adjust accountswitcher to accountsplugin, remove old newaccountdialog, enable accountwizard

2 files changed, 4 insertions, 181 deletions

diff --git a/components/package/contents/ui/AccountSwitcher.qml b/components/package/contents/ui/AccountSwitcher.qml
index 6c899c50..41b3478c 100644
--- a/components/package/contents/ui/AccountSwitcher.qml
+++ b/components/package/contents/ui/AccountSwitcher.qml
@@ -24,6 +24,7 @@ import QtQml 2.2 as QtQml
 import org.kde.kirigami 1.0 as Kirigami
 
 import org.kube.framework.domain 1.0 as KubeFramework
+import org.kube.framework.accounts 1.0 as KubeAccounts
 import org.kube.components 1.0 as KubeComponents
 
 Controls2.Button {
@@ -81,17 +82,9 @@ Controls2.Button {
                 text: "Create new Account"
 
                 onClicked: {
-                    newAccountComponent.createObject(app)
+                    accountWizard.open()
                     popup.close()
                 }
-
-                Component {
-                    id: newAccountComponent
-                    KubeComponents.NewAccountDialog {
-                        id: settings
-                        anchors.fill: parent
-                    }
-                }
             }
 
             Controls2.Button {
@@ -123,7 +116,7 @@ Controls2.Button {
 
             clip: true
 
-            model: KubeFramework.AccountsModel {  }
+            model: KubeAccounts.AccountsModel {  }
 
             delegate: Kirigami.AbstractListItem {
                 id: accountDelegate
@@ -158,7 +151,7 @@ Controls2.Button {
 
                         Layout.fillHeight: true
 
-                        KubeFramework.AccountFactory {
+                        KubeAccounts.AccountFactory {
                             id: accountFactory
                             accountId: model.accountId
                         }
diff --git a/components/package/contents/ui/NewAccountDialog.qml b/components/package/contents/ui/NewAccountDialog.qml
deleted file mode 100644
index de168de7..00000000
--- a/components/package/contents/ui/NewAccountDialog.qml
+++ /dev/null
@@ -1,170 +0,0 @@
-/*
-  Copyright (C) 2016 Michael Bohlender, <michael.bohlender@kdemail.net>
-
-  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.4
-import QtQuick.Controls 1.4
-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
-
-    KubeFramework.AccountsController {
-        id: accountsController
-    }
-
-    Item {
-        id: dialog
-
-        anchors.centerIn: parent
-
-        height: parent.height * 0.8
-        width: parent.width * 0.8
-
-        ToolBar {
-            id: toolBar
-            anchors {
-                top: parent.top
-                left: parent.left
-                right: parent.right
-            }
-
-            ToolButton {
-
-                anchors {
-                    left: parent.left
-                    verticalCenter: parent.verticalCenter
-                }
-
-                visible: stack.depth > 1
-                iconName: "go-previous"
-
-                onClicked: stack.pop()
-            }
-        }
-
-        StackView {
-            id: stack
-
-            anchors {
-                top: toolBar.bottom
-                left: parent.left
-                right: parent.right
-                bottom: parent.bottom
-            }
-
-            clip: true
-            initialItem: accountTypes
-
-            Component {
-                id: accountTypes
-
-                Item {
-                    id: pageRoot
-
-                    height: dialog.height
-                    width: dialog.width
-
-                    Column {
-                        anchors.centerIn: parent
-
-                        spacing: Kirigami.Units.largeSpacing
-
-                        Button {
-                            anchors.horizontalCenter: parent.horizontalCenter
-                            width: pageRoot.width * 0.4
-
-                            text: "kolabnow"
-
-                            onClicked: {
-                                accountsController.createAccount("kolabnow");
-                                root.closeDialog()
-                                //stack.push(imap)
-                            }
-                        }
-
-                        Button {
-                            anchors.horizontalCenter: parent.horizontalCenter
-                            width: pageRoot.width * 0.4
-
-                            text: "imap"
-
-                            onClicked: {
-                                accountsController.createAccount("imap");
-                                root.closeDialog()
-                                //stack.push(imap)
-                            }
-                        }
-
-                        Button {
-                            anchors.horizontalCenter: parent.horizontalCenter
-                             width: pageRoot.width * 0.4
-
-                            text: "maildir"
-
-                            onClicked: {
-                                accountsController.createAccount("maildir");
-                                root.closeDialog()
-                                //stack.push(maildir)
-                            }
-                        }
-                    }
-                }
-            }
-
-            Component {
-                id: imap
-
-                Rectangle {
-                    color: "green"
-
-                    height: dialog.height
-                    width: dialog.width
-                }
-            }
-
-            Component {
-                id: maildir
-
-                Rectangle {
-                    color: "blue"
-
-                    height: dialog.height
-                    width: dialog.width
-                }
-            }
-
-            Component {
-                id: kolabnow
-
-                Rectangle {
-                    color: "yellow"
-
-                    height: dialog.height
-                    width: dialog.width
-                }
-            }
-
-        }
-    }
-}