Ported more actions to the fabric

4 files changed, 31 insertions, 86 deletions

diff --git a/framework/qml/ConversationView.qml b/framework/qml/ConversationView.qml
index 85712a5a..d7d33c78 100644
--- a/framework/qml/ConversationView.qml
+++ b/framework/qml/ConversationView.qml
@@ -548,32 +548,12 @@ Rectangle {
                             rightMargin: Kube.Units.largeSpacing
                         }
 
-                        Kube.Context {
-                            id: mailcontext
-                            property variant mail
-                            property bool isDraft
-                            mail: model.mail
-                            isDraft: model.draft
-                        }
-
-                        Kube.Action {
-                            id: replyAction
-                            actionId: "org.kde.kube.actions.reply"
-                            context: maillistcontext
-                        }
-
-                        Kube.Action {
-                            id: editAction
-                            actionId: "org.kde.kube.actions.edit"
-                            context: maillistcontext
-                        }
-
                         iconName: model.draft ? Kube.Icons.edit : Kube.Icons.replyToSender
                         onClicked: {
                             if (model.draft) {
-                                editAction.execute()
+                                Kube.Fabric.postMessage(Kube.Messages.edit, {"mail": model.mail, "isDraft": model.draft})
                             } else {
-                                replyAction.execute()
+                                Kube.Fabric.postMessage(Kube.Messages.reply, {"mail": model.mail, "isDraft": model.draft})
                             }
                         }
                     }
diff --git a/framework/qml/FolderListView.qml b/framework/qml/FolderListView.qml
index 78d3c5d0..42841221 100644
--- a/framework/qml/FolderListView.qml
+++ b/framework/qml/FolderListView.qml
@@ -30,17 +30,6 @@ Rectangle {
 
     color: Kube.Colors.textColor
 
-    Kube.FolderController {
-        id: folderController
-    }
-    Kube.Listener {
-        id: controllerListener
-        filter: Kube.Messages.folderSelection
-        onMessageReceived: {
-            folderController.folder = message.folder
-        }
-    }
-
     TreeView {
         id: treeView
 
@@ -66,7 +55,7 @@ Rectangle {
             model.fetchMore(currentIndex)
             Kube.Fabric.postMessage(Kube.Messages.folderSelection, {"folder":model.data(currentIndex, Kube.FolderListModel.DomainObject),
                                                            "trash":model.data(currentIndex, Kube.FolderListModel.Trash)})
-            folderController.synchronizeAction.execute()
+            Kube.Fabric.postMessage(Kube.Messages.synchronize, {"folder":model.data(currentIndex, Kube.FolderListModel.DomainObject)})
             console.error(model.data)
         }
 
@@ -117,9 +106,7 @@ Rectangle {
                         visible: parent.containsDrag
                     }
                     onDropped: {
-                        folderController.folder = model.domainObject
-                        folderController.mail = drop.source.mail
-                        folderController.moveToFolderAction.execute()
+                        Kube.Fabric.postMessage(Kube.Messages.moveToFolder, {"mail": drop.source.mail, "folder":model.domainObject})
                         drop.accept(Qt.MoveAction)
                         drop.source.visible = false
                     }
diff --git a/framework/qml/MailListView.qml b/framework/qml/MailListView.qml
index 570b92f8..97a222a7 100644
--- a/framework/qml/MailListView.qml
+++ b/framework/qml/MailListView.qml
@@ -31,12 +31,15 @@ Item {
     property bool isImportant : false
     property bool isTrash : false
     property bool isUnread : false
+    property variant currentMail: null
+
+    onCurrentMailChanged: Kube.Fabric.postMessage(Kube.Messages.mailSelection, {"mail":currentMail})
 
     Kube.Listener {
         filter: Kube.Messages.folderSelection
         onMessageReceived: {
             parentFolder = message.folder
-            Kube.Fabric.postMessage(Kube.Messages.mailSelection, {"mail":null})
+            currentMail = null
         }
     }
 
@@ -47,35 +50,10 @@ Item {
         }
     }
 
-    Kube.MailController {
-        id: mailController
-        unread: root.isUnread
-        trash: root.isTrash
-        important: root.isImportant
-        draft: root.isDraft
-        operateOnThreads: mailListModel.isThreaded
-    }
-
-    Kube.Listener {
-        id: controllerListener
-        filter: Kube.Messages.mailSelection
-        onMessageReceived: {
-            mailController.mail = message.mail
-        }
-    }
-
     Shortcut {
         sequence: StandardKey.Delete
-        onActivated: mailController.moveToTrashAction.execute()
-        enabled: mailController.moveToTrashAction.enabled
-    }
-    Shortcut {
-        sequence: StandardKey.MoveToNextLine
-        onActivated: root.currentIndex++
-    }
-    Shortcut {
-        sequence: StandardKey.MoveToPreviousLine
-        onActivated: root.currentIndex--
+        enabled: isTrash
+        onActivated: Kube.Fabric.postMessage(Kube.Messages.moveToTrash, {"mail":currentMail})
     }
 
     Kube.Label {
@@ -106,7 +84,7 @@ Item {
         //END keyboard nav
 
         onCurrentItemChanged: {
-            Kube.Fabric.postMessage(Kube.Messages.mailSelection, {"mail":currentItem.currentData.mail})
+            root.currentMail = currentItem.currentData.mail;
             root.isDraft = currentItem.currentData.draft;
             root.isTrash = currentItem.currentData.trash;
             root.isImportant = currentItem.currentData.important;
@@ -286,50 +264,40 @@ Item {
                     Kube.Button {
                         id: readButton
                         text: "r"
-                        enabled: mailController.markAsReadAction.enabled
                         visible: enabled
-                        onClicked: {
-                            mailController.markAsReadAction.execute()
-                        }
+                        enabled: model.unread
+                        onClicked: Kube.Fabric.postMessage(Kube.Messages.markAsRead, {"mail": model.mail})
                     }
                     Kube.Button {
                         id: unreadButton
                         text: "u"
-                        enabled: mailController.markAsUnreadAction.enabled
                         visible: enabled
-                        onClicked: {
-                            mailController.markAsUnreadAction.execute()
-                        }
+                        enabled: !model.unread
+                        onClicked: Kube.Fabric.postMessage(Kube.Messages.markAsUnread, {"mail": model.mail})
                     }
 
                     Kube.Button {
                         id: importantButton
                         text: "i"
-                        enabled: mailController.toggleImportantAction.enabled
                         visible: enabled
-                        onClicked: {
-                            mailController.toggleImportantAction.execute()
-                        }
+                        enabled: !!model.mail
+                        onClicked: Kube.Fabric.postMessage(Kube.Messages.toggleImportant, {"mail": model.mail, "important": model.important})
                     }
 
                     Kube.Button {
                         id: deleteButton
                         text: "d"
-                        enabled: mailController.moveToTrashAction.enabled
                         visible: enabled
-                        onClicked: {
-                            mailController.moveToTrashAction.execute()
-                        }
+                        enabled: !!model.mail
+                        onClicked: Kube.Fabric.postMessage(Kube.Messages.moveToTrash, {"mail": model.mail})
                     }
 
                     Kube.Button {
                         id: restoreButton
                         text: "re"
-                        enabled: mailController.restoreFromTrashAction.enabled
                         visible: enabled
-                        onClicked: {
-                            mailController.restoreFromTrashAction.execute()
-                        }
+                        enabled: !!model.trash
+                        onClicked: Kube.Fabric.postMessage(Kube.Messages.restoreFromTrash, {"mail": model.mail})
                     }
                 }
             }
diff --git a/framework/qml/Messages.qml b/framework/qml/Messages.qml
index b4b170ec..1b384bfa 100644
--- a/framework/qml/Messages.qml
+++ b/framework/qml/Messages.qml
@@ -27,6 +27,16 @@ Item {
 
     //Actions
     property string moveToTrash: "moveToTrash"
+    property string restoreFromTrash: "restoreFromTrash"
+    property string markAsRead: "markAsRead"
+    property string markAsUnread: "markAsUnread"
+    property string toggleImportant: "toggleImportant"
+    property string moveToFolder: "moveToFolder"
+
+    property string notification: "notification"
     property string search: "search"
+    property string synchronize: "synchronize"
+    property string reply: "reply"
+    property string edit: "edit"
 }