yesBad/proton-bridge
1
0
Fork 0
forked from Silverfish/proton-bridge
Code Actions 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

61
internal/frontend/qml/Notifications/Notifications.qml
View File

@ -56,6 +56,8 @@ QtObject {
root.updateSilentRestartNeeded,
root.updateSilentError,
root.updateIsLatestVersion,
root.loginConnectionError,
root.onlyPaidUsers,
root.disableBeta,
root.enableBeta,
root.bugReportSendSuccess,
@ -119,7 +121,7 @@ QtObject {
text: qsTr("Update manually")
onTriggered: {
Qt.openUrlExternally(root.backend.getLandingPage())
Qt.openUrlExternally(root.backend.landingPageLink)
root.updateManualReady.active = false
}
},
@ -174,7 +176,7 @@ QtObject {
text: qsTr("Update manually")
onTriggered: {
Qt.openUrlExternally(root.backend.getLandingPage())
Qt.openUrlExternally(root.backend.landingPageLink)
root.updateManualError.active = false
}
},
@ -217,7 +219,7 @@ QtObject {
text: qsTr("Update manually")
onTriggered: {
Qt.openUrlExternally(root.backend.getLandingPage())
Qt.openUrlExternally(root.backend.landingPageLink)
root.updateForce.active = false
}
},
@ -252,7 +254,7 @@ QtObject {
text: qsTr("Update manually")
onTriggered: {
Qt.openUrlExternally(root.backend.getLandingPage())
Qt.openUrlExternally(root.backend.landingPageLink)
root.updateForceError.active = false
}
},
@ -307,7 +309,7 @@ QtObject {
text: qsTr("Update manually")
onTriggered: {
Qt.openUrlExternally(root.backend.getLandingPage())
Qt.openUrlExternally(root.backend.landingPageLink)
root.updateSilentError.active = false
}
}
@ -399,6 +401,52 @@ QtObject {
]
}
// login
property Notification loginConnectionError: Notification {
text: qsTr("Bridge is not able to contact the server, please check your internet connection.")
icon: "./icons/ic-exclamation-circle-filled.svg"
type: Notification.NotificationType.Danger
group: Notifications.Group.Configuration
Connections {
target: root.backend
onLoginConnectionError: {
root.loginConnectionError.active = true
}
}
action: [
Action {
text: qsTr("OK")
onTriggered: {
root.loginConnectionError.active = false
}
}
]
}
property Notification onlyPaidUsers: Notification {
text: qsTr("Bridge is exclusive to our paid plans. Upgrade your account to use Bridge.")
icon: "./icons/ic-exclamation-circle-filled.svg"
type: Notification.NotificationType.Danger
group: Notifications.Group.Configuration
Connections {
target: root.backend
onLoginFreeUserError: {
root.onlyPaidUsers.active = true
}
}
action: [
Action {
text: qsTr("OK")
onTriggered: {
root.onlyPaidUsers.active = false
}
}
]
}
// Bug reports
property Notification bugReportSendSuccess: Notification {
@ -420,9 +468,6 @@ QtObject {
onTriggered: {
root.bugReportSendSuccess.active = false
}
},
Action {
text: "test"
}
]
}