From ca49b148bcff3f273b45e5032bc5e7bb58f15104 Mon Sep 17 00:00:00 2001
From: Oliver Bock <oliver.bock@aei.mpg.de>
Date: Fri, 9 Sep 2011 20:47:00 +0200
Subject: [PATCH] Added second shortcut (ESC) to get out of fullscreen mode
---
src/pulsatingscience.cpp | 13 +++++++++++++
src/pulsatingscience.h | 1 +
2 files changed, 14 insertions(+)
diff --git a/src/pulsatingscience.cpp b/src/pulsatingscience.cpp
index cbadc58..b0a1fe7 100644
--- a/src/pulsatingscience.cpp
+++ b/src/pulsatingscience.cpp
@@ -63,6 +63,8 @@ PulsatingScience::PulsatingScience(QWidget *parent) : QMainWindow(parent)
m_menuBarShortcut->setEnabled(false);
m_fullscreenShortcut = new QShortcut(ui.actionFullscreen->shortcut(), this);
m_fullscreenShortcut->setEnabled(false);
+ m_fullscreenESCShortcut = new QShortcut(QKeySequence(Qt::Key_Escape), this);
+ m_fullscreenESCShortcut->setEnabled(false);
// register "hidden" demo mode shortcut for IYA2009 exhibition
m_hiddenShortcut = new QShortcut(Qt::CTRL + Qt::SHIFT + Qt::ALT + Qt::Key_D, this);
@@ -161,6 +163,11 @@ PulsatingScience::~PulsatingScience()
delete m_fullscreenShortcut;
}
+ if(m_fullscreenESCShortcut) {
+ m_fullscreenESCShortcut->disconnect();
+ delete m_fullscreenESCShortcut;
+ }
+
if(m_hiddenShortcut) {
m_hiddenShortcut->disconnect();
delete m_hiddenShortcut;
@@ -384,6 +391,9 @@ void PulsatingScience::on_actionFullscreen_toggled(bool checked)
// keep visibility setting
m_animControlVisible = true;
}
+
+ m_fullscreenESCShortcut->setEnabled(true);
+ connect(m_fullscreenESCShortcut, SIGNAL(activated()), this, SLOT(fullscreenToggled()));
}
else {
window()->setWindowState(windowState() & ~Qt::WindowFullScreen);
@@ -393,6 +403,9 @@ void PulsatingScience::on_actionFullscreen_toggled(bool checked)
#endif
if(m_statusBarVisible) ui.statusbar->show();
if(m_animControlVisible && !m_animControlFloating) ui.dockAnimControl->show();
+
+ m_fullscreenESCShortcut->disconnect();
+ m_fullscreenESCShortcut->setEnabled(false);
}
}
diff --git a/src/pulsatingscience.h b/src/pulsatingscience.h
index 3a8fc39..bfa89df 100644
--- a/src/pulsatingscience.h
+++ b/src/pulsatingscience.h
@@ -85,6 +85,7 @@ private:
QShortcut *m_rotationAxesShortcut;
QShortcut *m_menuBarShortcut;
QShortcut *m_fullscreenShortcut;
+ QShortcut *m_fullscreenESCShortcut;
QShortcut *m_hiddenShortcut;
bool m_permanentOrbits;
--
GitLab