From 3a7ecc1a7f1b993e64ce7685df559f7f6fae0edf Mon Sep 17 00:00:00 2001
From: Dirk Hohndel <dirk@hohndel.org>
Date: Sun, 9 Jul 2017 18:47:18 -0700
Subject: QML UI: make Preferences page scrollable

This commit only has the actual changes, the next commit will clean up
the white space in order to make it more obvious what was done.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
---
 mobile-widgets/qml/Preferences.qml | 47 +++++++++++++-------------------------
 1 file changed, 16 insertions(+), 31 deletions(-)

(limited to 'mobile-widgets/qml')

diff --git a/mobile-widgets/qml/Preferences.qml b/mobile-widgets/qml/Preferences.qml
index 9dc73ba7b..af18babbb 100644
--- a/mobile-widgets/qml/Preferences.qml
+++ b/mobile-widgets/qml/Preferences.qml
@@ -7,9 +7,11 @@ import QtQuick.Layouts 1.1
 import org.kde.kirigami 2.0 as Kirigami
 import org.subsurfacedivelog.mobile 1.0
 
-Kirigami.Page {
-
+Kirigami.ScrollablePage {
+	objectName: "Preferences"
 	title: qsTr("Preferences")
+	anchors.margins: Kirigami.Units.gridUnit / 2
+
 	actions {
 		main: Kirigami.Action {
 			text: qsTr("Save")
@@ -23,29 +25,16 @@ Kirigami.Page {
 			}
 		}
 	}
-
+	ColumnLayout {
+		width: parent.width - Kirigami.Units.gridUnit
 	GridLayout {
 		id: themePrefs
 		columns: 2
-		width: parent.width - Kirigami.Units.gridUnit
-		anchors {
-			top: parent.top
-			left: parent.left
-			right: parent.right
-			margins: Kirigami.Units.gridUnit / 2
-		}
-
-		Kirigami.Heading {
-			text: qsTr("Preferences")
-			color: subsurfaceTheme.textColor
-			Layout.bottomMargin: Kirigami.Units.largeSpacing / 2
-			Layout.columnSpan: 2
-		}
 
 		Kirigami.Heading {
 			text: qsTr("Theme")
 			color: subsurfaceTheme.textColor
-			level: 3
+			level: 4
 			Layout.topMargin: Kirigami.Units.largeSpacing
 			Layout.bottomMargin: Kirigami.Units.largeSpacing / 2
 			Layout.columnSpan: 2
@@ -252,16 +241,12 @@ Kirigami.Page {
 	GridLayout {
 		id: gpsPrefs
 		columns: 2
-		width: parent.width - Kirigami.Units.gridUnit
-		anchors {
-			top: themePrefs.bottom
-			margins: Kirigami.Units.gridUnit / 2
-		}
+		width: parent.width
 
 		Kirigami.Heading {
 			text: qsTr("Subsurface GPS data webservice")
 			color: subsurfaceTheme.textColor
-			level: 3
+			level: 4
 			Layout.topMargin: Kirigami.Units.largeSpacing
 			Layout.bottomMargin: Kirigami.Units.largeSpacing / 2
 			Layout.columnSpan: 2
@@ -294,16 +279,13 @@ Kirigami.Page {
 		}
 	}
 	GridLayout {
+		id: libdclogprefs
 		columns: 2
-		width: parent.width - Kirigami.Units.gridUnit
-		anchors {
-			top: gpsPrefs.bottom
-			margins: Kirigami.Units.gridUnit / 2
-		}
+		width: parent.width
 		Kirigami.Heading {
 			text: qsTr("Debug log for download from divecomputer")
 			color: subsurfaceTheme.textColor
-			level: 3
+			level: 4
 			Layout.topMargin: Kirigami.Units.largeSpacing
 			Layout.bottomMargin: Kirigami.Units.largeSpacing / 2
 			Layout.columnSpan: 2
@@ -338,6 +320,9 @@ Kirigami.Page {
 		Kirigami.Label {
 			text: qsTr("Save detailed log of interaction with the dive computer")
 		}
-
+	}
+	Item {
+		height: Kirigami.Units.gridUnit * 6
+	}
 	}
 }
-- 
cgit v1.2.3-70-g09d2