Silverfish/proton-bridge
1
0
Fork 1
mirror of https://github.com/ProtonMail/proton-bridge.git synced 2025-12-17 15:46:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GODT-1453: clicking 'Sign in' from status window now selects the right account.

Browse Source
This commit is contained in:
Xavier Michelon
2023-01-26 17:27:09 +01:00
parent badebbef9f
commit 7e36b215fe
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
internal/frontend/bridge-gui/bridge-gui/qml/Bridge.qml
View File

@ -87,8 +87,8 @@ QtObject {
mainWindow.showAndRise() mainWindow.showAndRise()
} }
onShowSignIn: function(login) { onSelectUser: function(userID) {
mainWindow.showSignIn(login) mainWindow.selectUser(userID)
mainWindow.showAndRise() mainWindow.showAndRise()
} }

4
internal/frontend/bridge-gui/bridge-gui/qml/StatusWindow.qml
View File

@ -40,7 +40,7 @@ Window {
signal showMainWindow() signal showMainWindow()
signal showHelp() signal showHelp()
signal showSettings() signal showSettings()
signal showSignIn(string username) signal selectUser(string userID)
signal quit() signal quit()
MouseArea { MouseArea {
@ -229,7 +229,7 @@ Window {
visible: viewItem.user ? (viewItem.user.state === EUserState.SignedOut) : false visible: viewItem.user ? (viewItem.user.state === EUserState.SignedOut) : false
text: qsTr("Sign in") text: qsTr("Sign in")
onClicked: { onClicked: {
root.showSignIn(viewItem.user.primaryEmailOrUsername()) root.selectUser(viewItem.user.id) // selectUser will show login screen if user is in SignedOut state.
root.close() root.close()
} }
} }