From 9958a642b2c605b397be23b4ee6b02375c5d240e Mon Sep 17 00:00:00 2001 From: Christian Mollekopf Date: Mon, 2 Jan 2017 12:53:52 +0100 Subject: Conditionally remove/delete --- components/package/contents/ui/SingleMailView.qml | 11 +++++++---- framework/domain/maillistmodel.cpp | 1 + 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/components/package/contents/ui/SingleMailView.qml b/components/package/contents/ui/SingleMailView.qml index c2565cf1..b44659f9 100644 --- a/components/package/contents/ui/SingleMailView.qml +++ b/components/package/contents/ui/SingleMailView.qml @@ -358,15 +358,17 @@ Item { mail: model.mail } - text: "Delete Mail" + text: model.trash ? qsTr("Delete Mail") : qsTr("Move to trash") color: Kirigami.Theme.textColor opacity: 0.5 - enabled: mailController.moveToTrashAction.enabled + enabled: model.trash ? mailController.removeAction.enabled : mailController.moveToTrashAction.enabled MouseArea { anchors.fill: parent - enabled: mailController.moveToTrashAction.enabled + enabled: parent.enabled onClicked: { - if (mailController.moveToTrashAction.enabled) { + if (model.trash) { + mailController.removeAction.execute(); + } else { mailController.moveToTrashAction.execute(); } } @@ -374,6 +376,7 @@ Item { } Controls1.ToolButton { + visible: !model.trash anchors{ verticalCenter: parent.verticalCenter right: parent.right diff --git a/framework/domain/maillistmodel.cpp b/framework/domain/maillistmodel.cpp index 950a2b8d..0e76e0a8 100644 --- a/framework/domain/maillistmodel.cpp +++ b/framework/domain/maillistmodel.cpp @@ -51,6 +51,7 @@ QHash< int, QByteArray > MailListModel::roleNames() const roles[Unread] = "unread"; roles[Important] = "important"; roles[Draft] = "draft"; + roles[Trash] = "trash"; roles[Id] = "id"; roles[MimeMessage] = "mimeMessage"; roles[DomainObject] = "domainObject"; -- cgit v1.2.3