Merge branch 'develop' into dev/mimetreeinterface

6 files changed, 11 insertions, 8 deletions

diff --git a/components/mail/contents/ui/main.qml b/components/mail/contents/ui/main.qml
index ef167bbe..279e280d 100644
--- a/components/mail/contents/ui/main.qml
+++ b/components/mail/contents/ui/main.qml
@@ -25,7 +25,6 @@ import org.kde.kirigami 1.0 as Kirigami
 import org.kube.framework.actions 1.0 as KubeAction
 import org.kube.framework.settings 1.0 as KubeSettings
 import org.kube.framework.domain 1.0 as KubeFramework
-import org.kube.framework.theme 1.0
 import org.kube.components 1.0 as KubeComponents
 
 ApplicationWindow {
diff --git a/components/package/contents/ui/FolderListView.qml b/components/package/contents/ui/FolderListView.qml
index bf4263c4..41f152de 100644
--- a/components/package/contents/ui/FolderListView.qml
+++ b/components/package/contents/ui/FolderListView.qml
@@ -24,7 +24,6 @@ import QtQuick.Layouts 1.1
 import org.kde.kirigami 1.0 as Kirigami
 
 import org.kube.framework.domain 1.0 as KubeFramework
-import org.kube.framework.theme 1.0
 
 Item {
     id: root
diff --git a/components/package/contents/ui/ListItem.qml b/components/package/contents/ui/ListItem.qml
index 0f3b7af9..165ac3ab 100644
--- a/components/package/contents/ui/ListItem.qml
+++ b/components/package/contents/ui/ListItem.qml
@@ -17,7 +17,6 @@
 */
 
 import QtQuick 2.4
-import org.kube.framework.theme 1.0
 
 Item {
     id: delegateRoot
diff --git a/components/package/contents/ui/MailListView.qml b/components/package/contents/ui/MailListView.qml
index ff71e43e..cda8bbda 100644
--- a/components/package/contents/ui/MailListView.qml
+++ b/components/package/contents/ui/MailListView.qml
@@ -24,7 +24,6 @@ import QtQml 2.2 as QtQml
 import org.kde.kirigami 1.0 as Kirigami
 
 import org.kube.framework.domain 1.0 as KubeFramework
-import org.kube.framework.theme 1.0
 
 Controls.ScrollView {
     id: root
@@ -127,6 +126,13 @@ Controls.ScrollView {
                             color: Kirigami.Theme.textColor
                         }
                     }
+                    Text {
+                        text: model.threadSize
+
+                        renderType: Text.NativeRendering
+                        font.weight: Font.Light
+                        color:  Kirigami.Theme.textColor
+                    }
                 }
             }
         }
diff --git a/components/package/contents/ui/Outbox.qml b/components/package/contents/ui/Outbox.qml
index 01501410..c7b1f7b0 100644
--- a/components/package/contents/ui/Outbox.qml
+++ b/components/package/contents/ui/Outbox.qml
@@ -39,7 +39,7 @@ ToolButton {
     Rectangle {
         id: dialog
 
-        property int modelCount: 5 //FIXME replace with actual model
+        property int modelCount: listView.count
 
         anchors {
             top: parent.bottom
@@ -68,7 +68,8 @@ ToolButton {
             ListView {
                 id: listView
 
-                model: 5
+                model: KubeFramework.OutboxModel {
+                }
 
                 delegate: Kirigami.AbstractListItem {
 
@@ -76,7 +77,7 @@ ToolButton {
 
                     Kirigami.Label {
                         anchors.centerIn: parent
-                        text: "Subjext subxetson"
+                        text: model.subject
                     }
                 }
             }
diff --git a/components/package/contents/ui/SingleMailView.qml b/components/package/contents/ui/SingleMailView.qml
index b06216dd..73dedc7e 100644
--- a/components/package/contents/ui/SingleMailView.qml
+++ b/components/package/contents/ui/SingleMailView.qml
@@ -24,7 +24,6 @@ import org.kde.kirigami 1.0 as Kirigami
 import QtQml 2.2 as QtQml
 
 import org.kube.framework.domain 1.0 as KubeFramework
-import org.kube.framework.theme 1.0
 
 Item {
     id: root