3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-11-28 05:11:04 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Merge branch 'master' into feature_extruder_warning_icon

Browse source 
# Conflicts:
#	resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml
This commit is contained in:
fieldOfView 2021-07-26 14:12:30 +02:00
commit 9c05d990ea
4471 changed files with 152594 additions and 22537 deletions
Download patch file Download diff file Expand all files Collapse all files

4
resources/qml/Menus/ConfigurationMenu/ConfigurationItem.qml
View file

@ -93,7 +93,7 @@ Button
id: icon
anchors.verticalCenter: unknownMaterialMessage.verticalCenter
source: UM.Theme.getIcon("warning")
source: UM.Theme.getIcon("Warning")
color: UM.Theme.getColor("warning")
width: UM.Theme.getSize("section_icon").width
height: width
@ -219,7 +219,7 @@ Button
Connections
{
target: Cura.MachineManager
onCurrentConfigurationChanged:
function onCurrentConfigurationChanged()
{
configurationItem.checked = Cura.MachineManager.matchesConfiguration(configuration)
}

6
resources/qml/Menus/ConfigurationMenu/ConfigurationListView.qml
View file

@ -39,7 +39,7 @@ Item
anchors.left: parent.left
anchors.verticalCenter: label.verticalCenter
source: UM.Theme.getIcon("warning")
source: UM.Theme.getIcon("Warning")
color: UM.Theme.getColor("warning")
width: UM.Theme.getSize("section_icon").width
height: width
@ -126,7 +126,7 @@ Item
Connections
{
target: outputDevice
onUniqueConfigurationsChanged:
function onUniqueConfigurationsChanged()
{
forceModelUpdate()
}
@ -135,7 +135,7 @@ Item
Connections
{
target: Cura.MachineManager
onOutputDevicesChanged:
function onOutputDevicesChanged()
{
forceModelUpdate()
}

103
resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml
View file

@ -56,8 +56,7 @@ Cura.ExpandablePopup
id: extruderIcon
materialColor: model.color
extruderEnabled: model.enabled
height: parent.height
width: height
anchors.verticalCenter: parent.verticalCenter
}
// Warning icon that indicates if no qualities are available for the variant/material combination for this extruder
@ -81,47 +80,73 @@ Cura.ExpandablePopup
height: width
}
// Label for the brand of the material
Label
ColumnLayout
{
id: typeAndBrandNameLabel
text: model.material_brand + " " + model.material
elide: Text.ElideRight
font: UM.Theme.getFont("default")
color: UM.Theme.getColor("text")
renderType: Text.NativeRendering
opacity: model.enabled ? 1 : UM.Theme.getColor("extruder_disabled").a
spacing: 0
anchors
{
top: extruderIcon.top
left: configurationWarning.right
left: configurationWarning.visible ? configurationWarning.right : extruderIcon.right
leftMargin: UM.Theme.getSize("default_margin").width
right: parent.right
rightMargin: UM.Theme.getSize("default_margin").width
}
}
// Label that shows the name of the variant
Label
{
id: variantLabel
visible: Cura.MachineManager.activeMachine ? Cura.MachineManager.activeMachine.hasVariants : false
text: model.variant
elide: Text.ElideRight
font: UM.Theme.getFont("default_bold")
color: UM.Theme.getColor("text")
renderType: Text.NativeRendering
anchors
{
left: configurationWarning.right
leftMargin: UM.Theme.getSize("default_margin").width
top: typeAndBrandNameLabel.bottom
verticalCenter: parent.verticalCenter
right: parent.right
rightMargin: UM.Theme.getSize("default_margin").width
}
// Label for the brand of the material
Label
{
id: materialBrandColorTypeLabel
text: model.material_brand == model.color_name ? model.color_name + " " + model.material_type : model.material_brand + " " + model.color_name + " " + model.material_type
elide: Text.ElideRight
font: UM.Theme.getFont("default")
color: UM.Theme.getColor("text")
renderType: Text.NativeRendering
width: parent.width
visible: !truncated
}
Label
{
id: materialColorTypeLabel
text: model.color_name + " " + model.material_type
elide: Text.ElideRight
font: UM.Theme.getFont("default")
color: UM.Theme.getColor("text")
renderType: Text.NativeRendering
width: parent.width
visible: !materialBrandColorTypeLabel.visible && !truncated
}
Label
{
id: materialTypeLabel
text: model.material_type
elide: Text.ElideRight
font: UM.Theme.getFont("default")
color: UM.Theme.getColor("text")
renderType: Text.NativeRendering
width: parent.width
visible: !materialBrandColorTypeLabel.visible && !materialColorTypeLabel.visible
}
// Label that shows the name of the variant
Label
{
id: variantLabel
visible: Cura.MachineManager.activeMachine ? Cura.MachineManager.activeMachine.hasVariants : false
text: model.variant
elide: Text.ElideRight
font: UM.Theme.getFont("default_bold")
color: UM.Theme.getColor("text")
renderType: Text.NativeRendering
width: parent.width
}
}
}
}
@ -227,7 +252,7 @@ Cura.ExpandablePopup
anchors.right: parent.right
iconSource: UM.Theme.getIcon("arrow_right")
iconSource: UM.Theme.getIcon("ChevronSingleRight")
isIconOnRightSide: true
onClicked:
@ -243,7 +268,7 @@ Cura.ExpandablePopup
visible: popupItem.configuration_method == ConfigurationMenu.ConfigurationMethod.Custom
text: catalog.i18nc("@label", "Configurations")
iconSource: UM.Theme.getIcon("arrow_left")
iconSource: UM.Theme.getIcon("ChevronSingleLeft")
onClicked:
{
@ -257,6 +282,6 @@ Cura.ExpandablePopup
Connections
{
target: Cura.MachineManager
onGlobalContainerChanged: popupItem.manual_selected_method = -1 // When switching printers, reset the value of the manual selected method
function onGlobalContainerChanged() { popupItem.manual_selected_method = -1 } // When switching printers, reset the value of the manual selected method
}
}

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

@ -118,7 +118,7 @@ Item
Connections
{
target: Cura.ExtruderManager
onActiveExtruderChanged:
function onActiveExtruderChanged()
{
tabBar.setCurrentIndex(Cura.ExtruderManager.activeExtruderIndex);
}
@ -139,7 +139,7 @@ Item
Connections
{
target: repeater.model
onModelChanged:
function onModelChanged()
{
tabBar.setCurrentIndex(Cura.ExtruderManager.activeExtruderIndex)
}
@ -289,27 +289,32 @@ Item
style: UM.Theme.styles.print_setup_header_button
activeFocusOnPress: true
menu: Cura.MaterialMenu
Cura.MaterialMenu
{
id: materialsMenu
extruderIndex: Cura.ExtruderManager.activeExtruderIndex
updateModels: materialSelection.visible
}
onClicked:
{
materialsMenu.popup();
}
}
Item
{
width: instructionButton.width + 2 * UM.Theme.getSize("default_margin").width
width: instructionButton.width + 2 * UM.Theme.getSize("narrow_margin").width
height: instructionButton.visible ? materialSelection.height: 0
Button
{
id: instructionButton
hoverEnabled: true
contentItem: Item {}
height: 0.5 * materialSelection.height
width: height
height: UM.Theme.getSize("small_button").height
width: UM.Theme.getSize("small_button").width
anchors.centerIn: parent
background: UM.RecolorImage
{
source: UM.Theme.getIcon("printing_guideline")
source: UM.Theme.getIcon("Guide")
color: instructionButton.hovered ? UM.Theme.getColor("primary") : UM.Theme.getColor("icon")
}
visible: selectors.instructionLink != ""
@ -345,7 +350,15 @@ Item
activeFocusOnPress: true
enabled: enabledCheckbox.checked
menu: Cura.NozzleMenu { extruderIndex: Cura.ExtruderManager.activeExtruderIndex }
Cura.NozzleMenu
{
id: nozzlesMenu
extruderIndex: Cura.ExtruderManager.activeExtruderIndex
}
onClicked:
{
nozzlesMenu.popup();
}
}
}
@ -375,7 +388,7 @@ Item
{
id: warningImage
anchors.left: parent.left
source: UM.Theme.getIcon("warning")
source: UM.Theme.getIcon("Warning")
width: UM.Theme.getSize("section_icon").width
height: UM.Theme.getSize("section_icon").height
sourceSize.width: width