3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-24 07:03:56 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

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

Browse source
This commit is contained in:
Tim Kuipers 2016-07-07 15:18:57 +02:00
commit 7fc37e7a74
19 changed files with 205 additions and 108 deletions
Download patch file Download diff file Expand all files Collapse all files

2
resources/definitions/fdmprinter.def.json
View file

@ -455,7 +455,7 @@
},
"skin_line_width":
{
"label": "Top/bottom Line Width",
"label": "Top/Bottom Line Width",
"description": "Width of a single top/bottom line.",
"unit": "mm",
"minimum_value": "0.0001",

2
resources/definitions/ultimaker2_extended.def.json
View file

@ -16,7 +16,7 @@
"overrides": {
"machine_height": {
"default_value": 315
"default_value": 305
}
}
}

2
resources/definitions/ultimaker2_extended_plus.def.json
View file

@ -15,7 +15,7 @@
"overrides": {
"machine_height": {
"default_value": 313
"default_value": 305
},
"machine_show_variants": {
"default_value": true

2
resources/materials/generic_abs.xml.fdm_material
View file

@ -9,7 +9,7 @@ Generic PLA profile. Serves as an example file, data in this file is not correct
<material>ABS</material>
<color>Generic</color>
</name>
<GUID>506c9f0d-e3aa-4bd4-b2d2-23e2425b1aa9</GUID>
<GUID>60636bb4-518f-42e7-8237-fe77b194ebe0</GUID>
<version>0</version>
<color_code>#FF0000</color_code>
</metadata>

2
resources/materials/generic_cpe.xml.fdm_material
View file

@ -9,7 +9,7 @@ Generic PLA profile. Serves as an example file, data in this file is not correct
<material>CPE</material>
<color>Generic</color>
</name>
<GUID>506c9f0d-e3aa-4bd4-b2d2-23e2425b1aa9</GUID>
<GUID>12f41353-1a33-415e-8b4f-a775a6c70cc6</GUID>
<version>0</version>
<color_code>#0000FF</color_code>
</metadata>

2
resources/qml/MonitorButton.qml
View file

@ -24,7 +24,7 @@ Rectangle
return UM.Theme.getColor("status_offline")
else if(Cura.MachineManager.printerOutputDevices[0].jobState == "printing" || Cura.MachineManager.printerOutputDevices[0].jobState == "pre_print")
return UM.Theme.getColor("status_busy")
else if(Cura.MachineManager.printerOutputDevices[0].jobState == "ready")
else if(Cura.MachineManager.printerOutputDevices[0].jobState == "ready" || Cura.MachineManager.printerOutputDevices[0].jobState == "")
return UM.Theme.getColor("status_ready")
else if(Cura.MachineManager.printerOutputDevices[0].jobState == "paused")
return UM.Theme.getColor("status_paused")

2
resources/qml/Sidebar.qml
View file

@ -103,7 +103,7 @@ Rectangle
return UM.Theme.getIcon("tab_monitor")
else if(Cura.MachineManager.printerOutputDevices[0].jobState == "printing" || Cura.MachineManager.printerOutputDevices[0].jobState == "pre_print")
return UM.Theme.getIcon("tab_monitor_busy")
else if(Cura.MachineManager.printerOutputDevices[0].jobState == "ready")
else if(Cura.MachineManager.printerOutputDevices[0].jobState == "ready" || Cura.MachineManager.printerOutputDevices[0].jobState == "")
return UM.Theme.getIcon("tab_monitor_connected")
else if(Cura.MachineManager.printerOutputDevices[0].jobState == "paused")
return UM.Theme.getIcon("tab_monitor_paused")

4
resources/qml/SidebarHeader.qml
View file

@ -13,7 +13,7 @@ Column
id: base;
property int totalHeightHeader: childrenRect.height
property int currentExtruderIndex: -1;
property int currentExtruderIndex:ExtruderManager.activeExtruderIndex;
spacing: UM.Theme.getSize("default_margin").height
@ -118,7 +118,7 @@ Column
{
base.currentExtruderIndex = -1;
forceActiveFocus()
ExtruderManager.setActiveExtruderIndex(0);
ExtruderManager.setActiveExtruderIndex(base.currentExtruderIndex);
}
}