mirror of
https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura
synced 2025-05-17 20:26:40 +08:00
0a75c772ed
We created a new set of icons for Cura. These icons had to be reverted though because they weren't working out in the interface for the last release yet. This unreverts them, basically adding them back hoping that we'll get them fixed in time for the next release. Contributes to issue CURA-8342. Revert "Revert "Fix merge conflict"" This reverts commit bb20e3307f43edc1ff53cb154d2351ddfe39e158. Revert "Revert "Merge pull request #9716 from Ultimaker/CURA-8010_new_icons"" This reverts commit 70e4e9640e561e18a12870f30c905203ce8ccee7. Revert "Revert "Fix typo in icon name"" This reverts commit 38ce22ba7c3f40b971bc6e1e0a8e776ca9d51512. Revert "Revert "Add list for deprecated icons"" This reverts commit 119a957e7f978dbf1ddbcb3b0005bf38e8fed943. Revert "Revert "Add Function icon"" This reverts commit 760726cf0bb953bb1b0fc277b448f419d4bd2544. Revert "Revert "Switch out inherit icon"" This reverts commit 26afff609381e2004d194c280f504b6226859bd3. Revert "Revert "Merge branch 'CURA-8205_Introduce_new_icons_in_Cura' of github.com:Ultimaker/Cura"" This reverts commit 6483db3d47ee052c1a966cdee3af7190577a5769. Revert "Fix incorrect icons" This reverts commit 02a4ade2a50a943ff36fd4895bdc9261cf2133eb.
419 lines
16 KiB
QML
419 lines
16 KiB
QML
// Copyright (c) 2019 Ultimaker B.V.
|
|
// Cura is released under the terms of the LGPLv3 or higher.
|
|
|
|
import QtQuick 2.6
|
|
import QtQuick.Controls 2.0
|
|
import QtQuick.Controls 1.1 as OldControls
|
|
|
|
import Cura 1.0 as Cura
|
|
import UM 1.3 as UM
|
|
|
|
Item
|
|
{
|
|
UM.I18nCatalog
|
|
{
|
|
id: catalog
|
|
name: "cura"
|
|
}
|
|
|
|
width: parent.width
|
|
height: childrenRect.height
|
|
|
|
Label
|
|
{
|
|
id: header
|
|
text: catalog.i18nc("@header", "Custom")
|
|
font: UM.Theme.getFont("medium")
|
|
color: UM.Theme.getColor("small_button_text")
|
|
height: contentHeight
|
|
renderType: Text.NativeRendering
|
|
|
|
anchors
|
|
{
|
|
top: parent.top
|
|
left: parent.left
|
|
right: parent.right
|
|
}
|
|
}
|
|
|
|
//Printer type selector.
|
|
Item
|
|
{
|
|
id: printerTypeSelectorRow
|
|
visible:
|
|
{
|
|
return Cura.MachineManager.printerOutputDevices.length >= 1 //If connected...
|
|
&& Cura.MachineManager.printerOutputDevices[0].connectedPrintersTypeCount != null //...and we have configuration information...
|
|
&& Cura.MachineManager.printerOutputDevices[0].connectedPrintersTypeCount.length > 1; //...and there is more than one type of printer in the configuration list.
|
|
}
|
|
height: visible ? childrenRect.height : 0
|
|
|
|
anchors
|
|
{
|
|
left: parent.left
|
|
right: parent.right
|
|
top: header.bottom
|
|
topMargin: visible ? UM.Theme.getSize("default_margin").height : 0
|
|
}
|
|
|
|
Label
|
|
{
|
|
text: catalog.i18nc("@label", "Printer")
|
|
width: Math.round(parent.width * 0.3) - UM.Theme.getSize("default_margin").width
|
|
height: contentHeight
|
|
font: UM.Theme.getFont("default")
|
|
color: UM.Theme.getColor("text")
|
|
anchors.verticalCenter: printerTypeSelector.verticalCenter
|
|
anchors.left: parent.left
|
|
}
|
|
|
|
OldControls.ToolButton
|
|
{
|
|
id: printerTypeSelector
|
|
text: Cura.MachineManager.activeMachine !== null ? Cura.MachineManager.activeMachine.definition.name: ""
|
|
tooltip: text
|
|
height: UM.Theme.getSize("print_setup_big_item").height
|
|
width: Math.round(parent.width * 0.7) + UM.Theme.getSize("default_margin").width
|
|
anchors.right: parent.right
|
|
style: UM.Theme.styles.print_setup_header_button
|
|
|
|
menu: Cura.PrinterTypeMenu { }
|
|
}
|
|
}
|
|
|
|
UM.TabRow
|
|
{
|
|
id: tabBar
|
|
anchors.top: printerTypeSelectorRow.bottom
|
|
anchors.topMargin: UM.Theme.getSize("default_margin").height
|
|
visible: extrudersModel.count > 1
|
|
|
|
Repeater
|
|
{
|
|
id: repeater
|
|
model: extrudersModel
|
|
delegate: UM.TabRowButton
|
|
{
|
|
contentItem: Item
|
|
{
|
|
Cura.ExtruderIcon
|
|
{
|
|
anchors.horizontalCenter: parent.horizontalCenter
|
|
materialColor: model.color
|
|
extruderEnabled: model.enabled
|
|
width: parent.height
|
|
height: parent.height
|
|
}
|
|
}
|
|
onClicked:
|
|
{
|
|
Cura.ExtruderManager.setActiveExtruderIndex(tabBar.currentIndex)
|
|
}
|
|
}
|
|
}
|
|
|
|
//When active extruder changes for some other reason, switch tabs.
|
|
//Don't directly link currentIndex to Cura.ExtruderManager.activeExtruderIndex!
|
|
//This causes a segfault in Qt 5.11. Something with VisualItemModel removing index -1. We have to use setCurrentIndex instead.
|
|
Connections
|
|
{
|
|
target: Cura.ExtruderManager
|
|
function onActiveExtruderChanged()
|
|
{
|
|
tabBar.setCurrentIndex(Cura.ExtruderManager.activeExtruderIndex);
|
|
}
|
|
}
|
|
|
|
// Can't use 'item: ...activeExtruderIndex' directly apparently, see also the comment on the previous block.
|
|
onVisibleChanged:
|
|
{
|
|
if (tabBar.visible)
|
|
{
|
|
tabBar.setCurrentIndex(Cura.ExtruderManager.activeExtruderIndex);
|
|
}
|
|
}
|
|
|
|
//When the model of the extruders is rebuilt, the list of extruders is briefly emptied and rebuilt.
|
|
//This causes the currentIndex of the tab to be in an invalid position which resets it to 0.
|
|
//Therefore we need to change it back to what it was: The active extruder index.
|
|
Connections
|
|
{
|
|
target: repeater.model
|
|
function onModelChanged()
|
|
{
|
|
tabBar.setCurrentIndex(Cura.ExtruderManager.activeExtruderIndex)
|
|
}
|
|
}
|
|
}
|
|
|
|
Rectangle
|
|
{
|
|
width: parent.width
|
|
height: childrenRect.height
|
|
anchors.top: tabBar.bottom
|
|
|
|
radius: tabBar.visible ? UM.Theme.getSize("default_radius").width : 0
|
|
border.width: tabBar.visible ? UM.Theme.getSize("default_lining").width : 0
|
|
border.color: UM.Theme.getColor("lining")
|
|
color: UM.Theme.getColor("main_background")
|
|
|
|
//Remove rounding and lining at the top.
|
|
Rectangle
|
|
{
|
|
width: parent.width
|
|
height: parent.radius
|
|
anchors.top: parent.top
|
|
color: UM.Theme.getColor("lining")
|
|
visible: tabBar.visible
|
|
Rectangle
|
|
{
|
|
anchors
|
|
{
|
|
left: parent.left
|
|
leftMargin: parent.parent.border.width
|
|
right: parent.right
|
|
rightMargin: parent.parent.border.width
|
|
top: parent.top
|
|
}
|
|
height: parent.parent.radius
|
|
color: parent.parent.color
|
|
}
|
|
}
|
|
|
|
Column
|
|
{
|
|
id: selectors
|
|
padding: UM.Theme.getSize("default_margin").width
|
|
spacing: UM.Theme.getSize("default_margin").height
|
|
|
|
property var model: extrudersModel.items[tabBar.currentIndex]
|
|
|
|
readonly property real paddedWidth: parent.width - padding * 2
|
|
property real textWidth: Math.round(paddedWidth * 0.3)
|
|
property real controlWidth:
|
|
{
|
|
if(instructionLink == "")
|
|
{
|
|
return paddedWidth - textWidth
|
|
}
|
|
else
|
|
{
|
|
return paddedWidth - textWidth - UM.Theme.getSize("print_setup_big_item").height * 0.5 - UM.Theme.getSize("default_margin").width
|
|
}
|
|
}
|
|
property string instructionLink: Cura.MachineManager.activeStack != null ? Cura.ContainerManager.getContainerMetaDataEntry(Cura.MachineManager.activeStack.material.id, "instruction_link", ""): ""
|
|
|
|
Row
|
|
{
|
|
height: visible ? UM.Theme.getSize("setting_control").height : 0
|
|
visible: extrudersModel.count > 1 // If there is only one extruder, there is no point to enable/disable that.
|
|
|
|
Label
|
|
{
|
|
text: catalog.i18nc("@label", "Enabled")
|
|
verticalAlignment: Text.AlignVCenter
|
|
font: UM.Theme.getFont("default")
|
|
color: UM.Theme.getColor("text")
|
|
height: parent.height
|
|
width: selectors.textWidth
|
|
renderType: Text.NativeRendering
|
|
}
|
|
|
|
OldControls.CheckBox
|
|
{
|
|
id: enabledCheckbox
|
|
enabled: !checked || Cura.MachineManager.numberExtrudersEnabled > 1 //Disable if it's the last enabled extruder.
|
|
height: parent.height
|
|
style: UM.Theme.styles.checkbox
|
|
|
|
Binding
|
|
{
|
|
target: enabledCheckbox
|
|
property: "checked"
|
|
value: Cura.MachineManager.activeStack.isEnabled
|
|
when: Cura.MachineManager.activeStack != null
|
|
}
|
|
|
|
/* Use a MouseArea to process the click on this checkbox.
|
|
This is necessary because actually clicking the checkbox
|
|
causes the "checked" property to be overwritten. After
|
|
it's been overwritten, the original link that made it
|
|
depend on the active extruder stack is broken. */
|
|
MouseArea
|
|
{
|
|
anchors.fill: parent
|
|
onClicked:
|
|
{
|
|
if(!parent.enabled)
|
|
{
|
|
return
|
|
}
|
|
// Already update the visual indication
|
|
parent.checked = !parent.checked
|
|
// Update the settings on the background!
|
|
Cura.MachineManager.setExtruderEnabled(Cura.ExtruderManager.activeExtruderIndex, parent.checked)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
Row
|
|
{
|
|
height: visible ? UM.Theme.getSize("print_setup_big_item").height : 0
|
|
visible: Cura.MachineManager.activeMachine ? Cura.MachineManager.activeMachine.hasMaterials : false
|
|
|
|
Label
|
|
{
|
|
text: catalog.i18nc("@label", "Material")
|
|
verticalAlignment: Text.AlignVCenter
|
|
font: UM.Theme.getFont("default")
|
|
color: UM.Theme.getColor("text")
|
|
height: parent.height
|
|
width: selectors.textWidth
|
|
renderType: Text.NativeRendering
|
|
}
|
|
|
|
OldControls.ToolButton
|
|
{
|
|
id: materialSelection
|
|
|
|
property bool valueError: Cura.MachineManager.activeStack !== null ? Cura.ContainerManager.getContainerMetaDataEntry(Cura.MachineManager.activeStack.material.id, "compatible", "") !== "True" : true
|
|
property bool valueWarning: !Cura.MachineManager.isActiveQualitySupported
|
|
|
|
text: Cura.MachineManager.activeStack !== null ? Cura.MachineManager.activeStack.material.name : ""
|
|
tooltip: text
|
|
enabled: enabledCheckbox.checked
|
|
|
|
width: selectors.controlWidth
|
|
height: parent.height
|
|
|
|
style: UM.Theme.styles.print_setup_header_button
|
|
activeFocusOnPress: true
|
|
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
|
|
height: instructionButton.visible ? materialSelection.height: 0
|
|
Button
|
|
{
|
|
id: instructionButton
|
|
hoverEnabled: true
|
|
contentItem: Item {}
|
|
height: 0.5 * materialSelection.height
|
|
width: height
|
|
anchors.centerIn: parent
|
|
background: UM.RecolorImage
|
|
{
|
|
source: UM.Theme.getIcon("Guide")
|
|
color: instructionButton.hovered ? UM.Theme.getColor("primary") : UM.Theme.getColor("icon")
|
|
}
|
|
visible: selectors.instructionLink != ""
|
|
onClicked:Qt.openUrlExternally(selectors.instructionLink)
|
|
}
|
|
}
|
|
}
|
|
|
|
Row
|
|
{
|
|
height: visible ? UM.Theme.getSize("print_setup_big_item").height : 0
|
|
visible: Cura.MachineManager.activeMachine ? Cura.MachineManager.activeMachine.hasVariants : false
|
|
|
|
Label
|
|
{
|
|
text: Cura.MachineManager.activeDefinitionVariantsName
|
|
verticalAlignment: Text.AlignVCenter
|
|
font: UM.Theme.getFont("default")
|
|
color: UM.Theme.getColor("text")
|
|
height: parent.height
|
|
width: selectors.textWidth
|
|
renderType: Text.NativeRendering
|
|
}
|
|
|
|
OldControls.ToolButton
|
|
{
|
|
id: variantSelection
|
|
text: Cura.MachineManager.activeStack != null ? Cura.MachineManager.activeStack.variant.name : ""
|
|
tooltip: text
|
|
height: parent.height
|
|
width: selectors.controlWidth
|
|
style: UM.Theme.styles.print_setup_header_button
|
|
activeFocusOnPress: true
|
|
enabled: enabledCheckbox.checked
|
|
|
|
Cura.NozzleMenu
|
|
{
|
|
id: nozzlesMenu
|
|
extruderIndex: Cura.ExtruderManager.activeExtruderIndex
|
|
}
|
|
onClicked:
|
|
{
|
|
nozzlesMenu.popup();
|
|
}
|
|
}
|
|
}
|
|
|
|
Row
|
|
{
|
|
id: warnings
|
|
height: visible ? childrenRect.height : 0
|
|
visible: buildplateCompatibilityError || buildplateCompatibilityWarning
|
|
|
|
property bool buildplateCompatibilityError: !Cura.MachineManager.variantBuildplateCompatible && !Cura.MachineManager.variantBuildplateUsable
|
|
property bool buildplateCompatibilityWarning: Cura.MachineManager.variantBuildplateUsable
|
|
|
|
// This is a space holder aligning the warning messages.
|
|
Label
|
|
{
|
|
text: ""
|
|
width: selectors.textWidth
|
|
renderType: Text.NativeRendering
|
|
}
|
|
|
|
Item
|
|
{
|
|
width: selectors.controlWidth
|
|
height: childrenRect.height
|
|
|
|
UM.RecolorImage
|
|
{
|
|
id: warningImage
|
|
anchors.left: parent.left
|
|
source: UM.Theme.getIcon("Warning")
|
|
width: UM.Theme.getSize("section_icon").width
|
|
height: UM.Theme.getSize("section_icon").height
|
|
sourceSize.width: width
|
|
sourceSize.height: height
|
|
color: UM.Theme.getColor("material_compatibility_warning")
|
|
visible: !Cura.MachineManager.isCurrentSetupSupported || warnings.buildplateCompatibilityError || warnings.buildplateCompatibilityWarning
|
|
}
|
|
|
|
Label
|
|
{
|
|
id: materialCompatibilityLabel
|
|
anchors.left: warningImage.right
|
|
anchors.leftMargin: UM.Theme.getSize("default_margin").width
|
|
verticalAlignment: Text.AlignVCenter
|
|
width: selectors.controlWidth - warningImage.width - UM.Theme.getSize("default_margin").width
|
|
text: catalog.i18nc("@label", "Use glue for better adhesion with this material combination.")
|
|
font: UM.Theme.getFont("default")
|
|
color: UM.Theme.getColor("text")
|
|
visible: CuraSDKVersion == "dev" ? false : warnings.buildplateCompatibilityError || warnings.buildplateCompatibilityWarning
|
|
wrapMode: Text.WordWrap
|
|
renderType: Text.NativeRendering
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|