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

Merge branch 'CURA-7460_Change_popup_tooltip_when_printer_is_offline' into CURA-7438_Show_cloud_connection_not_available_printer_removed_from_account

Browse Source
This commit is contained in:
Kostas Karmas 2020-06-04 10:46:54 +02:00
commit 230ba01d14
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
resources/qml/PrinterSelector/MachineSelector.qml
View File

@ -38,12 +38,23 @@ Cura.ExpandablePopup
readonly property string connectionStatusMessage: { readonly property string connectionStatusMessage: {
if (connectionStatus == "printer_cloud_not_available") if (connectionStatus == "printer_cloud_not_available")
{ {
if(Cura.API.connectionStatus.isInternetReachable){ if(Cura.API.connectionStatus.isInternetReachable)
return catalog.i18nc("@status", "The cloud connection is currently unavailable. Please check your internet connection and sign in to connect to the cloud printer.") {
} else { if (Cura.API.account.isLoggedIn)
{
return catalog.i18nc("@status", "The cloud printer is offline. Please check if the printer is turned on and connected to the internet.")
}
else
{
return catalog.i18nc("@status", "The cloud connection is currently unavailable. Please sign in to connect to the cloud printer.")
}
} else
{
return catalog.i18nc("@status", "The cloud connection is currently unavailable. Please check your internet connection.") return catalog.i18nc("@status", "The cloud connection is currently unavailable. Please check your internet connection.")
} }
} else { }
else
{
return "" return ""
} }
} }