History

Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager

Ryan Huffman committed 7 years ago

Commit 720cd902 parents ad47138 889f110233 files · +7920 −2965Browse files

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

Unified · Split

interface/src/Menu.cpp+11−7
@@ -124,10 +124,12 @@ Menu::Menu() { · 123 unmodified lines
124 // Edit > Running Scripts124 // Edit > Running Scripts
125 auto action = addActionToQMenuAndActionHash(editMenu, MenuOption::RunningScripts, Qt::CTRL | Qt::Key_J);125 auto action = addActionToQMenuAndActionHash(editMenu, MenuOption::RunningScripts, Qt::CTRL | Qt::Key_J);
126 connect(action, &QAction::triggered, [] {126 connect(action, &QAction::triggered, [] {
127 static const QUrl widgetUrl("hifi/dialogs/RunningScripts.qml");127 if (!qApp->getLoginDialogPoppedUp()) {
128 static const QUrl tabletUrl("hifi/dialogs/TabletRunningScripts.qml");128 static const QUrl widgetUrl("hifi/dialogs/RunningScripts.qml");
129 static const QString name("RunningScripts");129 static const QUrl tabletUrl("hifi/dialogs/TabletRunningScripts.qml");
130 qApp->showDialog(widgetUrl, tabletUrl, name);130 static const QString name("RunningScripts");
131 qApp->showDialog(widgetUrl, tabletUrl, name);
132 }
131 });133 });
132 134
133 editMenu->addSeparator();135 editMenu->addSeparator();
@@ -248,8 +250,10 @@ Menu::Menu() { · 114 unmodified lines
248 // Settings > General...250 // Settings > General...
249 action = addActionToQMenuAndActionHash(settingsMenu, MenuOption::Preferences, Qt::CTRL | Qt::Key_G, nullptr, nullptr);251 action = addActionToQMenuAndActionHash(settingsMenu, MenuOption::Preferences, Qt::CTRL | Qt::Key_G, nullptr, nullptr);
250 connect(action, &QAction::triggered, [] {252 connect(action, &QAction::triggered, [] {
251 qApp->showDialog(QString("hifi/dialogs/GeneralPreferencesDialog.qml"),253 if (!qApp->getLoginDialogPoppedUp()) {
252 QString("hifi/tablet/TabletGeneralPreferences.qml"), "GeneralPreferencesDialog");254 qApp->showDialog(QString("hifi/dialogs/GeneralPreferencesDialog.qml"),
255 QString("hifi/tablet/TabletGeneralPreferences.qml"), "GeneralPreferencesDialog");
256 }
253 });257 });
254 258
255 // Settings > Controls...259 // Settings > Controls...
@@ -809,7 +813,7 @@ Menu::Menu() { · 553 unmodified lines
809 connect(action, &QAction::triggered, qApp, []() { std::thread(crash::newFault).join(); });813 connect(action, &QAction::triggered, qApp, []() { std::thread(crash::newFault).join(); });
810 814
811 // Developer > Show Statistics815 // Developer > Show Statistics
812 addCheckableActionToQMenuAndActionHash(developerMenu, MenuOption::Stats);816 addCheckableActionToQMenuAndActionHash(developerMenu, MenuOption::Stats, 0, true);
813 817
814 // Developer > Show Animation Statistics818 // Developer > Show Animation Statistics
815 addCheckableActionToQMenuAndActionHash(developerMenu, MenuOption::AnimStats);819 addCheckableActionToQMenuAndActionHash(developerMenu, MenuOption::AnimStats);