move account wizard to accountsview

2 files changed, 16 insertions, 15 deletions

diff --git a/components/kube/contents/ui/AccountsView.qml b/components/kube/contents/ui/AccountsView.qml
index 5d0098a1..86a413e7 100644
--- a/components/kube/contents/ui/AccountsView.qml
+++ b/components/kube/contents/ui/AccountsView.qml
@@ -20,6 +20,7 @@ import QtQuick 2.4
 import QtQuick.Layouts 1.1
 import QtQuick.Controls 1.3 as Controls
 import org.kube.framework 1.0 as Kube
+import org.kube.components.accounts 1.0 as KubeAccounts
 
 Rectangle {
     color: Kube.Colors.backgroundColor
@@ -32,7 +33,7 @@ Rectangle {
 
         Item {
             id: accountList
-            width: Kube.Units.gridUnit * 15
+            width: Kube.Units.gridUnit * 12
             Layout.fillHeight: true
 
             Kube.PositiveButton {
@@ -44,6 +45,8 @@ Rectangle {
                     margins: Kube.Units.largeSpacing
                 }
                 text: "New Account"
+
+                onClicked: accountWizard.open()
             }
 
             ListView {
@@ -104,4 +107,16 @@ Rectangle {
             }
         }
     }
+
+    //BEGIN AccountWizard
+    KubeAccounts.AccountWizard {
+        id: accountWizard
+
+        height: app.height * 0.85
+        width: app.width * 0.85
+
+        x: app.width * 0.075
+        y: app.height * 0.075
+    }
+    //END AccountWizard
 }
diff --git a/components/kube/contents/ui/Kube.qml b/components/kube/contents/ui/Kube.qml
index 18c1b6ec..ca3af1b9 100644
--- a/components/kube/contents/ui/Kube.qml
+++ b/components/kube/contents/ui/Kube.qml
@@ -23,9 +23,7 @@ import QtQuick.Layouts 1.3
 import QtQuick.Window 2.0
 
 import QtQuick.Controls 2.0 as Controls2
-
 import org.kube.framework 1.0 as Kube
-import org.kube.components.accounts 1.0 as KubeAccounts
 
 Controls2.ApplicationWindow {
     id: app
@@ -209,18 +207,6 @@ Controls2.ApplicationWindow {
     }
     //END Main content
 
-    //BEGIN AccountWizard
-    KubeAccounts.AccountWizard {
-        id: accountWizard
-
-        height: app.height * 0.85
-        width: app.width * 0.85
-
-        x: app.width * 0.075
-        y: app.height * 0.075
-    }
-    //END AccountWizard
-
     //BEGIN Notification
     Kube.NotificationPopup {
         id: notificationPopup