Skip to content

Commit fa212af

Browse files
author
timlinux
committedJul 26, 2008
Added refresh button so when plugging in a gps device after dialog is opened, it can be selectd from the ports list. Use button box for gps add device dialog
git-svn-id: http://svn.osgeo.org/qgis/trunk@8916 c8812cc2-4d05-0410-92ff-de0c093fc19c
·
ltr-3_40Before-merge-new_vector_api
1 parent 615b120 commit fa212af

File tree

3 files changed

+254
-179
lines changed

3 files changed

+254
-179
lines changed
 

‎src/plugins/gps_importer/qgsgpsdevicedialogbase.ui

Lines changed: 88 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,7 @@
1010
</rect>
1111
</property>
1212
<property name="sizePolicy" >
13-
<sizepolicy>
14-
<hsizetype>1</hsizetype>
15-
<vsizetype>1</vsizetype>
13+
<sizepolicy vsizetype="Minimum" hsizetype="Minimum" >
1614
<horstretch>0</horstretch>
1715
<verstretch>0</verstretch>
1816
</sizepolicy>
@@ -23,32 +21,33 @@
2321
<property name="modal" >
2422
<bool>true</bool>
2523
</property>
26-
<layout class="QVBoxLayout" >
27-
<property name="margin" >
28-
<number>9</number>
29-
</property>
30-
<property name="spacing" >
31-
<number>6</number>
32-
</property>
33-
<item>
24+
<layout class="QGridLayout" >
25+
<item row="0" column="0" >
3426
<widget class="QSplitter" name="splitter" >
3527
<property name="orientation" >
3628
<enum>Qt::Horizontal</enum>
3729
</property>
3830
<widget class="QWidget" name="layoutWidget_2" >
3931
<layout class="QVBoxLayout" >
40-
<property name="margin" >
41-
<number>0</number>
42-
</property>
4332
<property name="spacing" >
4433
<number>6</number>
4534
</property>
35+
<property name="leftMargin" >
36+
<number>0</number>
37+
</property>
38+
<property name="topMargin" >
39+
<number>0</number>
40+
</property>
41+
<property name="rightMargin" >
42+
<number>0</number>
43+
</property>
44+
<property name="bottomMargin" >
45+
<number>0</number>
46+
</property>
4647
<item>
4748
<widget class="QListWidget" name="lbDeviceList" >
4849
<property name="sizePolicy" >
49-
<sizepolicy>
50-
<hsizetype>5</hsizetype>
51-
<vsizetype>5</vsizetype>
50+
<sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
5251
<horstretch>0</horstretch>
5352
<verstretch>0</verstretch>
5453
</sizepolicy>
@@ -58,9 +57,7 @@
5857
<item>
5958
<widget class="QPushButton" name="pbnNewDevice" >
6059
<property name="sizePolicy" >
61-
<sizepolicy>
62-
<hsizetype>1</hsizetype>
63-
<vsizetype>0</vsizetype>
60+
<sizepolicy vsizetype="Fixed" hsizetype="Minimum" >
6461
<horstretch>0</horstretch>
6562
<verstretch>0</verstretch>
6663
</sizepolicy>
@@ -73,9 +70,7 @@
7370
<item>
7471
<widget class="QPushButton" name="pbnDeleteDevice" >
7572
<property name="sizePolicy" >
76-
<sizepolicy>
77-
<hsizetype>1</hsizetype>
78-
<vsizetype>0</vsizetype>
73+
<sizepolicy vsizetype="Fixed" hsizetype="Minimum" >
7974
<horstretch>0</horstretch>
8075
<verstretch>0</verstretch>
8176
</sizepolicy>
@@ -88,9 +83,7 @@
8883
<item>
8984
<widget class="QPushButton" name="pbnUpdateDevice" >
9085
<property name="sizePolicy" >
91-
<sizepolicy>
92-
<hsizetype>1</hsizetype>
93-
<vsizetype>0</vsizetype>
86+
<sizepolicy vsizetype="Fixed" hsizetype="Minimum" >
9487
<horstretch>0</horstretch>
9588
<verstretch>0</verstretch>
9689
</sizepolicy>
@@ -104,41 +97,55 @@
10497
</widget>
10598
<widget class="QWidget" name="layoutWidget_3" >
10699
<layout class="QVBoxLayout" >
107-
<property name="margin" >
108-
<number>0</number>
109-
</property>
110100
<property name="spacing" >
111101
<number>6</number>
112102
</property>
103+
<property name="leftMargin" >
104+
<number>0</number>
105+
</property>
106+
<property name="topMargin" >
107+
<number>0</number>
108+
</property>
109+
<property name="rightMargin" >
110+
<number>0</number>
111+
</property>
112+
<property name="bottomMargin" >
113+
<number>0</number>
114+
</property>
113115
<item>
114116
<layout class="QHBoxLayout" >
115-
<property name="margin" >
116-
<number>0</number>
117-
</property>
118117
<property name="spacing" >
119118
<number>6</number>
120119
</property>
120+
<property name="leftMargin" >
121+
<number>0</number>
122+
</property>
123+
<property name="topMargin" >
124+
<number>0</number>
125+
</property>
126+
<property name="rightMargin" >
127+
<number>0</number>
128+
</property>
129+
<property name="bottomMargin" >
130+
<number>0</number>
131+
</property>
121132
<item>
122133
<widget class="QLabel" name="textLabel3" >
123134
<property name="sizePolicy" >
124-
<sizepolicy>
125-
<hsizetype>1</hsizetype>
126-
<vsizetype>5</vsizetype>
135+
<sizepolicy vsizetype="Preferred" hsizetype="Minimum" >
127136
<horstretch>0</horstretch>
128137
<verstretch>0</verstretch>
129138
</sizepolicy>
130139
</property>
131140
<property name="text" >
132-
<string>Device name:</string>
141+
<string>Device name</string>
133142
</property>
134143
</widget>
135144
</item>
136145
<item>
137146
<widget class="QLineEdit" name="leDeviceName" >
138147
<property name="sizePolicy" >
139-
<sizepolicy>
140-
<hsizetype>7</hsizetype>
141-
<vsizetype>0</vsizetype>
148+
<sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
142149
<horstretch>2</horstretch>
143150
<verstretch>0</verstretch>
144151
</sizepolicy>
@@ -159,10 +166,22 @@
159166
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
160167
</property>
161168
<layout class="QGridLayout" >
162-
<property name="margin" >
169+
<property name="leftMargin" >
170+
<number>9</number>
171+
</property>
172+
<property name="topMargin" >
173+
<number>9</number>
174+
</property>
175+
<property name="rightMargin" >
176+
<number>9</number>
177+
</property>
178+
<property name="bottomMargin" >
163179
<number>9</number>
164180
</property>
165-
<property name="spacing" >
181+
<property name="horizontalSpacing" >
182+
<number>6</number>
183+
</property>
184+
<property name="verticalSpacing" >
166185
<number>6</number>
167186
</property>
168187
<item row="4" column="0" >
@@ -255,58 +274,50 @@
255274
<item>
256275
<widget class="QTextEdit" name="textEdit" >
257276
<property name="sizePolicy" >
258-
<sizepolicy>
259-
<hsizetype>5</hsizetype>
260-
<vsizetype>5</vsizetype>
277+
<sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
261278
<horstretch>0</horstretch>
262279
<verstretch>0</verstretch>
263280
</sizepolicy>
264281
</property>
265282
<property name="html" >
266-
<string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;/head>&lt;body style=" white-space: pre-wrap; font-family:Sans Serif; font-size:9pt; font-weight:400; font-style:normal; text-decoration:none;">&lt;p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">In the download and upload commands there can be special words that will be replaced by QGIS when the commands are used. These words are:&lt;span style=" font-style:italic;">%babel&lt;/span> - the path to GPSBabel&lt;br />&lt;span style=" font-style:italic;">%in&lt;/span> - the GPX filename when uploading or the port when downloading&lt;br />&lt;span style=" font-style:italic;">%out&lt;/span> - the port when uploading or the GPX filename when downloading&lt;/p>&lt;/body>&lt;/html></string>
283+
<string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
284+
p, li { white-space: pre-wrap; }
285+
&lt;/style>&lt;/head>&lt;body style=" font-family:'Verdana'; font-size:10pt; font-weight:400; font-style:normal;">
286+
&lt;p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif'; font-size:9pt;">In the download and upload commands there can be special words that will be replaced by QGIS when the commands are used. These words are:&lt;span style=" font-style:italic;">%babel&lt;/span> - the path to GPSBabel&lt;br />&lt;span style=" font-style:italic;">%in&lt;/span> - the GPX filename when uploading or the port when downloading&lt;br />&lt;span style=" font-style:italic;">%out&lt;/span> - the port when uploading or the GPX filename when downloading&lt;/p>&lt;/body>&lt;/html></string>
267287
</property>
268288
</widget>
269289
</item>
270290
</layout>
271291
</widget>
272292
</widget>
273293
</item>
274-
<item>
275-
<layout class="QHBoxLayout" >
276-
<property name="margin" >
277-
<number>0</number>
278-
</property>
279-
<property name="spacing" >
280-
<number>6</number>
294+
<item row="1" column="0" >
295+
<widget class="QDialogButtonBox" name="buttonBox" >
296+
<property name="standardButtons" >
297+
<set>QDialogButtonBox::Close</set>
281298
</property>
282-
<item>
283-
<spacer>
284-
<property name="orientation" >
285-
<enum>Qt::Horizontal</enum>
286-
</property>
287-
<property name="sizeHint" >
288-
<size>
289-
<width>381</width>
290-
<height>21</height>
291-
</size>
292-
</property>
293-
</spacer>
294-
</item>
295-
<item>
296-
<widget class="QPushButton" name="pbnClose" >
297-
<property name="text" >
298-
<string>Close</string>
299-
</property>
300-
<property name="default" >
301-
<bool>true</bool>
302-
</property>
303-
</widget>
304-
</item>
305-
</layout>
299+
</widget>
306300
</item>
307301
</layout>
308302
</widget>
309303
<layoutdefault spacing="6" margin="11" />
310304
<resources/>
311-
<connections/>
305+
<connections>
306+
<connection>
307+
<sender>buttonBox</sender>
308+
<signal>clicked(QAbstractButton*)</signal>
309+
<receiver>QgsGPSDeviceDialogBase</receiver>
310+
<slot>accept()</slot>
311+
<hints>
312+
<hint type="sourcelabel" >
313+
<x>453</x>
314+
<y>418</y>
315+
</hint>
316+
<hint type="destinationlabel" >
317+
<x>498</x>
318+
<y>403</y>
319+
</hint>
320+
</hints>
321+
</connection>
322+
</connections>
312323
</ui>

‎src/plugins/gps_importer/qgsgpsplugingui.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -285,9 +285,14 @@ void QgsGPSPluginGui::on_pbnIMPOutput_clicked() {
285285
leIMPOutput->setText(myFileNameQString);
286286
}
287287

288+
void QgsGPSPluginGui::on_pbnRefresh_clicked()
289+
{
290+
populatePortComboBoxes();
291+
}
288292

289293
void QgsGPSPluginGui::populatePortComboBoxes() {
290294

295+
cmbDLPort->clear();
291296
#ifdef linux
292297
// look for linux serial devices
293298
QString linuxDev("/dev/ttyS%1");

‎src/plugins/gps_importer/qgsgpspluginguibase.ui

Lines changed: 161 additions & 102 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
<rect>
66
<x>0</x>
77
<y>0</y>
8-
<width>930</width>
9-
<height>406</height>
8+
<width>987</width>
9+
<height>428</height>
1010
</rect>
1111
</property>
1212
<property name="windowTitle" >
@@ -16,10 +16,22 @@
1616
<iconset/>
1717
</property>
1818
<layout class="QGridLayout" >
19-
<property name="margin" >
19+
<property name="leftMargin" >
2020
<number>9</number>
2121
</property>
22-
<property name="spacing" >
22+
<property name="topMargin" >
23+
<number>9</number>
24+
</property>
25+
<property name="rightMargin" >
26+
<number>9</number>
27+
</property>
28+
<property name="bottomMargin" >
29+
<number>9</number>
30+
</property>
31+
<property name="horizontalSpacing" >
32+
<number>6</number>
33+
</property>
34+
<property name="verticalSpacing" >
2335
<number>6</number>
2436
</property>
2537
<item row="0" column="0" >
@@ -51,25 +63,35 @@
5163
<item row="0" column="2" >
5264
<widget class="QTabWidget" name="tabWidget" >
5365
<property name="currentIndex" >
54-
<number>0</number>
66+
<number>2</number>
5567
</property>
5668
<widget class="QWidget" name="tab1" >
5769
<attribute name="title" >
5870
<string>Load GPX file</string>
5971
</attribute>
6072
<layout class="QGridLayout" >
61-
<property name="margin" >
73+
<property name="leftMargin" >
74+
<number>9</number>
75+
</property>
76+
<property name="topMargin" >
77+
<number>9</number>
78+
</property>
79+
<property name="rightMargin" >
80+
<number>9</number>
81+
</property>
82+
<property name="bottomMargin" >
6283
<number>9</number>
6384
</property>
64-
<property name="spacing" >
85+
<property name="horizontalSpacing" >
86+
<number>6</number>
87+
</property>
88+
<property name="verticalSpacing" >
6589
<number>6</number>
6690
</property>
6791
<item row="0" column="0" colspan="2" >
6892
<widget class="QTextEdit" name="teLoadDescription" >
6993
<property name="sizePolicy" >
70-
<sizepolicy>
71-
<hsizetype>7</hsizetype>
72-
<vsizetype>7</vsizetype>
94+
<sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
7395
<horstretch>0</horstretch>
7496
<verstretch>0</verstretch>
7597
</sizepolicy>
@@ -83,8 +105,8 @@
83105
<property name="html" >
84106
<string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
85107
p, li { white-space: pre-wrap; }
86-
&lt;/style>&lt;/head>&lt;body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal; text-decoration:none;">
87-
&lt;p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">&lt;/p>&lt;/body>&lt;/html></string>
108+
&lt;/style>&lt;/head>&lt;body style=" font-family:'Verdana'; font-size:10pt; font-weight:400; font-style:normal;">
109+
&lt;p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif'; font-size:9pt;">&lt;/p>&lt;/body>&lt;/html></string>
88110
</property>
89111
</widget>
90112
</item>
@@ -158,10 +180,22 @@ p, li { white-space: pre-wrap; }
158180
<string>Import other file</string>
159181
</attribute>
160182
<layout class="QGridLayout" >
161-
<property name="margin" >
183+
<property name="leftMargin" >
184+
<number>9</number>
185+
</property>
186+
<property name="topMargin" >
187+
<number>9</number>
188+
</property>
189+
<property name="rightMargin" >
190+
<number>9</number>
191+
</property>
192+
<property name="bottomMargin" >
162193
<number>9</number>
163194
</property>
164-
<property name="spacing" >
195+
<property name="horizontalSpacing" >
196+
<number>6</number>
197+
</property>
198+
<property name="verticalSpacing" >
165199
<number>6</number>
166200
</property>
167201
<item row="0" column="0" colspan="4" >
@@ -172,8 +206,8 @@ p, li { white-space: pre-wrap; }
172206
<property name="html" >
173207
<string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
174208
p, li { white-space: pre-wrap; }
175-
&lt;/style>&lt;/head>&lt;body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal; text-decoration:none;">
176-
&lt;p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">&lt;/p>&lt;/body>&lt;/html></string>
209+
&lt;/style>&lt;/head>&lt;body style=" font-family:'Verdana'; font-size:10pt; font-weight:400; font-style:normal;">
210+
&lt;p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif'; font-size:9pt;">&lt;/p>&lt;/body>&lt;/html></string>
177211
</property>
178212
</widget>
179213
</item>
@@ -272,95 +306,44 @@ p, li { white-space: pre-wrap; }
272306
<string>Download from GPS</string>
273307
</attribute>
274308
<layout class="QGridLayout" >
275-
<property name="margin" >
276-
<number>9</number>
277-
</property>
278-
<property name="spacing" >
279-
<number>6</number>
280-
</property>
281-
<item row="0" column="0" colspan="5" >
309+
<item row="0" column="0" colspan="9" >
282310
<widget class="QTextEdit" name="teDLDescription" >
283311
<property name="readOnly" >
284312
<bool>true</bool>
285313
</property>
286314
<property name="html" >
287315
<string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
288316
p, li { white-space: pre-wrap; }
289-
&lt;/style>&lt;/head>&lt;body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal; text-decoration:none;">
290-
&lt;p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">&lt;/p>&lt;/body>&lt;/html></string>
317+
&lt;/style>&lt;/head>&lt;body style=" font-family:'Verdana'; font-size:10pt; font-weight:400; font-style:normal;">
318+
&lt;p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif'; font-size:9pt;">&lt;/p>&lt;/body>&lt;/html></string>
291319
</property>
292320
</widget>
293321
</item>
294-
<item row="1" column="4" >
295-
<widget class="QComboBox" name="cmbDLPort" >
296-
<property name="minimumSize" >
297-
<size>
298-
<width>90</width>
299-
<height>0</height>
300-
</size>
322+
<item row="1" column="0" >
323+
<widget class="QLabel" name="textLabel1" >
324+
<property name="text" >
325+
<string>GPS device:</string>
301326
</property>
302327
</widget>
303328
</item>
304-
<item row="2" column="4" >
305-
<widget class="QComboBox" name="cmbDLFeatureType" >
329+
<item row="1" column="1" >
330+
<widget class="QComboBox" name="cmbDLDevice" >
306331
<property name="minimumSize" >
307332
<size>
308-
<width>100</width>
333+
<width>120</width>
309334
<height>0</height>
310335
</size>
311336
</property>
312-
<item>
313-
<property name="text" >
314-
<string>Waypoints</string>
315-
</property>
316-
</item>
317-
<item>
318-
<property name="text" >
319-
<string>Routes</string>
320-
</property>
321-
</item>
322-
<item>
323-
<property name="text" >
324-
<string>Tracks</string>
325-
</property>
326-
</item>
327337
</widget>
328338
</item>
329-
<item row="1" column="3" >
330-
<widget class="QLabel" name="textLabel2_5" >
331-
<property name="text" >
332-
<string>Port:</string>
333-
</property>
334-
</widget>
335-
</item>
336-
<item row="2" column="3" >
337-
<widget class="QLabel" name="textLabel1_3" >
338-
<property name="text" >
339-
<string>Feature type:</string>
340-
</property>
341-
</widget>
342-
</item>
343-
<item row="4" column="1" colspan="3" >
344-
<widget class="QLineEdit" name="leDLBasename" />
345-
</item>
346-
<item row="4" column="0" >
347-
<widget class="QLabel" name="textLabel1_2" >
348-
<property name="text" >
349-
<string>Layer name:</string>
350-
</property>
351-
</widget>
352-
</item>
353-
<item row="3" column="0" >
354-
<widget class="QLabel" name="textLabel2" >
339+
<item row="1" column="2" >
340+
<widget class="QPushButton" name="pbDLEditDevices" >
355341
<property name="text" >
356-
<string>Output file:</string>
342+
<string>Edit devices...</string>
357343
</property>
358344
</widget>
359345
</item>
360-
<item row="3" column="1" colspan="3" >
361-
<widget class="QLineEdit" name="leDLOutput" />
362-
</item>
363-
<item row="1" column="2" >
346+
<item row="1" column="3" >
364347
<spacer>
365348
<property name="orientation" >
366349
<enum>Qt::Horizontal</enum>
@@ -370,13 +353,37 @@ p, li { white-space: pre-wrap; }
370353
</property>
371354
<property name="sizeHint" >
372355
<size>
373-
<width>80</width>
374-
<height>20</height>
356+
<width>121</width>
357+
<height>24</height>
375358
</size>
376359
</property>
377360
</spacer>
378361
</item>
379-
<item row="2" column="2" >
362+
<item row="1" column="4" colspan="2" >
363+
<widget class="QLabel" name="textLabel2_5" >
364+
<property name="text" >
365+
<string>Port:</string>
366+
</property>
367+
</widget>
368+
</item>
369+
<item row="1" column="6" colspan="2" >
370+
<widget class="QComboBox" name="cmbDLPort" >
371+
<property name="minimumSize" >
372+
<size>
373+
<width>90</width>
374+
<height>0</height>
375+
</size>
376+
</property>
377+
</widget>
378+
</item>
379+
<item row="1" column="8" >
380+
<widget class="QPushButton" name="pbnRefresh" >
381+
<property name="text" >
382+
<string>Refresh</string>
383+
</property>
384+
</widget>
385+
</item>
386+
<item row="2" column="2" colspan="3" >
380387
<spacer>
381388
<property name="orientation" >
382389
<enum>Qt::Horizontal</enum>
@@ -392,48 +399,88 @@ p, li { white-space: pre-wrap; }
392399
</property>
393400
</spacer>
394401
</item>
395-
<item row="1" column="0" >
396-
<widget class="QLabel" name="textLabel1" >
402+
<item row="2" column="5" colspan="2" >
403+
<widget class="QLabel" name="textLabel1_3" >
397404
<property name="text" >
398-
<string>GPS device:</string>
405+
<string>Feature type:</string>
399406
</property>
400407
</widget>
401408
</item>
402-
<item row="1" column="1" >
403-
<widget class="QComboBox" name="cmbDLDevice" >
409+
<item row="2" column="7" colspan="2" >
410+
<widget class="QComboBox" name="cmbDLFeatureType" >
404411
<property name="minimumSize" >
405412
<size>
406-
<width>120</width>
413+
<width>100</width>
407414
<height>0</height>
408415
</size>
409416
</property>
417+
<item>
418+
<property name="text" >
419+
<string>Waypoints</string>
420+
</property>
421+
</item>
422+
<item>
423+
<property name="text" >
424+
<string>Routes</string>
425+
</property>
426+
</item>
427+
<item>
428+
<property name="text" >
429+
<string>Tracks</string>
430+
</property>
431+
</item>
410432
</widget>
411433
</item>
412-
<item row="2" column="1" >
413-
<widget class="QPushButton" name="pbDLEditDevices" >
434+
<item row="3" column="0" >
435+
<widget class="QLabel" name="textLabel2" >
414436
<property name="text" >
415-
<string>Edit devices</string>
437+
<string>Output file:</string>
416438
</property>
417439
</widget>
418440
</item>
419-
<item row="3" column="4" >
441+
<item row="3" column="1" colspan="6" >
442+
<widget class="QLineEdit" name="leDLOutput" />
443+
</item>
444+
<item row="3" column="7" colspan="2" >
420445
<widget class="QPushButton" name="pbnDLOutput" >
421446
<property name="text" >
422447
<string>Save As...</string>
423448
</property>
424449
</widget>
425450
</item>
451+
<item row="4" column="0" >
452+
<widget class="QLabel" name="textLabel1_2" >
453+
<property name="text" >
454+
<string>Layer name:</string>
455+
</property>
456+
</widget>
457+
</item>
458+
<item row="4" column="1" colspan="6" >
459+
<widget class="QLineEdit" name="leDLBasename" />
460+
</item>
426461
</layout>
427462
</widget>
428463
<widget class="QWidget" name="tab4" >
429464
<attribute name="title" >
430465
<string>Upload to GPS</string>
431466
</attribute>
432467
<layout class="QGridLayout" >
433-
<property name="margin" >
468+
<property name="leftMargin" >
469+
<number>9</number>
470+
</property>
471+
<property name="topMargin" >
472+
<number>9</number>
473+
</property>
474+
<property name="rightMargin" >
475+
<number>9</number>
476+
</property>
477+
<property name="bottomMargin" >
434478
<number>9</number>
435479
</property>
436-
<property name="spacing" >
480+
<property name="horizontalSpacing" >
481+
<number>6</number>
482+
</property>
483+
<property name="verticalSpacing" >
437484
<number>6</number>
438485
</property>
439486
<item row="1" column="2" >
@@ -460,8 +507,8 @@ p, li { white-space: pre-wrap; }
460507
<property name="html" >
461508
<string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
462509
p, li { white-space: pre-wrap; }
463-
&lt;/style>&lt;/head>&lt;body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal; text-decoration:none;">
464-
&lt;p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">&lt;/p>&lt;/body>&lt;/html></string>
510+
&lt;/style>&lt;/head>&lt;body style=" font-family:'Verdana'; font-size:10pt; font-weight:400; font-style:normal;">
511+
&lt;p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif'; font-size:9pt;">&lt;/p>&lt;/body>&lt;/html></string>
465512
</property>
466513
</widget>
467514
</item>
@@ -530,10 +577,22 @@ p, li { white-space: pre-wrap; }
530577
<string>GPX Conversions</string>
531578
</attribute>
532579
<layout class="QGridLayout" >
533-
<property name="margin" >
580+
<property name="leftMargin" >
581+
<number>9</number>
582+
</property>
583+
<property name="topMargin" >
584+
<number>9</number>
585+
</property>
586+
<property name="rightMargin" >
587+
<number>9</number>
588+
</property>
589+
<property name="bottomMargin" >
534590
<number>9</number>
535591
</property>
536-
<property name="spacing" >
592+
<property name="horizontalSpacing" >
593+
<number>6</number>
594+
</property>
595+
<property name="verticalSpacing" >
537596
<number>6</number>
538597
</property>
539598
<item row="0" column="0" colspan="4" >
@@ -544,8 +603,8 @@ p, li { white-space: pre-wrap; }
544603
<property name="html" >
545604
<string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
546605
p, li { white-space: pre-wrap; }
547-
&lt;/style>&lt;/head>&lt;body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal; text-decoration:none;">
548-
&lt;p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">&lt;/p>&lt;/body>&lt;/html></string>
606+
&lt;/style>&lt;/head>&lt;body style=" font-family:'Verdana'; font-size:10pt; font-weight:400; font-style:normal;">
607+
&lt;p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif'; font-size:9pt;">&lt;/p>&lt;/body>&lt;/html></string>
549608
</property>
550609
</widget>
551610
</item>

0 commit comments

Comments
 (0)
Please sign in to comment.