mirror of
https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura
synced 2025-08-14 10:45:54 +08:00
Merge branch 'CURA-4318_themes_cleanup'
This commit is contained in:
ChrisTerBeke
commit
4b0aa65ae5
@ -351,14 +351,12 @@ Column
|
|||||||
rightMargin: UM.Theme.getSize("sidebar_margin").width
|
rightMargin: UM.Theme.getSize("sidebar_margin").width
|
||||||
}
|
}
|
||||||
|
|
||||||
Item
|
Item {
|
||||||
{
|
|
||||||
height: UM.Theme.getSize("sidebar_setup").height
|
height: UM.Theme.getSize("sidebar_setup").height
|
||||||
anchors.right: parent.right
|
anchors.right: parent.right
|
||||||
width: parent.width * 0.7 + UM.Theme.getSize("sidebar_margin").width
|
width: parent.width * 0.7 + UM.Theme.getSize("sidebar_margin").width
|
||||||
|
|
||||||
UM.RecolorImage
|
UM.RecolorImage {
|
||||||
{
|
|
||||||
id: warningImage
|
id: warningImage
|
||||||
anchors.right: materialInfoLabel.left
|
anchors.right: materialInfoLabel.left
|
||||||
anchors.rightMargin: UM.Theme.getSize("default_margin").width
|
anchors.rightMargin: UM.Theme.getSize("default_margin").width
|
||||||
@ -366,40 +364,33 @@ Column
|
|||||||
source: UM.Theme.getIcon("warning")
|
source: UM.Theme.getIcon("warning")
|
||||||
width: UM.Theme.getSize("section_icon").width
|
width: UM.Theme.getSize("section_icon").width
|
||||||
height: UM.Theme.getSize("section_icon").height
|
height: UM.Theme.getSize("section_icon").height
|
||||||
//sourceSize.width: width + 5
|
|
||||||
//sourceSize.height: width + 5
|
|
||||||
|
|
||||||
color: UM.Theme.getColor("material_compatibility_warning")
|
color: UM.Theme.getColor("material_compatibility_warning")
|
||||||
visible: !Cura.MachineManager.isCurrentSetupSupported
|
visible: !Cura.MachineManager.isCurrentSetupSupported
|
||||||
}
|
}
|
||||||
|
|
||||||
Text
|
Text {
|
||||||
{
|
|
||||||
id: materialInfoLabel
|
id: materialInfoLabel
|
||||||
wrapMode: Text.WordWrap
|
wrapMode: Text.WordWrap
|
||||||
text: catalog.i18nc("@label", "Check material compatibility")
|
text: catalog.i18nc("@label", "<a href='%1'>Check material compatibility</a>")
|
||||||
font: UM.Theme.getFont("default");
|
font: UM.Theme.getFont("default")
|
||||||
|
color: UM.Theme.getColor("text")
|
||||||
|
linkColor: UM.Theme.getColor("text_link")
|
||||||
verticalAlignment: Text.AlignTop
|
verticalAlignment: Text.AlignTop
|
||||||
anchors.top: parent.top
|
anchors.top: parent.top
|
||||||
anchors.right: parent.right
|
anchors.right: parent.right
|
||||||
anchors.bottom: parent.bottom
|
anchors.bottom: parent.bottom
|
||||||
color: UM.Theme.getColor("text")
|
|
||||||
|
|
||||||
MouseArea
|
MouseArea {
|
||||||
{
|
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
hoverEnabled: true
|
hoverEnabled: true
|
||||||
onClicked:
|
onClicked: {
|
||||||
{
|
|
||||||
// open the material URL with web browser
|
// open the material URL with web browser
|
||||||
var version = UM.Application.version;
|
var version = UM.Application.version;
|
||||||
var machineName = Cura.MachineManager.activeMachine.definition.id;
|
var machineName = Cura.MachineManager.activeMachine.definition.id;
|
||||||
|
|
||||||
var url = "https://ultimaker.com/materialcompatibility/" + version + "/" + machineName;
|
var url = "https://ultimaker.com/materialcompatibility/" + version + "/" + machineName;
|
||||||
Qt.openUrlExternally(url);
|
Qt.openUrlExternally(url);
|
||||||
}
|
}
|
||||||
onEntered:
|
onEntered: {
|
||||||
{
|
|
||||||
var content = catalog.i18nc("@tooltip", "Click to check the material compatibility on Ultimaker.com.");
|
var content = catalog.i18nc("@tooltip", "Click to check the material compatibility on Ultimaker.com.");
|
||||||
base.showTooltip(
|
base.showTooltip(
|
||||||
materialInfoRow,
|
materialInfoRow,
|
||||||
|
|||||||
@ -331,41 +331,19 @@ Item
|
|||||||
{
|
{
|
||||||
var current_extruder = extruderModel.get(currentIndex);
|
var current_extruder = extruderModel.get(currentIndex);
|
||||||
color_override = "";
|
color_override = "";
|
||||||
if (current_extruder === undefined) {
|
if (current_extruder === undefined) return ""
|
||||||
return "";
|
return (current_extruder.color) ? current_extruder.color : "";
|
||||||
}
|
|
||||||
var model_color = current_extruder.color;
|
|
||||||
return (model_color) ? model_color : "";
|
|
||||||
}
|
}
|
||||||
|
|
||||||
textRole: 'text' // this solves that the combobox isn't populated in the first time Cura is started
|
textRole: "text" // this solves that the combobox isn't populated in the first time Cura is started
|
||||||
|
|
||||||
anchors.top: enableSupportCheckBox.bottom
|
anchors.top: enableSupportCheckBox.bottom
|
||||||
anchors.topMargin:
|
anchors.topMargin: ((supportEnabled.properties.value === "True") && (machineExtruderCount.properties.value > 1)) ? UM.Theme.getSize("sidebar_margin").height : 0
|
||||||
{
|
|
||||||
if ((supportEnabled.properties.value == "True") && (machineExtruderCount.properties.value > 1))
|
|
||||||
{
|
|
||||||
return UM.Theme.getSize("sidebar_margin").height;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
anchors.left: infillCellRight.left
|
anchors.left: infillCellRight.left
|
||||||
|
|
||||||
width: UM.Theme.getSize("sidebar").width * .55
|
width: UM.Theme.getSize("sidebar").width * .55
|
||||||
height:
|
height: ((supportEnabled.properties.value == "True") && (machineExtruderCount.properties.value > 1)) ? UM.Theme.getSize("setting_control").height : 0
|
||||||
{
|
|
||||||
if ((supportEnabled.properties.value == "True") && (machineExtruderCount.properties.value > 1))
|
|
||||||
{
|
|
||||||
// default height when control is enabled
|
|
||||||
return UM.Theme.getSize("setting_control").height;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Behavior on height { NumberAnimation { duration: 100 } }
|
Behavior on height { NumberAnimation { duration: 100 } }
|
||||||
|
|
||||||
style: UM.Theme.styles.combobox_color
|
style: UM.Theme.styles.combobox_color
|
||||||
|
|||||||
@ -156,18 +156,6 @@ Rectangle
|
|||||||
}
|
}
|
||||||
Behavior on color { ColorAnimation { duration: 50; } }
|
Behavior on color { ColorAnimation { duration: 50; } }
|
||||||
|
|
||||||
Rectangle
|
|
||||||
{
|
|
||||||
id: underline;
|
|
||||||
|
|
||||||
anchors.left: parent.left
|
|
||||||
anchors.right: parent.right
|
|
||||||
anchors.bottom: parent.bottom
|
|
||||||
height: UM.Theme.getSize("sidebar_header_highlight").height
|
|
||||||
color: UM.Theme.getColor("sidebar_header_highlight_hover")
|
|
||||||
visible: control.hovered || control.pressed
|
|
||||||
}
|
|
||||||
|
|
||||||
UM.RecolorImage
|
UM.RecolorImage
|
||||||
{
|
{
|
||||||
id: downArrow
|
id: downArrow
|
||||||
|
|||||||
@ -1,11 +1,203 @@
|
|||||||
{
|
{
|
||||||
"metadata": {
|
"metadata": {
|
||||||
"name": "Dark",
|
"name": "Ultimaker Dark",
|
||||||
"inherits": "cura"
|
"inherits": "cura-light"
|
||||||
},
|
},
|
||||||
"colors": {
|
"colors": {
|
||||||
"viewport_background": [31, 36, 39, 255],
|
|
||||||
|
"sidebar": [39, 44, 48, 255],
|
||||||
|
"lining": [64, 69, 72, 255],
|
||||||
|
"viewport_overlay": [0, 6, 9, 222],
|
||||||
|
|
||||||
|
"primary": [12, 169, 227, 255],
|
||||||
|
"primary_hover": [48, 182, 231, 255],
|
||||||
|
"primary_text": [255, 255, 255, 204],
|
||||||
|
"border": [127, 127, 127, 255],
|
||||||
|
"secondary": [241, 242, 242, 255],
|
||||||
|
|
||||||
|
"text": [255, 255, 255, 204],
|
||||||
|
"text_detail": [255, 255, 255, 172],
|
||||||
|
"text_link": [255, 255, 255, 127],
|
||||||
|
"text_inactive": [255, 255, 255, 88],
|
||||||
|
"text_hover": [255, 255, 255, 204],
|
||||||
|
"text_pressed": [255, 255, 255, 204],
|
||||||
|
"text_subtext": [255, 255, 255, 172],
|
||||||
|
"text_emphasis": [255, 255, 255, 255],
|
||||||
"text_scene": [255, 255, 255, 162],
|
"text_scene": [255, 255, 255, 162],
|
||||||
"text_scene_hover": [255, 255, 255, 204]
|
"text_scene_hover": [255, 255, 255, 204],
|
||||||
|
|
||||||
|
"error": [212, 31, 53, 255],
|
||||||
|
"sidebar_header_bar": [39, 44, 48, 255],
|
||||||
|
"sidebar_header_active": [39, 44, 48, 255],
|
||||||
|
"sidebar_header_hover": [39, 44, 48, 255],
|
||||||
|
"sidebar_header_highlight": [68, 192, 255, 255],
|
||||||
|
"sidebar_header_highlight_hover": [68, 192, 255, 255],
|
||||||
|
"sidebar_header_text_active": [255, 255, 255, 255],
|
||||||
|
"sidebar_header_text_hover": [255, 255, 255, 255],
|
||||||
|
"sidebar_header_text_inactive": [255, 255, 255, 127],
|
||||||
|
"sidebar_lining": [31, 36, 39, 255],
|
||||||
|
|
||||||
|
"button": [39, 44, 48, 255],
|
||||||
|
"button_hover": [39, 44, 48, 255],
|
||||||
|
"button_active": [67, 72, 75, 255],
|
||||||
|
"button_active_hover": [67, 72, 75, 255],
|
||||||
|
"button_text": [255, 255, 255, 197],
|
||||||
|
"button_text_hover": [255, 255, 255, 255],
|
||||||
|
"button_text_active": [255, 255, 255, 255],
|
||||||
|
"button_text_active_hover": [255, 255, 255, 255],
|
||||||
|
"button_disabled": [39, 44, 48, 255],
|
||||||
|
"button_disabled_text": [255, 255, 255, 101],
|
||||||
|
|
||||||
|
"button_tooltip": [39, 44, 48, 255],
|
||||||
|
"button_tooltip_border": [39, 44, 48, 255],
|
||||||
|
"button_tooltip_text": [255, 255, 255, 172],
|
||||||
|
|
||||||
|
"tab_checked": [39, 44, 48, 255],
|
||||||
|
"tab_checked_border": [255, 255, 255, 30],
|
||||||
|
"tab_checked_text": [255, 255, 255, 255],
|
||||||
|
"tab_unchecked": [39, 44, 48, 255],
|
||||||
|
"tab_unchecked_border": [255, 255, 255, 30],
|
||||||
|
"tab_unchecked_text": [255, 255, 255, 101],
|
||||||
|
"tab_hovered": [39, 44, 48, 255],
|
||||||
|
"tab_hovered_border": [255, 255, 255, 30],
|
||||||
|
"tab_hovered_text": [255, 255, 255, 255],
|
||||||
|
"tab_active": [39, 44, 48, 255],
|
||||||
|
"tab_active_border": [255, 255, 255, 30],
|
||||||
|
"tab_active_text": [255, 255, 255, 255],
|
||||||
|
"tab_background": [39, 44, 48, 255],
|
||||||
|
|
||||||
|
"action_button": [39, 44, 48, 255],
|
||||||
|
"action_button_text": [255, 255, 255, 101],
|
||||||
|
"action_button_border": [255, 255, 255, 30],
|
||||||
|
"action_button_hovered": [39, 44, 48, 255],
|
||||||
|
"action_button_hovered_text": [255, 255, 255, 255],
|
||||||
|
"action_button_hovered_border": [255, 255, 255, 30],
|
||||||
|
"action_button_active": [39, 44, 48, 30],
|
||||||
|
"action_button_active_text": [255, 255, 255, 255],
|
||||||
|
"action_button_active_border": [255, 255, 255, 30],
|
||||||
|
"action_button_disabled": [39, 44, 48, 255],
|
||||||
|
"action_button_disabled_text": [255, 255, 255, 101],
|
||||||
|
"action_button_disabled_border": [255, 255, 255, 30],
|
||||||
|
|
||||||
|
"scrollbar_background": [39, 44, 48, 0],
|
||||||
|
"scrollbar_handle": [255, 255, 255, 105],
|
||||||
|
"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_text": [255, 255, 255, 152],
|
||||||
|
"setting_category_disabled_text": [255, 255, 255, 101],
|
||||||
|
"setting_category_hover_text": [255, 255, 255, 204],
|
||||||
|
"setting_category_active_text": [255, 255, 255, 204],
|
||||||
|
"setting_category_active_hover_text": [255, 255, 255, 204],
|
||||||
|
"setting_category_border": [39, 44, 48, 0],
|
||||||
|
"setting_category_disabled_border": [39, 44, 48, 0],
|
||||||
|
"setting_category_hover_border": [39, 44, 48, 0],
|
||||||
|
"setting_category_active_border": [39, 44, 48, 0],
|
||||||
|
"setting_category_active_hover_border": [39, 44, 48, 0],
|
||||||
|
|
||||||
|
"setting_control": [43, 48, 52, 255],
|
||||||
|
"setting_control_selected": [34, 39, 42, 38],
|
||||||
|
"setting_control_highlight": [255, 255, 255, 0],
|
||||||
|
"setting_control_border": [255, 255, 255, 38],
|
||||||
|
"setting_control_border_highlight": [255, 255, 255, 38],
|
||||||
|
"setting_control_text": [255, 255, 255, 181],
|
||||||
|
"setting_control_button": [255, 255, 255, 127],
|
||||||
|
"setting_control_button_hover": [255, 255, 255, 204],
|
||||||
|
"setting_control_disabled": [34, 39, 42, 255],
|
||||||
|
"setting_control_disabled_text": [255, 255, 255, 101],
|
||||||
|
"setting_control_disabled_border": [255, 255, 255, 101],
|
||||||
|
"setting_unit": [255, 255, 255, 127],
|
||||||
|
"setting_validation_error_background": [59, 31, 53, 255],
|
||||||
|
"setting_validation_error": [212, 31, 53, 255],
|
||||||
|
"setting_validation_warning_background": [62, 54, 46, 255],
|
||||||
|
"setting_validation_warning": [245, 166, 35, 255],
|
||||||
|
"setting_validation_ok": [43, 48, 52, 255],
|
||||||
|
|
||||||
|
"progressbar_background": [255, 255, 255, 48],
|
||||||
|
"progressbar_control": [255, 255, 255, 197],
|
||||||
|
|
||||||
|
"slider_groove": [39, 44, 48, 75],
|
||||||
|
"slider_groove_border": [39, 44, 48, 0],
|
||||||
|
"slider_groove_fill": [39, 44, 48, 182],
|
||||||
|
"slider_handle": [255, 255, 255, 255],
|
||||||
|
"slider_handle_border": [39, 44, 48, 255],
|
||||||
|
"slider_handle_hover": [255, 255, 255, 255],
|
||||||
|
"slider_handle_hover_border": [39, 44, 48, 255],
|
||||||
|
"slider_text_background": [39, 44, 48, 255],
|
||||||
|
|
||||||
|
"checkbox": [43, 48, 52, 255],
|
||||||
|
"checkbox_hover": [43, 48, 52, 255],
|
||||||
|
"checkbox_border": [255, 255, 255, 38],
|
||||||
|
"checkbox_border_hover": [255, 255, 255, 38],
|
||||||
|
"checkbox_mark": [255, 255, 255, 181],
|
||||||
|
"checkbox_text": [255, 255, 255, 181],
|
||||||
|
|
||||||
|
"tooltip": [39, 44, 48, 255],
|
||||||
|
"tooltip_text": [255, 255, 255, 204],
|
||||||
|
|
||||||
|
"message_background": [255, 255, 255, 200],
|
||||||
|
"message_text": [0, 0, 0, 255],
|
||||||
|
"message_border": [191, 191, 191, 200],
|
||||||
|
"message_button": [255, 255, 255, 255],
|
||||||
|
"message_button_hover": [12, 169, 227, 255],
|
||||||
|
"message_button_active": [32, 166, 219, 255],
|
||||||
|
"message_button_text": [24, 41, 77, 255],
|
||||||
|
"message_button_text_hover": [255, 255, 255, 255],
|
||||||
|
"message_button_text_active": [255, 255, 255, 255],
|
||||||
|
"message_progressbar_background": [255, 255, 255, 255],
|
||||||
|
"message_progressbar_control": [12, 169, 227, 255],
|
||||||
|
|
||||||
|
"tool_panel_background": [39, 44, 48, 255],
|
||||||
|
|
||||||
|
"status_offline": [0, 0, 0, 255],
|
||||||
|
"status_ready": [0, 205, 0, 255],
|
||||||
|
"status_busy": [12, 169, 227, 255],
|
||||||
|
"status_paused": [255, 140, 0, 255],
|
||||||
|
"status_stopped": [236, 82, 80, 255],
|
||||||
|
"status_unknown": [127, 127, 127, 255],
|
||||||
|
|
||||||
|
"disabled_axis": [127, 127, 127, 255],
|
||||||
|
"x_axis": [255, 0, 0, 255],
|
||||||
|
"y_axis": [0, 0, 255, 255],
|
||||||
|
"z_axis": [0, 255, 0, 255],
|
||||||
|
"all_axis": [255, 255, 255, 255],
|
||||||
|
|
||||||
|
"viewport_background": [31, 36, 39, 255],
|
||||||
|
"volume_outline": [1, 168, 230, 255],
|
||||||
|
"buildplate": [252, 252, 252, 255],
|
||||||
|
"buildplate_alt": [204, 204, 204, 255],
|
||||||
|
"buildplate_grid": [129, 131, 134, 255],
|
||||||
|
"buildplate_grid_minor": [129, 131, 134, 31],
|
||||||
|
|
||||||
|
"convex_hull": [35, 35, 35, 127],
|
||||||
|
"disallowed_area": [0, 0, 0, 52],
|
||||||
|
"error_area": [255, 0, 0, 127],
|
||||||
|
|
||||||
|
"model_default": [255, 201, 36, 255],
|
||||||
|
"model_overhang": [255, 0, 0, 255],
|
||||||
|
"model_unslicable": [122, 122, 122, 255],
|
||||||
|
"model_unslicable_alt": [172, 172, 127, 255],
|
||||||
|
"model_selection_outline": [12, 169, 227, 255],
|
||||||
|
|
||||||
|
"xray": [26, 26, 62, 255],
|
||||||
|
"xray_error": [255, 0, 0, 255],
|
||||||
|
|
||||||
|
"layerview_ghost": [32, 32, 32, 96],
|
||||||
|
"layerview_none": [255, 255, 255, 255],
|
||||||
|
"layerview_inset_0": [255, 0, 0, 255],
|
||||||
|
"layerview_inset_x": [0, 255, 0, 255],
|
||||||
|
"layerview_skin": [255, 255, 0, 255],
|
||||||
|
"layerview_support": [0, 255, 255, 255],
|
||||||
|
"layerview_skirt": [0, 255, 255, 255],
|
||||||
|
"layerview_infill": [255, 192, 0, 255],
|
||||||
|
"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]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -610,17 +610,20 @@ QtObject {
|
|||||||
|
|
||||||
property Component combobox: Component {
|
property Component combobox: Component {
|
||||||
ComboBoxStyle {
|
ComboBoxStyle {
|
||||||
|
|
||||||
background: Rectangle {
|
background: Rectangle {
|
||||||
implicitHeight: Theme.getSize("setting_control").height;
|
implicitHeight: Theme.getSize("setting_control").height;
|
||||||
implicitWidth: Theme.getSize("setting_control").width;
|
implicitWidth: Theme.getSize("setting_control").width;
|
||||||
|
|
||||||
color: Theme.getColor("setting_control")
|
color: control.hovered ? UM.Theme.getColor("setting_control_highlight") : UM.Theme.getColor("setting_control")
|
||||||
Behavior on color { ColorAnimation { duration: 50; } }
|
Behavior on color { ColorAnimation { duration: 50; } }
|
||||||
|
|
||||||
border.width: Theme.getSize("default_lining").width;
|
border.width: Theme.getSize("default_lining").width;
|
||||||
border.color: (control.hovered || control._hovered) ? Theme.getColor("setting_control_border_highlight") : Theme.getColor("setting_control_border");
|
border.color: control.hovered ? Theme.getColor("setting_control_border_highlight") : Theme.getColor("setting_control_border");
|
||||||
}
|
}
|
||||||
|
|
||||||
label: Item {
|
label: Item {
|
||||||
|
|
||||||
Label {
|
Label {
|
||||||
anchors.left: parent.left;
|
anchors.left: parent.left;
|
||||||
anchors.leftMargin: Theme.getSize("default_lining").width
|
anchors.leftMargin: Theme.getSize("default_lining").width
|
||||||
@ -656,32 +659,18 @@ QtObject {
|
|||||||
|
|
||||||
// Combobox with items with colored rectangles
|
// Combobox with items with colored rectangles
|
||||||
property Component combobox_color: Component {
|
property Component combobox_color: Component {
|
||||||
ComboBoxStyle
|
|
||||||
{
|
ComboBoxStyle {
|
||||||
background: Rectangle
|
|
||||||
{
|
background: Rectangle {
|
||||||
color:
|
color: !enabled ? UM.Theme.getColor("setting_control_disabled") : control._hovered ? UM.Theme.getColor("setting_control_highlight") : UM.Theme.getColor("setting_control")
|
||||||
{
|
|
||||||
if(!enabled)
|
|
||||||
{
|
|
||||||
return UM.Theme.getColor("setting_control_disabled");
|
|
||||||
}
|
|
||||||
if(control.hovered)
|
|
||||||
{
|
|
||||||
return UM.Theme.getColor("setting_control_highlight");
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
return UM.Theme.getColor("setting_control");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
border.width: UM.Theme.getSize("default_lining").width
|
border.width: UM.Theme.getSize("default_lining").width
|
||||||
border.color: !enabled ? UM.Theme.getColor("setting_control_disabled_border") : control.hovered ? UM.Theme.getColor("setting_control_border_highlight") : UM.Theme.getColor("setting_control_border")
|
border.color: !enabled ? UM.Theme.getColor("setting_control_disabled_border") : control._hovered ? UM.Theme.getColor("setting_control_border_highlight") : UM.Theme.getColor("setting_control_border")
|
||||||
}
|
}
|
||||||
label: Item
|
|
||||||
{
|
label: Item {
|
||||||
Label
|
|
||||||
{
|
Label {
|
||||||
anchors.left: parent.left
|
anchors.left: parent.left
|
||||||
anchors.leftMargin: UM.Theme.getSize("default_lining").width
|
anchors.leftMargin: UM.Theme.getSize("default_lining").width
|
||||||
anchors.right: swatch.left
|
anchors.right: swatch.left
|
||||||
@ -695,27 +684,21 @@ QtObject {
|
|||||||
elide: Text.ElideRight
|
elide: Text.ElideRight
|
||||||
verticalAlignment: Text.AlignVCenter
|
verticalAlignment: Text.AlignVCenter
|
||||||
}
|
}
|
||||||
Rectangle
|
|
||||||
{
|
Rectangle {
|
||||||
id: swatch
|
id: swatch
|
||||||
height: UM.Theme.getSize("setting_control").height / 2
|
height: UM.Theme.getSize("setting_control").height / 2
|
||||||
width: height
|
width: height
|
||||||
|
anchors.right: downArrow.left
|
||||||
anchors
|
anchors.verticalCenter: parent.verticalCenter
|
||||||
{
|
anchors.margins: UM.Theme.getSize("default_margin").width / 4
|
||||||
right: downArrow.left;
|
|
||||||
verticalCenter: parent.verticalCenter
|
|
||||||
margins: UM.Theme.getSize("default_margin").width / 4
|
|
||||||
}
|
|
||||||
|
|
||||||
border.width: UM.Theme.getSize("default_lining").width * 2
|
|
||||||
border.color: enabled ? UM.Theme.getColor("setting_control_border") : UM.Theme.getColor("setting_control_disabled_border")
|
|
||||||
radius: width / 2
|
radius: width / 2
|
||||||
|
border.width: UM.Theme.getSize("default_lining").width
|
||||||
color: if (control.color_override != "") {return control.color_override} else {return control.color;}
|
border.color: UM.Theme.getColor("lining")
|
||||||
|
color: (control.color_override !== "") ? control.color_override : control.color
|
||||||
}
|
}
|
||||||
UM.RecolorImage
|
|
||||||
{
|
UM.RecolorImage {
|
||||||
id: downArrow
|
id: downArrow
|
||||||
anchors.right: parent.right
|
anchors.right: parent.right
|
||||||
anchors.rightMargin: UM.Theme.getSize("default_lining").width * 2
|
anchors.rightMargin: UM.Theme.getSize("default_lining").width * 2
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"metadata": {
|
"metadata": {
|
||||||
"name": "Light"
|
"name": "Ultimaker"
|
||||||
},
|
},
|
||||||
|
|
||||||
"fonts": {
|
"fonts": {
|
||||||
@ -166,7 +166,7 @@
|
|||||||
|
|
||||||
"setting_control": [255, 255, 255, 255],
|
"setting_control": [255, 255, 255, 255],
|
||||||
"setting_control_selected": [24, 41, 77, 255],
|
"setting_control_selected": [24, 41, 77, 255],
|
||||||
"setting_control_highlight": [255, 255, 255, 0],
|
"setting_control_highlight": [255, 255, 255, 255],
|
||||||
"setting_control_border": [127, 127, 127, 255],
|
"setting_control_border": [127, 127, 127, 255],
|
||||||
"setting_control_border_highlight": [12, 169, 227, 255],
|
"setting_control_border_highlight": [12, 169, 227, 255],
|
||||||
"setting_control_text": [27, 27, 27, 255],
|
"setting_control_text": [27, 27, 27, 255],
|
||||||
|
|||||||
@ -1,291 +0,0 @@
|
|||||||
{
|
|
||||||
"metadata": {
|
|
||||||
"name": "Ultimaker",
|
|
||||||
"inherits": "cura-light"
|
|
||||||
},
|
|
||||||
|
|
||||||
"colors": {
|
|
||||||
"sidebar": [39, 44, 48, 255],
|
|
||||||
"lining": [64, 69, 72, 255],
|
|
||||||
"viewport_overlay": [0, 6, 9, 222],
|
|
||||||
|
|
||||||
"primary": [12, 169, 227, 255],
|
|
||||||
"primary_hover": [48, 182, 231, 255],
|
|
||||||
"primary_text": [255, 255, 255, 204],
|
|
||||||
"border": [127, 127, 127, 255],
|
|
||||||
"secondary": [241, 242, 242, 255],
|
|
||||||
|
|
||||||
"text": [255, 255, 255, 204],
|
|
||||||
"text_detail": [255, 255, 255, 172],
|
|
||||||
"text_link": [255, 255, 255, 127],
|
|
||||||
"text_inactive": [255, 255, 255, 88],
|
|
||||||
"text_hover": [255, 255, 255, 204],
|
|
||||||
"text_pressed": [255, 255, 255, 204],
|
|
||||||
"text_subtext": [255, 255, 255, 172],
|
|
||||||
"text_emphasis": [255, 255, 255, 255],
|
|
||||||
"text_scene": [39, 44, 48, 255],
|
|
||||||
"text_scene_hover": [43, 48, 52, 255],
|
|
||||||
|
|
||||||
"error": [212, 31, 53, 255],
|
|
||||||
"sidebar_header_bar": [39, 44, 48, 255],
|
|
||||||
"sidebar_header_active": [39, 44, 48, 255],
|
|
||||||
"sidebar_header_hover": [39, 44, 48, 255],
|
|
||||||
"sidebar_header_highlight": [68, 192, 255, 255],
|
|
||||||
"sidebar_header_highlight_hover": [68, 192, 255, 255],
|
|
||||||
"sidebar_header_text_active": [255, 255, 255, 255],
|
|
||||||
"sidebar_header_text_hover": [255, 255, 255, 255],
|
|
||||||
"sidebar_header_text_inactive": [255, 255, 255, 127],
|
|
||||||
"sidebar_lining": [31, 36, 39, 255],
|
|
||||||
|
|
||||||
"button": [39, 44, 48, 255],
|
|
||||||
"button_hover": [39, 44, 48, 255],
|
|
||||||
"button_active": [67, 72, 75, 255],
|
|
||||||
"button_active_hover": [67, 72, 75, 255],
|
|
||||||
"button_text": [255, 255, 255, 197],
|
|
||||||
"button_text_hover": [255, 255, 255, 255],
|
|
||||||
"button_text_active": [255, 255, 255, 255],
|
|
||||||
"button_text_active_hover": [255, 255, 255, 255],
|
|
||||||
"button_disabled": [39, 44, 48, 255],
|
|
||||||
"button_disabled_text": [255, 255, 255, 101],
|
|
||||||
|
|
||||||
"button_tooltip": [39, 44, 48, 255],
|
|
||||||
"button_tooltip_border": [39, 44, 48, 255],
|
|
||||||
"button_tooltip_text": [255, 255, 255, 172],
|
|
||||||
|
|
||||||
"tab_checked": [39, 44, 48, 255],
|
|
||||||
"tab_checked_border": [255, 255, 255, 30],
|
|
||||||
"tab_checked_text": [255, 255, 255, 255],
|
|
||||||
"tab_unchecked": [39, 44, 48, 255],
|
|
||||||
"tab_unchecked_border": [255, 255, 255, 30],
|
|
||||||
"tab_unchecked_text": [255, 255, 255, 101],
|
|
||||||
"tab_hovered": [39, 44, 48, 255],
|
|
||||||
"tab_hovered_border": [255, 255, 255, 30],
|
|
||||||
"tab_hovered_text": [255, 255, 255, 255],
|
|
||||||
"tab_active": [39, 44, 48, 255],
|
|
||||||
"tab_active_border": [255, 255, 255, 30],
|
|
||||||
"tab_active_text": [255, 255, 255, 255],
|
|
||||||
"tab_background": [39, 44, 48, 255],
|
|
||||||
|
|
||||||
"action_button": [39, 44, 48, 255],
|
|
||||||
"action_button_text": [255, 255, 255, 101],
|
|
||||||
"action_button_border": [255, 255, 255, 30],
|
|
||||||
"action_button_hovered": [39, 44, 48, 255],
|
|
||||||
"action_button_hovered_text": [255, 255, 255, 255],
|
|
||||||
"action_button_hovered_border": [255, 255, 255, 30],
|
|
||||||
"action_button_active": [39, 44, 48, 30],
|
|
||||||
"action_button_active_text": [255, 255, 255, 255],
|
|
||||||
"action_button_active_border": [255, 255, 255, 30],
|
|
||||||
"action_button_disabled": [39, 44, 48, 255],
|
|
||||||
"action_button_disabled_text": [255, 255, 255, 101],
|
|
||||||
"action_button_disabled_border": [255, 255, 255, 30],
|
|
||||||
|
|
||||||
"scrollbar_background": [39, 44, 48, 0],
|
|
||||||
"scrollbar_handle": [255, 255, 255, 105],
|
|
||||||
"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_text": [255, 255, 255, 152],
|
|
||||||
"setting_category_disabled_text": [255, 255, 255, 101],
|
|
||||||
"setting_category_hover_text": [255, 255, 255, 204],
|
|
||||||
"setting_category_active_text": [255, 255, 255, 204],
|
|
||||||
"setting_category_active_hover_text": [255, 255, 255, 204],
|
|
||||||
"setting_category_border": [39, 44, 48, 0],
|
|
||||||
"setting_category_disabled_border": [39, 44, 48, 0],
|
|
||||||
"setting_category_hover_border": [39, 44, 48, 0],
|
|
||||||
"setting_category_active_border": [39, 44, 48, 0],
|
|
||||||
"setting_category_active_hover_border": [39, 44, 48, 0],
|
|
||||||
|
|
||||||
"setting_control": [43, 48, 52, 255],
|
|
||||||
"setting_control_selected": [34, 39, 42, 38],
|
|
||||||
"setting_control_highlight": [255, 255, 255, 0],
|
|
||||||
"setting_control_border": [255, 255, 255, 38],
|
|
||||||
"setting_control_border_highlight": [255, 255, 255, 38],
|
|
||||||
"setting_control_text": [255, 255, 255, 181],
|
|
||||||
"setting_control_button": [255, 255, 255, 127],
|
|
||||||
"setting_control_button_hover": [255, 255, 255, 204],
|
|
||||||
"setting_control_disabled": [34, 39, 42, 255],
|
|
||||||
"setting_control_disabled_text": [255, 255, 255, 101],
|
|
||||||
"setting_control_disabled_border": [255, 255, 255, 101],
|
|
||||||
"setting_unit": [255, 255, 255, 127],
|
|
||||||
"setting_validation_error_background": [59, 31, 53, 255],
|
|
||||||
"setting_validation_error": [212, 31, 53, 255],
|
|
||||||
"setting_validation_warning_background": [62, 54, 46, 255],
|
|
||||||
"setting_validation_warning": [245, 166, 35, 255],
|
|
||||||
"setting_validation_ok": [43, 48, 52, 255],
|
|
||||||
|
|
||||||
"progressbar_background": [255, 255, 255, 48],
|
|
||||||
"progressbar_control": [255, 255, 255, 197],
|
|
||||||
|
|
||||||
"slider_groove": [39, 44, 48, 75],
|
|
||||||
"slider_groove_border": [39, 44, 48, 0],
|
|
||||||
"slider_groove_fill": [39, 44, 48, 182],
|
|
||||||
"slider_handle": [255, 255, 255, 255],
|
|
||||||
"slider_handle_border": [39, 44, 48, 255],
|
|
||||||
"slider_handle_hover": [255, 255, 255, 255],
|
|
||||||
"slider_handle_hover_border": [39, 44, 48, 255],
|
|
||||||
"slider_text_background": [39, 44, 48, 255],
|
|
||||||
|
|
||||||
"checkbox": [43, 48, 52, 255],
|
|
||||||
"checkbox_hover": [43, 48, 52, 255],
|
|
||||||
"checkbox_border": [255, 255, 255, 38],
|
|
||||||
"checkbox_border_hover": [255, 255, 255, 38],
|
|
||||||
"checkbox_mark": [255, 255, 255, 181],
|
|
||||||
"checkbox_text": [255, 255, 255, 181],
|
|
||||||
|
|
||||||
"tooltip": [39, 44, 48, 255],
|
|
||||||
"tooltip_text": [255, 255, 255, 204],
|
|
||||||
|
|
||||||
"message_background": [255, 255, 255, 200],
|
|
||||||
"message_text": [0, 0, 0, 255],
|
|
||||||
"message_border": [191, 191, 191, 200],
|
|
||||||
"message_button": [255, 255, 255, 255],
|
|
||||||
"message_button_hover": [12, 169, 227, 255],
|
|
||||||
"message_button_active": [32, 166, 219, 255],
|
|
||||||
"message_button_text": [24, 41, 77, 255],
|
|
||||||
"message_button_text_hover": [255, 255, 255, 255],
|
|
||||||
"message_button_text_active": [255, 255, 255, 255],
|
|
||||||
"message_progressbar_background": [255, 255, 255, 255],
|
|
||||||
"message_progressbar_control": [12, 169, 227, 255],
|
|
||||||
|
|
||||||
"tool_panel_background": [39, 44, 48, 255],
|
|
||||||
|
|
||||||
"status_offline": [0, 0, 0, 255],
|
|
||||||
"status_ready": [0, 205, 0, 255],
|
|
||||||
"status_busy": [12, 169, 227, 255],
|
|
||||||
"status_paused": [255, 140, 0, 255],
|
|
||||||
"status_stopped": [236, 82, 80, 255],
|
|
||||||
"status_unknown": [127, 127, 127, 255],
|
|
||||||
|
|
||||||
"disabled_axis": [127, 127, 127, 255],
|
|
||||||
"x_axis": [255, 0, 0, 255],
|
|
||||||
"y_axis": [0, 0, 255, 255],
|
|
||||||
"z_axis": [0, 255, 0, 255],
|
|
||||||
"all_axis": [255, 255, 255, 255],
|
|
||||||
|
|
||||||
"viewport_background": [241, 242, 242, 255],
|
|
||||||
"volume_outline": [1, 168, 230, 255],
|
|
||||||
"buildplate": [252, 252, 252, 255],
|
|
||||||
"buildplate_alt": [204, 204, 204, 255],
|
|
||||||
"buildplate_grid": [129, 131, 134, 255],
|
|
||||||
"buildplate_grid_minor": [129, 131, 134, 31],
|
|
||||||
|
|
||||||
"convex_hull": [35, 35, 35, 127],
|
|
||||||
"disallowed_area": [0, 0, 0, 52],
|
|
||||||
"error_area": [255, 0, 0, 127],
|
|
||||||
|
|
||||||
"model_default": [255, 201, 36, 255],
|
|
||||||
"model_overhang": [255, 0, 0, 255],
|
|
||||||
"model_unslicable": [122, 122, 122, 255],
|
|
||||||
"model_unslicable_alt": [172, 172, 127, 255],
|
|
||||||
"model_selection_outline": [12, 169, 227, 255],
|
|
||||||
|
|
||||||
"xray": [26, 26, 62, 255],
|
|
||||||
"xray_error": [255, 0, 0, 255],
|
|
||||||
|
|
||||||
"layerview_ghost": [32, 32, 32, 96],
|
|
||||||
"layerview_none": [255, 255, 255, 255],
|
|
||||||
"layerview_inset_0": [255, 0, 0, 255],
|
|
||||||
"layerview_inset_x": [0, 255, 0, 255],
|
|
||||||
"layerview_skin": [255, 255, 0, 255],
|
|
||||||
"layerview_support": [0, 255, 255, 255],
|
|
||||||
"layerview_skirt": [0, 255, 255, 255],
|
|
||||||
"layerview_infill": [255, 192, 0, 255],
|
|
||||||
"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]
|
|
||||||
},
|
|
||||||
|
|
||||||
"sizes": {
|
|
||||||
"window_minimum_size": [70, 50],
|
|
||||||
"window_margin": [1.0, 1.0],
|
|
||||||
"default_margin": [1.0, 1.0],
|
|
||||||
"default_lining": [0.08, 0.08],
|
|
||||||
"default_arrow": [0.8, 0.8],
|
|
||||||
"logo": [9.5, 2.0],
|
|
||||||
|
|
||||||
"sidebar": [35.0, 10.0],
|
|
||||||
"sidebar_header": [0.0, 4.0],
|
|
||||||
"sidebar_header_highlight": [0.25, 0.25],
|
|
||||||
"sidebar_header_mode_toggle": [0.0, 2.0],
|
|
||||||
"sidebar_header_mode_tabs": [0.0, 3.0],
|
|
||||||
"sidebar_lining": [0.5, 0.5],
|
|
||||||
"sidebar_lining_thin": [0.2, 0.2],
|
|
||||||
"sidebar_setup": [0.0, 2.0],
|
|
||||||
"sidebar_tabs": [0.0, 3.5],
|
|
||||||
"sidebar_inputfields": [0.0, 2.0],
|
|
||||||
"sidebar_extruder_box": [0.0, 6.0],
|
|
||||||
"simple_mode_infill_caption": [0.0, 5.0],
|
|
||||||
"simple_mode_infill_height": [0.0, 8.0],
|
|
||||||
|
|
||||||
"section": [0.0, 2.0],
|
|
||||||
"section_icon": [1.6, 1.6],
|
|
||||||
"section_icon_column": [2.8, 0.0],
|
|
||||||
|
|
||||||
"setting": [25.0, 1.8],
|
|
||||||
"setting_control": [10.0, 2.0],
|
|
||||||
"setting_control_depth_margin": [1.4, 0.0],
|
|
||||||
"setting_preferences_button_margin": [3.3, 0.0],
|
|
||||||
"setting_control_margin": [0.0, 0.0],
|
|
||||||
"setting_unit_margin": [0.5, 0.5],
|
|
||||||
"setting_text_maxwidth": [40.0, 0.0],
|
|
||||||
|
|
||||||
"standard_list_lineheight": [1.5, 1.5],
|
|
||||||
"standard_list_input": [20.0, 25.0],
|
|
||||||
"standard_arrow": [0.8, 0.8],
|
|
||||||
|
|
||||||
"button": [4, 4],
|
|
||||||
"button_icon": [2.5, 2.5],
|
|
||||||
"button_lining": [0, 0],
|
|
||||||
|
|
||||||
"topbar_button": [8, 4],
|
|
||||||
|
|
||||||
"button_tooltip": [1.0, 1.3],
|
|
||||||
"button_tooltip_arrow": [0.25, 0.25],
|
|
||||||
|
|
||||||
"progressbar": [26.0, 0.8],
|
|
||||||
"progressbar_radius": [0.4, 0.4],
|
|
||||||
"progressbar_control": [8.0, 0.8],
|
|
||||||
|
|
||||||
"scrollbar": [0.75, 0.5],
|
|
||||||
|
|
||||||
"slider_groove": [0.5, 0.5],
|
|
||||||
"slider_handle": [1.5, 1.5],
|
|
||||||
"slider_layerview_size": [1.0, 22.0],
|
|
||||||
"slider_layerview_background": [4.0, 0.0],
|
|
||||||
"slider_layerview_margin": [1.0, 1.0],
|
|
||||||
|
|
||||||
"layerview_menu_size": [16.5, 21.0],
|
|
||||||
"layerview_menu_size_compatibility": [22, 23.0],
|
|
||||||
"layerview_legend_size": [1.0, 1.0],
|
|
||||||
"layerview_row": [11.0, 1.5],
|
|
||||||
"layerview_row_spacing": [0.0, 0.5],
|
|
||||||
|
|
||||||
"checkbox": [2.0, 2.0],
|
|
||||||
"mode_switch": [2.0, 1.0],
|
|
||||||
|
|
||||||
"tooltip": [20.0, 10.0],
|
|
||||||
"tooltip_margins": [1.0, 1.0],
|
|
||||||
"tooltip_arrow_margins": [2.0, 2.0],
|
|
||||||
|
|
||||||
"save_button_text_margin": [0.3, 0.6],
|
|
||||||
"save_button_save_to_button": [0.3, 2.7],
|
|
||||||
"save_button_specs_icons": [1.4, 1.4],
|
|
||||||
|
|
||||||
"modal_window_minimum": [60.0, 45],
|
|
||||||
"wizard_progress": [10.0, 0.0],
|
|
||||||
|
|
||||||
"message": [30.0, 5.0],
|
|
||||||
"message_close": [1.25, 1.25],
|
|
||||||
"message_button": [6.0, 1.8],
|
|
||||||
|
|
||||||
"infill_button_margin": [0.5, 0.5],
|
|
||||||
|
|
||||||
"jobspecs_line": [2.0, 2.0]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Loading…
x
Reference in New Issue
Block a user