mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-08-10 07:15:03 -06:00
Merge branch 'feature_light_colours_icons'
CURA-4148
This commit is contained in:
alekseisasin
commit
24c9dc9bee
116 changed files with 1909 additions and 1461 deletions
|
|
@ -447,7 +447,7 @@ UM.MainWindow
|
|||
right: sidebar.left
|
||||
}
|
||||
visible: opacity > 0
|
||||
opacity: base.showPrintMonitor ? 0.75 : 0
|
||||
opacity: base.showPrintMonitor ? 1 : 0
|
||||
|
||||
Behavior on opacity { NumberAnimation { duration: 100; } }
|
||||
|
||||
|
|
|
|||
|
|
@ -86,7 +86,7 @@ Item {
|
|||
height: UM.Theme.getSize("save_button_specs_icons").height;
|
||||
sourceSize.width: width;
|
||||
sourceSize.height: width;
|
||||
color: control.hovered ? UM.Theme.getColor("setting_control_button_hover") : UM.Theme.getColor("text");
|
||||
color: control.hovered ? UM.Theme.getColor("text_scene_hover") : UM.Theme.getColor("text_scene");
|
||||
source: UM.Theme.getIcon("pencil");
|
||||
}
|
||||
}
|
||||
|
|
@ -116,7 +116,7 @@ Item {
|
|||
regExp: /^[^\\ \/ \*\?\|\[\]]*$/
|
||||
}
|
||||
style: TextFieldStyle{
|
||||
textColor: UM.Theme.getColor("setting_control_text");
|
||||
textColor: UM.Theme.getColor("text_scene");
|
||||
font: UM.Theme.getFont("default_bold");
|
||||
background: Rectangle {
|
||||
opacity: 0
|
||||
|
|
@ -135,7 +135,7 @@ Item {
|
|||
height: UM.Theme.getSize("jobspecs_line").height
|
||||
verticalAlignment: Text.AlignVCenter
|
||||
font: UM.Theme.getFont("small")
|
||||
color: UM.Theme.getColor("text_subtext")
|
||||
color: UM.Theme.getColor("text_scene")
|
||||
text: CuraApplication.getSceneBoundingBoxString
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
// Copyright (c) 2016 Ultimaker B.V.
|
||||
// Copyright (c) 2017 Ultimaker B.V.
|
||||
// Cura is released under the terms of the AGPLv3 or higher.
|
||||
|
||||
import QtQuick 2.2
|
||||
|
|
@ -119,10 +119,10 @@ Item
|
|||
Label
|
||||
{
|
||||
id: statusLabel
|
||||
width: parent.width - 2 * UM.Theme.getSize("default_margin").width
|
||||
width: parent.width - 2 * UM.Theme.getSize("sidebar_margin").width
|
||||
anchors.top: parent.top
|
||||
anchors.left: parent.left
|
||||
anchors.leftMargin: UM.Theme.getSize("default_margin").width
|
||||
anchors.leftMargin: UM.Theme.getSize("sidebar_margin").width
|
||||
|
||||
color: base.statusColor
|
||||
font: UM.Theme.getFont("large")
|
||||
|
|
@ -177,21 +177,21 @@ Item
|
|||
property string backgroundColor: UM.Theme.getColor("progressbar_background");
|
||||
property string controlColor: base.statusColor;
|
||||
|
||||
width: parent.width - 2 * UM.Theme.getSize("default_margin").width;
|
||||
width: parent.width - 2 * UM.Theme.getSize("sidebar_margin").width;
|
||||
height: UM.Theme.getSize("progressbar").height;
|
||||
anchors.top: statusLabel.bottom;
|
||||
anchors.topMargin: UM.Theme.getSize("default_margin").height / 4;
|
||||
anchors.topMargin: UM.Theme.getSize("sidebar_margin").height / 4;
|
||||
anchors.left: parent.left;
|
||||
anchors.leftMargin: UM.Theme.getSize("default_margin").width;
|
||||
anchors.leftMargin: UM.Theme.getSize("sidebar_margin").width;
|
||||
}
|
||||
|
||||
Row {
|
||||
id: buttonsRow
|
||||
height: abortButton.height
|
||||
anchors.top: progressBar.bottom
|
||||
anchors.topMargin: UM.Theme.getSize("default_margin").height
|
||||
anchors.topMargin: UM.Theme.getSize("sidebar_margin").height
|
||||
anchors.right: parent.right
|
||||
anchors.rightMargin: UM.Theme.getSize("default_margin").width
|
||||
anchors.rightMargin: UM.Theme.getSize("sidebar_margin").width
|
||||
spacing: UM.Theme.getSize("default_margin").width
|
||||
|
||||
Row {
|
||||
|
|
|
|||
|
|
@ -353,7 +353,7 @@ Column
|
|||
Rectangle //Input field for pre-heat temperature.
|
||||
{
|
||||
id: preheatTemperatureControl
|
||||
color: !enabled ? UM.Theme.getColor("setting_control_disabled") : showError ? UM.Theme.getColor("setting_validation_error") : UM.Theme.getColor("setting_validation_ok")
|
||||
color: !enabled ? UM.Theme.getColor("setting_control_disabled") : showError ? UM.Theme.getColor("setting_validation_error_background") : UM.Theme.getColor("setting_validation_ok")
|
||||
property var showError:
|
||||
{
|
||||
if(bedTemperature.properties.maximum_value != "None" && bedTemperature.properties.maximum_value < parseInt(preheatTemperatureInput.text))
|
||||
|
|
|
|||
|
|
@ -45,10 +45,10 @@ Item {
|
|||
|
||||
Text {
|
||||
id: statusLabel
|
||||
width: parent.width - 2 * UM.Theme.getSize("default_margin").width
|
||||
width: parent.width - 2 * UM.Theme.getSize("sidebar_margin").width
|
||||
anchors.top: parent.top
|
||||
anchors.left: parent.left
|
||||
anchors.leftMargin: UM.Theme.getSize("default_margin").width
|
||||
anchors.leftMargin: UM.Theme.getSize("sidebar_margin").width
|
||||
|
||||
color: UM.Theme.getColor("text")
|
||||
font: UM.Theme.getFont("default_bold")
|
||||
|
|
@ -57,12 +57,12 @@ Item {
|
|||
|
||||
Rectangle {
|
||||
id: progressBar
|
||||
width: parent.width - 2 * UM.Theme.getSize("default_margin").width
|
||||
width: parent.width - 2 * UM.Theme.getSize("sidebar_margin").width
|
||||
height: UM.Theme.getSize("progressbar").height
|
||||
anchors.top: statusLabel.bottom
|
||||
anchors.topMargin: UM.Theme.getSize("default_margin").height/4
|
||||
anchors.topMargin: UM.Theme.getSize("sidebar_margin").height/4
|
||||
anchors.left: parent.left
|
||||
anchors.leftMargin: UM.Theme.getSize("default_margin").width
|
||||
anchors.leftMargin: UM.Theme.getSize("sidebar_margin").width
|
||||
radius: UM.Theme.getSize("progressbar_radius").width
|
||||
color: UM.Theme.getColor("progressbar_background")
|
||||
|
||||
|
|
@ -92,14 +92,14 @@ Item {
|
|||
width: base.width
|
||||
height: saveToButton.height
|
||||
anchors.top: progressBar.bottom
|
||||
anchors.topMargin: UM.Theme.getSize("default_margin").height
|
||||
anchors.topMargin: UM.Theme.getSize("sidebar_margin").height
|
||||
anchors.left: parent.left
|
||||
|
||||
Row {
|
||||
id: additionalComponentsRow
|
||||
anchors.top: parent.top
|
||||
anchors.right: saveToButton.visible ? saveToButton.left : parent.right
|
||||
anchors.rightMargin: UM.Theme.getSize("default_margin").width
|
||||
anchors.rightMargin: UM.Theme.getSize("sidebar_margin").width
|
||||
|
||||
spacing: UM.Theme.getSize("default_margin").width
|
||||
}
|
||||
|
|
@ -141,7 +141,7 @@ Item {
|
|||
|
||||
anchors.top: parent.top
|
||||
anchors.right: parent.right
|
||||
anchors.rightMargin: UM.Theme.getSize("default_margin").width
|
||||
anchors.rightMargin: UM.Theme.getSize("sidebar_margin").width
|
||||
|
||||
// 1 = not started, 5 = disabled
|
||||
text: [1, 5].indexOf(UM.Backend.state) != -1 ? catalog.i18nc("@label:Printjob", "Prepare") : catalog.i18nc("@label:Printjob", "Cancel")
|
||||
|
|
@ -183,7 +183,7 @@ Item {
|
|||
|
||||
Behavior on color { ColorAnimation { duration: 50; } }
|
||||
|
||||
implicitWidth: actualLabel.contentWidth + (UM.Theme.getSize("default_margin").width * 2)
|
||||
implicitWidth: actualLabel.contentWidth + (UM.Theme.getSize("sidebar_margin").width * 2)
|
||||
|
||||
Label {
|
||||
id: actualLabel
|
||||
|
|
@ -221,7 +221,7 @@ Item {
|
|||
|
||||
anchors.top: parent.top
|
||||
anchors.right: deviceSelectionMenu.visible ? deviceSelectionMenu.left : parent.right
|
||||
anchors.rightMargin: deviceSelectionMenu.visible ? -3 * UM.Theme.getSize("default_lining").width : UM.Theme.getSize("default_margin").width
|
||||
anchors.rightMargin: deviceSelectionMenu.visible ? -3 * UM.Theme.getSize("default_lining").width : UM.Theme.getSize("sidebar_margin").width
|
||||
|
||||
text: UM.OutputDeviceManager.activeDeviceShortDescription
|
||||
onClicked:
|
||||
|
|
@ -258,7 +258,7 @@ Item {
|
|||
|
||||
Behavior on color { ColorAnimation { duration: 50; } }
|
||||
|
||||
implicitWidth: actualLabel.contentWidth + (UM.Theme.getSize("default_margin").width * 2)
|
||||
implicitWidth: actualLabel.contentWidth + (UM.Theme.getSize("sidebar_margin").width * 2)
|
||||
|
||||
Label {
|
||||
id: actualLabel
|
||||
|
|
@ -288,7 +288,7 @@ Item {
|
|||
anchors.top: parent.top
|
||||
anchors.right: parent.right
|
||||
|
||||
anchors.rightMargin: UM.Theme.getSize("default_margin").width
|
||||
anchors.rightMargin: UM.Theme.getSize("sidebar_margin").width
|
||||
width: UM.Theme.getSize("save_button_save_to_button").height
|
||||
height: UM.Theme.getSize("save_button_save_to_button").height
|
||||
// 3 = Done, 5 = Disabled
|
||||
|
|
|
|||
|
|
@ -130,11 +130,11 @@ Item {
|
|||
id: settingControls
|
||||
|
||||
height: parent.height / 2
|
||||
spacing: UM.Theme.getSize("default_margin").width / 2
|
||||
spacing: UM.Theme.getSize("sidebar_margin").height / 2
|
||||
|
||||
anchors {
|
||||
right: controlContainer.left
|
||||
rightMargin: UM.Theme.getSize("default_margin").width / 2
|
||||
rightMargin: UM.Theme.getSize("sidebar_margin").width / 2
|
||||
verticalCenter: parent.verticalCenter
|
||||
}
|
||||
|
||||
|
|
@ -293,7 +293,7 @@ Item {
|
|||
enabled: propertyProvider.isValueUsed
|
||||
|
||||
anchors.right: parent.right;
|
||||
anchors.rightMargin: UM.Theme.getSize("default_margin").width
|
||||
anchors.rightMargin: UM.Theme.getSize("sidebar_margin").width
|
||||
anchors.verticalCenter: parent.verticalCenter;
|
||||
width: UM.Theme.getSize("setting_control").width;
|
||||
height: UM.Theme.getSize("setting_control").height
|
||||
|
|
|
|||
|
|
@ -24,6 +24,17 @@ SettingItem
|
|||
{
|
||||
return UM.Theme.getColor("setting_control_disabled_border")
|
||||
}
|
||||
switch(propertyProvider.properties.validationState)
|
||||
{
|
||||
case "ValidatorState.Exception":
|
||||
case "ValidatorState.MinimumError":
|
||||
case "ValidatorState.MaximumError":
|
||||
return UM.Theme.getColor("setting_validation_error");
|
||||
case "ValidatorState.MinimumWarning":
|
||||
case "ValidatorState.MaximumWarning":
|
||||
return UM.Theme.getColor("setting_validation_warning");
|
||||
}
|
||||
//Validation is OK.
|
||||
if(hovered || input.activeFocus)
|
||||
{
|
||||
return UM.Theme.getColor("setting_control_border_highlight")
|
||||
|
|
@ -39,15 +50,12 @@ SettingItem
|
|||
switch(propertyProvider.properties.validationState)
|
||||
{
|
||||
case "ValidatorState.Exception":
|
||||
return UM.Theme.getColor("setting_validation_error")
|
||||
case "ValidatorState.MinimumError":
|
||||
return UM.Theme.getColor("setting_validation_error")
|
||||
case "ValidatorState.MaximumError":
|
||||
return UM.Theme.getColor("setting_validation_error")
|
||||
return UM.Theme.getColor("setting_validation_error_background")
|
||||
case "ValidatorState.MinimumWarning":
|
||||
return UM.Theme.getColor("setting_validation_warning")
|
||||
case "ValidatorState.MaximumWarning":
|
||||
return UM.Theme.getColor("setting_validation_warning")
|
||||
return UM.Theme.getColor("setting_validation_warning_background")
|
||||
case "ValidatorState.Valid":
|
||||
return UM.Theme.getColor("setting_validation_ok")
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
// Copyright (c) 2015 Ultimaker B.V.
|
||||
// Copyright (c) 2017 Ultimaker B.V.
|
||||
// Uranium is released under the terms of the AGPLv3 or higher.
|
||||
|
||||
import QtQuick 2.2
|
||||
|
|
@ -42,9 +42,9 @@ Item
|
|||
{
|
||||
top: parent.top
|
||||
left: parent.left
|
||||
leftMargin: UM.Theme.getSize("default_margin").width
|
||||
leftMargin: UM.Theme.getSize("sidebar_margin").width
|
||||
right: parent.right
|
||||
rightMargin: UM.Theme.getSize("default_margin").width
|
||||
rightMargin: UM.Theme.getSize("sidebar_margin").width
|
||||
}
|
||||
height: visible ? UM.Theme.getSize("setting_control").height : 0
|
||||
Behavior on height { NumberAnimation { duration: 100 } }
|
||||
|
|
@ -55,13 +55,14 @@ Item
|
|||
|
||||
anchors.left: parent.left
|
||||
anchors.right: clearFilterButton.left
|
||||
anchors.rightMargin: UM.Theme.getSize("default_margin").width
|
||||
anchors.rightMargin: UM.Theme.getSize("sidebar_margin").width
|
||||
|
||||
placeholderText: catalog.i18nc("@label:textbox", "Search...")
|
||||
|
||||
style: TextFieldStyle
|
||||
{
|
||||
textColor: UM.Theme.getColor("setting_control_text");
|
||||
placeholderTextColor: UM.Theme.getColor("setting_control_text")
|
||||
font: UM.Theme.getFont("default");
|
||||
background: Item {}
|
||||
}
|
||||
|
|
@ -118,7 +119,7 @@ Item
|
|||
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
anchors.right: parent.right
|
||||
anchors.rightMargin: UM.Theme.getSize("default_margin").width
|
||||
anchors.rightMargin: UM.Theme.getSize("sidebar_margin").width
|
||||
|
||||
color: UM.Theme.getColor("setting_control_button")
|
||||
hoverColor: UM.Theme.getColor("setting_control_button_hover")
|
||||
|
|
@ -137,7 +138,7 @@ Item
|
|||
anchors.bottom: parent.bottom;
|
||||
anchors.right: parent.right;
|
||||
anchors.left: parent.left;
|
||||
anchors.topMargin: filterContainer.visible ? UM.Theme.getSize("default_margin").width : 0
|
||||
anchors.topMargin: filterContainer.visible ? UM.Theme.getSize("sidebar_margin").height : 0
|
||||
Behavior on anchors.topMargin { NumberAnimation { duration: 100 } }
|
||||
|
||||
style: UM.Theme.styles.scrollview;
|
||||
|
|
@ -296,7 +297,7 @@ Item
|
|||
contextMenu.provider = provider
|
||||
contextMenu.popup();
|
||||
}
|
||||
onShowTooltip: base.showTooltip(delegate, { x: 0, y: delegate.height / 2 }, text)
|
||||
onShowTooltip: base.showTooltip(delegate, { x: -UM.Theme.getSize("default_arrow").width, y: delegate.height / 2 }, text)
|
||||
onHideTooltip: base.hideTooltip()
|
||||
onShowAllHiddenInheritedSettings:
|
||||
{
|
||||
|
|
|
|||
|
|
@ -43,14 +43,14 @@ Rectangle
|
|||
|
||||
onTriggered:
|
||||
{
|
||||
base.showTooltip(base, {x:1, y:item.y}, text);
|
||||
base.showTooltip(base, {x: 0, y: item.y}, text);
|
||||
}
|
||||
}
|
||||
|
||||
function showTooltip(item, position, text)
|
||||
{
|
||||
tooltip.text = text;
|
||||
position = item.mapToItem(base, position.x, position.y);
|
||||
position = item.mapToItem(base, position.x - UM.Theme.getSize("default_arrow").width, position.y);
|
||||
tooltip.show(position);
|
||||
}
|
||||
|
||||
|
|
@ -102,7 +102,7 @@ Rectangle
|
|||
height: visible ? UM.Theme.getSize("sidebar_lining").height : 0
|
||||
color: UM.Theme.getColor("sidebar_lining")
|
||||
anchors.top: header.bottom
|
||||
anchors.topMargin: visible ? UM.Theme.getSize("default_margin").height : 0
|
||||
anchors.topMargin: visible ? UM.Theme.getSize("sidebar_margin").height : 0
|
||||
}
|
||||
|
||||
onCurrentModeIndexChanged:
|
||||
|
|
@ -118,10 +118,10 @@ Rectangle
|
|||
id: settingsModeLabel
|
||||
text: !hideSettings ? catalog.i18nc("@label:listbox", "Print Setup") : catalog.i18nc("@label:listbox","Print Setup disabled\nG-code files cannot be modified");
|
||||
anchors.left: parent.left
|
||||
anchors.leftMargin: UM.Theme.getSize("default_margin").width;
|
||||
anchors.leftMargin: UM.Theme.getSize("sidebar_margin").width
|
||||
anchors.top: headerSeparator.bottom
|
||||
anchors.topMargin: UM.Theme.getSize("default_margin").height
|
||||
width: parent.width * 0.45 - 2 * UM.Theme.getSize("default_margin").width
|
||||
anchors.topMargin: UM.Theme.getSize("sidebar_margin").height
|
||||
width: parent.width * 0.45 - 2 * UM.Theme.getSize("sidebar_margin").width
|
||||
font: UM.Theme.getFont("large")
|
||||
color: UM.Theme.getColor("text")
|
||||
visible: !monitoringPrint
|
||||
|
|
@ -134,9 +134,9 @@ Rectangle
|
|||
width: parent.width * 0.55
|
||||
height: UM.Theme.getSize("sidebar_header_mode_toggle").height
|
||||
anchors.right: parent.right
|
||||
anchors.rightMargin: UM.Theme.getSize("default_margin").width
|
||||
anchors.rightMargin: UM.Theme.getSize("sidebar_margin").width
|
||||
anchors.top: headerSeparator.bottom
|
||||
anchors.topMargin: UM.Theme.getSize("default_margin").height
|
||||
anchors.topMargin: UM.Theme.getSize("sidebar_margin").height
|
||||
visible: !monitoringPrint && !hideSettings
|
||||
Component{
|
||||
id: wizardDelegate
|
||||
|
|
@ -169,18 +169,18 @@ Rectangle
|
|||
style: ButtonStyle {
|
||||
background: Rectangle {
|
||||
border.width: UM.Theme.getSize("default_lining").width
|
||||
border.color: control.checked ? UM.Theme.getColor("toggle_checked_border") :
|
||||
control.pressed ? UM.Theme.getColor("toggle_active_border") :
|
||||
control.hovered ? UM.Theme.getColor("toggle_hovered_border") : UM.Theme.getColor("toggle_unchecked_border")
|
||||
color: control.checked ? UM.Theme.getColor("toggle_checked") :
|
||||
control.pressed ? UM.Theme.getColor("toggle_active") :
|
||||
control.hovered ? UM.Theme.getColor("toggle_hovered") : UM.Theme.getColor("toggle_unchecked")
|
||||
border.color: (control.checked || control.pressed) ? UM.Theme.getColor("action_button_active_border") :
|
||||
control.hovered ? UM.Theme.getColor("action_button_hovered_border") :
|
||||
UM.Theme.getColor("action_button_border")
|
||||
color: (control.checked || control.pressed) ? UM.Theme.getColor("action_button_active") :
|
||||
control.hovered ? UM.Theme.getColor("action_button_hovered") :
|
||||
UM.Theme.getColor("action_button")
|
||||
Behavior on color { ColorAnimation { duration: 50; } }
|
||||
Label {
|
||||
anchors.centerIn: parent
|
||||
color: control.checked ? UM.Theme.getColor("toggle_checked_text") :
|
||||
control.pressed ? UM.Theme.getColor("toggle_active_text") :
|
||||
control.hovered ? UM.Theme.getColor("toggle_hovered_text") : UM.Theme.getColor("toggle_unchecked_text")
|
||||
color: (control.checked || control.pressed) ? UM.Theme.getColor("action_button_active_text") :
|
||||
control.hovered ? UM.Theme.getColor("action_button_hovered_text") :
|
||||
UM.Theme.getColor("action_button_text")
|
||||
font: UM.Theme.getFont("default")
|
||||
text: control.text;
|
||||
}
|
||||
|
|
@ -212,18 +212,18 @@ Rectangle
|
|||
anchors
|
||||
{
|
||||
top: settingsModeSelection.bottom
|
||||
topMargin: UM.Theme.getSize("default_margin").width
|
||||
topMargin: UM.Theme.getSize("sidebar_margin").height
|
||||
left: parent.left
|
||||
leftMargin: UM.Theme.getSize("default_margin").width
|
||||
leftMargin: UM.Theme.getSize("sidebar_margin").width
|
||||
right: parent.right
|
||||
rightMargin: UM.Theme.getSize("default_margin").width
|
||||
rightMargin: UM.Theme.getSize("sidebar_margin").width
|
||||
}
|
||||
|
||||
Text
|
||||
{
|
||||
id: globalProfileLabel
|
||||
text: catalog.i18nc("@label","Profile:");
|
||||
width: parent.width * 0.45 - UM.Theme.getSize("default_margin").width
|
||||
width: parent.width * 0.45 - UM.Theme.getSize("sidebar_margin").width
|
||||
font: UM.Theme.getFont("default");
|
||||
color: UM.Theme.getColor("text");
|
||||
verticalAlignment: Text.AlignVCenter
|
||||
|
|
@ -247,14 +247,13 @@ Rectangle
|
|||
}
|
||||
enabled: !header.currentExtruderVisible || header.currentExtruderIndex > -1
|
||||
|
||||
width: parent.width * 0.7 + UM.Theme.getSize("default_margin").width
|
||||
width: parent.width * 0.7 + UM.Theme.getSize("sidebar_margin").width
|
||||
height: UM.Theme.getSize("setting_control").height
|
||||
anchors.left: globalProfileLabel.right
|
||||
anchors.right: parent.right
|
||||
tooltip: Cura.MachineManager.activeQualityName
|
||||
style: UM.Theme.styles.sidebar_header_button
|
||||
activeFocusOnPress: true;
|
||||
property var valueWarning: !Cura.MachineManager.isActiveQualitySupported
|
||||
menu: ProfileMenu { }
|
||||
|
||||
UM.SimpleButton
|
||||
|
|
@ -267,7 +266,7 @@ Rectangle
|
|||
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
anchors.right: parent.right
|
||||
anchors.rightMargin: UM.Theme.getSize("setting_preferences_button_margin").width - UM.Theme.getSize("default_margin").width
|
||||
anchors.rightMargin: UM.Theme.getSize("setting_preferences_button_margin").width - UM.Theme.getSize("sidebar_margin").width
|
||||
|
||||
color: hovered ? UM.Theme.getColor("setting_control_button_hover") : UM.Theme.getColor("setting_control_button");
|
||||
iconSource: UM.Theme.getIcon("star");
|
||||
|
|
@ -280,7 +279,7 @@ Rectangle
|
|||
onEntered:
|
||||
{
|
||||
var content = catalog.i18nc("@tooltip","Some setting/override values are different from the values stored in the profile.\n\nClick to open the profile manager.")
|
||||
base.showTooltip(globalProfileRow, Qt.point(-UM.Theme.getSize("default_margin").width, 0), content)
|
||||
base.showTooltip(globalProfileRow, Qt.point(-UM.Theme.getSize("sidebar_margin").width, 0), content)
|
||||
}
|
||||
onExited: base.hideTooltip()
|
||||
}
|
||||
|
|
@ -293,7 +292,7 @@ Rectangle
|
|||
|
||||
anchors.bottom: footerSeparator.top
|
||||
anchors.top: globalProfileRow.bottom
|
||||
anchors.topMargin: UM.Theme.getSize("default_margin").height
|
||||
anchors.topMargin: UM.Theme.getSize("sidebar_margin").height
|
||||
anchors.left: base.left
|
||||
anchors.right: base.right
|
||||
visible: !monitoringPrint && !hideSettings
|
||||
|
|
@ -379,7 +378,7 @@ Rectangle
|
|||
height: UM.Theme.getSize("sidebar_lining").height
|
||||
color: UM.Theme.getColor("sidebar_lining")
|
||||
anchors.bottom: printSpecs.top
|
||||
anchors.bottomMargin: UM.Theme.getSize("default_margin").height * 2 + UM.Theme.getSize("progressbar").height + UM.Theme.getFont("default_bold").pixelSize
|
||||
anchors.bottomMargin: UM.Theme.getSize("sidebar_margin").height * 2 + UM.Theme.getSize("progressbar").height + UM.Theme.getFont("default_bold").pixelSize
|
||||
}
|
||||
|
||||
Rectangle
|
||||
|
|
@ -387,8 +386,8 @@ Rectangle
|
|||
id: printSpecs
|
||||
anchors.left: parent.left
|
||||
anchors.bottom: parent.bottom
|
||||
anchors.leftMargin: UM.Theme.getSize("default_margin").width
|
||||
anchors.bottomMargin: UM.Theme.getSize("default_margin").height
|
||||
anchors.leftMargin: UM.Theme.getSize("sidebar_margin").width
|
||||
anchors.bottomMargin: UM.Theme.getSize("sidebar_margin").height
|
||||
height: childrenRect.height
|
||||
visible: !monitoringPrint
|
||||
|
||||
|
|
@ -501,7 +500,7 @@ Rectangle
|
|||
id: saveButton
|
||||
implicitWidth: base.width
|
||||
anchors.top: footerSeparator.bottom
|
||||
anchors.topMargin: UM.Theme.getSize("default_margin").height
|
||||
anchors.topMargin: UM.Theme.getSize("sidebar_margin").height
|
||||
anchors.bottom: parent.bottom
|
||||
visible: !monitoringPrint
|
||||
}
|
||||
|
|
@ -511,7 +510,7 @@ Rectangle
|
|||
id: monitorButton
|
||||
implicitWidth: base.width
|
||||
anchors.top: footerSeparator.bottom
|
||||
anchors.topMargin: UM.Theme.getSize("default_margin").height
|
||||
anchors.topMargin: UM.Theme.getSize("sidebar_margin").height
|
||||
anchors.bottom: parent.bottom
|
||||
visible: monitoringPrint
|
||||
}
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ Column
|
|||
property int currentExtruderIndex: ExtruderManager.activeExtruderIndex;
|
||||
property bool currentExtruderVisible: extrudersList.visible;
|
||||
|
||||
spacing: UM.Theme.getSize("default_margin").height
|
||||
spacing: UM.Theme.getSize("sidebar_margin").height
|
||||
|
||||
signal showTooltip(Item item, point location, string text)
|
||||
signal hideTooltip()
|
||||
|
|
@ -133,9 +133,9 @@ Column
|
|||
{
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
anchors.left: swatch.visible ? swatch.right : parent.left
|
||||
anchors.leftMargin: swatch.visible ? UM.Theme.getSize("default_margin").width / 2 : UM.Theme.getSize("default_margin").width
|
||||
anchors.leftMargin: swatch.visible ? UM.Theme.getSize("sidebar_margin").width / 2 : UM.Theme.getSize("sidebar_margin").width
|
||||
anchors.right: parent.right
|
||||
anchors.rightMargin: UM.Theme.getSize("default_margin").width / 2
|
||||
anchors.rightMargin: UM.Theme.getSize("sidebar_margin").width / 2
|
||||
|
||||
color: control.checked ? UM.Theme.getColor("tab_checked_text") :
|
||||
control.pressed ? UM.Theme.getColor("tab_active_text") :
|
||||
|
|
@ -155,7 +155,7 @@ Column
|
|||
Item
|
||||
{
|
||||
id: variantRowSpacer
|
||||
height: UM.Theme.getSize("default_margin").height / 4
|
||||
height: UM.Theme.getSize("sidebar_margin").height / 4
|
||||
width: height
|
||||
visible: !extruderSelectionRow.visible
|
||||
}
|
||||
|
|
@ -170,9 +170,9 @@ Column
|
|||
anchors
|
||||
{
|
||||
left: parent.left
|
||||
leftMargin: UM.Theme.getSize("default_margin").width
|
||||
leftMargin: UM.Theme.getSize("sidebar_margin").width
|
||||
right: parent.right
|
||||
rightMargin: UM.Theme.getSize("default_margin").width
|
||||
rightMargin: UM.Theme.getSize("sidebar_margin").width
|
||||
}
|
||||
|
||||
Text
|
||||
|
|
@ -207,7 +207,7 @@ Column
|
|||
enabled: !extrudersList.visible || base.currentExtruderIndex > -1
|
||||
|
||||
height: UM.Theme.getSize("setting_control").height
|
||||
width: parent.width * 0.7 + UM.Theme.getSize("default_margin").width
|
||||
width: parent.width * 0.7 + UM.Theme.getSize("sidebar_margin").width
|
||||
anchors.right: parent.right
|
||||
style: UM.Theme.styles.sidebar_header_button
|
||||
activeFocusOnPress: true;
|
||||
|
|
@ -226,9 +226,9 @@ Column
|
|||
anchors
|
||||
{
|
||||
left: parent.left
|
||||
leftMargin: UM.Theme.getSize("default_margin").width
|
||||
leftMargin: UM.Theme.getSize("sidebar_margin").width
|
||||
right: parent.right
|
||||
rightMargin: UM.Theme.getSize("default_margin").width
|
||||
rightMargin: UM.Theme.getSize("sidebar_margin").width
|
||||
}
|
||||
|
||||
Text
|
||||
|
|
@ -247,7 +247,7 @@ Column
|
|||
visible: Cura.MachineManager.hasVariants
|
||||
|
||||
height: UM.Theme.getSize("setting_control").height
|
||||
width: parent.width * 0.7 + UM.Theme.getSize("default_margin").width
|
||||
width: parent.width * 0.7 + UM.Theme.getSize("sidebar_margin").width
|
||||
anchors.right: parent.right
|
||||
style: UM.Theme.styles.sidebar_header_button
|
||||
activeFocusOnPress: true;
|
||||
|
|
@ -266,37 +266,27 @@ Column
|
|||
anchors
|
||||
{
|
||||
left: parent.left
|
||||
leftMargin: UM.Theme.getSize("default_margin").width
|
||||
leftMargin: UM.Theme.getSize("sidebar_margin").width
|
||||
right: parent.right
|
||||
rightMargin: UM.Theme.getSize("default_margin").width
|
||||
rightMargin: UM.Theme.getSize("sidebar_margin").width
|
||||
}
|
||||
|
||||
Item
|
||||
{
|
||||
height: UM.Theme.getSize("sidebar_setup").height
|
||||
anchors.right: parent.right
|
||||
width: parent.width * 0.7 + UM.Theme.getSize("default_margin").width
|
||||
width: parent.width * 0.7 + UM.Theme.getSize("sidebar_margin").width
|
||||
|
||||
Text
|
||||
{
|
||||
id: materialInfoLabel
|
||||
wrapMode: Text.WordWrap
|
||||
text: catalog.i18nc("@label","Check material compability");
|
||||
text: catalog.i18nc("@label", "Check material compability");
|
||||
font: UM.Theme.getFont("default");
|
||||
verticalAlignment: Text.AlignVCenter
|
||||
anchors.top: parent.top
|
||||
anchors.bottom: parent.bottom
|
||||
color:
|
||||
{
|
||||
if (!Cura.MachineManager.isActiveQualitySupported)
|
||||
{
|
||||
UM.Theme.getColor("setting_validation_error");
|
||||
}
|
||||
else
|
||||
{
|
||||
UM.Theme.getColor("text");
|
||||
}
|
||||
}
|
||||
color: UM.Theme.getColor("text")
|
||||
|
||||
MouseArea
|
||||
{
|
||||
|
|
@ -317,7 +307,7 @@ Column
|
|||
var content = catalog.i18nc("@tooltip", "Click to check the material compatibility on Ultimaker.com.");
|
||||
base.showTooltip(
|
||||
materialInfoRow,
|
||||
Qt.point(-UM.Theme.getSize("default_margin").width, 0),
|
||||
Qt.point(-UM.Theme.getSize("sidebar_margin").width, 0),
|
||||
catalog.i18nc("@tooltip", content)
|
||||
);
|
||||
}
|
||||
|
|
@ -336,8 +326,8 @@ Column
|
|||
//sourceSize.width: width + 5
|
||||
//sourceSize.height: width + 5
|
||||
|
||||
color: UM.Theme.getColor("setting_control_text")
|
||||
visible: !Cura.MachineManager.isActiveQualitySupported
|
||||
color: UM.Theme.getColor("setting_validation_warning")
|
||||
visible: !Cura.MachineManager.isCurrentSetupSupported
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -44,7 +44,7 @@ Rectangle
|
|||
iconSource: UM.Theme.getIcon("tab_settings");
|
||||
property color overlayColor: "transparent"
|
||||
property string overlayIconSource: ""
|
||||
text: catalog.i18nc("@title:tab","Prepare")
|
||||
text: catalog.i18nc("@title:tab", "Prepare")
|
||||
checkable: true
|
||||
checked: !base.monitoringPrint
|
||||
exclusiveGroup: sidebarHeaderBarGroup
|
||||
|
|
@ -58,7 +58,7 @@ Rectangle
|
|||
height: UM.Theme.getSize("sidebar_header").height
|
||||
onClicked: base.startMonitoringPrint()
|
||||
text: catalog.i18nc("@title:tab", "Monitor")
|
||||
iconSource: printerConnected ? UM.Theme.getIcon("tab_monitor_with_status") : UM.Theme.getIcon("tab_monitor")
|
||||
iconSource: UM.Theme.getIcon("tab_monitor")
|
||||
property color overlayColor:
|
||||
{
|
||||
if(!printerAcceptsCommands)
|
||||
|
|
@ -122,8 +122,6 @@ Rectangle
|
|||
return UM.Theme.getIcon("tab_status_paused")
|
||||
case "error":
|
||||
return UM.Theme.getIcon("tab_status_stopped")
|
||||
case "offline":
|
||||
return UM.Theme.getIcon("tab_status_offline")
|
||||
default:
|
||||
return ""
|
||||
}
|
||||
|
|
@ -191,13 +189,13 @@ Rectangle
|
|||
height: UM.Theme.getSize("standard_arrow").height
|
||||
sourceSize.width: width
|
||||
sourceSize.height: width
|
||||
color: UM.Theme.getColor("text_reversed")
|
||||
color: UM.Theme.getColor("text_emphasis")
|
||||
source: UM.Theme.getIcon("arrow_bottom")
|
||||
}
|
||||
Label
|
||||
{
|
||||
id: sidebarComboBoxLabel
|
||||
color: UM.Theme.getColor("text_reversed")
|
||||
color: UM.Theme.getColor("sidebar_header_text_active")
|
||||
text: control.text;
|
||||
elide: Text.ElideRight;
|
||||
anchors.left: parent.left;
|
||||
|
|
|
|||
|
|
@ -4,183 +4,8 @@
|
|||
"inherits": "cura"
|
||||
},
|
||||
"colors": {
|
||||
"sidebar": [83, 83, 83, 255],
|
||||
"lining": [127, 127, 127, 255],
|
||||
"viewport_overlay": [66, 66, 66, 255],
|
||||
|
||||
"primary": [12, 169, 227, 255],
|
||||
"primary_hover": [48, 182, 231, 255],
|
||||
"primary_text": [83, 83, 83, 255],
|
||||
"border": [127, 127, 127, 255],
|
||||
"secondary": [66, 66, 66, 255],
|
||||
|
||||
"text": [255, 255, 255, 255],
|
||||
"text_detail": [174, 174, 174, 128],
|
||||
"text_link": [12, 169, 227, 255],
|
||||
"text_inactive": [174, 174, 174, 255],
|
||||
"text_hover": [70, 84, 113, 255],
|
||||
"text_pressed": [12, 169, 227, 255],
|
||||
"text_reversed": [255, 255, 255, 255],
|
||||
"text_subtext": [255, 255, 255, 255],
|
||||
|
||||
"error": [255, 140, 0, 255],
|
||||
|
||||
"sidebar_header_bar": [66, 66, 66, 255],
|
||||
"sidebar_header_active": [83, 83, 83, 255],
|
||||
"sidebar_header_hover": [83, 83, 83, 255],
|
||||
"sidebar_header_highlight": [83, 83, 83, 255],
|
||||
"sidebar_header_highlight_hover": [66, 66, 66, 255],
|
||||
"sidebar_lining": [66, 66, 66, 255],
|
||||
|
||||
"button": [83, 83, 83, 255],
|
||||
"button_hover": [83, 83, 83, 255],
|
||||
"button_active": [32, 166, 219, 255],
|
||||
"button_active_hover": [12, 169, 227, 255],
|
||||
"button_text": [255, 255, 255, 255],
|
||||
"button_disabled": [255, 255, 255, 255],
|
||||
"button_disabled_text": [70, 84, 113, 255],
|
||||
|
||||
"button_tooltip": [83, 83, 83, 255],
|
||||
"button_tooltip_border": [255, 255, 255, 255],
|
||||
"button_tooltip_text": [255, 255, 255, 255],
|
||||
|
||||
"toggle_checked": [255, 255, 255, 255],
|
||||
"toggle_checked_border": [255, 255, 255, 255],
|
||||
"toggle_checked_text": [83, 83, 83, 255],
|
||||
"toggle_unchecked": [83, 83, 83, 255],
|
||||
"toggle_unchecked_border": [127, 127, 127, 255],
|
||||
"toggle_unchecked_text": [255, 255, 255, 255],
|
||||
"toggle_hovered": [83, 83, 83, 255],
|
||||
"toggle_hovered_border": [32, 166, 219, 255],
|
||||
"toggle_hovered_text": [255, 255, 255, 255],
|
||||
"toggle_active": [32, 166, 219, 255],
|
||||
"toggle_active_border": [32, 166, 219, 255],
|
||||
"toggle_active_text": [255, 255, 255, 255],
|
||||
|
||||
"tab_checked": [83, 83, 83, 255],
|
||||
"tab_checked_border": [83, 83, 83, 255],
|
||||
"tab_checked_text": [255, 255, 255, 255],
|
||||
"tab_unchecked": [66, 66, 66, 255],
|
||||
"tab_unchecked_border": [66, 66, 66, 255],
|
||||
"tab_unchecked_text": [127, 127, 127, 255],
|
||||
"tab_hovered": [66, 66, 66, 255],
|
||||
"tab_hovered_border": [66, 66, 66, 255],
|
||||
"tab_hovered_text": [32, 166, 219, 255],
|
||||
"tab_active": [83, 83, 83, 255],
|
||||
"tab_active_border": [83, 83, 83, 255],
|
||||
"tab_active_text": [255, 255, 255, 255],
|
||||
"tab_background": [66, 66, 66, 255],
|
||||
|
||||
"action_button": [83, 83, 83, 255],
|
||||
"action_button_text": [255, 255, 255, 255],
|
||||
"action_button_border": [127, 127, 127, 255],
|
||||
"action_button_hovered": [83, 83, 83, 255],
|
||||
"action_button_hovered_text": [255, 255, 255, 255],
|
||||
"action_button_hovered_border": [12, 169, 227, 255],
|
||||
"action_button_active": [12, 169, 227, 255],
|
||||
"action_button_active_text": [83, 83, 83, 255],
|
||||
"action_button_active_border": [12, 169, 227, 255],
|
||||
"action_button_disabled": [66, 66, 66, 255],
|
||||
"action_button_disabled_text": [127, 127, 127, 255],
|
||||
"action_button_disabled_border": [66, 66, 66, 255],
|
||||
|
||||
"scrollbar_background": [83, 83, 83, 255],
|
||||
"scrollbar_handle": [255, 255, 255, 255],
|
||||
"scrollbar_handle_hover": [12, 159, 227, 255],
|
||||
"scrollbar_handle_down": [12, 159, 227, 255],
|
||||
|
||||
"setting_category": [66, 66, 66, 255],
|
||||
"setting_category_disabled": [83, 83, 83, 255],
|
||||
"setting_category_hover": [66, 66, 66, 255],
|
||||
"setting_category_active": [66, 66, 66, 255],
|
||||
"setting_category_active_hover": [66, 66, 66, 255],
|
||||
"setting_category_text": [255, 255, 255, 255],
|
||||
"setting_category_border": [66, 66, 66, 255],
|
||||
"setting_category_disabled_border": [66, 66, 66, 255],
|
||||
"setting_category_hover_border": [12, 159, 227, 255],
|
||||
"setting_category_active_border": [66, 66, 66, 255],
|
||||
"setting_category_active_hover_border": [12, 159, 227, 255],
|
||||
|
||||
"setting_control": [83, 83, 83, 255],
|
||||
"setting_control_selected": [12, 159, 227, 255],
|
||||
"setting_control_highlight": [83, 83, 83, 0],
|
||||
"setting_control_border": [127, 127, 127, 255],
|
||||
"setting_control_border_highlight": [12, 169, 227, 255],
|
||||
"setting_control_text": [255, 255, 255, 255],
|
||||
"setting_control_depth_line": [127, 127, 127, 255],
|
||||
"setting_control_button": [127, 127, 127, 255],
|
||||
"setting_control_button_hover": [70, 84, 113, 255],
|
||||
"setting_control_disabled": [66, 66, 66, 255],
|
||||
"setting_control_disabled_text": [127, 127, 127, 255],
|
||||
"setting_control_disabled_border": [127, 127, 127, 255],
|
||||
"setting_unit": [127, 127, 127, 255],
|
||||
"setting_validation_error": [204, 37, 0, 255],
|
||||
"setting_validation_warning": [204, 146, 0, 255],
|
||||
"setting_validation_ok": [83, 83, 83, 255],
|
||||
|
||||
"progressbar_background": [66, 66, 66, 255],
|
||||
"progressbar_control": [255, 255, 255, 255],
|
||||
|
||||
"slider_groove": [66, 66, 66, 255],
|
||||
"slider_groove_border": [127, 127, 127, 255],
|
||||
"slider_groove_fill": [127, 127, 127, 255],
|
||||
"slider_handle": [32, 166, 219, 255],
|
||||
"slider_handle_hover": [77, 182, 226, 255],
|
||||
"slider_text_background": [83, 83, 83, 255],
|
||||
|
||||
"checkbox": [83, 83, 83, 255],
|
||||
"checkbox_hover": [83, 83, 83, 255],
|
||||
"checkbox_border": [127, 127, 127, 255],
|
||||
"checkbox_border_hover": [12, 169, 227, 255],
|
||||
"checkbox_mark": [255, 255, 255, 255],
|
||||
"checkbox_text": [255, 255, 255, 255],
|
||||
|
||||
"mode_switch": [83, 83, 83, 255],
|
||||
"mode_switch_hover": [83, 83, 83, 255],
|
||||
"mode_switch_border": [127, 127, 127, 255],
|
||||
"mode_switch_border_hover": [12, 169, 227, 255],
|
||||
"mode_switch_handle": [255, 255, 255, 255],
|
||||
"mode_switch_text": [255, 255, 255, 255],
|
||||
"mode_switch_text_hover": [255, 255, 255, 255],
|
||||
"mode_switch_text_checked": [12, 169, 227, 255],
|
||||
|
||||
"tooltip": [40, 40, 40, 255],
|
||||
"tooltip_text": [255, 255, 255, 255],
|
||||
|
||||
"message_background": [255, 255, 255, 255],
|
||||
"message_text": [83, 83, 83, 255],
|
||||
"message_border": [255, 255, 255, 255],
|
||||
"message_button": [83, 83, 83, 255],
|
||||
"message_button_hover": [12, 169, 227, 255],
|
||||
"message_button_active": [32, 166, 219, 255],
|
||||
"message_button_text": [255, 255, 255, 255],
|
||||
"message_button_text_hover": [83, 83, 83, 255],
|
||||
"message_button_text_active": [83, 83, 83, 255],
|
||||
"message_progressbar_background": [83, 83, 83, 255],
|
||||
"message_progressbar_control": [12, 169, 227, 255],
|
||||
|
||||
"tool_panel_background": [83, 83, 83, 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": [83, 83, 83, 255],
|
||||
|
||||
"viewport_background": [66, 66, 66, 255],
|
||||
"volume_outline": [12, 169, 227, 255],
|
||||
"buildplate": [169, 169, 169, 255],
|
||||
"buildplate_alt": [204, 204, 204, 255],
|
||||
|
||||
"convex_hull": [35, 35, 35, 127],
|
||||
"disallowed_area": [0, 0, 0, 40],
|
||||
"error_area": [255, 0, 0, 127]
|
||||
"viewport_background": [31, 36, 39, 255],
|
||||
"text_scene": [255, 255, 255, 162],
|
||||
"text_scene_hover": [255, 255, 255, 204]
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,202 +1,202 @@
|
|||
|
||||
Apache License
|
||||
Version 2.0, January 2004
|
||||
http://www.apache.org/licenses/
|
||||
|
||||
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
|
||||
|
||||
1. Definitions.
|
||||
|
||||
"License" shall mean the terms and conditions for use, reproduction,
|
||||
and distribution as defined by Sections 1 through 9 of this document.
|
||||
|
||||
"Licensor" shall mean the copyright owner or entity authorized by
|
||||
the copyright owner that is granting the License.
|
||||
|
||||
"Legal Entity" shall mean the union of the acting entity and all
|
||||
other entities that control, are controlled by, or are under common
|
||||
control with that entity. For the purposes of this definition,
|
||||
"control" means (i) the power, direct or indirect, to cause the
|
||||
direction or management of such entity, whether by contract or
|
||||
otherwise, or (ii) ownership of fifty percent (50%) or more of the
|
||||
outstanding shares, or (iii) beneficial ownership of such entity.
|
||||
|
||||
"You" (or "Your") shall mean an individual or Legal Entity
|
||||
exercising permissions granted by this License.
|
||||
|
||||
"Source" form shall mean the preferred form for making modifications,
|
||||
including but not limited to software source code, documentation
|
||||
source, and configuration files.
|
||||
|
||||
"Object" form shall mean any form resulting from mechanical
|
||||
transformation or translation of a Source form, including but
|
||||
not limited to compiled object code, generated documentation,
|
||||
and conversions to other media types.
|
||||
|
||||
"Work" shall mean the work of authorship, whether in Source or
|
||||
Object form, made available under the License, as indicated by a
|
||||
copyright notice that is included in or attached to the work
|
||||
(an example is provided in the Appendix below).
|
||||
|
||||
"Derivative Works" shall mean any work, whether in Source or Object
|
||||
form, that is based on (or derived from) the Work and for which the
|
||||
editorial revisions, annotations, elaborations, or other modifications
|
||||
represent, as a whole, an original work of authorship. For the purposes
|
||||
of this License, Derivative Works shall not include works that remain
|
||||
separable from, or merely link (or bind by name) to the interfaces of,
|
||||
the Work and Derivative Works thereof.
|
||||
|
||||
"Contribution" shall mean any work of authorship, including
|
||||
the original version of the Work and any modifications or additions
|
||||
to that Work or Derivative Works thereof, that is intentionally
|
||||
submitted to Licensor for inclusion in the Work by the copyright owner
|
||||
or by an individual or Legal Entity authorized to submit on behalf of
|
||||
the copyright owner. For the purposes of this definition, "submitted"
|
||||
means any form of electronic, verbal, or written communication sent
|
||||
to the Licensor or its representatives, including but not limited to
|
||||
communication on electronic mailing lists, source code control systems,
|
||||
and issue tracking systems that are managed by, or on behalf of, the
|
||||
Licensor for the purpose of discussing and improving the Work, but
|
||||
excluding communication that is conspicuously marked or otherwise
|
||||
designated in writing by the copyright owner as "Not a Contribution."
|
||||
|
||||
"Contributor" shall mean Licensor and any individual or Legal Entity
|
||||
on behalf of whom a Contribution has been received by Licensor and
|
||||
subsequently incorporated within the Work.
|
||||
|
||||
2. Grant of Copyright License. Subject to the terms and conditions of
|
||||
this License, each Contributor hereby grants to You a perpetual,
|
||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||
copyright license to reproduce, prepare Derivative Works of,
|
||||
publicly display, publicly perform, sublicense, and distribute the
|
||||
Work and such Derivative Works in Source or Object form.
|
||||
|
||||
3. Grant of Patent License. Subject to the terms and conditions of
|
||||
this License, each Contributor hereby grants to You a perpetual,
|
||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||
(except as stated in this section) patent license to make, have made,
|
||||
use, offer to sell, sell, import, and otherwise transfer the Work,
|
||||
where such license applies only to those patent claims licensable
|
||||
by such Contributor that are necessarily infringed by their
|
||||
Contribution(s) alone or by combination of their Contribution(s)
|
||||
with the Work to which such Contribution(s) was submitted. If You
|
||||
institute patent litigation against any entity (including a
|
||||
cross-claim or counterclaim in a lawsuit) alleging that the Work
|
||||
or a Contribution incorporated within the Work constitutes direct
|
||||
or contributory patent infringement, then any patent licenses
|
||||
granted to You under this License for that Work shall terminate
|
||||
as of the date such litigation is filed.
|
||||
|
||||
4. Redistribution. You may reproduce and distribute copies of the
|
||||
Work or Derivative Works thereof in any medium, with or without
|
||||
modifications, and in Source or Object form, provided that You
|
||||
meet the following conditions:
|
||||
|
||||
(a) You must give any other recipients of the Work or
|
||||
Derivative Works a copy of this License; and
|
||||
|
||||
(b) You must cause any modified files to carry prominent notices
|
||||
stating that You changed the files; and
|
||||
|
||||
(c) You must retain, in the Source form of any Derivative Works
|
||||
that You distribute, all copyright, patent, trademark, and
|
||||
attribution notices from the Source form of the Work,
|
||||
excluding those notices that do not pertain to any part of
|
||||
the Derivative Works; and
|
||||
|
||||
(d) If the Work includes a "NOTICE" text file as part of its
|
||||
distribution, then any Derivative Works that You distribute must
|
||||
include a readable copy of the attribution notices contained
|
||||
within such NOTICE file, excluding those notices that do not
|
||||
pertain to any part of the Derivative Works, in at least one
|
||||
of the following places: within a NOTICE text file distributed
|
||||
as part of the Derivative Works; within the Source form or
|
||||
documentation, if provided along with the Derivative Works; or,
|
||||
within a display generated by the Derivative Works, if and
|
||||
wherever such third-party notices normally appear. The contents
|
||||
of the NOTICE file are for informational purposes only and
|
||||
do not modify the License. You may add Your own attribution
|
||||
notices within Derivative Works that You distribute, alongside
|
||||
or as an addendum to the NOTICE text from the Work, provided
|
||||
that such additional attribution notices cannot be construed
|
||||
as modifying the License.
|
||||
|
||||
You may add Your own copyright statement to Your modifications and
|
||||
may provide additional or different license terms and conditions
|
||||
for use, reproduction, or distribution of Your modifications, or
|
||||
for any such Derivative Works as a whole, provided Your use,
|
||||
reproduction, and distribution of the Work otherwise complies with
|
||||
the conditions stated in this License.
|
||||
|
||||
5. Submission of Contributions. Unless You explicitly state otherwise,
|
||||
any Contribution intentionally submitted for inclusion in the Work
|
||||
by You to the Licensor shall be under the terms and conditions of
|
||||
this License, without any additional terms or conditions.
|
||||
Notwithstanding the above, nothing herein shall supersede or modify
|
||||
the terms of any separate license agreement you may have executed
|
||||
with Licensor regarding such Contributions.
|
||||
|
||||
6. Trademarks. This License does not grant permission to use the trade
|
||||
names, trademarks, service marks, or product names of the Licensor,
|
||||
except as required for reasonable and customary use in describing the
|
||||
origin of the Work and reproducing the content of the NOTICE file.
|
||||
|
||||
7. Disclaimer of Warranty. Unless required by applicable law or
|
||||
agreed to in writing, Licensor provides the Work (and each
|
||||
Contributor provides its Contributions) on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
||||
implied, including, without limitation, any warranties or conditions
|
||||
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
|
||||
PARTICULAR PURPOSE. You are solely responsible for determining the
|
||||
appropriateness of using or redistributing the Work and assume any
|
||||
risks associated with Your exercise of permissions under this License.
|
||||
|
||||
8. Limitation of Liability. In no event and under no legal theory,
|
||||
whether in tort (including negligence), contract, or otherwise,
|
||||
unless required by applicable law (such as deliberate and grossly
|
||||
negligent acts) or agreed to in writing, shall any Contributor be
|
||||
liable to You for damages, including any direct, indirect, special,
|
||||
incidental, or consequential damages of any character arising as a
|
||||
result of this License or out of the use or inability to use the
|
||||
Work (including but not limited to damages for loss of goodwill,
|
||||
work stoppage, computer failure or malfunction, or any and all
|
||||
other commercial damages or losses), even if such Contributor
|
||||
has been advised of the possibility of such damages.
|
||||
|
||||
9. Accepting Warranty or Additional Liability. While redistributing
|
||||
the Work or Derivative Works thereof, You may choose to offer,
|
||||
and charge a fee for, acceptance of support, warranty, indemnity,
|
||||
or other liability obligations and/or rights consistent with this
|
||||
License. However, in accepting such obligations, You may act only
|
||||
on Your own behalf and on Your sole responsibility, not on behalf
|
||||
of any other Contributor, and only if You agree to indemnify,
|
||||
defend, and hold each Contributor harmless for any liability
|
||||
incurred by, or claims asserted against, such Contributor by reason
|
||||
of your accepting any such warranty or additional liability.
|
||||
|
||||
END OF TERMS AND CONDITIONS
|
||||
|
||||
APPENDIX: How to apply the Apache License to your work.
|
||||
|
||||
To apply the Apache License to your work, attach the following
|
||||
boilerplate notice, with the fields enclosed by brackets "[]"
|
||||
replaced with your own identifying information. (Don't include
|
||||
the brackets!) The text should be enclosed in the appropriate
|
||||
comment syntax for the file format. We also recommend that a
|
||||
file or class name and description of purpose be included on the
|
||||
same "printed page" as the copyright notice for easier
|
||||
identification within third-party archives.
|
||||
|
||||
Copyright [yyyy] [name of copyright owner]
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
|
||||
Apache License
|
||||
Version 2.0, January 2004
|
||||
http://www.apache.org/licenses/
|
||||
|
||||
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
|
||||
|
||||
1. Definitions.
|
||||
|
||||
"License" shall mean the terms and conditions for use, reproduction,
|
||||
and distribution as defined by Sections 1 through 9 of this document.
|
||||
|
||||
"Licensor" shall mean the copyright owner or entity authorized by
|
||||
the copyright owner that is granting the License.
|
||||
|
||||
"Legal Entity" shall mean the union of the acting entity and all
|
||||
other entities that control, are controlled by, or are under common
|
||||
control with that entity. For the purposes of this definition,
|
||||
"control" means (i) the power, direct or indirect, to cause the
|
||||
direction or management of such entity, whether by contract or
|
||||
otherwise, or (ii) ownership of fifty percent (50%) or more of the
|
||||
outstanding shares, or (iii) beneficial ownership of such entity.
|
||||
|
||||
"You" (or "Your") shall mean an individual or Legal Entity
|
||||
exercising permissions granted by this License.
|
||||
|
||||
"Source" form shall mean the preferred form for making modifications,
|
||||
including but not limited to software source code, documentation
|
||||
source, and configuration files.
|
||||
|
||||
"Object" form shall mean any form resulting from mechanical
|
||||
transformation or translation of a Source form, including but
|
||||
not limited to compiled object code, generated documentation,
|
||||
and conversions to other media types.
|
||||
|
||||
"Work" shall mean the work of authorship, whether in Source or
|
||||
Object form, made available under the License, as indicated by a
|
||||
copyright notice that is included in or attached to the work
|
||||
(an example is provided in the Appendix below).
|
||||
|
||||
"Derivative Works" shall mean any work, whether in Source or Object
|
||||
form, that is based on (or derived from) the Work and for which the
|
||||
editorial revisions, annotations, elaborations, or other modifications
|
||||
represent, as a whole, an original work of authorship. For the purposes
|
||||
of this License, Derivative Works shall not include works that remain
|
||||
separable from, or merely link (or bind by name) to the interfaces of,
|
||||
the Work and Derivative Works thereof.
|
||||
|
||||
"Contribution" shall mean any work of authorship, including
|
||||
the original version of the Work and any modifications or additions
|
||||
to that Work or Derivative Works thereof, that is intentionally
|
||||
submitted to Licensor for inclusion in the Work by the copyright owner
|
||||
or by an individual or Legal Entity authorized to submit on behalf of
|
||||
the copyright owner. For the purposes of this definition, "submitted"
|
||||
means any form of electronic, verbal, or written communication sent
|
||||
to the Licensor or its representatives, including but not limited to
|
||||
communication on electronic mailing lists, source code control systems,
|
||||
and issue tracking systems that are managed by, or on behalf of, the
|
||||
Licensor for the purpose of discussing and improving the Work, but
|
||||
excluding communication that is conspicuously marked or otherwise
|
||||
designated in writing by the copyright owner as "Not a Contribution."
|
||||
|
||||
"Contributor" shall mean Licensor and any individual or Legal Entity
|
||||
on behalf of whom a Contribution has been received by Licensor and
|
||||
subsequently incorporated within the Work.
|
||||
|
||||
2. Grant of Copyright License. Subject to the terms and conditions of
|
||||
this License, each Contributor hereby grants to You a perpetual,
|
||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||
copyright license to reproduce, prepare Derivative Works of,
|
||||
publicly display, publicly perform, sublicense, and distribute the
|
||||
Work and such Derivative Works in Source or Object form.
|
||||
|
||||
3. Grant of Patent License. Subject to the terms and conditions of
|
||||
this License, each Contributor hereby grants to You a perpetual,
|
||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||
(except as stated in this section) patent license to make, have made,
|
||||
use, offer to sell, sell, import, and otherwise transfer the Work,
|
||||
where such license applies only to those patent claims licensable
|
||||
by such Contributor that are necessarily infringed by their
|
||||
Contribution(s) alone or by combination of their Contribution(s)
|
||||
with the Work to which such Contribution(s) was submitted. If You
|
||||
institute patent litigation against any entity (including a
|
||||
cross-claim or counterclaim in a lawsuit) alleging that the Work
|
||||
or a Contribution incorporated within the Work constitutes direct
|
||||
or contributory patent infringement, then any patent licenses
|
||||
granted to You under this License for that Work shall terminate
|
||||
as of the date such litigation is filed.
|
||||
|
||||
4. Redistribution. You may reproduce and distribute copies of the
|
||||
Work or Derivative Works thereof in any medium, with or without
|
||||
modifications, and in Source or Object form, provided that You
|
||||
meet the following conditions:
|
||||
|
||||
(a) You must give any other recipients of the Work or
|
||||
Derivative Works a copy of this License; and
|
||||
|
||||
(b) You must cause any modified files to carry prominent notices
|
||||
stating that You changed the files; and
|
||||
|
||||
(c) You must retain, in the Source form of any Derivative Works
|
||||
that You distribute, all copyright, patent, trademark, and
|
||||
attribution notices from the Source form of the Work,
|
||||
excluding those notices that do not pertain to any part of
|
||||
the Derivative Works; and
|
||||
|
||||
(d) If the Work includes a "NOTICE" text file as part of its
|
||||
distribution, then any Derivative Works that You distribute must
|
||||
include a readable copy of the attribution notices contained
|
||||
within such NOTICE file, excluding those notices that do not
|
||||
pertain to any part of the Derivative Works, in at least one
|
||||
of the following places: within a NOTICE text file distributed
|
||||
as part of the Derivative Works; within the Source form or
|
||||
documentation, if provided along with the Derivative Works; or,
|
||||
within a display generated by the Derivative Works, if and
|
||||
wherever such third-party notices normally appear. The contents
|
||||
of the NOTICE file are for informational purposes only and
|
||||
do not modify the License. You may add Your own attribution
|
||||
notices within Derivative Works that You distribute, alongside
|
||||
or as an addendum to the NOTICE text from the Work, provided
|
||||
that such additional attribution notices cannot be construed
|
||||
as modifying the License.
|
||||
|
||||
You may add Your own copyright statement to Your modifications and
|
||||
may provide additional or different license terms and conditions
|
||||
for use, reproduction, or distribution of Your modifications, or
|
||||
for any such Derivative Works as a whole, provided Your use,
|
||||
reproduction, and distribution of the Work otherwise complies with
|
||||
the conditions stated in this License.
|
||||
|
||||
5. Submission of Contributions. Unless You explicitly state otherwise,
|
||||
any Contribution intentionally submitted for inclusion in the Work
|
||||
by You to the Licensor shall be under the terms and conditions of
|
||||
this License, without any additional terms or conditions.
|
||||
Notwithstanding the above, nothing herein shall supersede or modify
|
||||
the terms of any separate license agreement you may have executed
|
||||
with Licensor regarding such Contributions.
|
||||
|
||||
6. Trademarks. This License does not grant permission to use the trade
|
||||
names, trademarks, service marks, or product names of the Licensor,
|
||||
except as required for reasonable and customary use in describing the
|
||||
origin of the Work and reproducing the content of the NOTICE file.
|
||||
|
||||
7. Disclaimer of Warranty. Unless required by applicable law or
|
||||
agreed to in writing, Licensor provides the Work (and each
|
||||
Contributor provides its Contributions) on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
||||
implied, including, without limitation, any warranties or conditions
|
||||
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
|
||||
PARTICULAR PURPOSE. You are solely responsible for determining the
|
||||
appropriateness of using or redistributing the Work and assume any
|
||||
risks associated with Your exercise of permissions under this License.
|
||||
|
||||
8. Limitation of Liability. In no event and under no legal theory,
|
||||
whether in tort (including negligence), contract, or otherwise,
|
||||
unless required by applicable law (such as deliberate and grossly
|
||||
negligent acts) or agreed to in writing, shall any Contributor be
|
||||
liable to You for damages, including any direct, indirect, special,
|
||||
incidental, or consequential damages of any character arising as a
|
||||
result of this License or out of the use or inability to use the
|
||||
Work (including but not limited to damages for loss of goodwill,
|
||||
work stoppage, computer failure or malfunction, or any and all
|
||||
other commercial damages or losses), even if such Contributor
|
||||
has been advised of the possibility of such damages.
|
||||
|
||||
9. Accepting Warranty or Additional Liability. While redistributing
|
||||
the Work or Derivative Works thereof, You may choose to offer,
|
||||
and charge a fee for, acceptance of support, warranty, indemnity,
|
||||
or other liability obligations and/or rights consistent with this
|
||||
License. However, in accepting such obligations, You may act only
|
||||
on Your own behalf and on Your sole responsibility, not on behalf
|
||||
of any other Contributor, and only if You agree to indemnify,
|
||||
defend, and hold each Contributor harmless for any liability
|
||||
incurred by, or claims asserted against, such Contributor by reason
|
||||
of your accepting any such warranty or additional liability.
|
||||
|
||||
END OF TERMS AND CONDITIONS
|
||||
|
||||
APPENDIX: How to apply the Apache License to your work.
|
||||
|
||||
To apply the Apache License to your work, attach the following
|
||||
boilerplate notice, with the fields enclosed by brackets "[]"
|
||||
replaced with your own identifying information. (Don't include
|
||||
the brackets!) The text should be enclosed in the appropriate
|
||||
comment syntax for the file format. We also recommend that a
|
||||
file or class name and description of purpose be included on the
|
||||
same "printed page" as the copyright notice for easier
|
||||
identification within third-party archives.
|
||||
|
||||
Copyright [yyyy] [name of copyright owner]
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
|
Before Width: | Height: | Size: 371 B After Width: | Height: | Size: 371 B |
|
Before Width: | Height: | Size: 197 B After Width: | Height: | Size: 197 B |
|
Before Width: | Height: | Size: 196 B After Width: | Height: | Size: 196 B |
|
Before Width: | Height: | Size: 200 B After Width: | Height: | Size: 200 B |
|
Before Width: | Height: | Size: 207 B After Width: | Height: | Size: 207 B |
|
Before Width: | Height: | Size: 215 B After Width: | Height: | Size: 215 B |
|
Before Width: | Height: | Size: 461 B After Width: | Height: | Size: 461 B |
|
Before Width: | Height: | Size: 900 B After Width: | Height: | Size: 900 B |
|
Before Width: | Height: | Size: 958 B After Width: | Height: | Size: 958 B |
|
Before Width: | Height: | Size: 331 B After Width: | Height: | Size: 331 B |
|
Before Width: | Height: | Size: 737 B After Width: | Height: | Size: 737 B |
|
Before Width: | Height: | Size: 383 B After Width: | Height: | Size: 383 B |
|
Before Width: | Height: | Size: 779 B After Width: | Height: | Size: 779 B |
|
Before Width: | Height: | Size: 192 B After Width: | Height: | Size: 192 B |
|
Before Width: | Height: | Size: 448 B After Width: | Height: | Size: 448 B |
|
Before Width: | Height: | Size: 629 B After Width: | Height: | Size: 629 B |
|
Before Width: | Height: | Size: 421 B After Width: | Height: | Size: 421 B |
|
Before Width: | Height: | Size: 377 B After Width: | Height: | Size: 377 B |
|
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 1.6 KiB |
|
Before Width: | Height: | Size: 405 B After Width: | Height: | Size: 405 B |
|
Before Width: | Height: | Size: 450 B After Width: | Height: | Size: 450 B |
|
Before Width: | Height: | Size: 450 B After Width: | Height: | Size: 450 B |
|
Before Width: | Height: | Size: 390 B After Width: | Height: | Size: 390 B |
|
Before Width: | Height: | Size: 271 B After Width: | Height: | Size: 271 B |
|
Before Width: | Height: | Size: 248 B After Width: | Height: | Size: 248 B |
|
Before Width: | Height: | Size: 646 B After Width: | Height: | Size: 646 B |
|
Before Width: | Height: | Size: 130 B After Width: | Height: | Size: 130 B |
4
resources/themes/cura-light/icons/drop_down_button.svg
Normal file
4
resources/themes/cura-light/icons/drop_down_button.svg
Normal file
|
|
@ -0,0 +1,4 @@
|
|||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<svg width="7px" height="5px" viewBox="0 0 7 5" version="1.1" xmlns="http://www.w3.org/2000/svg">
|
||||
<polygon points="3.5 5 7 0 0 0" />
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 183 B |
|
Before Width: | Height: | Size: 3.8 KiB After Width: | Height: | Size: 3.8 KiB |
|
Before Width: | Height: | Size: 165 B After Width: | Height: | Size: 165 B |
|
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 1.5 KiB |
|
Before Width: | Height: | Size: 296 B After Width: | Height: | Size: 296 B |
|
Before Width: | Height: | Size: 5.1 KiB After Width: | Height: | Size: 5.1 KiB |
|
Before Width: | Height: | Size: 4.8 KiB After Width: | Height: | Size: 4.8 KiB |
|
Before Width: | Height: | Size: 106 B After Width: | Height: | Size: 106 B |
|
Before Width: | Height: | Size: 331 B After Width: | Height: | Size: 331 B |
4
resources/themes/cura-light/icons/notice.svg
Normal file
4
resources/themes/cura-light/icons/notice.svg
Normal file
|
|
@ -0,0 +1,4 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<svg width="15" height="15" viewBox="0 0 15 15" xmlns="http://www.w3.org/2000/svg">
|
||||
<path d="M7.5 15C11.641 15 15 11.643 15 7.5 15 3.358 11.641 0 7.5 0 3.358 0 0 3.358 0 7.5 0 11.643 3.358 15 7.5 15ZM8.6 12.369L6.472 12.369 6.472 4.57 8.6 4.57 8.6 12.369ZM7.541 1.514C8.313 1.514 8.697 1.861 8.697 2.553 8.697 2.885 8.6 3.141 8.409 3.325 8.216 3.509 7.926 3.601 7.541 3.601 6.767 3.601 6.382 3.252 6.382 2.553 6.382 1.861 6.767 1.514 7.541 1.514Z"/>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 499 B |
|
Before Width: | Height: | Size: 375 B After Width: | Height: | Size: 375 B |
4
resources/themes/cura-light/icons/play.svg
Normal file
4
resources/themes/cura-light/icons/play.svg
Normal file
|
|
@ -0,0 +1,4 @@
|
|||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<svg width="5px" height="20px" viewBox="0 0 5 20" version="1.1" xmlns="http://www.w3.org/2000/svg">
|
||||
<polygon fill="#FFFFFF" opacity="0.8" points="5 10 0 13.5 0 6.5" />
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 218 B |
|
Before Width: | Height: | Size: 241 B After Width: | Height: | Size: 241 B |
|
Before Width: | Height: | Size: 142 B After Width: | Height: | Size: 142 B |
|
Before Width: | Height: | Size: 400 B After Width: | Height: | Size: 400 B |
|
Before Width: | Height: | Size: 450 B After Width: | Height: | Size: 450 B |
|
Before Width: | Height: | Size: 131 B After Width: | Height: | Size: 131 B |
|
Before Width: | Height: | Size: 692 B After Width: | Height: | Size: 692 B |
|
Before Width: | Height: | Size: 948 B After Width: | Height: | Size: 948 B |
|
Before Width: | Height: | Size: 514 B After Width: | Height: | Size: 514 B |
|
Before Width: | Height: | Size: 1,023 B After Width: | Height: | Size: 1,023 B |
|
Before Width: | Height: | Size: 366 B After Width: | Height: | Size: 366 B |
|
Before Width: | Height: | Size: 494 B After Width: | Height: | Size: 494 B |
|
Before Width: | Height: | Size: 610 B After Width: | Height: | Size: 610 B |
|
Before Width: | Height: | Size: 1 KiB After Width: | Height: | Size: 1 KiB |
|
Before Width: | Height: | Size: 237 B After Width: | Height: | Size: 237 B |
|
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 1.2 KiB |
|
Before Width: | Height: | Size: 4.8 KiB After Width: | Height: | Size: 4.8 KiB |
|
Before Width: | Height: | Size: 410 B After Width: | Height: | Size: 410 B |
|
Before Width: | Height: | Size: 331 B After Width: | Height: | Size: 331 B |
4
resources/themes/cura-light/icons/tab_monitor.svg
Normal file
4
resources/themes/cura-light/icons/tab_monitor.svg
Normal file
|
|
@ -0,0 +1,4 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<svg width="35px" height="28px" viewBox="0 0 35 28" version="1.1" xmlns="http://www.w3.org/2000/svg">
|
||||
<path d="M26,0 L0,0 L0,28 L2.73151751,28 C3.13618677,27.6 3.74319066,27.3 4.45136187,27.3 L21.5486381,27.3 C22.2568093,27.3 22.8638132,27.6 23.2684825,28 L26,28 L26,0 Z M23.5719844,21 C23.5719844,22.3 22.459144,23.4 21.1439689,23.4 L4.95719844,23.4 C3.64202335,23.4 2.52918288,22.3 2.52918288,21 L2.52918288,3.1 C2.52918288,2.7 2.83268482,2.4 3.23735409,2.4 L22.8638132,2.4 C23.2684825,2.4 23.5719844,2.7 23.5719844,3.1 L23.5719844,21 Z" />
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 592 B |
|
|
@ -1,3 +1,3 @@
|
|||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 30 30">
|
||||
<path d="M15.658 26.184h10.526V27.5H15.658v-1.316zm0-2.631h9.21v1.315h-9.21v-1.315zm0-2.632h7.895v1.316h-7.895V20.92zm0-2.632h6.58v1.316h-6.58V18.29zm0-2.631h5.263v1.316h-5.263v-1.316zm0-2.632h3.947v1.316h-3.947v-1.316zm0-2.631h2.632v1.316h-2.632v-1.316zm0-2.632h5.263V9.08h-5.263V7.763zm0-2.631h7.895v1.315h-7.895V5.132zm0-2.632h10.526v1.316H15.658V2.5zm-11.842 0l7.895 8.553L3.816 27.5h10.526v-25H3.816z" fill="#fff" fill-rule="evenodd"/>
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 37.5 30">
|
||||
<path d="M15.658 26.184h10.526V27.5H15.658v-1.316zm0-2.631h9.21v1.315h-9.21v-1.315zm0-2.632h7.895v1.316h-7.895V20.92zm0-2.632h6.58v1.316h-6.58V18.29zm0-2.631h5.263v1.316h-5.263v-1.316zm0-2.632h3.947v1.316h-3.947v-1.316zm0-2.631h2.632v1.316h-2.632v-1.316zm0-2.632h5.263V9.08h-5.263V7.763zm0-2.631h7.895v1.315h-7.895V5.132zm0-2.632h10.526v1.316H15.658V2.5zm-11.842 0l7.895 8.553L3.816 27.5h10.526v-25H3.816z" />
|
||||
</svg>
|
||||
|
Before Width: | Height: | Size: 513 B After Width: | Height: | Size: 484 B |
9
resources/themes/cura-light/icons/tab_status_busy.svg
Normal file
9
resources/themes/cura-light/icons/tab_status_busy.svg
Normal file
|
|
@ -0,0 +1,9 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<svg width="35px" height="28px" viewBox="0 0 35 28" version="1.1" xmlns="http://www.w3.org/2000/svg">
|
||||
<g transform="translate(15.5, 4)">
|
||||
<circle fill="#0CA9E3" cx="9" cy="9" r="8.5" stroke="#18294D" />
|
||||
<circle fill="#FFFFFF" cx="4" cy="9" r="1.75" />
|
||||
<circle fill="#FFFFFF" cx="9" cy="9" r="1.75" />
|
||||
<circle fill="#FFFFFF" cx="14" cy="9" r="1.75" />
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 440 B |
|
|
@ -0,0 +1,7 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<svg width="35px" height="28px" viewBox="0 0 35 28" version="1.1" xmlns="http://www.w3.org/2000/svg">
|
||||
<g transform="translate(15.5, 4)">
|
||||
<circle fill="#10CB00" cx="9" cy="9" r="8.5" stroke="#18294D" />
|
||||
<polyline fill="none" stroke="#FFFFFF" stroke-width="2" points="5.643,8.645 8.116,11.12 12.36,6.88" />
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 379 B |
8
resources/themes/cura-light/icons/tab_status_paused.svg
Normal file
8
resources/themes/cura-light/icons/tab_status_paused.svg
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<svg width="35px" height="28px" viewBox="0 0 35 28" version="1.1" xmlns="http://www.w3.org/2000/svg">
|
||||
<g transform="translate(15.5, 4)">
|
||||
<circle fill="#FF8C10" cx="9" cy="9" r="8.5" stroke="#18294D" />
|
||||
<rect fill="#FFFFFF" x="6" y="6" width="2" height="6" />
|
||||
<rect fill="#FFFFFF" x="10" y="6" width="2" height="6" />
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 399 B |
8
resources/themes/cura-light/icons/tab_status_stopped.svg
Normal file
8
resources/themes/cura-light/icons/tab_status_stopped.svg
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<svg width="35px" height="28px" viewBox="0 0 35 28" version="1.1" xmlns="http://www.w3.org/2000/svg">
|
||||
<g transform="translate(15.5, 4)">
|
||||
<circle fill="#D0021B" cx="9" cy="9" r="8.5" stroke="#18294D" />
|
||||
<line x1="6" y1="6" x2="12" y2="12" stroke-width="2" stroke="#FFFFFF" />
|
||||
<line x1="6" y1="12" x2="12" y2="6" stroke-width="2" stroke="#FFFFFF" />
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 430 B |
8
resources/themes/cura-light/icons/tab_status_unknown.svg
Normal file
8
resources/themes/cura-light/icons/tab_status_unknown.svg
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<svg width="35" height="28" viewBox="0 0 35 28" xmlns="http://www.w3.org/2000/svg">
|
||||
<g transform="translate(15.5, 4)">
|
||||
<circle cx="9" cy="9" r="8.5" fill="#8B9595" stroke="#18294D" />
|
||||
<path fill="#FFFFFF" d="M9.013 3.5C7.29 3.5 6.533 4.515 6.236 5.12 5.989 5.623 5.997 6.057 6.001 6.138L7.59 6.058 7.591 6.082C7.591 6.081 7.594 5.964 7.664 5.821 7.905 5.33 8.347 5.091 9.013 5.091 9.47 5.091 9.817 5.217 10.075 5.475 10.477 5.878 10.556 6.485 10.555 6.626 10.554 6.812 10.49 7.77 9.306 8.386 8.318 8.899 7.752 9.906 7.752 11.147L7.752 11.621 9.343 11.618 9.342 11.147C9.342 10.697 9.463 10.097 10.039 9.798 12.035 8.76 12.144 6.98 12.146 6.633 12.148 6.141 11.952 5.106 11.202 4.353 10.647 3.795 9.89 3.5 9.013 3.5Z"/>
|
||||
<rect fill="#FFFFFF" x="7.818" y="13.136" width="1.591" height="1.25" />
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 874 B |
|
Before Width: | Height: | Size: 431 B After Width: | Height: | Size: 431 B |
|
Before Width: | Height: | Size: 215 B After Width: | Height: | Size: 215 B |
|
Before Width: | Height: | Size: 357 B After Width: | Height: | Size: 357 B |
|
Before Width: | Height: | Size: 183 B After Width: | Height: | Size: 183 B |
|
Before Width: | Height: | Size: 296 B After Width: | Height: | Size: 296 B |
4
resources/themes/cura-light/icons/viewmode.svg
Normal file
4
resources/themes/cura-light/icons/viewmode.svg
Normal file
|
|
@ -0,0 +1,4 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<svg width="24" height="24" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
|
||||
<path d="M12.002 5L12 5 12 5C12 5 12 5 11.998 5 6.239 5 1.408 7.974 0 11.999 1.407 16.026 6.238 19 11.998 19 17.76 19 22.594 16.026 24 11.999 22.594 7.974 17.762 5.001 12.002 5ZM11.998 18C6.93 18 2.487 15.679 1 12.305 2.129 9.744 4.964 7.792 8.481 7 7.413 8.034 6.728 9.513 6.728 11.177 6.728 14.293 9.087 16.82 11.999 16.82 14.914 16.82 17.272 14.293 17.272 11.177 17.272 9.514 16.588 8.035 15.52 7.002 19.038 7.794 21.872 9.745 23 12.305 21.515 15.679 17.07 18 11.998 18Z"/>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 610 B |
4
resources/themes/cura-light/icons/warning.svg
Normal file
4
resources/themes/cura-light/icons/warning.svg
Normal file
|
|
@ -0,0 +1,4 @@
|
|||
<?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" />
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 1.1 KiB |
8
resources/themes/cura-light/images/logo.svg
Normal file
8
resources/themes/cura-light/images/logo.svg
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<svg width="82px" height="18px" viewBox="0 0 82 18" version="1.1" xmlns="http://www.w3.org/2000/svg">
|
||||
<polygon fill="#20A6DB" points="82 10.3797468 77.8757345 10.3797468 75.7721519 12.4764557 75.7721519 16.6075949 79.9067798 16.6075949 82 14.5108861" />
|
||||
<path fill="black" d="M0,9.32538529 C0,14.168804 3.22511,17.6455696 8.53908129,17.6455696 L16.6075949,17.6455696 L16.6075949,13.294146 L8.53908129,13.294146 C5.8534025,13.2832128 4.53351762,11.4792306 4.53351762,9.32538529 C4.53351762,7.17153994 5.8534025,5.40035747 8.53908129,5.37849102 L16.6075949,5.37849102 L16.6075949,1.03800064 L8.53908129,1.03800064 C3.21363275,1.02706742 0,4.47103333 0,9.32538529 Z" />
|
||||
<path fill="black" d="M33.004725,9.78605176 C33.004725,12.2613239 31.20074,13.5835846 29.0468913,13.5835846 C26.8930426,13.5835846 25.1218573,12.2613239 25.1218573,9.78605176 L25.1218573,1.03797468 L20.7594937,1.03797468 L20.7594937,9.78605176 C20.7594937,14.6837056 24.203465,17.6455696 29.0468913,17.6455696 C33.8903176,17.6455696 37.3670886,14.6731275 37.3670886,9.78605176 L37.3670886,1.03797468 L33.004725,1.03797468 L33.004725,9.78605176 L33.004725,9.78605176 Z" />
|
||||
<path fill="black" d="M62.1251127,1.03797468 C57.0530042,1.03797468 53.9746835,4.47968021 53.9746835,9.31992005 C53.9746835,14.1601599 57.0530042,17.6346436 62.1251127,17.6346436 L63.9217127,17.6346436 L63.9217127,13.297002 L62.1251127,13.297002 C59.5616713,13.2860759 58.3018603,11.4832778 58.3018603,9.3308461 C58.3018603,7.17841439 59.5616713,5.4083944 62.1251127,5.38654231 L66.2112822,5.38654231 L66.2112822,11.0680879 L66.2112822,13.297002 L66.2112822,17.6455696 L70.5822785,17.6455696 L70.5822785,17.3942705 L70.5822785,13.297002 L70.5822785,5.38654231 L70.5822785,1.80279813 L70.5822785,1.03797468 L62.1251127,1.03797468 Z" />
|
||||
<path fill="black" d="M41.5189873,8.10074451 L41.5189873,16.6075949 L45.8823067,16.6075949 L45.8823067,8.10074451 C45.8823067,5.99540589 47.1558644,4.26411221 49.7472774,4.24273822 L52.9367089,4.24273822 L52.9367089,0 L49.7472774,0 C44.6198234,0 41.5189873,3.36640438 41.5189873,8.10074451 Z" />
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 2.1 KiB |
|
|
@ -1,4 +1,4 @@
|
|||
// Copyright (c) 2015 Ultimaker B.V.
|
||||
// Copyright (c) 2017 Ultimaker B.V.
|
||||
// Cura is released under the terms of the AGPLv3 or higher.
|
||||
|
||||
import QtQuick 2.1
|
||||
|
|
@ -8,50 +8,6 @@ import QtQuick.Controls.Styles 1.1
|
|||
import UM 1.1 as UM
|
||||
|
||||
QtObject {
|
||||
property Component mode_switch: Component {
|
||||
SwitchStyle {
|
||||
groove: Rectangle {
|
||||
implicitWidth: UM.Theme.getSize("mode_switch").width
|
||||
implicitHeight: UM.Theme.getSize("mode_switch").height
|
||||
radius: implicitHeight / 2
|
||||
color: {
|
||||
if(control.hovered || control._hovered) {
|
||||
return UM.Theme.getColor("mode_switch_hover");
|
||||
} else {
|
||||
return UM.Theme.getColor("mode_switch");
|
||||
}
|
||||
}
|
||||
Behavior on color { ColorAnimation { duration: 50; } }
|
||||
border.color: {
|
||||
if(control.hovered || control._hovered) {
|
||||
return UM.Theme.getColor("mode_switch_border_hover");
|
||||
} else {
|
||||
return UM.Theme.getColor("mode_switch_border");
|
||||
}
|
||||
}
|
||||
Behavior on border.color { ColorAnimation { duration: 50; } }
|
||||
border.width: 1
|
||||
}
|
||||
|
||||
handle: Rectangle {
|
||||
implicitWidth: implicitHeight
|
||||
implicitHeight: UM.Theme.getSize("mode_switch").height
|
||||
radius: implicitHeight / 2
|
||||
|
||||
color: {
|
||||
if (control.pressed || (control.checkable && control.checked)) {
|
||||
return UM.Theme.getColor("sidebar_header_active");
|
||||
} else if(control.hovered) {
|
||||
return UM.Theme.getColor("sidebar_header_hover");
|
||||
} else {
|
||||
return UM.Theme.getColor("sidebar_header_bar");
|
||||
}
|
||||
}
|
||||
Behavior on color { ColorAnimation { duration: 50; } }
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
property Component sidebar_header_button: Component {
|
||||
ButtonStyle {
|
||||
background: Rectangle {
|
||||
|
|
@ -61,23 +17,50 @@ QtObject {
|
|||
{
|
||||
if(control.valueError)
|
||||
{
|
||||
return Theme.getColor("setting_validation_error");
|
||||
return Theme.getColor("setting_validation_error_background");
|
||||
}
|
||||
else if(control.valueWarning)
|
||||
{
|
||||
return Theme.getColor("setting_validation_warning");
|
||||
} else
|
||||
return Theme.getColor("setting_validation_warning_background");
|
||||
}
|
||||
else
|
||||
{
|
||||
return Theme.getColor("setting_control");
|
||||
}
|
||||
} else {
|
||||
}
|
||||
else
|
||||
{
|
||||
return Theme.getColor("setting_control_disabled");
|
||||
}
|
||||
}
|
||||
|
||||
border.width: Theme.getSize("default_lining").width
|
||||
border.color: !control.enabled ? Theme.getColor("setting_control_disabled_border") :
|
||||
control.hovered ? Theme.getColor("setting_control_border_highlight") : Theme.getColor("setting_control_border")
|
||||
border.color:
|
||||
{
|
||||
if (control.enabled)
|
||||
{
|
||||
if (control.valueError)
|
||||
{
|
||||
return Theme.getColor("setting_validation_error");
|
||||
}
|
||||
else if (control.valueWarning)
|
||||
{
|
||||
return Theme.getColor("setting_validation_warning");
|
||||
}
|
||||
else if (control.hovered)
|
||||
{
|
||||
return Theme.getColor("setting_control_border_highlight");
|
||||
}
|
||||
else
|
||||
{
|
||||
return Theme.getColor("setting_control_border");
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
return Theme.getColor("setting_control_disabled_border");
|
||||
}
|
||||
}
|
||||
UM.RecolorImage {
|
||||
id: downArrow
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
|
|
@ -87,7 +70,7 @@ QtObject {
|
|||
height: Theme.getSize("standard_arrow").height
|
||||
sourceSize.width: width
|
||||
sourceSize.height: width
|
||||
color: control.enabled ? Theme.getColor("setting_category_text") : Theme.getColor("setting_control_disabled_text")
|
||||
color: control.enabled ? Theme.getColor("setting_category_text") : Theme.getColor("setting_category_disabled_text")
|
||||
source: Theme.getIcon("arrow_bottom")
|
||||
}
|
||||
Label {
|
||||
|
|
@ -145,36 +128,34 @@ QtObject {
|
|||
|
||||
label: Item
|
||||
{
|
||||
|
||||
implicitHeight: Theme.getSize("button_icon").height
|
||||
implicitHeight: Theme.getSize("topbar_button_icon").height
|
||||
implicitWidth: Theme.getSize("topbar_button").width;
|
||||
Item
|
||||
{
|
||||
anchors.horizontalCenter: parent.horizontalCenter
|
||||
anchors.verticalCenter: parent.verticalCenter;
|
||||
width: childrenRect.width
|
||||
height: Theme.getSize("button_icon").height
|
||||
height: Theme.getSize("topbar_button_icon").height
|
||||
UM.RecolorImage
|
||||
{
|
||||
id: icon
|
||||
color: UM.Theme.getColor("text_reversed")
|
||||
color: UM.Theme.getColor("text_emphasis")
|
||||
opacity: !control.enabled ? 0.2 : 1.0
|
||||
source: control.iconSource
|
||||
width: Theme.getSize("button_icon").width
|
||||
height: Theme.getSize("button_icon").height
|
||||
width: Theme.getSize("topbar_button_icon").width
|
||||
height: Theme.getSize("topbar_button_icon").height
|
||||
|
||||
sourceSize: Theme.getSize("button_icon")
|
||||
sourceSize: Theme.getSize("topbar_button_icon")
|
||||
}
|
||||
UM.RecolorImage
|
||||
Image
|
||||
{
|
||||
visible: control.overlayIconSource != ""
|
||||
color: control.overlayColor
|
||||
opacity: !control.enabled ? 0.2 : 1.0
|
||||
source: control.overlayIconSource
|
||||
width: Theme.getSize("button_icon").width
|
||||
height: Theme.getSize("button_icon").height
|
||||
width: Theme.getSize("topbar_button_icon").width
|
||||
height: Theme.getSize("topbar_button_icon").height
|
||||
|
||||
sourceSize: Theme.getSize("button_icon")
|
||||
sourceSize: Theme.getSize("topbar_button_icon")
|
||||
}
|
||||
Label
|
||||
{
|
||||
|
|
@ -183,7 +164,21 @@ QtObject {
|
|||
anchors.leftMargin: Theme.getSize("default_margin").width
|
||||
anchors.verticalCenter: parent.verticalCenter;
|
||||
font: UM.Theme.getFont("large");
|
||||
color: UM.Theme.getColor("text_reversed")
|
||||
color:
|
||||
{
|
||||
if(control.hovered)
|
||||
{
|
||||
return UM.Theme.getColor("sidebar_header_text_hover");
|
||||
}
|
||||
if(control.checked)
|
||||
{
|
||||
return UM.Theme.getColor("sidebar_header_text_active");
|
||||
}
|
||||
else
|
||||
{
|
||||
return UM.Theme.getColor("sidebar_header_text_inactive");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -205,7 +200,7 @@ QtObject {
|
|||
|
||||
target: Qt.point(parent.x, y + height/2)
|
||||
arrowSize: Theme.getSize("button_tooltip_arrow").width
|
||||
color: Theme.getColor("tooltip")
|
||||
color: Theme.getColor("button_tooltip")
|
||||
opacity: control.hovered ? 1.0 : 0.0;
|
||||
|
||||
width: control.hovered ? button_tip.width + Theme.getSize("button_tooltip").width : 0
|
||||
|
|
@ -250,7 +245,6 @@ QtObject {
|
|||
|
||||
UM.RecolorImage {
|
||||
id: tool_button_arrow
|
||||
opacity: !control.enabled ? 0.2 : 1.0
|
||||
anchors.right: parent.right;
|
||||
anchors.rightMargin: (Theme.getSize("button").width - Theme.getSize("button_icon").width) / 4
|
||||
anchors.bottom: parent.bottom;
|
||||
|
|
@ -260,7 +254,25 @@ QtObject {
|
|||
sourceSize.width: width
|
||||
sourceSize.height: width
|
||||
visible: control.menu != null;
|
||||
color: Theme.getColor("button_text")
|
||||
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")
|
||||
}
|
||||
}
|
||||
|
|
@ -273,7 +285,25 @@ QtObject {
|
|||
source: control.iconSource;
|
||||
width: Theme.getSize("button_icon").width;
|
||||
height: Theme.getSize("button_icon").height;
|
||||
color: Theme.getColor("button_text")
|
||||
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");
|
||||
}
|
||||
}
|
||||
|
||||
sourceSize: Theme.getSize("button_icon")
|
||||
}
|
||||
|
|
@ -331,9 +361,9 @@ QtObject {
|
|||
background: Rectangle {
|
||||
anchors.fill: parent;
|
||||
anchors.left: parent.left
|
||||
anchors.leftMargin: Theme.getSize("default_margin").width
|
||||
anchors.leftMargin: Theme.getSize("sidebar_margin").width
|
||||
anchors.right: parent.right
|
||||
anchors.rightMargin: Theme.getSize("default_margin").width
|
||||
anchors.rightMargin: Theme.getSize("sidebar_margin").width
|
||||
implicitHeight: Theme.getSize("section").height;
|
||||
color: {
|
||||
if(control.color) {
|
||||
|
|
@ -381,8 +411,30 @@ QtObject {
|
|||
UM.RecolorImage {
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
anchors.left: parent.left
|
||||
anchors.leftMargin: Theme.getSize("default_margin").width
|
||||
color: Theme.getColor("setting_category_text")
|
||||
anchors.leftMargin: Theme.getSize("sidebar_margin").width
|
||||
color:
|
||||
{
|
||||
if(!control.enabled)
|
||||
{
|
||||
return Theme.getColor("setting_category_disabled_text");
|
||||
}
|
||||
else if((control.hovered || control.activeFocus) && control.checkable && control.checked)
|
||||
{
|
||||
return Theme.getColor("setting_category_active_hover_text");
|
||||
}
|
||||
else if(control.pressed || (control.checkable && control.checked))
|
||||
{
|
||||
return Theme.getColor("setting_category_active_text");
|
||||
}
|
||||
else if(control.hovered || control.activeFocus)
|
||||
{
|
||||
return Theme.getColor("setting_category_hover_text");
|
||||
}
|
||||
else
|
||||
{
|
||||
return Theme.getColor("setting_category_text");
|
||||
}
|
||||
}
|
||||
source: control.iconSource;
|
||||
width: Theme.getSize("section_icon").width;
|
||||
height: Theme.getSize("section_icon").height;
|
||||
|
|
@ -394,13 +446,35 @@ QtObject {
|
|||
Label {
|
||||
anchors {
|
||||
left: icon.right;
|
||||
leftMargin: Theme.getSize("default_lining").width;
|
||||
leftMargin: Theme.getSize("default_margin").width;
|
||||
right: parent.right;
|
||||
verticalCenter: parent.verticalCenter;
|
||||
}
|
||||
text: control.text;
|
||||
font: Theme.getFont("setting_category");
|
||||
color: Theme.getColor("setting_category_text");
|
||||
color:
|
||||
{
|
||||
if(!control.enabled)
|
||||
{
|
||||
return Theme.getColor("setting_category_disabled_text");
|
||||
}
|
||||
else if((control.hovered || control.activeFocus) && control.checkable && control.checked)
|
||||
{
|
||||
return Theme.getColor("setting_category_active_hover_text");
|
||||
}
|
||||
else if(control.pressed || (control.checkable && control.checked))
|
||||
{
|
||||
return Theme.getColor("setting_category_active_text");
|
||||
}
|
||||
else if(control.hovered || control.activeFocus)
|
||||
{
|
||||
return Theme.getColor("setting_category_hover_text");
|
||||
}
|
||||
else
|
||||
{
|
||||
return Theme.getColor("setting_category_text");
|
||||
}
|
||||
}
|
||||
fontSizeMode: Text.HorizontalFit;
|
||||
minimumPointSize: 8
|
||||
}
|
||||
|
|
@ -408,12 +482,34 @@ QtObject {
|
|||
id: category_arrow
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
anchors.right: parent.right
|
||||
anchors.rightMargin: Theme.getSize("default_margin").width * 2 - width / 2
|
||||
anchors.rightMargin: Theme.getSize("default_margin").width * 3 - width / 2
|
||||
width: Theme.getSize("standard_arrow").width
|
||||
height: Theme.getSize("standard_arrow").height
|
||||
sourceSize.width: width
|
||||
sourceSize.height: width
|
||||
color: Theme.getColor("setting_category_text")
|
||||
color:
|
||||
{
|
||||
if(!control.enabled)
|
||||
{
|
||||
return Theme.getColor("setting_category_disabled_text");
|
||||
}
|
||||
else if((control.hovered || control.activeFocus) && control.checkable && control.checked)
|
||||
{
|
||||
return Theme.getColor("setting_category_active_hover_text");
|
||||
}
|
||||
else if(control.pressed || (control.checkable && control.checked))
|
||||
{
|
||||
return Theme.getColor("setting_category_active_text");
|
||||
}
|
||||
else if(control.hovered || control.activeFocus)
|
||||
{
|
||||
return Theme.getColor("setting_category_hover_text");
|
||||
}
|
||||
else
|
||||
{
|
||||
return Theme.getColor("setting_category_text");
|
||||
}
|
||||
}
|
||||
source: control.checked ? Theme.getIcon("arrow_bottom") : Theme.getIcon("arrow_left")
|
||||
}
|
||||
}
|
||||
|
|
@ -627,7 +723,9 @@ QtObject {
|
|||
width: Theme.getSize("slider_handle").width;
|
||||
height: Theme.getSize("slider_handle").height;
|
||||
color: control.hovered ? Theme.getColor("slider_handle_hover") : Theme.getColor("slider_handle");
|
||||
radius: Theme.getSize("slider_handle").width/2;
|
||||
border.width: Theme.getSize("default_lining").width
|
||||
border.color: control.hovered ? Theme.getColor("slider_handle_hover_border") : Theme.getColor("slider_handle_border")
|
||||
radius: Theme.getSize("slider_handle").width / 2; //Round.
|
||||
Behavior on color { ColorAnimation { duration: 50; } }
|
||||
}
|
||||
}
|
||||
|
|
@ -636,6 +734,7 @@ QtObject {
|
|||
property Component text_field: Component {
|
||||
TextFieldStyle {
|
||||
textColor: Theme.getColor("setting_control_text");
|
||||
placeholderTextColor: Theme.getColor("setting_control_text")
|
||||
font: Theme.getFont("default");
|
||||
|
||||
background: Rectangle
|
||||
|
|
@ -691,7 +790,7 @@ QtObject {
|
|||
}
|
||||
Behavior on color { ColorAnimation { duration: 50; } }
|
||||
|
||||
implicitWidth: actualLabel.contentWidth + (UM.Theme.getSize("default_margin").width * 2)
|
||||
implicitWidth: actualLabel.contentWidth + (UM.Theme.getSize("sidebar_margin").width * 2)
|
||||
|
||||
Label
|
||||
{
|
||||
345
resources/themes/cura-light/theme.json
Normal file
345
resources/themes/cura-light/theme.json
Normal file
|
|
@ -0,0 +1,345 @@
|
|||
{
|
||||
"metadata": {
|
||||
"name": "Light"
|
||||
},
|
||||
|
||||
"fonts": {
|
||||
"large": {
|
||||
"size": 1.25,
|
||||
"bold": true,
|
||||
"family": "Open Sans"
|
||||
},
|
||||
"default": {
|
||||
"size": 1.15,
|
||||
"family": "Open Sans"
|
||||
},
|
||||
"default_bold": {
|
||||
"size": 1.15,
|
||||
"bold": true,
|
||||
"family": "Open Sans"
|
||||
},
|
||||
"default_italic": {
|
||||
"size": 1.15,
|
||||
"italic": true,
|
||||
"family": "Open Sans"
|
||||
},
|
||||
"small": {
|
||||
"size": 1.0,
|
||||
"bold": true,
|
||||
"family": "Open Sans"
|
||||
},
|
||||
"very_small": {
|
||||
"size": 1.0,
|
||||
"family": "Open Sans"
|
||||
},
|
||||
"button_tooltip": {
|
||||
"size": 1.0,
|
||||
"family": "Open Sans"
|
||||
},
|
||||
"setting_category": {
|
||||
"size": 1.15,
|
||||
"bold": true,
|
||||
"family": "Open Sans"
|
||||
},
|
||||
"action_button": {
|
||||
"size": 1.15,
|
||||
"bold": true,
|
||||
"family": "Open Sans"
|
||||
}
|
||||
},
|
||||
|
||||
"colors": {
|
||||
"sidebar": [255, 255, 255, 255],
|
||||
"lining": [127, 127, 127, 255],
|
||||
"viewport_overlay": [24, 41, 77, 192],
|
||||
|
||||
"primary": [12, 169, 227, 255],
|
||||
"primary_hover": [48, 182, 231, 255],
|
||||
"primary_text": [255, 255, 255, 255],
|
||||
"border": [127, 127, 127, 255],
|
||||
"secondary": [245, 245, 245, 255],
|
||||
|
||||
"text": [24, 41, 77, 255],
|
||||
"text_detail": [174, 174, 174, 128],
|
||||
"text_link": [12, 169, 227, 255],
|
||||
"text_inactive": [174, 174, 174, 255],
|
||||
"text_hover": [70, 84, 113, 255],
|
||||
"text_pressed": [12, 169, 227, 255],
|
||||
"text_subtext": [70, 84, 113, 255],
|
||||
"text_emphasis": [255, 255, 255, 255],
|
||||
"text_scene": [24, 41, 77, 255],
|
||||
"text_scene_hover": [70, 84, 113, 255],
|
||||
|
||||
"error": [255, 140, 0, 255],
|
||||
"sidebar_header_bar": [24, 41, 77, 255],
|
||||
"sidebar_header_active": [70, 84, 113, 255],
|
||||
"sidebar_header_hover": [24, 41, 77, 255],
|
||||
"sidebar_header_highlight": [12, 169, 227, 255],
|
||||
"sidebar_header_highlight_hover": [255, 255, 255, 255],
|
||||
"sidebar_header_text_inactive": [255, 255, 255, 255],
|
||||
"sidebar_header_text_active": [255, 255, 255, 255],
|
||||
"sidebar_header_text_hover": [255, 255, 255, 255],
|
||||
"sidebar_lining": [245, 245, 245, 255],
|
||||
|
||||
"button": [24, 41, 77, 255],
|
||||
"button_hover": [70, 84, 113, 255],
|
||||
"button_active": [32, 166, 219, 255],
|
||||
"button_active_hover": [12, 169, 227, 255],
|
||||
"button_text": [255, 255, 255, 255],
|
||||
"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_text": [255, 255, 255, 101],
|
||||
|
||||
"button_tooltip": [12, 169, 227, 255],
|
||||
"button_tooltip_border": [24, 41, 77, 255],
|
||||
"button_tooltip_text": [24, 41, 77, 255],
|
||||
|
||||
"tab_checked": [255, 255, 255, 255],
|
||||
"tab_checked_border": [255, 255, 255, 255],
|
||||
"tab_checked_text": [24, 41, 77, 255],
|
||||
"tab_unchecked": [245, 245, 245, 255],
|
||||
"tab_unchecked_border": [245, 245, 245, 255],
|
||||
"tab_unchecked_text": [127, 127, 127, 255],
|
||||
"tab_hovered": [245, 245, 245, 255],
|
||||
"tab_hovered_border": [245, 245, 245, 255],
|
||||
"tab_hovered_text": [32, 166, 219, 255],
|
||||
"tab_active": [255, 255, 255, 255],
|
||||
"tab_active_border": [255, 255, 255, 255],
|
||||
"tab_active_text": [24, 41, 77, 255],
|
||||
"tab_background": [245, 245, 245, 255],
|
||||
|
||||
"action_button": [255, 255, 255, 255],
|
||||
"action_button_text": [24, 41, 77, 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_border": [12, 169, 227, 255],
|
||||
"action_button_active": [12, 169, 227, 255],
|
||||
"action_button_active_text": [255, 255, 255, 255],
|
||||
"action_button_active_border": [12, 169, 227, 255],
|
||||
"action_button_disabled": [245, 245, 245, 255],
|
||||
"action_button_disabled_text": [127, 127, 127, 255],
|
||||
"action_button_disabled_border": [245, 245, 245, 255],
|
||||
|
||||
"scrollbar_background": [255, 255, 255, 255],
|
||||
"scrollbar_handle": [24, 41, 77, 255],
|
||||
"scrollbar_handle_hover": [12, 159, 227, 255],
|
||||
"scrollbar_handle_down": [12, 159, 227, 255],
|
||||
|
||||
"setting_category": [245, 245, 245, 255],
|
||||
"setting_category_disabled": [255, 255, 255, 255],
|
||||
"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_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_border": [245, 245, 245, 255],
|
||||
"setting_category_disabled_border": [245, 245, 245, 255],
|
||||
"setting_category_hover_border": [12, 159, 227, 255],
|
||||
"setting_category_active_border": [245, 245, 245, 255],
|
||||
"setting_category_active_hover_border": [12, 159, 227, 255],
|
||||
|
||||
"setting_control": [255, 255, 255, 255],
|
||||
"setting_control_selected": [24, 41, 77, 255],
|
||||
"setting_control_highlight": [255, 255, 255, 0],
|
||||
"setting_control_border": [127, 127, 127, 255],
|
||||
"setting_control_border_highlight": [12, 169, 227, 255],
|
||||
"setting_control_text": [24, 41, 77, 255],
|
||||
"setting_control_depth_line": [127, 127, 127, 255],
|
||||
"setting_control_button": [127, 127, 127, 255],
|
||||
"setting_control_button_hover": [70, 84, 113, 255],
|
||||
"setting_control_disabled": [245, 245, 245, 255],
|
||||
"setting_control_disabled_text": [127, 127, 127, 255],
|
||||
"setting_control_disabled_border": [127, 127, 127, 255],
|
||||
"setting_unit": [127, 127, 127, 255],
|
||||
"setting_validation_error_background": [255, 57, 14, 255],
|
||||
"setting_validation_error": [127, 127, 127, 255],
|
||||
"setting_validation_warning_background": [255, 186, 15, 255],
|
||||
"setting_validation_warning": [127, 127, 127, 255],
|
||||
"setting_validation_ok": [255, 255, 255, 255],
|
||||
|
||||
"progressbar_background": [245, 245, 245, 255],
|
||||
"progressbar_control": [24, 41, 77, 255],
|
||||
|
||||
"slider_groove": [245, 245, 245, 255],
|
||||
"slider_groove_border": [127, 127, 127, 255],
|
||||
"slider_groove_fill": [127, 127, 127, 255],
|
||||
"slider_handle": [32, 166, 219, 255],
|
||||
"slider_handle_hover": [77, 182, 226, 255],
|
||||
"slider_text_background": [255, 255, 255, 255],
|
||||
|
||||
"checkbox": [255, 255, 255, 255],
|
||||
"checkbox_hover": [255, 255, 255, 255],
|
||||
"checkbox_border": [127, 127, 127, 255],
|
||||
"checkbox_border_hover": [12, 169, 227, 255],
|
||||
"checkbox_mark": [24, 41, 77, 255],
|
||||
"checkbox_text": [24, 41, 77, 255],
|
||||
|
||||
"mode_switch": [255, 255, 255, 255],
|
||||
"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_text_checked": [12, 169, 227, 255],
|
||||
|
||||
"tooltip": [12, 169, 227, 255],
|
||||
"tooltip_text": [255, 255, 255, 255],
|
||||
|
||||
"message_background": [24, 41, 77, 255],
|
||||
"message_text": [255, 255, 255, 255],
|
||||
"message_border": [24, 41, 77, 255],
|
||||
"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": [255, 255, 255, 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": [245, 245, 245, 255],
|
||||
"volume_outline": [12, 169, 227, 255],
|
||||
"buildplate": [244, 244, 244, 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, 40],
|
||||
"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_margin": [1.71, 1.43],
|
||||
"sidebar_margin_thin": [0.71, 0.71],
|
||||
"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.2],
|
||||
"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": [4, 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": [17, 4],
|
||||
"topbar_button_icon": [3.125, 2.5],
|
||||
|
||||
"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],
|
||||
|
||||
"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]
|
||||
}
|
||||
}
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 30 30">
|
||||
<path d="M13.628 29.557c-3.53 1.24-6.44-.182-5.857-3.572.584-3.39 3.934-10.65 4.412-12.023.477-1.373-.438-1.75-1.42-1.19-.566.326-1.408.98-2.13 1.617-.2-.404-.482-.865-.694-1.306 1.18-1.181 3.15-2.765 5.482-3.339 2.787-.688 7.446.413 5.444 5.739-1.43 3.797-2.441 6.417-3.078 8.372-.637 1.952.125 2.365 1.239 1.6.87-.594 1.798-1.403 2.478-2.03.315.513.413.676.726 1.264-1.185 1.2-4.27 4.042-6.598 4.868h-.004zm7.314-23.486c-1.601 1.363-3.974 1.333-5.302-.067-1.328-1.399-1.106-3.638.495-5.001 1.6-1.363 3.974-1.333 5.306.062 1.323 1.399 1.1 3.639-.501 5.006h.002z"/>
|
||||
</svg>
|
||||
|
Before Width: | Height: | Size: 638 B |
|
|
@ -1,3 +0,0 @@
|
|||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 30 30">
|
||||
<path d="M2.5 2.5h25v1.19h-25V2.5zm0 23.81h2.287l2.272-1.19h15.966l2.234 1.19H27.5v1.19h-2.239l-2.236-1.19H7.057l-2.27 1.177L2.5 27.5v-1.19zM26.364 3.69H27.5v22.62h-1.136V3.69zM2.5 3.69h1.136v22.62H2.5V3.69zm3.41 2.381h18.18v16.667H5.91V6.071zm1.135 1.19h15.91v14.287H7.045V7.262zm5.682 0h4.546v3.572h-4.546V7.262zM9.318 20.358h11.364v1.19H9.318v-1.19zm4.546-9.524h2.272v1.19h-2.272v-1.19z" fill-rule="evenodd"/>
|
||||
</svg>
|
||||
|
Before Width: | Height: | Size: 485 B |
|
|
@ -1,4 +0,0 @@
|
|||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 30 30">
|
||||
<path d="M2.5 2.5h25v1.19h-25V2.5zm0 23.81h2.287l2.272-1.19h15.966l2.234 1.19H27.5v1.19h-2.239l-2.236-1.19H7.057l-2.27 1.177L2.5 27.5v-1.19zM26.364 3.69H27.5v22.62h-1.136V3.69zM2.5 3.69h1.136v22.62H2.5V3.69zm3.41 2.381h18.18v16.667H5.91V6.071zm1.135 1.19h15.91v14.287H7.045V7.262zm5.682 0h4.546v3.572h-4.546V7.262zM9.318 20.358h11.364v1.19H9.318v-1.19zm4.546-9.524h2.272v1.19h-2.272v-1.19z" fill-rule="evenodd"/>
|
||||
<circle cx="22.5" cy="7.5" r="7.4" />
|
||||
</svg>
|
||||
|
Before Width: | Height: | Size: 527 B |
|
|
@ -1,4 +1,9 @@
|
|||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 30 30">
|
||||
<path
|
||||
d="M 22.5 0 A 7.5 7.5 0 0 0 15 7.5 A 7.5 7.5 0 0 0 22.5 15 A 7.5 7.5 0 0 0 30 7.5 A 7.5 7.5 0 0 0 22.5 0 z M 18.5 6 A 1.5 1.5 0 0 1 20 7.5 A 1.5 1.5 0 0 1 18.5 9 A 1.5 1.5 0 0 1 17 7.5 A 1.5 1.5 0 0 1 18.5 6 z M 22.5 6 A 1.5 1.5 0 0 1 24 7.5 A 1.5 1.5 0 0 1 22.5 9 A 1.5 1.5 0 0 1 21 7.5 A 1.5 1.5 0 0 1 22.5 6 z M 26.5 6 A 1.5 1.5 0 0 1 28 7.5 A 1.5 1.5 0 0 1 26.5 9 A 1.5 1.5 0 0 1 25 7.5 A 1.5 1.5 0 0 1 26.5 6 z " />
|
||||
</svg>
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<svg width="35px" height="28px" viewBox="0 0 35 28" version="1.1" xmlns="http://www.w3.org/2000/svg">
|
||||
<g transform="translate(15.5, 4)">
|
||||
<circle fill="#0CA9E3" cx="9" cy="9" r="8.5" stroke="#272C30" />
|
||||
<circle fill="#FFFFFF" cx="4" cy="9" r="1.75" />
|
||||
<circle fill="#FFFFFF" cx="9" cy="9" r="1.75" />
|
||||
<circle fill="#FFFFFF" cx="14" cy="9" r="1.75" />
|
||||
</g>
|
||||
</svg>
|
||||
|
Before Width: | Height: | Size: 502 B After Width: | Height: | Size: 440 B |
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Add a link
Reference in a new issue