Showing the changes to interface/src/Menu.cpp (1 of 325 files). Show all
Unified · Split
| @@ -56,7 +56,7 @@ Menu* Menu::getInstance() { · 55 unmodified lines | |||
| 56 | return dynamic_cast<Menu*>(qApp->getWindow()->menuBar()); | 56 | return dynamic_cast<Menu*>(qApp->getWindow()->menuBar()); |
| 57 | } | 57 | } |
| 58 | 58 | ||
| 59 | const char* exclusionGroupKey = "exclusionGroup"; | 59 | const char* EXCLUSION_GROUP_KEY = "exclusionGroup"; |
| 60 | 60 | ||
| 61 | Menu::Menu() { | 61 | Menu::Menu() { |
| 62 | auto dialogsManager = DependencyManager::get<DialogsManager>(); | 62 | auto dialogsManager = DependencyManager::get<DialogsManager>(); |
| @@ -228,21 +228,21 @@ Menu::Menu() { · 165 unmodified lines | |||
| 228 | viewMenu, MenuOption::FirstPerson, Qt::CTRL | Qt::Key_F, | 228 | viewMenu, MenuOption::FirstPerson, Qt::CTRL | Qt::Key_F, |
| 229 | true, qApp, SLOT(cameraMenuChanged()))); | 229 | true, qApp, SLOT(cameraMenuChanged()))); |
| 230 | 230 | ||
| 231 | firstPersonAction->setProperty(exclusionGroupKey, QVariant::fromValue(cameraModeGroup)); | 231 | firstPersonAction->setProperty(EXCLUSION_GROUP_KEY, QVariant::fromValue(cameraModeGroup)); |
| 232 | 232 | ||
| 233 | // View > Third Person | 233 | // View > Third Person |
| 234 | auto thirdPersonAction = cameraModeGroup->addAction(addCheckableActionToQMenuAndActionHash( | 234 | auto thirdPersonAction = cameraModeGroup->addAction(addCheckableActionToQMenuAndActionHash( |
| 235 | viewMenu, MenuOption::ThirdPerson, Qt::CTRL | Qt::Key_G, | 235 | viewMenu, MenuOption::ThirdPerson, Qt::CTRL | Qt::Key_G, |
| 236 | false, qApp, SLOT(cameraMenuChanged()))); | 236 | false, qApp, SLOT(cameraMenuChanged()))); |
| 237 | 237 | ||
| 238 | thirdPersonAction->setProperty(exclusionGroupKey, QVariant::fromValue(cameraModeGroup)); | 238 | thirdPersonAction->setProperty(EXCLUSION_GROUP_KEY, QVariant::fromValue(cameraModeGroup)); |
| 239 | 239 | ||
| 240 | // View > Mirror | 240 | // View > Mirror |
| 241 | auto viewMirrorAction = cameraModeGroup->addAction(addCheckableActionToQMenuAndActionHash( | 241 | auto viewMirrorAction = cameraModeGroup->addAction(addCheckableActionToQMenuAndActionHash( |
| 242 | viewMenu, MenuOption::FullscreenMirror, Qt::CTRL | Qt::Key_H, | 242 | viewMenu, MenuOption::FullscreenMirror, Qt::CTRL | Qt::Key_H, |
| 243 | false, qApp, SLOT(cameraMenuChanged()))); | 243 | false, qApp, SLOT(cameraMenuChanged()))); |
| 244 | 244 | ||
| 245 | viewMirrorAction->setProperty(exclusionGroupKey, QVariant::fromValue(cameraModeGroup)); | 245 | viewMirrorAction->setProperty(EXCLUSION_GROUP_KEY, QVariant::fromValue(cameraModeGroup)); |
| 246 | 246 | ||
| 247 | // View > Independent [advanced] | 247 | // View > Independent [advanced] |
| 248 | auto viewIndependentAction = cameraModeGroup->addAction(addCheckableActionToQMenuAndActionHash(viewMenu, | 248 | auto viewIndependentAction = cameraModeGroup->addAction(addCheckableActionToQMenuAndActionHash(viewMenu, |
| @@ -250,7 +250,7 @@ Menu::Menu() { · 1 unmodified line | |||
| 250 | false, qApp, SLOT(cameraMenuChanged()), | 250 | false, qApp, SLOT(cameraMenuChanged()), |
| 251 | UNSPECIFIED_POSITION, "Advanced")); | 251 | UNSPECIFIED_POSITION, "Advanced")); |
| 252 | 252 | ||
| 253 | viewIndependentAction->setProperty(exclusionGroupKey, QVariant::fromValue(cameraModeGroup)); | 253 | viewIndependentAction->setProperty(EXCLUSION_GROUP_KEY, QVariant::fromValue(cameraModeGroup)); |
| 254 | 254 | ||
| 255 | // View > Entity Camera [advanced] | 255 | // View > Entity Camera [advanced] |
| 256 | auto viewEntityCameraAction = cameraModeGroup->addAction(addCheckableActionToQMenuAndActionHash(viewMenu, | 256 | auto viewEntityCameraAction = cameraModeGroup->addAction(addCheckableActionToQMenuAndActionHash(viewMenu, |
| @@ -258,7 +258,7 @@ Menu::Menu() { · 1 unmodified line | |||
| 258 | false, qApp, SLOT(cameraMenuChanged()), | 258 | false, qApp, SLOT(cameraMenuChanged()), |
| 259 | UNSPECIFIED_POSITION, "Advanced")); | 259 | UNSPECIFIED_POSITION, "Advanced")); |
| 260 | 260 | ||
| 261 | viewEntityCameraAction->setProperty(exclusionGroupKey, QVariant::fromValue(cameraModeGroup)); | 261 | viewEntityCameraAction->setProperty(EXCLUSION_GROUP_KEY, QVariant::fromValue(cameraModeGroup)); |
| 262 | 262 | ||
| 263 | viewMenu->addSeparator(); | 263 | viewMenu->addSeparator(); |
| 264 | 264 | ||