From 73b2621624c87528ce776b74555ec98c56115661 Mon Sep 17 00:00:00 2001
From: Michael Bohlender <michael.bohlender@kdemail.net>
Date: Thu, 10 Mar 2016 12:41:52 +0100
Subject: remove Colorpalette.qml and change its use to the theme plugin

---
 components/mail/contents/ui/main.qml | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'components/mail/contents')

diff --git a/components/mail/contents/ui/main.qml b/components/mail/contents/ui/main.qml
index 8f2d3c52..181174d2 100644
--- a/components/mail/contents/ui/main.qml
+++ b/components/mail/contents/ui/main.qml
@@ -193,9 +193,5 @@ ApplicationWindow {
         id: unit
         property int size: 5
     }
-
-    KubeComponents.ColorPalette {
-        id: colorPalette
-    }
 }
 
-- 
cgit v1.2.3


From 181b39ddd0b3c027341b228ab51482ce4413d3bb Mon Sep 17 00:00:00 2001
From: Michael Bohlender <michael.bohlender@kdemail.net>
Date: Thu, 10 Mar 2016 13:54:07 +0100
Subject: add scaling unit to the theme plugin and use it instaed of the
 main.qml unit item

---
 components/mail/contents/ui/main.qml | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

(limited to 'components/mail/contents')

diff --git a/components/mail/contents/ui/main.qml b/components/mail/contents/ui/main.qml
index 181174d2..d864f2fc 100644
--- a/components/mail/contents/ui/main.qml
+++ b/components/mail/contents/ui/main.qml
@@ -22,6 +22,7 @@ import org.kde.plasma.components 2.0 as PlasmaComponents
 
 import org.kube.framework.actions 1.0 as KubeAction
 import org.kube.framework.settings 1.0 as KubeSettings
+import org.kube.framework.theme 1.0
 import org.kube.components 1.0 as KubeComponents
 
 ApplicationWindow {
@@ -154,17 +155,17 @@ ApplicationWindow {
 
         KubeComponents.FolderListView {
             id: folderListView
-            width: unit.size * 55
-            Layout.maximumWidth: unit.size * 150
-            Layout.minimumWidth: unit.size * 30
+            width: Unit.size * 55
+            Layout.maximumWidth: Unit.size * 150
+            Layout.minimumWidth: Unit.size * 30
         }
 
         KubeComponents.MailListView  {
             id: mailListView
             parentFolder: folderListView.currentFolder
-            width: unit.size * 80
-            Layout.maximumWidth: unit.size * 250
-            Layout.minimumWidth: unit.size * 50
+            width: Unit.size * 80
+            Layout.maximumWidth: Unit.size * 250
+            Layout.minimumWidth: Unit.size * 50
             focus: true
         }
 
@@ -187,11 +188,5 @@ ApplicationWindow {
 
         anchors.fill: parent
     }
-
-    //TODO find a better way to scale UI
-    Item {
-        id: unit
-        property int size: 5
-    }
 }
 
-- 
cgit v1.2.3