yesBad/proton-bridge
1
0
Fork 0
forked from Silverfish/proton-bridge
Code Actions Activity

GODT-1244: Refactor switching stable-early and factory reset

Browse Source
This commit is contained in:
Alexander Bilyak
2021-11-03 16:55:25 +00:00
committed by Jakub
parent b5b477a3ce
commit 41e15db442
12 changed files with 163 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
internal/frontend/qml/GeneralSettings.qml
View File

@ -79,7 +79,7 @@ SettingsView {
if (!beta.checked) {
root.notifications.askEnableBeta()
} else {
root.notifications.askDisableBeta()
root.backend.toggleBeta(false)
}
}

5
internal/frontend/qml/NotificationPopups.qml
View File

@ -66,11 +66,6 @@ Item {
notification: root.notifications.updateForceError
}
NotificationDialog {
colorScheme: root.colorScheme
notification: root.notifications.disableBeta
}
NotificationDialog {
colorScheme: root.colorScheme
notification: root.notifications.enableBeta

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

@ -29,7 +29,6 @@ QtObject {
property StatusWindow frontendStatus
property SystemTrayIcon frontendTray
signal askDisableBeta()
signal askEnableBeta()
signal askEnableSplitMode(var user)
signal askDisableLocalCache()
@ -58,7 +57,6 @@ QtObject {
root.updateIsLatestVersion,
root.loginConnectionError,
root.onlyPaidUsers,
root.disableBeta,
root.enableBeta,
root.bugReportSendSuccess,
root.bugReportSendError,
@ -337,41 +335,6 @@ QtObject {
}
}
property Notification disableBeta: Notification {
text: qsTr("Disable beta access?")
description: qsTr("This resets Bridge to the current release and will restart the app. Your preferences, cached data, and email client configurations will be cleared. ")
icon: "./icons/ic-exclamation-circle-filled.svg"
type: Notification.NotificationType.Warning
group: Notifications.Group.Update | Notifications.Group.Dialogs
Connections {
target: root
onAskDisableBeta: {
root.disableBeta.active = true
}
}
action: [
Action {
id: disableBeta_remindLater
text: qsTr("Remind me later")
onTriggered: {
root.disableBeta.active = false
}
},
Action {
id: disableBeta_disable
text: qsTr("Disable and restart")
onTriggered: {
root.backend.toggleBeta(false)
disableBeta_disable.loading = true
disableBeta_remindLater.enabled = false
}
}
]
}
property Notification enableBeta: Notification {
text: qsTr("Enable Beta access")
description: qsTr("Be the first to get new updates and use new features. Bridge will update to the latest beta version.")