From 03384190b71f91121593a4f04027042f3cf68f9f Mon Sep 17 00:00:00 2001
From: Michael Bohlender <michael.bohlender@kdemail.net>
Date: Thu, 5 Jan 2017 20:05:41 +0100
Subject: link account name to composer

---
 components/package/contents/ui/AccountSwitcher.qml | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

(limited to 'components/package/contents/ui')

diff --git a/components/package/contents/ui/AccountSwitcher.qml b/components/package/contents/ui/AccountSwitcher.qml
index 41b3478c..d5f7610c 100644
--- a/components/package/contents/ui/AccountSwitcher.qml
+++ b/components/package/contents/ui/AccountSwitcher.qml
@@ -19,6 +19,8 @@
 import QtQuick 2.4
 import QtQuick.Layouts 1.1
 import QtQuick.Controls 2.0 as Controls2
+import QtQuick.Controls 1.4 as Controls
+
 import QtQml 2.2 as QtQml
 
 import org.kde.kirigami 1.0 as Kirigami
@@ -156,18 +158,18 @@ Controls2.Button {
                             accountId: model.accountId
                         }
 
-                        Kirigami.Icon {
-                            source: accountFactory.icon
-                        }
+//                         Kirigami.Icon {
+//                             source: model.icon
+//                         }
 
                         Controls2.Label {
-                            text: model.name === "" ? accountFactory.name : model.name
+                            text: model.name
+                        }
+
+                        Controls.ToolButton {
+                            visible: model.showStatus
+                            source: model.statusIcon
                         }
-                        //FIXME port to qqc2
-//                         Button {
-//                             visible: model.showStatus
-//                             source: model.statusIcon
-//                         }
                     }
                     Controls2.Button {
 
-- 
cgit v1.2.3