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

Update PerObjectCategory to QtQuick.Controls 2.1

Browse source 
CURA-8684
This commit is contained in:
casper 2022-01-19 15:37:59 +01:00
parent 204d965df2
commit f2ee58a08b
1 changed files with 32 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

68
plugins/PerObjectSettingsTool/PerObjectCategory.qml
View file

@ -1,10 +1,8 @@
// Copyright (c) 2015 Ultimaker B.V. // Copyright (c) 2022 Ultimaker B.V.
// Uranium is released under the terms of the LGPLv3 or higher. // Uranium is released under the terms of the LGPLv3 or higher.
import QtQuick 2.2 import QtQuick 2.2
import QtQuick.Controls 1.1 import QtQuick.Controls 2.1
import QtQuick.Controls.Styles 1.1
import QtQuick.Layouts 1.1
import UM 1.1 as UM import UM 1.1 as UM
@ -13,39 +11,38 @@ import ".."
Button { Button {
id: base; id: base;
style: ButtonStyle { background: Item { }
background: Item { }
label: Row contentItem: Row
{
spacing: UM.Theme.getSize("default_lining").width
UM.RecolorImage
{ {
spacing: UM.Theme.getSize("default_lining").width anchors.verticalCenter: parent.verticalCenter
height: (label.height / 2) | 0
UM.RecolorImage width: height
{ source: base.checked ? UM.Theme.getIcon("ChevronSingleDown") : UM.Theme.getIcon("ChevronSingleRight");
anchors.verticalCenter: parent.verticalCenter color: base.hovered ? palette.highlight : palette.buttonText
height: (label.height / 2) | 0
width: height
source: control.checked ? UM.Theme.getIcon("ChevronSingleDown") : UM.Theme.getIcon("ChevronSingleRight");
color: control.hovered ? palette.highlight : palette.buttonText
}
UM.RecolorImage
{
anchors.verticalCenter: parent.verticalCenter
height: label.height
width: height
source: control.iconSource
color: control.hovered ? palette.highlight : palette.buttonText
}
Label
{
id: label
anchors.verticalCenter: parent.verticalCenter
text: control.text
color: control.hovered ? palette.highlight : palette.buttonText
font.bold: true
}
SystemPalette { id: palette }
} }
UM.RecolorImage
{
anchors.verticalCenter: parent.verticalCenter
height: label.height
width: height
source: UM.Theme.getIcon(definition.icon)
color: base.hovered ? palette.highlight : palette.buttonText
}
Label
{
id: label
anchors.verticalCenter: parent.verticalCenter
text: base.text
color: base.hovered ? palette.highlight : palette.buttonText
font.bold: true
}
SystemPalette { id: palette }
} }
signal showTooltip(string text); signal showTooltip(string text);
@ -53,7 +50,6 @@ Button {
signal contextMenuRequested() signal contextMenuRequested()
text: definition.label text: definition.label
iconSource: UM.Theme.getIcon(definition.icon)
checkable: true checkable: true
checked: definition.expanded checked: definition.expanded