Showing the changes to interface/src/Menu.cpp (1 of 1 file). Show all
Unified · Split
| @@ -235,33 +235,33 @@ Menu::Menu() { · 234 unmodified lines | |||
| 235 | 235 | ||
| 236 | QMenu* viewMenu = addMenu("View"); | 236 | QMenu* viewMenu = addMenu("View"); |
| 237 | 237 | ||
| 238 | #ifdef Q_OS_MAC | ||
| 239 | addCheckableActionToQMenuAndActionHash(viewMenu, | 238 | addCheckableActionToQMenuAndActionHash(viewMenu, |
| 240 | MenuOption::Fullscreen, | 239 | MenuOption::Fullscreen, |
| 240 | #ifdef Q_OS_MAC | ||
| 241 | Qt::CTRL | Qt::META | Qt::Key_F, | 241 | Qt::CTRL | Qt::META | Qt::Key_F, |
| 242 | false, | ||
| 243 | qApp, | ||
| 244 | SLOT(setFullscreen(bool))); | ||
| 245 | #else | 242 | #else |
| 246 | addCheckableActionToQMenuAndActionHash(viewMenu, | ||
| 247 | MenuOption::Fullscreen, | ||
| 248 | Qt::CTRL | Qt::Key_F, | 243 | Qt::CTRL | Qt::Key_F, |
| 244 | #endif | ||
| 249 | false, | 245 | false, |
| 250 | qApp, | 246 | qApp, |
| 251 | SLOT(setFullscreen(bool))); | 247 | SLOT(setFullscreen(bool))); |
| 252 | #endif | 248 | |
| 253 | addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::FirstPerson, Qt::Key_P, true, | 249 | addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::FirstPerson, Qt::Key_P, true, |
| 254 | qApp,SLOT(cameraMenuChanged())); | 250 | qApp,SLOT(cameraMenuChanged())); |
| 255 | addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::Mirror, Qt::SHIFT | Qt::Key_H, true); | 251 | addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::Mirror, Qt::SHIFT | Qt::Key_H, true); |
| 256 | addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::FullscreenMirror, Qt::Key_H, false, | 252 | addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::FullscreenMirror, Qt::Key_H, false, |
| 257 | qApp, SLOT(cameraMenuChanged())); | 253 | qApp, SLOT(cameraMenuChanged())); |
| 258 | 254 | ||
| 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 | ||
| 260 | false, | 261 | false, |
| 261 | dialogsManager.data(), | 262 | dialogsManager.data(), |
| 262 | SLOT(hmdTools(bool))); | 263 | SLOT(hmdTools(bool))); |
| 263 | 264 | ||
| 264 | |||
| 265 | addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::EnableVRMode, 0, | 265 | addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::EnableVRMode, 0, |
| 266 | false, | 266 | false, |
| 267 | qApp, | 267 | qApp, |