summaryrefslogtreecommitdiffstats
path: root/framework/qml
diff options
context:
space:
mode:
authorChristian Mollekopf <chrigi_1@fastmail.fm>2017-04-24 21:51:24 +0200
committerChristian Mollekopf <chrigi_1@fastmail.fm>2017-04-24 21:51:24 +0200
commitb3223155b178427354b44f05167d0afba0926cbd (patch)
tree25021116a0f465a6973e36b668945080f3b9fc4b /framework/qml
parent4ba8c5b72fd7a3db6e593853c4669750dc6dd2a2 (diff)
downloadkube-b3223155b178427354b44f05167d0afba0926cbd.tar.gz
kube-b3223155b178427354b44f05167d0afba0926cbd.zip
Another bunch of controllers gone
Diffstat (limited to 'framework/qml')
-rw-r--r--framework/qml/AccountSwitcher.qml8
-rw-r--r--framework/qml/Messages.qml1
-rw-r--r--framework/qml/Outbox.qml18
3 files changed, 7 insertions, 20 deletions
diff --git a/framework/qml/AccountSwitcher.qml b/framework/qml/AccountSwitcher.qml
index 7a1e7592..a8151712 100644
--- a/framework/qml/AccountSwitcher.qml
+++ b/framework/qml/AccountSwitcher.qml
@@ -36,11 +36,6 @@ Controls.ToolButton {
36 width: parent.width 36 width: parent.width
37 iconName: Kube.Icons.menu_inverted 37 iconName: Kube.Icons.menu_inverted
38 38
39 Kube.FolderController {
40 id: folderController
41 accountId: accountId
42 }
43
44 Kube.AccountsModel { 39 Kube.AccountsModel {
45 id: accountsModel 40 id: accountsModel
46 } 41 }
@@ -74,9 +69,8 @@ Controls.ToolButton {
74 69
75 //iconName: "view-refresh" 70 //iconName: "view-refresh"
76 text: "Sync" 71 text: "Sync"
77 enabled: folderController.synchronizeAction.enabled
78 onClicked: { 72 onClicked: {
79 folderController.synchronizeAction.execute() 73 Kube.Fabric.postMessage(Kube.Messages.synchronize, {"accountId": accountSwitcher.accountId})
80 popup.close() 74 popup.close()
81 } 75 }
82 } 76 }
diff --git a/framework/qml/Messages.qml b/framework/qml/Messages.qml
index 1b384bfa..26a3ea3e 100644
--- a/framework/qml/Messages.qml
+++ b/framework/qml/Messages.qml
@@ -32,6 +32,7 @@ Item {
32 property string markAsUnread: "markAsUnread" 32 property string markAsUnread: "markAsUnread"
33 property string toggleImportant: "toggleImportant" 33 property string toggleImportant: "toggleImportant"
34 property string moveToFolder: "moveToFolder" 34 property string moveToFolder: "moveToFolder"
35 property string moveToDrafts: "moveToDrafts"
35 36
36 property string notification: "notification" 37 property string notification: "notification"
37 property string search: "search" 38 property string search: "search"
diff --git a/framework/qml/Outbox.qml b/framework/qml/Outbox.qml
index fc960667..46368294 100644
--- a/framework/qml/Outbox.qml
+++ b/framework/qml/Outbox.qml
@@ -30,9 +30,6 @@ Controls.ToolButton {
30 30
31 visible: outboxModel.count > 0 31 visible: outboxModel.count > 0
32 32
33 Kube.OutboxController {
34 id: outboxController
35 }
36 Kube.OutboxModel { 33 Kube.OutboxModel {
37 id: outboxModel 34 id: outboxModel
38 } 35 }
@@ -134,10 +131,7 @@ Controls.ToolButton {
134 iconName: Kube.Icons.moveToTrash 131 iconName: Kube.Icons.moveToTrash
135 text: qsTr("Delete Mail") 132 text: qsTr("Delete Mail")
136 tooltip: text 133 tooltip: text
137 onClicked: { 134 onClicked: Kube.Fabric.postMessage(Kube.Messages.moveToTrash, {"mail": model.domainObject})
138 outboxController.mail = model.domainObject
139 outboxController.moveToTrashAction.execute()
140 }
141 } 135 }
142 136
143 Controls.ToolButton { 137 Controls.ToolButton {
@@ -145,8 +139,9 @@ Controls.ToolButton {
145 text: qsTr("Edit") 139 text: qsTr("Edit")
146 tooltip: text 140 tooltip: text
147 onClicked: { 141 onClicked: {
148 outboxController.mail = model.domainObject 142 Kube.Fabric.postMessage(Kube.Messages.moveToDrafts, {"mail": model.domainObject})
149 outboxController.editAction.execute() 143 //TODO stage upon completion
144 //Kube.Fabric.postMessage(Kube.Messages.edit, {"mail": model.domainObject})
150 } 145 }
151 } 146 }
152 } 147 }
@@ -167,10 +162,7 @@ Controls.ToolButton {
167 visible: listView.count != 0 162 visible: listView.count != 0
168 163
169 text: qsTr("Send now") 164 text: qsTr("Send now")
170 enabled: outboxController.sendOutboxAction.enabled 165 onClicked: Kube.Fabric.postMessage(Kube.Messages.sendOutbox, {})
171 onClicked: {
172 outboxController.sendOutboxAction.execute()
173 }
174 } 166 }
175 167
176 Kube.Label { 168 Kube.Label {