Some vim style keyboard navigation.

If nothing else it works as an example how we have to differentiate
between shortcuts and keyboard navigation (one is global to some extent,
the other is only when having focus), and shows that we'll need some
place to consolidate that configuration.

3 files changed, 34 insertions, 16 deletions

diff --git a/framework/qml/ConversationListView.qml b/framework/qml/ConversationListView.qml
index dcb5e3a4..2f5c5c32 100644
--- a/framework/qml/ConversationListView.qml
+++ b/framework/qml/ConversationListView.qml
@@ -60,6 +60,14 @@ FocusScope {
         setCurrentItem()
     }
 
+    function incrementCurrentIndex() {
+        flickable.incrementCurrentIndex()
+    }
+
+    function decrementCurrentIndex() {
+        flickable.decrementCurrentIndex()
+    }
+
     Flickable {
         id: flickable
         anchors.fill: parent
@@ -116,21 +124,13 @@ FocusScope {
             if (currentIndex < repeater.count - 1) {
                 currentIndex = currentIndex + 1
             }
+            scrollToIndex(currentIndex)
         }
 
         function decrementCurrentIndex() {
             if (currentIndex > 0) {
                 currentIndex = currentIndex - 1
             }
-        }
-
-        Keys.onDownPressed: {
-            incrementCurrentIndex()
-            scrollToIndex(currentIndex)
-        }
-
-        Keys.onUpPressed: {
-            decrementCurrentIndex()
             scrollToIndex(currentIndex)
         }
 
diff --git a/framework/qml/ConversationView.qml b/framework/qml/ConversationView.qml
index 0fd76f8f..4aa2b2c0 100644
--- a/framework/qml/ConversationView.qml
+++ b/framework/qml/ConversationView.qml
@@ -60,6 +60,18 @@ FocusScope {
                 mail: root.mail
             }
 
+            Keys.onPressed: {
+                if (event.text == "j" || event.matches(StandardKey.MoveToNextLine)) {
+                    listView.incrementCurrentIndex()
+                } else if (event.text == "k" || event.matches(StandardKey.MoveToPreviousLine)) {
+                    listView.decrementCurrentIndex()
+                } else if (event.text == "d") {
+                   //Not implemented as a shortcut because we want it only to apply if we have the focus
+                   Kube.Fabric.postMessage(Kube.Messages.moveToTrash, {"mail": listView.currentItem.currentData.mail})
+                }
+            }
+
+
             delegate: FocusScope {
                 id: delegateRoot
 
@@ -77,6 +89,7 @@ FocusScope {
 
                 height: sheet.height + Kube.Units.gridUnit
                 width: listView.width
+                //FIXME breaks keyboard navigation because we don't jump over invisible items
                 visible: !((root.hideTrash && model.trash) || (root.hideNonTrash && !model.trash))
 
                 MouseArea {
diff --git a/framework/qml/MailListView.qml b/framework/qml/MailListView.qml
index 55a3aaff..eb124102 100644
--- a/framework/qml/MailListView.qml
+++ b/framework/qml/MailListView.qml
@@ -16,7 +16,7 @@
   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
-import QtQuick 2.7
+import QtQuick 2.9
 import QtQuick.Controls 2.0
 import QtQuick.Controls 1.4 as Controls
 import QtQuick.Layouts 1.1
@@ -48,7 +48,7 @@ FocusScope {
     }
 
     Shortcut {
-        sequence: StandardKey.Delete
+        sequences: [StandardKey.Delete]
         enabled: !isTrash
         onActivated: Kube.Fabric.postMessage(Kube.Messages.moveToTrash, {"mail":currentMail})
     }
@@ -121,12 +121,17 @@ FocusScope {
                 }
             }
 
-            Keys.onDownPressed: {
-                incrementCurrentIndex()
-            }
-            Keys.onUpPressed: {
-                decrementCurrentIndex()
+            Keys.onPressed: {
+                if (event.text == "j" || event.matches(StandardKey.MoveToNextLine)) {
+                    incrementCurrentIndex()
+                } else if (event.text == "k" || event.matches(StandardKey.MoveToPreviousLine)) {
+                    decrementCurrentIndex()
+                } else if (event.text == "d") {
+                    //Not implemented as a shortcut because we want it only to apply if we have the focus
+                    Kube.Fabric.postMessage(Kube.Messages.moveToTrash, {"mail": root.currentMail})
+                }
             }
+
             //END keyboard nav
 
             onCurrentItemChanged: {