forked from Silverfish/proton-bridge
GODT-1751: fix QML hardcoded links
This commit is contained in:
@ -852,9 +852,9 @@ Window {
|
|||||||
property string version: "2.0.X-BridePreview"
|
property string version: "2.0.X-BridePreview"
|
||||||
property url logsPath: StandardPaths.standardLocations(StandardPaths.HomeLocation)[0]
|
property url logsPath: StandardPaths.standardLocations(StandardPaths.HomeLocation)[0]
|
||||||
property url licensePath: 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 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"
|
property string colorSchemeName: "light"
|
||||||
function changeColorScheme(newScheme){
|
function changeColorScheme(newScheme){
|
||||||
|
|||||||
@ -41,7 +41,7 @@ SettingsView {
|
|||||||
actionIcon: "/qml/icons/ic-external-link.svg"
|
actionIcon: "/qml/icons/ic-external-link.svg"
|
||||||
description: qsTr("Get help setting up your client with our instructions and FAQs.")
|
description: qsTr("Get help setting up your client with our instructions and FAQs.")
|
||||||
type: SettingsItem.PrimaryButton
|
type: SettingsItem.PrimaryButton
|
||||||
onClicked: {Qt.openUrlExternally("https://protonmail.com/support/categories/bridge/")}
|
onClicked: {Qt.openUrlExternally("https://proton.me/support/mail")}
|
||||||
|
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
}
|
}
|
||||||
|
|||||||
@ -289,7 +289,7 @@ QtObject {
|
|||||||
|
|
||||||
property Notification updateForceError: Notification {
|
property Notification updateForceError: Notification {
|
||||||
title: qsTr("Bridge coudn’t update")
|
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
|
brief: title
|
||||||
icon: "./icons/ic-exclamation-circle-filled.svg"
|
icon: "./icons/ic-exclamation-circle-filled.svg"
|
||||||
type: Notification.NotificationType.Danger
|
type: Notification.NotificationType.Danger
|
||||||
@ -997,7 +997,7 @@ QtObject {
|
|||||||
type: Notification.NotificationType.Danger
|
type: Notification.NotificationType.Danger
|
||||||
group: Notifications.Group.Dialogs | Notifications.Group.Configuration
|
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 {
|
Connections {
|
||||||
|
|||||||
@ -42,7 +42,7 @@ Item {
|
|||||||
property string name : "Apple Mail"
|
property string name : "Apple Mail"
|
||||||
property string iconSource : "/qml/icons/ic-apple-mail.svg"
|
property string iconSource : "/qml/icons/ic-apple-mail.svg"
|
||||||
property bool haveAutoSetup: true
|
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 : {
|
Component.onCompleted : {
|
||||||
if (Backend.goos == "darwin") {
|
if (Backend.goos == "darwin") {
|
||||||
@ -50,13 +50,13 @@ Item {
|
|||||||
"name" : "Apple Mail",
|
"name" : "Apple Mail",
|
||||||
"iconSource" : "/qml/icons/ic-apple-mail.svg",
|
"iconSource" : "/qml/icons/ic-apple-mail.svg",
|
||||||
"haveAutoSetup" : true,
|
"haveAutoSetup" : true,
|
||||||
"link" : "https://protonmail.com/bridge/applemail"
|
"link" : "https://proton.me/support/protonmail-bridge-clients-apple-mail"
|
||||||
})
|
})
|
||||||
append({
|
append({
|
||||||
"name" : "Microsoft Outlook",
|
"name" : "Microsoft Outlook",
|
||||||
"iconSource" : "/qml/icons/ic-microsoft-outlook.svg",
|
"iconSource" : "/qml/icons/ic-microsoft-outlook.svg",
|
||||||
"haveAutoSetup" : false,
|
"haveAutoSetup" : false,
|
||||||
"link" : "https://protonmail.com/bridge/outlook2019-mac"
|
"link" : "https://proton.me/support/protonmail-bridge-clients-macos-outlook-2019"
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
if (Backend.goos == "windows") {
|
if (Backend.goos == "windows") {
|
||||||
@ -64,7 +64,7 @@ Item {
|
|||||||
"name" : "Microsoft Outlook",
|
"name" : "Microsoft Outlook",
|
||||||
"iconSource" : "/qml/icons/ic-microsoft-outlook.svg",
|
"iconSource" : "/qml/icons/ic-microsoft-outlook.svg",
|
||||||
"haveAutoSetup" : false,
|
"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",
|
"name" : "Mozilla Thunderbird",
|
||||||
"iconSource" : "/qml/icons/ic-mozilla-thunderbird.svg",
|
"iconSource" : "/qml/icons/ic-mozilla-thunderbird.svg",
|
||||||
"haveAutoSetup" : false,
|
"haveAutoSetup" : false,
|
||||||
"link" : "https://protonmail.com/bridge/thunderbird"
|
"link" : "https://proton.me/support/protonmail-bridge-clients-windows-thunderbird"
|
||||||
})
|
})
|
||||||
|
|
||||||
append({
|
append({
|
||||||
"name" : "Other",
|
"name" : "Other",
|
||||||
"iconSource" : "/qml/icons/ic-other-mail-clients.svg",
|
"iconSource" : "/qml/icons/ic-other-mail-clients.svg",
|
||||||
"haveAutoSetup" : false,
|
"haveAutoSetup" : false,
|
||||||
"link" : "https://protonmail.com/bridge/clients"
|
"link" : "https://proton.me/support/protonmail-bridge-configure-client"
|
||||||
})
|
})
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -288,7 +288,7 @@ FocusScope {
|
|||||||
Label {
|
Label {
|
||||||
colorScheme: root.colorScheme
|
colorScheme: root.colorScheme
|
||||||
textFormat: Text.StyledText
|
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.alignment: Qt.AlignHCenter
|
||||||
Layout.topMargin: 24
|
Layout.topMargin: 24
|
||||||
type: Label.LabelType.Body
|
type: Label.LabelType.Body
|
||||||
|
|||||||
Reference in New Issue
Block a user