2 files changed, 155 insertions, 65 deletions

diff --git a/components/accounts/contents/ui/AccountWizard.qml b/components/accounts/contents/ui/AccountWizard.qml
index 8cc90acb..ffc3f5da 100644
--- a/components/accounts/contents/ui/AccountWizard.qml
+++ b/components/accounts/contents/ui/AccountWizard.qml
@@ -51,47 +51,15 @@ Controls2.Popup {
 
                 spacing: Kirigami.Units.largeSpacing
 
-                Controls2.Button {
-
-                    Layout.fillWidth: true
-
-                    text: "kolabnow account"
-
-                    onClicked: {
-                        stack.push(kolabnow)
-                    }
-                }
-
-                Controls2.Button {
-
-                    Layout.fillWidth: true
-
-                    text: "gmail account"
-
-                    onClicked: {
-                        stack.push(gmail)
-                    }
-                }
-
-                Controls2.Button {
-
-                    Layout.fillWidth: true
-
-                    text: "imap account"
-
-                    onClicked: {
-                        stack.push(imap)
-                    }
-                }
-
-                Controls2.Button {
-
-                    Layout.fillWidth: true
-
-                    text: "maildir archive"
-
-                    onClicked: {
-                        stack.push(maildir)
+                Repeater {
+                    //TODO replace by model of available accounts
+                    model: ["kolabnow", "imap", "maildir"]
+                    delegate: Controls2.Button {
+                        Layout.fillWidth: true
+                        text: modelData +" account"
+                        onClicked: {
+                            stack.push(wizardPage.createObject(app, {accountType:modelData}))
+                        }
                     }
                 }
             }
@@ -99,30 +67,8 @@ Controls2.Popup {
     }
 
     Component {
-        id: kolabnow
-
-        CreateKolabNow {
-        }
-    }
-
-    Component {
-        id: gmail
-
-        CreateGmail {
-        }
-    }
-
-    Component {
-        id: imap
-
-        CreateImap {
-        }
-    }
-
-    Component {
-        id: maildir
-
-        CreateMaildir {
+        id: wizardPage
+        AccountWizardPage {
         }
     }
 }
diff --git a/components/accounts/contents/ui/AccountWizardPage.qml b/components/accounts/contents/ui/AccountWizardPage.qml
new file mode 100644
index 00000000..967bd4ab
--- /dev/null
+++ b/components/accounts/contents/ui/AccountWizardPage.qml
@@ -0,0 +1,144 @@
+/*
+ * Copyright (C) 2016 Michael Bohlender, <michael.bohlender@kdemail.net>
+ * Copyright (C) 2017 Christian Mollekopf, <mollekopf@kolabsys.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+import QtQuick 2.7
+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.accounts 1.0 as KubeAccounts
+
+Item {
+    id: root
+    property string accountType
+
+    KubeAccounts.AccountFactory {
+        id: accountFactory
+        accountType: root.accountType
+    }
+
+    Controls.ToolButton {
+        iconName: "go-previous"
+        tooltip: "go back"
+        onClicked: {
+            stack.pop()
+        }
+    }
+
+    //Item to avoid anchors conflict with stack
+    Item {
+
+        anchors {
+            fill: parent
+            margins: Kirigami.Units.largeSpacing * 2
+        }
+
+        Kirigami.Heading {
+            id: heading
+            text: loader.item.heading
+            color: Kirigami.Theme.highlightColor
+        }
+
+        Kirigami.Label {
+            id: subHeadline
+
+            anchors {
+                left: heading.left
+                top: heading.bottom
+            }
+
+            width: parent.width
+            text: loader.item.subheadline
+            color: Kirigami.Theme.disabledTextColor
+            wrapMode: Text.Wrap
+        }
+
+        Item {
+            id: accountEdit
+            anchors {
+                top:subHeadline.bottom
+                left: parent.left
+                right: parent.right
+                topMargin: Kirigami.Units.largeSpacing * 2
+            }
+
+            Loader {
+                id: loader
+                anchors.fill: parent
+                source: accountFactory.uiPath
+            }
+        }
+
+        Item {
+            id: spacer
+            Layout.fillHeight: true
+            anchors {
+                top:accountEdit.bottom
+                bottom: footer.top
+                left: parent.left
+                right: parent.right
+            }
+        }
+
+        //This is where we should place the account wizard ui
+        GridLayout {
+            id: footer
+            anchors {
+                bottom: parent.bottom
+                left: parent.left
+                right: parent.right
+                topMargin: Kirigami.Units.largeSpacing * 2
+            }
+
+            columns: 2
+            columnSpacing: Kirigami.Units.largeSpacing
+            rowSpacing: Kirigami.Units.largeSpacing
+
+            Item {
+                Layout.fillHeight: true
+            }
+
+            Kirigami.Label {
+                text: ""
+            }
+
+            Item {
+                Layout.fillWidth: true
+
+                Controls.Button {
+                    text: "Discard"
+
+                    onClicked: {
+                        popup.close()
+                    }
+                }
+
+                Controls.Button {
+                    anchors.right: parent.right
+                    text: "Save"
+                    onClicked: {
+                        loader.item.save()
+                        popup.close()
+                    }
+                }
+            }
+        }
+    }
+}