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

GODT-1346: GODT-1340 GODT-1315 QML changes

Browse Source 
GODT-1365: Create ComboBox component
GODT-1338: GODT-1343 Help view buttons
GODT-1340: Not crashing, user list updating in main thread.
GODT-1345: adding panic handlers
This commit is contained in:
Jakub Cuth
2021-09-28 12:45:47 +00:00
committed by Jakub
parent 2c8feff97a
commit d11cf57879
46 changed files with 1267 additions and 727 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
internal/frontend/qml/ContentWrapper.qml
View File

@ -28,24 +28,8 @@ Item {
property var backend
property var notifications
signal login(string username, string password)
signal login2FA(string username, string code)
signal login2Password(string username, string password)
signal loginAbort(string username)
signal showSetupGuide(var user, string address)
property var noUser: QtObject {
property var avatarText: ""
property var username: ""
property var password: ""
property var usedBytes: 1
property var totalBytes: 1
property var loggedIn: false
property var splitMode: false
property var addresses: []
}
RowLayout {
anchors.fill: parent
spacing: 0
@ -183,6 +167,7 @@ Item {
onClicked: {
var user = root.backend.users.get(index)
accounts.currentIndex = index
if (!user) return
if (user.loggedIn) {
rightContent.showAccount()
} else {
@ -248,8 +233,8 @@ Item {
backend: root.backend
notifications: root.notifications
user: {
if (accounts.currentIndex < 0) return root.noUser
if (root.backend.users.count == 0) return root.noUser
if (accounts.currentIndex < 0) return undefined
if (root.backend.users.count == 0) return undefined
return root.backend.users.get(accounts.currentIndex)
}
onShowSignIn: {
@ -261,7 +246,7 @@ Item {
}
}
GridLayout { // 1
GridLayout { // 1 Sign In
columns: 2
Button {
@ -271,7 +256,10 @@ Item {
Layout.alignment: Qt.AlignTop
colorScheme: root.colorScheme
onClicked: rightContent.showAccount()
onClicked: {
signIn.abort()
rightContent.showAccount()
}
icon.source: "icons/ic-arrow-left.svg"
secondary: true
horizontalPadding: 8
@ -289,11 +277,6 @@ Item {
colorScheme: root.colorScheme
backend: root.backend
onLogin : { root.backend.login ( username , password ) }
onLogin2FA : { root.backend.login2FA ( username , code ) }
onLogin2Password : { root.backend.login2Password ( username , password ) }
onLoginAbort : { root.backend.loginAbort ( username ) }
}
}
@ -330,7 +313,9 @@ Item {
selectedAddress: {
if (accounts.currentIndex < 0) return ""
if (root.backend.users.count == 0) return ""
return root.backend.users.get(accounts.currentIndex).addresses[0]
var user = root.backend.users.get(accounts.currentIndex)
if (!user) return ""
return user.addresses[0]
}
}
@ -342,6 +327,12 @@ Item {
function showLocalCacheSettings () { rightContent.currentIndex = 5 }
function showHelpView () { rightContent.currentIndex = 6 }
function showBugReport () { rightContent.currentIndex = 7 }
Connections {
target: root.backend
onLoginFinished: rightContent.showAccount()
}
}
}
}
@ -353,5 +344,4 @@ Item {
signIn.username = username
rightContent.showSignIn()
}
}