sync with mobilecomponents a85365111 + patches

This is the latest state of the upstream art from Plasma, plus our
patches to disable the gamma effect on the icon, and the drawer removed.

Signed-off-by: Sebastian Kügler <sebas@kde.org>
This commit is contained in:
Sebastian Kügler 2016-01-06 04:40:33 +01:00
parent 8664925e20
commit 548d6fc956
11 changed files with 553 additions and 904 deletions

View file

@ -142,51 +142,30 @@ OverlayDrawer {
interactive: contentHeight > height
footer: ListItem {
footer: BasicListItem {
visible: level > 0
enabled: true
RowLayout {
height: Units.iconSizes.smallMedium + Units.smallSpacing * 2
anchors {
left: parent.left
}
Icon {
Layout.minimumWidth: height
Layout.maximumWidth: Layout.minimumWidth
Layout.fillHeight: true
source: "go-previous"
}
Label {
text: typeof i18n !== "undefined" ? i18n("Back") : "Back"
}
}
icon: "go-previous"
label: typeof i18n !== "undefined" ? i18n("Back") : "Back"
onClicked: pageRow.pop()
}
delegate: ListItem {
delegate: BasicListItem {
enabled: true
RowLayout {
height: implicitHeight + Units.smallSpacing * 2
checked: modelData.checked
icon: modelData.iconName
label: modelData.text
Icon {
anchors {
left: parent.left
top: parent.top
bottom: parent.bottom
right: parent.right
}
Icon {
Layout.maximumWidth: height
Layout.fillHeight: true
source: modelData.iconName
}
Label {
Layout.fillWidth: true
text: modelData.text
}
Icon {
Layout.minimumWidth: height
Layout.maximumWidth: Layout.minimumWidth
Layout.fillHeight: true
source: "go-next"
visible: modelData.children != undefined
}
width: height
source: "go-next"
visible: modelData.children != undefined
}
onClicked: {
if (modelData.children) {
pageRow.push(menuComponent, {"model": modelData.children, "level": level + 1});