mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-07-06 22:47:29 -06:00
Replace ScrollView with QtControls2 ListView
I can't update the buttons (not part of this ticket) so I kept those Controls1. The ScrollView is no longer necessary, just a ListView now with customised scroll bar. Contributes to issue CURA-8686.
This commit is contained in:
Ghostkeeper
parent
d4381a6dd0
commit
f630b84788
1 changed files with 160 additions and 161 deletions
|
|
@ -1,9 +1,10 @@
|
||||||
// Copyright (c) 2021 Ultimaker B.V.
|
// Copyright (c) 2022 Ultimaker B.V.
|
||||||
// Uranium is released under the terms of the LGPLv3 or higher.
|
// Cura is released under the terms of the LGPLv3 or higher.
|
||||||
|
|
||||||
import QtQuick 2.2
|
import QtQuick 2.2
|
||||||
import QtQuick.Controls 1.2
|
import QtQuick.Controls 1.2 as OldControls
|
||||||
import QtQuick.Controls.Styles 1.2
|
import QtQuick.Controls.Styles 1.2
|
||||||
|
import QtQuick.Controls 2.15
|
||||||
|
|
||||||
import UM 1.5 as UM
|
import UM 1.5 as UM
|
||||||
import Cura 1.0 as Cura
|
import Cura 1.0 as Cura
|
||||||
|
|
@ -76,7 +77,7 @@ Item
|
||||||
id: meshTypeButtons
|
id: meshTypeButtons
|
||||||
spacing: UM.Theme.getSize("default_margin").width
|
spacing: UM.Theme.getSize("default_margin").width
|
||||||
|
|
||||||
Button
|
OldControls.Button
|
||||||
{
|
{
|
||||||
id: normalButton
|
id: normalButton
|
||||||
text: catalog.i18nc("@label", "Normal model")
|
text: catalog.i18nc("@label", "Normal model")
|
||||||
|
|
@ -88,7 +89,7 @@ Item
|
||||||
z: 4
|
z: 4
|
||||||
}
|
}
|
||||||
|
|
||||||
Button
|
OldControls.Button
|
||||||
{
|
{
|
||||||
id: supportMeshButton
|
id: supportMeshButton
|
||||||
text: catalog.i18nc("@label", "Print as support")
|
text: catalog.i18nc("@label", "Print as support")
|
||||||
|
|
@ -100,7 +101,7 @@ Item
|
||||||
z: 3
|
z: 3
|
||||||
}
|
}
|
||||||
|
|
||||||
Button
|
OldControls.Button
|
||||||
{
|
{
|
||||||
id: overlapMeshButton
|
id: overlapMeshButton
|
||||||
text: catalog.i18nc("@label", "Modify settings for overlaps")
|
text: catalog.i18nc("@label", "Modify settings for overlaps")
|
||||||
|
|
@ -112,7 +113,7 @@ Item
|
||||||
z: 2
|
z: 2
|
||||||
}
|
}
|
||||||
|
|
||||||
Button
|
OldControls.Button
|
||||||
{
|
{
|
||||||
id: antiOverhangMeshButton
|
id: antiOverhangMeshButton
|
||||||
text: catalog.i18nc("@label", "Don't support overlaps")
|
text: catalog.i18nc("@label", "Don't support overlaps")
|
||||||
|
|
@ -179,189 +180,187 @@ Item
|
||||||
height: Math.min(contents.count * (UM.Theme.getSize("section").height + UM.Theme.getSize("default_lining").height), maximumHeight)
|
height: Math.min(contents.count * (UM.Theme.getSize("section").height + UM.Theme.getSize("default_lining").height), maximumHeight)
|
||||||
visible: currentMeshType != "anti_overhang_mesh"
|
visible: currentMeshType != "anti_overhang_mesh"
|
||||||
|
|
||||||
ScrollView
|
ListView
|
||||||
{
|
{
|
||||||
|
id: contents
|
||||||
height: parent.height
|
height: parent.height
|
||||||
width: UM.Theme.getSize("setting").width + UM.Theme.getSize("default_margin").width
|
width: UM.Theme.getSize("setting").width + UM.Theme.getSize("default_margin").width
|
||||||
style: UM.Theme.styles.scrollview
|
|
||||||
|
|
||||||
ListView
|
ScrollBar.vertical: UM.ScrollBar {}
|
||||||
|
clip: true
|
||||||
|
spacing: UM.Theme.getSize("default_lining").height
|
||||||
|
|
||||||
|
model: UM.SettingDefinitionsModel
|
||||||
{
|
{
|
||||||
id: contents
|
id: addedSettingsModel
|
||||||
spacing: UM.Theme.getSize("default_lining").height
|
containerId: Cura.MachineManager.activeMachine != null ? Cura.MachineManager.activeMachine.definition.id: ""
|
||||||
|
expanded: [ "*" ]
|
||||||
model: UM.SettingDefinitionsModel
|
filter:
|
||||||
{
|
{
|
||||||
id: addedSettingsModel
|
if (printSequencePropertyProvider.properties.value == "one_at_a_time")
|
||||||
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)
|
||||||
{
|
{
|
||||||
return {"settable_per_meshgroup": true}
|
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
|
||||||
}
|
}
|
||||||
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
|
OldControls.Button
|
||||||
{
|
{
|
||||||
spacing: - UM.Theme.getSize("default_margin").width
|
width: Math.round(UM.Theme.getSize("setting").height / 2)
|
||||||
Loader
|
height: UM.Theme.getSize("setting").height
|
||||||
|
|
||||||
|
onClicked: addedSettingsModel.setVisible(model.key, false)
|
||||||
|
|
||||||
|
style: ButtonStyle
|
||||||
{
|
{
|
||||||
id: settingLoader
|
background: Item
|
||||||
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
|
UM.RecolorImage
|
||||||
settingLoader.item.showInheritButton = false
|
|
||||||
settingLoader.item.showLinkedSettingIcon = false
|
|
||||||
settingLoader.item.doDepthIndentation = false
|
|
||||||
settingLoader.item.doQualityUserSettingEmphasis = false
|
|
||||||
}
|
|
||||||
|
|
||||||
sourceComponent:
|
|
||||||
{
|
|
||||||
switch(model.type)
|
|
||||||
{
|
{
|
||||||
case "int":
|
anchors.verticalCenter: parent.verticalCenter
|
||||||
return settingTextField
|
width: parent.width
|
||||||
case "[int]":
|
height: width
|
||||||
return settingTextField
|
sourceSize.height: width
|
||||||
case "float":
|
color: control.hovered ? UM.Theme.getColor("setting_control_button_hover") : UM.Theme.getColor("setting_control_button")
|
||||||
return settingTextField
|
source: UM.Theme.getIcon("Minus")
|
||||||
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
|
// Specialty provider that only watches global_inherits (we can't 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()
|
||||||
{
|
{
|
||||||
width: Math.round(UM.Theme.getSize("setting").height / 2)
|
// the values cannot be bound with UM.ActiveTool.properties.getValue() calls,
|
||||||
height: UM.Theme.getSize("setting").height
|
// so here we connect to the signal and update the those values.
|
||||||
|
if (typeof UM.ActiveTool.properties.getValue("SelectedObjectId") !== "undefined")
|
||||||
onClicked: addedSettingsModel.setVisible(model.key, false)
|
|
||||||
|
|
||||||
style: ButtonStyle
|
|
||||||
{
|
{
|
||||||
background: Item
|
const selectedObjectId = UM.ActiveTool.properties.getValue("SelectedObjectId")
|
||||||
|
if (addedSettingsModel.visibilityHandler.selectedObjectId != selectedObjectId)
|
||||||
{
|
{
|
||||||
UM.RecolorImage
|
addedSettingsModel.visibilityHandler.selectedObjectId = selectedObjectId
|
||||||
{
|
|
||||||
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")
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
if (typeof UM.ActiveTool.properties.getValue("ContainerID") !== "undefined")
|
||||||
|
|
||||||
// Specialty provider that only watches global_inherits (we can't 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,
|
const containerId = UM.ActiveTool.properties.getValue("ContainerID")
|
||||||
// so here we connect to the signal and update the those values.
|
if (provider.containerStackId != containerId)
|
||||||
if (typeof UM.ActiveTool.properties.getValue("SelectedObjectId") !== "undefined")
|
|
||||||
{
|
{
|
||||||
const selectedObjectId = UM.ActiveTool.properties.getValue("SelectedObjectId")
|
provider.containerStackId = containerId
|
||||||
if (addedSettingsModel.visibilityHandler.selectedObjectId != selectedObjectId)
|
|
||||||
{
|
|
||||||
addedSettingsModel.visibilityHandler.selectedObjectId = selectedObjectId
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
if (typeof UM.ActiveTool.properties.getValue("ContainerID") !== "undefined")
|
if (inheritStackProvider.containerStackId != containerId)
|
||||||
{
|
{
|
||||||
const containerId = UM.ActiveTool.properties.getValue("ContainerID")
|
inheritStackProvider.containerStackId = containerId
|
||||||
if (provider.containerStackId != containerId)
|
|
||||||
{
|
|
||||||
provider.containerStackId = containerId
|
|
||||||
}
|
|
||||||
if (inheritStackProvider.containerStackId != containerId)
|
|
||||||
{
|
|
||||||
inheritStackProvider.containerStackId = containerId
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue