remove Colorpalette.qml and change its use to the theme plugin

7 files changed, 7 insertions, 37 deletions

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
-    }
 }
 
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/FocusComposer.qml b/components/package/contents/ui/FocusComposer.qml
index 5c4d88d7..bc8b3f2d 100644
--- a/components/package/contents/ui/FocusComposer.qml
+++ b/components/package/contents/ui/FocusComposer.qml
@@ -45,7 +45,7 @@ Rectangle {
         height: root.height * 0.8
         width: root.width * 0.8
 
-        color: colorPalette.background
+        color: ColorPalette.background
 
         MouseArea {
             anchors.fill: parent
@@ -80,4 +80,4 @@ Rectangle {
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/components/package/contents/ui/MailListView.qml b/components/package/contents/ui/MailListView.qml
index 8b612c52..bf5185dc 100644
--- a/components/package/contents/ui/MailListView.qml
+++ b/components/package/contents/ui/MailListView.qml
@@ -72,7 +72,6 @@ ScrollView {
 
                 anchors.fill: parent
 
-                // color: colorPalette.read
                 color: "steelblue"
                 opacity: 0.1
 
diff --git a/components/package/contents/ui/Settings.qml b/components/package/contents/ui/Settings.qml
index 692ddd0a..fa886f2b 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
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