diff --git a/NetworkPrinterOutputDevice.py b/NetworkPrinterOutputDevice.py
index b119f5ff8b..208ad80d51 100644
--- a/NetworkPrinterOutputDevice.py
+++ b/NetworkPrinterOutputDevice.py
@@ -441,27 +441,35 @@ class NetworkPrinterOutputDevice(PrinterOutputDevice):
material = extruder_manager.getExtruderStack(0).findContainer({"type": "material"})
if material:
if material.getMetaDataEntry("GUID") != self._json_printer_state["heads"][0]["extruders"][index]["active_material"]["GUID"]:
- warnings.append(i18n_catalog.i18nc("@label", "Different material selected for extruder {0}").format(index + 1))
+ warnings.append(i18n_catalog.i18nc("@label", "Different material selected for extruder {0}").format(index + 1))
if warnings:
- text = i18n_catalog.i18nc("@label", "A number of configurations are mismatched. Are you sure you wish to print with the selected configuration?")
- detailed_text = "
"
+ text = i18n_catalog.i18nc("@label", "Are you sure you wish to print with the selected configuration?")
+ informative_text = i18n_catalog.i18nc("@label", "There is a mismatch between the configuration of the printer and Cura. "
+ "For the best result, always slice for the PrintCores and materials that are inserted in your printer.")
+ detailed_text = ""
for warning in warnings:
- detailed_text += "- " + warning + "
"
+ detailed_text += warning + "\n"
- detailed_text += "
"
Application.getInstance().messageBox(i18n_catalog.i18nc("@window:title", "Mismatched configuration"),
text,
+ informative_text,
detailed_text,
buttons=QMessageBox.Yes + QMessageBox.No,
icon=QMessageBox.Question,
- callback=self._configurationCallback
+ callback=self._configurationMismatchMessageCallback
)
return
self.startPrint()
+ def _configurationMismatchMessageCallback(self, button):
+ if button == QMessageBox.Yes:
+ self.startPrint()
+ else:
+ Application.getInstance().showPrintMonitor.emit(False)
+
def isConnected(self):
return self._connection_state != ConnectionState.closed and self._connection_state != ConnectionState.error
@@ -789,7 +797,3 @@ class NetworkPrinterOutputDevice(PrinterOutputDevice):
icon=QMessageBox.Question,
callback=callback
)
-
- def _configurationCallback(self, button):
- if button == QMessageBox.Yes:
- self.startPrint()