History

Working on new-UI implementations of address bar and login

Brad Davis committed 11 years ago

Commit d14d5f31 parent fe482b345 files · +1842 −726Browse files

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

Unified · Split

interface/src/Menu.cpp+33−19
@@ -97,7 +97,7 @@ Menu::Menu() { · 96 unmodified lines
9797
9898 addActionToQMenuAndActionHash(fileMenu,
9999 MenuOption::AddressBar,
100− Qt::Key_Enter,
100+ Qt::CTRL | Qt::Key_L,
101101 dialogsManager.data(),
102102 SLOT(toggleAddressBar()));
103103 auto addressManager = DependencyManager::get<AddressManager>();
@@ -151,7 +151,8 @@ Menu::Menu() { · 47 unmodified lines
151151 connect(speechRecognizer.data(), SIGNAL(enabledUpdated(bool)), speechRecognizerAction, SLOT(setChecked(bool)));
152152 #endif
153153
154− addActionToQMenuAndActionHash(toolsMenu, MenuOption::Chat, Qt::Key_Backslash,
154+ addActionToQMenuAndActionHash(toolsMenu, MenuOption::Chat,
155+ 0, // QML Qt::Key_Backslash,
155156 dialogsManager.data(), SLOT(showIRCLink()));
156157 addActionToQMenuAndActionHash(toolsMenu, MenuOption::AddRemoveFriends, 0,
157158 qApp, SLOT(showFriendsWindow()));
@@ -194,7 +195,7 @@ Menu::Menu() { · 36 unmodified lines
194195
195196 addActionToQMenuAndActionHash(toolsMenu,
196197 MenuOption::ResetSensors,
197− Qt::Key_Apostrophe,
198+ 0, // QML Qt::Key_Apostrophe,
198199 qApp,
199200 SLOT(resetSensors()));
200201
@@ -207,17 +208,17 @@ Menu::Menu() { · 6 unmodified lines
207208 QMenu* avatarSizeMenu = avatarMenu->addMenu("Size");
208209 addActionToQMenuAndActionHash(avatarSizeMenu,
209210 MenuOption::IncreaseAvatarSize,
210− Qt::Key_Plus,
211+ 0, // QML Qt::Key_Plus,
211212 avatar,
212213 SLOT(increaseSize()));
213214 addActionToQMenuAndActionHash(avatarSizeMenu,
214215 MenuOption::DecreaseAvatarSize,
215− Qt::Key_Minus,
216+ 0, // QML Qt::Key_Minus,
216217 avatar,
217218 SLOT(decreaseSize()));
218219 addActionToQMenuAndActionHash(avatarSizeMenu,
219220 MenuOption::ResetAvatarSize,
220− Qt::Key_Equal,
221+ 0, // QML Qt::Key_Equal,
221222 avatar,
222223 SLOT(resetSize()));
223224
@@ -250,13 +251,17 @@ Menu::Menu() { · 26 unmodified lines
250251 qApp,
251252 SLOT(setFullscreen(bool)));
252253 #endif
253− addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::FirstPerson, Qt::Key_P, true,
254− qApp,SLOT(cameraMenuChanged()));
255− addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::Mirror, Qt::SHIFT | Qt::Key_H, true);
256− addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::FullscreenMirror, Qt::Key_H, false,
257− qApp, SLOT(cameraMenuChanged()));
258−
259− addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::HMDTools, Qt::META | Qt::Key_H,
254+ addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::FirstPerson,
255+ 0, // QML Qt::Key_P,
256+ true, qApp, SLOT(cameraMenuChanged()));
257+ addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::Mirror,
258+ 0, //QML Qt::SHIFT | Qt::Key_H,
259+ true);
260+ addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::FullscreenMirror,
261+ 0, // QML Qt::Key_H,
262+ false, qApp, SLOT(cameraMenuChanged()));
263+
264+ addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::HMDTools, Qt::CTRL | Qt::SHIFT | Qt::Key_H,
260265 false,
261266 dialogsManager.data(),
262267 SLOT(hmdTools(bool)));
@@ -283,8 +288,12 @@ Menu::Menu() { · 20 unmodified lines
283288 addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::TurnWithHead, 0, false);
284289
285290
286− addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::Stats, Qt::Key_Slash);
287− addActionToQMenuAndActionHash(viewMenu, MenuOption::Log, Qt::CTRL | Qt::Key_L, qApp, SLOT(toggleLogDialog()));
291+ addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::Stats,
292+ 0); // QML Qt::Key_Slash);
293+ addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::Stats);
294+ addActionToQMenuAndActionHash(viewMenu, MenuOption::Log,
295+ Qt::CTRL | Qt::SHIFT | Qt::Key_L,
296+ qApp, SLOT(toggleLogDialog()));
288297 addActionToQMenuAndActionHash(viewMenu, MenuOption::BandwidthDetails, 0,
289298 dialogsManager.data(), SLOT(bandwidthDetails()));
290299 addActionToQMenuAndActionHash(viewMenu, MenuOption::OctreeStats, 0,
@@ -294,7 +303,9 @@ Menu::Menu() { · 3 unmodified lines
294303 QMenu* developerMenu = addMenu("Developer");
295304
296305 QMenu* renderOptionsMenu = developerMenu->addMenu("Render");
297− addCheckableActionToQMenuAndActionHash(renderOptionsMenu, MenuOption::Atmosphere, Qt::SHIFT | Qt::Key_A, true);
306+ addCheckableActionToQMenuAndActionHash(renderOptionsMenu, MenuOption::Atmosphere,
307+ 0, // QML Qt::SHIFT | Qt::Key_A,
308+ true);
298309 addCheckableActionToQMenuAndActionHash(renderOptionsMenu, MenuOption::AmbientOcclusion);
299310 addCheckableActionToQMenuAndActionHash(renderOptionsMenu, MenuOption::DontFadeOnOctreeServerChanges);
300311
@@ -346,13 +357,16 @@ Menu::Menu() { · 45 unmodified lines
346357 resolutionGroup->addAction(addCheckableActionToQMenuAndActionHash(resolutionMenu, MenuOption::RenderResolutionThird, 0, false));
347358 resolutionGroup->addAction(addCheckableActionToQMenuAndActionHash(resolutionMenu, MenuOption::RenderResolutionQuarter, 0, false));
348359
349− addCheckableActionToQMenuAndActionHash(renderOptionsMenu, MenuOption::Stars, Qt::Key_Asterisk, true);
360+ addCheckableActionToQMenuAndActionHash(renderOptionsMenu, MenuOption::Stars,
361+ 0, // QML Qt::Key_Asterisk,
362+ true);
350363 addCheckableActionToQMenuAndActionHash(renderOptionsMenu, MenuOption::EnableGlowEffect, 0, true,
351364 DependencyManager::get<GlowEffect>().data(), SLOT(toggleGlowEffect(bool)));
352365
353366 addCheckableActionToQMenuAndActionHash(renderOptionsMenu, MenuOption::Wireframe, Qt::ALT | Qt::Key_W, false);
354− addActionToQMenuAndActionHash(renderOptionsMenu, MenuOption::LodTools, Qt::SHIFT | Qt::Key_L,
355− dialogsManager.data(), SLOT(lodTools()));
367+ addActionToQMenuAndActionHash(renderOptionsMenu, MenuOption::LodTools,
368+ 0, // QML Qt::SHIFT | Qt::Key_L,
369+ dialogsManager.data(), SLOT(lodTools()));
356370
357371 QMenu* avatarDebugMenu = developerMenu->addMenu("Avatar");
358372