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

Replace old ScrollView with new ListView

Browse source 
I also swapped out the old NewControls import to just be the actual Controls, and used OldControls to import the Controls1 module. This is consistent with the rest of the code base as far as I could find.

Contributes to issue CURA-8686.
This commit is contained in:
Ghostkeeper 2022-01-18 18:43:27 +01:00
parent 4614b3a9e1
commit bb32f25b49
No known key found for this signature in database
GPG key ID: D2A8871EE34EC59A
1 changed files with 40 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

86
resources/qml/Preferences/SettingVisibilityPage.qml
View file

@ -1,13 +1,11 @@
// Copyright (c) 2016 Ultimaker B.V. // Copyright (c) 2022 Ultimaker B.V.
// Cura is released under the terms of the LGPLv3 or higher. // Cura is released under the terms of the LGPLv3 or higher.
import QtQuick 2.1 import QtQuick 2.1
import QtQuick.Controls 1.1 import QtQuick.Controls 2.15
import QtQuick.Controls.Styles 1.1 import QtQuick.Controls 1.1 as OldControls
import QtQuick.Controls 2.3 as NewControls import UM 1.5 as UM
import UM 1.2 as UM
import Cura 1.0 as Cura import Cura 1.0 as Cura
@ -36,7 +34,7 @@ UM.PreferencesPage
id: base; id: base;
anchors.fill: parent; anchors.fill: parent;
CheckBox OldControls.CheckBox
{ {
id: toggleVisibleSettings id: toggleVisibleSettings
anchors anchors
@ -98,7 +96,7 @@ UM.PreferencesPage
onTextChanged: definitionsModel.filter = {"i18n_label|i18n_description": "*" + text} onTextChanged: definitionsModel.filter = {"i18n_label|i18n_description": "*" + text}
} }
NewControls.ComboBox ComboBox
{ {
id: visibilityPreset id: visibilityPreset
width: 150 * screenScaleFactor width: 150 * screenScaleFactor
@ -106,7 +104,7 @@ UM.PreferencesPage
{ {
top: parent.top top: parent.top
right: parent.right right: parent.right
bottom: scrollView.top bottom: settingsListView.top
} }
model: settingVisibilityPresetsModel.items model: settingVisibilityPresetsModel.items
@ -133,12 +131,9 @@ UM.PreferencesPage
} }
} }
ScrollView ListView
{ {
id: scrollView id: settingsListView
frameVisible: true
anchors anchors
{ {
top: filter.bottom; top: filter.bottom;
@ -147,42 +142,41 @@ UM.PreferencesPage
right: parent.right; right: parent.right;
bottom: parent.bottom; bottom: parent.bottom;
} }
ListView
clip: true
ScrollBar.vertical: UM.ScrollBar {}
model: UM.SettingDefinitionsModel
{ {
id: settingsListView id: definitionsModel
containerId: Cura.MachineManager.activeMachine != null ? Cura.MachineManager.activeMachine.definition.id: ""
showAll: true
exclude: ["machine_settings", "command_line_settings"]
showAncestors: true
expanded: ["*"]
visibilityHandler: UM.SettingPreferenceVisibilityHandler {}
}
model: UM.SettingDefinitionsModel delegate: Loader
{
id: loader
width: settingsListView.width
height: model.type != undefined ? UM.Theme.getSize("section").height : 0
property var definition: model
property var settingDefinitionsModel: definitionsModel
asynchronous: true
active: model.type != undefined
sourceComponent:
{ {
id: definitionsModel switch(model.type)
containerId: Cura.MachineManager.activeMachine != null ? Cura.MachineManager.activeMachine.definition.id: ""
showAll: true
exclude: ["machine_settings", "command_line_settings"]
showAncestors: true
expanded: ["*"]
visibilityHandler: UM.SettingPreferenceVisibilityHandler {}
}
delegate: Loader
{
id: loader
width: settingsListView.width
height: model.type != undefined ? UM.Theme.getSize("section").height : 0
property var definition: model
property var settingDefinitionsModel: definitionsModel
asynchronous: true
active: model.type != undefined
sourceComponent:
{ {
switch(model.type) case "category":
{ return settingVisibilityCategory
case "category": default:
return settingVisibilityCategory return settingVisibilityItem
default:
return settingVisibilityItem
}
} }
} }
} }