Whitelist functionality for tablet apps

Brad Davis committed 9 years ago

Commit d162e1c1 parent ff36cbf28 files · +283 −217Browse files

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

Unified · Split

interface/src/Menu.cpp+2−2

@@ -101,7 +101,7 @@ Menu::Menu() { · 100 unmodified lines
101	auto action = addActionToQMenuAndActionHash(editMenu, MenuOption::RunningScripts, Qt::CTRL \| Qt::Key_J);	101	auto action = addActionToQMenuAndActionHash(editMenu, MenuOption::RunningScripts, Qt::CTRL \| Qt::Key_J);
102	connect(action, &QAction::triggered, [] {	102	connect(action, &QAction::triggered, [] {
103	static const QUrl widgetUrl("hifi/dialogs/RunningScripts.qml");	103	static const QUrl widgetUrl("hifi/dialogs/RunningScripts.qml");
104	static const QUrl tabletUrl("../../hifi/dialogs/TabletRunningScripts.qml");	104	static const QUrl tabletUrl("hifi/dialogs/TabletRunningScripts.qml");
105	static const QString name("RunningScripts");	105	static const QString name("RunningScripts");
106	qApp->showDialog(widgetUrl, tabletUrl, name);	106	qApp->showDialog(widgetUrl, tabletUrl, name);
107	});	107	});
@@ -338,7 +338,7 @@ Menu::Menu() { · 230 unmodified lines
338	connect(action, &QAction::triggered, [] {	338	connect(action, &QAction::triggered, [] {
339	auto tablet = DependencyManager::get<TabletScriptingInterface>()->getTablet("com.highfidelity.interface.tablet.system");	339	auto tablet = DependencyManager::get<TabletScriptingInterface>()->getTablet("com.highfidelity.interface.tablet.system");
340	auto hmd = DependencyManager::get<HMDScriptingInterface>();	340	auto hmd = DependencyManager::get<HMDScriptingInterface>();
341	tablet->loadQMLSource("ControllerSettings.qml");	341	tablet->loadQMLSource("hifi/tablet/ControllerSettings.qml");
342		342
343	if (!hmd->getShouldShowTablet()) {	343	if (!hmd->getShouldShowTablet()) {
344	hmd->toggleShouldShowTablet();	344	hmd->toggleShouldShowTablet();