diff --git a/resources/qml/ExtruderButton.qml b/resources/qml/ExtruderButton.qml index df1a72e765..3ad77660c6 100644 --- a/resources/qml/ExtruderButton.qml +++ b/resources/qml/ExtruderButton.qml @@ -12,12 +12,14 @@ UM.ToolbarButton id: base property var extruder + property var extrdurerNumberFont: UM.Theme.getFont("small_emphasis") toolItem: ExtruderIcon { materialColor: extruder.color extruderEnabled: extruder.stack.isEnabled iconVariant: "default" + font: extruderNumberFont property int index: extruder.index } diff --git a/resources/qml/ExtruderIcon.qml b/resources/qml/ExtruderIcon.qml index 718f1bcd87..c59521cdc3 100644 --- a/resources/qml/ExtruderIcon.qml +++ b/resources/qml/ExtruderIcon.qml @@ -14,6 +14,7 @@ Item property bool extruderEnabled: true property var iconSize: UM.Theme.getSize("extruder_icon").width property string iconVariant: "medium" + property alias font: extruderNumberText.font implicitWidth: iconSize implicitHeight: iconSize diff --git a/resources/qml/Toolbar.qml b/resources/qml/Toolbar.qml index e003c6cd6f..894f280240 100644 --- a/resources/qml/Toolbar.qml +++ b/resources/qml/Toolbar.qml @@ -142,6 +142,7 @@ Item text: catalog.i18ncp("@label %1 is filled in with the name of an extruder", "Print Selected Model with %1", "Print Selected Models with %1", UM.Selection.selectionCount).arg(extruder.name) checked: Cura.ExtruderManager.selectedObjectExtruders.indexOf(extruder.id) != -1 enabled: UM.Selection.hasSelection && extruder.stack.isEnabled + font: UM.Theme.getFont("small_emphasis") onClicked: { diff --git a/resources/qml/Widgets/SingleSettingExtruderSelectorBar.qml b/resources/qml/Widgets/SingleSettingExtruderSelectorBar.qml index 389f70f4f9..80f77304c3 100644 --- a/resources/qml/Widgets/SingleSettingExtruderSelectorBar.qml +++ b/resources/qml/Widgets/SingleSettingExtruderSelectorBar.qml @@ -61,6 +61,7 @@ Row extruder: model checked: extruder.index == selectedIndex iconScale: 0.8 + font: UM.Theme.getFont("tiny_emphasis") buttonSize: UM.Theme.getSize("small_button").width onClicked: extruder.enabled && onClickExtruder(extruder.index) } diff --git a/resources/themes/cura-light/theme.json b/resources/themes/cura-light/theme.json index 6bf89a92fa..ad32573288 100644 --- a/resources/themes/cura-light/theme.json +++ b/resources/themes/cura-light/theme.json @@ -172,6 +172,26 @@ "size": 0.9, "weight": 700, "family": "Noto Sans" + }, + "tiny_emphasis": { + "size": 0.7, + "weight": 700, + "family": "Noto Sans" + }, + "tiny_emphasis_ja_JP": { + "size": 0.7, + "weight": 700, + "family": "Noto Sans" + }, + "tiny_emphasis_zh_CN": { + "size": 0.7, + "weight": 700, + "family": "Noto Sans" + }, + "tiny_emphasis_zh_TW": { + "size": 0.7, + "weight": 700, + "family": "Noto Sans" } },