Skip to content

Commit eadcab5

Browse files
pilotnbr1pilotnbr1
authored
Merge pull request #190 from MacDaddyFPV/master
Titles and Compass iNav
2 parents 5a2a2c7 + 7d7d0a4 commit eadcab5

38 files changed

+2436
-1154
lines changed

‎qml/ui/widgets/AdsbWidgetForm.ui.qml

+43-18
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,14 @@ import QtQml.Models 2.15
99
import QtPositioning 5.2
1010
import QtLocation 5.12
1111

12-
1312
import OpenHD 1.0
1413

15-
16-
1714
BaseWidget {
1815
id: adsbWidget
1916
width: 55
2017
height: 15
2118

22-
z:4
19+
z: 4
2320

2421
visible: settings.show_adsb
2522

@@ -42,15 +39,37 @@ BaseWidget {
4239
property bool adsbStatus: AdsbVehicleManager.status ? true : false
4340
property color adsbStatusColor: AdsbVehicleManager.status == 2 ? "green" : "red"
4441

45-
46-
widgetDetailComponent: ScrollView{
42+
widgetDetailComponent: ScrollView {
4743

4844
contentHeight: adsbSettingsColumn.height
4945
ScrollBar.horizontal.policy: ScrollBar.AlwaysOff
5046
clip: true
5147

5248
Column {
5349
id: adsbSettingsColumn
50+
Item {
51+
width: parent.width
52+
height: 42
53+
Text {
54+
id: adsbTitle
55+
text: qsTr("ADSB")
56+
color: "white"
57+
height: parent.height - 10
58+
width: parent.width
59+
font.bold: true
60+
horizontalAlignment: Text.AlignHCenter
61+
font.pixelSize: detailPanelFontPixels
62+
verticalAlignment: Text.AlignVCenter
63+
}
64+
Rectangle {
65+
id: adsbTitleUL
66+
y: 34
67+
width: parent.width
68+
height: 3
69+
color: "white"
70+
radius: 5
71+
}
72+
}
5473
Item {
5574
width: parent.width
5675
height: 32
@@ -129,17 +148,20 @@ BaseWidget {
129148
anchors.right: parent.right
130149
checked: {
131150
// @disable-check M222
132-
var _hCenter = settings.value(hCenterIdentifier, defaultHCenter)
151+
var _hCenter = settings.value(hCenterIdentifier,
152+
defaultHCenter)
133153
// @disable-check M223
134-
if (_hCenter === "true" || _hCenter === 1 || _hCenter === true) {
135-
checked = true;
154+
if (_hCenter === "true" || _hCenter === 1
155+
|| _hCenter === true) {
156+
checked = true
136157
// @disable-check M223
137158
} else {
138-
checked = false;
159+
checked = false
139160
}
140161
}
141162

142-
onCheckedChanged: settings.setValue(hCenterIdentifier, checked)
163+
onCheckedChanged: settings.setValue(hCenterIdentifier,
164+
checked)
143165
}
144166
}
145167
Item {
@@ -161,17 +183,20 @@ BaseWidget {
161183
anchors.right: parent.right
162184
checked: {
163185
// @disable-check M222
164-
var _vCenter = settings.value(vCenterIdentifier, defaultVCenter)
186+
var _vCenter = settings.value(vCenterIdentifier,
187+
defaultVCenter)
165188
// @disable-check M223
166-
if (_vCenter === "true" || _vCenter === 1 || _vCenter === true) {
167-
checked = true;
189+
if (_vCenter === "true" || _vCenter === 1
190+
|| _vCenter === true) {
191+
checked = true
168192
// @disable-check M223
169193
} else {
170-
checked = false;
194+
checked = false
171195
}
172196
}
173197

174-
onCheckedChanged: settings.setValue(vCenterIdentifier, checked)
198+
onCheckedChanged: settings.setValue(vCenterIdentifier,
199+
checked)
175200
}
176201
}
177202
Item {
@@ -193,7 +218,7 @@ BaseWidget {
193218
anchors.right: parent.right
194219
checked: settings.adsb_api_sdr
195220
onCheckedChanged: {
196-
settings.adsb_api_sdr = checked;
221+
settings.adsb_api_sdr = checked
197222
}
198223
}
199224
}
@@ -216,7 +241,7 @@ BaseWidget {
216241
anchors.right: parent.right
217242
checked: settings.adsb_api_openskynetwork
218243
onCheckedChanged: {
219-
settings.adsb_api_openskynetwork = checked;
244+
settings.adsb_api_openskynetwork = checked
220245
}
221246
}
222247
}

‎qml/ui/widgets/AirBatteryWidgetForm.ui.qml

+40-12
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,29 @@ BaseWidget {
3232
id: airBatterySettingsColumn
3333
spacing: 0
3434
clip: true
35-
35+
Item {
36+
width: 230
37+
height: 42
38+
Text {
39+
id: airBatteryTitle
40+
text: qsTr("AIR BATTERY")
41+
color: "white"
42+
height: parent.height - 10
43+
width: parent.width
44+
font.bold: true
45+
horizontalAlignment: Text.AlignHCenter
46+
font.pixelSize: detailPanelFontPixels
47+
verticalAlignment: Text.AlignVCenter
48+
}
49+
Rectangle {
50+
id: airBatteryTitleUL
51+
y: 34
52+
width: parent.width
53+
height: 3
54+
color: "white"
55+
radius: 5
56+
}
57+
}
3658
Item {
3759
width: 230
3860
height: 32
@@ -111,17 +133,20 @@ BaseWidget {
111133
anchors.right: parent.right
112134
checked: {
113135
// @disable-check M222
114-
var _hCenter = settings.value(hCenterIdentifier, defaultHCenter)
136+
var _hCenter = settings.value(hCenterIdentifier,
137+
defaultHCenter)
115138
// @disable-check M223
116-
if (_hCenter === "true" || _hCenter === 1 || _hCenter === true) {
117-
checked = true;
139+
if (_hCenter === "true" || _hCenter === 1
140+
|| _hCenter === true) {
141+
checked = true
118142
// @disable-check M223
119143
} else {
120-
checked = false;
144+
checked = false
121145
}
122146
}
123147

124-
onCheckedChanged: settings.setValue(hCenterIdentifier, checked)
148+
onCheckedChanged: settings.setValue(hCenterIdentifier,
149+
checked)
125150
}
126151
}
127152
Item {
@@ -143,19 +168,22 @@ BaseWidget {
143168
anchors.right: parent.right
144169
checked: {
145170
// @disable-check M222
146-
var _vCenter = settings.value(vCenterIdentifier, defaultVCenter)
171+
var _vCenter = settings.value(vCenterIdentifier,
172+
defaultVCenter)
147173
// @disable-check M223
148-
if (_vCenter === "true" || _vCenter === 1 || _vCenter === true) {
149-
checked = true;
174+
if (_vCenter === "true" || _vCenter === 1
175+
|| _vCenter === true) {
176+
checked = true
150177
// @disable-check M223
151178
} else {
152-
checked = false;
179+
checked = false
153180
}
154181
}
155182

156-
onCheckedChanged: settings.setValue(vCenterIdentifier, checked)
183+
onCheckedChanged: settings.setValue(vCenterIdentifier,
184+
checked)
157185
}
158-
}
186+
}
159187
Item {
160188
width: 230
161189
height: 32

0 commit comments

Comments
 (0)