Inline key event handler

mpvqc · Feb 1, 2024 · 7ae149b · 7ae149b
1 parent 982afb9
commit 7ae149b
Show file tree

Hide file tree

Showing 4 changed files with 69 additions and 415 deletions.
diff --git a/qml/table/MpvqcCommentTable.qml b/qml/table/MpvqcCommentTable.qml
@@ -18,8 +18,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 import QtQuick
+import QtQuick.Controls
 
 import pyobjects
+import shared
 
 
 FocusScope {
@@ -49,4 +51,26 @@ FocusScope {
         }
 
     }
+
+    Shortcut {
+        sequence: 'e'
+        autoRepeat: false
+
+        onActivated: root.newCommentMenu.popupMenu()
+    }
+
+    Shortcut {
+        sequence: 'f'
+        autoRepeat: false
+
+        onActivated: root.mpvqcApplication.toggleFullScreen()
+    }
+
+    Shortcut {
+        sequence: 'Esc'
+        autoRepeat: false
+        enabled: root.mpvqcApplication.fullscreen
+
+        onActivated: root.mpvqcApplication.disableFullScreen()
+    }
 }
diff --git a/qml/table/MpvqcTable.qml b/qml/table/MpvqcTable.qml
@@ -33,6 +33,10 @@ ListView {
     readonly property var mpvqcClipboardPyObject: mpvqcApplication.mpvqcClipboardPyObject
     readonly property var mpvqcKeyCommandGenerator: mpvqcApplication.mpvqcKeyCommandGenerator
 
+	property bool haveComments: root.mpvqcApplication.mpvqcCommentTable.count > 0
+    property bool currentlyEditing: root.mpvqcApplication.mpvqcCommentTable.editMode
+    property bool currentlyFullscreen: root.mpvqcApplication.fullscreen
+
     property bool editMode: false
 
     property var deleteCommentMessageBox: null
@@ -140,6 +144,19 @@ ListView {
         root.model.import_comments(comments)
     }
 
+    function _ignore(event: KeyEvent): bool {
+        const key = event.key
+        const modifiers = event.modifiers
+        return key === Qt.Key_Up
+          ||   key === Qt.Key_Down
+          || ( key === Qt.Key_Return && modifiers === Qt.NoModifier )
+          || ( key === Qt.Key_Escape && modifiers === Qt.NoModifier )
+          || ( key === Qt.Key_Delete && modifiers === Qt.NoModifier )
+          || ( key === Qt.Key_Backspace && modifiers === Qt.NoModifier )
+          || ( key === Qt.Key_F && modifiers === Qt.ControlModifier )
+          || ( key === Qt.Key_C && modifiers === Qt.ControlModifier )
+    }
+
     Connections {
         target: root.model
 
@@ -161,19 +178,40 @@ ListView {
         }
     }
 
-    MpvqcTableEventHandler {
-        id: _handler
+    Shortcut {
+        sequence: 'return'
+        autoRepeat: false
+        enabled: !currentlyFullscreen && haveComments && !currentlyEditing
 
-        mpvqcCommentTable: root
-        mpvqcApplication: root.mpvqcApplication
+        onActivated: root.startEditing()
+    }
+
+    Shortcut {
+        sequence: 'delete'
+        autoRepeat: false
+        enabled: !currentlyFullscreen && haveComments
+
+        onActivated: root._requestDeleteRow(root.currentIndex)
+    }
+
+    Shortcut {
+        sequence: 'backspace'
+        autoRepeat: false
+        enabled: !currentlyFullscreen && haveComments
+
+        onActivated: root._requestDeleteRow(root.currentIndex)
+    }
 
-        onDeleteCommentPressed: root._requestDeleteRow(root.currentIndex)
+    Shortcut {
+        sequence: 'ctrl+c'
+        autoRepeat: false
+        enabled: !currentlyFullscreen && haveComments && !currentlyEditing
 
-        onCopyToClipboardPressed: root._copyCurrentCommentToClipboard()
+        onActivated: root._copyCurrentCommentToClipboard()
     }
 
     Keys.onPressed: (event) => {
-        if (_handler.ignore(event))  {
+        if (root._ignore(event))  {
             return
         }
         const command = root.mpvqcKeyCommandGenerator.generateFrom(event)

diff --git a/qml/table/MpvqcTableEventHandler.qml b/qml/table/MpvqcTableEventHandler.qml