1 files changed, 56 insertions, 46 deletions

diff --git a/components/package/contents/ui/AccountSwitcher.qml b/components/package/contents/ui/AccountSwitcher.qml
index 6d1c0aa2..eb5702e0 100644
--- a/components/package/contents/ui/AccountSwitcher.qml
+++ b/components/package/contents/ui/AccountSwitcher.qml
@@ -1,20 +1,20 @@
 /*
-  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.
-*/
+ *  Copyright (C) 2017 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.Layouts 1.1
@@ -29,74 +29,78 @@ 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 {
+Controls.ToolButton {
     id: accountSwitcher
 
     property variant accountId
+    property variant accountName
+
+    width: parent.width
 
     KubeFramework.FolderController {
         id: folderController
     }
 
-    text: "Accounts"
+    KubeAccounts.AccountsModel {
+        id: accountsModel
+    }
+
 
     onClicked: {
         popup.open()
-        focus = false
     }
 
     Controls2.Popup {
         id: popup
 
-        height: 300
-        width: 600
+        height: listView.count == 0 ? Kirigami.Units.gridUnit * 4 : Kirigami.Units.gridUnit * 2 + listView.count * Kirigami.Units.gridUnit * 3
+        width: Kirigami.Units.gridUnit * 20
 
-        x: 0
-        y: - popup.height
+        y: accountSwitcher.height
 
         modal: true
         focus: true
         closePolicy: Controls2.Popup.CloseOnEscape | Controls2.Popup.CloseOnPressOutsideParent
 
         Item {
-            id: footer
-
+            id: buttons
             anchors {
                 bottom: parent.bottom
-                left: parent.left
-                right: parent.right
-                margins: Kirigami.Units.largeSpacing
             }
 
-            height: Kirigami.Units.gridUnit + Kirigami.Units.smallSpacing * 1
-            width: listView.width
+            height: Kirigami.Units.gridUnit * 2
+            width: parent.width
 
             Controls2.Button {
 
+
                 anchors {
-                    verticalCenter: parent.verticalCenter
-                    right: parent.right
+                    left: parent.left
+                    bottom: parent.bottom
                 }
 
-                text: "Create new Account"
 
+                //iconName: "view-refresh"
+                text: "Sync"
+                enabled: folderController.synchronizeAction.enabled
                 onClicked: {
-                    accountWizard.open()
+                    folderController.synchronizeAction.execute()
                     popup.close()
                 }
             }
 
             Controls2.Button {
+                id: newAccountButton
+
                 anchors {
-                    verticalCenter: parent.verticalCenter
-                    left: parent.left
+                    right: parent.right
+                    bottom: parent.bottom
                 }
 
-                //iconName: "view-refresh"
-                text: "Sync"
-                enabled: folderController.synchronizeAction.enabled
+                text: "Create new Account"
+
                 onClicked: {
-                    folderController.synchronizeAction.execute()
+                    accountWizard.open()
                     popup.close()
                 }
             }
@@ -107,15 +111,14 @@ Controls2.Button {
 
             anchors {
                 top: parent.top
-                bottom: footer.top
+                bottom: buttons.top
                 left: parent.left
                 right: parent.right
-                margins: Kirigami.Units.smallSpacing
             }
 
             clip: true
 
-            model: KubeAccounts.AccountsModel {  }
+            model: accountsModel
 
             delegate: Kirigami.AbstractListItem {
                 id: accountDelegate
@@ -141,6 +144,13 @@ Controls2.Button {
                         value: model.accountId
                     }
 
+                    QtQml.Binding {
+                        target: accountSwitcher
+                        property: "accountName"
+                        when: listView.currentIndex == index
+                        value: model.name
+                    }
+
                     RowLayout {
                         anchors {
                             verticalCenter: parent.verticalCenter
@@ -155,9 +165,9 @@ Controls2.Button {
                             accountId: model.accountId
                         }
 
-//                         Kirigami.Icon {
-//                             source: model.icon
-//                         }
+                        //                         Kirigami.Icon {
+                        //                             source: model.icon
+                        //                         }
 
                         Controls2.Label {
                             text: model.name