Showing the changes to interface/src/Menu.cpp (1 of 165 files). Show all
Unified · Split
| @@ -9,9 +9,6 @@ · 8 unmodified lines | ||
| 9 | 9 | // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html |
| 10 | 10 | // |
| 11 | 11 | |
| 12 | −// include this before QGLWidget, which includes an earlier version of OpenGL | |
| 13 | −#include "InterfaceConfig.h" | |
| 14 | − | |
| 15 | 12 | #include <QFileDialog> |
| 16 | 13 | #include <QMenuBar> |
| 17 | 14 | #include <QShortcut> |
| @@ -267,19 +264,6 @@ Menu::Menu() { · 249 unmodified lines | ||
| 267 | 264 | |
| 268 | 265 | addActionToQMenuAndActionHash(viewMenu, MenuOption::ReloadContent, 0, qApp, SLOT(reloadResourceCaches())); |
| 269 | 266 | |
| 270 | −#if 0 | |
| 271 | − addCheckableActionToQMenuAndActionHash(viewMenu, | |
| 272 | − MenuOption::Fullscreen, | |
| 273 | −#ifdef Q_OS_MAC | |
| 274 | − Qt::CTRL | Qt::META | Qt::Key_F, | |
| 275 | −#else | |
| 276 | − Qt::CTRL | Qt::Key_F, | |
| 277 | −#endif | |
| 278 | − false, | |
| 279 | − qApp, | |
| 280 | − SLOT(setFullscreen(bool))); | |
| 281 | −#endif | |
| 282 | − | |
| 283 | 267 | MenuWrapper* cameraModeMenu = viewMenu->addMenu("Camera Mode"); |
| 284 | 268 | QActionGroup* cameraModeGroup = new QActionGroup(cameraModeMenu); |
| 285 | 269 | cameraModeGroup->setExclusive(true); |
| @@ -306,17 +290,6 @@ Menu::Menu() { · 20 unmodified lines | ||
| 306 | 290 | addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::CenterPlayerInView, |
| 307 | 291 | 0, false, qApp, SLOT(rotationModeChanged())); |
| 308 | 292 | |
| 309 | −#if 0 | |
| 310 | − addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::HMDTools, | |
| 311 | −#ifdef Q_OS_MAC | |
| 312 | − Qt::META | Qt::Key_H, | |
| 313 | −#else | |
| 314 | − Qt::CTRL | Qt::Key_H, | |
| 315 | −#endif | |
| 316 | − false, | |
| 317 | − dialogsManager.data(), | |
| 318 | − SLOT(hmdTools(bool))); | |
| 319 | −#endif | |
| 320 | 293 | |
| 321 | 294 | addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::TurnWithHead, 0, false); |
| 322 | 295 | |
| @@ -327,6 +300,8 @@ Menu::Menu() { · 4 unmodified lines | ||
| 327 | 300 | addActionToQMenuAndActionHash(viewMenu, MenuOption::Log, |
| 328 | 301 | Qt::CTRL | Qt::SHIFT | Qt::Key_L, |
| 329 | 302 | qApp, SLOT(toggleLogDialog())); |
| 303 | + addActionToQMenuAndActionHash(viewMenu, MenuOption::AudioNetworkStats, 0, | |
| 304 | + dialogsManager.data(), SLOT(audioStatsDetails())); | |
| 330 | 305 | addActionToQMenuAndActionHash(viewMenu, MenuOption::BandwidthDetails, 0, |
| 331 | 306 | dialogsManager.data(), SLOT(bandwidthDetails())); |
| 332 | 307 | addActionToQMenuAndActionHash(viewMenu, MenuOption::OctreeStats, 0, |
| @@ -377,6 +352,8 @@ Menu::Menu() { · 44 unmodified lines | ||
| 377 | 352 | addCheckableActionToQMenuAndActionHash(renderOptionsMenu, MenuOption::RenderTargetFramerateVSyncOn, 0, true, |
| 378 | 353 | qApp, SLOT(setVSyncEnabled())); |
| 379 | 354 | #endif |
| 355 | + addCheckableActionToQMenuAndActionHash(renderOptionsMenu, MenuOption::ThrottleFPSIfNotFocus, 0, false, | |
| 356 | + qApp, SLOT(setThrottleFPSEnabled())); | |
| 380 | 357 | } |
| 381 | 358 | |
| 382 | 359 | |
| @@ -393,7 +370,6 @@ Menu::Menu() { · 10 unmodified lines | ||
| 393 | 370 | 0, // QML Qt::Key_Asterisk, |
| 394 | 371 | true); |
| 395 | 372 | |
| 396 | − addCheckableActionToQMenuAndActionHash(renderOptionsMenu, MenuOption::Wireframe, Qt::ALT | Qt::Key_W, false); | |
| 397 | 373 | addActionToQMenuAndActionHash(renderOptionsMenu, MenuOption::LodTools, |
| 398 | 374 | 0, // QML Qt::SHIFT | Qt::Key_L, |
| 399 | 375 | dialogsManager.data(), SLOT(lodTools())); |
| @@ -441,8 +417,7 @@ Menu::Menu() { · 41 unmodified lines | ||
| 441 | 417 | #if defined(HAVE_FACESHIFT) || defined(HAVE_DDE) |
| 442 | 418 | faceTrackingMenu->addSeparator(); |
| 443 | 419 | addCheckableActionToQMenuAndActionHash(faceTrackingMenu, MenuOption::MuteFaceTracking, |
| 444 | − Qt::CTRL | Qt::SHIFT | Qt::Key_F, true, // DDE face tracking is on by default | |
| 445 | − qApp, SLOT(toggleFaceTrackerMute())); | |
| 420 | + Qt::CTRL | Qt::SHIFT | Qt::Key_F, true); // DDE face tracking is on by default | |
| 446 | 421 | addCheckableActionToQMenuAndActionHash(faceTrackingMenu, MenuOption::AutoMuteAudio, 0, false); |
| 447 | 422 | #endif |
| 448 | 423 | |
| @@ -581,15 +556,6 @@ Menu::Menu() { · 132 unmodified lines | ||
| 581 | 556 | audioScopeFramesGroup->addAction(fiftyFrames); |
| 582 | 557 | } |
| 583 | 558 | |
| 584 | − addCheckableActionToQMenuAndActionHash(audioDebugMenu, MenuOption::AudioStats, | |
| 585 | − Qt::CTRL | Qt::SHIFT | Qt::Key_A, | |
| 586 | − false); //, statsRenderer.data(), SLOT(toggle())); // TODO: convert to dialogbox | |
| 587 | − | |
| 588 | − addCheckableActionToQMenuAndActionHash(audioDebugMenu, MenuOption::AudioStatsShowInjectedStreams, | |
| 589 | − 0, | |
| 590 | − false); //, statsRenderer.data(), SLOT(toggleShowInjectedStreams)); // TODO: convert to dialogbox | |
| 591 | − | |
| 592 | − | |
| 593 | 559 | MenuWrapper* physicsOptionsMenu = developerMenu->addMenu("Physics"); |
| 594 | 560 | addCheckableActionToQMenuAndActionHash(physicsOptionsMenu, MenuOption::PhysicsShowOwned); |
| 595 | 561 | addCheckableActionToQMenuAndActionHash(physicsOptionsMenu, MenuOption::PhysicsShowHulls); |