File 2001-fix-shortcuts.patch of Package spectacle

Overview Repositories Revisions Requests Users Attributes Meta

File 2001-fix-shortcuts.patch of Package spectacle (Revision 9e1084618d5d9f49e06a7699fe3f4273)

Currently displaying revision 9e1084618d5d9f49e06a7699fe3f4273 , Show latest

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1b735910a5cbcb0c60f6f8dffc3bdb95685d56f7..cd65b9b537c51b65a6abfd6e629204b8bc6bfba4 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -40,6 +40,7 @@ add_executable(spectacle
     Gui/SpectacleWindow.cpp
     Gui/SpectacleMenu.cpp
     Gui/ViewerWindow.cpp
+    Gui/Action.cpp
     Gui/Annotations/AnnotationDocument.cpp
     Gui/Annotations/AnnotationTool.cpp
     Gui/Annotations/AnnotationViewport.cpp
diff --git a/src/Gui/Action.cpp b/src/Gui/Action.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..c1454d986166da54fa34c166fd7040cf0ec4720b
--- /dev/null
+++ b/src/Gui/Action.cpp
@@ -0,0 +1,24 @@
+#include "Action.h"
+
+#include <QKeyEvent>
+
+Action::~Action()
+{
+    parent()->removeEventFilter(this);
+}
+
+bool Action::eventFilter(QObject *watched, QEvent *event)
+{
+    if (watched == parent() && event->type() == QEvent::KeyPress) {
+        const QKeyEvent *keyEvent = static_cast<const QKeyEvent *>(event);
+        for (const QKeySequence::StandardKey &shortcut : m_shortcuts) {
+            if (keyEvent->matches(shortcut)) {
+                Q_EMIT activated();
+
+                return true;
+            }
+        }
+    }
+
+    return QObject::eventFilter(watched, event);
+}
diff --git a/src/Gui/Action.h b/src/Gui/Action.h
new file mode 100644
index 0000000000000000000000000000000000000000..89fff9a70bab2586769b46891769b2b3793d08b4
--- /dev/null
+++ b/src/Gui/Action.h
@@ -0,0 +1,84 @@
+#ifndef ACTION_H
+#define ACTION_H
+
+#include <QKeySequence>
+#include <QObject>
+
+class Action : public QObject
+{
+    Q_OBJECT
+
+public:
+    template<typename Func>
+    explicit Action(QObject *parent, const QList<QKeySequence::StandardKey> &shortcuts, const typename QtPrivate::FunctionPointer<Func>::Object *receiver, Func slot, Qt::ConnectionType type = Qt::AutoConnection)
+        : QObject(parent)
+        , m_shortcuts(shortcuts)
+    {
+        parent->installEventFilter(this);
+
+        connect(this, &Action::activated, receiver, std::move(slot), type);
+    }
+
+    template<typename Func>
+    explicit Action(typename QtPrivate::FunctionPointer<Func>::Object *parent, const QList<QKeySequence::StandardKey> &shortcuts, Func slot, Qt::ConnectionType type = Qt::AutoConnection)
+        : QObject(parent)
+        , m_shortcuts(shortcuts)
+    {
+        parent->installEventFilter(this);
+
+        connect(this, &Action::activated, parent, std::move(slot), type);
+    }
+
+    template<typename Func>
+    explicit Action(QObject *parent, const QList<QKeySequence::StandardKey> &shortcuts, const QObject *context, Func slot, Qt::ConnectionType type = Qt::AutoConnection)
+        : QObject(parent)
+        , m_shortcuts(shortcuts)
+    {
+        parent->installEventFilter(this);
+
+        connect(this, &Action::activated, context, std::move(slot), type);
+    }
+
+    template<typename Func>
+    explicit Action(QObject *parent, QKeySequence::StandardKey shortcut, const typename QtPrivate::FunctionPointer<Func>::Object *receiver, Func slot, Qt::ConnectionType type = Qt::AutoConnection)
+        : Action(parent, QList<QKeySequence::StandardKey>() << shortcut, receiver, slot, type)
+    {}
+
+    template<typename Func>
+    explicit Action(typename QtPrivate::FunctionPointer<Func>::Object *parent, QKeySequence::StandardKey shortcut, Func slot, Qt::ConnectionType type = Qt::AutoConnection)
+        : Action(parent, QList<QKeySequence::StandardKey>() << shortcut, slot, type)
+    {}
+
+    template<typename Func>
+    explicit Action(QObject *parent, QKeySequence::StandardKey shortcut, const QObject *context, Func slot, Qt::ConnectionType type = Qt::AutoConnection)
+        : Action(parent, QList<QKeySequence::StandardKey>() << shortcut, context, slot, type)
+    {}
+
+    template<typename Func>
+    explicit Action(QObject *parent, const QList<QKeySequence::StandardKey> &shortcuts, Func slot)
+        : QObject(parent)
+        , m_shortcuts(shortcuts)
+    {
+        parent->installEventFilter(this);
+
+        connect(this, &Action::activated, std::move(slot));
+    }
+
+    template<typename Func>
+    explicit Action(QObject *parent, QKeySequence::StandardKey shortcut, Func slot)
+        : Action(parent, QList<QKeySequence::StandardKey>() << shortcut, slot)
+    {}
+
+    ~Action() override;
+
+Q_SIGNALS:
+    void activated();
+
+protected:
+    bool eventFilter(QObject *watched, QEvent *event) override;
+
+private:
+    const QList<QKeySequence::StandardKey> m_shortcuts;
+};
+
+#endif // ACTION_H
diff --git a/src/Gui/CaptureWindow.cpp b/src/Gui/CaptureWindow.cpp
index 7d3df41bf3f63ca9420001f493bf12f4cec88196..259a93ddf83b6389004b27984b7c679704c6b6c1 100644
--- a/src/Gui/CaptureWindow.cpp
+++ b/src/Gui/CaptureWindow.cpp
@@ -7,6 +7,7 @@
 
 #include "CaptureWindow.h"
 
+#include "Action.h"
 #include "Config.h"
 #include "SpectacleCore.h"
 #include "Gui/SelectionEditor.h"
@@ -70,6 +71,27 @@ CaptureWindow::CaptureWindow(Mode mode, QScreen *screen, QQmlEngine *engine, QWi
     if (auto rootItem = rootObject()) {
         rootItem->installEventFilter(selectionEditor);
     }
+
+    new Action(this, QKeySequence::Save, &CaptureWindow::save);
+    new Action(this, QKeySequence::SaveAs, &CaptureWindow::saveAs);
+    new Action(this, QKeySequence::Copy, &CaptureWindow::copyImage);
+    new Action(this, QKeySequence::Print, &CaptureWindow::showPrintDialog);
+    new Action(this, QKeySequence::Undo, [this]() {
+        if (isAnnotating()) {
+            auto document = SpectacleCore::instance()->annotationDocument();
+            if (document->undoStackDepth() > 0) {
+                document->undo();
+            }
+        }
+    });
+    new Action(this, QKeySequence::Redo, [this]() {
+        if (isAnnotating()) {
+            auto document = SpectacleCore::instance()->annotationDocument();
+            if (document->redoStackDepth() > 0) {
+                document->redo();
+            }
+        }
+    });
 }
 
 CaptureWindow::~CaptureWindow()
@@ -152,37 +174,6 @@ void CaptureWindow::mousePressEvent(QMouseEvent *event)
     SpectacleWindow::mousePressEvent(event);
 }
 
-void CaptureWindow::keyReleaseEvent(QKeyEvent *event)
-{
-    SpectacleWindow::keyReleaseEvent(event);
-    if (event->isAccepted()) {
-        return;
-    }
-    if (event->matches(QKeySequence::Save)) {
-        event->accept();
-        save();
-    } else if (event->matches(QKeySequence::SaveAs)) {
-        event->accept();
-        saveAs();
-    } else if (event->matches(QKeySequence::Copy)) {
-        event->accept();
-        copyImage();
-    } else if (event->matches(QKeySequence::Print)) {
-        event->accept();
-        showPrintDialog();
-    }
-    auto document = SpectacleCore::instance()->annotationDocument();
-    if (!event->isAccepted() && document) {
-        if (document->undoStackDepth() > 0 && event->matches(QKeySequence::Undo)) {
-            event->accept();
-            document->undo();
-        } else if (document->redoStackDepth() > 0 && event->matches(QKeySequence::Redo)) {
-            event->accept();
-            document->redo();
-        }
-    }
-}
-
 void CaptureWindow::showEvent(QShowEvent *event)
 {
     SpectacleWindow::showEvent(event);
diff --git a/src/Gui/CaptureWindow.h b/src/Gui/CaptureWindow.h
index c8c62f027d29eb0c54730b9e5209cf72e0ed6075..b5e87a8340297d774e73dfce771023f47ba0db90 100644
--- a/src/Gui/CaptureWindow.h
+++ b/src/Gui/CaptureWindow.h
@@ -44,7 +44,6 @@ Q_SIGNALS:
 
 protected:
     void mousePressEvent(QMouseEvent *event) override;
-    void keyReleaseEvent(QKeyEvent *event) override;
     void showEvent(QShowEvent *event) override;
 
 private:
diff --git a/src/Gui/SpectacleWindow.cpp b/src/Gui/SpectacleWindow.cpp
index df277b534b478a0be9008bffaa5d089080e161ab..4bcee2490737cbd5672694e7121ad91b0102b796 100644
--- a/src/Gui/SpectacleWindow.cpp
+++ b/src/Gui/SpectacleWindow.cpp
@@ -8,6 +8,7 @@
 
 #include "SpectacleWindow.h"
 
+#include "Action.h"
 #include "ExportManager.h"
 #include "SpectacleCore.h"
 #include "Geometry.h"
@@ -59,6 +60,15 @@ SpectacleWindow::SpectacleWindow(QQmlEngine *engine, QWindow *parent)
     // set up QML
     setResizeMode(QQuickView::SizeRootObjectToView);
     m_context->setContextProperty(u"contextWindow"_s, this);
+
+    new Action(this, { QKeySequence::Cancel, QKeySequence::Close, QKeySequence::Quit }, [this]() {
+        SpectacleCore::instance()->cancelScreenshot();
+    });
+    new Action(this, QKeySequence::Preferences, &SpectacleWindow::showPreferencesDialog);
+    new Action(this, QKeySequence::New, []() {
+        SpectacleCore::instance()->takeNewScreenshot();
+    });
+    new Action(this, QKeySequence::HelpContents, HelpMenu::instance(), &HelpMenu::showAppHelp);
 }
 
 SpectacleWindow::~SpectacleWindow()
@@ -431,46 +441,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..e9dff237d79913b657cc2eac5f3e024c443d4118 100644
--- a/src/Gui/SpectacleWindow.h
+++ b/src/Gui/SpectacleWindow.h
@@ -108,8 +108,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 +119,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 288b19411c1c3bd144c02883f1faff8566256a59..5c2af7333ee0b118d2894b020084f8f5b00f986d 100644
--- a/src/Gui/ViewerWindow.cpp
+++ b/src/Gui/ViewerWindow.cpp
@@ -7,6 +7,7 @@
 
 #include "ViewerWindow.h"
 
+#include "Action.h"
 #include "Config.h"
 #include "SpectacleCore.h"
 #include "Gui/ExportMenu.h"
@@ -39,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();
+
+    new Action(this, QKeySequence::Save, &ViewerWindow::save);
+    new Action(this, QKeySequence::SaveAs, &ViewerWindow::saveAs);
+    new Action(this, QKeySequence::Copy, &ViewerWindow::copyImage);
+    new Action(this, QKeySequence::Print, &ViewerWindow::showPrintDialog);
+    new Action(this, QKeySequence::Undo, [this]() {
+        if (isAnnotating()) {
+            auto document = SpectacleCore::instance()->annotationDocument();
+            if (document->undoStackDepth() > 0) {
+                document->undo();
+            }
+        }
+    });
+    new Action(this, QKeySequence::Redo, [this]() {
+        if (isAnnotating()) {
+            auto document = SpectacleCore::instance()->annotationDocument();
+            if (document->redoStackDepth() > 0) {
+                document->redo();
+            }
+        }
+    });
 }
 
 ViewerWindow::~ViewerWindow()
@@ -293,35 +315,4 @@ void ViewerWindow::resizeEvent(QResizeEvent *event)
     }
 }
 
-void ViewerWindow::keyReleaseEvent(QKeyEvent *event)
-{
-    SpectacleWindow::keyReleaseEvent(event);
-    if (event->isAccepted() || m_mode == Dialog) {
-        return;
-    }
-    if (event->matches(QKeySequence::Save)) {
-        event->accept();
-        save();
-    } else if (event->matches(QKeySequence::SaveAs)) {
-        event->accept();
-        saveAs();
-    } else if (event->matches(QKeySequence::Copy)) {
-        event->accept();
-        copyImage();
-    } else if (event->matches(QKeySequence::Print)) {
-        event->accept();
-        showPrintDialog();
-    }
-    auto document = SpectacleCore::instance()->annotationDocument();
-    if (!event->isAccepted() && document) {
-        if (document->undoStackDepth() > 0 && event->matches(QKeySequence::Undo)) {
-            event->accept();
-            document->undo();
-        } else if (document->redoStackDepth() > 0 && event->matches(QKeySequence::Redo)) {
-            event->accept();
-            document->redo();
-        }
-    }
-}
-
 #include "moc_ViewerWindow.cpp"
diff --git a/src/Gui/ViewerWindow.h b/src/Gui/ViewerWindow.h
index 1c405981842e54970add8991f30ecd6937068244..1f4fcc640fedb276e03f68a0a0377e275f3865ba 100644
--- a/src/Gui/ViewerWindow.h
+++ b/src/Gui/ViewerWindow.h
@@ -47,7 +47,6 @@ public:
 protected:
     bool event(QEvent *event) override;
     void resizeEvent(QResizeEvent *event) override;
-    void keyReleaseEvent(QKeyEvent *event) override;
 
 private:
     explicit ViewerWindow(Mode mode, QQmlEngine *engine, QWindow *parent = nullptr);

Places

File 2001-fix-shortcuts.patch of Package spectacle (Revision 9e1084618d5d9f49e06a7699fe3f4273)

Places