Skip to content

Commit 2d810fa

Browse files
nyalldawsonnyalldawson
committed
Rework GPS dock UI layout for UX consistency
1 parent 4442da2 commit 2d810fa

File tree

1 file changed

+74
-78
lines changed

1 file changed

+74
-78
lines changed

‎src/ui/qgsgpsinformationwidgetbase.ui

+74-78
Original file line numberDiff line numberDiff line change
@@ -721,7 +721,7 @@ gray = no data
721721
<number>4</number>
722722
</property>
723723
<item row="0" column="0">
724-
<widget class="QGroupBox" name="mDeviceGroupBox">
724+
<widget class="QgsCollapsibleGroupBox" name="mDeviceGroupBox">
725725
<property name="title">
726726
<string>Connection</string>
727727
</property>
@@ -889,7 +889,7 @@ gray = no data
889889
</widget>
890890
</item>
891891
<item row="3" column="0">
892-
<widget class="QGroupBox" name="mGroupShowMarker">
892+
<widget class="QgsCollapsibleGroupBox" name="mGroupShowMarker">
893893
<property name="title">
894894
<string>Cursor</string>
895895
</property>
@@ -906,17 +906,7 @@ gray = no data
906906
<property name="verticalSpacing">
907907
<number>2</number>
908908
</property>
909-
<item row="2" column="0">
910-
<widget class="QComboBox" name="mCboAcquisitionInterval"/>
911-
</item>
912-
<item row="2" column="1">
913-
<widget class="QLabel" name="label_6">
914-
<property name="text">
915-
<string>sec.</string>
916-
</property>
917-
</widget>
918-
</item>
919-
<item row="1" column="3">
909+
<item row="1" column="2">
920910
<widget class="QLabel" name="label_2">
921911
<property name="sizePolicy">
922912
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
@@ -929,7 +919,7 @@ gray = no data
929919
</property>
930920
</widget>
931921
</item>
932-
<item row="1" column="2">
922+
<item row="1" column="1">
933923
<spacer name="horizontalSpacer_2">
934924
<property name="orientation">
935925
<enum>Qt::Horizontal</enum>
@@ -942,7 +932,7 @@ gray = no data
942932
</property>
943933
</spacer>
944934
</item>
945-
<item row="0" column="0" colspan="4">
935+
<item row="0" column="0" colspan="3">
946936
<widget class="QSlider" name="mSliderMarkerSize">
947937
<property name="sizePolicy">
948938
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
@@ -986,48 +976,11 @@ gray = no data
986976
</property>
987977
</widget>
988978
</item>
989-
<item row="2" column="3">
990-
<widget class="QLabel" name="label_7">
991-
<property name="text">
992-
<string>m.</string>
993-
</property>
994-
</widget>
995-
</item>
996-
<item row="2" column="2">
997-
<widget class="QComboBox" name="mCboDistanceThreshold"/>
998-
</item>
999-
<item row="3" column="0">
1000-
<widget class="QLabel" name="label_8">
1001-
<property name="text">
1002-
<string>Acquisition Interval</string>
1003-
</property>
1004-
</widget>
1005-
</item>
1006-
<item row="3" column="1">
1007-
<spacer name="horizontalSpacer_3">
1008-
<property name="orientation">
1009-
<enum>Qt::Horizontal</enum>
1010-
</property>
1011-
<property name="sizeHint" stdset="0">
1012-
<size>
1013-
<width>40</width>
1014-
<height>20</height>
1015-
</size>
1016-
</property>
1017-
</spacer>
1018-
</item>
1019-
<item row="3" column="2">
1020-
<widget class="QLabel" name="label_9">
1021-
<property name="text">
1022-
<string>Distance threshold</string>
1023-
</property>
1024-
</widget>
1025-
</item>
1026979
</layout>
1027980
</widget>
1028981
</item>
1029982
<item row="6" column="0">
1030-
<widget class="QGroupBox" name="mLogFileGroupBox">
983+
<widget class="QgsCollapsibleGroupBox" name="mLogFileGroupBox">
1031984
<property name="enabled">
1032985
<bool>true</bool>
1033986
</property>
@@ -1041,7 +994,7 @@ gray = no data
1041994
<string>save GPS data (NMEA sentences) to a file</string>
1042995
</property>
1043996
<property name="title">
1044-
<string>Log File</string>
997+
<string>Log file</string>
1045998
</property>
1046999
<property name="checkable">
10471000
<bool>true</bool>
@@ -1101,7 +1054,7 @@ gray = no data
11011054
</widget>
11021055
</item>
11031056
<item row="5" column="0">
1104-
<widget class="QGroupBox" name="groupBox">
1057+
<widget class="QgsCollapsibleGroupBoxBasic" name="groupBox">
11051058
<property name="title">
11061059
<string>Map centering</string>
11071060
</property>
@@ -1118,7 +1071,7 @@ gray = no data
11181071
<item row="1" column="0">
11191072
<widget class="QRadioButton" name="radRecenterWhenNeeded">
11201073
<property name="text">
1121-
<string>when leaving</string>
1074+
<string>When leaving</string>
11221075
</property>
11231076
</widget>
11241077
</item>
@@ -1160,14 +1113,14 @@ gray = no data
11601113
<item row="3" column="0">
11611114
<widget class="QRadioButton" name="radNeverRecenter">
11621115
<property name="text">
1163-
<string>never</string>
1116+
<string>Never</string>
11641117
</property>
11651118
</widget>
11661119
</item>
11671120
<item row="0" column="0">
11681121
<widget class="QRadioButton" name="radRecenterMap">
11691122
<property name="text">
1170-
<string>always</string>
1123+
<string>Always</string>
11711124
</property>
11721125
<property name="checked">
11731126
<bool>true</bool>
@@ -1178,7 +1131,7 @@ gray = no data
11781131
</widget>
11791132
</item>
11801133
<item row="2" column="0">
1181-
<widget class="QGroupBox" name="groupBox_2">
1134+
<widget class="QgsCollapsibleGroupBox" name="groupBox_2">
11821135
<property name="title">
11831136
<string>Digitizing</string>
11841137
</property>
@@ -1254,6 +1207,35 @@ gray = no data
12541207
</layout>
12551208
</widget>
12561209
</item>
1210+
<item row="4" column="0">
1211+
<widget class="QgsCollapsibleGroupBox" name="groupBox_4">
1212+
<property name="title">
1213+
<string>Filtering</string>
1214+
</property>
1215+
<layout class="QGridLayout" name="gridLayout_14" columnstretch="0,1">
1216+
<item row="1" column="1">
1217+
<widget class="QComboBox" name="mCboDistanceThreshold"/>
1218+
</item>
1219+
<item row="1" column="0">
1220+
<widget class="QLabel" name="label_9">
1221+
<property name="text">
1222+
<string>Distance threshold (meters)</string>
1223+
</property>
1224+
</widget>
1225+
</item>
1226+
<item row="0" column="0">
1227+
<widget class="QLabel" name="label_8">
1228+
<property name="text">
1229+
<string>Acquisition interval (seconds)</string>
1230+
</property>
1231+
</widget>
1232+
</item>
1233+
<item row="0" column="1">
1234+
<widget class="QComboBox" name="mCboAcquisitionInterval"/>
1235+
</item>
1236+
</layout>
1237+
</widget>
1238+
</item>
12571239
</layout>
12581240
</widget>
12591241
</widget>
@@ -1297,6 +1279,18 @@ gray = no data
12971279
<header>qgsscrollarea.h</header>
12981280
<container>1</container>
12991281
</customwidget>
1282+
<customwidget>
1283+
<class>QgsCollapsibleGroupBox</class>
1284+
<extends>QGroupBox</extends>
1285+
<header>qgscollapsiblegroupbox.h</header>
1286+
<container>1</container>
1287+
</customwidget>
1288+
<customwidget>
1289+
<class>QgsCollapsibleGroupBoxBasic</class>
1290+
<extends>QGroupBox</extends>
1291+
<header>qgscollapsiblegroupbox.h</header>
1292+
<container>1</container>
1293+
</customwidget>
13001294
</customwidgets>
13011295
<tabstops>
13021296
<tabstop>mBtnCloseFeature</tabstop>
@@ -1308,30 +1302,12 @@ gray = no data
13081302
<tabstop>mBtnOptions</tabstop>
13091303
<tabstop>mBtnDebug</tabstop>
13101304
<tabstop>mConnectButton</tabstop>
1311-
<tabstop>scrollArea_2</tabstop>
1312-
<tabstop>mTxtLatitude</tabstop>
1313-
<tabstop>mTxtLongitude</tabstop>
1314-
<tabstop>mTxtAltitude</tabstop>
1315-
<tabstop>mTxtDateTime</tabstop>
1316-
<tabstop>mTxtSpeed</tabstop>
1317-
<tabstop>mTxtDirection</tabstop>
1318-
<tabstop>mTxtHdop</tabstop>
1319-
<tabstop>mTxtVdop</tabstop>
1320-
<tabstop>mTxtPdop</tabstop>
1321-
<tabstop>mTxtHacc</tabstop>
1322-
<tabstop>mTxtVacc</tabstop>
1323-
<tabstop>mTxtFixMode</tabstop>
1324-
<tabstop>mTxtFixType</tabstop>
1325-
<tabstop>mTxtQuality</tabstop>
1326-
<tabstop>mTxtStatus</tabstop>
1327-
<tabstop>mTxtSatellitesUsed</tabstop>
1328-
<tabstop>mBtnRefreshDevices</tabstop>
1329-
<tabstop>mGPSPlainTextEdit</tabstop>
13301305
<tabstop>scrollArea</tabstop>
13311306
<tabstop>mRadAutodetect</tabstop>
13321307
<tabstop>mRadInternal</tabstop>
13331308
<tabstop>mRadUserPath</tabstop>
13341309
<tabstop>mCboDevices</tabstop>
1310+
<tabstop>mBtnRefreshDevices</tabstop>
13351311
<tabstop>mRadGpsd</tabstop>
13361312
<tabstop>mGpsdHost</tabstop>
13371313
<tabstop>mGpsdPort</tabstop>
@@ -1342,13 +1318,33 @@ gray = no data
13421318
<tabstop>mBtnTrackColor</tabstop>
13431319
<tabstop>mGroupShowMarker</tabstop>
13441320
<tabstop>mSliderMarkerSize</tabstop>
1321+
<tabstop>mCboAcquisitionInterval</tabstop>
1322+
<tabstop>mCboDistanceThreshold</tabstop>
13451323
<tabstop>radRecenterMap</tabstop>
13461324
<tabstop>radRecenterWhenNeeded</tabstop>
13471325
<tabstop>mSpinMapExtentMultiplier</tabstop>
13481326
<tabstop>radNeverRecenter</tabstop>
13491327
<tabstop>mLogFileGroupBox</tabstop>
13501328
<tabstop>mTxtLogFile</tabstop>
13511329
<tabstop>mBtnLogFile</tabstop>
1330+
<tabstop>mGPSPlainTextEdit</tabstop>
1331+
<tabstop>scrollArea_2</tabstop>
1332+
<tabstop>mTxtLatitude</tabstop>
1333+
<tabstop>mTxtLongitude</tabstop>
1334+
<tabstop>mTxtAltitude</tabstop>
1335+
<tabstop>mTxtDateTime</tabstop>
1336+
<tabstop>mTxtSpeed</tabstop>
1337+
<tabstop>mTxtDirection</tabstop>
1338+
<tabstop>mTxtHdop</tabstop>
1339+
<tabstop>mTxtVdop</tabstop>
1340+
<tabstop>mTxtPdop</tabstop>
1341+
<tabstop>mTxtHacc</tabstop>
1342+
<tabstop>mTxtVacc</tabstop>
1343+
<tabstop>mTxtFixMode</tabstop>
1344+
<tabstop>mTxtFixType</tabstop>
1345+
<tabstop>mTxtQuality</tabstop>
1346+
<tabstop>mTxtStatus</tabstop>
1347+
<tabstop>mTxtSatellitesUsed</tabstop>
13521348
</tabstops>
13531349
<resources>
13541350
<include location="../../images/images.qrc"/>

0 commit comments

Comments
 (0)