History

Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui

Seth Alves committed 9 years ago

Commit cc4ddd12 parents b0b3fe2 b2abe5a78 files · +664 −3888Browse files

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

Unified · Split

interface/src/Menu.cpp+0−11
@@ -74,9 +74,6 @@ Menu::Menu() { · 73 unmodified lines
74 // File > Help74 // File > Help
75 addActionToQMenuAndActionHash(fileMenu, MenuOption::Help, 0, qApp, SLOT(showHelp()));75 addActionToQMenuAndActionHash(fileMenu, MenuOption::Help, 0, qApp, SLOT(showHelp()));
76 76
77 // File > About
78 addActionToQMenuAndActionHash(fileMenu, MenuOption::AboutApp, 0, qApp, SLOT(aboutApp()), QAction::AboutRole);
79
80 // File > Quit77 // File > Quit
81 addActionToQMenuAndActionHash(fileMenu, MenuOption::Quit, Qt::CTRL | Qt::Key_Q, qApp, SLOT(quit()), QAction::QuitRole);78 addActionToQMenuAndActionHash(fileMenu, MenuOption::Quit, Qt::CTRL | Qt::Key_Q, qApp, SLOT(quit()), QAction::QuitRole);
82 79
@@ -120,11 +117,6 @@ Menu::Menu() { · 37 unmodified lines
120 scriptEngines.data(), SLOT(reloadAllScripts()),117 scriptEngines.data(), SLOT(reloadAllScripts()),
121 QAction::NoRole, UNSPECIFIED_POSITION, "Advanced");118 QAction::NoRole, UNSPECIFIED_POSITION, "Advanced");
122 119
123 // Edit > Scripts Editor... [advanced]
124 addActionToQMenuAndActionHash(editMenu, MenuOption::ScriptEditor, Qt::ALT | Qt::Key_S,
125 dialogsManager.data(), SLOT(showScriptEditor()),
126 QAction::NoRole, UNSPECIFIED_POSITION, "Advanced");
127
128 // Edit > Console... [advanced]120 // Edit > Console... [advanced]
129 addActionToQMenuAndActionHash(editMenu, MenuOption::Console, Qt::CTRL | Qt::ALT | Qt::Key_J,121 addActionToQMenuAndActionHash(editMenu, MenuOption::Console, Qt::CTRL | Qt::ALT | Qt::Key_J,
130 DependencyManager::get<StandAloneJSConsole>().data(),122 DependencyManager::get<StandAloneJSConsole>().data(),
@@ -249,9 +241,6 @@ Menu::Menu() { · 118 unmodified lines
249 241
250 viewMenu->addSeparator();242 viewMenu->addSeparator();
251 243
252 // View > Mini Mirror
253 addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::MiniMirror, 0, false);
254
255 // View > Center Player In View244 // View > Center Player In View
256 addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::CenterPlayerInView,245 addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::CenterPlayerInView,
257 0, true, qApp, SLOT(rotationModeChanged()),246 0, true, qApp, SLOT(rotationModeChanged()),