20 files changed, 303 insertions, 76 deletions

diff --git a/accounts/maildir/package/contents/ui/MaildirAccountSettings.qml b/accounts/maildir/package/contents/ui/MaildirAccountSettings.qml
index a2564500..99814a06 100644
--- a/accounts/maildir/package/contents/ui/MaildirAccountSettings.qml
+++ b/accounts/maildir/package/contents/ui/MaildirAccountSettings.qml
@@ -20,18 +20,16 @@ import QtQuick.Controls 1.4
 import QtQuick.Layouts 1.1
 
 import org.kube.framework.settings 1.0 as KubeSettings
+import org.kube.framework.theme 1.0
 import org.kde.kube.accounts.maildir 1.0 as MaildirAccount
-import org.kube.components 1.0 as KubeComponents
+
 
 Rectangle {
     id: root
     property string accountId
     property string accountName: "Maildir"
 
-    KubeComponents.ColorPalette {
-        id: colorPalette
-    }
-    color: colorPalette.background
+    color: ColorPalette.background
 
     GridLayout {
         id: gridLayout
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
diff --git a/framework/CMakeLists.txt b/framework/CMakeLists.txt
index be137441..d795e992 100644
--- a/framework/CMakeLists.txt
+++ b/framework/CMakeLists.txt
@@ -40,5 +40,7 @@ add_subdirectory(actions)
 add_subdirectory(settings)
 # Domain specific domain logic
 add_subdirectory(domain)
+# Theme specfic things like colors
+add_subdirectory(theme)
 
 feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
diff --git a/framework/theme/CMakeLists.txt b/framework/theme/CMakeLists.txt
new file mode 100644
index 00000000..319e3d39
--- /dev/null
+++ b/framework/theme/CMakeLists.txt
@@ -0,0 +1,14 @@
+set(themeplugin_SRCS
+    themeplugin.cpp
+    colorpalette.cpp
+    unit.cpp
+)
+
+add_library(themeplugin SHARED ${themeplugin_SRCS})
+
+qt5_use_modules(themeplugin Core Quick Qml)
+
+target_link_libraries(themeplugin)
+
+install(TARGETS themeplugin DESTINATION ${QML_INSTALL_DIR}/org/kube/framework/theme)
+install(FILES qmldir DESTINATION ${QML_INSTALL_DIR}/org/kube/framework/theme)
diff --git a/framework/theme/colorpalette.cpp b/framework/theme/colorpalette.cpp
new file mode 100644
index 00000000..a321a292
--- /dev/null
+++ b/framework/theme/colorpalette.cpp
@@ -0,0 +1,45 @@
+/*
+  Copyright (C) 2016 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 2 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, write to the Free Software Foundation, Inc.,
+  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+*/
+
+#include "colorpalette.h"
+
+ColorPalette::ColorPalette(QObject *parent) : QObject(parent), m_background("#fcfcfc"), m_selected("#3daee9"), m_read("#232629"), m_border("#232629")
+{
+
+}
+
+QString ColorPalette::background() const
+{
+    return m_background;
+}
+
+QString ColorPalette::read() const
+{
+    return m_read;
+}
+
+QString ColorPalette::selected() const
+{
+    return m_selected;
+}
+
+QString ColorPalette::border() const
+{
+    return m_border;
+}
+
diff --git a/framework/theme/colorpalette.h b/framework/theme/colorpalette.h
new file mode 100644
index 00000000..a06783f3
--- /dev/null
+++ b/framework/theme/colorpalette.h
@@ -0,0 +1,47 @@
+/*
+  Copyright (C) 2016 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 2 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, write to the Free Software Foundation, Inc.,
+  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+*/
+
+#include <QObject>
+#include <QString>
+
+class ColorPalette : public QObject
+{
+    Q_OBJECT
+
+    Q_PROPERTY (QString background READ background NOTIFY themeChanged)
+    Q_PROPERTY (QString selected READ background NOTIFY themeChanged)
+    Q_PROPERTY (QString read READ read NOTIFY themeChanged)
+    Q_PROPERTY (QString border READ border NOTIFY themeChanged)
+
+public:
+    explicit ColorPalette(QObject *parent = Q_NULLPTR);
+
+    QString background() const;
+    QString selected() const;
+    QString read() const;
+    QString border() const;
+
+signals:
+    void themeChanged();
+
+private:
+    QString m_background;
+    QString m_selected;
+    QString m_read;
+    QString m_border;
+};
diff --git a/framework/theme/qmldir b/framework/theme/qmldir
new file mode 100644
index 00000000..489a71ca
--- /dev/null
+++ b/framework/theme/qmldir
@@ -0,0 +1,3 @@
+module org.kube.framework.theme
+
+plugin themeplugin
diff --git a/framework/theme/themeplugin.cpp b/framework/theme/themeplugin.cpp
new file mode 100644
index 00000000..ad9d0e1b
--- /dev/null
+++ b/framework/theme/themeplugin.cpp
@@ -0,0 +1,50 @@
+/*
+  Copyright (C) 2016 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 2 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, write to the Free Software Foundation, Inc.,
+  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+*/
+
+#include "themeplugin.h"
+
+#include <QtQml>
+#include <QQmlEngine>
+
+#include "colorpalette.h"
+#include "unit.h"
+
+static QObject *colorpaletteInstace(QQmlEngine *engine, QJSEngine *scriptEngine)
+{
+    Q_UNUSED(engine);
+    Q_UNUSED(scriptEngine);
+
+    return new ColorPalette;
+}
+
+static QObject *unitInstace(QQmlEngine *engine, QJSEngine *scriptEngine)
+{
+    Q_UNUSED(engine);
+    Q_UNUSED(scriptEngine);
+
+    return new Unit;
+}
+
+void ThemePlugin::registerTypes (const char *uri)
+{
+    Q_ASSERT(uri == QLatin1String("org.kube.framework.theme"));
+
+    qmlRegisterSingletonType<ColorPalette>(uri, 1, 0, "ColorPalette", colorpaletteInstace);
+    qmlRegisterSingletonType<Unit>(uri, 1, 0, "Unit", unitInstace);
+
+}
diff --git a/framework/theme/themeplugin.h b/framework/theme/themeplugin.h
new file mode 100644
index 00000000..d8ae43c1
--- /dev/null
+++ b/framework/theme/themeplugin.h
@@ -0,0 +1,31 @@
+/*
+  Copyright (C) 2016 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 2 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, write to the Free Software Foundation, Inc.,
+  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+*/
+
+#pragma once
+
+#include <QQmlEngine>
+#include <QQmlExtensionPlugin>
+
+class ThemePlugin : public QQmlExtensionPlugin
+{
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
+
+public:
+    virtual void registerTypes(const char *uri);
+};
\ No newline at end of file
diff --git a/framework/theme/unit.cpp b/framework/theme/unit.cpp
new file mode 100644
index 00000000..1f3803cb
--- /dev/null
+++ b/framework/theme/unit.cpp
@@ -0,0 +1,29 @@
+/*
+  Copyright (C) 2016 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 2 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, write to the Free Software Foundation, Inc.,
+  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+*/
+
+#include "unit.h"
+
+Unit::Unit(QObject *parent) : QObject(parent), m_size(5)
+{
+
+}
+
+int Unit::size() const
+{
+    return m_size;
+}
\ No newline at end of file
diff --git a/framework/theme/unit.h b/framework/theme/unit.h
new file mode 100644
index 00000000..bd9b58f0
--- /dev/null
+++ b/framework/theme/unit.h
@@ -0,0 +1,38 @@
+/*
+  Copyright (C) 2016 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 2 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, write to the Free Software Foundation, Inc.,
+  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+*/
+
+#include <QObject>
+
+
+class Unit : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY (int size READ size NOTIFY unitChanged)
+
+
+public:
+    explicit Unit(QObject *parent = Q_NULLPTR);
+
+    int size() const;
+
+signals:
+    void unitChanged();
+
+private:
+    int m_size;
+};