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 <notmart@gmail.com>

1 files changed, 48 insertions, 51 deletions

diff --git a/qt-mobile/qml/About.qml b/qt-mobile/qml/About.qml
index 2655401f6..9b1b69c8b 100644
--- a/qt-mobile/qml/About.qml
+++ b/qt-mobile/qml/About.qml
@@ -1,66 +1,63 @@
 import QtQuick 2.3
 import QtQuick.Controls 1.2
 import QtQuick.Layouts 1.1
-import org.kde.plasma.mobilecomponents 0.2 as MobileComponents
+import org.kde.kirigami 1.0 as Kirigami
 import org.subsurfacedivelog.mobile 1.0
 
-MobileComponents.Page {
+Kirigami.ScrollablePage {
 	id: aboutPage
-	property int pageWidth: subsurfaceTheme.columnWidth - MobileComponents.Units.gridUnit
+	property int pageWidth: subsurfaceTheme.columnWidth - Kirigami.Units.gridUnit
+	title: "About Subsurface-mobile"
 
-	ScrollView {
-		anchors.fill: parent
+	ColumnLayout {
+		spacing: Kirigami.Units.largeSpacing
+		width: aboutPage.width
+		Layout.margins: Kirigami.Units.gridUnit / 2
 
-		ColumnLayout {
-			spacing: MobileComponents.Units.largeSpacing
-			width: aboutPage.width
-			Layout.margins: MobileComponents.Units.gridUnit / 2
-
-			MobileComponents.Heading {
-				text: "About Subsurface-mobile"
-				Layout.margins: MobileComponents.Units.largeSpacing / 2
-				Layout.alignment: Qt.AlignHCenter
-				Layout.maximumWidth: pageWidth
-				wrapMode: TextEdit.WrapAtWordBoundaryOrAnywhere
-			}
+		Kirigami.Heading {
+			text: "About Subsurface-mobile"
+			Layout.margins: Kirigami.Units.largeSpacing / 2
+			Layout.alignment: Qt.AlignHCenter
+			Layout.maximumWidth: pageWidth
+			wrapMode: TextEdit.WrapAtWordBoundaryOrAnywhere
+		}
 
-			Rectangle {
-				color: "transparent"
-				Layout.margins: MobileComponents.Units.largeSpacing
-				Layout.fillWidth: true
-				height: childrenRect.height
-				Image {
-					id: image
-					source: "qrc:/qml/subsurface-mobile-icon.png"
-					width: parent.width - MobileComponents.Units.largeSpacing
-					fillMode: Image.PreserveAspectFit
-					horizontalAlignment: Image.AlignHCenter
-				}
+		Rectangle {
+			color: "transparent"
+			Layout.margins: Kirigami.Units.largeSpacing
+			Layout.fillWidth: true
+			Layout.minimumHeight: childrenRect.height
+			Image {
+				id: image
+				source: "qrc:/qml/subsurface-mobile-icon.png"
+				width: parent.width - Kirigami.Units.largeSpacing
+				fillMode: Image.PreserveAspectFit
+				horizontalAlignment: Image.AlignHCenter
 			}
+		}
 
-			MobileComponents.Heading {
-				text: "A mobile version of the free Subsurface divelog software.\n" +
-				      "View your dive logs while on the go."
-				level: 4
-				Layout.alignment: Qt.AlignHCenter
-				Layout.topMargin: MobileComponents.Units.largeSpacing * 3
-				Layout.maximumWidth: pageWidth
-				wrapMode: TextEdit.WrapAtWordBoundaryOrAnywhere
-				anchors.horizontalCenter: parent.Center
-				horizontalAlignment: Text.AlignHCenter
-			}
+		Kirigami.Heading {
+			text: "A mobile version of the free Subsurface divelog software.\n" +
+				"View your dive logs while on the go."
+			level: 4
+			Layout.alignment: Qt.AlignHCenter
+			Layout.topMargin: Kirigami.Units.largeSpacing * 3
+			Layout.maximumWidth: pageWidth
+			wrapMode: TextEdit.WrapAtWordBoundaryOrAnywhere
+			anchors.horizontalCenter: parent.Center
+			horizontalAlignment: Text.AlignHCenter
+		}
 
-			MobileComponents.Heading {
-				text: "Version: " + manager.getVersion() + "\n\n© Subsurface developer team\n2011-2016"
-				level: 5
-				font.pointSize: subsurfaceTheme.smallPointSize + 1
-				Layout.alignment: Qt.AlignHCenter
-				Layout.topMargin: MobileComponents.Units.largeSpacing
-				Layout.maximumWidth: pageWidth
-				wrapMode: TextEdit.WrapAtWordBoundaryOrAnywhere
-				anchors.horizontalCenter: parent.Center
-				horizontalAlignment: Text.AlignHCenter
-			}
+		Kirigami.Heading {
+			text: "Version: " + manager.getVersion() + "\n\n© Subsurface developer team\n2011-2016"
+			level: 5
+			font.pointSize: subsurfaceTheme.smallPointSize + 1
+			Layout.alignment: Qt.AlignHCenter
+			Layout.topMargin: Kirigami.Units.largeSpacing
+			Layout.maximumWidth: pageWidth
+			wrapMode: TextEdit.WrapAtWordBoundaryOrAnywhere
+			anchors.horizontalCenter: parent.Center
+			horizontalAlignment: Text.AlignHCenter
 		}
 	}
 }