mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-07-25 15:44:04 -06:00
T562: Added searching of settings
# Conflicts: # resources/qml/Settings/SettingView.qml
This commit is contained in:
Victor Larchenko
fieldOfView
parent
47bb8f9601
commit
829f8893e2
1 changed files with 241 additions and 211 deletions
|
|
@ -9,229 +9,259 @@ import QtQuick.Layouts 1.1
|
||||||
import UM 1.2 as UM
|
import UM 1.2 as UM
|
||||||
import Cura 1.0 as Cura
|
import Cura 1.0 as Cura
|
||||||
|
|
||||||
ScrollView
|
Item
|
||||||
{
|
{
|
||||||
id: base;
|
id: base;
|
||||||
|
|
||||||
style: UM.Theme.styles.scrollview;
|
|
||||||
flickableItem.flickableDirection: Flickable.VerticalFlick;
|
|
||||||
|
|
||||||
property Action configureSettings;
|
property Action configureSettings;
|
||||||
signal showTooltip(Item item, point location, string text);
|
signal showTooltip(Item item, point location, string text);
|
||||||
signal hideTooltip();
|
signal hideTooltip();
|
||||||
|
|
||||||
ListView
|
TextField
|
||||||
{
|
{
|
||||||
id: contents
|
id: filter;
|
||||||
spacing: UM.Theme.getSize("default_lining").height;
|
visible: !monitoringPrint
|
||||||
cacheBuffer: 1000000; // Set a large cache to effectively just cache every list item.
|
|
||||||
|
|
||||||
model: UM.SettingDefinitionsModel {
|
anchors
|
||||||
id: definitionsModel;
|
|
||||||
containerId: Cura.MachineManager.activeDefinitionId
|
|
||||||
visibilityHandler: UM.SettingPreferenceVisibilityHandler { }
|
|
||||||
exclude: ["machine_settings", "command_line_settings", "infill_mesh", "infill_mesh_order"] // TODO: infill_mesh settigns are excluded hardcoded, but should be based on the fact that settable_globally, settable_per_meshgroup and settable_per_extruder are false.
|
|
||||||
expanded: Printer.expandedCategories
|
|
||||||
onExpandedChanged: Printer.setExpandedCategories(expanded)
|
|
||||||
onVisibilityChanged: Cura.SettingInheritanceManager.forceUpdate()
|
|
||||||
}
|
|
||||||
|
|
||||||
delegate: Loader
|
|
||||||
{
|
{
|
||||||
id: delegate
|
top: parent.top
|
||||||
|
left: parent.left
|
||||||
width: UM.Theme.getSize("sidebar").width;
|
leftMargin: UM.Theme.getSize("default_margin").width
|
||||||
height: provider.properties.enabled == "True" ? UM.Theme.getSize("section").height : - contents.spacing
|
//right: parent.right
|
||||||
Behavior on height { NumberAnimation { duration: 100 } }
|
|
||||||
opacity: provider.properties.enabled == "True" ? 1 : 0
|
|
||||||
Behavior on opacity { NumberAnimation { duration: 100 } }
|
|
||||||
enabled:
|
|
||||||
{
|
|
||||||
if(!ExtruderManager.activeExtruderStackId && ExtruderManager.extruderCount > 0)
|
|
||||||
{
|
|
||||||
// disable all controls on the global tab, except categories
|
|
||||||
return model.type == "category"
|
|
||||||
}
|
|
||||||
return provider.properties.enabled == "True"
|
|
||||||
}
|
|
||||||
|
|
||||||
property var definition: model
|
|
||||||
property var settingDefinitionsModel: definitionsModel
|
|
||||||
property var propertyProvider: provider
|
|
||||||
property var globalPropertyProvider: inheritStackProvider
|
|
||||||
|
|
||||||
//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"
|
|
||||||
active: model.type != undefined
|
|
||||||
|
|
||||||
source:
|
|
||||||
{
|
|
||||||
switch(model.type)
|
|
||||||
{
|
|
||||||
case "int":
|
|
||||||
return "SettingTextField.qml"
|
|
||||||
case "float":
|
|
||||||
return "SettingTextField.qml"
|
|
||||||
case "enum":
|
|
||||||
return "SettingComboBox.qml"
|
|
||||||
case "extruder":
|
|
||||||
return "SettingExtruder.qml"
|
|
||||||
case "bool":
|
|
||||||
return "SettingCheckBox.qml"
|
|
||||||
case "str":
|
|
||||||
return "SettingTextField.qml"
|
|
||||||
case "category":
|
|
||||||
return "SettingCategory.qml"
|
|
||||||
default:
|
|
||||||
return "SettingUnknown.qml"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Binding to ensure that the right containerstack ID is set for the provider.
|
|
||||||
// This ensures that if a setting has a limit_to_extruder id (for instance; Support speed points to the
|
|
||||||
// extruder that actually prints the support, as that is the setting we need to use to calculate the value)
|
|
||||||
Binding
|
|
||||||
{
|
|
||||||
target: provider
|
|
||||||
property: "containerStackId"
|
|
||||||
when: model.settable_per_extruder || (inheritStackProvider.properties.limit_to_extruder != null && inheritStackProvider.properties.limit_to_extruder >= 0);
|
|
||||||
value:
|
|
||||||
{
|
|
||||||
if(!model.settable_per_extruder || machineExtruderCount.properties.value == 1)
|
|
||||||
{
|
|
||||||
//Not settable per extruder or there only is global, so we must pick global.
|
|
||||||
return Cura.MachineManager.activeMachineId;
|
|
||||||
}
|
|
||||||
if(inheritStackProvider.properties.limit_to_extruder != null && inheritStackProvider.properties.limit_to_extruder >= 0)
|
|
||||||
{
|
|
||||||
//We have limit_to_extruder, so pick that stack.
|
|
||||||
return ExtruderManager.extruderIds[String(inheritStackProvider.properties.limit_to_extruder)];
|
|
||||||
}
|
|
||||||
if(ExtruderManager.activeExtruderStackId)
|
|
||||||
{
|
|
||||||
//We're on an extruder tab. Pick the current extruder.
|
|
||||||
return ExtruderManager.activeExtruderStackId;
|
|
||||||
}
|
|
||||||
//No extruder tab is selected. Pick the global stack. Shouldn't happen any more since we removed the global tab.
|
|
||||||
return Cura.MachineManager.activeMachineId;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// 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: inheritStackProvider
|
|
||||||
containerStackId: Cura.MachineManager.activeMachineId
|
|
||||||
key: model.key
|
|
||||||
watchedProperties: [ "limit_to_extruder" ]
|
|
||||||
}
|
|
||||||
|
|
||||||
UM.SettingPropertyProvider
|
|
||||||
{
|
|
||||||
id: provider
|
|
||||||
|
|
||||||
containerStackId: Cura.MachineManager.activeMachineId
|
|
||||||
key: model.key ? model.key : ""
|
|
||||||
watchedProperties: [ "value", "enabled", "state", "validationState", "settable_per_extruder", "resolve" ]
|
|
||||||
storeIndex: 0
|
|
||||||
// Due to the way setPropertyValue works, removeUnusedValue gives the correct output in case of resolve
|
|
||||||
removeUnusedValue: model.resolve == undefined
|
|
||||||
}
|
|
||||||
|
|
||||||
Connections
|
|
||||||
{
|
|
||||||
target: item
|
|
||||||
onContextMenuRequested:
|
|
||||||
{
|
|
||||||
contextMenu.key = model.key;
|
|
||||||
contextMenu.provider = provider
|
|
||||||
contextMenu.popup();
|
|
||||||
}
|
|
||||||
onShowTooltip: base.showTooltip(delegate, { x: 0, y: delegate.height / 2 }, text)
|
|
||||||
onHideTooltip: base.hideTooltip()
|
|
||||||
onShowAllHiddenInheritedSettings:
|
|
||||||
{
|
|
||||||
var children_with_override = Cura.SettingInheritanceManager.getChildrenKeysWithOverride(category_id)
|
|
||||||
for(var i = 0; i < children_with_override.length; i++)
|
|
||||||
{
|
|
||||||
definitionsModel.setVisible(children_with_override[i], true)
|
|
||||||
}
|
|
||||||
Cura.SettingInheritanceManager.manualRemoveOverride(category_id)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
UM.I18nCatalog { id: catalog; name: "uranium"; }
|
placeholderText: catalog.i18nc("@label:textbox", "Filter...")
|
||||||
|
|
||||||
add: Transition {
|
onTextChanged: {
|
||||||
SequentialAnimation {
|
definitionsModel.filter = {"label": "*" + text};
|
||||||
NumberAnimation { properties: "height"; from: 0; duration: 100 }
|
definitionsModel.expanded = text.length > 0 ? ["*"] : [""]
|
||||||
NumberAnimation { properties: "opacity"; from: 0; duration: 100 }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
remove: Transition {
|
|
||||||
SequentialAnimation {
|
|
||||||
NumberAnimation { properties: "opacity"; to: 0; duration: 100 }
|
|
||||||
NumberAnimation { properties: "height"; to: 0; duration: 100 }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
addDisplaced: Transition {
|
|
||||||
NumberAnimation { properties: "x,y"; duration: 100 }
|
|
||||||
}
|
|
||||||
removeDisplaced: Transition {
|
|
||||||
SequentialAnimation {
|
|
||||||
PauseAnimation { duration: 100; }
|
|
||||||
NumberAnimation { properties: "x,y"; duration: 100 }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Menu
|
|
||||||
{
|
|
||||||
id: contextMenu
|
|
||||||
|
|
||||||
property string key
|
|
||||||
property var provider
|
|
||||||
|
|
||||||
MenuItem
|
|
||||||
{
|
|
||||||
//: Settings context menu action
|
|
||||||
text: catalog.i18nc("@action:menu", "Copy value to all extruders")
|
|
||||||
visible: machineExtruderCount.properties.value > 1
|
|
||||||
enabled: contextMenu.provider != undefined && contextMenu.provider.properties.settable_per_extruder != "False"
|
|
||||||
onTriggered: Cura.MachineManager.copyValueToExtruders(contextMenu.key)
|
|
||||||
}
|
|
||||||
|
|
||||||
MenuSeparator
|
|
||||||
{
|
|
||||||
visible: machineExtruderCount.properties.value > 1
|
|
||||||
}
|
|
||||||
|
|
||||||
MenuItem
|
|
||||||
{
|
|
||||||
//: Settings context menu action
|
|
||||||
text: catalog.i18nc("@action:menu", "Hide this setting");
|
|
||||||
onTriggered: definitionsModel.hide(contextMenu.key);
|
|
||||||
}
|
|
||||||
MenuItem
|
|
||||||
{
|
|
||||||
//: Settings context menu action
|
|
||||||
text: catalog.i18nc("@action:menu", "Configure setting visiblity...");
|
|
||||||
|
|
||||||
onTriggered: Cura.Actions.configureSettingVisibility.trigger(contextMenu);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
UM.SettingPropertyProvider
|
|
||||||
{
|
|
||||||
id: machineExtruderCount
|
|
||||||
|
|
||||||
containerStackId: Cura.MachineManager.activeMachineId
|
|
||||||
key: "machine_extruder_count"
|
|
||||||
watchedProperties: [ "value" ]
|
|
||||||
storeIndex: 0
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
ScrollView
|
||||||
|
{
|
||||||
|
anchors.top: filter.bottom;
|
||||||
|
anchors.bottom: parent.bottom;
|
||||||
|
anchors.right: parent.right;
|
||||||
|
anchors.left: parent.left;
|
||||||
|
anchors.topMargin: UM.Theme.getSize("default_margin").width
|
||||||
|
|
||||||
|
style: UM.Theme.styles.scrollview;
|
||||||
|
flickableItem.flickableDirection: Flickable.VerticalFlick;
|
||||||
|
|
||||||
|
ListView
|
||||||
|
{
|
||||||
|
id: contents
|
||||||
|
spacing: UM.Theme.getSize("default_lining").height;
|
||||||
|
cacheBuffer: 1000000; // Set a large cache to effectively just cache every list item.
|
||||||
|
|
||||||
|
model: UM.SettingDefinitionsModel {
|
||||||
|
id: definitionsModel;
|
||||||
|
containerId: Cura.MachineManager.activeDefinitionId
|
||||||
|
visibilityHandler: UM.SettingPreferenceVisibilityHandler { }
|
||||||
|
exclude: ["machine_settings", "command_line_settings", "infill_mesh", "infill_mesh_order"] // TODO: infill_mesh settigns are excluded hardcoded, but should be based on the fact that settable_globally, settable_per_meshgroup and settable_per_extruder are false.
|
||||||
|
expanded: Printer.expandedCategories
|
||||||
|
onExpandedChanged: Printer.setExpandedCategories(expanded)
|
||||||
|
onVisibilityChanged: Cura.SettingInheritanceManager.forceUpdate()
|
||||||
|
}
|
||||||
|
|
||||||
|
delegate: Loader
|
||||||
|
{
|
||||||
|
id: delegate
|
||||||
|
|
||||||
|
width: UM.Theme.getSize("sidebar").width;
|
||||||
|
height: provider.properties.enabled == "True" ? UM.Theme.getSize("section").height : - contents.spacing
|
||||||
|
Behavior on height { NumberAnimation { duration: 100 } }
|
||||||
|
opacity: provider.properties.enabled == "True" ? 1 : 0
|
||||||
|
Behavior on opacity { NumberAnimation { duration: 100 } }
|
||||||
|
enabled:
|
||||||
|
{
|
||||||
|
if(!ExtruderManager.activeExtruderStackId && ExtruderManager.extruderCount > 0)
|
||||||
|
{
|
||||||
|
// disable all controls on the global tab, except categories
|
||||||
|
return model.type == "category"
|
||||||
|
}
|
||||||
|
return provider.properties.enabled == "True"
|
||||||
|
}
|
||||||
|
|
||||||
|
property var definition: model
|
||||||
|
property var settingDefinitionsModel: definitionsModel
|
||||||
|
property var propertyProvider: provider
|
||||||
|
property var globalPropertyProvider: inheritStackProvider
|
||||||
|
|
||||||
|
//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"
|
||||||
|
active: model.type != undefined
|
||||||
|
|
||||||
|
source:
|
||||||
|
{
|
||||||
|
switch(model.type)
|
||||||
|
{
|
||||||
|
case "int":
|
||||||
|
return "SettingTextField.qml"
|
||||||
|
case "float":
|
||||||
|
return "SettingTextField.qml"
|
||||||
|
case "enum":
|
||||||
|
return "SettingComboBox.qml"
|
||||||
|
case "extruder":
|
||||||
|
return "SettingExtruder.qml"
|
||||||
|
case "bool":
|
||||||
|
return "SettingCheckBox.qml"
|
||||||
|
case "str":
|
||||||
|
return "SettingTextField.qml"
|
||||||
|
case "category":
|
||||||
|
return "SettingCategory.qml"
|
||||||
|
default:
|
||||||
|
return "SettingUnknown.qml"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Binding to ensure that the right containerstack ID is set for the provider.
|
||||||
|
// This ensures that if a setting has a limit_to_extruder id (for instance; Support speed points to the
|
||||||
|
// extruder that actually prints the support, as that is the setting we need to use to calculate the value)
|
||||||
|
Binding
|
||||||
|
{
|
||||||
|
target: provider
|
||||||
|
property: "containerStackId"
|
||||||
|
when: model.settable_per_extruder || (inheritStackProvider.properties.limit_to_extruder != null && inheritStackProvider.properties.limit_to_extruder >= 0);
|
||||||
|
value:
|
||||||
|
{
|
||||||
|
if(!model.settable_per_extruder || machineExtruderCount.properties.value == 1)
|
||||||
|
{
|
||||||
|
//Not settable per extruder or there only is global, so we must pick global.
|
||||||
|
return Cura.MachineManager.activeMachineId;
|
||||||
|
}
|
||||||
|
if(inheritStackProvider.properties.limit_to_extruder != null && inheritStackProvider.properties.limit_to_extruder >= 0)
|
||||||
|
{
|
||||||
|
//We have limit_to_extruder, so pick that stack.
|
||||||
|
return ExtruderManager.extruderIds[String(inheritStackProvider.properties.limit_to_extruder)];
|
||||||
|
}
|
||||||
|
if(ExtruderManager.activeExtruderStackId)
|
||||||
|
{
|
||||||
|
//We're on an extruder tab. Pick the current extruder.
|
||||||
|
return ExtruderManager.activeExtruderStackId;
|
||||||
|
}
|
||||||
|
//No extruder tab is selected. Pick the global stack. Shouldn't happen any more since we removed the global tab.
|
||||||
|
return Cura.MachineManager.activeMachineId;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 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: inheritStackProvider
|
||||||
|
containerStackId: Cura.MachineManager.activeMachineId
|
||||||
|
key: model.key
|
||||||
|
watchedProperties: [ "limit_to_extruder" ]
|
||||||
|
}
|
||||||
|
|
||||||
|
UM.SettingPropertyProvider
|
||||||
|
{
|
||||||
|
id: provider
|
||||||
|
|
||||||
|
containerStackId: Cura.MachineManager.activeMachineId
|
||||||
|
key: model.key ? model.key : ""
|
||||||
|
watchedProperties: [ "value", "enabled", "state", "validationState", "settable_per_extruder", "resolve" ]
|
||||||
|
storeIndex: 0
|
||||||
|
// Due to the way setPropertyValue works, removeUnusedValue gives the correct output in case of resolve
|
||||||
|
removeUnusedValue: model.resolve == undefined
|
||||||
|
}
|
||||||
|
|
||||||
|
Connections
|
||||||
|
{
|
||||||
|
target: item
|
||||||
|
onContextMenuRequested:
|
||||||
|
{
|
||||||
|
contextMenu.key = model.key;
|
||||||
|
contextMenu.provider = provider
|
||||||
|
contextMenu.popup();
|
||||||
|
}
|
||||||
|
onShowTooltip: base.showTooltip(delegate, { x: 0, y: delegate.height / 2 }, text)
|
||||||
|
onHideTooltip: base.hideTooltip()
|
||||||
|
onShowAllHiddenInheritedSettings:
|
||||||
|
{
|
||||||
|
var children_with_override = Cura.SettingInheritanceManager.getChildrenKeysWithOverride(category_id)
|
||||||
|
for(var i = 0; i < children_with_override.length; i++)
|
||||||
|
{
|
||||||
|
definitionsModel.setVisible(children_with_override[i], true)
|
||||||
|
}
|
||||||
|
Cura.SettingInheritanceManager.manualRemoveOverride(category_id)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
UM.I18nCatalog { id: catalog; name: "uranium"; }
|
||||||
|
|
||||||
|
add: Transition {
|
||||||
|
SequentialAnimation {
|
||||||
|
NumberAnimation { properties: "height"; from: 0; duration: 100 }
|
||||||
|
NumberAnimation { properties: "opacity"; from: 0; duration: 100 }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
remove: Transition {
|
||||||
|
SequentialAnimation {
|
||||||
|
NumberAnimation { properties: "opacity"; to: 0; duration: 100 }
|
||||||
|
NumberAnimation { properties: "height"; to: 0; duration: 100 }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
addDisplaced: Transition {
|
||||||
|
NumberAnimation { properties: "x,y"; duration: 100 }
|
||||||
|
}
|
||||||
|
removeDisplaced: Transition {
|
||||||
|
SequentialAnimation {
|
||||||
|
PauseAnimation { duration: 100; }
|
||||||
|
NumberAnimation { properties: "x,y"; duration: 100 }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Menu
|
||||||
|
{
|
||||||
|
id: contextMenu
|
||||||
|
|
||||||
|
property string key
|
||||||
|
property var provider
|
||||||
|
|
||||||
|
MenuItem
|
||||||
|
{
|
||||||
|
//: Settings context menu action
|
||||||
|
text: catalog.i18nc("@action:menu", "Copy value to all extruders")
|
||||||
|
visible: machineExtruderCount.properties.value > 1
|
||||||
|
enabled: contextMenu.provider != undefined && contextMenu.provider.properties.settable_per_extruder != "False"
|
||||||
|
onTriggered: Cura.MachineManager.copyValueToExtruders(contextMenu.key)
|
||||||
|
}
|
||||||
|
|
||||||
|
MenuSeparator
|
||||||
|
{
|
||||||
|
visible: machineExtruderCount.properties.value > 1
|
||||||
|
}
|
||||||
|
|
||||||
|
MenuItem
|
||||||
|
{
|
||||||
|
//: Settings context menu action
|
||||||
|
text: catalog.i18nc("@action:menu", "Hide this setting");
|
||||||
|
onTriggered: definitionsModel.hide(contextMenu.key);
|
||||||
|
}
|
||||||
|
MenuItem
|
||||||
|
{
|
||||||
|
//: Settings context menu action
|
||||||
|
text: catalog.i18nc("@action:menu", "Configure setting visiblity...");
|
||||||
|
|
||||||
|
onTriggered: Cura.Actions.configureSettingVisibility.trigger(contextMenu);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
UM.SettingPropertyProvider
|
||||||
|
{
|
||||||
|
id: machineExtruderCount
|
||||||
|
|
||||||
|
containerStackId: Cura.MachineManager.activeMachineId
|
||||||
|
key: "machine_extruder_count"
|
||||||
|
watchedProperties: [ "value" ]
|
||||||
|
storeIndex: 0
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
Loading…
Add table
Add a link
Reference in a new issue