From 7e36b215fe6f384d40b595ab03771e7bff306f7f Mon Sep 17 00:00:00 2001 From: Xavier Michelon Date: Thu, 26 Jan 2023 17:27:09 +0100 Subject: [PATCH] GODT-1453: clicking 'Sign in' from status window now selects the right account. --- internal/frontend/bridge-gui/bridge-gui/qml/Bridge.qml | 4 ++-- internal/frontend/bridge-gui/bridge-gui/qml/StatusWindow.qml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/frontend/bridge-gui/bridge-gui/qml/Bridge.qml b/internal/frontend/bridge-gui/bridge-gui/qml/Bridge.qml index 581df440..8d116b3a 100644 --- a/internal/frontend/bridge-gui/bridge-gui/qml/Bridge.qml +++ b/internal/frontend/bridge-gui/bridge-gui/qml/Bridge.qml @@ -87,8 +87,8 @@ QtObject { mainWindow.showAndRise() } - onShowSignIn: function(login) { - mainWindow.showSignIn(login) + onSelectUser: function(userID) { + mainWindow.selectUser(userID) mainWindow.showAndRise() } diff --git a/internal/frontend/bridge-gui/bridge-gui/qml/StatusWindow.qml b/internal/frontend/bridge-gui/bridge-gui/qml/StatusWindow.qml index 315f75d5..2269acaa 100644 --- a/internal/frontend/bridge-gui/bridge-gui/qml/StatusWindow.qml +++ b/internal/frontend/bridge-gui/bridge-gui/qml/StatusWindow.qml @@ -40,7 +40,7 @@ Window { signal showMainWindow() signal showHelp() signal showSettings() - signal showSignIn(string username) + signal selectUser(string userID) signal quit() MouseArea { @@ -229,7 +229,7 @@ Window { visible: viewItem.user ? (viewItem.user.state === EUserState.SignedOut) : false text: qsTr("Sign in") onClicked: { - root.showSignIn(viewItem.user.primaryEmailOrUsername()) + root.selectUser(viewItem.user.id) // selectUser will show login screen if user is in SignedOut state. root.close() } }