diff options
| author | Aleix Pol <aleixpol@kde.org> | 2015-10-19 14:22:52 (GMT) |
|---|---|---|
| committer | Aleix Pol <aleixpol@kde.org> | 2015-10-19 14:22:52 (GMT) |
| commit | 31b47462a386315bb898761542971daaef122fae (patch) | |
| tree | 5f9198aadc8cbe871c6b7b1d770ec43a0ae68c67 | |
| parent | 229612fba2cee65937a6daba6ddf0ed7184c364e (diff) | |
Generalize the padding in the PageHeader
This way all of the pages look similar
| -rw-r--r-- | discover/qml/PageHeader.qml | 17 | ||||
| -rw-r--r-- | discover/qml/PresentUpdatesPage.qml | 11 | ||||
| -rw-r--r-- | discover/qml/SourcesPage.qml | 3 |
3 files changed, 18 insertions, 13 deletions
diff --git a/discover/qml/PageHeader.qml b/discover/qml/PageHeader.qml index f6165df..d141993 100644 --- a/discover/qml/PageHeader.qml +++ b/discover/qml/PageHeader.qml @@ -17,7 +17,22 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -GridItem { +import QtQuick 2.0 + +GridItem +{ + id: root height: 50 hoverEnabled: false + + readonly property real internalMargin: 5 + + default property alias content: paddingItem.data + Item { + id: paddingItem + anchors { + fill: parent + margins: root.internalMargin + } + } } diff --git a/discover/qml/PresentUpdatesPage.qml b/discover/qml/PresentUpdatesPage.qml index 6d2769c..9965ba9 100644 --- a/discover/qml/PresentUpdatesPage.qml +++ b/discover/qml/PresentUpdatesPage.qml @@ -24,32 +24,23 @@ ScrollView Layout.fillWidth: true ConditionalLoader { - anchors { - left: parent.left - right: parent.right - verticalCenter: parent.verticalCenter - margins: 10 - } + anchors.fill: parent condition: resourcesUpdatesModel.isProgressing componentFalse: RowLayout { LabelBackground { - anchors.verticalCenter: parent.verticalCenter text: updateModel.toUpdateCount } Label { - anchors.verticalCenter: parent.verticalCenter text: i18n("updates selected") } LabelBackground { id: unselectedItem readonly property int unselected: (updateModel.totalUpdatesCount - updateModel.toUpdateCount) - anchors.verticalCenter: parent.verticalCenter text: unselected visible: unselected>0 } Label { - anchors.verticalCenter: parent.verticalCenter text: i18n("updates not selected") visible: unselectedItem.visible } diff --git a/discover/qml/SourcesPage.qml b/discover/qml/SourcesPage.qml index cdd0624..2b00fa0 100644 --- a/discover/qml/SourcesPage.qml +++ b/discover/qml/SourcesPage.qml @@ -24,8 +24,7 @@ Item { model: SourcesModel - header: GridItem { - height: 50 + header: PageHeader { x: page.proposedMargin width: app.actualWidth hoverEnabled: false |