Merge branch 'develop' of git://anongit.kde.org/kube into develop

10 files changed, 41 insertions, 71 deletions

diff --git a/components/mail/contents/ui/main.qml b/components/mail/contents/ui/main.qml
index 8f2d3c52..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,15 +188,5 @@ ApplicationWindow {
 
         anchors.fill: parent
     }
-
-    //TODO find a better way to scale UI
-    Item {
-        id: unit
-        property int size: 5
-    }
-
-    KubeComponents.ColorPalette {
-        id: colorPalette
-    }
 }
 
diff --git a/components/package/contents/ui/ColorPalette.qml b/components/package/contents/ui/ColorPalette.qml
deleted file mode 100644
index db85cac6..00000000
--- a/components/package/contents/ui/ColorPalette.qml
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (C) 2015 Michael Bohlender <michael.bohlender@kdemail.net>
- *
- *   This program is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, see <http://www.gnu.org/licenses/>.
- */
-
-import QtQuick 2.4
-
-//TODO probably expose it from the Cpp side
-Item {
-    property string background: "#fcfcfc"
-    property string selected: "#3daee9"
-    property string read: "#232629"
-    property string border: "#232629"
-}
\ No newline at end of file
diff --git a/components/package/contents/ui/Composer.qml b/components/package/contents/ui/Composer.qml
index 01991b67..c16bf582 100644
--- a/components/package/contents/ui/Composer.qml
+++ b/components/package/contents/ui/Composer.qml
@@ -97,7 +97,7 @@ Item {
                     }
                 }
 
-                PlasmaComponents.Button {
+                Button {
                     id: ccButton
 
                     text: "Cc"
@@ -108,7 +108,7 @@ Item {
                     }
                 }
 
-                PlasmaComponents.Button {
+                Button {
                     id: bccButton
 
                     text: "Bcc"
@@ -181,7 +181,7 @@ Item {
 
             height: subject.height * 1.5
 
-            PlasmaComponents.Button {
+            Button {
 
                 anchors {
                     bottom: parent.bottom
@@ -194,7 +194,7 @@ Item {
                 }
             }
 
-            PlasmaComponents.Button {
+            Button {
 
                 anchors {
                     bottom: parent.bottom
@@ -217,7 +217,7 @@ Item {
 
                 model: composer.attachments
 
-                delegate: PlasmaComponents.Label {
+                delegate: Label {
                     id: name
 
                     text: modelData
diff --git a/components/package/contents/ui/FocusComposer.qml b/components/package/contents/ui/FocusComposer.qml
index 8ec01cc9..ab04dbed 100644
--- a/components/package/contents/ui/FocusComposer.qml
+++ b/components/package/contents/ui/FocusComposer.qml
@@ -19,13 +19,15 @@ import QtQuick 2.4
 import QtQuick.Controls 1.4
 import QtQuick.Layouts 1.1
 
+import org.kube.framework.theme 1.0
+
 Rectangle {
     id: root
     property variant originalMessage
 
     visible: false
 
-    color: colorPalette.border
+    color: ColorPalette.border
 
     opacity: 0.9
 
@@ -43,7 +45,7 @@ Rectangle {
         height: root.height * 0.8
         width: root.width * 0.8
 
-        color: colorPalette.background
+        color: ColorPalette.background
 
         MouseArea {
             anchors.fill: parent
@@ -53,7 +55,7 @@ Rectangle {
 
             anchors {
                 fill: parent
-                margins: unit.size * 3
+                margins: Unit.size * 3
             }
 
             Composer {
@@ -78,4 +80,4 @@ Rectangle {
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/components/package/contents/ui/FolderListView.qml b/components/package/contents/ui/FolderListView.qml
index d78531a2..fafc1623 100644
--- a/components/package/contents/ui/FolderListView.qml
+++ b/components/package/contents/ui/FolderListView.qml
@@ -24,6 +24,7 @@ import org.kde.plasma.core 2.0 as PlasmaCore
 import org.kde.plasma.components 2.0 as PlasmaComponents
 
 import org.kube.framework.domain 1.0 as KubeFramework
+import org.kube.framework.theme 1.0
 
 Item {
     id: root
@@ -34,7 +35,7 @@ Item {
         id: searchBox
 
         width: root.width
-        height: unit.size * 10
+        height: Unit.size * 10
 
         TextField {
             anchors. centerIn: parent
@@ -68,7 +69,7 @@ Item {
         style: TreeViewStyle {
             activateItemOnSingleClick: true
             rowDelegate: Rectangle {
-                height: unit.size * 10
+                height: Unit.size * 10
                 color: "transparent"
             }
             itemDelegate: Rectangle {
@@ -81,7 +82,7 @@ Item {
                     anchors {
                         verticalCenter: parent.verticalCenter
                         left: parent.left
-                        leftMargin: unit.size * 3
+                        leftMargin: Unit.size * 3
                     }
                     source: model.icon
                 }
@@ -89,7 +90,7 @@ Item {
                     anchors {
                         verticalCenter: parent.verticalCenter
                         left: iconItem.right
-                        leftMargin: unit.size * 3
+                        leftMargin: Unit.size * 3
                     }
                     renderType: Text.NativeRendering
                     text: styleData.value
diff --git a/components/package/contents/ui/ListItem.qml b/components/package/contents/ui/ListItem.qml
index 5396645d..bea3c11b 100644
--- a/components/package/contents/ui/ListItem.qml
+++ b/components/package/contents/ui/ListItem.qml
@@ -16,13 +16,14 @@
  */
 
 import QtQuick 2.4
+import org.kube.framework.theme 1.0
 
 Item {
     id: delegateRoot
 
     readonly property bool isCurrentItem: ListView.isCurrentItem
 
-    height: unit.width * 25
+    height: Unit.width * 25
     width: parent.width
 
     MouseArea {
@@ -60,4 +61,4 @@ Item {
             opacity: 0.2
         }
     }
-}
\ No newline at end of file
+}
diff --git a/components/package/contents/ui/MailListView.qml b/components/package/contents/ui/MailListView.qml
index 8b612c52..e7fc634f 100644
--- a/components/package/contents/ui/MailListView.qml
+++ b/components/package/contents/ui/MailListView.qml
@@ -24,6 +24,7 @@ import QtQml 2.2
 import org.kde.plasma.components 2.0 as PlasmaComponents
 
 import org.kube.framework.domain 1.0 as KubeFramework
+import org.kube.framework.theme 1.0
 
 ScrollView {
     id: root
@@ -47,7 +48,7 @@ ScrollView {
 
         delegate: PlasmaComponents.ListItem {
             width: listView.width
-            height: unit.size * 12
+            height: Unit.size * 12
 
             enabled: true
             checked: listView.currentIndex == index
@@ -72,7 +73,6 @@ ScrollView {
 
                 anchors.fill: parent
 
-                // color: colorPalette.read
                 color: "steelblue"
                 opacity: 0.1
 
@@ -85,10 +85,10 @@ ScrollView {
                 anchors {
                     verticalCenter: parent.verticalCenter
                     left: parent.left
-                    leftMargin: unit.size * 2
+                    leftMargin: Unit.size * 2
                 }
 
-                height: unit.size * 9
+                height: Unit.size * 9
                 width: height
 
                 name: model.senderName
@@ -100,7 +100,7 @@ ScrollView {
                 anchors {
                     top: avatar.top
                     left: avatar.right
-                    leftMargin: unit.size * 3
+                    leftMargin: Unit.size * 3
                 }
 
                 text: model.senderName
@@ -115,9 +115,9 @@ ScrollView {
             //     anchors {
             //         top: avatar.top
             //         left: senderName.right
-            //         leftMargin: unit.size
+            //         leftMargin: Unit.size
             //         right: date.left
-            //         rightMargin: unit.size
+            //         rightMargin: Unit.size
             //     }
             //
             //     text: "(" + model.sender +")"
@@ -131,7 +131,7 @@ ScrollView {
                 anchors {
                     top: avatar.top
                     right: parent.right
-                    rightMargin: unit.size * 2
+                    rightMargin: Unit.size * 2
                 }
 
                 text: Qt.formatDateTime(model.date)
@@ -145,7 +145,7 @@ ScrollView {
                 anchors {
                     bottom: avatar.bottom
                     left: avatar.right
-                    leftMargin: unit.size * 3
+                    leftMargin: Unit.size * 3
                 }
 
                 text: model.subject
diff --git a/components/package/contents/ui/Settings.qml b/components/package/contents/ui/Settings.qml
index 1f5fc972..8da372e7 100644
--- a/components/package/contents/ui/Settings.qml
+++ b/components/package/contents/ui/Settings.qml
@@ -23,13 +23,14 @@ import org.kde.plasma.core 2.0 as PlasmaCore
 
 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
 
 Rectangle {
     id: root
 
     visible: false
 
-    color: colorPalette.border
+    color: ColorPalette.border
 
     opacity: 0.9
 
@@ -47,7 +48,7 @@ Rectangle {
         height: root.height * 0.8
         width: root.width * 0.8
 
-        color: colorPalette.background
+        color: ColorPalette.background
 
         MouseArea {
             anchors.fill: parent
@@ -78,7 +79,7 @@ Rectangle {
                         anchors {
                             verticalCenter: parent.verticalCenter
                             left: parent.left
-                            // leftMargin: unit.size * 3
+                            // leftMargin: Unit.size * 3
                         }
                         source: accountFactory.icon
                     }
diff --git a/components/package/contents/ui/SingleMailView.qml b/components/package/contents/ui/SingleMailView.qml
index ff48a9d3..4b801a89 100644
--- a/components/package/contents/ui/SingleMailView.qml
+++ b/components/package/contents/ui/SingleMailView.qml
@@ -20,6 +20,7 @@ import QtQuick.Controls 1.3
 import QtQuick.Layouts 1.1
 
 import org.kube.framework.domain 1.0 as KubeFramework
+import org.kube.framework.theme 1.0
 
 Item {
     id: root
@@ -30,7 +31,7 @@ Item {
 
         anchors.fill: parent
 
-        color: colorPalette.background
+        color: ColorPalette.background
     }
 
     Repeater {
diff --git a/components/qmldir b/components/qmldir
index 204beff8..e9a70bc5 100644
--- a/components/qmldir
+++ b/components/qmldir
@@ -1,6 +1,5 @@
 module org.kube.components
 
-ColorPalette 1.0 ColorPalette.qml
 FocusComposer 1.0 FocusComposer.qml
 SingleMailView 1.0 SingleMailView.qml
 FolderListView 1.0 FolderListView.qml