3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-18 12:17:50 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Rename action_panel_button theme entry to action_button

Browse source 
Because it's not just used in the save panel.

Contributes to issue CURA-5876.
This commit is contained in:
Ghostkeeper 2018-11-20 14:24:09 +01:00
parent 42d73836f4
commit a1068a3ef2
No known key found for this signature in database
GPG key ID: 86BEF881AE2CF276
4 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
resources/qml/ActionPanel/OutputProcessWidget.qml
View file

@ -104,7 +104,7 @@ Column
{ {
id: previewStageShortcut id: previewStageShortcut
height: UM.Theme.getSize("action_panel_button").height height: UM.Theme.getSize("action_button").height
text: catalog.i18nc("@button", "Preview") text: catalog.i18nc("@button", "Preview")
color: UM.Theme.getColor("secondary") color: UM.Theme.getColor("secondary")
hoverColor: UM.Theme.getColor("secondary") hoverColor: UM.Theme.getColor("secondary")
@ -116,8 +116,8 @@ Column
Cura.OutputDevicesActionButton Cura.OutputDevicesActionButton
{ {
width: previewStageShortcut.visible ? UM.Theme.getSize("action_panel_button").width : parent.width width: previewStageShortcut.visible ? UM.Theme.getSize("action_button").width : parent.width
height: UM.Theme.getSize("action_panel_button").height height: UM.Theme.getSize("action_button").height
} }
} }
} }

2
resources/qml/ActionPanel/SliceProcessWidget.qml
View file

@ -85,7 +85,7 @@ Column
{ {
id: prepareButton id: prepareButton
width: parent.width width: parent.width
height: UM.Theme.getSize("action_panel_button").height height: UM.Theme.getSize("action_button").height
fixedWidthMode: true fixedWidthMode: true
text: text:
{ {

4
resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml
View file

@ -171,7 +171,7 @@ Cura.ExpandableComponent
hoverColor: UM.Theme.getColor("secondary") hoverColor: UM.Theme.getColor("secondary")
textColor: UM.Theme.getColor("primary") textColor: UM.Theme.getColor("primary")
textHoverColor: UM.Theme.getColor("text") textHoverColor: UM.Theme.getColor("text")
height: UM.Theme.getSize("action_panel_button").height height: UM.Theme.getSize("action_button").height
onClicked: popupItem.configuration_method = "custom" onClicked: popupItem.configuration_method = "custom"
} }
@ -192,7 +192,7 @@ Cura.ExpandableComponent
hoverColor: UM.Theme.getColor("secondary") hoverColor: UM.Theme.getColor("secondary")
textColor: UM.Theme.getColor("primary") textColor: UM.Theme.getColor("primary")
textHoverColor: UM.Theme.getColor("text") textHoverColor: UM.Theme.getColor("text")
height: UM.Theme.getSize("action_panel_button").height height: UM.Theme.getSize("action_button").height
onClicked: popupItem.configuration_method = "auto" onClicked: popupItem.configuration_method = "auto"
} }

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

@ -385,7 +385,6 @@
"action_panel_widget": [25.0, 0.0], "action_panel_widget": [25.0, 0.0],
"action_panel_information_widget": [20.0, 0.0], "action_panel_information_widget": [20.0, 0.0],
"action_panel_button": [15.0, 3.0],
"machine_selector_widget": [16.0, 4.5], "machine_selector_widget": [16.0, 4.5],
@ -432,6 +431,9 @@
"button_icon": [2.5, 2.5], "button_icon": [2.5, 2.5],
"button_lining": [0, 0], "button_lining": [0, 0],
"action_button": [15.0, 3.0],
"action_button_radius": [0.15, 0.15],
"small_button": [2, 2], "small_button": [2, 2],
"small_button_icon": [1.5, 1.5], "small_button_icon": [1.5, 1.5],
@ -520,8 +522,6 @@
"avatar_image": [6.8, 6.8], "avatar_image": [6.8, 6.8],
"action_button_radius": [0.15, 0.15],
"monitor_config_override_box": [1.0, 14.0], "monitor_config_override_box": [1.0, 14.0],
"monitor_extruder_circle": [2.75, 2.75], "monitor_extruder_circle": [2.75, 2.75],
"monitor_text_line": [1.16, 1.16], "monitor_text_line": [1.16, 1.16],