3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-07 06:57:28 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Remove references to the toolbox plugin from the themes.json

Browse source 
Some other components were (incorrectly) using these theme variables.
Replaced them by another theme variable with the same value.

CURA 8588
This commit is contained in:
casper 2021-12-30 13:38:16 +01:00
parent 1cdeaffab7
commit 02c81234d0
5 changed files with 2 additions and 83 deletions
Download patch file Download diff file Expand all files Collapse all files

2
plugins/DigitalLibrary/resources/qml/ProjectSummaryCard.qml
View file

@ -44,7 +44,7 @@ Cura.RoundedRectangle
{
id: projectImage
anchors.verticalCenter: parent.verticalCenter
width: UM.Theme.getSize("toolbox_thumbnail_small").width
width: UM.Theme.getSize("card_icon").width
height: Math.round(width * 3/4)
sourceSize.width: width
sourceSize.height: height

2
plugins/DigitalLibrary/resources/qml/SelectProjectPage.qml
View file

@ -201,7 +201,7 @@ Item
LoadMoreProjectsCard
{
id: loadMoreProjectsCard
height: UM.Theme.getSize("toolbox_thumbnail_small").height
height: UM.Theme.getSize("card_icon").height
width: parent.width
visible: manager.digitalFactoryProjectModel.count > 0
hasMoreProjectsToLoad: manager.hasMoreProjectsToLoad

4
resources/themes/cura-dark/theme.json
View file

@ -176,10 +176,6 @@
"quality_slider_available": [255, 255, 255, 255],
"toolbox_header_button_text_active": [255, 255, 255, 255],
"toolbox_header_button_text_inactive": [128, 128, 128, 255],
"toolbox_premium_packages_background": [57, 57, 57, 255],
"monitor_printer_family_tag": [86, 86, 106, 255],
"monitor_text_disabled": [102, 102, 102, 255],
"monitor_icon_primary": [229, 229, 229, 255],

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

@ -602,62 +602,6 @@ QtObject
}
}
property Component toolbox_action_button: Component
{
ButtonStyle
{
background: Rectangle
{
implicitWidth: UM.Theme.getSize("toolbox_action_button").width
implicitHeight: UM.Theme.getSize("toolbox_action_button").height
color:
{
if (control.installed)
{
return UM.Theme.getColor("action_button_disabled");
}
else
{
if (control.hovered)
{
return UM.Theme.getColor("primary_hover");
}
else
{
return UM.Theme.getColor("primary");
}
}
}
}
label: Label
{
text: control.text
color:
{
if (control.installed)
{
return UM.Theme.getColor("action_button_disabled_text");
}
else
{
if (control.hovered)
{
return UM.Theme.getColor("button_text_hover");
}
else
{
return UM.Theme.getColor("button_text");
}
}
}
verticalAlignment: Text.AlignVCenter
horizontalAlignment: Text.AlignHCenter
font: UM.Theme.getFont("default_bold")
}
}
}
property Component monitor_button_style: Component
{
ButtonStyle

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

@ -428,9 +428,6 @@
"printer_config_matched": [50, 130, 255, 255],
"printer_config_mismatch": [127, 127, 127, 255],
"toolbox_header_button_text_inactive": [0, 0, 0, 255],
"toolbox_premium_packages_background": [240, 240, 240, 255],
"favorites_header_bar": [245, 245, 245, 255],
"favorites_header_hover": [245, 245, 245, 255],
"favorites_header_text": [31, 36, 39, 255],
@ -644,24 +641,6 @@
"build_plate_selection_size": [15, 5],
"objects_menu_button": [0.3, 2.7],
"toolbox_thumbnail_small": [6.0, 6.0],
"toolbox_thumbnail_medium": [8.0, 8.0],
"toolbox_thumbnail_large": [12.0, 10.0],
"toolbox_footer": [1.0, 4.5],
"toolbox_footer_button": [8.0, 2.5],
"toolbox_header_tab": [12.0, 4.0],
"toolbox_detail_header": [1.0, 14.0],
"toolbox_back_column": [6.0, 1.0],
"toolbox_back_button": [6.0, 2.0],
"toolbox_installed_tile": [1.0, 8.0],
"toolbox_property_label": [1.0, 2.0],
"toolbox_heading_label": [1.0, 3.8],
"toolbox_header": [1.0, 4.0],
"toolbox_header_highlight": [0.25, 0.25],
"toolbox_chart_row": [1.0, 2.0],
"toolbox_action_button": [8.0, 2.5],
"toolbox_loader": [2.0, 2.0],
"notification_icon": [1.5, 1.5],
"avatar_image": [6.8, 6.8],