mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-08-08 22:35:03 -06:00
Merge branch 'master' into feature_setting_visibility_profiles
This commit is contained in:
fieldOfView
commit
3f11b8a756
699 changed files with 62717 additions and 19296 deletions
|
|
@ -55,6 +55,15 @@
|
|||
"button_disabled": [39, 44, 48, 255],
|
||||
"button_disabled_text": [255, 255, 255, 101],
|
||||
|
||||
"small_button": [39, 44, 48, 0],
|
||||
"small_button_hover": [39, 44, 48, 255],
|
||||
"small_button_active": [67, 72, 75, 255],
|
||||
"small_button_active_hover": [67, 72, 75, 255],
|
||||
"small_button_text": [255, 255, 255, 197],
|
||||
"small_button_text_hover": [255, 255, 255, 255],
|
||||
"small_button_text_active": [255, 255, 255, 255],
|
||||
"small_button_text_active_hover": [255, 255, 255, 255],
|
||||
|
||||
"button_tooltip": [39, 44, 48, 255],
|
||||
"button_tooltip_border": [39, 44, 48, 255],
|
||||
"button_tooltip_text": [255, 255, 255, 172],
|
||||
|
|
@ -133,6 +142,7 @@
|
|||
"slider_groove_fill": [245, 245, 245, 255],
|
||||
"slider_handle": [255, 255, 255, 255],
|
||||
"slider_handle_hover": [77, 182, 226, 255],
|
||||
"slider_handle_active": [68, 192, 255, 255],
|
||||
"slider_handle_border": [39, 44, 48, 255],
|
||||
"slider_text_background": [255, 255, 255, 255],
|
||||
|
||||
|
|
@ -194,6 +204,7 @@
|
|||
"layerview_move_combing": [0, 0, 255, 255],
|
||||
"layerview_move_retraction": [128, 128, 255, 255],
|
||||
"layerview_support_interface": [64, 192, 255, 255],
|
||||
"layerview_nozzle": [181, 166, 66, 120],
|
||||
|
||||
"material_compatibility_warning": [255, 255, 255, 255],
|
||||
|
||||
|
|
|
|||
3
resources/themes/cura-light/icons/home.svg
Normal file
3
resources/themes/cura-light/icons/home.svg
Normal file
|
|
@ -0,0 +1,3 @@
|
|||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 10 10">
|
||||
<path d="m 8.5727081,5.62578 v 2.97725 q 0,0.16127 -0.1178498,0.27912 Q 8.3370085,9 8.1757405,9 H 5.7939349 V 6.61819 H 4.2060646 V 9 H 1.824259 Q 1.6629909,9 1.5451412,8.88215 1.4272914,8.7643 1.4272914,8.60303 V 5.62578 q 0,-0.006 0.0031,-0.0186 0.0031,-0.0124 0.0031,-0.0186 L 4.9999998,2.64852 8.5665054,5.58856 q 0.0062,0.0124 0.0062,0.0372 z M 9.955892,5.19779 9.5713297,5.65679 q -0.049621,0.0558 -0.130255,0.0682 h -0.018608 q -0.080634,0 -0.130255,-0.0434 L 4.9999998,2.10269 0.70778771,5.6816 Q 0.63335631,5.7312 0.55892486,5.725 0.47829087,5.7126 0.42866987,5.6568 L 0.04410752,5.1978 Q -0.00551343,5.1358 6.8917799e-4,5.05204 0.00689178,4.96834 0.06891799,4.91869 L 4.5286008,1.20331 q 0.1984838,-0.16127 0.471399,-0.16127 0.2729153,0 0.471399,0.16127 L 6.9848377,2.46864 V 1.25913 q 0,-0.0868 0.055824,-0.14266 0.055824,-0.0558 0.1426602,-0.0558 h 1.1909028 q 0.086837,0 0.1426602,0.0558 0.055824,0.0558 0.055824,0.14266 V 3.7898 l 1.3583734,1.12888 q 0.062026,0.0496 0.068229,0.13335 0.0062,0.0837 -0.043418,0.14576 z" />
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 1.1 KiB |
14
resources/themes/cura-light/icons/view_3d.svg
Normal file
14
resources/themes/cura-light/icons/view_3d.svg
Normal file
|
|
@ -0,0 +1,14 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<svg width="30px" height="30px" viewBox="0 0 30 30" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
|
||||
<!-- Generator: Sketch 47.1 (45422) - http://www.bohemiancoding.com/sketch -->
|
||||
<title>icn_perspectives_white</title>
|
||||
<desc>Created with Sketch.</desc>
|
||||
<defs></defs>
|
||||
<g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
|
||||
<g id="icn_perspectives_white" fill="#1F2427">
|
||||
<polygon id="Polygon" points="15 3 26 7.75 15 13 4 7.75"></polygon>
|
||||
<polygon id="Rectangle-3" points="16 15 26 10 26 21 16 26"></polygon>
|
||||
<polygon id="Rectangle-3-Copy" transform="translate(9.000000, 18.000000) scale(-1, 1) translate(-9.000000, -18.000000) " points="4 15 14 10 14 21 4 26"></polygon>
|
||||
</g>
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 868 B |
19
resources/themes/cura-light/icons/view_front.svg
Normal file
19
resources/themes/cura-light/icons/view_front.svg
Normal file
|
|
@ -0,0 +1,19 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<svg width="30px" height="30px" viewBox="0 0 30 30" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
|
||||
<!-- Generator: Sketch 47.1 (45422) - http://www.bohemiancoding.com/sketch -->
|
||||
<title>icn_front_white</title>
|
||||
<desc>Created with Sketch.</desc>
|
||||
<defs>
|
||||
<rect id="path-1" x="4" y="11" width="15" height="15"></rect>
|
||||
</defs>
|
||||
<g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
|
||||
<g id="icn_front_white">
|
||||
<polygon id="Path-2" stroke="#1F2427" points="25.9854977 4 11.3636023 4 4.05692142 11.3333333 4 26 18.6890523 26 26 18.6666667"></polygon>
|
||||
<g id="Rectangle-3-Copy-3">
|
||||
<use fill="#1F2427" fill-rule="evenodd" xlink:href="#path-1"></use>
|
||||
<rect stroke="#1F2427" stroke-width="1" x="4.5" y="11.5" width="14" height="14"></rect>
|
||||
</g>
|
||||
<path d="M18.4012594,11.6428026 L26,4" id="Path-3" stroke="#1F2427"></path>
|
||||
</g>
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 1 KiB |
21
resources/themes/cura-light/icons/view_left.svg
Normal file
21
resources/themes/cura-light/icons/view_left.svg
Normal file
|
|
@ -0,0 +1,21 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<svg width="30px" height="30px" viewBox="0 0 30 30" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
|
||||
<!-- Generator: Sketch 47.1 (45422) - http://www.bohemiancoding.com/sketch -->
|
||||
<title>icn_left_white</title>
|
||||
<desc>Created with Sketch.</desc>
|
||||
<defs>
|
||||
<polygon id="path-1" points="0 7.33333333 7.13513514 0 7.13513514 14.6666667 0 22"></polygon>
|
||||
</defs>
|
||||
<g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
|
||||
<g id="icn_left_white">
|
||||
<g id="Group-Copy" transform="translate(4.000000, 4.000000)">
|
||||
<polygon id="Path-2-Copy-4" stroke="#1F2427" transform="translate(10.735474, 11.000000) scale(-1, 1) translate(-10.735474, -11.000000) " points="21.4567937 0 7.18652344 0 0.0555525861 7.33333333 0 22 14.3358121 22 21.4709473 14.6666667"></polygon>
|
||||
<g id="Rectangle-3-Copy-14" transform="translate(3.567568, 11.000000) scale(-1, 1) translate(-3.567568, -11.000000) ">
|
||||
<use fill="#1F2427" fill-rule="evenodd" xlink:href="#path-1"></use>
|
||||
<path stroke="#1F2427" stroke-width="1" d="M0.5,7.53643942 L0.5,20.7691161 L6.63513514,14.4635606 L6.63513514,1.23088386 L0.5,7.53643942 Z"></path>
|
||||
</g>
|
||||
<path d="M6.65507549,7.42568631 L21.5199404,7.42568631" id="Path-3" stroke="#1F2427"></path>
|
||||
</g>
|
||||
</g>
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 1.4 KiB |
21
resources/themes/cura-light/icons/view_right.svg
Normal file
21
resources/themes/cura-light/icons/view_right.svg
Normal file
|
|
@ -0,0 +1,21 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<svg width="30px" height="30px" viewBox="0 0 30 30" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
|
||||
<!-- Generator: Sketch 47.1 (45422) - http://www.bohemiancoding.com/sketch -->
|
||||
<title>icn_right_white</title>
|
||||
<desc>Created with Sketch.</desc>
|
||||
<defs>
|
||||
<polygon id="path-1" points="14.2702703 7.33333333 21.4054054 0 21.4054054 14.6666667 14.2702703 22"></polygon>
|
||||
</defs>
|
||||
<g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
|
||||
<g id="icn_right_white">
|
||||
<g id="Group-2-Copy" transform="translate(4.000000, 4.000000)">
|
||||
<polygon id="Path-2-Copy-2" stroke="#1F2427" points="21.4567937 0 7.18652344 0 0.0555525861 7.33333333 0 22 14.3358121 22 21.4709473 14.6666667"></polygon>
|
||||
<g id="Rectangle-3-Copy-10">
|
||||
<use fill="#1F2427" fill-rule="evenodd" xlink:href="#path-1"></use>
|
||||
<path stroke="#1F2427" stroke-width="1" d="M14.7702703,7.53643942 L14.7702703,20.7691161 L20.9054054,14.4635606 L20.9054054,1.23088386 L14.7702703,7.53643942 Z"></path>
|
||||
</g>
|
||||
<path d="M0.114534945,7.42568631 L14.9793998,7.42568631" id="Path-3" stroke="#1F2427"></path>
|
||||
</g>
|
||||
</g>
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 1.3 KiB |
21
resources/themes/cura-light/icons/view_top.svg
Normal file
21
resources/themes/cura-light/icons/view_top.svg
Normal file
|
|
@ -0,0 +1,21 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<svg width="30px" height="30px" viewBox="0 0 30 30" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
|
||||
<!-- Generator: Sketch 47.1 (45422) - http://www.bohemiancoding.com/sketch -->
|
||||
<title>icn_top_white</title>
|
||||
<desc>Created with Sketch.</desc>
|
||||
<defs>
|
||||
<polygon id="path-1" points="7.13513514 0 21.4054054 0 14.2702703 7.33333333 0 7.33333333"></polygon>
|
||||
</defs>
|
||||
<g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
|
||||
<g id="icn_top_white">
|
||||
<g id="Group-3-Copy" transform="translate(4.000000, 4.000000)">
|
||||
<polygon id="Path-2-Copy" stroke="#1F2427" points="21.4567937 0 7.18652344 0 0.0555525861 7.33333333 0 22 14.3358121 22 21.4709473 14.6666667"></polygon>
|
||||
<g id="Rectangle-3-Copy-6">
|
||||
<use fill="#1F2427" fill-rule="evenodd" xlink:href="#path-1"></use>
|
||||
<path stroke="#1F2427" stroke-width="1" d="M7.34626538,0.5 L1.18410322,6.83333333 L14.05914,6.83333333 L20.2213022,0.5 L7.34626538,0.5 Z"></path>
|
||||
</g>
|
||||
<path d="M14.2702703,22 L14.2702703,6.72222222" id="Path-3" stroke="#1F2427"></path>
|
||||
</g>
|
||||
</g>
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 1.3 KiB |
|
|
@ -202,9 +202,8 @@ QtObject {
|
|||
height: Theme.getSize("topbar_button_icon").height
|
||||
Label
|
||||
{
|
||||
id: button_label
|
||||
text: control.text;
|
||||
anchors.right: (icon.visible || overlayIcon.visible) ? icon.left : parent.right
|
||||
anchors.rightMargin: (icon.visible || overlayIcon.visible) ? Theme.getSize("default_margin").width : 0
|
||||
anchors.verticalCenter: parent.verticalCenter;
|
||||
font: control.checked ? UM.Theme.getFont("large") : UM.Theme.getFont("large_nonbold")
|
||||
color:
|
||||
|
|
@ -227,6 +226,8 @@ QtObject {
|
|||
{
|
||||
visible: control.iconSource != ""
|
||||
id: icon
|
||||
anchors.left: button_label.right
|
||||
anchors.leftMargin: (icon.visible || overlayIcon.visible) ? Theme.getSize("default_margin").width : 0
|
||||
color: UM.Theme.getColor("text_emphasis")
|
||||
opacity: !control.enabled ? 0.2 : 1.0
|
||||
source: control.iconSource
|
||||
|
|
@ -238,6 +239,8 @@ QtObject {
|
|||
UM.RecolorImage
|
||||
{
|
||||
id: overlayIcon
|
||||
anchors.left: button_label.right
|
||||
anchors.leftMargin: (icon.visible || overlayIcon.visible) ? Theme.getSize("default_margin").width : 0
|
||||
visible: control.overlayIconSource != "" && control.iconSource != ""
|
||||
color: control.overlayColor
|
||||
opacity: !control.enabled ? 0.2 : 1.0
|
||||
|
|
@ -269,6 +272,7 @@ QtObject {
|
|||
arrowSize: Theme.getSize("button_tooltip_arrow").width
|
||||
color: Theme.getColor("button_tooltip")
|
||||
opacity: control.hovered ? 1.0 : 0.0;
|
||||
visible: control.text != ""
|
||||
|
||||
width: control.hovered ? button_tip.width + Theme.getSize("button_tooltip").width : 0
|
||||
height: Theme.getSize("button_tooltip").height
|
||||
|
|
@ -294,16 +298,26 @@ QtObject {
|
|||
anchors.fill: parent;
|
||||
property bool down: control.pressed || (control.checkable && control.checked);
|
||||
|
||||
color: {
|
||||
if(control.customColor !== undefined && control.customColor !== null) {
|
||||
color:
|
||||
{
|
||||
if(control.customColor !== undefined && control.customColor !== null)
|
||||
{
|
||||
return control.customColor
|
||||
} else if(control.checkable && control.checked && control.hovered) {
|
||||
}
|
||||
else if(control.checkable && control.checked && control.hovered)
|
||||
{
|
||||
return Theme.getColor("button_active_hover");
|
||||
} else if(control.pressed || (control.checkable && control.checked)) {
|
||||
}
|
||||
else if(control.pressed || (control.checkable && control.checked))
|
||||
{
|
||||
return Theme.getColor("button_active");
|
||||
} else if(control.hovered) {
|
||||
}
|
||||
else if(control.hovered)
|
||||
{
|
||||
return Theme.getColor("button_hover");
|
||||
} else {
|
||||
}
|
||||
else
|
||||
{
|
||||
return Theme.getColor("button");
|
||||
}
|
||||
}
|
||||
|
|
@ -380,6 +394,111 @@ QtObject {
|
|||
}
|
||||
}
|
||||
|
||||
property Component small_tool_button: Component {
|
||||
ButtonStyle {
|
||||
background: Item {
|
||||
implicitWidth: Theme.getSize("small_button").width;
|
||||
implicitHeight: Theme.getSize("small_button").height;
|
||||
|
||||
Rectangle {
|
||||
id: smallButtonFace;
|
||||
|
||||
anchors.fill: parent;
|
||||
property bool down: control.pressed || (control.checkable && control.checked);
|
||||
|
||||
color:
|
||||
{
|
||||
if(control.customColor !== undefined && control.customColor !== null)
|
||||
{
|
||||
return control.customColor
|
||||
}
|
||||
else if(control.checkable && control.checked && control.hovered)
|
||||
{
|
||||
return Theme.getColor("small_button_active_hover");
|
||||
}
|
||||
else if(control.pressed || (control.checkable && control.checked))
|
||||
{
|
||||
return Theme.getColor("small_button_active");
|
||||
}
|
||||
else if(control.hovered)
|
||||
{
|
||||
return Theme.getColor("small_button_hover");
|
||||
}
|
||||
else
|
||||
{
|
||||
return Theme.getColor("small_button");
|
||||
}
|
||||
}
|
||||
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: smallToolButtonArrow
|
||||
|
||||
width: 5
|
||||
height: 5
|
||||
sourceSize.width: 5
|
||||
sourceSize.height: 5
|
||||
visible: control.menu != null;
|
||||
color:
|
||||
{
|
||||
if(control.checkable && control.checked && control.hovered)
|
||||
{
|
||||
return Theme.getColor("small_button_text_active_hover");
|
||||
}
|
||||
else if(control.pressed || (control.checkable && control.checked))
|
||||
{
|
||||
return Theme.getColor("small_button_text_active");
|
||||
}
|
||||
else if(control.hovered)
|
||||
{
|
||||
return Theme.getColor("small_button_text_hover");
|
||||
}
|
||||
else
|
||||
{
|
||||
return Theme.getColor("small_button_text");
|
||||
}
|
||||
}
|
||||
source: Theme.getIcon("arrow_bottom")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
label: Item {
|
||||
UM.RecolorImage {
|
||||
anchors.centerIn: parent;
|
||||
opacity: !control.enabled ? 0.2 : 1.0
|
||||
source: control.iconSource;
|
||||
width: Theme.getSize("small_button_icon").width;
|
||||
height: Theme.getSize("small_button_icon").height;
|
||||
color:
|
||||
{
|
||||
if(control.checkable && control.checked && control.hovered)
|
||||
{
|
||||
return Theme.getColor("small_button_text_active_hover");
|
||||
}
|
||||
else if(control.pressed || (control.checkable && control.checked))
|
||||
{
|
||||
return Theme.getColor("small_button_text_active");
|
||||
}
|
||||
else if(control.hovered)
|
||||
{
|
||||
return Theme.getColor("small_button_text_hover");
|
||||
}
|
||||
else
|
||||
{
|
||||
return Theme.getColor("small_button_text");
|
||||
}
|
||||
}
|
||||
|
||||
sourceSize: Theme.getSize("small_button_icon")
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
property Component progressbar: Component{
|
||||
ProgressBarStyle {
|
||||
background: Rectangle {
|
||||
|
|
@ -752,6 +871,49 @@ QtObject {
|
|||
}
|
||||
}
|
||||
|
||||
property Component partially_checkbox: Component {
|
||||
CheckBoxStyle {
|
||||
background: Item { }
|
||||
indicator: Rectangle {
|
||||
implicitWidth: Theme.getSize("checkbox").width;
|
||||
implicitHeight: Theme.getSize("checkbox").height;
|
||||
|
||||
color: (control.hovered || control._hovered) ? Theme.getColor("checkbox_hover") : Theme.getColor("checkbox");
|
||||
Behavior on color { ColorAnimation { duration: 50; } }
|
||||
|
||||
radius: control.exclusiveGroup ? Theme.getSize("checkbox").width / 2 : 0
|
||||
|
||||
border.width: Theme.getSize("default_lining").width;
|
||||
border.color: (control.hovered || control._hovered) ? Theme.getColor("checkbox_border_hover") : Theme.getColor("checkbox_border");
|
||||
|
||||
UM.RecolorImage {
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
anchors.horizontalCenter: parent.horizontalCenter
|
||||
width: parent.width / 2.5
|
||||
height: parent.height / 2.5
|
||||
sourceSize.width: width
|
||||
sourceSize.height: width
|
||||
color: Theme.getColor("checkbox_mark")
|
||||
source: {
|
||||
if (control.checkbox_state == 2){
|
||||
return Theme.getIcon("solid")
|
||||
}
|
||||
else{
|
||||
return control.exclusiveGroup ? Theme.getIcon("dot") : Theme.getIcon("check")
|
||||
}
|
||||
}
|
||||
opacity: control.checked
|
||||
Behavior on opacity { NumberAnimation { duration: 100; } }
|
||||
}
|
||||
}
|
||||
label: Label {
|
||||
text: control.text;
|
||||
color: Theme.getColor("checkbox_text");
|
||||
font: Theme.getFont("default");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
property Component slider: Component {
|
||||
SliderStyle {
|
||||
groove: Rectangle {
|
||||
|
|
|
|||
|
|
@ -78,7 +78,7 @@
|
|||
"text_pressed": [12, 169, 227, 255],
|
||||
"text_subtext": [0, 0, 0, 255],
|
||||
"text_emphasis": [255, 255, 255, 255],
|
||||
"text_scene": [24, 41, 77, 255],
|
||||
"text_scene": [31, 36, 39, 255],
|
||||
"text_scene_hover": [70, 84, 113, 255],
|
||||
|
||||
"error": [255, 140, 0, 255],
|
||||
|
|
@ -100,9 +100,18 @@
|
|||
"button_text_hover": [255, 255, 255, 255],
|
||||
"button_text_active": [255, 255, 255, 255],
|
||||
"button_text_active_hover": [255, 255, 255, 255],
|
||||
"button_disabled": [24, 41, 77, 255],
|
||||
"button_disabled": [31, 36, 39, 255],
|
||||
"button_disabled_text": [255, 255, 255, 101],
|
||||
|
||||
"small_button": [31, 36, 39, 0],
|
||||
"small_button_hover": [68, 72, 75, 255],
|
||||
"small_button_active": [68, 72, 75, 255],
|
||||
"small_button_active_hover": [68, 72, 75, 255],
|
||||
"small_button_text": [31, 36, 39, 197],
|
||||
"small_button_text_hover": [255, 255, 255, 255],
|
||||
"small_button_text_active": [255, 255, 255, 255],
|
||||
"small_button_text_active_hover": [255, 255, 255, 255],
|
||||
|
||||
"button_tooltip": [31, 36, 39, 255],
|
||||
"button_tooltip_border": [68, 192, 255, 255],
|
||||
"button_tooltip_text": [192, 193, 194, 255],
|
||||
|
|
@ -116,7 +125,7 @@
|
|||
"action_button_text": [0, 0, 0, 255],
|
||||
"action_button_border": [127, 127, 127, 255],
|
||||
"action_button_hovered": [255, 255, 255, 255],
|
||||
"action_button_hovered_text": [24, 41, 77, 255],
|
||||
"action_button_hovered_text": [31, 36, 39, 255],
|
||||
"action_button_hovered_border": [12, 169, 227, 255],
|
||||
"action_button_active": [255, 255, 255, 255],
|
||||
"action_button_active_text": [0, 0, 0, 255],
|
||||
|
|
@ -134,7 +143,7 @@
|
|||
"print_button_ready_pressed_border": [30, 186, 245, 243],
|
||||
|
||||
"scrollbar_background": [255, 255, 255, 255],
|
||||
"scrollbar_handle": [24, 41, 77, 255],
|
||||
"scrollbar_handle": [31, 36, 39, 255],
|
||||
"scrollbar_handle_hover": [12, 159, 227, 255],
|
||||
"scrollbar_handle_down": [12, 159, 227, 255],
|
||||
|
||||
|
|
@ -143,11 +152,11 @@
|
|||
"setting_category_hover": [245, 245, 245, 255],
|
||||
"setting_category_active": [245, 245, 245, 255],
|
||||
"setting_category_active_hover": [245, 245, 245, 255],
|
||||
"setting_category_text": [24, 41, 77, 255],
|
||||
"setting_category_text": [31, 36, 39, 255],
|
||||
"setting_category_disabled_text": [24, 41, 77, 101],
|
||||
"setting_category_hover_text": [24, 41, 77, 255],
|
||||
"setting_category_active_text": [24, 41, 77, 255],
|
||||
"setting_category_active_hover_text": [24, 41, 77, 255],
|
||||
"setting_category_hover_text": [31, 36, 39, 255],
|
||||
"setting_category_active_text": [31, 36, 39, 255],
|
||||
"setting_category_active_hover_text": [31, 36, 39, 255],
|
||||
"setting_category_border": [245, 245, 245, 255],
|
||||
"setting_category_disabled_border": [245, 245, 245, 255],
|
||||
"setting_category_hover_border": [12, 159, 227, 255],
|
||||
|
|
@ -155,7 +164,7 @@
|
|||
"setting_category_active_hover_border": [12, 159, 227, 255],
|
||||
|
||||
"setting_control": [255, 255, 255, 255],
|
||||
"setting_control_selected": [24, 41, 77, 255],
|
||||
"setting_control_selected": [31, 36, 39, 255],
|
||||
"setting_control_highlight": [255, 255, 255, 255],
|
||||
"setting_control_border": [127, 127, 127, 255],
|
||||
"setting_control_border_highlight": [12, 169, 227, 255],
|
||||
|
|
@ -176,13 +185,14 @@
|
|||
"material_compatibility_warning": [0, 0, 0, 255],
|
||||
|
||||
"progressbar_background": [245, 245, 245, 255],
|
||||
"progressbar_control": [24, 41, 77, 255],
|
||||
"progressbar_control": [31, 36, 39, 255],
|
||||
|
||||
"slider_groove": [245, 245, 245, 255],
|
||||
"slider_groove_border": [127, 127, 127, 255],
|
||||
"slider_groove_fill": [127, 127, 127, 255],
|
||||
"slider_handle": [0, 0, 0, 255],
|
||||
"slider_handle_hover": [77, 182, 226, 255],
|
||||
"slider_handle_active": [68, 192, 255, 255],
|
||||
"slider_handle_border": [39, 44, 48, 255],
|
||||
"slider_text_background": [255, 255, 255, 255],
|
||||
|
||||
|
|
@ -203,9 +213,9 @@
|
|||
"mode_switch_hover": [255, 255, 255, 255],
|
||||
"mode_switch_border": [127, 127, 127, 255],
|
||||
"mode_switch_border_hover": [12, 169, 227, 255],
|
||||
"mode_switch_handle": [24, 41, 77, 255],
|
||||
"mode_switch_text": [24, 41, 77, 255],
|
||||
"mode_switch_text_hover": [24, 41, 77, 255],
|
||||
"mode_switch_handle": [31, 36, 39, 255],
|
||||
"mode_switch_text": [31, 36, 39, 255],
|
||||
"mode_switch_text_hover": [31, 36, 39, 255],
|
||||
"mode_switch_text_checked": [12, 169, 227, 255],
|
||||
|
||||
"tooltip": [68, 192, 255, 255],
|
||||
|
|
@ -256,6 +266,7 @@
|
|||
"model_unslicable": [122, 122, 122, 255],
|
||||
"model_unslicable_alt": [172, 172, 127, 255],
|
||||
"model_selection_outline": [12, 169, 227, 255],
|
||||
"model_non_printing": [122, 122, 122, 255],
|
||||
|
||||
"xray": [26, 26, 62, 255],
|
||||
"xray_error": [255, 0, 0, 255],
|
||||
|
|
@ -271,7 +282,8 @@
|
|||
"layerview_support_infill": [0, 255, 255, 255],
|
||||
"layerview_move_combing": [0, 0, 255, 255],
|
||||
"layerview_move_retraction": [128, 128, 255, 255],
|
||||
"layerview_support_interface": [64, 192, 255, 255]
|
||||
"layerview_support_interface": [64, 192, 255, 255],
|
||||
"layerview_nozzle": [181, 166, 66, 50]
|
||||
},
|
||||
|
||||
"sizes": {
|
||||
|
|
@ -321,6 +333,9 @@
|
|||
"button_icon": [2.5, 2.5],
|
||||
"button_lining": [0, 0],
|
||||
|
||||
"small_button": [2, 2],
|
||||
"small_button_icon": [1.5, 1.5],
|
||||
|
||||
"topbar_logo_right_margin": [3, 0],
|
||||
"topbar_button": [8, 4],
|
||||
"topbar_button_icon": [1.2, 1.2],
|
||||
|
|
@ -342,11 +357,13 @@
|
|||
"slider_handle": [1.0, 1.0],
|
||||
"slider_layerview_size": [1.0, 22.0],
|
||||
"slider_layerview_background": [4.0, 0.0],
|
||||
"slider_layerview_margin": [1.0, 1.0],
|
||||
"slider_layerview_margin": [1.0, 1.5],
|
||||
|
||||
"layerview_menu_size": [15, 19.5],
|
||||
"layerview_menu_size_material_color_mode": [15, 15.5],
|
||||
"layerview_menu_size": [15, 20],
|
||||
"layerview_menu_size_material_color_mode": [15, 16],
|
||||
"layerview_menu_size_collapsed": [15, 6],
|
||||
"layerview_menu_size_compatibility": [22, 22.0],
|
||||
"layerview_menu_size_compatibility_collapsed": [15, 3.5],
|
||||
"layerview_legend_size": [1.0, 1.0],
|
||||
"layerview_row": [11.0, 1.5],
|
||||
"layerview_row_spacing": [0.0, 0.5],
|
||||
|
|
@ -374,6 +391,11 @@
|
|||
|
||||
"infill_button_margin": [0.5, 0.5],
|
||||
|
||||
"jobspecs_line": [2.0, 2.0]
|
||||
"jobspecs_line": [2.0, 2.0],
|
||||
|
||||
"objects_menu_size": [20, 40],
|
||||
"objects_menu_size_collapsed": [20, 17],
|
||||
"build_plate_selection_size": [15, 5],
|
||||
"objects_menu_button": [0.3, 2.7]
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue