History

revert mac version of HMD tools back to meta-H

ZappoMan committed 11 years ago

Commit 41e7b751 parent d72bb711 file · +9 −9Browse files

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

Unified · Split

interface/src/Menu.cpp+9−9
@@ -235,33 +235,33 @@ Menu::Menu() { · 234 unmodified lines
235235
236236 QMenu* viewMenu = addMenu("View");
237237
238−#ifdef Q_OS_MAC
239238 addCheckableActionToQMenuAndActionHash(viewMenu,
240239 MenuOption::Fullscreen,
240+#ifdef Q_OS_MAC
241241 Qt::CTRL | Qt::META | Qt::Key_F,
242− false,
243− qApp,
244− SLOT(setFullscreen(bool)));
245242 #else
246− addCheckableActionToQMenuAndActionHash(viewMenu,
247− MenuOption::Fullscreen,
248243 Qt::CTRL | Qt::Key_F,
244+#endif
249245 false,
250246 qApp,
251247 SLOT(setFullscreen(bool)));
252−#endif
248+
253249 addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::FirstPerson, Qt::Key_P, true,
254250 qApp,SLOT(cameraMenuChanged()));
255251 addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::Mirror, Qt::SHIFT | Qt::Key_H, true);
256252 addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::FullscreenMirror, Qt::Key_H, false,
257253 qApp, SLOT(cameraMenuChanged()));
258254
259− addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::HMDTools, Qt::CTRL | Qt::Key_H,
255+ addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::HMDTools,
256+#ifdef Q_OS_MAC
257+ Qt::META | Qt::Key_H,
258+#else
259+ Qt::CTRL | Qt::Key_H,
260+#endif
260261 false,
261262 dialogsManager.data(),
262263 SLOT(hmdTools(bool)));
263264
264−
265265 addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::EnableVRMode, 0,
266266 false,
267267 qApp,