3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-16 11:17:49 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Improved layout, removed material name from extruder name. CURA-2763

Browse source
This commit is contained in:
Jack Ha 2016-12-06 16:11:08 +01:00
parent b120cba148
commit 3efc5d63ef
7 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cura/Settings/ExtrudersModel.py
View file

@ -140,8 +140,6 @@ class ExtrudersModel(UM.Qt.ListModel.ListModel):
for extruder in manager.getMachineExtruders(global_container_stack.getId()):
extruder_name = extruder.getName()
material = extruder.findContainer({ "type": "material" })
if material and not self._simple_names:
extruder_name = "%s (%s)" % (material.getName(), extruder_name)
position = extruder.getMetaDataEntry("position", default = "0") # Get the position
try:
position = int(position)

2
resources/extruders/ultimaker3_extended_extruder_left.def.json
View file

@ -1,7 +1,7 @@
{
"id": "ultimaker3_extended_extruder_left",
"version": 2,
"name": "Print core 1",
"name": "Extruder 1",
"inherits": "fdmextruder",
"metadata": {
"machine": "ultimaker3_extended",

2
resources/extruders/ultimaker3_extended_extruder_right.def.json
View file

@ -1,7 +1,7 @@
{
"id": "ultimaker3_extended_extruder_right",
"version": 2,
"name": "Print core 2",
"name": "Extruder 2",
"inherits": "fdmextruder",
"metadata": {
"machine": "ultimaker3_extended",

2
resources/extruders/ultimaker3_extruder_left.def.json
View file

@ -1,7 +1,7 @@
{
"id": "ultimaker3_extruder_left",
"version": 2,
"name": "Print core 1",
"name": "Extruder 1",
"inherits": "fdmextruder",
"metadata": {
"machine": "ultimaker3",

2
resources/extruders/ultimaker3_extruder_right.def.json
View file

@ -1,7 +1,7 @@
{
"id": "ultimaker3_extruder_right",
"version": 2,
"name": "Print core 2",
"name": "Extruder 2",
"inherits": "fdmextruder",
"metadata": {
"machine": "ultimaker3",

2
resources/qml/SidebarHeader.qml
View file

@ -65,6 +65,7 @@ Column
{
id: extruderSelectionRow
height: UM.Theme.getSize("sidebar_tabs").height
visible: machineExtruderCount.properties.value > 1 && !sidebar.monitoringPrint
anchors
{
@ -86,7 +87,6 @@ Column
id: extrudersList
property var index: 0
visible: machineExtruderCount.properties.value > 1 && !sidebar.monitoringPrint
height: UM.Theme.getSize("sidebar_header_mode_tabs").height
boundsBehavior: Flickable.StopAtBounds

2
resources/themes/cura/theme.json
View file

@ -210,7 +210,7 @@
"sidebar_header_mode_tabs": [0.0, 3.0],
"sidebar_lining": [0.5, 0.5],
"sidebar_setup": [0.0, 2.0],
"sidebar_tabs": [0.0, 4.0],
"sidebar_tabs": [0.0, 3.5],
"sidebar_inputfields": [0.0, 2.0],
"simple_mode_infill_caption": [0.0, 5.0],
"simple_mode_infill_height": [0.0, 8.0],