5 files changed, 37 insertions, 1 deletions

diff --git a/components/package/contents/ui/SingleMailView.qml b/components/package/contents/ui/SingleMailView.qml
index 9b38b5be..5576391d 100644
--- a/components/package/contents/ui/SingleMailView.qml
+++ b/components/package/contents/ui/SingleMailView.qml
@@ -353,9 +353,24 @@ Item {
                             leftMargin: Kirigami.Units.gridUnit
                         }
 
+                        KubeFramework.MailController {
+                            id: mailController
+                            mail: model.mail
+                        }
+
                         text: "Delete Mail"
                         color: Kirigami.Theme.textColor
                         opacity: 0.5
+                        enabled: mailController.moveToTrashAction.enabled
+                        MouseArea {
+                            anchors.fill: parent
+                            enabled: mailController.moveToTrashAction.enabled
+                            onClicked: {
+                                if (mailController.moveToTrashAction.enabled) {
+                                    mailController.moveToTrashAction.execute();
+                                }
+                            }
+                        }
                     }
 
                     Controls1.ToolButton {
diff --git a/framework/domain/mailcontroller.cpp b/framework/domain/mailcontroller.cpp
index 4c5ae5c6..3d29ba22 100644
--- a/framework/domain/mailcontroller.cpp
+++ b/framework/domain/mailcontroller.cpp
@@ -32,6 +32,16 @@ MailController::MailController()
     QObject::connect(markAsReadAction(), &Kube::ControllerAction::triggered, this, &MailController::markAsRead);
     QObject::connect(moveToTrashAction(), &Kube::ControllerAction::triggered, this, &MailController::moveToTrash);
     QObject::connect(removeAction(), &Kube::ControllerAction::triggered, this, &MailController::remove);
+
+    QObject::connect(this, &MailController::mailChanged, &MailController::updateActions);
+    updateActions();
+}
+
+void MailController::updateActions()
+{
+    if (auto mail = getMail()) {
+        action_moveToTrash->setEnabled(!mail->getTrash());
+    }
 }
 
 void MailController::markAsRead()
diff --git a/framework/domain/mailcontroller.h b/framework/domain/mailcontroller.h
index 6c41f433..c20cf595 100644
--- a/framework/domain/mailcontroller.h
+++ b/framework/domain/mailcontroller.h
@@ -32,4 +32,6 @@ class MailController : public Kube::Controller
 
 public:
     explicit MailController();
+private slots:
+    void updateActions();
 };
diff --git a/framework/domain/maillistmodel.cpp b/framework/domain/maillistmodel.cpp
index 17b98c2b..950a2b8d 100644
--- a/framework/domain/maillistmodel.cpp
+++ b/framework/domain/maillistmodel.cpp
@@ -55,6 +55,7 @@ QHash< int, QByteArray > MailListModel::roleNames() const
     roles[MimeMessage] = "mimeMessage";
     roles[DomainObject] = "domainObject";
     roles[ThreadSize] = "threadSize";
+    roles[Mail] = "mail";
 
     return roles;
 }
@@ -97,6 +98,8 @@ QVariant MailListModel::data(const QModelIndex &idx, int role) const
             return mail->getProperty("importantCollected").toList().contains(true);
         case Draft:
             return mail->getDraft();
+        case Trash:
+            return mail->getTrash();
         case Id:
             return mail->identifier();
         case DomainObject:
@@ -105,6 +108,8 @@ QVariant MailListModel::data(const QModelIndex &idx, int role) const
             return mail->getMimeMessage();
         case ThreadSize:
             return mail->getProperty("count").toInt();
+        case Mail:
+            return QVariant::fromValue(mail);
     }
     return QSortFilterProxyModel::data(idx, role);
 }
@@ -142,6 +147,7 @@ void MailListModel::setParentFolder(const QVariant &parentFolder)
     query.request<Mail::Unread>();
     query.request<Mail::Important>();
     query.request<Mail::Draft>();
+    query.request<Mail::Trash>();
     query.request<Mail::Folder>();
     qWarning() << "Running folder query: " << folder->resourceInstanceIdentifier() << folder->identifier();
     runQuery(query);
@@ -170,6 +176,7 @@ void MailListModel::setMail(const QVariant &variant)
     query.request<Mail::Unread>();
     query.request<Mail::Important>();
     query.request<Mail::Draft>();
+    query.request<Mail::Trash>();
     query.request<Mail::MimeMessage>();
     qWarning() << "Running mail query: " << mail->resourceInstanceIdentifier() << mail->identifier();
     runQuery(query);
diff --git a/framework/domain/maillistmodel.h b/framework/domain/maillistmodel.h
index 22b97e11..71a0a6df 100644
--- a/framework/domain/maillistmodel.h
+++ b/framework/domain/maillistmodel.h
@@ -51,10 +51,12 @@ public:
         Unread,
         Important,
         Draft,
+        Trash,
         Id,
         MimeMessage,
         DomainObject,
-        ThreadSize
+        ThreadSize,
+        Mail
     };
 
     QHash<int, QByteArray> roleNames() const Q_DECL_OVERRIDE;