A factory to load account plugins.

5 files changed, 20 insertions, 9 deletions

diff --git a/accounts/maildir/CMakeLists.txt b/accounts/maildir/CMakeLists.txt
index d83ae0be..5307c5b0 100644
--- a/accounts/maildir/CMakeLists.txt
+++ b/accounts/maildir/CMakeLists.txt
@@ -22,6 +22,7 @@ find_package(Qt5 REQUIRED NO_MODULE COMPONENTS Core Quick Test Gui)
 set (QT_MIN_VERSION "5.4.0")
 find_package(Sink CONFIG REQUIRED)
 find_package(KF5Async CONFIG REQUIRED)
+find_package(KF5 REQUIRED COMPONENTS Package)
 
 include_directories(SYSTEM ${KDE_INSTALL_FULL_INCLUDEDIR}/KF5/)
 
@@ -34,7 +35,7 @@ add_library(maildiraccountplugin SHARED ${SRCS})
 qt5_use_modules(maildiraccountplugin Core Quick Qml)
 target_link_libraries(maildiraccountplugin sink)
 
-install(TARGETS maildiraccountplugin DESTINATION ${QML_INSTALL_DIR}/org/kde/kube/accounts/maildir)
-install(FILES qmldir DESTINATION ${QML_INSTALL_DIR}/org/kde/kube/accounts/maildir)
-install(FILES package/contents/ui/MaildirAccountSettings.qml DESTINATION ${QML_INSTALL_DIR}/org/kde/kube/accounts/maildir)
+kpackage_install_package(package org.kube.accounts.maildir "genericqml")
 
+install(TARGETS maildiraccountplugin DESTINATION ${QML_INSTALL_DIR}/org/kube/accounts/maildir)
+install(FILES qmldir DESTINATION ${QML_INSTALL_DIR}/org/kube/accounts/maildir)
diff --git a/accounts/maildir/maildiraccountplugin.cpp b/accounts/maildir/maildiraccountplugin.cpp
index 0033613b..2c3c8c4d 100644
--- a/accounts/maildir/maildiraccountplugin.cpp
+++ b/accounts/maildir/maildiraccountplugin.cpp
@@ -6,6 +6,6 @@
 
 void MaildirAccountPlugin::registerTypes (const char *uri)
 {
-    Q_ASSERT(uri == QLatin1String("org.kde.kube.accounts.maildir"));
+    Q_ASSERT(uri == QLatin1String("org.kube.accounts.maildir"));
     qmlRegisterType<MaildirSettings>(uri, 1, 0, "MaildirSettings");
 }
diff --git a/accounts/maildir/package/contents/ui/MaildirAccountSettings.qml b/accounts/maildir/package/contents/ui/MaildirAccountSettings.qml
index 77cf739f..a2564500 100644
--- a/accounts/maildir/package/contents/ui/MaildirAccountSettings.qml
+++ b/accounts/maildir/package/contents/ui/MaildirAccountSettings.qml
@@ -19,14 +19,18 @@ import QtQuick 2.4
 import QtQuick.Controls 1.4
 import QtQuick.Layouts 1.1
 
-import org.kde.kube.settings 1.0 as KubeSettings
+import org.kube.framework.settings 1.0 as KubeSettings
 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
 
     GridLayout {
@@ -82,7 +86,7 @@ Rectangle {
 
         KubeSettings.Settings {
             id: accountSettings
-            identifier: "account." + modelData
+            identifier: "account." + accountId
             property string primaryIdentity: "current"
         }
         KubeSettings.Settings {
diff --git a/accounts/maildir/package/metadata.desktop b/accounts/maildir/package/metadata.desktop
new file mode 100644
index 00000000..12d444e9
--- /dev/null
+++ b/accounts/maildir/package/metadata.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=Kube Maildir Accounts Plugin
+X-KDE-PluginInfo-Name=org.kube.accounts.maildir
+Exec=kpackagelauncherqml -a org.kube.accounts.maildir
+X-Plasma-MainScript=ui/MaildirAccountSettings.qml
+X-KDE-ServiceTypes=KPackage/GenericQML
+Icon=kmail2
+Type=Service
diff --git a/accounts/maildir/qmldir b/accounts/maildir/qmldir
index 70ecc786..5e4861c0 100644
--- a/accounts/maildir/qmldir
+++ b/accounts/maildir/qmldir
@@ -1,5 +1,3 @@
-module org.kde.kube.accounts.maildir
-
-AccountSettings 1.0 MaildirAccountSettings.qml
+module org.kube.accounts.maildir
 
 plugin maildiraccountplugin