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

GODT-1336: Fix showing window on startup

Browse Source
This commit is contained in:
Alexander Bilyak
2021-10-11 12:15:12 +00:00
committed by Jakub
parent ea821b1bd8
commit b259de238e
5 changed files with 33 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
internal/frontend/qml/Bridge_test.qml
View File

@ -330,6 +330,16 @@ Window {
}
CheckBox {
id: showOnStartupCheckbox
colorScheme: root.colorScheme
text: "Show on startup"
checked: root.showOnStartup
onCheckedChanged: {
root.showOnStartup = checked
}
}
Button {
colorScheme: root.colorScheme
//Layout.fillWidth: true
@ -338,7 +348,6 @@ Window {
enabled: bridge === undefined || bridge === null
onClicked: {
bridge = bridgeComponent.createObject()
if (true) bridge._mainWindow.showAndRise()
}
}
@ -630,6 +639,7 @@ Window {
property string goos: "linux"
property bool showOnStartup: true // this actually needs to be false, but since we use Bridge_test for testing purpose - lets default this to true just for convenience
property bool dockIconVisible: false
// this signals are used only when trying to login with new user (i.e. not in users model)

8
internal/frontend/qml/WelcomeGuide.qml
View File

@ -224,13 +224,7 @@ Item {
Layout.preferredWidth: 320
Layout.fillWidth: true
username: {
if (root.backend.users.count !== 1) return ""
var user = root.backend.users.get(0)
if (user) return ""
if (user.loggedIn) return ""
return user.username
}
username: root.backend.users.count === 1 && root.backend.users.get(0) && root.backend.users.get(0).loggedIn === false ? root.backend.users.get(0).username : ""
backend: root.backend
}