1 files changed, 127 insertions, 72 deletions

diff --git a/components/package/contents/ui/MailListView.qml b/components/package/contents/ui/MailListView.qml
index 68db1c43..6ec86aee 100644
--- a/components/package/contents/ui/MailListView.qml
+++ b/components/package/contents/ui/MailListView.qml
@@ -89,7 +89,7 @@ Item {
         }
     }
 
-        ListView {
+    ListView {
         id: listView
 
         anchors.top: toolbar.bottom
@@ -119,106 +119,161 @@ Item {
             parentFolder: root.parentFolder
         }
 
-        delegate: Kirigami.AbstractListItem {
-            id: mailListDelegate
+        delegate: Item {
+            id: origin
 
-            width: scrollbar.visible ? listView.width - scrollbar.width : listView.width
-            height: Kirigami.Units.gridUnit * 4.5
+            width: delegateRoot.width
+            height: delegateRoot.height
 
-            enabled: true
-            supportsMouseEvents: true
-
-            checked: listView.currentIndex == index
-            onClicked:  {
-                listView.currentIndex = model.index
+            QtQml.Binding {
+                target: root
+                property: "currentMail"
+                when: listView.currentIndex == index
+                value: model.domainObject
+            }
+            QtQml.Binding {
+                target: root
+                property: "isDraft"
+                when: listView.currentIndex == index
+                value: model.draft
             }
 
-            //Content
             Item {
-                width: parent.width
-                height: parent.height
-
-                QtQml.Binding {
-                    target: root
-                    property: "currentMail"
-                    when: listView.currentIndex == index
-                    value: model.domainObject
-                }
-                QtQml.Binding {
-                    target: root
-                    property: "isDraft"
-                    when: listView.currentIndex == index
-                    value: model.draft
+                id: delegateRoot
+
+                width: scrollbar.visible ? listView.width - scrollbar.width : listView.width
+                height: Kirigami.Units.gridUnit * 5
+
+                states: [
+                State {
+                    name: "dnd"
+                    when: mouseArea.drag.active
+
+                    PropertyChanges {target: mouseArea; cursorShape: Qt.ClosedHandCursor}
+                    PropertyChanges {target: delegateRoot; x: x; y:y}
+                    PropertyChanges {target: delegateRoot; parent: root}
+
+                    PropertyChanges {target: delegateRoot; opacity: 0.7}
+                    PropertyChanges {target: background; color: Kirigami.Theme.highlightColor}
+                    PropertyChanges {target: subject; color: Kirigami.Theme.highlightedTextColor}
+                    PropertyChanges {target: sender; color: Kirigami.Theme.highlightedTextColor}
+                    PropertyChanges {target: date; color: Kirigami.Theme.highlightedTextColor}
+                    PropertyChanges {target: threadCounter; color: Kirigami.Theme.highlightedTextColor}
+                },
+                State {
+                    name: "selected"
+                    when: listView.currentIndex == index && !mouseArea.drag.active
+
+                    PropertyChanges {target: background; color: Kirigami.Theme.highlightColor}
+                    PropertyChanges {target: subject; color: Kirigami.Theme.highlightedTextColor}
+                    PropertyChanges {target: sender; color: Kirigami.Theme.highlightedTextColor}
+                    PropertyChanges {target: date; color: Kirigami.Theme.highlightedTextColor}
+                    PropertyChanges {target: threadCounter; color: Kirigami.Theme.highlightedTextColor}
+                },
+                State {
+                    name: "hovered"
+                    when: mouseArea.containsMouse && !mouseArea.drag.active
+
+                    PropertyChanges {target: background; color: Kirigami.Theme.buttonHoverColor; opacity: 0.7}
+                    PropertyChanges {target: subject; color: Kirigami.Theme.highlightedTextColor}
+                    PropertyChanges {target: sender; color: Kirigami.Theme.highlightedTextColor}
+                    PropertyChanges {target: date; color: Kirigami.Theme.highlightedTextColor}
+                    PropertyChanges {target: threadCounter; color: Kirigami.Theme.highlightedTextColor}
                 }
+                ]
 
-                //TODO implement bulk action
-                //    Controls.CheckBox {
-                //        visible: mailListDelegate.containsMouse == true
-                //    }
+                Drag.active: mouseArea.drag.active
+                Drag.hotSpot.x: Kirigami.Units.gridUnit * 2
+                Drag.hotSpot.y: height / 2
 
-                Column {
-                    anchors {
-                        verticalCenter: parent.verticalCenter
-                        left: parent.left
-                        leftMargin: Kirigami.Units.largeSpacing
-                    }
+                MouseArea {
+                    id: mouseArea
 
-                    Text{
-                        text: model.subject
-                        color: mailListDelegate.checked ? Kirigami.Theme.highlightedTextColor : model.unread ? "#1d99f3" : Kirigami.Theme.textColor
+                    anchors.fill: parent
 
-                        maximumLineCount: 2
-                        width: mailListDelegate.width - Kirigami.Units.gridUnit * 3
-                        wrapMode: Text.WrapAnywhere
-                        elide: Text.ElideRight
-                    }
+                    hoverEnabled: true
+                    drag.target: parent
 
-                    Text {
-                        text: model.senderName
-                        font.italic: true
-                        color: mailListDelegate.checked ? Kirigami.Theme.highlightedTextColor : Kirigami.Theme.textColor
-                        width: mailListDelegate.width - Kirigami.Units.gridUnit * 3
-                        elide: Text.ElideRight
+                    onClicked: {
+                        listView.currentIndex = index
                     }
                 }
 
-                Text {
-                    anchors {
-                        right: parent.right
-                        bottom: parent.bottom
-                    }
-                    text: Qt.formatDateTime(model.date, "dd MMM yyyy")
-                    font.italic: true
-                    color: mailListDelegate.checked ? Kirigami.Theme.highlightedTextColor : Kirigami.Theme.disabledTextColor
-                    font.pointSize: 9
-                }
+                Rectangle {
+                    id: background
+
+                    anchors.fill: parent
+
+                    color: Kirigami.Theme.viewBackgroundColor
 
+                    border.color: Kirigami.Theme.backgroundColor
+                    border.width: 1
+                }
 
                 Item {
+                    id: content
+
                     anchors {
+                        top: parent.top
+                        bottom: parent.bottom
+                        left: parent.left
                         right: parent.right
+                        margins: Kirigami.Units.smallSpacing
                     }
 
-                    height: Kirigami.Units.gridUnit * 1.2
-                    width: height
-
-                    visible: !mailListDelegate.checked
+                    Column {
+                        anchors {
+                            verticalCenter: parent.verticalCenter
+                            left: parent.left
+                            leftMargin: Kirigami.Units.largeSpacing
+                        }
+
+                        Text{
+                            id: subject
+
+                            text: model.subject
+                            color: model.unread ? Kirigami.Theme.highlightColor : Kirigami.Theme.textColor
+
+                            maximumLineCount: 2
+                            width: content.width - Kirigami.Units.gridUnit * 3
+                            wrapMode: Text.WrapAnywhere
+                            elide: Text.ElideRight
+                        }
+
+                        Text {
+                            id: sender
+
+                            text: model.senderName
+                            font.italic: true
+                            color: Kirigami.Theme.textColor
+                            width: delegateRoot.width - Kirigami.Units.gridUnit * 3
+                            elide: Text.ElideRight
+                        }
+                    }
 
-                    Rectangle {
-                        anchors.fill: parent
+                    Text {
+                        id: date
 
-                        opacity: model.unread ? 1 :  0.5
-                        radius: 80
-                        color: model.unread ? Kirigami.Theme.highlightColor : Kirigami.Theme.disabledTextColor
+                        anchors {
+                            right: parent.right
+                            bottom: parent.bottom
+                        }
+                        text: Qt.formatDateTime(model.date, "dd MMM yyyy")
+                        font.italic: true
+                        color: Kirigami.Theme.disabledTextColor
+                        font.pointSize: 9
                     }
 
                     Text {
-                        anchors.centerIn: parent
+                        id: threadCounter
 
+                        anchors {
+                            right: parent.right
+                        }
                         text: model.threadSize
-                        color: Kirigami.Theme.highlightedTextColor
+                        color: model.unread ?  Kirigami.Theme.highlightColor  : Kirigami.Theme.disabledTextColor
+                        visible: model.threadSize > 1
                     }
-
                 }
             }
         }