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 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'components/package/contents') 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 -- cgit v1.2.3