diff options
author | Christian Mollekopf <chrigi_1@fastmail.fm> | 2018-06-28 09:02:48 +0200 |
---|---|---|
committer | Christian Mollekopf <chrigi_1@fastmail.fm> | 2018-06-28 10:45:51 +0200 |
commit | bd62b0c97bf7aa9f4c864367a159ea479c256bc1 (patch) | |
tree | 7ea317f2dc4e45b2da0b83e12dcae6144bfc7fbf /framework | |
parent | ef0756cdc8d94240da268b506f0e9f753abe7470 (diff) | |
download | kube-bd62b0c97bf7aa9f4c864367a159ea479c256bc1.tar.gz kube-bd62b0c97bf7aa9f4c864367a159ea479c256bc1.zip |
Fixed mark as important
Diffstat (limited to 'framework')
-rw-r--r-- | framework/qml/Icons.qml | 1 | ||||
-rw-r--r-- | framework/qml/MailListView.qml | 4 | ||||
-rw-r--r-- | framework/qml/Messages.qml | 2 | ||||
-rw-r--r-- | framework/src/sinkfabric.cpp | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/framework/qml/Icons.qml b/framework/qml/Icons.qml index 79a52046..a627fab1 100644 --- a/framework/qml/Icons.qml +++ b/framework/qml/Icons.qml | |||
@@ -36,6 +36,7 @@ Item { | |||
36 | property string markAsRead: "kuberead" | 36 | property string markAsRead: "kuberead" |
37 | property string markAsUnread: "kubeunread" | 37 | property string markAsUnread: "kubeunread" |
38 | property string markImportant: "kubeimportant" | 38 | property string markImportant: "kubeimportant" |
39 | property string markUnimportant: "kubeunimportant" | ||
39 | property string undo: "edit-undo-inverted" | 40 | property string undo: "edit-undo-inverted" |
40 | property string moveToTrash: "kubetrash" | 41 | property string moveToTrash: "kubetrash" |
41 | property string edit: "document-edit" | 42 | property string edit: "document-edit" |
diff --git a/framework/qml/MailListView.qml b/framework/qml/MailListView.qml index 46d3146a..d82571ec 100644 --- a/framework/qml/MailListView.qml +++ b/framework/qml/MailListView.qml | |||
@@ -295,9 +295,9 @@ FocusScope { | |||
295 | 295 | ||
296 | Kube.IconButton { | 296 | Kube.IconButton { |
297 | id: importantButton | 297 | id: importantButton |
298 | iconName: Kube.Icons.markImportant | 298 | iconName: model.important ? Kube.Icons.markImportant : Kube.Icons.markUnimportant |
299 | visible: !!model.mail | 299 | visible: !!model.mail |
300 | onClicked: Kube.Fabric.postMessage(Kube.Messages.toggleImportant, {"mail": model.mail, "important": model.important}) | 300 | onClicked: Kube.Fabric.postMessage(Kube.Messages.setImportant, {"mail": model.mail, "important": !model.important}) |
301 | activeFocusOnTab: false | 301 | activeFocusOnTab: false |
302 | } | 302 | } |
303 | 303 | ||
diff --git a/framework/qml/Messages.qml b/framework/qml/Messages.qml index f357b78b..d9734a0a 100644 --- a/framework/qml/Messages.qml +++ b/framework/qml/Messages.qml | |||
@@ -31,7 +31,7 @@ Item { | |||
31 | property string restoreFromTrash: "restoreFromTrash" | 31 | property string restoreFromTrash: "restoreFromTrash" |
32 | property string markAsRead: "markAsRead" | 32 | property string markAsRead: "markAsRead" |
33 | property string markAsUnread: "markAsUnread" | 33 | property string markAsUnread: "markAsUnread" |
34 | property string toggleImportant: "toggleImportant" | 34 | property string setImportant: "setImportant" |
35 | property string moveToFolder: "moveToFolder" | 35 | property string moveToFolder: "moveToFolder" |
36 | property string moveToDrafts: "moveToDrafts" | 36 | property string moveToDrafts: "moveToDrafts" |
37 | property string unlockKeyring: "unlockKeyring" | 37 | property string unlockKeyring: "unlockKeyring" |
diff --git a/framework/src/sinkfabric.cpp b/framework/src/sinkfabric.cpp index 916cc8fa..42e6d817 100644 --- a/framework/src/sinkfabric.cpp +++ b/framework/src/sinkfabric.cpp | |||
@@ -108,7 +108,7 @@ public: | |||
108 | Store::modify(*mail).exec(); | 108 | Store::modify(*mail).exec(); |
109 | } | 109 | } |
110 | } | 110 | } |
111 | if (id == "toggleImportant"/*Kube::Messages::synchronize*/) { | 111 | if (id == "setImportant"/*Kube::Messages::synchronize*/) { |
112 | if (auto mail = message["mail"].value<ApplicationDomain::Mail::Ptr>()) { | 112 | if (auto mail = message["mail"].value<ApplicationDomain::Mail::Ptr>()) { |
113 | mail->setImportant(message["important"].toBool()); | 113 | mail->setImportant(message["important"].toBool()); |
114 | Store::modify(*mail).exec(); | 114 | Store::modify(*mail).exec(); |