6 files changed, 34 insertions, 1 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a70344bd..7d896eb0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,4 +4,5 @@ cmake_minimum_required(VERSION 2.8.10.1)
 
 add_subdirectory(applications)
 add_subdirectory(framework)
+add_subdirectory(accounts)
 add_subdirectory(icons)
diff --git a/accounts/CMakeLists.txt b/accounts/CMakeLists.txt
new file mode 100644
index 00000000..25fa7f67
--- /dev/null
+++ b/accounts/CMakeLists.txt
@@ -0,0 +1 @@
+add_subdirectory(maildir)
diff --git a/accounts/maildir/CMakeLists.txt b/accounts/maildir/CMakeLists.txt
new file mode 100644
index 00000000..7e9894b1
--- /dev/null
+++ b/accounts/maildir/CMakeLists.txt
@@ -0,0 +1,27 @@
+project(kube-accounts-maildir)
+
+cmake_minimum_required(VERSION 2.8.10.1)
+
+include(CPack)
+include(FeatureSummary)
+find_package(PkgConfig)
+
+################# set KDE specific information #################
+
+find_package(ECM 0.0.8 REQUIRED NO_MODULE)
+
+# where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
+
+include(KDEInstallDirs)
+include(KDECMakeSettings)
+include(KDECompilerSettings)
+
+find_package(Qt5 REQUIRED NO_MODULE COMPONENTS Core Quick Test Gui)
+
+set (QT_MIN_VERSION "5.4.0")
+find_package(KF5 REQUIRED COMPONENTS Package)
+
+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)
+
diff --git a/applications/kube-mail/package/contents/ui/MaildirAccountSettings.qml b/accounts/maildir/package/contents/ui/MaildirAccountSettings.qml
index 5ba9f0c1..5ba9f0c1 100644
--- a/applications/kube-mail/package/contents/ui/MaildirAccountSettings.qml
+++ b/accounts/maildir/package/contents/ui/MaildirAccountSettings.qml
diff --git a/accounts/maildir/qmldir b/accounts/maildir/qmldir
new file mode 100644
index 00000000..40e6be1c
--- /dev/null
+++ b/accounts/maildir/qmldir
@@ -0,0 +1,3 @@
+module org.kde.kube.accounts.maildir
+
+AccountSettings 1.0 MaildirAccountSettings.qml
diff --git a/applications/kube-mail/package/contents/ui/Settings.qml b/applications/kube-mail/package/contents/ui/Settings.qml
index 34755df0..a3ea32f0 100644
--- a/applications/kube-mail/package/contents/ui/Settings.qml
+++ b/applications/kube-mail/package/contents/ui/Settings.qml
@@ -20,6 +20,7 @@ import QtQuick.Controls 1.4
 import QtQuick.Layouts 1.1
 
 import org.kde.kube.settings 1.0 as KubeSettings
+import org.kde.kube.accounts.maildir 1.0 as Maildir
 
 Rectangle {
     id: root
@@ -60,7 +61,7 @@ Rectangle {
             spacing: 5
             Repeater {
                 model: ["current"] //Get from context settings
-                delegate: MaildirAccountSettings { //This should be retrieved from the accounts plugin: KubeAccounts { identifier: modelData }.settingsUi
+                delegate: Maildir.AccountSettings { //This should be retrieved from the accounts plugin: KubeAccounts { identifier: modelData }.settingsUi
                     accountId: modelData
                     accountName: "Maildir"
                 }