From 7692547fa0471175893b38fa5d6ed2faee460298 Mon Sep 17 00:00:00 2001
From: Christian Mollekopf <chrigi_1@fastmail.fm>
Date: Thu, 12 Jul 2018 16:07:54 +0200
Subject: Handle help via View.qml

---
 views/conversation/qml/View.qml | 34 ++++++++++++++++------------------
 1 file changed, 16 insertions(+), 18 deletions(-)

(limited to 'views/conversation/qml/View.qml')

diff --git a/views/conversation/qml/View.qml b/views/conversation/qml/View.qml
index 2a5e3d0c..7463d5e2 100644
--- a/views/conversation/qml/View.qml
+++ b/views/conversation/qml/View.qml
@@ -41,6 +41,21 @@ Kube.View {
         onMessageReceived: root.triggerSearch()
     }
 
+    helpViewComponent: Kube.HelpPopup {
+        ListModel {
+            ListElement { description: qsTr("Jump to next thread:"); shortcut: "j" }
+            ListElement { description: qsTr("Jump to previous thread:"); shortcut: "k" }
+            ListElement { description: qsTr("Jump to next message:"); shortcut: "n" }
+            ListElement { description: qsTr("Jump to previous message:"); shortcut: "p" }
+            ListElement { description: qsTr("Jump to next folder:"); shortcut: "f,n" }
+            ListElement { description: qsTr("Jump to previous previous folder:"); shortcut: "f,p" }
+            ListElement { description: qsTr("Compose new message:"); shortcut: "c" }
+            ListElement { description: qsTr("Reply to the currently focused message:"); shortcut: "r" }
+            ListElement { description: qsTr("Delete the currently focused message:"); shortcut: "d" }
+            ListElement { description: qsTr("Show this help text:"); shortcut: "?" }
+        }
+    }
+
     Shortcut {
         sequences: ['j']
         onActivated: Kube.Fabric.postMessage(Kube.Messages.selectNextConversation, {})
@@ -79,7 +94,7 @@ Kube.View {
     }
     Shortcut {
         sequence: "?"
-        onActivated: helpViewComponent.createObject(root).open()
+        onActivated: root.showHelp()
     }
 
 
@@ -203,21 +218,4 @@ Kube.View {
         }
     }
 
-    Component {
-        id: helpViewComponent
-        Kube.HelpPopup {
-            ListModel {
-                ListElement { description: qsTr("Jump to next thread:"); shortcut: "j" }
-                ListElement { description: qsTr("Jump to previous thread:"); shortcut: "k" }
-                ListElement { description: qsTr("Jump to next message:"); shortcut: "n" }
-                ListElement { description: qsTr("Jump to previous message:"); shortcut: "p" }
-                ListElement { description: qsTr("Jump to next folder:"); shortcut: "f,n" }
-                ListElement { description: qsTr("Jump to previous previous folder:"); shortcut: "f,p" }
-                ListElement { description: qsTr("Compose new message:"); shortcut: "c" }
-                ListElement { description: qsTr("Reply to the currently focused message:"); shortcut: "r" }
-                ListElement { description: qsTr("Delete the currently focused message:"); shortcut: "d" }
-                ListElement { description: qsTr("Show this help text:"); shortcut: "?" }
-            }
-        }
-    }
 }
-- 
cgit v1.2.3