Add Graphics preferences to Tablet. Use TabletComboBox instead of desktop ComboBox for Tablet preferences

Vladyslav Stelmakhovskyi committed 9 years ago

Commit d70943d1 parent 2cc72374 files · +102 −2Browse files

Showing the changes to interface/src/Menu.cpp (1 of 4 files). Show all

Unified · Split

interface/src/Menu.cpp+2−1

@@ -329,7 +329,8 @@ Menu::Menu() { · 328 unmodified lines
329	// Developer > Graphics...	329	// Developer > Graphics...
330	action = addActionToQMenuAndActionHash(developerMenu, "Graphics...");	330	action = addActionToQMenuAndActionHash(developerMenu, "Graphics...");
331	connect(action, &QAction::triggered, [] {	331	connect(action, &QAction::triggered, [] {
332	DependencyManager::get<OffscreenUi>()->toggle(QString("hifi/dialogs/GraphicsPreferencesDialog.qml"), "GraphicsPreferencesDialog");	332	qApp->showDialog(QString("hifi/dialogs/GraphicsPreferencesDialog.qml"),
		333	QString("../../hifi/tablet/TabletGraphicsPreferences.qml"), "GraphicsPreferencesDialog");
333	});	334	});
334		335
335	// Developer > Render >>>	336	// Developer > Render >>>