mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-08-08 22:35:03 -06:00
Merge branch '4.0' into unify_font_types
This commit is contained in:
Diego Prado Gesto
commit
ef2fb53790
141 changed files with 1872 additions and 3377 deletions
|
|
@ -17,6 +17,12 @@
|
|||
"border": [127, 127, 127, 255],
|
||||
"secondary": [95, 95, 95, 255],
|
||||
|
||||
"icon": [204, 204, 204, 255],
|
||||
"toolbar_background": [39, 44, 48, 255],
|
||||
"toolbar_button_active": [95, 95, 95, 255],
|
||||
"toolbar_button_hover": [95, 95, 95, 255],
|
||||
"toolbar_button_active_hover": [95, 95, 95, 255],
|
||||
|
||||
"main_window_header_button_text_inactive": [128, 128, 128, 255],
|
||||
"main_window_header_button_text_hovered": [255, 255, 255, 255],
|
||||
|
||||
|
|
@ -34,6 +40,8 @@
|
|||
"text_scene": [255, 255, 255, 162],
|
||||
"text_scene_hover": [255, 255, 255, 204],
|
||||
|
||||
"printer_type_label_background": [95, 95, 95, 255],
|
||||
|
||||
"error": [212, 31, 53, 255],
|
||||
"disabled": [32, 32, 32, 255],
|
||||
|
||||
|
|
@ -93,11 +101,11 @@
|
|||
"scrollbar_handle_hover": [255, 255, 255, 255],
|
||||
"scrollbar_handle_down": [255, 255, 255, 255],
|
||||
|
||||
"setting_category": [39, 44, 48, 255],
|
||||
"setting_category_disabled": [39, 44, 48, 255],
|
||||
"setting_category_hover": [39, 44, 48, 255],
|
||||
"setting_category_active": [39, 44, 48, 255],
|
||||
"setting_category_active_hover": [39, 44, 48, 255],
|
||||
"setting_category": [75, 80, 83, 255],
|
||||
"setting_category_disabled": [75, 80, 83, 255],
|
||||
"setting_category_hover": [75, 80, 83, 255],
|
||||
"setting_category_active": [75, 80, 83, 255],
|
||||
"setting_category_active_hover": [75, 80, 83, 255],
|
||||
"setting_category_text": [255, 255, 255, 152],
|
||||
"setting_category_disabled_text": [255, 255, 255, 101],
|
||||
"setting_category_hover_text": [255, 255, 255, 204],
|
||||
|
|
|
|||
11
resources/themes/cura-light/icons/star_empty.svg
Normal file
11
resources/themes/cura-light/icons/star_empty.svg
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<svg width="14px" height="13px" viewBox="0 0 14 13" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
|
||||
<!-- Generator: Sketch 52.2 (67145) - http://www.bohemiancoding.com/sketch -->
|
||||
<title>Star Copy 8</title>
|
||||
<desc>Created with Sketch.</desc>
|
||||
<g id="Toolbox-VIP-material" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
|
||||
<g id="Marketplace-hover-" transform="translate(-140.000000, -457.000000)" stroke="#666666">
|
||||
<path d="M150.450431,468.749111 L149.791458,464.907 L152.582915,462.186001 L148.725216,461.625444 L147,458.129776 L145.274784,461.625444 L141.417085,462.186001 L144.208542,464.907 L143.549569,468.749111 L147,466.935112 L150.450431,468.749111 Z" id="Star-Copy-8"></path>
|
||||
</g>
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 844 B |
11
resources/themes/cura-light/icons/star_filled.svg
Normal file
11
resources/themes/cura-light/icons/star_filled.svg
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<svg width="14px" height="13px" viewBox="0 0 14 13" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
|
||||
<!-- Generator: Sketch 52.2 (67145) - http://www.bohemiancoding.com/sketch -->
|
||||
<title>Star Copy 7</title>
|
||||
<desc>Created with Sketch.</desc>
|
||||
<g id="Toolbox-VIP-material" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
|
||||
<g id="Marketplace-hover-" transform="translate(-127.000000, -457.000000)" fill="#666666" stroke="#666666">
|
||||
<path d="M137.450431,468.749111 L136.791458,464.907 L139.582915,462.186001 L135.725216,461.625444 L134,458.129776 L132.274784,461.625444 L128.417085,462.186001 L131.208542,464.907 L130.549569,468.749111 L134,466.935112 L137.450431,468.749111 Z" id="Star-Copy-7"></path>
|
||||
</g>
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 859 B |
|
|
@ -1,4 +1,11 @@
|
|||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<svg width="20px" height="17px" viewBox="0 0 20 17" version="1.1" xmlns="http://www.w3.org/2000/svg">
|
||||
<path d="M9.552 0C8.949 0 8.403 0.308 8.097 0.83L0.23 14.256C-0.076 14.78-0.077 15.415 0.23 15.937 0.573 16.522 1.146 16.769 1.751 16.767L17.354 16.767C17.959 16.769 18.531 16.522 18.875 15.937 19.182 15.415 19.181 14.78 18.875 14.256L11.008 0.83C10.702 0.308 10.156 0 9.552 0L9.552 0ZM9.552 1.397C9.636 1.397 9.762 1.471 9.8 1.536L17.667 14.962C17.704 15.027 17.704 15.16 17.667 15.224 17.665 15.227 17.437 15.37 17.354 15.37L1.751 15.37C1.668 15.37 1.44 15.227 1.438 15.224 1.4 15.16 1.4 15.027 1.438 14.962L9.305 1.536C9.343 1.471 9.469 1.397 9.552 1.397ZM9.552 5.356C8.909 5.356 8.388 5.877 8.388 6.521L8.621 10.479C8.621 10.994 9.038 11.411 9.552 11.411 10.067 11.411 10.484 10.994 10.484 10.479L10.717 6.521C10.717 5.877 10.195 5.356 9.552 5.356ZM9.552 11.877C8.781 11.877 8.155 12.502 8.155 13.274 8.155 14.046 8.781 14.671 9.552 14.671 10.324 14.671 10.95 14.046 10.95 13.274 10.95 12.502 10.324 11.877 9.552 11.877 Z" />
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<svg width="18px" height="18px" viewBox="0 0 18 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
|
||||
<!-- Generator: Sketch 52.2 (67145) - http://www.bohemiancoding.com/sketch -->
|
||||
<title>Icon/warning-s</title>
|
||||
<desc>Created with Sketch.</desc>
|
||||
<g id="Icon/warning-s" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
|
||||
<g id="icn/warning" transform="translate(0.000000, 1.000000)" fill="#000000" fill-rule="nonzero">
|
||||
<path d="M10.2840021,13.2214915 L10.2840021,11.3934951 C10.2840021,11.3037916 10.252402,11.2286553 10.1892019,11.1680863 C10.1252018,11.1067505 10.0498017,11.0760827 9.96300155,11.0760827 L8.03699845,11.0760827 C7.94979832,11.0760827 7.87439819,11.1067505 7.81079809,11.1680863 C7.74759799,11.2286553 7.71599794,11.3037916 7.71599794,11.3934951 L7.71599794,13.2209164 C7.71599794,13.3106199 7.74759799,13.3859479 7.81079809,13.4469003 C7.87479819,13.5078527 7.95019832,13.5383288 8.03699845,13.5383288 L9.96300155,13.5383288 C10.0502017,13.5383288 10.1256018,13.507661 10.1892019,13.4463252 C10.252402,13.3857562 10.2840021,13.3106199 10.2840021,13.2209164 L10.2840021,13.2214915 Z M10.264202,9.62530099 L10.4448023,5.21142857 C10.4448023,5.13475891 10.4114023,5.07380653 10.3446022,5.02857143 C10.257402,4.95803534 10.1770019,4.9227673 10.1034018,4.9227673 L7.89659823,4.9227673 C7.82299811,4.9227673 7.74259798,4.95803534 7.65539784,5.02857143 C7.58859774,5.07342318 7.55519768,5.14089248 7.55519768,5.23097934 L7.72559796,9.62530099 C7.72559796,9.68932016 7.75919801,9.74222222 7.82639812,9.78400719 C7.89319822,9.82540881 7.97319835,9.84610961 8.0663985,9.84610961 L9.92280148,9.84610961 C10.0168016,9.84610961 10.0954018,9.82540881 10.1586019,9.78400719 C10.222602,9.74183887 10.257802,9.68893681 10.264202,9.62530099 Z M10.1238018,0.644025157 L17.8290142,14.182929 C18.0634145,14.5865948 18.0568145,14.9904522 17.8092141,15.3945013 C17.695614,15.5804253 17.5400137,15.7280144 17.3424134,15.8372686 C17.1452131,15.9457562 16.9330127,16 16.7058124,16 L1.29418764,16 C1.06698727,16 0.854786932,15.9455645 0.657586615,15.8366936 C0.459986298,15.7278227 0.304386049,15.5802336 0.190785866,15.3939263 C-0.056814531,14.9902606 -0.0634145416,14.5865948 0.170985835,14.182929 L7.8761982,0.644025157 C7.98979838,0.445450734 8.14699863,0.288277928 8.34779895,0.172506739 C8.54859928,0.0575022462 8.76599962,-1.42108547e-13 9,-1.42108547e-13 C9.23400038,-1.42108547e-13 9.45140072,0.0575022462 9.65220105,0.172506739 C9.85300137,0.288277928 10.0102016,0.445450734 10.1238018,0.644025157 Z" id="Shape"></path>
|
||||
</g>
|
||||
</g>
|
||||
</svg>
|
||||
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 2.6 KiB |
File diff suppressed because it is too large
Load diff
|
Before Width: | Height: | Size: 785 KiB |
|
|
@ -75,7 +75,7 @@ QtObject
|
|||
width: Theme.getSize("standard_arrow").width
|
||||
height: Theme.getSize("standard_arrow").height
|
||||
sourceSize.height: width
|
||||
color: control.enabled ? Theme.getColor("setting_category_text") : Theme.getColor("setting_category_disabled_text")
|
||||
color: control.enabled ? Theme.getColor("setting_control_button") : Theme.getColor("setting_category_disabled_text")
|
||||
source: Theme.getIcon("arrow_bottom")
|
||||
}
|
||||
Label
|
||||
|
|
@ -177,8 +177,8 @@ QtObject
|
|||
{
|
||||
background: Item
|
||||
{
|
||||
implicitWidth: Theme.getSize("button").width;
|
||||
implicitHeight: Theme.getSize("button").height;
|
||||
implicitWidth: Theme.getSize("button").width
|
||||
implicitHeight: Theme.getSize("button").height
|
||||
|
||||
UM.PointingRectangle
|
||||
{
|
||||
|
|
@ -205,9 +205,9 @@ QtObject
|
|||
id: button_tip
|
||||
|
||||
anchors.horizontalCenter: parent.horizontalCenter
|
||||
anchors.verticalCenter: parent.verticalCenter;
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
|
||||
text: control.text;
|
||||
text: control.text
|
||||
font: Theme.getFont("default")
|
||||
color: Theme.getColor("tooltip_text")
|
||||
}
|
||||
|
|
@ -215,10 +215,10 @@ QtObject
|
|||
|
||||
Rectangle
|
||||
{
|
||||
id: buttonFace;
|
||||
id: buttonFace
|
||||
|
||||
anchors.fill: parent;
|
||||
property bool down: control.pressed || (control.checkable && control.checked);
|
||||
anchors.fill: parent
|
||||
property bool down: control.pressed || (control.checkable && control.checked)
|
||||
|
||||
color:
|
||||
{
|
||||
|
|
@ -228,58 +228,22 @@ QtObject
|
|||
}
|
||||
else if(control.checkable && control.checked && control.hovered)
|
||||
{
|
||||
return Theme.getColor("button_active_hover");
|
||||
return Theme.getColor("toolbar_button_active_hover")
|
||||
}
|
||||
else if(control.pressed || (control.checkable && control.checked))
|
||||
{
|
||||
return Theme.getColor("button_active");
|
||||
return Theme.getColor("toolbar_button_active")
|
||||
}
|
||||
else if(control.hovered)
|
||||
{
|
||||
return Theme.getColor("button_hover");
|
||||
}
|
||||
else
|
||||
{
|
||||
return Theme.getColor("button");
|
||||
return Theme.getColor("toolbar_button_hover")
|
||||
}
|
||||
return Theme.getColor("toolbar_background")
|
||||
}
|
||||
Behavior on color { ColorAnimation { duration: 50; } }
|
||||
|
||||
border.width: (control.hasOwnProperty("needBorder") && control.needBorder) ? 2 * screenScaleFactor : 0
|
||||
border.color: Theme.getColor("tool_button_border")
|
||||
|
||||
UM.RecolorImage
|
||||
{
|
||||
id: tool_button_arrow
|
||||
anchors.right: parent.right;
|
||||
anchors.rightMargin: Theme.getSize("button").width - Math.round(Theme.getSize("button_icon").width / 4)
|
||||
anchors.bottom: parent.bottom;
|
||||
anchors.bottomMargin: Theme.getSize("button").height - Math.round(Theme.getSize("button_icon").height / 4)
|
||||
width: Theme.getSize("standard_arrow").width
|
||||
height: Theme.getSize("standard_arrow").height
|
||||
sourceSize.height: width
|
||||
visible: control.menu != null;
|
||||
color:
|
||||
{
|
||||
if(control.checkable && control.checked && control.hovered)
|
||||
{
|
||||
return Theme.getColor("button_text_active_hover");
|
||||
}
|
||||
else if(control.pressed || (control.checkable && control.checked))
|
||||
{
|
||||
return Theme.getColor("button_text_active");
|
||||
}
|
||||
else if(control.hovered)
|
||||
{
|
||||
return Theme.getColor("button_text_hover");
|
||||
}
|
||||
else
|
||||
{
|
||||
return Theme.getColor("button_text");
|
||||
}
|
||||
}
|
||||
source: Theme.getIcon("arrow_bottom")
|
||||
}
|
||||
border.width: (control.hasOwnProperty("needBorder") && control.needBorder) ? Theme.getSize("default_lining").width : 0
|
||||
border.color: Theme.getColor("lining")
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -287,30 +251,12 @@ QtObject
|
|||
{
|
||||
UM.RecolorImage
|
||||
{
|
||||
anchors.centerIn: parent;
|
||||
opacity: !control.enabled ? 0.2 : 1.0
|
||||
source: control.iconSource;
|
||||
width: Theme.getSize("button_icon").width;
|
||||
height: Theme.getSize("button_icon").height;
|
||||
color:
|
||||
{
|
||||
if(control.checkable && control.checked && control.hovered)
|
||||
{
|
||||
return Theme.getColor("button_text_active_hover");
|
||||
}
|
||||
else if(control.pressed || (control.checkable && control.checked))
|
||||
{
|
||||
return Theme.getColor("button_text_active");
|
||||
}
|
||||
else if(control.hovered)
|
||||
{
|
||||
return Theme.getColor("button_text_hover");
|
||||
}
|
||||
else
|
||||
{
|
||||
return Theme.getColor("button_text");
|
||||
}
|
||||
}
|
||||
anchors.centerIn: parent
|
||||
opacity: control.enabled ? 1.0 : 0.2
|
||||
source: control.iconSource
|
||||
width: Theme.getSize("button_icon").width
|
||||
height: Theme.getSize("button_icon").height
|
||||
color: Theme.getColor("toolbar_button_text")
|
||||
|
||||
sourceSize: Theme.getSize("button_icon")
|
||||
}
|
||||
|
|
@ -446,7 +392,7 @@ QtObject
|
|||
sourceSize.width: width + 5 * screenScaleFactor
|
||||
sourceSize.height: width + 5 * screenScaleFactor
|
||||
|
||||
color: Theme.getColor("setting_control_text");
|
||||
color: Theme.getColor("setting_control_button");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -513,7 +459,7 @@ QtObject
|
|||
sourceSize.width: width + 5 * screenScaleFactor
|
||||
sourceSize.height: width + 5 * screenScaleFactor
|
||||
|
||||
color: UM.Theme.getColor("setting_control_text")
|
||||
color: UM.Theme.getColor("setting_control_button")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -63,6 +63,8 @@
|
|||
"secondary": [240, 240, 240, 255],
|
||||
"secondary_shadow": [216, 216, 216, 255],
|
||||
|
||||
"icon": [8, 7, 63, 255],
|
||||
|
||||
"primary_button": [38, 113, 231, 255],
|
||||
"primary_button_shadow": [27, 95, 202, 255],
|
||||
"primary_button_hover": [81, 145, 247, 255],
|
||||
|
|
@ -96,7 +98,7 @@
|
|||
|
||||
"printer_type_label_background": [228, 228, 242, 255],
|
||||
|
||||
"text": [0, 0, 0, 255],
|
||||
"text": [25, 25, 25, 255],
|
||||
"text_detail": [174, 174, 174, 128],
|
||||
"text_link": [50, 130, 255, 255],
|
||||
"text_inactive": [174, 174, 174, 255],
|
||||
|
|
@ -140,6 +142,8 @@
|
|||
|
||||
"extruder_button_material_border": [255, 255, 255, 255],
|
||||
|
||||
"rating_star": [90, 90, 90, 255],
|
||||
|
||||
"sync_button_text": [120, 120, 120, 255],
|
||||
"sync_button_text_hovered": [0, 0, 0, 255],
|
||||
|
||||
|
|
@ -220,11 +224,9 @@
|
|||
"checkbox_disabled": [223, 223, 223, 255],
|
||||
"checkbox_text": [35, 35, 35, 255],
|
||||
|
||||
"tooltip": [68, 192, 255, 255],
|
||||
"tooltip": [25, 25, 25, 255],
|
||||
"tooltip_text": [255, 255, 255, 255],
|
||||
|
||||
"tool_button_border": [255, 255, 255, 0],
|
||||
|
||||
"message_background": [255, 255, 255, 255],
|
||||
"message_shadow": [0, 0, 0, 120],
|
||||
"message_border": [192, 193, 194, 255],
|
||||
|
|
@ -237,8 +239,8 @@
|
|||
"message_button_text": [255, 255, 255, 255],
|
||||
"message_button_text_hover": [255, 255, 255, 255],
|
||||
"message_button_text_active": [255, 255, 255, 255],
|
||||
"message_progressbar_background": [200, 200, 200, 255],
|
||||
"message_progressbar_control": [77, 182, 226, 255],
|
||||
"message_progressbar_background": [245, 245, 245, 255],
|
||||
"message_progressbar_control": [50, 130, 255, 255],
|
||||
|
||||
"tool_panel_background": [255, 255, 255, 255],
|
||||
|
||||
|
|
@ -329,7 +331,7 @@
|
|||
},
|
||||
|
||||
"sizes": {
|
||||
"window_minimum_size": [106, 66],
|
||||
"window_minimum_size": [100, 60],
|
||||
|
||||
"main_window_header": [0.0, 4.0],
|
||||
"main_window_header_button": [8, 2.35],
|
||||
|
|
@ -351,16 +353,17 @@
|
|||
|
||||
"expandable_component_content_header": [0.0, 3.0],
|
||||
|
||||
"configuration_selector": [35.0, 4.0],
|
||||
"configuration_selector_mode_tabs": [0.0, 3.0],
|
||||
|
||||
"action_panel_widget": [25.0, 0.0],
|
||||
"action_panel_widget": [26.0, 0.0],
|
||||
"action_panel_information_widget": [20.0, 0.0],
|
||||
|
||||
"machine_selector_widget": [20.0, 4.0],
|
||||
"machine_selector_widget_content": [25.0, 32.0],
|
||||
"machine_selector_icon": [2.66, 2.66],
|
||||
|
||||
"views_selector": [16.0, 4.5],
|
||||
"views_selector": [23.0, 4.0],
|
||||
|
||||
"printer_type_label": [3.5, 1.5],
|
||||
|
||||
|
|
@ -384,6 +387,7 @@
|
|||
"section": [0.0, 2],
|
||||
"section_icon": [1.6, 1.6],
|
||||
"section_icon_column": [2.8, 0.0],
|
||||
"rating_star": [1.0, 1.0],
|
||||
|
||||
"setting": [25.0, 1.8],
|
||||
"setting_control": [11.0, 2.0],
|
||||
|
|
@ -402,6 +406,7 @@
|
|||
"button_lining": [0, 0],
|
||||
|
||||
"action_button": [15.0, 3.0],
|
||||
"action_button_icon": [1.0, 1.0],
|
||||
"action_button_radius": [0.15, 0.15],
|
||||
|
||||
"small_button": [2, 2],
|
||||
|
|
@ -430,7 +435,7 @@
|
|||
"slider_handle": [1.5, 1.5],
|
||||
"slider_layerview_size": [1.0, 26.0],
|
||||
|
||||
"layerview_menu_size": [15, 20],
|
||||
"layerview_menu_size": [16.0, 4.0],
|
||||
"layerview_legend_size": [1.0, 1.0],
|
||||
"layerview_row": [11.0, 1.5],
|
||||
"layerview_row_spacing": [0.0, 0.5],
|
||||
|
|
@ -485,7 +490,7 @@
|
|||
"toolbox_back_button": [4.0, 2.0],
|
||||
"toolbox_installed_tile": [1.0, 8.0],
|
||||
"toolbox_property_label": [1.0, 2.0],
|
||||
"toolbox_heading_label": [1.0, 4.0],
|
||||
"toolbox_heading_label": [1.0, 3.8],
|
||||
"toolbox_header": [1.0, 4.0],
|
||||
"toolbox_header_highlight": [0.25, 0.25],
|
||||
"toolbox_progress_bar": [8.0, 0.5],
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue