From bc0f4739083ea71521fdb9f5b4cd9a610e7f54d5 Mon Sep 17 00:00:00 2001
From: Joakim Bygdell <j.bygdell@gmail.com>
Date: Thu, 20 Jul 2017 21:19:26 +0200
Subject: [PATCH] QML UI: merge all GPS settings in one block

Put all GPS settings in one block and revert to a 2 column layout while maintaing the 4 column widh.

Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
---
 mobile-widgets/qml/Settings.qml | 35 ++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/mobile-widgets/qml/Settings.qml b/mobile-widgets/qml/Settings.qml
index 1391ef08f..5e4553518 100644
--- a/mobile-widgets/qml/Settings.qml
+++ b/mobile-widgets/qml/Settings.qml
@@ -289,43 +289,30 @@ Kirigami.ScrollablePage {
 			Kirigami.Label {
 				text: qsTr("Distance threshold (meters)")
 				Layout.alignment: Qt.AlignRight
-				Layout.preferredWidth: settingsPage.col1Width + settingsPage.col2Width
+				Layout.preferredWidth: settingsPage.col1Width + settingsPage.col2Width + settingsPage.col3Width
 			}
 
 			TextField {
 				id: distanceThreshold
 				text: manager.distanceThreshold
-				Layout.preferredWidth: settingsPage.col3Width + settingsPage.col4Width
+				Layout.preferredWidth: settingsPage.col4Width
 			}
 
 			Kirigami.Label {
 				text: qsTr("Time threshold (minutes)")
 				Layout.alignment: Qt.AlignRight
-				Layout.preferredWidth: settingsPage.col1Width + settingsPage.col2Width
+				Layout.preferredWidth: settingsPage.col1Width + settingsPage.col2Width + settingsPage.col3Width
 			}
 
 			TextField {
 				id: timeThreshold
 				text: manager.timeThreshold
-				Layout.preferredWidth: settingsPage.col3Width + settingsPage.col4Width
+				Layout.preferredWidth: settingsPage.col4Width
 			}
 
-			Item {
-				Layout.fillHeight: true
-			}
-		}
-		Rectangle {
-			color: subsurfaceTheme.darkerPrimaryColor
-			height: 1
-			opacity: 0.5
-			Layout.fillWidth: true
-		}
-		GridLayout {
-			id: locationService
-			columns: 4
-			width: parent.width
 			Kirigami.Label {
 				text: qsTr("Run location service")
+				Layout.alignment: Qt.AlignRight
 				Layout.preferredWidth: settingsPage.col1Width + settingsPage.col2Width + settingsPage.col3Width
 			}
 			Switch {
@@ -359,6 +346,12 @@ Kirigami.ScrollablePage {
 				}
 			}
 		}
+		Rectangle {
+			color: subsurfaceTheme.darkerPrimaryColor
+			height: 1
+			opacity: 0.5
+			Layout.fillWidth: true
+		}
 		GridLayout {
 			id: libdclogprefs
 			columns: 4
@@ -406,6 +399,12 @@ Kirigami.ScrollablePage {
 				}
 			}
 		}
+		Rectangle {
+			color: subsurfaceTheme.darkerPrimaryColor
+			height: 1
+			opacity: 0.5
+			Layout.fillWidth: true
+		}
 		GridLayout {
 			id: developer
 			columns: 4