summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorLaszlo Agocs <laszlo.agocs@qt.io>2018-03-23 14:14:36 +0100
committerLaszlo Agocs <laszlo.agocs@qt.io>2018-03-26 14:40:02 +0000
commitafb14683bcf5f2d5107585beed72c4a22fbddf87 (patch)
tree68d19a4cb21bb4bf3456e8c31eb70b45c59c340d /tools
parent918df14006b9b3865d117cd4d4f0308e9ddfa9a2 (diff)
q3dsviewer: Move some items from View to Debug menu
Because the Debug menu will be hidden in production. Change-Id: I4703c895a00056bf6e9f1ff9c271a2fd7d59d260 Reviewed-by: Andy Nichols <andy.nichols@qt.io>
Diffstat (limited to 'tools')
-rw-r--r--tools/q3dsviewer/q3dsmainwindow.cpp42
1 files changed, 20 insertions, 22 deletions
diff --git a/tools/q3dsviewer/q3dsmainwindow.cpp b/tools/q3dsviewer/q3dsmainwindow.cpp
index 99333a8..0df6919 100644
--- a/tools/q3dsviewer/q3dsmainwindow.cpp
+++ b/tools/q3dsviewer/q3dsmainwindow.cpp
@@ -90,27 +90,6 @@ Q3DStudioMainWindow::Q3DStudioMainWindow(Q3DSWindow *view, QWidget *parent)
}
});
- QAction *renderOnDemand = viewMenu->addAction(tr("&Render on demand only"));
- renderOnDemand->setCheckable(true);
- renderOnDemand->setChecked(false);
- connect(renderOnDemand, &QAction::toggled, [=]() {
- view->engine()->setOnDemandRendering(renderOnDemand->isChecked());
- });
-
- QAction *pauseAnims = viewMenu->addAction(tr("&Pause animations"));
- pauseAnims->setCheckable(true);
- pauseAnims->setChecked(false);
- connect(pauseAnims, &QAction::toggled, [=]() {
- Q3DSSceneManager *sb = view->engine()->sceneManager();
- Q3DSSlidePlayer *player = sb->slidePlayer();
- if (player) {
- if (pauseAnims->isChecked())
- player->pause();
- else
- player->play();
- }
- });
-
viewMenu->addAction(tr("Toggle fullscree&n"), this, [this] {
Qt::WindowStates s = windowState();
s.setFlag(Qt::WindowFullScreen, !s.testFlag(Qt::WindowFullScreen));
@@ -120,7 +99,7 @@ Q3DStudioMainWindow::Q3DStudioMainWindow(Q3DSWindow *view, QWidget *parent)
viewMenu->addAction(tr("Toggle in-scene &debug view"), this, [view] {
Q3DSSceneManager *sm = view->engine()->sceneManager();
sm->setProfileUiVisible(!sm->isProfileUiVisible());
- });
+ }, Qt::Key_F10);
QMenu *debugMenu = menuBar()->addMenu(tr("&Debug"));
debugMenu->addAction(tr("&Object graph..."), [=]() {
@@ -188,6 +167,25 @@ Q3DStudioMainWindow::Q3DStudioMainWindow(Q3DSWindow *view, QWidget *parent)
}
});
});
+ QAction *pauseAnims = debugMenu->addAction(tr("&Pause animations"));
+ pauseAnims->setCheckable(true);
+ pauseAnims->setChecked(false);
+ connect(pauseAnims, &QAction::toggled, [=]() {
+ Q3DSSceneManager *sb = view->engine()->sceneManager();
+ Q3DSSlidePlayer *player = sb->slidePlayer();
+ if (player) {
+ if (pauseAnims->isChecked())
+ player->pause();
+ else
+ player->play();
+ }
+ });
+ QAction *renderOnDemand = debugMenu->addAction(tr("Render on &demand only"));
+ renderOnDemand->setCheckable(true);
+ renderOnDemand->setChecked(false);
+ connect(renderOnDemand, &QAction::toggled, [=]() {
+ view->engine()->setOnDemandRendering(renderOnDemand->isChecked());
+ });
QMenu *helpMenu = menuBar()->addMenu(tr("&Help"));
helpMenu->addAction(tr("&About"), this, [this]() {