Showing the changes to interface/src/Menu.cpp (1 of 22 files). Show all
Unified · Split
| @@ -93,6 +93,8 @@ Menu::Menu() : · 92 unmodified lines | ||
| 93 | 93 | |
| 94 | 94 | addDisabledActionAndSeparator(fileMenu, "Scripts"); |
| 95 | 95 | addActionToQMenuAndActionHash(fileMenu, MenuOption::LoadScript, Qt::CTRL | Qt::Key_O, appInstance, SLOT(loadDialog())); |
| 96 | + addActionToQMenuAndActionHash(fileMenu, MenuOption::StopAllScripts, 0, appInstance, SLOT(stopAllScripts())); | |
| 97 | + addActionToQMenuAndActionHash(fileMenu, MenuOption::ReloadAllScripts, 0, appInstance, SLOT(reloadAllScripts())); | |
| 96 | 98 | _activeScriptsMenu = fileMenu->addMenu("Running Scripts"); |
| 97 | 99 | |
| 98 | 100 | addDisabledActionAndSeparator(fileMenu, "Voxels"); |
| @@ -161,7 +163,7 @@ Menu::Menu() : · 62 unmodified lines | ||
| 161 | 163 | #endif |
| 162 | 164 | |
| 163 | 165 | addDisabledActionAndSeparator(editMenu, "Physics"); |
| 164 | − addCheckableActionToQMenuAndActionHash(editMenu, MenuOption::Gravity, Qt::SHIFT | Qt::Key_G, true); | |
| 166 | + addCheckableActionToQMenuAndActionHash(editMenu, MenuOption::Gravity, Qt::SHIFT | Qt::Key_G, false); | |
| 165 | 167 | |
| 166 | 168 | |
| 167 | 169 | addCheckableActionToQMenuAndActionHash(editMenu, MenuOption::ClickToFly); |
| @@ -238,9 +240,9 @@ Menu::Menu() : · 70 unmodified lines | ||
| 238 | 240 | SLOT(setFullscreen(bool))); |
| 239 | 241 | addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::FirstPerson, Qt::Key_P, true, |
| 240 | 242 | appInstance,SLOT(cameraMenuChanged())); |
| 241 | − addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::Mirror, Qt::SHIFT | Qt::Key_H); | |
| 242 | − addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::FullscreenMirror, Qt::Key_H,false, | |
| 243 | − appInstance,SLOT(cameraMenuChanged())); | |
| 243 | + addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::Mirror, Qt::SHIFT | Qt::Key_H, true); | |
| 244 | + addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::FullscreenMirror, Qt::Key_H, false, | |
| 245 | + appInstance, SLOT(cameraMenuChanged())); | |
| 244 | 246 | |
| 245 | 247 | addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::Enable3DTVMode, 0, |
| 246 | 248 | false, |
| @@ -266,14 +268,8 @@ Menu::Menu() : · 19 unmodified lines | ||
| 266 | 268 | appInstance->getAvatar(), |
| 267 | 269 | SLOT(resetSize())); |
| 268 | 270 | |
| 269 | − addCheckableActionToQMenuAndActionHash(viewMenu, | |
| 270 | − MenuOption::OffAxisProjection, | |
| 271 | − 0, | |
| 272 | − true); | |
| 273 | − addCheckableActionToQMenuAndActionHash(viewMenu, | |
| 274 | − MenuOption::TurnWithHead, | |
| 275 | − 0, | |
| 276 | − true); | |
| 271 | + addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::OffAxisProjection, 0, false); | |
| 272 | + addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::TurnWithHead, 0, false); | |
| 277 | 273 | addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::MoveWithLean, 0, false); |
| 278 | 274 | addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::HeadMouse, 0, false); |
| 279 | 275 | |
| @@ -298,7 +294,6 @@ Menu::Menu() : · 18 unmodified lines | ||
| 298 | 294 | appInstance->getGlowEffect(), |
| 299 | 295 | SLOT(cycleRenderMode())); |
| 300 | 296 | |
| 301 | − addCheckableActionToQMenuAndActionHash(renderOptionsMenu, MenuOption::ParticleCloud, 0, false); | |
| 302 | 297 | addCheckableActionToQMenuAndActionHash(renderOptionsMenu, MenuOption::Shadows, 0, false); |
| 303 | 298 | addCheckableActionToQMenuAndActionHash(renderOptionsMenu, MenuOption::Metavoxels, 0, false); |
| 304 | 299 | |
| @@ -339,14 +334,14 @@ Menu::Menu() : · 34 unmodified lines | ||
| 339 | 334 | addCheckableActionToQMenuAndActionHash(avatarOptionsMenu, MenuOption::Avatars, 0, true); |
| 340 | 335 | addCheckableActionToQMenuAndActionHash(avatarOptionsMenu, MenuOption::CollisionProxies); |
| 341 | 336 | |
| 342 | − addCheckableActionToQMenuAndActionHash(avatarOptionsMenu, MenuOption::LookAtVectors, 0, true); | |
| 337 | + addCheckableActionToQMenuAndActionHash(avatarOptionsMenu, MenuOption::LookAtVectors, 0, false); | |
| 343 | 338 | addCheckableActionToQMenuAndActionHash(avatarOptionsMenu, |
| 344 | 339 | MenuOption::FaceshiftTCP, |
| 345 | 340 | 0, |
| 346 | 341 | false, |
| 347 | 342 | appInstance->getFaceshift(), |
| 348 | 343 | SLOT(setTCPEnabled(bool))); |
| 349 | − addCheckableActionToQMenuAndActionHash(avatarOptionsMenu, MenuOption::ChatCircling, 0, true); | |
| 344 | + addCheckableActionToQMenuAndActionHash(avatarOptionsMenu, MenuOption::ChatCircling, 0, false); | |
| 350 | 345 | |
| 351 | 346 | QMenu* handOptionsMenu = developerMenu->addMenu("Hand Options"); |
| 352 | 347 | |
| @@ -356,7 +351,7 @@ Menu::Menu() : · 3 unmodified lines | ||
| 356 | 351 | true, |
| 357 | 352 | appInstance->getSixenseManager(), |
| 358 | 353 | SLOT(setFilter(bool))); |
| 359 | − addCheckableActionToQMenuAndActionHash(handOptionsMenu, MenuOption::DisplayLeapHands, 0, true); | |
| 354 | + addCheckableActionToQMenuAndActionHash(handOptionsMenu, MenuOption::DisplayHands, 0, true); | |
| 360 | 355 | addCheckableActionToQMenuAndActionHash(handOptionsMenu, MenuOption::DisplayHandTargets, 0, false); |
| 361 | 356 | addCheckableActionToQMenuAndActionHash(handOptionsMenu, MenuOption::VoxelDrumming, 0, false); |
| 362 | 357 | addCheckableActionToQMenuAndActionHash(handOptionsMenu, MenuOption::PlaySlaps, 0, false); |