diff --git a/plugins/3MFReader/WorkspaceDialog.py b/plugins/3MFReader/WorkspaceDialog.py index 5e5eaf985e..349dec177b 100644 --- a/plugins/3MFReader/WorkspaceDialog.py +++ b/plugins/3MFReader/WorkspaceDialog.py @@ -285,14 +285,6 @@ class WorkspaceDialog(QObject): except: pass - @pyqtSlot(bool) - def _onVisibilityChanged(self, visible): - if not visible: - try: - self._lock.release() - except: - pass - @pyqtSlot() def onOkButtonClicked(self): self._view.hide() diff --git a/plugins/3MFReader/WorkspaceDialog.qml b/plugins/3MFReader/WorkspaceDialog.qml index a633491248..b1ece2be96 100644 --- a/plugins/3MFReader/WorkspaceDialog.qml +++ b/plugins/3MFReader/WorkspaceDialog.qml @@ -14,7 +14,7 @@ UM.Dialog title: catalog.i18nc("@title:window", "Open Project") minimumWidth: 500 * screenScaleFactor - minimumHeight: 400 * screenScaleFactor + minimumHeight: 450 * screenScaleFactor width: minimumWidth height: minimumHeight diff --git a/plugins/CuraEngineBackend/CuraEngineBackend.py b/plugins/CuraEngineBackend/CuraEngineBackend.py index c89f476fa9..914aa1dee0 100755 --- a/plugins/CuraEngineBackend/CuraEngineBackend.py +++ b/plugins/CuraEngineBackend/CuraEngineBackend.py @@ -441,7 +441,7 @@ class CuraEngineBackend(QObject, Backend): def _onStackErrorCheckFinished(self): self._is_error_check_scheduled = False - if self._need_slicing: + if not self._slicing and self._need_slicing: self.needsSlicing() self._onChanged() @@ -536,7 +536,6 @@ class CuraEngineBackend(QObject, Backend): # # \param message The protobuf message containing the print time per feature def _parseMessagePrintTimes(self, message): - result = { "inset_0": message.time_inset_0, "inset_x": message.time_inset_x, diff --git a/plugins/MachineSettingsAction/MachineSettingsAction.qml b/plugins/MachineSettingsAction/MachineSettingsAction.qml index 613a28f3b7..cd7738da11 100644 --- a/plugins/MachineSettingsAction/MachineSettingsAction.qml +++ b/plugins/MachineSettingsAction/MachineSettingsAction.qml @@ -247,7 +247,7 @@ Cura.MachineAction Row { - spacing: UM.Theme.getSize("default_margin").width + spacing: UM.Theme.getSize("default_margin").width * 4 / 5 Label { @@ -648,7 +648,7 @@ Cura.MachineAction Row { - spacing: UM.Theme.getSize("default_margin").width + spacing: UM.Theme.getSize("default_margin").width * 4 / 5 Label { diff --git a/plugins/UM3NetworkPrinting/DiscoverUM3Action.qml b/plugins/UM3NetworkPrinting/DiscoverUM3Action.qml index b9b85ef2d4..7594d1691d 100644 --- a/plugins/UM3NetworkPrinting/DiscoverUM3Action.qml +++ b/plugins/UM3NetworkPrinting/DiscoverUM3Action.qml @@ -321,7 +321,7 @@ Cura.MachineAction title: catalog.i18nc("@title:window", "Printer Address") minimumWidth: 400 * screenScaleFactor - minimumHeight: 120 * screenScaleFactor + minimumHeight: 130 * screenScaleFactor width: minimumWidth height: minimumHeight diff --git a/plugins/UM3NetworkPrinting/PrinterInfoBlock.qml b/plugins/UM3NetworkPrinting/PrinterInfoBlock.qml index da5ebc7e37..25be77bd7d 100644 --- a/plugins/UM3NetworkPrinting/PrinterInfoBlock.qml +++ b/plugins/UM3NetworkPrinting/PrinterInfoBlock.qml @@ -189,7 +189,7 @@ Rectangle PrintCoreConfiguration { id: leftExtruderInfo - width: (parent.width - extruderSeperator.width) / 2 + width: Math.floor((parent.width - extruderSeperator.width) / 2) printCoreConfiguration: printer.configuration[0] } @@ -204,7 +204,7 @@ Rectangle PrintCoreConfiguration { id: rightExtruderInfo - width: (parent.width - extruderSeperator.width) / 2 + width: Math.floor((parent.width - extruderSeperator.width) / 2) printCoreConfiguration: printer.configuration[1] } } @@ -404,6 +404,8 @@ Rectangle anchors.left: parent.left anchors.right: parent.right elide: Text.ElideRight + wrapMode: Text.Wrap + font: UM.Theme.getFont("default") } diff --git a/resources/qml/Preferences/MaterialView.qml b/resources/qml/Preferences/MaterialView.qml index c1750b2342..b13ce1aadf 100644 --- a/resources/qml/Preferences/MaterialView.qml +++ b/resources/qml/Preferences/MaterialView.qml @@ -16,8 +16,8 @@ TabView property bool editingEnabled: false; property string currency: UM.Preferences.getValue("cura/currency") ? UM.Preferences.getValue("cura/currency") : "€" - property real firstColumnWidth: (width * 0.45) | 0 - property real secondColumnWidth: (width * 0.45) | 0 + property real firstColumnWidth: (width * 0.50) | 0 + property real secondColumnWidth: (width * 0.40) | 0 property string containerId: "" property var materialPreferenceValues: UM.Preferences.getValue("cura/material_settings") ? JSON.parse(UM.Preferences.getValue("cura/material_settings")) : {}