mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-07-25 07:33:57 -06:00
Merge remote-tracking branch 'origin/qt6_beyond_the_splash' into qt6_beyond_the_splash
This commit is contained in:
commit
0f84fc3abe
5 changed files with 17 additions and 16 deletions
|
@ -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]
|
||||
|
||||
|
|
|
@ -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)
|
||||
{
|
||||
|
|
|
@ -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
|
||||
{
|
||||
|
|
|
@ -172,7 +172,7 @@ Item
|
|||
{
|
||||
anchors.fill: contents
|
||||
acceptedButtons: Qt.AllButtons
|
||||
onWheel: wheel.accepted = true
|
||||
onWheel: (wheel) => { wheel.accepted = true }
|
||||
}
|
||||
|
||||
ListView
|
||||
|
|
|
@ -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"
|
||||
}
|
||||
},
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue