A single framework plugin

8 files changed, 10 insertions, 14 deletions

diff --git a/accounts/gmail/CMakeLists.txt b/accounts/gmail/CMakeLists.txt
index 8c6a8f61..ca9bcae7 100644
--- a/accounts/gmail/CMakeLists.txt
+++ b/accounts/gmail/CMakeLists.txt
@@ -37,7 +37,7 @@ set(SRCS
 
 add_library(gmailaccountplugin SHARED ${SRCS})
 qt5_use_modules(gmailaccountplugin Core Quick Qml)
-target_link_libraries(gmailaccountplugin sink settingsplugin mailplugin)
+target_link_libraries(gmailaccountplugin sink frameworkplugin)
 
 kpackage_install_package(package org.kube.accounts.gmail "genericqml")
 
diff --git a/accounts/gmail/package/contents/ui/GmailSettings.qml b/accounts/gmail/package/contents/ui/GmailSettings.qml
index 33dafe8d..ea6ac9e3 100644
--- a/accounts/gmail/package/contents/ui/GmailSettings.qml
+++ b/accounts/gmail/package/contents/ui/GmailSettings.qml
@@ -23,7 +23,6 @@ import QtQuick.Layouts 1.1
 
 import org.kde.kirigami 1.0 as Kirigami
 
-import org.kube.framework.settings 1.0 as KubeSettings
 import org.kube.accounts.gmail 1.0 as GmailAccount
 
 Item {
diff --git a/accounts/imap/CMakeLists.txt b/accounts/imap/CMakeLists.txt
index f6c4a49e..ecaae493 100644
--- a/accounts/imap/CMakeLists.txt
+++ b/accounts/imap/CMakeLists.txt
@@ -37,11 +37,11 @@ set(SRCS
 
 add_library(imapaccountplugin SHARED ${SRCS})
 qt5_use_modules(imapaccountplugin Core Quick Qml)
-target_link_libraries(imapaccountplugin sink settingsplugin mailplugin)
+target_link_libraries(imapaccountplugin sink frameworkplugin)
 
 add_library(imapaccount_static STATIC ${SRCS})
 qt5_use_modules(imapaccount_static Core Quick Qml)
-target_link_libraries(imapaccount_static sink settingsplugin mailplugin)
+target_link_libraries(imapaccount_static sink frameworkplugin)
 add_subdirectory(tests)
 
 kpackage_install_package(package org.kube.accounts.imap "genericqml")
diff --git a/accounts/imap/package/contents/ui/ImapAccountSettings.qml b/accounts/imap/package/contents/ui/ImapAccountSettings.qml
index e7834368..b448ac3c 100644
--- a/accounts/imap/package/contents/ui/ImapAccountSettings.qml
+++ b/accounts/imap/package/contents/ui/ImapAccountSettings.qml
@@ -23,7 +23,6 @@ import QtQuick.Layouts 1.1
 
 import org.kde.kirigami 1.0 as Kirigami
 
-import org.kube.framework.settings 1.0 as KubeSettings
 import org.kube.accounts.imap 1.0 as ImapAccount
 
 Item {
diff --git a/accounts/kolabnow/CMakeLists.txt b/accounts/kolabnow/CMakeLists.txt
index 1167db71..6dd264ce 100644
--- a/accounts/kolabnow/CMakeLists.txt
+++ b/accounts/kolabnow/CMakeLists.txt
@@ -37,11 +37,11 @@ set(SRCS
 
 add_library(kolabnowaccountplugin SHARED ${SRCS})
 qt5_use_modules(kolabnowaccountplugin Core Quick Qml)
-target_link_libraries(kolabnowaccountplugin sink settingsplugin mailplugin)
+target_link_libraries(kolabnowaccountplugin sink frameworkplugin)
 
 add_library(kolabnowaccount_static STATIC ${SRCS})
 qt5_use_modules(kolabnowaccount_static Core Quick Qml)
-target_link_libraries(kolabnowaccount_static sink settingsplugin mailplugin)
+target_link_libraries(kolabnowaccount_static sink frameworkplugin)
 # add_subdirectory(tests)
 
 kpackage_install_package(package org.kube.accounts.kolabnow "genericqml")
diff --git a/accounts/kolabnow/package/contents/ui/KolabnowAccountSettings.qml b/accounts/kolabnow/package/contents/ui/KolabnowAccountSettings.qml
index 46d197fa..2cb4086f 100644
--- a/accounts/kolabnow/package/contents/ui/KolabnowAccountSettings.qml
+++ b/accounts/kolabnow/package/contents/ui/KolabnowAccountSettings.qml
@@ -23,7 +23,6 @@ import QtQuick.Layouts 1.1
 
 import org.kde.kirigami 1.0 as Kirigami
 
-import org.kube.framework.settings 1.0 as KubeSettings
 import org.kube.accounts.kolabnow 1.0 as KolabnowAccount
 
 Item {
diff --git a/accounts/maildir/CMakeLists.txt b/accounts/maildir/CMakeLists.txt
index afdf660d..cb93551d 100644
--- a/accounts/maildir/CMakeLists.txt
+++ b/accounts/maildir/CMakeLists.txt
@@ -37,11 +37,11 @@ set(SRCS
 
 add_library(maildiraccountplugin SHARED ${SRCS})
 qt5_use_modules(maildiraccountplugin Core Quick Qml)
-target_link_libraries(maildiraccountplugin sink settingsplugin mailplugin)
+target_link_libraries(maildiraccountplugin sink frameworkplugin)
 
 add_library(maildiraccount_static STATIC ${SRCS})
 qt5_use_modules(maildiraccount_static Core Quick Qml)
-target_link_libraries(maildiraccount_static sink settingsplugin mailplugin)
+target_link_libraries(maildiraccount_static sink frameworkplugin)
 add_subdirectory(tests)
 
 kpackage_install_package(package org.kube.accounts.maildir "genericqml")
diff --git a/accounts/maildir/package/contents/ui/MaildirAccountSettings.qml b/accounts/maildir/package/contents/ui/MaildirAccountSettings.qml
index 2e7b6d8a..f191c82c 100644
--- a/accounts/maildir/package/contents/ui/MaildirAccountSettings.qml
+++ b/accounts/maildir/package/contents/ui/MaildirAccountSettings.qml
@@ -25,7 +25,6 @@ import QtQuick.Dialogs 1.0 as Dialogs
 
 import org.kde.kirigami 1.0 as Kirigami
 
-import org.kube.framework.settings 1.0 as KubeSettings
 import org.kube.accounts.maildir 1.0 as MaildirAccount
 
 Item {
@@ -57,8 +56,8 @@ Item {
                 fill: parent
             }
             columns: 2
-            columnSpacing: KubeTheme.Units.largeSpacing
-            rowSpacing: KubeTheme.Units.largeSpacing
+            columnSpacing: Kube.Units.largeSpacing
+            rowSpacing: Kube.Units.largeSpacing
 
             Controls.Label {
                 text: "Title of Account"
@@ -88,7 +87,7 @@ Item {
                 }
 
                 Controls.Button {
-                    iconName: KubeTheme.Icons.folder
+                    iconName: Kube.Icons.folder
 
                     onClicked: {
                         fileDialogComponent.createObject(parent)