3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-25 07:33:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merge remote-tracking branch 'origin/qt6_beyond_the_splash' into qt6_beyond_the_splash

Browse source
This commit is contained in:
j.delarago 2022-04-01 17:26:28 +02:00
commit 0f84fc3abe
5 changed files with 17 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cura/UI/PrintInformation.py
View file

@ -132,7 +132,7 @@ class PrintInformation(QObject):
self._updateJobName() self._updateJobName()
self.preSlicedChanged.emit() self.preSlicedChanged.emit()
@pyqtProperty(Duration, notify = currentPrintTimeChanged) @pyqtProperty(QObject, notify = currentPrintTimeChanged)
def currentPrintTime(self) -> Duration: def currentPrintTime(self) -> Duration:
return self._current_print_time[self._active_build_plate] return self._current_print_time[self._active_build_plate]

4
resources/qml/ExpandableComponent.qml
View file

@ -249,13 +249,13 @@ Item
} }
property var clickPos: Qt.point(0, 0) property var clickPos: Qt.point(0, 0)
property bool dragging: false property bool dragging: false
onPressed: onPressed: (mouse) =>
{ {
clickPos = Qt.point(mouse.x, mouse.y); clickPos = Qt.point(mouse.x, mouse.y);
dragging = true dragging = true
} }
onPositionChanged: onPositionChanged: (mouse) =>
{ {
if(dragging) if(dragging)
{ {

7
resources/qml/Preferences/Materials/MaterialsView.qml
View file

@ -206,7 +206,8 @@ Item
{ {
height: informationPage.rowHeight height: informationPage.rowHeight
width: informationPage.columnWidth width: informationPage.columnWidth
verticalAlignment: Qt.AlignmentFlag.AlignVCenter; text: catalog.i18nc("@label", "Color") verticalAlignment: Qt.AlignVCenter
text: catalog.i18nc("@label", "Color")
} }
Row Row
@ -270,7 +271,7 @@ Item
width: parent.width width: parent.width
height: parent.rowHeight height: parent.rowHeight
font: UM.Theme.getFont("default_bold") font: UM.Theme.getFont("default_bold")
verticalAlignment: Qt.AlignmentFlag.AlignVCenter verticalAlignment: Qt.AlignVCenter
text: catalog.i18nc("@label", "Properties") text: catalog.i18nc("@label", "Properties")
} }
@ -571,7 +572,7 @@ Item
height: spinBox.height + UM.Theme.getSize("default_lining").height height: spinBox.height + UM.Theme.getSize("default_lining").height
text: model.label text: model.label
elide: Text.ElideRight elide: Text.ElideRight
verticalAlignment: Qt.AlignmentFlag.AlignVCenter verticalAlignment: Qt.AlignVCenter
} }
Cura.SpinBox Cura.SpinBox
{ {

2
resources/qml/Settings/SettingView.qml
View file

@ -172,7 +172,7 @@ Item
{ {
anchors.fill: contents anchors.fill: contents
acceptedButtons: Qt.AllButtons acceptedButtons: Qt.AllButtons
onWheel: wheel.accepted = true onWheel: (wheel) => { wheel.accepted = true }
} }
ListView ListView

18
resources/themes/cura-light/theme.json
View file

@ -6,7 +6,7 @@
"fonts": { "fonts": {
"large": { "large": {
"size": 1.35, "size": 1.35,
"weight": 350, "weight": 400,
"family": "Noto Sans" "family": "Noto Sans"
}, },
"large_ja_JP": { "large_ja_JP": {
@ -41,7 +41,7 @@
}, },
"medium": { "medium": {
"size": 1.16, "size": 1.16,
"weight": 350, "weight": 400,
"family": "Noto Sans" "family": "Noto Sans"
}, },
"medium_ja_JP": { "medium_ja_JP": {
@ -66,7 +66,7 @@
}, },
"default": { "default": {
"size": 0.95, "size": 0.95,
"weight": 350, "weight": 400,
"family": "Noto Sans" "family": "Noto Sans"
}, },
"default_ja_JP": { "default_ja_JP": {
@ -106,7 +106,7 @@
}, },
"default_italic": { "default_italic": {
"size": 0.95, "size": 0.95,
"weight": 350, "weight": 400,
"italic": true, "italic": true,
"family": "Noto Sans" "family": "Noto Sans"
}, },
@ -130,7 +130,7 @@
}, },
"small": { "small": {
"size": 0.9, "size": 0.9,
"weight": 350, "weight": 400,
"family": "Noto Sans" "family": "Noto Sans"
}, },
"small_ja_JP": { "small_ja_JP": {
@ -150,22 +150,22 @@
}, },
"small_emphasis": { "small_emphasis": {
"size": 0.9, "size": 0.9,
"weight": 1000, "weight": 700,
"family": "Noto Sans" "family": "Noto Sans"
}, },
"small_emphasis_ja_JP": { "small_emphasis_ja_JP": {
"size": 0.9, "size": 0.9,
"weight": 1000, "weight": 700,
"family": "Noto Sans" "family": "Noto Sans"
}, },
"small_emphasis_zh_CN": { "small_emphasis_zh_CN": {
"size": 0.9, "size": 0.9,
"weight": 1000, "weight": 700,
"family": "Noto Sans" "family": "Noto Sans"
}, },
"small_emphasis_zh_TW": { "small_emphasis_zh_TW": {
"size": 0.9, "size": 0.9,
"weight": 1000, "weight": 700,
"family": "Noto Sans" "family": "Noto Sans"
} }
}, },