diff --git a/src/qml/QFieldSettings.qml b/src/qml/QFieldSettings.qml
index 936f5e57ae..c33cd1ce0f 100644
--- a/src/qml/QFieldSettings.qml
+++ b/src/qml/QFieldSettings.qml
@@ -1047,11 +1047,30 @@ Page {
GridLayout {
Layout.fillWidth: true
+ Layout.leftMargin: 20
+ Layout.rightMargin: 20
columns: 2
columnSpacing: 0
rowSpacing: 5
+ Label {
+ text: qsTr('User Interface')
+ font: Theme.strongFont
+ color: Theme.mainColor
+ wrapMode: Text.WordWrap
+ Layout.fillWidth: true
+ Layout.topMargin: 5
+ Layout.columnSpan: 2
+ }
+
+ Rectangle {
+ Layout.fillWidth: true
+ Layout.columnSpan: 2
+ height: 1
+ color: Theme.mainColor
+ }
+
Label {
text: qsTr("Show position information")
font: Theme.defaultFont
@@ -1075,60 +1094,6 @@ Page {
}
}
- Label {
- id: measureLabel
- Layout.fillWidth: true
- Layout.columnSpan: 2
- text: qsTr("Measure (M) value attached to vertices:")
- font: Theme.defaultFont
- color: Theme.mainTextColor
-
- wrapMode: Text.WordWrap
- }
-
- ComboBox {
- id: measureComboBox
- Layout.fillWidth: true
- Layout.columnSpan: 2
- Layout.alignment: Qt.AlignVCenter
- font: Theme.defaultFont
-
- popup.font: Theme.defaultFont
- popup.topMargin: mainWindow.sceneTopMargin
- popup.bottomMargin: mainWindow.sceneTopMargin
-
- property bool loaded: false
- Component.onCompleted: {
- // This list matches the Tracker::MeasureType enum, with SecondsSinceStart removed
- var measurements = [qsTr("Timestamp (milliseconds since epoch)"), qsTr("Ground speed"), qsTr("Bearing"), qsTr("Horizontal accuracy"), qsTr("Vertical accuracy"), qsTr("PDOP"), qsTr("HDOP"), qsTr("VDOP")];
- measureComboBox.model = measurements;
- measureComboBox.currentIndex = positioningSettings.digitizingMeasureType - 1;
- loaded = true;
- }
-
- onCurrentIndexChanged: {
- if (loaded) {
- positioningSettings.digitizingMeasureType = currentIndex + 1;
- }
- }
- }
-
- Label {
- id: measureTipLabel
- Layout.fillWidth: true
- text: qsTr("When digitizing features with the coordinate cursor locked to the current position, the measurement type selected above will be added to the geometry provided it has an M dimension.")
- font: Theme.tipFont
- color: Theme.secondaryTextColor
-
- wrapMode: Text.WordWrap
- }
-
- Item {
- // spacer item
- Layout.fillWidth: true
- Layout.fillHeight: true
- }
-
Label {
text: qsTr("Activate accuracy indicator")
font: Theme.defaultFont
@@ -1230,6 +1195,43 @@ Page {
}
}
+ Label {
+ text: qsTr("When the accuracy indicator is enabled, a badge is attached to the location button and colored red if the accuracy value is worse than bad, yellow if it falls short of excellent, or green.").arg("style='%1'".arg(Theme.toInlineStyles({
+ "color": Theme.accuracyBad
+ }))).arg("style='%1'".arg(Theme.toInlineStyles({
+ "color": Theme.accuracyTolerated
+ }))).arg("style='%1'".arg(Theme.toInlineStyles({
+ "color": Theme.accuracyExcellent
+ })))
+ font: Theme.tipFont
+ color: Theme.secondaryTextColor
+ textFormat: Qt.RichText
+ wrapMode: Text.WordWrap
+ Layout.fillWidth: true
+ }
+
+ Item {
+ // empty cell in grid layout
+ width: 1
+ }
+
+ Label {
+ text: qsTr('Digitizing')
+ font: Theme.strongFont
+ color: Theme.mainColor
+ wrapMode: Text.WordWrap
+ Layout.fillWidth: true
+ Layout.topMargin: 20
+ Layout.columnSpan: 2
+ }
+
+ Rectangle {
+ Layout.fillWidth: true
+ Layout.columnSpan: 2
+ height: 1
+ color: Theme.mainColor
+ }
+
Label {
text: qsTr("Enforce accuracy requirement")
font: Theme.defaultFont
@@ -1238,11 +1240,10 @@ Page {
visible: accuracyIndicator.checked
wrapMode: Text.WordWrap
Layout.fillWidth: true
- Layout.leftMargin: 8
MouseArea {
anchors.fill: parent
- onClicked: accuracyIndicator.toggle()
+ onClicked: accuracyRequirement.toggle()
}
}
@@ -1259,23 +1260,64 @@ Page {
}
Label {
- text: qsTr("When the accuracy indicator is enabled, a badge is attached to the location button and colored red if the accuracy value is worse than bad, yellow if it falls short of excellent, or green.
In addition, an accuracy restriction mode can be toggled on, which restricts vertex addition when locked to coordinate cursor to positions with an accuracy value worse than the bad threshold.").arg("style='%1'".arg(Theme.toInlineStyles({
- "color": Theme.accuracyBad
- }))).arg("style='%1'".arg(Theme.toInlineStyles({
- "color": Theme.accuracyTolerated
- }))).arg("style='%1'".arg(Theme.toInlineStyles({
- "color": Theme.accuracyExcellent
- })))
+ text: qsTr("In addition, an accuracy restriction mode can be toggled on, which restricts vertex addition when locked to coordinate cursor to positions with an accuracy value worse than the bad threshold.")
font: Theme.tipFont
color: Theme.secondaryTextColor
textFormat: Qt.RichText
wrapMode: Text.WordWrap
Layout.fillWidth: true
+ Layout.columnSpan: 2
+ enabled: accuracyIndicator.checked
+ visible: accuracyIndicator.checked
}
- Item {
- // empty cell in grid layout
- width: 1
+ Label {
+ id: measureLabel
+ Layout.fillWidth: true
+ Layout.columnSpan: 2
+ text: qsTr("Measure (M) value attached to vertices:")
+ font: Theme.defaultFont
+ color: Theme.mainTextColor
+
+ wrapMode: Text.WordWrap
+ }
+
+ ComboBox {
+ id: measureComboBox
+ Layout.fillWidth: true
+ Layout.columnSpan: 2
+ Layout.alignment: Qt.AlignVCenter
+ font: Theme.defaultFont
+
+ popup.font: Theme.defaultFont
+ popup.topMargin: mainWindow.sceneTopMargin
+ popup.bottomMargin: mainWindow.sceneTopMargin
+
+ property bool loaded: false
+ Component.onCompleted: {
+ // This list matches the Tracker::MeasureType enum, with SecondsSinceStart removed
+ var measurements = [qsTr("Timestamp (milliseconds since epoch)"), qsTr("Ground speed"), qsTr("Bearing"), qsTr("Horizontal accuracy"), qsTr("Vertical accuracy"), qsTr("PDOP"), qsTr("HDOP"), qsTr("VDOP")];
+ measureComboBox.model = measurements;
+ measureComboBox.currentIndex = positioningSettings.digitizingMeasureType - 1;
+ loaded = true;
+ }
+
+ onCurrentIndexChanged: {
+ if (loaded) {
+ positioningSettings.digitizingMeasureType = currentIndex + 1;
+ }
+ }
+ }
+
+ Label {
+ id: measureTipLabel
+ Layout.fillWidth: true
+ Layout.columnSpan: 2
+ text: qsTr("When digitizing features with the coordinate cursor locked to the current position, the measurement type selected above will be added to the geometry provided it has an M dimension.")
+ font: Theme.tipFont
+ color: Theme.secondaryTextColor
+
+ wrapMode: Text.WordWrap
}
Label {
@@ -1382,6 +1424,23 @@ Page {
width: 1
}
+ Label {
+ text: qsTr('Altitude')
+ font: Theme.strongFont
+ color: Theme.mainColor
+ wrapMode: Text.WordWrap
+ Layout.fillWidth: true
+ Layout.topMargin: 20
+ Layout.columnSpan: 2
+ }
+
+ Rectangle {
+ Layout.fillWidth: true
+ Layout.columnSpan: 2
+ height: 1
+ color: Theme.mainColor
+ }
+
Label {
text: qsTr("Antenna height compensation")
font: Theme.defaultFont
@@ -1598,6 +1657,23 @@ Page {
Layout.columnSpan: 2
}
+ Label {
+ text: qsTr('Advanced')
+ font: Theme.strongFont
+ color: Theme.mainColor
+ wrapMode: Text.WordWrap
+ Layout.fillWidth: true
+ Layout.topMargin: 20
+ Layout.columnSpan: 2
+ }
+
+ Rectangle {
+ Layout.fillWidth: true
+ Layout.columnSpan: 2
+ height: 1
+ color: Theme.mainColor
+ }
+
Label {
text: qsTr("Log NMEA sentences from device to file")
font: Theme.defaultFont