GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-19 03:47:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Ultimaker/Cura

Browse Source
This commit is contained in:
ChrisTerBeke 2017-09-11 09:14:56 +02:00
commit 2d8fca8ac4
16 changed files with 161 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cura/PrintInformation.py
View File

@ -265,7 +265,8 @@ class PrintInformation(QObject):
# extension. This cuts the extension off if necessary.
name = os.path.splitext(name)[0]
if self._base_name == "" and self._base_name != name:
# name is "" when I first had some meshes and afterwards I deleted them so the naming should start again
if name == "" or (self._base_name == "" and self._base_name != name):
self._base_name = name
self._updateJobName()

10
plugins/LayerView/LayerView.qml
View File

@ -72,7 +72,7 @@ Item
anchors.left: parent.left
text: catalog.i18nc("@label","View Mode: Layers")
font: UM.Theme.getFont("default_bold");
color: UM.Theme.getColor("text")
color: UM.Theme.getColor("setting_control_text")
Layout.fillWidth: true
elide: Text.ElideMiddle;
}
@ -93,7 +93,7 @@ Item
font: UM.Theme.getFont("default");
visible: !UM.LayerView.compatibilityMode
Layout.fillWidth: true
color: UM.Theme.getColor("text")
color: UM.Theme.getColor("setting_control_text")
}
ListModel // matches LayerView.py
@ -211,7 +211,7 @@ Item
{
text: model.name
elide: Text.ElideRight
color: UM.Theme.getColor("text")
color: UM.Theme.getColor("button_text")
font: UM.Theme.getFont("default")
anchors.verticalCenter: parent.verticalCenter
anchors.left: extrudersModelCheckBox.left;
@ -280,7 +280,7 @@ Item
text: label
font: UM.Theme.getFont("default")
elide: Text.ElideRight
color: UM.Theme.getColor("text")
color: UM.Theme.getColor("button_text")
anchors.verticalCenter: parent.verticalCenter
anchors.left: legendModelCheckBox.left;
anchors.right: legendModelCheckBox.right;
@ -343,7 +343,7 @@ Item
Layout.fillWidth: true
Layout.preferredHeight: UM.Theme.getSize("layerview_row").height + UM.Theme.getSize("default_lining").height
Layout.preferredWidth: UM.Theme.getSize("layerview_row").width
color: UM.Theme.getColor("text")
color: UM.Theme.getColor("button_text")
font: UM.Theme.getFont("default")
}
}

3
plugins/USBPrinting/USBPrinterOutputDevice.py
View File

@ -622,8 +622,9 @@ class USBPrinterOutputDevice(PrinterOutputDevice):
self._sendCommand("M140 S0")
self._sendCommand("M104 S0")
self._sendCommand("M107")
# Home XY to prevent nozzle resting on aborted print
# Don't home bed because it may crash the printhead into the print on printers that home on the bottom
self.homeHead()
self.homeBed()
self._sendCommand("M84")
self._is_printing = False
self._is_paused = False

49
resources/definitions/fdmprinter.def.json
View File

@ -566,6 +566,7 @@
"unit": "mm/s",
"type": "float",
"default_value": 20.0,
"minimum_value": "0",
"settable_per_mesh": false,
"settable_per_extruder": false,
"settable_per_meshgroup": false
@ -577,6 +578,7 @@
"unit": "mm/s",
"type": "float",
"default_value": 0.4,
"minimum_value": "0",
"settable_per_mesh": false,
"settable_per_extruder": false,
"settable_per_meshgroup": false
@ -588,6 +590,7 @@
"unit": "mm/s",
"type": "float",
"default_value": 5.0,
"minimum_value": "0",
"settable_per_mesh": false,
"settable_per_extruder": false,
"settable_per_meshgroup": false
@ -2677,7 +2680,7 @@
"description": "The maximum instantaneous velocity change of the print head.",
"unit": "mm/s",
"type": "float",
"minimum_value": "0.1",
"minimum_value": "0",
"maximum_value_warning": "50",
"default_value": 20,
"enabled": "resolveOrValue('jerk_enabled')",
@ -2690,7 +2693,7 @@
"description": "The maximum instantaneous velocity change with which infill is printed.",
"unit": "mm/s",
"type": "float",
"minimum_value": "0.1",
"minimum_value": "0",
"maximum_value_warning": "50",
"default_value": 20,
"value": "jerk_print",
@ -2704,7 +2707,7 @@
"description": "The maximum instantaneous velocity change with which the walls are printed.",
"unit": "mm/s",
"type": "float",
"minimum_value": "0.1",
"minimum_value": "0",
"maximum_value_warning": "50",
"default_value": 20,
"value": "jerk_print",
@ -2718,7 +2721,7 @@
"description": "The maximum instantaneous velocity change with which the outermost walls are printed.",
"unit": "mm/s",
"type": "float",
"minimum_value": "0.1",
"minimum_value": "0",
"maximum_value_warning": "50",
"default_value": 20,
"value": "jerk_wall",
@ -2732,7 +2735,7 @@
"description": "The maximum instantaneous velocity change with which all inner walls are printed.",
"unit": "mm/s",
"type": "float",
"minimum_value": "0.1",
"minimum_value": "0",
"maximum_value_warning": "50",
"default_value": 20,
"value": "jerk_wall",
@ -2748,7 +2751,7 @@
"description": "The maximum instantaneous velocity change with which top surface skin layers are printed.",
"unit": "mm/s",
"type": "float",
"minimum_value": "0.1",
"minimum_value": "0",
"maximum_value_warning": "50",
"default_value": 20,
"value": "jerk_topbottom",
@ -2762,7 +2765,7 @@
"description": "The maximum instantaneous velocity change with which top/bottom layers are printed.",
"unit": "mm/s",
"type": "float",
"minimum_value": "0.1",
"minimum_value": "0",
"maximum_value_warning": "50",
"default_value": 20,
"value": "jerk_print",
@ -2776,7 +2779,7 @@
"description": "The maximum instantaneous velocity change with which the support structure is printed.",
"unit": "mm/s",
"type": "float",
"minimum_value": "0.1",
"minimum_value": "0",
"maximum_value_warning": "50",
"default_value": 20,
"value": "jerk_print",
@ -2794,7 +2797,7 @@
"type": "float",
"default_value": 20,
"value": "jerk_support",
"minimum_value": "0.1",
"minimum_value": "0",
"maximum_value_warning": "50",
"enabled": "resolveOrValue('jerk_enabled') and support_enable",
"limit_to_extruder": "support_infill_extruder_nr",
@ -2809,7 +2812,7 @@
"type": "float",
"default_value": 20,
"value": "jerk_support",
"minimum_value": "0.1",
"minimum_value": "0",
"maximum_value_warning": "50",
"enabled": "resolveOrValue('jerk_enabled') and support_interface_enable and support_enable",
"limit_to_extruder": "support_interface_extruder_nr",
@ -2825,7 +2828,7 @@
"type": "float",
"default_value": 20,
"value": "extruderValue(support_roof_extruder_nr, 'jerk_support_interface')",
"minimum_value": "0.1",
"minimum_value": "0",
"maximum_value_warning": "50",
"enabled": "resolveOrValue('jerk_enabled') and support_roof_enable and support_enable",
"limit_to_extruder": "support_roof_extruder_nr",
@ -2840,7 +2843,7 @@
"type": "float",
"default_value": 20,
"value": "extruderValue(support_roof_extruder_nr, 'jerk_support_interface')",
"minimum_value": "0.1",
"minimum_value": "0",
"maximum_value_warning": "50",
"enabled": "resolveOrValue('jerk_enabled') and support_bottom_enable and support_enable",
"limit_to_extruder": "support_bottom_extruder_nr",
@ -2857,7 +2860,7 @@
"description": "The maximum instantaneous velocity change with which the prime tower is printed.",
"unit": "mm/s",
"type": "float",
"minimum_value": "0.1",
"minimum_value": "0",
"maximum_value_warning": "50",
"default_value": 20,
"value": "jerk_print",
@ -2873,7 +2876,7 @@
"unit": "mm/s",
"type": "float",
"default_value": 30,
"minimum_value": "0.1",
"minimum_value": "0",
"maximum_value_warning": "50",
"value": "jerk_print if magic_spiralize else 30",
"enabled": "resolveOrValue('jerk_enabled')",
@ -2887,7 +2890,7 @@
"type": "float",
"default_value": 20,
"value": "jerk_print",
"minimum_value": "0.1",
"minimum_value": "0",
"maximum_value_warning": "50",
"enabled": "resolveOrValue('jerk_enabled')",
"settable_per_mesh": true,
@ -2901,7 +2904,7 @@
"type": "float",
"default_value": 20,
"value": "jerk_layer_0",
"minimum_value": "0.1",
"minimum_value": "0",
"maximum_value_warning": "50",
"enabled": "resolveOrValue('jerk_enabled')",
"settable_per_mesh": true
@ -2914,7 +2917,7 @@
"type": "float",
"default_value": 20,
"value": "jerk_layer_0 * jerk_travel / jerk_print",
"minimum_value": "0.1",
"minimum_value": "0",
"maximum_value_warning": "50",
"enabled": "resolveOrValue('jerk_enabled')",
"settable_per_extruder": true,
@ -2929,7 +2932,7 @@
"unit": "mm/s",
"type": "float",
"default_value": 20,
"minimum_value": "0.1",
"minimum_value": "0",
"maximum_value_warning": "50",
"value": "jerk_layer_0",
"enabled": "resolveOrValue('jerk_enabled')",
@ -4448,7 +4451,7 @@
"unit": "mm/s",
"type": "float",
"default_value": 20,
"minimum_value": "0.1",
"minimum_value": "0",
"minimum_value_warning": "5",
"maximum_value_warning": "50",
"value": "jerk_print",
@ -4465,7 +4468,7 @@
"type": "float",
"default_value": 20,
"value": "raft_jerk",
"minimum_value": "0.1",
"minimum_value": "0",
"minimum_value_warning": "5",
"maximum_value_warning": "100",
"enabled": "resolveOrValue('adhesion_type') == 'raft' and resolveOrValue('jerk_enabled')",
@ -4480,7 +4483,7 @@
"type": "float",
"default_value": 20,
"value": "raft_jerk",
"minimum_value": "0.1",
"minimum_value": "0",
"minimum_value_warning": "5",
"maximum_value_warning": "50",
"enabled": "resolveOrValue('adhesion_type') == 'raft' and resolveOrValue('jerk_enabled')",
@ -4495,7 +4498,7 @@
"type": "float",
"default_value": 20,
"value": "raft_jerk",
"minimum_value": "0.1",
"minimum_value": "0",
"minimum_value_warning": "5",
"maximum_value_warning": "50",
"enabled": "resolveOrValue('adhesion_type') == 'raft' and resolveOrValue('jerk_enabled')",
@ -5803,7 +5806,7 @@
"description": "The maximum instantaneous velocity change while performing ironing.",
"unit": "mm/s",
"type": "float",
"minimum_value": "0.1",
"minimum_value": "0",
"maximum_value_warning": "50",
"default_value": 20,
"value": "jerk_topbottom",

2
resources/qml/JobSpecs.qml
View File

@ -43,7 +43,7 @@ Item {
}
if (activity == false){
//When there is no mesh in the buildplate; the printJobTextField is set to an empty string so it doesn't set an empty string as a jobName (which is later used for saving the file)
PrintInformation.setJobName('')
PrintInformation.setBaseName('')
}
}

4
resources/qml/Sidebar.qml
View File

@ -168,7 +168,7 @@ Rectangle
style: ButtonStyle {
background: Rectangle {
border.width: UM.Theme.getSize("default_lining").width
border.width: control.checked ? UM.Theme.getSize("default_lining").width * 2 : UM.Theme.getSize("default_lining").width
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")
@ -181,7 +181,7 @@ Rectangle
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")
font: (control.checked || control.pressed) ? UM.Theme.getFont("default_little_big") : UM.Theme.getFont("default")
text: control.text;
}
}

7
resources/qml/SidebarHeader.qml
View File

@ -122,7 +122,7 @@ Column
Rectangle
{
anchors.fill: parent
border.width: UM.Theme.getSize("default_lining").width
border.width: control.checked ? UM.Theme.getSize("default_lining").width * 2 : UM.Theme.getSize("default_lining").width
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")
@ -369,7 +369,7 @@ Column
//sourceSize.width: width + 5
//sourceSize.height: width + 5
color: UM.Theme.getColor("setting_validation_warning")
color: UM.Theme.getColor("material_compatibility_warning")
visible: !Cura.MachineManager.isCurrentSetupSupported
}
@ -377,7 +377,7 @@ Column
{
id: materialInfoLabel
wrapMode: Text.WordWrap
text: catalog.i18nc("@label", "Check material compability")
text: catalog.i18nc("@label", "Check material compatibility")
font: UM.Theme.getFont("default");
verticalAlignment: Text.AlignTop
anchors.top: parent.top
@ -400,7 +400,6 @@ Column
}
onEntered:
{
var content = catalog.i18nc("@tooltip", "Click to check the material compatibility on Ultimaker.com.");
base.showTooltip(
materialInfoRow,

14
resources/themes/cura-light/icons/tab_status_busy.svg
View File

@ -1 +1,13 @@
<svg width="18" height="18" viewBox="0 0 18 18" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><defs><rect id="a" x="1" y="1" width="16" height="16" rx="8"/></defs><g fill="none" fill-rule="evenodd"><use fill="#0CA9E3" xlink:href="#a"/><rect stroke="#272C30" x=".5" y=".5" width="17" height="17" rx="8.5"/><g transform="translate(2.3 7.3)" fill="#FFF"><rect x="10" width="3.5" height="3.5" rx="1.75"/><rect width="3.5" height="3.5" rx="1.75"/><rect x="5" width="3.5" height="3.5" rx="1.75"/></g></g></svg>
<?xml version="1.0" encoding="UTF-8"?>
<svg width="14px" height="14px" viewBox="0 0 14 14" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 46.2 (44496) - http://www.bohemiancoding.com/sketch -->
<title>Busy</title>
<desc>Created with Sketch.</desc>
<defs></defs>
<g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="00-printer-status-overview" transform="translate(-17.000000, -22.000000)"></g>
<g id="Busy" fill="#D8D8D8">
<path d="M7,14 C3.13400675,14 0,10.8659932 0,7 C0,3.13400675 3.13400675,0 7,0 C10.8659932,0 14,3.13400675 14,7 C14,10.8659932 10.8659932,14 7,14 Z M9.5,7 C9.5,7.83420277 10.1715729,8.5 11,8.5 C11.8342028,8.5 12.5,7.82842712 12.5,7 C12.5,6.16579723 11.8284271,5.5 11,5.5 C10.1657972,5.5 9.5,6.17157288 9.5,7 Z M1.5,7 C1.5,7.83420277 2.17157288,8.5 3,8.5 C3.83420277,8.5 4.5,7.82842712 4.5,7 C4.5,6.16579723 3.82842712,5.5 3,5.5 C2.16579723,5.5 1.5,6.17157288 1.5,7 Z M5.5,7 C5.5,7.83420277 6.17157288,8.5 7,8.5 C7.83420277,8.5 8.5,7.82842712 8.5,7 C8.5,6.16579723 7.82842712,5.5 7,5.5 C6.16579723,5.5 5.5,6.17157288 5.5,7 Z" id="Combined-Shape"></path>
</g>
</g>
</svg>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 536 B

After

Width:  |  Height:  |  Size: 1.2 KiB

14
resources/themes/cura-light/icons/tab_status_connected.svg
View File

@ -1 +1,13 @@
<svg width="18" height="18" viewBox="0 0 18 18" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><title>tab_status_connected</title><defs><rect id="a" x="1" y="1" width="16" height="16" rx="8"/></defs><g fill="none" fill-rule="evenodd"><use fill="#10CB00" xlink:href="#a"/><rect stroke="#272C30" x=".5" y=".5" width="17" height="17" rx="8.5"/><path fill="#FFF" d="M8.115 12.535l-3.18-3.183L6.35 7.937l1.768 1.768 3.534-3.532 1.416 1.415z"/></g></svg>
<?xml version="1.0" encoding="UTF-8"?>
<svg width="14px" height="14px" viewBox="0 0 14 14" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 46.2 (44496) - http://www.bohemiancoding.com/sketch -->
<title>Connected</title>
<desc>Created with Sketch.</desc>
<defs></defs>
<g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="00-printer-status-overview" transform="translate(-165.000000, -22.000000)"></g>
<g id="Connected" fill="#0CA9E3">
<path d="M0,7 C0,3.13400675 3.14187327,0 7,0 C10.8659932,0 14,3.14187327 14,7 C14,10.8659932 10.8581267,14 7,14 C3.13400675,14 0,10.8581267 0,7 Z M6.18,10.3625 L11.1325,5.415 L9.7175,4 L6.1825,7.5325 L4.415,5.765 L3,7.18 L6.18,10.3625 Z" id="Combined-Shape"></path>
</g>
</g>
</svg>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 479 B

After

Width:  |  Height:  |  Size: 878 B

13
resources/themes/cura-light/icons/tab_status_finished.svg Normal file
View File

@ -0,0 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="14px" height="14px" viewBox="0 0 14 14" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 46.2 (44496) - http://www.bohemiancoding.com/sketch -->
<title>Wait cleanup</title>
<desc>Created with Sketch.</desc>
<defs></defs>
<g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="00-printer-status-overview" transform="translate(-84.000000, -22.000000)"></g>
<g id="Wait-cleanup" fill="#7FDB16">
<path d="M7,14 C3.13400675,14 0,10.8659932 0,7 C0,3.13400675 3.13400675,0 7,0 C10.8659932,0 14,3.13400675 14,7 C14,10.8659932 10.8659932,14 7,14 Z M8.07520384,11.2263517 L8.07520384,10.7137766 C8.07520384,10.2581543 7.84739269,10.0018668 7.36329399,10.0018668 L6.73681332,10.0018668 C6.28119101,10.0018668 6.02490346,10.2296779 6.02490346,10.7137766 L6.02490346,11.2263517 C6.02490346,11.681974 6.25271461,11.9382616 6.73681332,11.9382616 L7.36329399,11.9382616 C7.8189163,11.9382616 8.07520384,11.7104504 8.07520384,11.2263517 Z M8.04672745,7.78070802 L8.21758581,2.74038625 C8.21758581,2.25628755 7.98977466,2 7.50567596,2 L6.59443134,2 C6.11033264,2 5.88252149,2.25628755 5.88252149,2.74038625 L6.05337986,7.78070802 C6.08185625,8.23633033 6.3381438,8.49261788 6.7937661,8.49261788 L7.3063412,8.49261788 C7.76196351,8.49261788 8.04672745,8.23633033 8.04672745,7.78070802 Z" id="Combined-Shape"></path>
</g>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

14
resources/themes/cura-light/icons/tab_status_paused.svg
View File

@ -1 +1,13 @@
<svg width="18" height="18" viewBox="0 0 18 18" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><title>tab_status_paused</title><defs><rect id="a" x="1" y="1" width="16" height="16" rx="8"/></defs><g fill="none" fill-rule="evenodd"><use fill="#FF8C10" xlink:href="#a"/><rect stroke="#272C30" x=".5" y=".5" width="17" height="17" rx="8.5"/><path d="M10 6h2v6h-2V6zM6 6h2v6H6V6z" fill="#FFF"/></g></svg>
<?xml version="1.0" encoding="UTF-8"?>
<svg width="14px" height="14px" viewBox="0 0 14 14" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 46.2 (44496) - http://www.bohemiancoding.com/sketch -->
<title>paused</title>
<desc>Created with Sketch.</desc>
<defs></defs>
<g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="00-printer-status-overview" transform="translate(-246.000000, -22.000000)"></g>
<g id="paused" fill="#F5A623">
<path d="M7,14 C3.13400675,14 0,10.8659932 0,7 C0,3.13400675 3.13400675,0 7,0 C10.8659932,0 14,3.13400675 14,7 C14,10.8659932 10.8659932,14 7,14 Z M4.33333333,4.11111111 L4.33333333,9.88888889 L6.11111111,9.88888889 L6.11111111,4.11111111 L4.33333333,4.11111111 Z M7.88888889,4.11111111 L7.88888889,9.88888889 L9.66666667,9.88888889 L9.66666667,4.11111111 L7.88888889,4.11111111 Z" id="Combined-Shape"></path>
</g>
</g>
</svg>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 431 B

After

Width:  |  Height:  |  Size: 1016 B

14
resources/themes/cura-light/icons/tab_status_stopped.svg
View File

@ -1 +1,13 @@
<svg width="18" height="18" viewBox="0 0 18 18" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><title>tab_status_stopped</title><defs><rect id="a" x="1" y="1" width="16" height="16" rx="8"/><path id="b" d="M3.588-.662h1v7.5h-1z"/><path id="c" d="M3.412-.662h1v7.5h-1z"/></defs><g fill="none" fill-rule="evenodd"><use fill="#D0021B" xlink:href="#a"/><rect stroke="#272C30" x=".5" y=".5" width="17" height="17" rx="8.5"/><g><g transform="rotate(45 -.654 12.124)"><use fill="#FFF" xlink:href="#b"/><path stroke="#FFF" stroke-width=".5" d="M3.338-.912h1.25v8h-1.25z"/></g><g transform="rotate(135 5.169 7.124)"><use fill="#FFF" xlink:href="#c"/><path stroke="#FFF" stroke-width=".5" d="M3.162-.912h1.25v8h-1.25z"/></g></g></g></svg>
<?xml version="1.0" encoding="UTF-8"?>
<svg width="14px" height="14px" viewBox="0 0 14 14" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 46.2 (44496) - http://www.bohemiancoding.com/sketch -->
<title>Aborted</title>
<desc>Created with Sketch.</desc>
<defs></defs>
<g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="00-printer-status-overview" transform="translate(-303.000000, -22.000000)"></g>
<g id="Aborted" fill="#D0021B">
<path d="M7.006431,8.15087791 L8.99372277,9.86752475 L10.1369901,8.54194059 L8.1500273,6.82616116 L9.86540931,4.83910045 L8.54098909,3.69576014 L6.82576597,5.68263681 L4.8380396,3.96619802 L3.69512871,5.29053465 L5.6823619,7.00713089 L3.96564795,8.9957345 L5.29006817,10.1390748 L7.006431,8.15087791 Z M7,14 C3.13400675,14 0,10.8659932 0,7 C0,3.13400675 3.13400675,0 7,0 C10.8659932,0 14,3.13400675 14,7 C14,10.8659932 10.8659932,14 7,14 Z" id="Combined-Shape"></path>
</g>
</g>
</svg>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 759 B

After

Width:  |  Height:  |  Size: 1.1 KiB

16
resources/themes/cura-light/icons/tab_status_unknown.svg
View File

@ -1 +1,15 @@
<svg width="18" height="18" viewBox="0 0 18 18" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><defs><rect id="a" width="16" height="16" rx="8"/></defs><g fill="none" fill-rule="evenodd"><g transform="translate(1 1)"><use fill="#8B9595" xlink:href="#a"/><rect stroke="#272C30" x="-.5" y="-.5" width="17" height="17" rx="8.5"/></g><g fill="#FFF"><path d="M9.013 3.5c-1.723 0-2.48 1.015-2.777 1.62-.247.503-.239.937-.235 1.018l1.589-.08v.024c0-.001.004-.118.074-.26.241-.492.683-.731 1.35-.731.456 0 .803.126 1.061.384.402.403.48 1.01.48 1.15 0 .187-.065 1.145-1.25 1.76-.987.514-1.553 1.52-1.553 2.762v.474l1.59-.003v-.47c0-.451.121-1.051.697-1.35 1.996-1.038 2.105-2.818 2.107-3.165.002-.492-.194-1.527-.944-2.28-.555-.558-1.312-.853-2.189-.853zM7.818 14.386H9.41v-1.25H7.82z"/></g></g></svg>
<?xml version="1.0" encoding="UTF-8"?>
<svg width="14px" height="14px" viewBox="0 0 14 14" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 46.2 (44496) - http://www.bohemiancoding.com/sketch -->
<title>Unknown</title>
<desc>Created with Sketch.</desc>
<defs></defs>
<g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="00-printer-status-overview" transform="translate(-407.000000, -62.000000)" fill="#D8D8D8" opacity="0.231600996">
<rect id="Rectangle-12" x="379" y="0" width="261" height="163"></rect>
</g>
<g id="Unknown" fill="#000000">
<path d="M7,14 C3.13400675,14 0,10.8659932 0,7 C0,3.13400675 3.13400675,0 7,0 C10.8659932,0 14,3.13400675 14,7 C14,10.8659932 10.8659932,14 7,14 Z M6.78333984,11.3842884 C7.41672998,11.3842884 7.93020964,10.8704803 7.93020964,10.2374186 C7.93020964,9.60435702 7.41672998,9.09087736 6.78333984,9.09087736 C6.1499497,9.09087736 5.63647003,9.6040285 5.63647003,10.2374186 C5.63647003,10.8708088 6.1499497,11.3842884 6.78333984,11.3842884 Z M7.5343408,7.73605322 C8.81853274,7.61975648 9.82775188,6.53727696 9.82808041,5.22351806 C9.82808041,3.83222799 8.69632261,2.7004702 7.30503254,2.7004702 C5.91374248,2.7004702 4.78198468,3.83255652 4.78198468,5.22351806 L6.33589307,5.22351806 C6.33589307,4.68967004 6.77052748,4.25503562 7.30470402,4.25503562 C7.83920908,4.25503562 8.27351498,4.68967004 8.27351498,5.22351806 C8.27351498,5.75802312 7.83920908,6.19232901 7.30470402,6.19232901 L5.9801039,6.19232901 L5.9801039,8.54355994 L7.5343408,8.54355994 L7.5343408,7.73605322 Z" id="Combined-Shape"></path>
</g>
</g>
</svg>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 823 B

After

Width:  |  Height:  |  Size: 1.7 KiB

2
resources/themes/cura-light/styles.qml
View File

@ -309,6 +309,8 @@ QtObject {
}
Behavior on color { ColorAnimation { duration: 50; } }
border.width: (control.hasOwnProperty("needBorder") && control.needBorder) ? 2 : 0
border.color: Theme.getColor("tool_button_border")
UM.RecolorImage {
id: tool_button_arrow

64
resources/themes/cura-light/theme.json
View File

@ -17,6 +17,10 @@
"size": 1.15,
"family": "Open Sans"
},
"default_little_big": {
"size": 1.17,
"family": "Open Sans"
},
"default_bold": {
"size": 1.15,
"bold": true,
@ -54,7 +58,7 @@
"colors": {
"sidebar": [255, 255, 255, 255],
"lining": [127, 127, 127, 255],
"lining": [192, 193, 194, 255],
"viewport_overlay": [24, 41, 77, 192],
"primary": [12, 169, 227, 255],
@ -67,32 +71,32 @@
"topbar_button_text_inactive": [128, 128, 128, 255],
"topbar_button_text_hovered": [0, 0, 0, 255],
"text": [24, 41, 77, 255],
"text": [0, 0, 0, 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_subtext": [0, 0, 0, 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_bar": [31, 36, 39, 255],
"sidebar_header_active": [68, 72, 75, 255],
"sidebar_header_hover": [68, 72, 75, 255],
"sidebar_header_highlight": [68, 192, 255, 255],
"sidebar_header_highlight_hover": [68, 192, 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": [31, 36, 39, 255],
"button_hover": [68, 72, 75, 255],
"button_active": [68, 72, 75, 255],
"button_active_hover": [68, 72, 75, 255],
"button_text": [255, 255, 255, 255],
"button_text_hover": [255, 255, 255, 255],
"button_text_active": [255, 255, 255, 255],
@ -100,9 +104,9 @@
"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],
"button_tooltip": [31, 36, 39, 255],
"button_tooltip_border": [68, 192, 255, 255],
"button_tooltip_text": [192, 193, 194, 255],
"extruder_button_material_border": [255, 255, 255, 255],
@ -124,13 +128,13 @@
"tab_background": [245, 245, 245, 255],
"action_button": [255, 255, 255, 255],
"action_button_text": [24, 41, 77, 255],
"action_button_text": [0, 0, 0, 255],
"action_button_border": [127, 127, 127, 255],
"action_button_hovered": [255, 255, 255, 255],
"action_button_hovered_text": [24, 41, 77, 255],
"action_button_hovered_border": [12, 169, 227, 255],
"action_button_active": [12, 169, 227, 255],
"action_button_active_text": [255, 255, 255, 255],
"action_button_active": [255, 255, 255, 255],
"action_button_active_text": [0, 0, 0, 255],
"action_button_active_border": [12, 169, 227, 255],
"action_button_disabled": [245, 245, 245, 255],
"action_button_disabled_text": [127, 127, 127, 255],
@ -162,7 +166,7 @@
"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_text": [127, 127, 127, 255],
"setting_control_depth_line": [127, 127, 127, 255],
"setting_control_button": [127, 127, 127, 255],
"setting_control_button_hover": [70, 84, 113, 255],
@ -170,12 +174,14 @@
"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_background": [255, 66, 60, 255],
"setting_validation_error": [127, 127, 127, 255],
"setting_validation_warning_background": [255, 186, 15, 255],
"setting_validation_warning": [0, 0, 0, 255],
"setting_validation_warning_background": [255, 145, 62, 255],
"setting_validation_warning": [127, 127, 127, 255],
"setting_validation_ok": [255, 255, 255, 255],
"material_compatibility_warning": [0, 0, 0, 255],
"progressbar_background": [245, 245, 245, 255],
"progressbar_control": [24, 41, 77, 255],
@ -188,10 +194,10 @@
"checkbox": [255, 255, 255, 255],
"checkbox_hover": [255, 255, 255, 255],
"checkbox_border": [127, 127, 127, 255],
"checkbox_border": [64, 69, 72, 255],
"checkbox_border_hover": [12, 169, 227, 255],
"checkbox_mark": [24, 41, 77, 255],
"checkbox_text": [24, 41, 77, 255],
"checkbox_mark": [119, 122, 124, 255],
"checkbox_text": [166, 168, 169, 255],
"mode_switch": [255, 255, 255, 255],
"mode_switch_hover": [255, 255, 255, 255],
@ -202,9 +208,11 @@
"mode_switch_text_hover": [24, 41, 77, 255],
"mode_switch_text_checked": [12, 169, 227, 255],
"tooltip": [12, 169, 227, 255],
"tooltip": [68, 192, 255, 255],
"tooltip_text": [255, 255, 255, 255],
"tool_button_border": [39, 44, 48, 255],
"message_background": [24, 41, 77, 255],
"message_text": [255, 255, 255, 255],
"message_border": [24, 41, 77, 255],
@ -217,7 +225,7 @@
"message_progressbar_background": [255, 255, 255, 255],
"message_progressbar_control": [12, 169, 227, 255],
"tool_panel_background": [255, 255, 255, 255],
"tool_panel_background": [31, 36, 39, 255],
"status_offline": [0, 0, 0, 255],
"status_ready": [0, 205, 0, 255],
@ -274,7 +282,7 @@
"default_arrow": [0.8, 0.8],
"logo": [7.6, 1.6],
"extruder_button_material_margin": [0.50, 0.9],
"extruder_button_material_margin": [0.70, 0.9],
"extruder_button_material": [0.75, 0.75],
"sidebar": [35.0, 10.0],