diff --git a/cura/UI/PrintInformation.py b/cura/UI/PrintInformation.py index a4c1410c0e..e18fc38247 100644 --- a/cura/UI/PrintInformation.py +++ b/cura/UI/PrintInformation.py @@ -132,7 +132,7 @@ class PrintInformation(QObject): self._updateJobName() self.preSlicedChanged.emit() - @pyqtProperty(Duration, notify = currentPrintTimeChanged) + @pyqtProperty(QObject, notify = currentPrintTimeChanged) def currentPrintTime(self) -> Duration: return self._current_print_time[self._active_build_plate] diff --git a/resources/qml/ExpandableComponent.qml b/resources/qml/ExpandableComponent.qml index 6717be94a5..1fef90d367 100644 --- a/resources/qml/ExpandableComponent.qml +++ b/resources/qml/ExpandableComponent.qml @@ -249,13 +249,13 @@ Item } property var clickPos: Qt.point(0, 0) property bool dragging: false - onPressed: + onPressed: (mouse) => { clickPos = Qt.point(mouse.x, mouse.y); dragging = true } - onPositionChanged: + onPositionChanged: (mouse) => { if(dragging) { diff --git a/resources/qml/Preferences/Materials/MaterialsView.qml b/resources/qml/Preferences/Materials/MaterialsView.qml index f8b9a41359..b033f755cf 100644 --- a/resources/qml/Preferences/Materials/MaterialsView.qml +++ b/resources/qml/Preferences/Materials/MaterialsView.qml @@ -206,7 +206,8 @@ Item { height: informationPage.rowHeight width: informationPage.columnWidth - verticalAlignment: Qt.AlignmentFlag.AlignVCenter; text: catalog.i18nc("@label", "Color") + verticalAlignment: Qt.AlignVCenter + text: catalog.i18nc("@label", "Color") } Row @@ -270,7 +271,7 @@ Item width: parent.width height: parent.rowHeight font: UM.Theme.getFont("default_bold") - verticalAlignment: Qt.AlignmentFlag.AlignVCenter + verticalAlignment: Qt.AlignVCenter text: catalog.i18nc("@label", "Properties") } @@ -571,7 +572,7 @@ Item height: spinBox.height + UM.Theme.getSize("default_lining").height text: model.label elide: Text.ElideRight - verticalAlignment: Qt.AlignmentFlag.AlignVCenter + verticalAlignment: Qt.AlignVCenter } Cura.SpinBox { diff --git a/resources/qml/Settings/SettingView.qml b/resources/qml/Settings/SettingView.qml index e6cbc7d46a..b8cd95c889 100644 --- a/resources/qml/Settings/SettingView.qml +++ b/resources/qml/Settings/SettingView.qml @@ -172,7 +172,7 @@ Item { anchors.fill: contents acceptedButtons: Qt.AllButtons - onWheel: wheel.accepted = true + onWheel: (wheel) => { wheel.accepted = true } } ListView diff --git a/resources/themes/cura-light/theme.json b/resources/themes/cura-light/theme.json index 9af58897c0..86d9766d1b 100644 --- a/resources/themes/cura-light/theme.json +++ b/resources/themes/cura-light/theme.json @@ -6,7 +6,7 @@ "fonts": { "large": { "size": 1.35, - "weight": 350, + "weight": 400, "family": "Noto Sans" }, "large_ja_JP": { @@ -41,7 +41,7 @@ }, "medium": { "size": 1.16, - "weight": 350, + "weight": 400, "family": "Noto Sans" }, "medium_ja_JP": { @@ -66,7 +66,7 @@ }, "default": { "size": 0.95, - "weight": 350, + "weight": 400, "family": "Noto Sans" }, "default_ja_JP": { @@ -106,7 +106,7 @@ }, "default_italic": { "size": 0.95, - "weight": 350, + "weight": 400, "italic": true, "family": "Noto Sans" }, @@ -130,7 +130,7 @@ }, "small": { "size": 0.9, - "weight": 350, + "weight": 400, "family": "Noto Sans" }, "small_ja_JP": { @@ -150,22 +150,22 @@ }, "small_emphasis": { "size": 0.9, - "weight": 1000, + "weight": 700, "family": "Noto Sans" }, "small_emphasis_ja_JP": { "size": 0.9, - "weight": 1000, + "weight": 700, "family": "Noto Sans" }, "small_emphasis_zh_CN": { "size": 0.9, - "weight": 1000, + "weight": 700, "family": "Noto Sans" }, "small_emphasis_zh_TW": { "size": 0.9, - "weight": 1000, + "weight": 700, "family": "Noto Sans" } },