GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-14 04:55:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'CURA-7017_link_to_help' of github.com:Ultimaker/Cura

Browse Source
This commit is contained in:
Jaime van Kessel 2020-03-18 10:49:35 +01:00
commit ced25adc2b
No known key found for this signature in database
GPG Key ID: 3710727397403C91
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
resources/qml/WelcomePages/AddPrinterByIpContent.qml
View File

@ -159,6 +159,7 @@ Item
enabled: !addPrinterByIpScreen.hasRequestInProgress && !addPrinterByIpScreen.isPrinterDiscovered && (hostnameField.state != "invalid" && hostnameField.text != "") enabled: !addPrinterByIpScreen.hasRequestInProgress && !addPrinterByIpScreen.isPrinterDiscovered && (hostnameField.state != "invalid" && hostnameField.text != "")
onClicked: onClicked:
{ {
addPrinterByIpScreen.hasRequestFinished = false //In case it's pressed multiple times.
const address = hostnameField.text const address = hostnameField.text
if (!networkingUtil.isValidIP(address)) if (!networkingUtil.isValidIP(address))
{ {
@ -197,17 +198,21 @@ Item
renderType: Text.NativeRendering renderType: Text.NativeRendering
visible: addPrinterByIpScreen.hasRequestInProgress || (addPrinterByIpScreen.hasRequestFinished && !addPrinterByIpScreen.isPrinterDiscovered) visible: addPrinterByIpScreen.hasRequestInProgress || (addPrinterByIpScreen.hasRequestFinished && !addPrinterByIpScreen.isPrinterDiscovered)
textFormat: Text.RichText
text: text:
{ {
if (addPrinterByIpScreen.hasRequestFinished) if (addPrinterByIpScreen.hasRequestFinished)
{ {
catalog.i18nc("@label", "Could not connect to device.") return catalog.i18nc("@label", "Could not connect to device.") + "<br /><br /><a href=\"https://ultimaker.com/en/resources/52891-set-up-a-cloud-connection\">"
+ catalog.i18nc("@label", "Can't connect to your Ultimaker printer?") + "</a>";
} }
else else
{ {
catalog.i18nc("@label", "The printer at this address has not responded yet.") return catalog.i18nc("@label", "The printer at this address has not responded yet.") + "<br /><br /><a href=\"https://ultimaker.com/en/resources/52891-set-up-a-cloud-connection\">"
+ catalog.i18nc("@label", "Can't connect to your Ultimaker printer?") + "</a>";
} }
} }
onLinkActivated: Qt.openUrlExternally(link)
} }
Item Item