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

GODT-1751: fix QML hardcoded links

Browse Source
This commit is contained in:
Romain LE JEUNE
2022-10-28 15:49:48 +02:00
parent 7c3414b86f
commit 5ab63a290e
5 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -852,9 +852,9 @@ Window {
property string version: "2.0.X-BridePreview"
property url logsPath: StandardPaths.standardLocations(StandardPaths.HomeLocation)[0]
property url licensePath: StandardPaths.standardLocations(StandardPaths.HomeLocation)[0]
property url releaseNotesLink: Qt.resolvedUrl("https://protonmail.com/download/bridge/early_releases.html")
property url releaseNotesLink: Qt.resolvedUrl("https://proton.me/download/bridge/early_releases.html")
property url dependencyLicensesLink: Qt.resolvedUrl("https://github.com/ProtonMail/proton-bridge/v2/blob/master/COPYING_NOTES.md#dependencies")
property url landingPageLink: Qt.resolvedUrl("https://protonmail.com/bridge")
property url landingPageLink: Qt.resolvedUrl("https://proton.me/mail/bridge#download")
property string colorSchemeName: "light"
function changeColorScheme(newScheme){

2
internal/frontend/bridge-gui/bridge-gui/qml/HelpView.qml
View File

@ -41,7 +41,7 @@ SettingsView {
actionIcon: "/qml/icons/ic-external-link.svg"
description: qsTr("Get help setting up your client with our instructions and FAQs.")
type: SettingsItem.PrimaryButton
onClicked: {Qt.openUrlExternally("https://protonmail.com/support/categories/bridge/")}
onClicked: {Qt.openUrlExternally("https://proton.me/support/mail")}
Layout.fillWidth: true
}

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

@ -289,7 +289,7 @@ QtObject {
property Notification updateForceError: Notification {
title: qsTr("Bridge coudn’t update")
description: qsTr("You must update manually. Go to: https:/protonmail.com/bridge/download")
description: qsTr("You must update manually. Go to: https://proton.me/mail/bridge#download")
brief: title
icon: "./icons/ic-exclamation-circle-filled.svg"
type: Notification.NotificationType.Danger
@ -997,7 +997,7 @@ QtObject {
type: Notification.NotificationType.Danger
group: Notifications.Group.Dialogs | Notifications.Group.Configuration
property var supportLink: "https://protonmail.com/support/knowledge-base/macos-keychain-corrupted"
property var supportLink: "https://proton.me/support/mail"
Connections {

12
internal/frontend/bridge-gui/bridge-gui/qml/SetupGuide.qml
View File

@ -42,7 +42,7 @@ Item {
property string name : "Apple Mail"
property string iconSource : "/qml/icons/ic-apple-mail.svg"
property bool haveAutoSetup: true
property string link: "https://protonmail.com/bridge/applemail"
property string link: "https://proton.me/support/protonmail-bridge-clients-apple-mail"
Component.onCompleted : {
if (Backend.goos == "darwin") {
@ -50,13 +50,13 @@ Item {
"name" : "Apple Mail",
"iconSource" : "/qml/icons/ic-apple-mail.svg",
"haveAutoSetup" : true,
"link" : "https://protonmail.com/bridge/applemail"
"link" : "https://proton.me/support/protonmail-bridge-clients-apple-mail"
})
append({
"name" : "Microsoft Outlook",
"iconSource" : "/qml/icons/ic-microsoft-outlook.svg",
"haveAutoSetup" : false,
"link" : "https://protonmail.com/bridge/outlook2019-mac"
"link" : "https://proton.me/support/protonmail-bridge-clients-macos-outlook-2019"
})
}
if (Backend.goos == "windows") {
@ -64,7 +64,7 @@ Item {
"name" : "Microsoft Outlook",
"iconSource" : "/qml/icons/ic-microsoft-outlook.svg",
"haveAutoSetup" : false,
"link" : "https://protonmail.com/bridge/outlook2019"
"link" : "https://proton.me/support/protonmail-bridge-clients-windows-outlook-2019"
})
}
@ -72,14 +72,14 @@ Item {
"name" : "Mozilla Thunderbird",
"iconSource" : "/qml/icons/ic-mozilla-thunderbird.svg",
"haveAutoSetup" : false,
"link" : "https://protonmail.com/bridge/thunderbird"
"link" : "https://proton.me/support/protonmail-bridge-clients-windows-thunderbird"
})
append({
"name" : "Other",
"iconSource" : "/qml/icons/ic-other-mail-clients.svg",
"haveAutoSetup" : false,
"link" : "https://protonmail.com/bridge/clients"
"link" : "https://proton.me/support/protonmail-bridge-configure-client"
})
}

2
internal/frontend/bridge-gui/bridge-gui/qml/SignIn.qml
View File

@ -288,7 +288,7 @@ FocusScope {
Label {
colorScheme: root.colorScheme
textFormat: Text.StyledText
text: link("https://protonmail.com/signup", qsTr("Create or upgrade your account"))
text: link("https://proton.me/mail/pricing", qsTr("Create or upgrade your account"))
Layout.alignment: Qt.AlignHCenter
Layout.topMargin: 24
type: Label.LabelType.Body