GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-08 22:19:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:Ultimaker/Cura

Browse Source
This commit is contained in:
Diego Prado Gesto 2018-03-21 15:10:38 +01:00
commit e6849d1b82
4 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerJob.py
View File

@ -69,7 +69,7 @@ class FirmwareUpdateCheckerJob(Job):
# If we do this in a cool way, the download url should be available in the JSON file # If we do this in a cool way, the download url should be available in the JSON file
if self._set_download_url_callback: if self._set_download_url_callback:
self._set_download_url_callback("https://ultimaker.com/en/resources/20500-upgrade-firmware") self._set_download_url_callback("https://ultimaker.com/en/resources/23129-updating-the-firmware?utm_source=cura&utm_medium=software&utm_campaign=hw-update")
message.actionTriggered.connect(self._callback) message.actionTriggered.connect(self._callback)
message.show() message.show()

2
plugins/SimulationView/SimulationView.py
View File

@ -74,7 +74,7 @@ class SimulationView(View):
self._global_container_stack = None self._global_container_stack = None
self._proxy = SimulationViewProxy() self._proxy = SimulationViewProxy()
self._controller.getScene().getRoot().childrenChanged.connect(self._onSceneChanged) self._controller.getScene().sceneChanged.connect(self._onSceneChanged)
self._resetSettings() self._resetSettings()
self._legend_items = None self._legend_items = None

10
plugins/UM3NetworkPrinting/PrinterInfoBlock.qml
View File

@ -34,17 +34,17 @@ Rectangle
switch (printer.state) switch (printer.state)
{ {
case "pre_print": case "pre_print":
return catalog.i18nc("@label", "Preparing to print") return catalog.i18nc("@label:status", "Preparing to print")
case "printing": case "printing":
return catalog.i18nc("@label:status", "Printing"); return catalog.i18nc("@label:status", "Printing");
case "idle": case "idle":
return catalog.i18nc("@label:status", "Available"); return catalog.i18nc("@label:status", "Available");
case "unreachable": case "unreachable":
return catalog.i18nc("@label:MonitorStatus", "Lost connection with the printer"); return catalog.i18nc("@label:status", "Lost connection with the printer");
case "maintenance": // TODO: new string case "maintenance":
case "unknown": return catalog.i18nc("@label:status", "Unavailable");
default: default:
return catalog.i18nc("@label Printer status", "Unknown"); return catalog.i18nc("@label:status", "Unknown");
} }
} }

3
plugins/VersionUpgrade/VersionUpgrade32to33/VersionUpgrade32to33.py
View File

@ -127,6 +127,9 @@ class VersionUpgrade32to33(VersionUpgrade):
parser["metadata"]["position"] = str(extruder_position) parser["metadata"]["position"] = str(extruder_position)
del parser["metadata"]["extruder"] del parser["metadata"]["extruder"]
quality_type = parser["metadata"]["quality_type"]
parser["metadata"]["quality_type"] = quality_type.lower()
#Update version number. #Update version number.
parser["general"]["version"] = "3" parser["general"]["version"] = "3"