File 2001-fix-shortcuts.patch of Package spectacle

Overview Repositories Revisions Requests Users Attributes Meta

File 2001-fix-shortcuts.patch of Package spectacle (Revision 345e8ac6616d6afc63b5f907c5b067ec)

Currently displaying revision 345e8ac6616d6afc63b5f907c5b067ec , Show latest

diff --git a/src/Gui/CaptureWindow.cpp b/src/Gui/CaptureWindow.cpp
index a6c5ce76cbffc378fe0aece11daa62e7a1665d7f..58ed599dcfbcd1fa1c52197b3ba9ae3a0d1639fb 100644
--- a/src/Gui/CaptureWindow.cpp
+++ b/src/Gui/CaptureWindow.cpp
@@ -25,24 +25,6 @@ CaptureWindow::CaptureWindow(Mode mode, QScreen *screen, QQmlEngine *engine, QWi
     s_captureWindowInstances.append(this);
     s_isAnnotating = true;
 
-    // Set up shortcuts. We won't need to access these again and the memory will be managed by Qt.
-    new QShortcut(QKeySequence::Save, this, this, &CaptureWindow::save);
-    new QShortcut(QKeySequence::SaveAs, this, this, &CaptureWindow::saveAs);
-    new QShortcut(QKeySequence::Copy, this, this, &CaptureWindow::copyImage);
-    new QShortcut(QKeySequence::Print, this, this, &CaptureWindow::showPrintDialog);
-    new QShortcut(QKeySequence::Undo, this, SpectacleCore::instance(), []{
-        auto document = SpectacleCore::instance()->annotationDocument();
-        if (document && document->undoStackDepth() > 0) {
-            document->undo();
-        }
-    });
-    new QShortcut(QKeySequence::Redo, this, SpectacleCore::instance(), []{
-        auto document = SpectacleCore::instance()->annotationDocument();
-        if (document && document->redoStackDepth() > 0) {
-            document->redo();
-        }
-    });
-
     m_context->setContextObject(this); // Must be before QML is initialized
 
     setFlags({
@@ -89,6 +71,27 @@ CaptureWindow::CaptureWindow(Mode mode, QScreen *screen, QQmlEngine *engine, QWi
     if (auto rootItem = rootObject()) {
         rootItem->installEventFilter(selectionEditor);
     }
+
+    addShortcut(QKeySequence::Save, this, &CaptureWindow::save);
+    addShortcut(QKeySequence::SaveAs, this, &CaptureWindow::saveAs);
+    addShortcut(QKeySequence::Copy, this, &CaptureWindow::copyImage);
+    addShortcut(QKeySequence::Print, this, &CaptureWindow::showPrintDialog);
+    addShortcut(QKeySequence::Undo, this, [this]() {
+        if (isAnnotating()) {
+            auto document = SpectacleCore::instance()->annotationDocument();
+            if (document->undoStackDepth() > 0) {
+                document->undo();
+            }
+        }
+    });
+    addShortcut(QKeySequence::Redo, this, [this]() {
+        if (isAnnotating()) {
+            auto document = SpectacleCore::instance()->annotationDocument();
+            if (document->redoStackDepth() > 0) {
+                document->redo();
+            }
+        }
+    });
 }
 
 CaptureWindow::~CaptureWindow()
diff --git a/src/Gui/SpectacleWindow.cpp b/src/Gui/SpectacleWindow.cpp
index 4a6720e0f49e9852b463550721da7b6b1aa4b074..7006257d39401b4ab486d5aa643a9164bb236c9e 100644
--- a/src/Gui/SpectacleWindow.cpp
+++ b/src/Gui/SpectacleWindow.cpp
@@ -59,6 +59,13 @@ SpectacleWindow::SpectacleWindow(QQmlEngine *engine, QWindow *parent)
     // set up QML
     setResizeMode(QQuickView::SizeRootObjectToView);
     m_context->setContextProperty(u"contextWindow"_s, this);
+
+    addShortcut(QKeySequence::Cancel, QKeySequence::Close, QKeySequence::Quit, SpectacleCore::instance(), &SpectacleCore::cancelScreenshot);
+    addShortcut(QKeySequence::Preferences, this, &SpectacleWindow::showPreferencesDialog);
+    addShortcut(QKeySequence::New, this, []() {
+        SpectacleCore::instance()->takeNewScreenshot();
+    });
+    addShortcut(QKeySequence::HelpContents, HelpMenu::instance(), &HelpMenu::showAppHelp);
 }
 
 SpectacleWindow::~SpectacleWindow()
@@ -431,46 +438,4 @@ void SpectacleWindow::mousePressEvent(QMouseEvent *event)
     }
 }
 
-void SpectacleWindow::keyPressEvent(QKeyEvent *event)
-{
-    // Events need to be processed normally first for events to reach items
-    QQuickView::keyPressEvent(event);
-    if (event->isAccepted()) {
-        return;
-    }
-    m_pressedKeys = event->key() | event->modifiers();
-}
-
-void SpectacleWindow::keyReleaseEvent(QKeyEvent *event)
-{
-    // Events need to be processed normally first for events to reach items
-    QQuickView::keyReleaseEvent(event);
-    if (event->isAccepted()) {
-        return;
-    }
-    // Cancel defaults to Escape in QPlatformTheme.
-    // Handling this here fixes https://bugs.kde.org/show_bug.cgi?id=428478
-    if ((event->matches(QKeySequence::Quit)
-        || event->matches(QKeySequence::Close)
-        || event->matches(QKeySequence::Cancel))
-        // We need to check if these were pressed previously or else pressing escape
-        // in a dialog will quit spectacle when you release the escape key.
-        && m_pressedKeys == (event->key() | event->modifiers())
-    ) {
-        event->accept();
-        auto spectacleCore = SpectacleCore::instance();
-        spectacleCore->cancelScreenshot();
-    } else if (event->matches(QKeySequence::Preferences)) {
-        event->accept();
-        showPreferencesDialog();
-    } else if (event->matches(QKeySequence::New)) {
-        event->accept();
-        SpectacleCore::instance()->takeNewScreenshot();
-    } else if (event->matches(QKeySequence::HelpContents)) {
-        event->accept();
-        HelpMenu::instance()->showAppHelp();
-    }
-    m_pressedKeys = {};
-}
-
 #include "moc_SpectacleWindow.cpp"
diff --git a/src/Gui/SpectacleWindow.h b/src/Gui/SpectacleWindow.h
index fa84d8246c30ba8e01143b3b6c6cccab4d75aa09..62f23de55d22dbc3b49ed5aab79998869ce387ea 100644
--- a/src/Gui/SpectacleWindow.h
+++ b/src/Gui/SpectacleWindow.h
@@ -7,6 +7,7 @@
 #pragma once
 
 #include <QQuickView>
+#include <QShortcut>
 #include <QQmlContext>
 
 class SpectacleWindowPrivate;
@@ -78,6 +79,26 @@ public:
      */
     Q_INVOKABLE QString baseFileName(const QUrl &url) const;
 
+    template<typename Func>
+    void addShortcut(const QKeySequence &key, const QObject *context, Func func)
+    {
+        addShortcut(key, QKeySequence(), context, func);
+    }
+
+    template<typename Func>
+    void addShortcut(const QKeySequence &key1, const QKeySequence &key2, const QObject *context, Func func)
+    {
+        addShortcut(key1, key2, QKeySequence(), context, func);
+    }
+
+    template<typename Func>
+    void addShortcut(const QKeySequence &key1, const QKeySequence &key2, const QKeySequence &key3, const QObject *context, Func func)
+    {
+        QShortcut *shortcut = new QShortcut(this);
+        shortcut->setKeys(QList<QKeySequence>() << key1 << key2 << key3);
+        connect(shortcut, &QShortcut::activated, context, func);
+    }
+
 public Q_SLOTS:
     virtual void save();
     virtual void saveAs();
@@ -108,8 +129,6 @@ protected:
     void setSource(const QUrl &source, const QVariantMap &initialProperties);
 
     void mousePressEvent(QMouseEvent *event) override;
-    void keyPressEvent(QKeyEvent *event) override;
-    void keyReleaseEvent(QKeyEvent *event) override;
 
     static QList<SpectacleWindow *> s_spectacleWindowInstances;
     static bool s_synchronizingVisibility;
@@ -121,6 +140,4 @@ protected:
 
     const std::unique_ptr<QQmlContext> m_context;
     std::unique_ptr<QQmlComponent> m_component;
-
-    QKeySequence m_pressedKeys;
 };
diff --git a/src/Gui/ViewerWindow.cpp b/src/Gui/ViewerWindow.cpp
index d5ded3961d0eac3f00745d8033ab252d1835775f..2b4b7ec691c3c0b397966b6fc83074e067fd3757 100644
--- a/src/Gui/ViewerWindow.cpp
+++ b/src/Gui/ViewerWindow.cpp
@@ -32,24 +32,6 @@ ViewerWindow::ViewerWindow(Mode mode, QQmlEngine *engine, QWindow *parent)
     s_viewerWindowInstance = this;
     s_isAnnotating = false;
 
-    // Set up shortcuts. We won't need to access these again and the memory will be managed by Qt.
-    new QShortcut(QKeySequence::Save, this, this, &ViewerWindow::save);
-    new QShortcut(QKeySequence::SaveAs, this, this, &ViewerWindow::saveAs);
-    new QShortcut(QKeySequence::Copy, this, this, &ViewerWindow::copyImage);
-    new QShortcut(QKeySequence::Print, this, this, &ViewerWindow::showPrintDialog);
-    new QShortcut(QKeySequence::Undo, this, SpectacleCore::instance(), []{
-        auto document = SpectacleCore::instance()->annotationDocument();
-        if (document && document->undoStackDepth() > 0) {
-            document->undo();
-        }
-    });
-    new QShortcut(QKeySequence::Redo, this, SpectacleCore::instance(), []{
-        auto document = SpectacleCore::instance()->annotationDocument();
-        if (document && document->redoStackDepth() > 0) {
-            document->redo();
-        }
-    });
-
     m_context->setContextObject(this); // Must be before QML is initialized
 
     connect(ExportMenu::instance(), &ExportMenu::imageShared, this, &ViewerWindow::showImageSharedMessage);
@@ -58,6 +40,27 @@ ViewerWindow::ViewerWindow(Mode mode, QQmlEngine *engine, QWindow *parent)
     setResizeMode(QQuickView::SizeRootObjectToView);
     setMode(mode); // sets source and other stuff based on mode.
     m_oldWindowStates = windowStates();
+
+    addShortcut(QKeySequence::Save, this, &ViewerWindow::save);
+    addShortcut(QKeySequence::SaveAs, this, &ViewerWindow::saveAs);
+    addShortcut(QKeySequence::Copy, this, &ViewerWindow::copyImage);
+    addShortcut(QKeySequence::Print, this, &ViewerWindow::showPrintDialog);
+    addShortcut(QKeySequence::Undo, this, [this]() {
+        if (isAnnotating()) {
+            auto document = SpectacleCore::instance()->annotationDocument();
+            if (document->undoStackDepth() > 0) {
+                document->undo();
+            }
+        }
+    });
+    addShortcut(QKeySequence::Redo, this, [this]() {
+        if (isAnnotating()) {
+            auto document = SpectacleCore::instance()->annotationDocument();
+            if (document->redoStackDepth() > 0) {
+                document->redo();
+            }
+        }
+    });
 }
 
 ViewerWindow::~ViewerWindow()

Places

File 2001-fix-shortcuts.patch of Package spectacle (Revision 345e8ac6616d6afc63b5f907c5b067ec)

Places