From c780cfd7ce483c5e3e870c9c92c06a4f1995cbed Mon Sep 17 00:00:00 2001 From: Marco Martin Date: Tue, 8 Mar 2016 21:26:54 +0100 Subject: port to Kirigami imports and new api first quick and dirty port of the imports to Kirigami 1.0 (using system installed for now) adapt to api changes and try out some of the proposed ui changes from the HIG Signed-off-by: Marco Martin --- qt-mobile/qml/Log.qml | 45 ++++++++++++++++++++++----------------------- 1 file changed, 22 insertions(+), 23 deletions(-) (limited to 'qt-mobile/qml/Log.qml') diff --git a/qt-mobile/qml/Log.qml b/qt-mobile/qml/Log.qml index 8571a52fe..3b9520f7b 100644 --- a/qt-mobile/qml/Log.qml +++ b/qt-mobile/qml/Log.qml @@ -6,13 +6,14 @@ import QtQuick.Dialogs 1.2 import QtQuick.Layouts 1.1 import QtQuick.Window 2.2 import org.subsurfacedivelog.mobile 1.0 -import org.kde.plasma.mobilecomponents 0.2 as MobileComponents +import org.kde.kirigami 1.0 as Kirigami -MobileComponents.Page { +Kirigami.ScrollablePage { id: logWindow - width: parent.width - MobileComponents.Units.gridUnit - anchors.margins: MobileComponents.Units.gridUnit / 2 + width: parent.width - Kirigami.Units.gridUnit + anchors.margins: Kirigami.Units.gridUnit / 2 objectName: "Log" + title: "Application Log" /* this can be done by hitting the back key contextualActions: [ @@ -26,26 +27,24 @@ MobileComponents.Page { } ] */ - ScrollView { + + Flickable { + id: logFlick anchors.fill: parent - Flickable { - id: logFlick - anchors.fill: parent - contentHeight: logContent.height - clip: true - ColumnLayout { - width: logFlick.width - spacing: MobileComponents.Units.smallSpacing - MobileComponents.Heading { - text: "Application Log" - } - MobileComponents.Label { - id: logContent - Layout.preferredWidth: parent.width - Layout.maximumWidth: parent.width - wrapMode: TextEdit.WrapAtWordBoundaryOrAnywhere - text: manager.logText - } + contentHeight: logContent.height + clip: true + ColumnLayout { + width: logFlick.width + spacing: Kirigami.Units.smallSpacing + Kirigami.Heading { + text: "Application Log" + } + Kirigami.Label { + id: logContent + Layout.preferredWidth: parent.width + Layout.maximumWidth: parent.width + wrapMode: TextEdit.WrapAtWordBoundaryOrAnywhere + text: manager.logText } } } -- cgit v1.2.3-70-g09d2