diff options
author | Joakim Bygdell <j.bygdell@gmail.com> | 2017-07-20 21:19:26 +0200 |
---|---|---|
committer | Dirk Hohndel <dirk@hohndel.org> | 2017-07-23 03:20:58 +0900 |
commit | bc0f4739083ea71521fdb9f5b4cd9a610e7f54d5 (patch) | |
tree | f459462e9cbf29d734daecab50d3786e2c96e216 /mobile-widgets/qml/Settings.qml | |
parent | a56e98ffc627c740de600a696725cc5b351327de (diff) | |
download | subsurface-bc0f4739083ea71521fdb9f5b4cd9a610e7f54d5.tar.gz |
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>
Diffstat (limited to 'mobile-widgets/qml/Settings.qml')
-rw-r--r-- | mobile-widgets/qml/Settings.qml | 35 |
1 files 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 |