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

Convert Toolbar.qml and styles.qml to Theme getThing style

Browse source
This commit is contained in:
Arjen Hiemstra 2016-01-25 02:40:29 +01:00 • committed by Ghostkeeper
parent d93055da1a
commit 19c25895bf
2 changed files with 185 additions and 136 deletions
Download patch file Download diff file Expand all files Collapse all files

2
resources/qml/Toolbar.qml
View file

@ -29,7 +29,7 @@ Item {
Button { Button {
text: model.name text: model.name
iconSource: UM.Theme.icons[model.icon]; iconSource: UM.Theme.getIcon(model.icon);
checkable: true; checkable: true;
checked: model.active; checked: model.active;

319
resources/themes/cura/styles.qml
View file

@ -11,57 +11,107 @@ QtObject {
property Component sidebar_header_button: Component { property Component sidebar_header_button: Component {
ButtonStyle { ButtonStyle {
background: Rectangle { background: Rectangle {
color: UM.Theme.colors.setting_control color: UM.Theme.getColor("setting_control")
border.width: UM.Theme.sizes.default_lining.width border.width: UM.Theme.getSize("default_lining").width
border.color: control.hovered ? UM.Theme.colors.setting_control_border_highlight : UM.Theme.colors.setting_control_border border.color: control.hovered ? UM.Theme.getColor("setting_control_border_highlight") : UM.Theme.getColor("setting_control_border")
UM.RecolorImage { UM.RecolorImage {
id: downArrow id: downArrow
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
anchors.right: parent.right anchors.right: parent.right
anchors.rightMargin: UM.Theme.sizes.default_margin.width anchors.rightMargin: UM.Theme.getSize("default_margin").width
width: UM.Theme.sizes.standard_arrow.width width: UM.Theme.getSize("standard_arrow").width
height: UM.Theme.sizes.standard_arrow.height height: UM.Theme.getSize("standard_arrow").height
sourceSize.width: width sourceSize.width: width
sourceSize.height: width sourceSize.height: width
color: UM.Theme.colors.setting_category_text color: UM.Theme.getColor("setting_category_text")
source: UM.Theme.icons.arrow_bottom source: UM.Theme.getIcon("arrow_bottom")
} }
Label { Label {
id: sidebarComboBoxLabel id: sidebarComboBoxLabel
color: UM.Theme.colors.setting_control_text color: UM.Theme.getColor("setting_control_text")
text: control.text; text: control.text;
elide: Text.ElideRight; elide: Text.ElideRight;
anchors.left: parent.left; anchors.left: parent.left;
anchors.leftMargin: UM.Theme.sizes.setting_unit_margin.width anchors.leftMargin: UM.Theme.getSize("setting_unit_margin").width
anchors.right: downArrow.left; anchors.right: downArrow.left;
anchors.verticalCenter: parent.verticalCenter; anchors.verticalCenter: parent.verticalCenter;
font: UM.Theme.fonts.default font: UM.Theme.getFont("default")
} }
} }
label: Label{} label: Label{}
} }
} }
<<<<<<< HEAD
=======
/*
property Component open_file_button: Component {
ButtonStyle {
background: Item{
implicitWidth: UM.Theme.getSize("button").width;
implicitHeight: UM.Theme.getSize("button").height;
Rectangle {
id: tool_button_background
anchors.left: parent.right
anchors.verticalCenter: parent.verticalCenter
opacity: control.hovered ? 1.0 : 0.0;
width: control.hovered ? label.width : 0;
height: label.height
Behavior on width { NumberAnimation { duration: 100; } }
Behavior on height { NumberAnimation { duration: 100; } }
Behavior on opacity { NumberAnimation { duration: 100; } }
Label {
id: label
anchors.bottom: parent.bottom
text: control.text
font: UM.Theme.getFont("button_tooltip");
color: UM.Theme.getColor("button_tooltip_text");
}
}
Rectangle {
anchors.fill: parent;
color: control.pressed ? UM.Theme.getColor("button_active") :
control.hovered ? UM.Theme.getColor("button_hover") : UM.Theme.getColor("button")
Behavior on color { ColorAnimation { duration: 50; } }
}
}
label: Item {
Image {
anchors.centerIn: parent;
source: control.iconSource;
width: UM.Theme.getSize("button_icon").width;
height: UM.Theme.getSize("button_icon").height;
sourceSize: UM.Theme.getSize("button_icon")
}
}
}
}
*/
>>>>>>> Convert Toolbar.qml and styles.qml to Theme getThing style
property Component tool_button: Component { property Component tool_button: Component {
ButtonStyle { ButtonStyle {
background: Item { background: Item {
implicitWidth: UM.Theme.sizes.button.width; implicitWidth: UM.Theme.getSize("button").width;
implicitHeight: UM.Theme.sizes.button.height; implicitHeight: UM.Theme.getSize("button").height;
UM.PointingRectangle { UM.PointingRectangle {
id: button_tooltip id: button_tooltip
anchors.left: parent.right anchors.left: parent.right
anchors.leftMargin: UM.Theme.sizes.button_tooltip_arrow.width * 2 anchors.leftMargin: UM.Theme.getSize("button_tooltip_arrow").width * 2
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
target: Qt.point(parent.x, y + height/2) target: Qt.point(parent.x, y + height/2)
arrowSize: UM.Theme.sizes.button_tooltip_arrow.width arrowSize: UM.Theme.getSize("button_tooltip_arrow").width
color: UM.Theme.colors.tooltip color: UM.Theme.getColor("tooltip")
opacity: control.hovered ? 1.0 : 0.0; opacity: control.hovered ? 1.0 : 0.0;
width: control.hovered ? button_tip.width + UM.Theme.sizes.button_tooltip.width : 0 width: control.hovered ? button_tip.width + UM.Theme.getSize("button_tooltip").width : 0
height: UM.Theme.sizes.button_tooltip.height height: UM.Theme.getSize("button_tooltip").height
Behavior on width { NumberAnimation { duration: 100; } } Behavior on width { NumberAnimation { duration: 100; } }
Behavior on opacity { NumberAnimation { duration: 100; } } Behavior on opacity { NumberAnimation { duration: 100; } }
@ -73,8 +123,8 @@ QtObject {
anchors.verticalCenter: parent.verticalCenter; anchors.verticalCenter: parent.verticalCenter;
text: control.text; text: control.text;
font: UM.Theme.fonts.button_tooltip; font: UM.Theme.getFont("button_tooltip");
color: UM.Theme.colors.tooltip_text; color: UM.Theme.getColor("tooltip_text");
} }
} }
@ -86,13 +136,13 @@ QtObject {
color: { color: {
if(control.checkable && control.checked && control.hovered) { if(control.checkable && control.checked && control.hovered) {
return UM.Theme.colors.button_active_hover; return UM.Theme.getColor("button_active_hover");
} else if(control.pressed || (control.checkable && control.checked)) { } else if(control.pressed || (control.checkable && control.checked)) {
return UM.Theme.colors.button_active; return UM.Theme.getColor("button_active");
} else if(control.hovered) { } else if(control.hovered) {
return UM.Theme.colors.button_hover; return UM.Theme.getColor("button_hover");
} else { } else {
return UM.Theme.colors.button; return UM.Theme.getColor("button");
} }
} }
Behavior on color { ColorAnimation { duration: 50; } } Behavior on color { ColorAnimation { duration: 50; } }
@ -102,16 +152,16 @@ QtObject {
id: tool_button_arrow id: tool_button_arrow
opacity: !control.enabled ? 0.2 : 1.0 opacity: !control.enabled ? 0.2 : 1.0
anchors.right: parent.right; anchors.right: parent.right;
anchors.rightMargin: (UM.Theme.sizes.button.width - UM.Theme.sizes.button_icon.width) / 4 anchors.rightMargin: (UM.Theme.getSize("button").width - UM.Theme.getSize("button_icon").width) / 4
anchors.bottom: parent.bottom; anchors.bottom: parent.bottom;
anchors.bottomMargin: (UM.Theme.sizes.button.height - UM.Theme.sizes.button_icon.height) / 4 anchors.bottomMargin: (UM.Theme.getSize("button").height - UM.Theme.getSize("button_icon").height) / 4
width: UM.Theme.sizes.standard_arrow.width width: UM.Theme.getSize("standard_arrow").width
height: UM.Theme.sizes.standard_arrow.height height: UM.Theme.getSize("standard_arrow").height
sourceSize.width: width sourceSize.width: width
sourceSize.height: width sourceSize.height: width
visible: control.menu != null; visible: control.menu != null;
color: UM.Theme.colors.button_text color: UM.Theme.getColor("button_text")
source: UM.Theme.icons.arrow_bottom source: UM.Theme.getIcon("arrow_bottom")
} }
} }
} }
@ -121,37 +171,36 @@ QtObject {
anchors.centerIn: parent; anchors.centerIn: parent;
opacity: !control.enabled ? 0.2 : 1.0 opacity: !control.enabled ? 0.2 : 1.0
source: control.iconSource; source: control.iconSource;
width: UM.Theme.sizes.button_icon.width; width: UM.Theme.getSize("button_icon").width;
height: UM.Theme.sizes.button_icon.height; height: UM.Theme.getSize("button_icon").height;
sourceSize: UM.Theme.sizes.button_icon sourceSize: UM.Theme.getSize("button_icon")
} }
} }
} }
} }
property Component progressbar: Component{ property Component progressbar: Component{
ProgressBarStyle { ProgressBarStyle {
background:Rectangle { background:Rectangle {
implicitWidth: UM.Theme.sizes.message.width - (UM.Theme.sizes.default_margin.width * 2) implicitWidth: UM.Theme.getSize("message").width - (UM.Theme.getSize("default_margin").width * 2)
implicitHeight: UM.Theme.sizes.progressbar.height implicitHeight: UM.Theme.getSize("progressbar").height
radius: UM.Theme.sizes.progressbar_radius.width radius: UM.Theme.getSize("progressbar_radius").width
color: UM.Theme.colors.progressbar_background color: UM.Theme.getColor("progressbar_background")
} }
progress: Rectangle { progress: Rectangle {
color: control.indeterminate ? "transparent" : UM.Theme.colors.progressbar_control color: control.indeterminate ? "transparent" : UM.Theme.getColor("progressbar_control")
radius: UM.Theme.sizes.progressbar_radius.width radius: UM.Theme.sizes.progressbar_radius.width
Rectangle{ Rectangle{
radius: UM.Theme.sizes.progressbar_radius.width radius: UM.Theme.getSize("progressbar_radius").width
color: UM.Theme.colors.progressbar_control color: UM.Theme.getColor("progressbar_control")
width: UM.Theme.sizes.progressbar_control.width width: UM.Theme.getSize("progressbar_control").width
height: UM.Theme.sizes.progressbar_control.height height: UM.Theme.getSize("progressbar_control").height
visible: control.indeterminate visible: control.indeterminate
SequentialAnimation on x { SequentialAnimation on x {
id: xAnim id: xAnim
property int animEndPoint: UM.Theme.sizes.message.width - (UM.Theme.sizes.default_margin.width * 2) - UM.Theme.sizes.progressbar_control.width property int animEndPoint: UM.Theme.getSize("message").width - (UM.Theme.getSize("default_margin").width * 2) - UM.Theme.getSize("progressbar_control").width
running: control.indeterminate running: control.indeterminate
loops: Animation.Infinite loops: Animation.Infinite
NumberAnimation { from: 0; to: xAnim.animEndPoint; duration: 2000;} NumberAnimation { from: 0; to: xAnim.animEndPoint; duration: 2000;}
@ -169,41 +218,41 @@ QtObject {
background: Rectangle { background: Rectangle {
anchors.fill: parent; anchors.fill: parent;
anchors.left: parent.left anchors.left: parent.left
anchors.leftMargin: UM.Theme.sizes.default_margin.width anchors.leftMargin: UM.Theme.getSize("default_margin").width
anchors.right: parent.right anchors.right: parent.right
anchors.rightMargin: UM.Theme.sizes.default_margin.width anchors.rightMargin: UM.Theme.getSize("default_margin").width
implicitHeight: UM.Theme.sizes.section.height; implicitHeight: UM.Theme.getSize("section").height;
color: { color: {
if(control.color) { if(control.color) {
return control.color; return control.color;
} else if(!control.enabled) { } else if(!control.enabled) {
return UM.Theme.colors.setting_category_disabled; return UM.Theme.getColor("setting_category_disabled");
} else if(control.hovered && control.checkable && control.checked) { } else if(control.hovered && control.checkable && control.checked) {
return UM.Theme.colors.setting_category_active_hover; return UM.Theme.getColor("setting_category_active_hover");
} else if(control.pressed || (control.checkable && control.checked)) { } else if(control.pressed || (control.checkable && control.checked)) {
return UM.Theme.colors.setting_category_active; return UM.Theme.getColor("setting_category_active");
} else if(control.hovered) { } else if(control.hovered) {
return UM.Theme.colors.setting_category_hover; return UM.Theme.getColor("setting_category_hover");
} else { } else {
return UM.Theme.colors.setting_category; return UM.Theme.getColor("setting_category");
} }
} }
Behavior on color { ColorAnimation { duration: 50; } } Behavior on color { ColorAnimation { duration: 50; } }
Rectangle { Rectangle {
height: UM.Theme.sizes.default_lining.height height: UM.Theme.getSize("default_lining").height
width: parent.width width: parent.width
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
color: { color: {
if(!control.enabled) { if(!control.enabled) {
return UM.Theme.colors.setting_category_disabled_border; return UM.Theme.getColor("setting_category_disabled_border");
} else if(control.hovered && control.checkable && control.checked) { } else if(control.hovered && control.checkable && control.checked) {
return UM.Theme.colors.setting_category_active_hover_border; return UM.Theme.getColor("setting_category_active_hover_border");
} else if(control.pressed || (control.checkable && control.checked)) { } else if(control.pressed || (control.checkable && control.checked)) {
return UM.Theme.colors.setting_category_active_border; return UM.Theme.getColor("setting_category_active_border");
} else if(control.hovered) { } else if(control.hovered) {
return UM.Theme.colors.setting_category_hover_border; return UM.Theme.getColor("setting_category_hover_border");
} else { } else {
return UM.Theme.colors.setting_category_border; return UM.Theme.getColor("setting_category_border");
} }
} }
} }
@ -215,15 +264,15 @@ QtObject {
id: icon; id: icon;
anchors.left: parent.left anchors.left: parent.left
height: parent.height height: parent.height
width: UM.Theme.sizes.section_icon_column.width width: UM.Theme.getSize("section_icon_column").width
UM.RecolorImage { UM.RecolorImage {
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
anchors.left: parent.left anchors.left: parent.left
anchors.leftMargin: UM.Theme.sizes.default_margin.width anchors.leftMargin: UM.Theme.getSize("default_margin").width
color: UM.Theme.colors.setting_category_text color: UM.Theme.getColor("setting_category_text")
source: control.iconSource; source: control.iconSource;
width: UM.Theme.sizes.section_icon.width; width: UM.Theme.getSize("section_icon").width;
height: UM.Theme.sizes.section_icon.height; height: UM.Theme.getSize("section_icon").height;
sourceSize.width: width + 15 sourceSize.width: width + 15
sourceSize.height: width + 15 sourceSize.height: width + 15
} }
@ -232,13 +281,13 @@ QtObject {
Label { Label {
anchors { anchors {
left: icon.right; left: icon.right;
leftMargin: UM.Theme.sizes.default_lining.width; leftMargin: UM.Theme.getSize("default_lining").width;
right: parent.right; right: parent.right;
verticalCenter: parent.verticalCenter; verticalCenter: parent.verticalCenter;
} }
text: control.text; text: control.text;
font: UM.Theme.fonts.setting_category; font: UM.Theme.getFont("setting_category");
color: UM.Theme.colors.setting_category_text; color: UM.Theme.getColor("setting_category_text");
fontSizeMode: Text.HorizontalFit; fontSizeMode: Text.HorizontalFit;
minimumPointSize: 8 minimumPointSize: 8
} }
@ -246,13 +295,13 @@ QtObject {
id: category_arrow id: category_arrow
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
anchors.right: parent.right anchors.right: parent.right
anchors.rightMargin: UM.Theme.sizes.default_margin.width * 2 - width / 2 anchors.rightMargin: UM.Theme.getSize("default_margin").width * 2 - width / 2
width: UM.Theme.sizes.standard_arrow.width width: UM.Theme.getSize("standard_arrow").width
height: UM.Theme.sizes.standard_arrow.height height: UM.Theme.getSize("standard_arrow").height
sourceSize.width: width sourceSize.width: width
sourceSize.height: width sourceSize.height: width
color: UM.Theme.colors.setting_category_text color: UM.Theme.getColor("setting_category_text")
source: control.checked ? UM.Theme.icons.arrow_bottom : UM.Theme.icons.arrow_left source: control.checked ? UM.Theme.getIcon("arrow_bottom") : UM.Theme.getIcon("arrow_left")
} }
} }
} }
@ -266,62 +315,62 @@ QtObject {
transientScrollBars: false transientScrollBars: false
scrollBarBackground: Rectangle { scrollBarBackground: Rectangle {
implicitWidth: UM.Theme.sizes.scrollbar.width implicitWidth: UM.Theme.getSize("scrollbar").width
radius: implicitWidth / 2 radius: implicitWidth / 2
color: UM.Theme.colors.scrollbar_background; color: UM.Theme.getColor("scrollbar_background");
} }
handle: Rectangle { handle: Rectangle {
id: scrollViewHandle id: scrollViewHandle
implicitWidth: UM.Theme.sizes.scrollbar.width; implicitWidth: UM.Theme.getSize("scrollbar").width;
radius: implicitWidth / 2 radius: implicitWidth / 2
color: styleData.pressed ? UM.Theme.colors.scrollbar_handle_down : styleData.hovered ? UM.Theme.colors.scrollbar_handle_hover : UM.Theme.colors.scrollbar_handle; color: styleData.pressed ? UM.Theme.getColor("scrollbar_handle_down") : styleData.hovered ? UM.Theme.getColor("scrollbar_handle_hover") : UM.Theme.getColor("scrollbar_handle");
Behavior on color { ColorAnimation { duration: 50; } } Behavior on color { ColorAnimation { duration: 50; } }
} }
} }
} }
property variant setting_item: UM.SettingItemStyle { property variant setting_item: UM.SettingItemStyle {
labelFont: UM.Theme.fonts.default; labelFont: UM.Theme.getFont("default");
labelColor: UM.Theme.colors.setting_control_text; labelColor: UM.Theme.getColor("setting_control_text");
spacing: UM.Theme.sizes.default_lining.height; spacing: UM.Theme.getSize("default_lining").height;
fixedHeight: UM.Theme.sizes.setting.height; fixedHeight: UM.Theme.getSize("setting").height;
controlWidth: UM.Theme.sizes.setting_control.width; controlWidth: UM.Theme.getSize("setting_control").width;
controlRightMargin: UM.Theme.sizes.setting_control_margin.width; controlRightMargin: UM.Theme.getSize("setting_control_margin").width;
controlColor: UM.Theme.colors.setting_control; controlColor: UM.Theme.getColor("setting_control");
controlHighlightColor: UM.Theme.colors.setting_control_highlight; controlHighlightColor: UM.Theme.getColor("setting_control_highlight");
controlBorderColor: UM.Theme.colors.setting_control_border; controlBorderColor: UM.Theme.getColor("setting_control_border");
controlBorderHighlightColor: UM.Theme.colors.setting_control_border_highlight; controlBorderHighlightColor: UM.Theme.getColor("setting_control_border_highlight");
controlTextColor: UM.Theme.colors.setting_control_text; controlTextColor: UM.Theme.getColor("setting_control_text");
controlBorderWidth: UM.Theme.sizes.default_lining.width; controlBorderWidth: UM.Theme.getSize("default_lining").width;
controlFont: UM.Theme.fonts.default; controlFont: UM.Theme.getFont("default");
validationErrorColor: UM.Theme.colors.setting_validation_error; validationErrorColor: UM.Theme.getColor("setting_validation_error");
validationWarningColor: UM.Theme.colors.setting_validation_warning; validationWarningColor: UM.Theme.getColor("setting_validation_warning");
validationOkColor: UM.Theme.colors.setting_validation_ok; validationOkColor: UM.Theme.getColor("setting_validation_ok");
unitRightMargin: UM.Theme.sizes.setting_unit_margin.width; unitRightMargin: UM.Theme.getSize("setting_unit_margin").width;
unitColor: UM.Theme.colors.setting_unit; unitColor: UM.Theme.getColor("setting_unit");
unitFont: UM.Theme.fonts.default; unitFont: UM.Theme.getFont("default");
} }
property Component checkbox: Component { property Component checkbox: Component {
CheckBoxStyle { CheckBoxStyle {
background: Item { } background: Item { }
indicator: Rectangle { indicator: Rectangle {
implicitWidth: UM.Theme.sizes.checkbox.width; implicitWidth: UM.Theme.getSize("checkbox").width;
implicitHeight: UM.Theme.sizes.checkbox.height; implicitHeight: UM.Theme.getSize("checkbox").height;
color: (control.hovered || control.hovered_ex) ? UM.Theme.colors.checkbox_hover : UM.Theme.colors.checkbox; color: (control.hovered || control.hovered_ex) ? UM.Theme.getColor("checkbox_hover") : UM.Theme.getColor("checkbox");
Behavior on color { ColorAnimation { duration: 50; } } Behavior on color { ColorAnimation { duration: 50; } }
radius: control.exclusiveGroup ? UM.Theme.sizes.checkbox.width / 2 : 0 radius: control.exclusiveGroup ? UM.Theme.getSize("checkbox").width / 2 : 0
border.width: UM.Theme.sizes.default_lining.width; border.width: UM.Theme.getSize("default_lining").width;
border.color: (control.hovered || control.hovered_ex) ? UM.Theme.colors.checkbox_border_hover : UM.Theme.colors.checkbox_border; border.color: (control.hovered || control.hovered_ex) ? UM.Theme.getColor("checkbox_border_hover") : UM.Theme.getColor("checkbox_border");
UM.RecolorImage { UM.RecolorImage {
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
@ -330,16 +379,16 @@ QtObject {
height: parent.height/2.5 height: parent.height/2.5
sourceSize.width: width sourceSize.width: width
sourceSize.height: width sourceSize.height: width
color: UM.Theme.colors.checkbox_mark color: UM.Theme.getColor("checkbox_mark")
source: control.exclusiveGroup ? UM.Theme.icons.dot : UM.Theme.icons.check source: control.exclusiveGroup ? UM.Theme.getIcon("dot") : UM.Theme.getIcon("check")
opacity: control.checked opacity: control.checked
Behavior on opacity { NumberAnimation { duration: 100; } } Behavior on opacity { NumberAnimation { duration: 100; } }
} }
} }
label: Label { label: Label {
text: control.text; text: control.text;
color: UM.Theme.colors.checkbox_text; color: UM.Theme.getColor("checkbox_text");
font: UM.Theme.fonts.default; font: UM.Theme.getFont("default");
} }
} }
} }
@ -348,11 +397,11 @@ QtObject {
SliderStyle { SliderStyle {
groove: Rectangle { groove: Rectangle {
implicitWidth: control.width; implicitWidth: control.width;
implicitHeight: UM.Theme.sizes.slider_groove.height; implicitHeight: UM.Theme.getSize("slider_groove").height;
color: UM.Theme.colors.slider_groove; color: UM.Theme.getColor("slider_groove");
border.width: UM.Theme.sizes.default_lining.width; border.width: UM.Theme.getSize("default_lining").width;
border.color: UM.Theme.colors.slider_groove_border; border.color: UM.Theme.getColor("slider_groove_border");
Rectangle { Rectangle {
anchors { anchors {
@ -360,14 +409,14 @@ QtObject {
top: parent.top; top: parent.top;
bottom: parent.bottom; bottom: parent.bottom;
} }
color: UM.Theme.colors.slider_groove_fill; color: UM.Theme.getColor("slider_groove_fill");
width: (control.value / (control.maximumValue - control.minimumValue)) * parent.width; width: (control.value / (control.maximumValue - control.minimumValue)) * parent.width;
} }
} }
handle: Rectangle { handle: Rectangle {
width: UM.Theme.sizes.slider_handle.width; width: UM.Theme.getSize("slider_handle").width;
height: UM.Theme.sizes.slider_handle.height; height: UM.Theme.getSize("slider_handle").height;
color: control.hovered ? UM.Theme.colors.slider_handle_hover : UM.Theme.colors.slider_handle; color: control.hovered ? UM.Theme.getColor("slider_handle_hover") : UM.Theme.getColor("slider_handle");
Behavior on color { ColorAnimation { duration: 50; } } Behavior on color { ColorAnimation { duration: 50; } }
} }
} }
@ -378,28 +427,28 @@ QtObject {
groove: Rectangle { groove: Rectangle {
id: layerSliderGroove id: layerSliderGroove
implicitWidth: control.width; implicitWidth: control.width;
implicitHeight: UM.Theme.sizes.slider_groove.height; implicitHeight: UM.Theme.getSize("slider_groove").height;
radius: width/2; radius: width/2;
color: UM.Theme.colors.slider_groove; color: UM.Theme.getColor("slider_groove");
border.width: UM.Theme.sizes.default_lining.width; border.width: UM.Theme.getSize("default_lining").width;
border.color: UM.Theme.colors.slider_groove_border; border.color: UM.Theme.getColor("slider_groove_border");
Rectangle { Rectangle {
anchors { anchors {
left: parent.left; left: parent.left;
top: parent.top; top: parent.top;
bottom: parent.bottom; bottom: parent.bottom;
} }
color: UM.Theme.colors.slider_groove_fill; color: UM.Theme.getColor("slider_groove_fill");
width: (control.value / (control.maximumValue - control.minimumValue)) * parent.width; width: (control.value / (control.maximumValue - control.minimumValue)) * parent.width;
radius: width/2 radius: width/2
} }
} }
handle: Rectangle { handle: Rectangle {
id: layerSliderControl id: layerSliderControl
width: UM.Theme.sizes.slider_handle.width; width: UM.Theme.getSize("slider_handle").width;
height: UM.Theme.sizes.slider_handle.height; height: UM.Theme.getSize("slider_handle").height;
color: control.hovered ? UM.Theme.colors.slider_handle_hover : UM.Theme.colors.slider_handle; color: control.hovered ? UM.Theme.getColor("slider_handle_hover") : UM.Theme.getColor("slider_handle");
Behavior on color { ColorAnimation { duration: 50; } } Behavior on color { ColorAnimation { duration: 50; } }
TextField { TextField {
id: valueLabel id: valueLabel
@ -414,17 +463,17 @@ QtObject {
validator: IntValidator {bottom: 1; top: control.maximumValue + 1;} validator: IntValidator {bottom: 1; top: control.maximumValue + 1;}
visible: UM.LayerView.getLayerActivity && Printer.getPlatformActivity ? true : false visible: UM.LayerView.getLayerActivity && Printer.getPlatformActivity ? true : false
anchors.top: layerSliderControl.bottom anchors.top: layerSliderControl.bottom
anchors.topMargin: width/2 - UM.Theme.sizes.default_margin.width/2 anchors.topMargin: width/2 - UM.Theme.getSize("default_margin").width/2
anchors.horizontalCenter: layerSliderControl.horizontalCenter anchors.horizontalCenter: layerSliderControl.horizontalCenter
rotation: 90 rotation: 90
style: TextFieldStyle{ style: TextFieldStyle{
textColor: UM.Theme.colors.setting_control_text; textColor: UM.Theme.getColor("setting_control_text");
font: UM.Theme.fonts.default; font: UM.Theme.getFont("default");
background: Rectangle { background: Rectangle {
implicitWidth: control.maxValue.length * valueLabel.font.pixelSize + UM.Theme.sizes.default_margin.width implicitWidth: control.maxValue.length * valueLabel.font.pixelSize + UM.Theme.getSize("default_margin").width
implicitHeight: UM.Theme.sizes.slider_handle.height + UM.Theme.sizes.default_margin.width implicitHeight: UM.Theme.getSize("slider_handle").height + UM.Theme.getSize("default_margin").width
border.width: UM.Theme.sizes.default_lining.width; border.width: UM.Theme.getSize("default_lining").width;
border.color: UM.Theme.colors.slider_groove_border; border.color: UM.Theme.getColor("slider_groove_border");
} }
} }
} }
@ -434,27 +483,27 @@ QtObject {
property Component text_field: Component { property Component text_field: Component {
TextFieldStyle { TextFieldStyle {
textColor: UM.Theme.colors.setting_control_text; textColor: UM.Theme.getColor("setting_control_text");
font: UM.Theme.fonts.default; font: UM.Theme.getFont("default");
background: Rectangle background: Rectangle
{ {
implicitHeight: control.height; implicitHeight: control.height;
implicitWidth: control.width; implicitWidth: control.width;
border.width: UM.Theme.sizes.default_lining.width; border.width: UM.Theme.getSize("default_lining").width;
border.color: control.hovered ? UM.Theme.colors.setting_control_border_highlight : UM.Theme.colors.setting_control_border; border.color: control.hovered ? UM.Theme.getColor("setting_control_border_highlight") : UM.Theme.getColor("setting_control_border");
color: UM.Theme.colors.setting_validation_ok; color: UM.Theme.getColor("setting_validation_ok");
Label { Label {
anchors.right: parent.right; anchors.right: parent.right;
anchors.rightMargin: UM.Theme.sizes.setting_unit_margin.width; anchors.rightMargin: UM.Theme.getSize("setting_unit_margin").width;
anchors.verticalCenter: parent.verticalCenter; anchors.verticalCenter: parent.verticalCenter;
text: control.unit ? control.unit : "" text: control.unit ? control.unit : ""
color: UM.Theme.colors.setting_unit; color: UM.Theme.getColor("setting_unit");
font: UM.Theme.fonts.default; font: UM.Theme.getFont("default");
} }
} }
} }