3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-15 02:37:49 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Use medium_button instead of toolbar_button

Browse source 
Since it is less specific and can be used in other places too.

CURA-8202
This commit is contained in:
Konstantinos Karmas 2021-07-01 10:02:09 +02:00
parent 0478c127bf
commit 0904324dde
7 changed files with 12 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

6
resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml
View file

@ -54,7 +54,7 @@ RowLayout
source: UM.Theme.getIcon("Infill1") source: UM.Theme.getIcon("Infill1")
text: Cura.MachineManager.activeStack ? parseInt(infillDensity.properties.value) + "%" : "0%" text: Cura.MachineManager.activeStack ? parseInt(infillDensity.properties.value) + "%" : "0%"
font: UM.Theme.getFont("medium") font: UM.Theme.getFont("medium")
iconSize: UM.Theme.getSize("toolbar_button_icon").width iconSize: UM.Theme.getSize("medium_button_icon").width
UM.SettingPropertyProvider UM.SettingPropertyProvider
{ {
@ -70,7 +70,7 @@ RowLayout
source: UM.Theme.getIcon("Support") source: UM.Theme.getIcon("Support")
text: supportEnabled.properties.value == "True" ? enabledText : disabledText text: supportEnabled.properties.value == "True" ? enabledText : disabledText
font: UM.Theme.getFont("medium") font: UM.Theme.getFont("medium")
iconSize: UM.Theme.getSize("toolbar_button_icon").width iconSize: UM.Theme.getSize("medium_button_icon").width
UM.SettingPropertyProvider UM.SettingPropertyProvider
{ {
@ -86,7 +86,7 @@ RowLayout
source: UM.Theme.getIcon("Adhesion") source: UM.Theme.getIcon("Adhesion")
text: platformAdhesionType.properties.value != "skirt" && platformAdhesionType.properties.value != "none" ? enabledText : disabledText text: platformAdhesionType.properties.value != "skirt" && platformAdhesionType.properties.value != "none" ? enabledText : disabledText
font: UM.Theme.getFont("medium") font: UM.Theme.getFont("medium")
iconSize: UM.Theme.getSize("toolbar_button_icon").width iconSize: UM.Theme.getSize("medium_button_icon").width
UM.SettingPropertyProvider UM.SettingPropertyProvider
{ {

2
resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml
View file

@ -29,7 +29,7 @@ Item
text: catalog.i18nc("@label", "Adhesion") text: catalog.i18nc("@label", "Adhesion")
font: UM.Theme.getFont("medium") font: UM.Theme.getFont("medium")
width: labelColumnWidth width: labelColumnWidth
iconSize: UM.Theme.getSize("toolbar_button_icon").width iconSize: UM.Theme.getSize("medium_button_icon").width
} }
Item Item

2
resources/qml/PrintSetupSelector/Recommended/RecommendedInfillDensitySelector.qml
View file

@ -65,7 +65,7 @@ Item
text: catalog.i18nc("@label", "Infill") + " (%)" text: catalog.i18nc("@label", "Infill") + " (%)"
font: UM.Theme.getFont("medium") font: UM.Theme.getFont("medium")
width: labelColumnWidth width: labelColumnWidth
iconSize: UM.Theme.getSize("toolbar_button_icon").width iconSize: UM.Theme.getSize("medium_button_icon").width
} }
Item Item

2
resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml
View file

@ -52,7 +52,7 @@ Item
text: catalog.i18nc("@label", "Profiles") text: catalog.i18nc("@label", "Profiles")
font: UM.Theme.getFont("medium") font: UM.Theme.getFont("medium")
width: labelColumnWidth width: labelColumnWidth
iconSize: UM.Theme.getSize("toolbar_button_icon").width iconSize: UM.Theme.getSize("medium_button_icon").width
} }
UM.SimpleButton UM.SimpleButton
{ {

2
resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml
View file

@ -30,7 +30,7 @@ Item
text: catalog.i18nc("@label", "Support") text: catalog.i18nc("@label", "Support")
font: UM.Theme.getFont("medium") font: UM.Theme.getFont("medium")
width: labelColumnWidth width: labelColumnWidth
iconSize: UM.Theme.getSize("toolbar_button_icon").width iconSize: UM.Theme.getSize("medium_button_icon").width
} }
Item Item

10
resources/themes/cura-light/styles.qml
View file

@ -175,8 +175,8 @@ QtObject
{ {
background: Item background: Item
{ {
implicitWidth: UM.Theme.getSize("toolbar_button").width implicitWidth: UM.Theme.getSize("button").width
implicitHeight: UM.Theme.getSize("toolbar_button").height implicitHeight: UM.Theme.getSize("button").height
UM.PointingRectangle UM.PointingRectangle
{ {
@ -252,11 +252,11 @@ QtObject
anchors.centerIn: parent anchors.centerIn: parent
opacity: control.enabled ? 1.0 : 0.2 opacity: control.enabled ? 1.0 : 0.2
source: control.iconSource source: control.iconSource
width: UM.Theme.getSize("toolbar_button_icon").width width: UM.Theme.getSize("medium_button_icon").width
height: UM.Theme.getSize("toolbar_button_icon").height height: UM.Theme.getSize("medium_button_icon").height
color: UM.Theme.getColor("icon") color: UM.Theme.getColor("icon")
sourceSize: UM.Theme.getSize("toolbar_button_icon") sourceSize: UM.Theme.getSize("medium_button_icon")
} }
} }
} }

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

@ -527,9 +527,6 @@
"button_icon": [2.5, 2.5], "button_icon": [2.5, 2.5],
"button_lining": [0, 0], "button_lining": [0, 0],
"toolbar_button": [4, 4],
"toolbar_button_icon": [2, 2],
"action_button": [15.0, 2.5], "action_button": [15.0, 2.5],
"action_button_icon": [1.0, 1.0], "action_button_icon": [1.0, 1.0],
"action_button_radius": [0.15, 0.15], "action_button_radius": [0.15, 0.15],