3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-10 07:15:03 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

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

Browse source
This commit is contained in:
Jaime van Kessel 2016-12-13 10:14:21 +01:00
commit 763b853eca
4 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

3
cura/CrashHandler.py
View file

@ -69,8 +69,7 @@ def show(exception_type, value, tb):
layout.addWidget(label)
#label.setScaledContents(True)
label.setText(catalog.i18nc("@label", """
<p>A fatal exception has occurred that we could not recover from!</p>
label.setText(catalog.i18nc("@label", """<p>A fatal exception has occurred that we could not recover from!</p>
<p>We hope this picture of a kitten helps you recover from the shock.</p>
<p>Please use the information below to post a bug report at <a href=\"http://github.com/Ultimaker/Cura/issues\">http://github.com/Ultimaker/Cura/issues</a></p>
"""))

5
cura/Settings/MachineManager.py
View file

@ -1196,8 +1196,9 @@ class MachineManager(QObject):
else:
material_search_criteria["definition"] = "fdmprinter"
material_containers = container_registry.findInstanceContainers(**material_search_criteria)
if material_containers:
search_criteria["material"] = material_containers[0].getId()
# Try all materials to see if there is a quality profile available.
for material_container in material_containers:
search_criteria["material"] = material_container.getId()
containers = container_registry.findInstanceContainers(**search_criteria)
if containers:

4
cura/Settings/QualitySettingsModel.py
View file

@ -185,6 +185,8 @@ class QualitySettingsModel(UM.Qt.ListModel.ListModel):
for definition in definition_container.findDefinitions():
if definition.type == "category":
current_category = definition.label
if self._i18n_catalog:
current_category = self._i18n_catalog.i18nc(definition.key + " label", definition.label)
continue
profile_value = None
@ -237,4 +239,4 @@ class QualitySettingsModel(UM.Qt.ListModel.ListModel):
"category": current_category
})
self.setItems(items)
self.setItems(items)

6
plugins/UM3NetworkPrinting/NetworkPrinterOutputDevice.py
View file

@ -537,7 +537,7 @@ class NetworkPrinterOutputDevice(PrinterOutputDevice):
print_information = Application.getInstance().getPrintInformation()
# Check if PrintCores / materials are loaded at all. Any failure in these results in an Error.
# Check if print cores / materials are loaded at all. Any failure in these results in an Error.
for index in range(0, self._num_extruders):
if print_information.materialLengths[index] != 0:
if self._json_printer_state["heads"][0]["extruders"][index]["hotend"]["id"] == "":
@ -571,7 +571,7 @@ class NetworkPrinterOutputDevice(PrinterOutputDevice):
if variant:
if variant.getName() != core_name:
Logger.log("w", "Extruder %s has a different Cartridge (%s) as Cura (%s)", index + 1, core_name, variant.getName())
warnings.append(i18n_catalog.i18nc("@label", "Different PrintCore (Cura: {0}, Printer: {1}) selected for extruder {2}".format(variant.getName(), core_name, index + 1)))
warnings.append(i18n_catalog.i18nc("@label", "Different print core (Cura: {0}, Printer: {1}) selected for extruder {2}".format(variant.getName(), core_name, index + 1)))
material = extruder_manager.getExtruderStack(index).findContainer({"type": "material"})
if material:
@ -593,7 +593,7 @@ class NetworkPrinterOutputDevice(PrinterOutputDevice):
is_offset_calibrated = True
if not is_offset_calibrated:
warnings.append(i18n_catalog.i18nc("@label", "PrintCore {0} is not properly calibrated. XY calibration needs to be performed on the printer.").format(index + 1))
warnings.append(i18n_catalog.i18nc("@label", "Print core {0} is not properly calibrated. XY calibration needs to be performed on the printer.").format(index + 1))
if warnings:
text = i18n_catalog.i18nc("@label", "Are you sure you wish to print with the selected configuration?")