new --scripts switch overrides default scripts location

David Kelly committed 9 years ago

Commit ff5b37c1 parent 34edd958 files · +81 −45Browse files

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

Unified · Split

interface/src/Menu.cpp+2−2

@@ -300,7 +300,7 @@ Menu::Menu() { · 299 unmodified lines
300	// Settings > Avatar...	300	// Settings > Avatar...
301	action = addActionToQMenuAndActionHash(settingsMenu, "Avatar...");	301	action = addActionToQMenuAndActionHash(settingsMenu, "Avatar...");
302	connect(action, &QAction::triggered, [] {	302	connect(action, &QAction::triggered, [] {
303	qApp->showDialog(QString("hifi/dialogs/AvatarPreferencesDialog.qml"),	303	qApp->showDialog(QString("hifi/dialogs/AvatarPreferencesDialog.qml"),
304	QString("../../hifi/tablet/TabletAvatarPreferences.qml"), "AvatarPreferencesDialog");	304	QString("../../hifi/tablet/TabletAvatarPreferences.qml"), "AvatarPreferencesDialog");
305	});	305	});
306		306
@@ -626,7 +626,7 @@ Menu::Menu() { · 319 unmodified lines
626	action = addActionToQMenuAndActionHash(audioDebugMenu, "Stats...");	626	action = addActionToQMenuAndActionHash(audioDebugMenu, "Stats...");
627	connect(action, &QAction::triggered, [] {	627	connect(action, &QAction::triggered, [] {
628	auto scriptEngines = DependencyManager::get<ScriptEngines>();	628	auto scriptEngines = DependencyManager::get<ScriptEngines>();
629	QUrl defaultScriptsLoc = defaultScriptsLocation();	629	QUrl defaultScriptsLoc = PathUtils::defaultScriptsLocation();
630	defaultScriptsLoc.setPath(defaultScriptsLoc.path() + "developer/utilities/audio/stats.js");	630	defaultScriptsLoc.setPath(defaultScriptsLoc.path() + "developer/utilities/audio/stats.js");
631	scriptEngines->loadScript(defaultScriptsLoc.toString());	631	scriptEngines->loadScript(defaultScriptsLoc.toString());
632	});	632	});