3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-11-02 20:52:20 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Reduce number of QML singletons

Browse source
This commit is contained in:
Lipu Fei 2018-02-22 14:21:10 +01:00
parent b415a36110
commit 392f729731
5 changed files with 30 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

14
resources/qml/ObjectsList.qml
View file

@ -33,6 +33,8 @@ Rectangle
property bool collapsed: true;
property Cura.MultiBuildPlateModel multiBuildPlateModel: CuraApplication.getMultiBuildPlateModel()
SystemPalette { id: palette }
Button {
@ -67,7 +69,7 @@ Rectangle
Rectangle
{
height: childrenRect.height
color: Cura.MultiBuildPlateModel.getItem(index).buildPlateNumber == Cura.MultiBuildPlateModel.activeBuildPlate ? palette.highlight : index % 2 ? palette.base : palette.alternateBase
color: multiBuildPlateModel.getItem(index).buildPlateNumber == multiBuildPlateModel.activeBuildPlate ? palette.highlight : index % 2 ? palette.base : palette.alternateBase
width: parent.width
Label
{
@ -75,8 +77,8 @@ Rectangle
anchors.left: parent.left
anchors.leftMargin: UM.Theme.getSize("default_margin").width
width: parent.width - 2 * UM.Theme.getSize("default_margin").width - 30
text: Cura.MultiBuildPlateModel.getItem(index) ? Cura.MultiBuildPlateModel.getItem(index).name : "";
color: Cura.MultiBuildPlateModel.activeBuildPlate == index ? palette.highlightedText : palette.text
text: multiBuildPlateModel.getItem(index) ? multiBuildPlateModel.getItem(index).name : "";
color: multiBuildPlateModel.activeBuildPlate == index ? palette.highlightedText : palette.text
elide: Text.ElideRight
}
@ -118,13 +120,12 @@ Rectangle
ListView
{
id: buildPlateListView
model: Cura.MultiBuildPlateModel
model: multiBuildPlateModel
width: parent.width
delegate: buildPlateDelegate
}
}
Component {
id: objectDelegate
Rectangle
@ -200,7 +201,6 @@ Rectangle
}
}
CheckBox
{
id: filterBuildPlateCheckbox
@ -260,6 +260,4 @@ Rectangle
}
action: Cura.Actions.arrangeAll;
}
}