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

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

Browse source
This commit is contained in:
Remco Burema 2019-10-15 10:46:46 +02:00
commit 26e578b059
36 changed files with 134 additions and 110 deletions
Download patch file Download diff file Expand all files Collapse all files

14
resources/qml/Dialogs/WorkspaceSummaryDialog.qml
View file

@ -148,8 +148,18 @@ UM.Dialog
{
height: childrenRect.height
width: parent.width
property string variantName: Cura.MachineManager.activeVariantNames[modelData] !== undefined ? Cura.MachineManager.activeVariantNames[modelData]: ""
property string materialName: Cura.MachineManager.getExtruder(modelData).material.name !== undefined ? Cura.MachineManager.getExtruder(modelData).material.name : ""
property string variantName:
{
var extruder = Cura.MachineManager.activeMachine.extruderList[modelData]
var variant_name = extruder.variant.name
return (variant_name !== undefined) ? variant_name : ""
}
property string materialName:
{
var extruder = Cura.MachineManager.activeMachine.extruderList[modelData]
var material_name = extruder.material.name
return (material_name !== undefined) ? material_name : ""
}
Label
{
text: {

5
resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml
View file

@ -221,6 +221,7 @@ Item
OldControls.CheckBox
{
id: enabledCheckbox
checked: Cura.MachineManager.activeStack != null ? Cura.MachineManager.activeStack.isEnabled : false
enabled: !checked || Cura.MachineManager.numberExtrudersEnabled > 1 //Disable if it's the last enabled extruder.
height: parent.height
@ -265,6 +266,7 @@ Item
text: Cura.MachineManager.activeStack !== null ? Cura.MachineManager.activeStack.material.name : ""
tooltip: text
enabled: enabledCheckbox.checked
width: selectors.controlWidth
height: parent.height
@ -324,7 +326,8 @@ Item
height: parent.height
width: selectors.controlWidth
style: UM.Theme.styles.print_setup_header_button
activeFocusOnPress: true;
activeFocusOnPress: true
enabled: enabledCheckbox.checked
menu: Cura.NozzleMenu { extruderIndex: Cura.ExtruderManager.activeExtruderIndex }
}

3
resources/qml/Menus/MaterialMenu.qml
View file

@ -50,6 +50,7 @@ Menu
{
text: model.brand + " " + model.name
checkable: true
enabled: Cura.MachineManager.activeMachine.extruderList[extruderIndex].isEnabled
checked: model.root_material_id === menu.currentRootMaterialId
onTriggered: Cura.MachineManager.setMaterial(extruderIndex, model.container_node)
exclusiveGroup: favoriteGroup // One favorite and one item from the others can be active at the same time.
@ -72,6 +73,7 @@ Menu
{
text: model.name
checkable: true
enabled: Cura.MachineManager.activeMachine.extruderList[extruderIndex].isEnabled
checked: model.root_material_id === menu.currentRootMaterialId
exclusiveGroup: group
onTriggered: Cura.MachineManager.setMaterial(extruderIndex, model.container_node)
@ -110,6 +112,7 @@ Menu
{
text: model.name
checkable: true
enabled: Cura.MachineManager.activeMachine.extruderList[extruderIndex].isEnabled
checked: model.id === menu.activeMaterialId
exclusiveGroup: group
onTriggered: Cura.MachineManager.setMaterial(extruderIndex, model.container_node)

7
resources/qml/Menus/NozzleMenu.qml
View file

@ -1,7 +1,7 @@
// Copyright (c) 2017 Ultimaker B.V.
// Cura is released under the terms of the LGPLv3 or higher.
import QtQuick 2.7
import QtQuick 2.10
import QtQuick.Controls 1.4
import UM 1.2 as UM
@ -28,10 +28,11 @@ Menu
text: model.hotend_name
checkable: true
checked: {
return Cura.MachineManager.activeVariantNames[extruderIndex] == model.hotend_name
var extruder = Cura.MachineManager.activeMachine.extruderList[extruderIndex]
return extruder.variant.name == model.hotend_name
}
exclusiveGroup: group
enabled: Cura.MachineManager.activeMachine.extruderList[extruderIndex].isEnabled
onTriggered: {
Cura.MachineManager.setVariant(menu.extruderIndex, model.container_node);
}

11
resources/qml/Preferences/Materials/MaterialsPage.qml
View file

@ -59,11 +59,14 @@ Item
onCurrentItemChanged:
{
forceActiveFocus()
materialDetailsPanel.currentItem = currentItem
// CURA-6679 If the current item is gone after the model update, reset the current item to the active material.
if (currentItem == null)
if(materialDetailsPanel.currentItem != currentItem)
{
resetExpandedActiveMaterial()
materialDetailsPanel.currentItem = currentItem
// CURA-6679 If the current item is gone after the model update, reset the current item to the active material.
if (currentItem == null)
{
resetExpandedActiveMaterial()
}
}
}

2
resources/qml/Preferences/Materials/MaterialsView.qml
View file

@ -17,7 +17,7 @@ TabView
property QtObject properties
property var currentMaterialNode: null
property bool editingEnabled: false;
property bool editingEnabled: false
property string currency: UM.Preferences.getValue("cura/currency") ? UM.Preferences.getValue("cura/currency") : "€"
property real firstColumnWidth: (width * 0.50) | 0
property real secondColumnWidth: (width * 0.40) | 0

4
resources/qml/Preferences/ProfilesPage.qml
View file

@ -531,8 +531,12 @@ Item
Label
{
anchors.left: parent.left
anchors.right: parent.right
text: base.currentItemDisplayName
font: UM.Theme.getFont("large_bold")
elide: Text.ElideRight
renderType: Text.NativeRendering
}
}

5
resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml
View file

@ -110,6 +110,11 @@ Item
resultSuffix += " (Experimental)"
}
if (Cura.MachineManager.isActiveQualityCustom)
{
result = resultMain
}
if (Cura.MachineManager.isActiveQualitySupported)
{
if (Cura.MachineManager.activeQualityLayerHeight > 0)