More fixes to login/logout logic

Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>

diff --git a/src/gui/tray/UserLine.qml b/src/gui/tray/UserLine.qml
index d2db68ff345a9cdd84924d42eef73a09cdb9878d..834c7001b6d2e9035f6005209e393bb46fc0de8d 100644 (file)
--- a/src/gui/tray/UserLine.qml
+++ b/src/gui/tray/UserLine.qml
@@ -116,7 +116,8 @@ MenuItem {
                     MenuItem {\r
                         text: userModelBackend.isUserConnected(index) ? "Log out" : "Log in"\r
                         onClicked: {\r
-                            userModelBackend.isUserConnected(index) ? userModelBackend.logout(index) : userModelBackend.logout(index)\r
+                            userModelBackend.isUserConnected(index) ? userModelBackend.logout(index) : userModelBackend.login(index)\r
+                            accountMenu.close()\r
                         }\r
                     }\r
 \r

diff --git a/src/gui/tray/Window.qml b/src/gui/tray/Window.qml
index c311b05039e447d80723b5c79f0c75bf0c32cc98..cda5374b51d6c68d9024ba137f0c42da8b76f3fe 100644 (file)
--- a/src/gui/tray/Window.qml
+++ b/src/gui/tray/Window.qml
@@ -27,6 +27,8 @@ Window {
         currentAccountUser.text = userModelBackend.currentUserName();\r
         currentAccountServer.text = userModelBackend.currentUserServer();\r
         trayWindowTalkButton.visible = userModelBackend.currentServerHasTalk() ? true : false;\r
+        currentAccountStateIndicator.source = ""\r
+        currentAccountStateIndicator.source = userModelBackend.isUserConnected(userModelBackend.currentUserId()) ? "qrc:///client/theme/colored/state-ok.svg" : "qrc:///client/theme/colored/state-offline.svg"\r
 \r
         userLineInstantiator.active = false;\r
         userLineInstantiator.active = true;\r
@@ -121,6 +123,11 @@ Window {
                                 radius: 2\r
                             }\r
 \r
+                            onClosed: {\r
+                                userLineInstantiator.active = false;\r
+                                userLineInstantiator.active = true;\r
+                            }\r
+\r
                             Instantiator {\r
                                 id: userLineInstantiator\r
                                 model: userModelBackend\r