mirror of
https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura
synced 2025-05-02 08:44:25 +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.
476 lines
18 KiB
QML
476 lines
18 KiB
QML
// Copyright (c) 2021 Ultimaker B.V.
|
|
// Uranium is released under the terms of the LGPLv3 or higher.
|
|
|
|
import QtQuick 2.2
|
|
import QtQuick.Controls 1.2
|
|
import QtQuick.Controls.Styles 1.2
|
|
|
|
import UM 1.2 as UM
|
|
import Cura 1.0 as Cura
|
|
import ".."
|
|
|
|
|
|
Item
|
|
{
|
|
id: base
|
|
width: childrenRect.width
|
|
height: childrenRect.height
|
|
property var allCategoriesExceptSupport: [ "machine_settings", "resolution", "shell", "infill", "material", "speed",
|
|
"travel", "cooling", "platform_adhesion", "dual", "meshfix", "blackmagic", "experimental"]
|
|
|
|
readonly property string normalMeshType: ""
|
|
readonly property string supportMeshType: "support_mesh"
|
|
readonly property string cuttingMeshType: "cutting_mesh"
|
|
readonly property string infillMeshType: "infill_mesh"
|
|
readonly property string antiOverhangMeshType: "anti_overhang_mesh"
|
|
|
|
property var currentMeshType: UM.ActiveTool.properties.getValue("MeshType")
|
|
|
|
// Update the view every time the currentMeshType changes
|
|
onCurrentMeshTypeChanged:
|
|
{
|
|
var type = currentMeshType
|
|
|
|
// set checked state of mesh type buttons
|
|
updateMeshTypeCheckedState(type)
|
|
|
|
// update active type label
|
|
for (var button in meshTypeButtons.children)
|
|
{
|
|
if (meshTypeButtons.children[button].checked)
|
|
{
|
|
meshTypeLabel.text = catalog.i18nc("@label", "Mesh Type") + ": " + meshTypeButtons.children[button].text
|
|
break
|
|
}
|
|
}
|
|
visibility_handler.addSkipResetSetting(currentMeshType)
|
|
}
|
|
|
|
function updateMeshTypeCheckedState(type)
|
|
{
|
|
// set checked state of mesh type buttons
|
|
normalButton.checked = type === normalMeshType
|
|
supportMeshButton.checked = type === supportMeshType
|
|
overlapMeshButton.checked = type === infillMeshType || type === cuttingMeshType
|
|
antiOverhangMeshButton.checked = type === antiOverhangMeshType
|
|
}
|
|
|
|
function setMeshType(type)
|
|
{
|
|
UM.ActiveTool.setProperty("MeshType", type)
|
|
updateMeshTypeCheckedState(type)
|
|
}
|
|
|
|
UM.I18nCatalog { id: catalog; name: "cura"}
|
|
|
|
Column
|
|
{
|
|
id: items
|
|
anchors.top: parent.top;
|
|
anchors.left: parent.left;
|
|
|
|
spacing: UM.Theme.getSize("default_margin").height
|
|
|
|
Row // Mesh type buttons
|
|
{
|
|
id: meshTypeButtons
|
|
spacing: UM.Theme.getSize("default_margin").width
|
|
|
|
Button
|
|
{
|
|
id: normalButton
|
|
text: catalog.i18nc("@label", "Normal model")
|
|
iconSource: UM.Theme.getIcon("Infill0");
|
|
property bool needBorder: true
|
|
checkable: true
|
|
onClicked: setMeshType(normalMeshType);
|
|
style: UM.Theme.styles.tool_button;
|
|
z: 4
|
|
}
|
|
|
|
Button
|
|
{
|
|
id: supportMeshButton
|
|
text: catalog.i18nc("@label", "Print as support")
|
|
iconSource: UM.Theme.getIcon("MeshTypeSupport");
|
|
property bool needBorder: true
|
|
checkable:true
|
|
onClicked: setMeshType(supportMeshType)
|
|
style: UM.Theme.styles.tool_button;
|
|
z: 3
|
|
}
|
|
|
|
Button
|
|
{
|
|
id: overlapMeshButton
|
|
text: catalog.i18nc("@label", "Modify settings for overlaps")
|
|
iconSource: UM.Theme.getIcon("MeshTypeIntersect");
|
|
property bool needBorder: true
|
|
checkable:true
|
|
onClicked: setMeshType(infillMeshType)
|
|
style: UM.Theme.styles.tool_button;
|
|
z: 2
|
|
}
|
|
|
|
Button
|
|
{
|
|
id: antiOverhangMeshButton
|
|
text: catalog.i18nc("@label", "Don't support overlaps")
|
|
iconSource: UM.Theme.getIcon("BlockSupportOverlaps");
|
|
property bool needBorder: true
|
|
checkable: true
|
|
onClicked: setMeshType(antiOverhangMeshType)
|
|
style: UM.Theme.styles.tool_button;
|
|
z: 1
|
|
}
|
|
|
|
}
|
|
|
|
Label
|
|
{
|
|
id: meshTypeLabel
|
|
font: UM.Theme.getFont("default")
|
|
color: UM.Theme.getColor("text")
|
|
height: UM.Theme.getSize("setting").height
|
|
verticalAlignment: Text.AlignVCenter
|
|
}
|
|
|
|
|
|
Cura.ComboBox
|
|
{
|
|
id: infillOnlyComboBox
|
|
width: parent.width / 2 - UM.Theme.getSize("default_margin").width
|
|
height: UM.Theme.getSize("setting_control").height
|
|
textRole: "text"
|
|
|
|
model: ListModel
|
|
{
|
|
id: infillOnlyComboBoxModel
|
|
|
|
Component.onCompleted: {
|
|
append({ text: catalog.i18nc("@item:inlistbox", "Infill mesh only") })
|
|
append({ text: catalog.i18nc("@item:inlistbox", "Cutting mesh") })
|
|
}
|
|
}
|
|
|
|
visible: currentMeshType === infillMeshType || currentMeshType === cuttingMeshType
|
|
|
|
|
|
onActivated:
|
|
{
|
|
if (index == 0){
|
|
setMeshType(infillMeshType)
|
|
} else {
|
|
setMeshType(cuttingMeshType)
|
|
}
|
|
}
|
|
|
|
Binding
|
|
{
|
|
target: infillOnlyComboBox
|
|
property: "currentIndex"
|
|
value: currentMeshType === infillMeshType ? 0 : 1
|
|
}
|
|
}
|
|
|
|
Column // List of selected Settings to override for the selected object
|
|
{
|
|
// This is to ensure that the panel is first increasing in size up to 200 and then shows a scrollbar.
|
|
// It kinda looks ugly otherwise (big panel, no content on it)
|
|
id: currentSettings
|
|
property int maximumHeight: 200 * screenScaleFactor
|
|
height: Math.min(contents.count * (UM.Theme.getSize("section").height + UM.Theme.getSize("default_lining").height), maximumHeight)
|
|
visible: currentMeshType != "anti_overhang_mesh"
|
|
|
|
ScrollView
|
|
{
|
|
height: parent.height
|
|
width: UM.Theme.getSize("setting").width + UM.Theme.getSize("default_margin").width
|
|
style: UM.Theme.styles.scrollview
|
|
|
|
ListView
|
|
{
|
|
id: contents
|
|
spacing: UM.Theme.getSize("default_lining").height
|
|
|
|
model: UM.SettingDefinitionsModel
|
|
{
|
|
id: addedSettingsModel
|
|
containerId: Cura.MachineManager.activeMachine != null ? Cura.MachineManager.activeMachine.definition.id: ""
|
|
expanded: [ "*" ]
|
|
filter:
|
|
{
|
|
if (printSequencePropertyProvider.properties.value == "one_at_a_time")
|
|
{
|
|
return {"settable_per_meshgroup": true}
|
|
}
|
|
return {"settable_per_mesh": true}
|
|
}
|
|
exclude:
|
|
{
|
|
var excluded_settings = [ "support_mesh", "anti_overhang_mesh", "cutting_mesh", "infill_mesh" ]
|
|
|
|
if (currentMeshType == "support_mesh")
|
|
{
|
|
excluded_settings = excluded_settings.concat(base.allCategoriesExceptSupport)
|
|
}
|
|
return excluded_settings
|
|
}
|
|
|
|
visibilityHandler: Cura.PerObjectSettingVisibilityHandler
|
|
{
|
|
id: visibility_handler
|
|
selectedObjectId: UM.ActiveTool.properties.getValue("SelectedObjectId")
|
|
}
|
|
|
|
// For some reason the model object is updated after removing him from the memory and
|
|
// it happens only on Windows. For this reason, set the destroyed value manually.
|
|
Component.onDestruction:
|
|
{
|
|
setDestroyed(true)
|
|
}
|
|
}
|
|
|
|
delegate: Row
|
|
{
|
|
spacing: - UM.Theme.getSize("default_margin").width
|
|
Loader
|
|
{
|
|
id: settingLoader
|
|
width: UM.Theme.getSize("setting").width
|
|
height: UM.Theme.getSize("section").height
|
|
enabled: provider.properties.enabled === "True"
|
|
property var definition: model
|
|
property var settingDefinitionsModel: addedSettingsModel
|
|
property var propertyProvider: provider
|
|
property var globalPropertyProvider: inheritStackProvider
|
|
property var externalResetHandler: false
|
|
|
|
//Qt5.4.2 and earlier has a bug where this causes a crash: https://bugreports.qt.io/browse/QTBUG-35989
|
|
//In addition, while it works for 5.5 and higher, the ordering of the actual combo box drop down changes,
|
|
//causing nasty issues when selecting different options. So disable asynchronous loading of enum type completely.
|
|
asynchronous: model.type != "enum" && model.type != "extruder"
|
|
|
|
onLoaded:
|
|
{
|
|
settingLoader.item.showRevertButton = false
|
|
settingLoader.item.showInheritButton = false
|
|
settingLoader.item.showLinkedSettingIcon = false
|
|
settingLoader.item.doDepthIndentation = false
|
|
settingLoader.item.doQualityUserSettingEmphasis = false
|
|
}
|
|
|
|
sourceComponent:
|
|
{
|
|
switch(model.type)
|
|
{
|
|
case "int":
|
|
return settingTextField
|
|
case "[int]":
|
|
return settingTextField
|
|
case "float":
|
|
return settingTextField
|
|
case "enum":
|
|
return settingComboBox
|
|
case "extruder":
|
|
return settingExtruder
|
|
case "optional_extruder":
|
|
return settingOptionalExtruder
|
|
case "bool":
|
|
return settingCheckBox
|
|
case "str":
|
|
return settingTextField
|
|
case "category":
|
|
return settingCategory
|
|
default:
|
|
return settingUnknown
|
|
}
|
|
}
|
|
}
|
|
|
|
Button
|
|
{
|
|
width: Math.round(UM.Theme.getSize("setting").height / 2)
|
|
height: UM.Theme.getSize("setting").height
|
|
|
|
onClicked: addedSettingsModel.setVisible(model.key, false)
|
|
|
|
style: ButtonStyle
|
|
{
|
|
background: Item
|
|
{
|
|
UM.RecolorImage
|
|
{
|
|
anchors.verticalCenter: parent.verticalCenter
|
|
width: parent.width
|
|
height: width
|
|
sourceSize.height: width
|
|
color: control.hovered ? UM.Theme.getColor("setting_control_button_hover") : UM.Theme.getColor("setting_control_button")
|
|
source: UM.Theme.getIcon("Minus")
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
// Specialty provider that only watches global_inherits (we cant filter on what property changed we get events
|
|
// so we bypass that to make a dedicated provider).
|
|
UM.SettingPropertyProvider
|
|
{
|
|
id: provider
|
|
|
|
containerStackId: UM.ActiveTool.properties.getValue("ContainerID")
|
|
key: model.key
|
|
watchedProperties: [ "value", "enabled", "validationState" ]
|
|
storeIndex: 0
|
|
removeUnusedValue: false
|
|
}
|
|
|
|
UM.SettingPropertyProvider
|
|
{
|
|
id: inheritStackProvider
|
|
containerStackId: UM.ActiveTool.properties.getValue("ContainerID")
|
|
key: model.key
|
|
watchedProperties: [ "limit_to_extruder" ]
|
|
}
|
|
|
|
Connections
|
|
{
|
|
target: inheritStackProvider
|
|
function onPropertiesChanged() { provider.forcePropertiesChanged() }
|
|
}
|
|
|
|
Connections
|
|
{
|
|
target: UM.ActiveTool
|
|
function onPropertiesChanged()
|
|
{
|
|
// the values cannot be bound with UM.ActiveTool.properties.getValue() calls,
|
|
// so here we connect to the signal and update the those values.
|
|
if (typeof UM.ActiveTool.properties.getValue("SelectedObjectId") !== "undefined")
|
|
{
|
|
const selectedObjectId = UM.ActiveTool.properties.getValue("SelectedObjectId")
|
|
if (addedSettingsModel.visibilityHandler.selectedObjectId != selectedObjectId)
|
|
{
|
|
addedSettingsModel.visibilityHandler.selectedObjectId = selectedObjectId
|
|
}
|
|
}
|
|
if (typeof UM.ActiveTool.properties.getValue("ContainerID") !== "undefined")
|
|
{
|
|
const containerId = UM.ActiveTool.properties.getValue("ContainerID")
|
|
if (provider.containerStackId != containerId)
|
|
{
|
|
provider.containerStackId = containerId
|
|
}
|
|
if (inheritStackProvider.containerStackId != containerId)
|
|
{
|
|
inheritStackProvider.containerStackId = containerId
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
Cura.SecondaryButton
|
|
{
|
|
id: customiseSettingsButton;
|
|
height: UM.Theme.getSize("setting_control").height;
|
|
visible: currentSettings.visible
|
|
|
|
text: catalog.i18nc("@action:button", "Select settings");
|
|
|
|
onClicked:
|
|
{
|
|
settingPickDialog.visible = true;
|
|
if (currentMeshType == "support_mesh")
|
|
{
|
|
settingPickDialog.additional_excluded_settings = base.allCategoriesExceptSupport;
|
|
}
|
|
else
|
|
{
|
|
settingPickDialog.additional_excluded_settings = []
|
|
}
|
|
}
|
|
}
|
|
|
|
}
|
|
|
|
SettingPickDialog
|
|
{
|
|
id: settingPickDialog
|
|
}
|
|
|
|
UM.SettingPropertyProvider
|
|
{
|
|
id: machineExtruderCount
|
|
|
|
containerStack: Cura.MachineManager.activeMachine
|
|
key: "machine_extruder_count"
|
|
watchedProperties: [ "value" ]
|
|
storeIndex: 0
|
|
}
|
|
|
|
UM.SettingPropertyProvider
|
|
{
|
|
id: printSequencePropertyProvider
|
|
|
|
containerStack: Cura.MachineManager.activeMachine
|
|
key: "print_sequence"
|
|
watchedProperties: [ "value" ]
|
|
storeIndex: 0
|
|
}
|
|
|
|
SystemPalette { id: palette }
|
|
|
|
Component
|
|
{
|
|
id: settingTextField
|
|
|
|
Cura.SettingTextField { }
|
|
}
|
|
|
|
Component
|
|
{
|
|
id: settingComboBox
|
|
|
|
Cura.SettingComboBox { }
|
|
}
|
|
|
|
Component
|
|
{
|
|
id: settingExtruder
|
|
|
|
Cura.SettingExtruder { }
|
|
}
|
|
|
|
Component
|
|
{
|
|
id: settingOptionalExtruder
|
|
|
|
Cura.SettingOptionalExtruder { }
|
|
}
|
|
|
|
Component
|
|
{
|
|
id: settingCheckBox
|
|
|
|
Cura.SettingCheckBox { }
|
|
}
|
|
|
|
Component
|
|
{
|
|
id: settingCategory
|
|
|
|
Cura.SettingCategory { }
|
|
}
|
|
|
|
Component
|
|
{
|
|
id: settingUnknown
|
|
|
|
Cura.SettingUnknown { }
|
|
}
|
|
}
|