Fixed kolabnow account setup page.

The account plugin supplies the configuration UI, the application
supplies the scaffolding. That way we ensure the application doens't
contain any account specific code and account configurations are free to
offer specialized UI's that work best for them.
We're not currently using a standardized controller, but if we did those
controllers would have to live with the plugin, not the framework or the
components.

3 files changed, 144 insertions, 34 deletions

diff --git a/components/package/contents/ui/AccountSwitcher.qml b/components/package/contents/ui/AccountSwitcher.qml
index eb5702e0..48bb2c1b 100644
--- a/components/package/contents/ui/AccountSwitcher.qml
+++ b/components/package/contents/ui/AccountSwitcher.qml
@@ -72,14 +72,11 @@ Controls.ToolButton {
             width: parent.width
 
             Controls2.Button {
-
-
                 anchors {
                     left: parent.left
                     bottom: parent.bottom
                 }
 
-
                 //iconName: "view-refresh"
                 text: "Sync"
                 enabled: folderController.synchronizeAction.enabled
@@ -160,15 +157,6 @@ Controls.ToolButton {
 
                         Layout.fillHeight: true
 
-                        KubeAccounts.AccountFactory {
-                            id: accountFactory
-                            accountId: model.accountId
-                        }
-
-                        //                         Kirigami.Icon {
-                        //                             source: model.icon
-                        //                         }
-
                         Controls2.Label {
                             text: model.name
                         }
@@ -191,20 +179,14 @@ Controls.ToolButton {
                         text: "edit"
 
                         onClicked: {
-                            editAccountComponent.createObject(app)
+                            editAccountComponent.createObject(app, {accountId:model.accountId})
                             popup.close()
                         }
 
                         Component {
                             id: editAccountComponent
-
                             KubeComponents.EditAccountDialog {
-                                id: editAccount
-
                                 anchors.fill: parent
-
-                                accountId: accountFactory.accountId
-                                uiSource: accountFactory.uiPath
                             }
                         }
                     }
diff --git a/components/package/contents/ui/EditAccount.qml b/components/package/contents/ui/EditAccount.qml
new file mode 100644
index 00000000..e3e049fa
--- /dev/null
+++ b/components/package/contents/ui/EditAccount.qml
@@ -0,0 +1,138 @@
+/*
+ * 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 accountId
+
+    KubeAccounts.AccountFactory {
+        id: accountFactory
+        accountId: root.accountId
+    }
+
+    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
+                bottom: spacer.top
+                left: parent.left
+                right: parent.right
+                topMargin: Kirigami.Units.largeSpacing * 2
+            }
+
+            Loader {
+                id: loader
+                anchors.fill: parent
+                source: accountFactory.uiPath
+                onLoaded: item.accountId = root.accountId
+            }
+        }
+
+        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 {
+                top:spacer.bottom
+                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: {
+                        dialog.closeDialog()
+                    }
+                }
+
+                Controls.Button {
+                    anchors.right: parent.right
+                    text: "Save"
+                    onClicked: {
+                        loader.item.save()
+                        dialog.closeDialog()
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/components/package/contents/ui/EditAccountDialog.qml b/components/package/contents/ui/EditAccountDialog.qml
index 19349f38..a7461640 100644
--- a/components/package/contents/ui/EditAccountDialog.qml
+++ b/components/package/contents/ui/EditAccountDialog.qml
@@ -21,28 +21,18 @@ 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.framework.domain 1.0 as KubeFramework
 import org.kube.components 1.0 as KubeComponents
 
 KubeComponents.OverlayDialog {
-    id: root
+    id: dialog
 
-    property variant uiSource
     property variant accountId
+    EditAccount {
+        accountId: dialog.accountId
 
-    Item {
-        id: dialog
         anchors.centerIn: parent
 
-        height: root.height * 0.8
-        width: root.width * 0.8
-
-        Loader {
-            anchors.fill: parent
-
-            source: root.uiSource
-            onLoaded: item.accountId = root.accountId
-        }
+        height: dialog.height * 0.8
+        width: dialog.width * 0.8
     }
 }