3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-12-05 16:51:12 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge remote-tracking branch 'origin/CURA-8688_qt6_cleanup' into CURA-8688_qt6_cleanup

Browse source
This commit is contained in:
casper 2022-02-23 14:09:58 +01:00
commit 6f27199bb9
3 changed files with 15 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

6
resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml
View file

@ -91,10 +91,12 @@ UM.Dialog
buttonSpacing: UM.Theme.getSize("thin_margin").width buttonSpacing: UM.Theme.getSize("thin_margin").width
leftButtons: [ leftButtons: [
ComboBox Cura.ComboBox
{ {
implicitHeight: UM.Theme.getSize("combobox_dialog").height
implicitWidth: UM.Theme.getSize("combobox_dialog").width
id: discardOrKeepProfileChangesDropDownButton id: discardOrKeepProfileChangesDropDownButton
width: 300
textRole: "text" textRole: "text"
model: ListModel model: ListModel

30
resources/qml/SpinBox.qml
View file

@ -102,14 +102,13 @@ Item
color: spinBox.up.pressed ? spinBox.palette.mid : UM.Theme.getColor("detail_background") color: spinBox.up.pressed ? spinBox.palette.mid : UM.Theme.getColor("detail_background")
} }
// Minus icon UM.RecolorImage
Rectangle
{ {
x: (parent.width - width) / 2 anchors.centerIn: parent
y: (parent.height - height) / 2 height: parent.height / 2.5
width: parent.width / 4 width: height
height: 2
color: enabled ? UM.Theme.getColor("text") : UM.Theme.getColor("text_disabled") color: enabled ? UM.Theme.getColor("text") : UM.Theme.getColor("text_disabled")
source: UM.Theme.getIcon("Minus")
} }
} }
@ -123,22 +122,13 @@ Item
color: spinBox.up.pressed ? spinBox.palette.mid : UM.Theme.getColor("detail_background") color: spinBox.up.pressed ? spinBox.palette.mid : UM.Theme.getColor("detail_background")
} }
// Plus Icon UM.RecolorImage
Rectangle
{ {
x: (parent.width - width) / 2 anchors.centerIn: parent
y: (parent.height - height) / 2 height: parent.height / 2.5
width: parent.width / 3.5 width: height
height: 2
color: enabled ? UM.Theme.getColor("text") : UM.Theme.getColor("text_disabled")
}
Rectangle
{
x: (parent.width - width) / 2
y: (parent.height - height) / 2
width: 2
height: parent.width / 3.5
color: enabled ? UM.Theme.getColor("text") : UM.Theme.getColor("text_disabled") color: enabled ? UM.Theme.getColor("text") : UM.Theme.getColor("text_disabled")
source: UM.Theme.getIcon("Plus")
} }
} }
} }

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

@ -620,6 +620,7 @@
"checkbox_label_padding": [0.5, 0.5], "checkbox_label_padding": [0.5, 0.5],
"spinbox": [6.0, 3.0], "spinbox": [6.0, 3.0],
"combobox_dialog": [14, 2],
"tooltip": [20.0, 10.0], "tooltip": [20.0, 10.0],
"tooltip_margins": [1.0, 1.0], "tooltip_margins": [1.0, 1.0],