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>
This commit is contained in:
Joakim Bygdell 2017-07-20 21:19:26 +02:00 committed by Dirk Hohndel
parent a56e98ffc6
commit bc0f473908

View file

@ -289,43 +289,30 @@ Kirigami.ScrollablePage {
Kirigami.Label { Kirigami.Label {
text: qsTr("Distance threshold (meters)") text: qsTr("Distance threshold (meters)")
Layout.alignment: Qt.AlignRight Layout.alignment: Qt.AlignRight
Layout.preferredWidth: settingsPage.col1Width + settingsPage.col2Width Layout.preferredWidth: settingsPage.col1Width + settingsPage.col2Width + settingsPage.col3Width
} }
TextField { TextField {
id: distanceThreshold id: distanceThreshold
text: manager.distanceThreshold text: manager.distanceThreshold
Layout.preferredWidth: settingsPage.col3Width + settingsPage.col4Width Layout.preferredWidth: settingsPage.col4Width
} }
Kirigami.Label { Kirigami.Label {
text: qsTr("Time threshold (minutes)") text: qsTr("Time threshold (minutes)")
Layout.alignment: Qt.AlignRight Layout.alignment: Qt.AlignRight
Layout.preferredWidth: settingsPage.col1Width + settingsPage.col2Width Layout.preferredWidth: settingsPage.col1Width + settingsPage.col2Width + settingsPage.col3Width
} }
TextField { TextField {
id: timeThreshold id: timeThreshold
text: manager.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 { Kirigami.Label {
text: qsTr("Run location service") text: qsTr("Run location service")
Layout.alignment: Qt.AlignRight
Layout.preferredWidth: settingsPage.col1Width + settingsPage.col2Width + settingsPage.col3Width Layout.preferredWidth: settingsPage.col1Width + settingsPage.col2Width + settingsPage.col3Width
} }
Switch { Switch {
@ -359,6 +346,12 @@ Kirigami.ScrollablePage {
} }
} }
} }
Rectangle {
color: subsurfaceTheme.darkerPrimaryColor
height: 1
opacity: 0.5
Layout.fillWidth: true
}
GridLayout { GridLayout {
id: libdclogprefs id: libdclogprefs
columns: 4 columns: 4
@ -406,6 +399,12 @@ Kirigami.ScrollablePage {
} }
} }
} }
Rectangle {
color: subsurfaceTheme.darkerPrimaryColor
height: 1
opacity: 0.5
Layout.fillWidth: true
}
GridLayout { GridLayout {
id: developer id: developer
columns: 4 columns: 4