From 9f92fcc309b10d2dc40e639c753588b8a5646a95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kaj=20Gr=C3=B6nholm?= Date: Thu, 13 Dec 2018 15:22:44 +0200 Subject: Add missing shortcuts to viewer MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit CTRL+Q to quit and ESC to exit when in fullscreen mode. Task-number: QT3DS-2390 Change-Id: Ib307f9d906fc0857a3a49ea945762c6396c8a2b6 Reviewed-by: Tomi Korpipää Reviewed-by: Andy Nichols --- tools/q3dsviewer/q3dsmainwindow.cpp | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/tools/q3dsviewer/q3dsmainwindow.cpp b/tools/q3dsviewer/q3dsmainwindow.cpp index adcc5fa..6e16c21 100644 --- a/tools/q3dsviewer/q3dsmainwindow.cpp +++ b/tools/q3dsviewer/q3dsmainwindow.cpp @@ -116,6 +116,7 @@ Q3DStudioMainWindow::Q3DStudioMainWindow(Q3DSWindow *view, Q3DSRemoteDeploymentM fileMenu->addAction(reloadAction); addAction(reloadAction); QAction *exitAction = fileMenu->addAction(tr("E&xit"), this, &QWidget::close, QKeySequence::Quit); + exitAction->setShortcut(QKeySequence(tr("Ctrl+Q"))); addAction(exitAction); QMenu *viewMenu = menuBar()->addMenu(tr("&View")); @@ -333,6 +334,16 @@ Q3DStudioMainWindow::Q3DStudioMainWindow(Q3DSWindow *view, Q3DSRemoteDeploymentM addAction(fullscreenAction); viewMenu->addAction(fullscreenAction); + // Action for ESC fullscreen exit + QAction *exitFullscreenAction = new QAction(); + exitFullscreenAction->setShortcut(Qt::Key_Escape); + connect(exitFullscreenAction, &QAction::triggered, [this, fullscreenAction]() { + if (windowState().testFlag(Qt::WindowFullScreen)) { + fullscreenAction->trigger(); + } + }); + addAction(exitFullscreenAction); + QMenu *profileSubMenu = new QMenu(tr("&Profile and Debug")); QAction *showDebugView = profileSubMenu->addAction(tr("Toggle in-scene &debug view"), this, [view] { Q3DSEngine *engine = view->engine(); -- cgit v1.2.3