diff options
| author |  Marco Martin <notmart@gmail.com> | 2016-04-22 18:12:15 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2016-04-26 10:06:44 -0700 |
| commit | 7d9c30668538e887f5a193ed4fdd385f83798062 (patch) | |
| tree | 34ec028acc37fb2bc7e92c806c1e12ba0bb64db7 /mobile-widgets | |
| parent | bc28944abb4d6640dec22226993f0e72bef2720b (diff) | |
| download | subsurface-7d9c30668538e887f5a193ed4fdd385f83798062.tar.gz | |
Adapt to Kirigami api changes
* add new file AbstractApplicationHeader.qml to the qrc
* add new file AbstractApplicationWindow.qml to the qrc
* use new api for custom ApplicationHeader
header: Kirigami.ApplicationHeader {
minimumHeight: 0
preferredHeight: Kirigami.Units.gridUnit * (Qt.platform.os == "ios" ? 2 : 1)
maximumHeight: Kirigami.Units.gridUnit * 2
}
Signed-off-by: Marco Martin <notmart@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'mobile-widgets')
| -rw-r--r-- | mobile-widgets/qml/main.qml | 8 | ||||
| -rw-r--r-- | mobile-widgets/qml/mobile-resources.qrc | 4 |
2 files changed, 8 insertions, 4 deletions
diff --git a/mobile-widgets/qml/main.qml b/mobile-widgets/qml/main.qml index 06e691eee..e1a140635 100644 --- a/mobile-widgets/qml/main.qml +++ b/mobile-widgets/qml/main.qml @@ -12,9 +12,11 @@ Kirigami.ApplicationWindow { id: rootItem title: qsTr("Subsurface-mobile") - header.minimumHeight: 0 - header.preferredHeight: Kirigami.Units.gridUnit * (Qt.platform.os == "ios" ? 2 : 1) - header.maximumHeight: Kirigami.Units.gridUnit * 2 + header: Kirigami.ApplicationHeader { + minimumHeight: 0 + preferredHeight: Kirigami.Units.gridUnit * (Qt.platform.os == "ios" ? 2 : 1) + maximumHeight: Kirigami.Units.gridUnit * 2 + } property bool fullscreen: true property alias oldStatus: manager.oldStatus property alias accessingCloud: manager.accessingCloud diff --git a/mobile-widgets/qml/mobile-resources.qrc b/mobile-widgets/qml/mobile-resources.qrc index 0592c1119..6157e3bf6 100644 --- a/mobile-widgets/qml/mobile-resources.qrc +++ b/mobile-widgets/qml/mobile-resources.qrc @@ -35,6 +35,8 @@ <file alias="org/kde/kirigami/Heading.qml">kirigami/Heading.qml</file> <file alias="org/kde/kirigami/OverlaySheet.qml">kirigami/OverlaySheet.qml</file> <file alias="org/kde/kirigami/ApplicationHeader.qml">kirigami/ApplicationHeader.qml</file> + <file alias="org/kde/kirigami/AbstractApplicationHeader.qml">kirigami/AbstractApplicationHeader.qml</file> + <file alias="org/kde/kirigami/AbstractApplicationWindow.qml">kirigami/AbstractApplicationWindow.qml</file> <file alias="org/kde/kirigami/private/PageRow.qml">kirigami/private/PageRow.qml</file> <file alias="org/kde/kirigami/Label.qml">kirigami/Label.qml</file> <file alias="org/kde/kirigami/AbstractListItem.qml">kirigami/AbstractListItem.qml</file> @@ -48,7 +50,7 @@ <file alias="org/kde/kirigami/private/ContextIcon.qml">kirigami/private/ContextIcon.qml</file> <file alias="org/kde/kirigami/private/EdgeShadow.qml">kirigami/private/EdgeShadow.qml</file> <file alias="org/kde/kirigami/private/MenuIcon.qml">kirigami/private/MenuIcon.qml</file> - <file alias="org/kde/kirigami/private/PageStack.js">kirigami/private/PageStack.js</file> + <file alias="org/kde/kirigami/private/DefaultListItemBackground.qml">kirigami/private/DefaultListItemBackground.qml</file> <file alias="org/kde/kirigami/private/PageActionPropertyGroup.qml">kirigami/private/PageActionPropertyGroup.qml</file> <file alias="org/kde/kirigami/private/PassiveNotification.qml">kirigami/private/PassiveNotification.qml</file> <file alias="org/kde/kirigami/private/RefreshableScrollView.qml">kirigami/private/RefreshableScrollView.qml</file> |