7 files changed, 39 insertions, 12 deletions

diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index 30a9d09c..dd710975 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -26,6 +26,8 @@ install(FILES qmldir DESTINATION ${QML_INSTALL_DIR}/org/kube/components)
 install(DIRECTORY package/contents/ui/ DESTINATION ${QML_INSTALL_DIR}/org/kube/components)
 install(DIRECTORY mailviewer/qml/ DESTINATION ${QML_INSTALL_DIR}/org/kube/mailviewer)
 
+install(DIRECTORY accounts/ DESTINATION ${QML_INSTALL_DIR}/org/kube/accounts)
+
 include(${CMAKE_SOURCE_DIR}/KF5KirigamiMacros.cmake)
 kirigami_package_breeze_icons(ICONS applications-graphics view-list-icons folder-sync view-list-details configure document-edit dialog-cancel document-decrypt mail-reply-sender bookmarks folder)
 
diff --git a/components/accounts/AccountWizard.qml b/components/accounts/AccountWizard.qml
index 44561ab8..16928eb9 100644
--- a/components/accounts/AccountWizard.qml
+++ b/components/accounts/AccountWizard.qml
@@ -25,18 +25,11 @@ import org.kde.kirigami 1.0 as Kirigami
 Controls2.Popup {
     id: popup
 
-    height: app.height * 0.85
-    width: app.width * 0.85
-
-    x: app.width * 0.075
-    y: 50
-
-    visible: true
-
     modal: true
     focus: true
     closePolicy: Popup.CloseOnEscape | Popup.CloseOnPressOutsideParent
 
+    clip: true
 
     Controls2.StackView {
         id: stack
diff --git a/components/accounts/CreateKolabNow.qml b/components/accounts/CreateKolabNow.qml
index 3f23c20e..e86f4ec9 100644
--- a/components/accounts/CreateKolabNow.qml
+++ b/components/accounts/CreateKolabNow.qml
@@ -157,6 +157,7 @@ Item {
                     text: "Save"
 
                     onClicked: {
+                        popup.close()
                     }
                 }
             }
diff --git a/components/accounts/CreateMaildir.qml b/components/accounts/CreateMaildir.qml
index 63a63221..2b22d8b0 100644
--- a/components/accounts/CreateMaildir.qml
+++ b/components/accounts/CreateMaildir.qml
@@ -21,10 +21,19 @@ 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 QtQuick.Dialogs 1.0
+import QtQuick.Dialogs 1.0 as Dialogs
+
+import org.kube.framework.domain 1.0 as KubeFramework
 
 Item {
+    id: root
+
+    //Controller
+    KubeFramework.AccountsController {
+        id: accountsController
+    }
 
+    //Navigation
     Controls.ToolButton {
         iconName: "go-previous"
 
@@ -44,6 +53,7 @@ Item {
         }
 
 
+        //BEGIN heading
         Kirigami.Heading {
             id: heading
             text: "Add your Maildir archive"
@@ -66,7 +76,7 @@ Item {
             color: Kirigami.Theme.disabledTextColor
             wrapMode: Text.Wrap
         }
-
+        //END heading
 
         GridLayout {
             anchors {
@@ -86,6 +96,7 @@ Item {
                 Layout.alignment: Qt.AlignRight
             }
             Controls.TextField {
+                id: title
                 Layout.fillWidth: true
             }
 
@@ -112,7 +123,7 @@ Item {
 
                     Component {
                         id: fileDialogComponent
-                        FileDialog {
+                        Dialogs.FileDialog {
                             id: fileDialog
 
                             visible: true
@@ -121,7 +132,7 @@ Item {
                             selectFolder: true
 
                             onAccepted: {
-                                path.text = fileDialog.fileUrl
+                                //root.path = fileDialog.fileUrl
                             }
                         }
                     }
@@ -132,6 +143,7 @@ Item {
                 text: ""
             }
             Controls.CheckBox {
+                id: readOnly
                 text: "Read only"
             }
 
@@ -165,6 +177,8 @@ Item {
                     text: "Save"
 
                     onClicked: {
+                        //accountsController.createMaildirAccount(root.name, root.path, root.readOnly)
+                        popup.close()
                     }
                 }
             }
diff --git a/components/accounts/main.qml b/components/accounts/main.qml
index 6b9fc86c..e15bca8f 100644
--- a/components/accounts/main.qml
+++ b/components/accounts/main.qml
@@ -25,5 +25,6 @@ Controls2.ApplicationWindow {
     width: 1500
 
     AccountWizard {
+        visible: true
     }
 }
diff --git a/components/accounts/qmldir b/components/accounts/qmldir
new file mode 100644
index 00000000..e563fec3
--- /dev/null
+++ b/components/accounts/qmldir
@@ -0,0 +1,4 @@
+module org.kube.accounts
+
+AccountWizard 1.0 AccountWizard.qml
+
diff --git a/components/mail/contents/ui/main.qml b/components/mail/contents/ui/main.qml
index c4340465..bd0e0f31 100644
--- a/components/mail/contents/ui/main.qml
+++ b/components/mail/contents/ui/main.qml
@@ -29,6 +29,7 @@ import org.kube.framework.actions 1.0 as KubeAction
 import org.kube.framework.settings 1.0 as KubeSettings
 import org.kube.framework.domain 1.0 as KubeFramework
 import org.kube.components 1.0 as KubeComponents
+import org.kube.accounts 1.0 as KubeAccounts
 
 Controls2.ApplicationWindow {
     id: app
@@ -315,4 +316,15 @@ Controls2.ApplicationWindow {
     }
     //END Composer
 
+    //BEGIN AccountWizard
+    KubeAccounts.AccountWizard {
+        id: accountWizard
+
+        height: app.height * 0.85
+        width: app.width * 0.85
+
+        x: app.width * 0.075
+        y: 50
+    }
+    //END AccountWizard
 }