A single framework plugin

3 files changed, 20 insertions, 23 deletions

diff --git a/components/accounts/contents/ui/AccountWizard.qml b/components/accounts/contents/ui/AccountWizard.qml
index 802f44a3..877a9d33 100644
--- a/components/accounts/contents/ui/AccountWizard.qml
+++ b/components/accounts/contents/ui/AccountWizard.qml
@@ -20,7 +20,7 @@ import QtQuick 2.7
 import QtQuick.Layouts 1.1
 import QtQuick.Controls 2.0 as Controls2
 import org.kde.kirigami 1.0 as Kirigami
-import org.kube.components.theme 1.0  as KubeTheme
+import org.kube.framework 1.0 as Kube
 
 Controls2.Popup {
     id: popup
@@ -50,7 +50,7 @@ Controls2.Popup {
             Kirigami.Heading {
                 id: heading
                 text: "Select your new account type"
-                color: KubeTheme.Colors.highlightColor
+                color: Kube.Colors.highlightColor
             }
 
             ColumnLayout {
diff --git a/components/accounts/contents/ui/AccountWizardPage.qml b/components/accounts/contents/ui/AccountWizardPage.qml
index 034c8fd5..a4dc7e25 100644
--- a/components/accounts/contents/ui/AccountWizardPage.qml
+++ b/components/accounts/contents/ui/AccountWizardPage.qml
@@ -22,21 +22,20 @@ import QtQuick.Layouts 1.1
 import QtQuick.Controls 1.4 as Controls
 import QtQuick.Controls 2.0 as Controls2
 import org.kde.kirigami 1.0 as Kirigami
+import org.kube.framework 1.0 as Kube
 
-import org.kube.framework.accounts 1.0 as KubeAccounts
-import org.kube.components.theme 1.0 as KubeTheme
 
 Item {
     id: root
     property string accountType
 
-    KubeAccounts.AccountFactory {
+    Kube.AccountFactory {
         id: accountFactory
         accountType: root.accountType
     }
 
     Controls.ToolButton {
-        iconName: KubeTheme.Icons.goBack
+        iconName: Kube.Icons.goBack
         tooltip: "go back"
         onClicked: {
             stack.pop()
@@ -48,13 +47,13 @@ Item {
 
         anchors {
             fill: parent
-            margins: KubeTheme.Units.largeSpacing * 2
+            margins: Kube.Units.largeSpacing * 2
         }
 
         Kirigami.Heading {
             id: heading
             text: loader.item.heading
-            color: KubeTheme.Colors.highlightColor
+            color: Kube.Colors.highlightColor
         }
 
         Kirigami.Label {
@@ -67,7 +66,7 @@ Item {
 
             width: parent.width
             text: loader.item.subheadline
-            color: KubeTheme.Colors.disabledTextColor
+            color: Kube.Colors.disabledTextColor
             wrapMode: Text.Wrap
         }
 
@@ -77,7 +76,7 @@ Item {
                 top:subHeadline.bottom
                 left: parent.left
                 right: parent.right
-                topMargin: KubeTheme.Units.largeSpacing * 2
+                topMargin: Kube.Units.largeSpacing * 2
             }
 
             Loader {
@@ -105,12 +104,12 @@ Item {
                 bottom: parent.bottom
                 left: parent.left
                 right: parent.right
-                topMargin: KubeTheme.Units.largeSpacing * 2
+                topMargin: Kube.Units.largeSpacing * 2
             }
 
             columns: 2
-            columnSpacing: KubeTheme.Units.largeSpacing
-            rowSpacing: KubeTheme.Units.largeSpacing
+            columnSpacing: Kube.Units.largeSpacing
+            rowSpacing: Kube.Units.largeSpacing
 
             Item {
                 Layout.fillHeight: true
diff --git a/components/accounts/contents/ui/CreateGmail.qml b/components/accounts/contents/ui/CreateGmail.qml
index 2b29f9ee..f16cd027 100644
--- a/components/accounts/contents/ui/CreateGmail.qml
+++ b/components/accounts/contents/ui/CreateGmail.qml
@@ -22,17 +22,15 @@ import QtQuick.Controls 1.4 as Controls
 import QtQuick.Controls 2.0 as Controls2
 import org.kde.kirigami 1.0 as Kirigami
 
-import org.kube.framework.accounts 1.0 as KubeAccounts
-import org.kube.components.theme 1.0 as KubeTheme
 
 Item {
 
-    KubeAccounts.GmailController {
+    Kube.GmailController {
         id: account
     }
 
     Controls.ToolButton {
-        iconName: KubeTheme.Icons.goBack
+        iconName: Kube.Icons.goBack
 
         tooltip: "go back"
 
@@ -46,14 +44,14 @@ Item {
 
         anchors {
             fill: parent
-            margins: KubeTheme.Units.largeSpacing * 2
+            margins: Kube.Units.largeSpacing * 2
         }
 
         Kirigami.Heading {
             id: heading
             text: "Connect your Gmail account"
 
-            color: KubeTheme.Colors.highlightColor
+            color: Kube.Colors.highlightColor
         }
 
         Kirigami.Label {
@@ -68,7 +66,7 @@ Item {
 
             text: "To let Kube access your account, fill in email address, username, password and give the account a title that will be displayed inside Kube."
 
-            color: KubeTheme.Colors.disabledTextColor
+            color: Kube.Colors.disabledTextColor
 
             wrapMode: Text.Wrap
         }
@@ -79,12 +77,12 @@ Item {
                 bottom: parent.bottom
                 left: parent.left
                 right: parent.right
-                topMargin: KubeTheme.Units.largeSpacing * 2
+                topMargin: Kube.Units.largeSpacing * 2
             }
 
             columns: 2
-            columnSpacing: KubeTheme.Units.largeSpacing
-            rowSpacing: KubeTheme.Units.largeSpacing
+            columnSpacing: Kube.Units.largeSpacing
+            rowSpacing: Kube.Units.largeSpacing
 
             Controls.Label {
                 text: "Title of Account"