Showing the changes to interface/src/Menu.cpp (1 of 45 files). Show all
Unified · Split
| @@ -97,7 +97,7 @@ Menu::Menu() { · 96 unmodified lines | |||
| 97 | 97 | ||
| 98 | addActionToQMenuAndActionHash(fileMenu, | 98 | addActionToQMenuAndActionHash(fileMenu, |
| 99 | MenuOption::AddressBar, | 99 | MenuOption::AddressBar, |
| 100 | Qt::Key_Enter, | 100 | Qt::CTRL | Qt::Key_L, |
| 101 | dialogsManager.data(), | 101 | dialogsManager.data(), |
| 102 | SLOT(toggleAddressBar())); | 102 | SLOT(toggleAddressBar())); |
| 103 | auto addressManager = DependencyManager::get<AddressManager>(); | 103 | auto addressManager = DependencyManager::get<AddressManager>(); |
| @@ -151,7 +151,8 @@ Menu::Menu() { · 47 unmodified lines | |||
| 151 | connect(speechRecognizer.data(), SIGNAL(enabledUpdated(bool)), speechRecognizerAction, SLOT(setChecked(bool))); | 151 | connect(speechRecognizer.data(), SIGNAL(enabledUpdated(bool)), speechRecognizerAction, SLOT(setChecked(bool))); |
| 152 | #endif | 152 | #endif |
| 153 | 153 | ||
| 154 | addActionToQMenuAndActionHash(toolsMenu, MenuOption::Chat, Qt::Key_Backslash, | 154 | addActionToQMenuAndActionHash(toolsMenu, MenuOption::Chat, |
| 155 | 0, // QML Qt::Key_Backslash, | ||
| 155 | dialogsManager.data(), SLOT(showIRCLink())); | 156 | dialogsManager.data(), SLOT(showIRCLink())); |
| 156 | addActionToQMenuAndActionHash(toolsMenu, MenuOption::AddRemoveFriends, 0, | 157 | addActionToQMenuAndActionHash(toolsMenu, MenuOption::AddRemoveFriends, 0, |
| 157 | qApp, SLOT(showFriendsWindow())); | 158 | qApp, SLOT(showFriendsWindow())); |
| @@ -194,7 +195,7 @@ Menu::Menu() { · 36 unmodified lines | |||
| 194 | 195 | ||
| 195 | addActionToQMenuAndActionHash(toolsMenu, | 196 | addActionToQMenuAndActionHash(toolsMenu, |
| 196 | MenuOption::ResetSensors, | 197 | MenuOption::ResetSensors, |
| 197 | Qt::Key_Apostrophe, | 198 | 0, // QML Qt::Key_Apostrophe, |
| 198 | qApp, | 199 | qApp, |
| 199 | SLOT(resetSensors())); | 200 | SLOT(resetSensors())); |
| 200 | 201 | ||
| @@ -207,17 +208,17 @@ Menu::Menu() { · 6 unmodified lines | |||
| 207 | QMenu* avatarSizeMenu = avatarMenu->addMenu("Size"); | 208 | QMenu* avatarSizeMenu = avatarMenu->addMenu("Size"); |
| 208 | addActionToQMenuAndActionHash(avatarSizeMenu, | 209 | addActionToQMenuAndActionHash(avatarSizeMenu, |
| 209 | MenuOption::IncreaseAvatarSize, | 210 | MenuOption::IncreaseAvatarSize, |
| 210 | Qt::Key_Plus, | 211 | 0, // QML Qt::Key_Plus, |
| 211 | avatar, | 212 | avatar, |
| 212 | SLOT(increaseSize())); | 213 | SLOT(increaseSize())); |
| 213 | addActionToQMenuAndActionHash(avatarSizeMenu, | 214 | addActionToQMenuAndActionHash(avatarSizeMenu, |
| 214 | MenuOption::DecreaseAvatarSize, | 215 | MenuOption::DecreaseAvatarSize, |
| 215 | Qt::Key_Minus, | 216 | 0, // QML Qt::Key_Minus, |
| 216 | avatar, | 217 | avatar, |
| 217 | SLOT(decreaseSize())); | 218 | SLOT(decreaseSize())); |
| 218 | addActionToQMenuAndActionHash(avatarSizeMenu, | 219 | addActionToQMenuAndActionHash(avatarSizeMenu, |
| 219 | MenuOption::ResetAvatarSize, | 220 | MenuOption::ResetAvatarSize, |
| 220 | Qt::Key_Equal, | 221 | 0, // QML Qt::Key_Equal, |
| 221 | avatar, | 222 | avatar, |
| 222 | SLOT(resetSize())); | 223 | SLOT(resetSize())); |
| 223 | 224 | ||
| @@ -250,13 +251,17 @@ Menu::Menu() { · 26 unmodified lines | |||
| 250 | qApp, | 251 | qApp, |
| 251 | SLOT(setFullscreen(bool))); | 252 | SLOT(setFullscreen(bool))); |
| 252 | #endif | 253 | #endif |
| 253 | addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::FirstPerson, Qt::Key_P, true, | 254 | addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::FirstPerson, |
| 254 | qApp,SLOT(cameraMenuChanged())); | 255 | 0, // QML Qt::Key_P, |
| 255 | addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::Mirror, Qt::SHIFT | Qt::Key_H, true); | 256 | true, qApp, SLOT(cameraMenuChanged())); |
| 256 | addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::FullscreenMirror, Qt::Key_H, false, | 257 | addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::Mirror, |
| 257 | qApp, SLOT(cameraMenuChanged())); | 258 | 0, //QML Qt::SHIFT | Qt::Key_H, |
| 258 | 259 | true); | |
| 259 | addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::HMDTools, Qt::META | Qt::Key_H, | 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, | ||
| 260 | false, | 265 | false, |
| 261 | dialogsManager.data(), | 266 | dialogsManager.data(), |
| 262 | SLOT(hmdTools(bool))); | 267 | SLOT(hmdTools(bool))); |
| @@ -283,8 +288,12 @@ Menu::Menu() { · 20 unmodified lines | |||
| 283 | addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::TurnWithHead, 0, false); | 288 | addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::TurnWithHead, 0, false); |
| 284 | 289 | ||
| 285 | 290 | ||
| 286 | addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::Stats, Qt::Key_Slash); | 291 | addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::Stats, |
| 287 | addActionToQMenuAndActionHash(viewMenu, MenuOption::Log, Qt::CTRL | Qt::Key_L, qApp, SLOT(toggleLogDialog())); | 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())); | ||
| 288 | addActionToQMenuAndActionHash(viewMenu, MenuOption::BandwidthDetails, 0, | 297 | addActionToQMenuAndActionHash(viewMenu, MenuOption::BandwidthDetails, 0, |
| 289 | dialogsManager.data(), SLOT(bandwidthDetails())); | 298 | dialogsManager.data(), SLOT(bandwidthDetails())); |
| 290 | addActionToQMenuAndActionHash(viewMenu, MenuOption::OctreeStats, 0, | 299 | addActionToQMenuAndActionHash(viewMenu, MenuOption::OctreeStats, 0, |
| @@ -294,7 +303,9 @@ Menu::Menu() { · 3 unmodified lines | |||
| 294 | QMenu* developerMenu = addMenu("Developer"); | 303 | QMenu* developerMenu = addMenu("Developer"); |
| 295 | 304 | ||
| 296 | QMenu* renderOptionsMenu = developerMenu->addMenu("Render"); | 305 | 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); | ||
| 298 | addCheckableActionToQMenuAndActionHash(renderOptionsMenu, MenuOption::AmbientOcclusion); | 309 | addCheckableActionToQMenuAndActionHash(renderOptionsMenu, MenuOption::AmbientOcclusion); |
| 299 | addCheckableActionToQMenuAndActionHash(renderOptionsMenu, MenuOption::DontFadeOnOctreeServerChanges); | 310 | addCheckableActionToQMenuAndActionHash(renderOptionsMenu, MenuOption::DontFadeOnOctreeServerChanges); |
| 300 | 311 | ||
| @@ -346,13 +357,16 @@ Menu::Menu() { · 45 unmodified lines | |||
| 346 | resolutionGroup->addAction(addCheckableActionToQMenuAndActionHash(resolutionMenu, MenuOption::RenderResolutionThird, 0, false)); | 357 | resolutionGroup->addAction(addCheckableActionToQMenuAndActionHash(resolutionMenu, MenuOption::RenderResolutionThird, 0, false)); |
| 347 | resolutionGroup->addAction(addCheckableActionToQMenuAndActionHash(resolutionMenu, MenuOption::RenderResolutionQuarter, 0, false)); | 358 | resolutionGroup->addAction(addCheckableActionToQMenuAndActionHash(resolutionMenu, MenuOption::RenderResolutionQuarter, 0, false)); |
| 348 | 359 | ||
| 349 | addCheckableActionToQMenuAndActionHash(renderOptionsMenu, MenuOption::Stars, Qt::Key_Asterisk, true); | 360 | addCheckableActionToQMenuAndActionHash(renderOptionsMenu, MenuOption::Stars, |
| 361 | 0, // QML Qt::Key_Asterisk, | ||
| 362 | true); | ||
| 350 | addCheckableActionToQMenuAndActionHash(renderOptionsMenu, MenuOption::EnableGlowEffect, 0, true, | 363 | addCheckableActionToQMenuAndActionHash(renderOptionsMenu, MenuOption::EnableGlowEffect, 0, true, |
| 351 | DependencyManager::get<GlowEffect>().data(), SLOT(toggleGlowEffect(bool))); | 364 | DependencyManager::get<GlowEffect>().data(), SLOT(toggleGlowEffect(bool))); |
| 352 | 365 | ||
| 353 | addCheckableActionToQMenuAndActionHash(renderOptionsMenu, MenuOption::Wireframe, Qt::ALT | Qt::Key_W, false); | 366 | addCheckableActionToQMenuAndActionHash(renderOptionsMenu, MenuOption::Wireframe, Qt::ALT | Qt::Key_W, false); |
| 354 | addActionToQMenuAndActionHash(renderOptionsMenu, MenuOption::LodTools, Qt::SHIFT | Qt::Key_L, | 367 | addActionToQMenuAndActionHash(renderOptionsMenu, MenuOption::LodTools, |
| 355 | dialogsManager.data(), SLOT(lodTools())); | 368 | 0, // QML Qt::SHIFT | Qt::Key_L, |
| 369 | dialogsManager.data(), SLOT(lodTools())); | ||
| 356 | 370 | ||
| 357 | QMenu* avatarDebugMenu = developerMenu->addMenu("Avatar"); | 371 | QMenu* avatarDebugMenu = developerMenu->addMenu("Avatar"); |
| 358 | 372 | ||