Skip to content

Commit f506cf1

Browse files
author
gsherman
committedSep 7, 2006
Improved layout of dialog.
Removed the MinScale and MaxScale fields from the dialog. git-svn-id: http://svn.osgeo.org/qgis/trunk@5775 c8812cc2-4d05-0410-92ff-de0c093fc19c
·
ltr-3_40Before-merge-new_vector_api
1 parent 708d416 commit f506cf1

File tree

2 files changed

+349
-304
lines changed

2 files changed

+349
-304
lines changed
 

‎tools/mapserver_export/qgsmapserverexport.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,8 @@ void QgsMapserverExport::on_chkExpLayersOnly_clicked(bool isChecked)
8383
txtMapHeight->setEnabled(!isChecked);
8484
cmbMapUnits->setEnabled(!isChecked);
8585
cmbMapImageType->setEnabled(!isChecked);
86-
txtMinScale->setEnabled(!isChecked);
87-
txtMaxScale->setEnabled(!isChecked);
86+
//txtMinScale->setEnabled(!isChecked);
87+
//txtMaxScale->setEnabled(!isChecked);
8888
txtWebTemplate->setEnabled(!isChecked);
8989
txtWebHeader->setEnabled(!isChecked);
9090
txtWebFooter->setEnabled(!isChecked);
@@ -130,7 +130,6 @@ void QgsMapserverExport::on_buttonOk_clicked()
130130
pargs = Py_BuildValue("(ssssssssss)",
131131
cmbMapUnits->currentText().ascii(), cmbMapImageType->currentText().ascii(),
132132
txtMapName->text().ascii(), txtMapWidth->text().ascii(), txtMapHeight->text().ascii(),
133-
txtMinScale->text().ascii(), txtMaxScale->text().ascii(),
134133
txtWebTemplate->text().ascii(), txtWebFooter->text().ascii(),txtWebHeader->text().ascii());
135134
pstr = PyEval_CallObject(pmeth, pargs);
136135

‎tools/mapserver_export/qgsmapserverexportbase.ui

Lines changed: 347 additions & 301 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<x>0</x>
1010
<y>0</y>
1111
<width>485</width>
12-
<height>496</height>
12+
<height>438</height>
1313
</rect>
1414
</property>
1515
<property name="windowTitle" >
@@ -25,193 +25,6 @@
2525
<property name="spacing" >
2626
<number>6</number>
2727
</property>
28-
<item row="3" column="0" colspan="3" >
29-
<widget class="Q3GroupBox" name="grpMap" >
30-
<property name="title" >
31-
<string>Map</string>
32-
</property>
33-
<property name="orientation" >
34-
<enum>Qt::Vertical</enum>
35-
</property>
36-
<layout class="QGridLayout" >
37-
<property name="margin" >
38-
<number>0</number>
39-
</property>
40-
<property name="spacing" >
41-
<number>6</number>
42-
</property>
43-
<item row="3" column="2" >
44-
<widget class="QLabel" name="textLabel6_2" >
45-
<property name="text" >
46-
<string>MaxScale</string>
47-
</property>
48-
<property name="buddy" >
49-
<cstring>txtMaxScale</cstring>
50-
</property>
51-
<property name="toolTip" >
52-
<string>MaxScale</string>
53-
</property>
54-
55-
</widget>
56-
</item>
57-
<item row="0" column="1" colspan="3" >
58-
<widget class="QLineEdit" name="txtMapName" >
59-
<property name="toolTip" >
60-
<string>Prefix attached to map, scalebar and legend GIF filenames created using this MapFile</string>
61-
</property>
62-
</widget>
63-
</item>
64-
<item row="1" column="3" >
65-
<widget class="QLineEdit" name="txtMapHeight" />
66-
</item>
67-
<item row="1" column="2" >
68-
<widget class="QLabel" name="textLabel2_2" >
69-
<property name="text" >
70-
<string>Height</string>
71-
</property>
72-
<property name="buddy" >
73-
<cstring>txtMapHeight</cstring>
74-
</property>
75-
</widget>
76-
</item>
77-
<item row="1" column="1" >
78-
<widget class="QLineEdit" name="txtMapWidth" />
79-
</item>
80-
<item row="1" column="0" >
81-
<widget class="QLabel" name="textLabel2" >
82-
<property name="text" >
83-
<string>Width</string>
84-
</property>
85-
<property name="buddy" >
86-
<cstring>txtMapWidth</cstring>
87-
</property>
88-
</widget>
89-
</item>
90-
<item row="3" column="3" >
91-
<widget class="QLineEdit" name="txtMaxScale" />
92-
</item>
93-
<item row="2" column="3" >
94-
<widget class="QComboBox" name="cmbMapImageType" >
95-
<item>
96-
<property name="text" >
97-
<string>gif</string>
98-
</property>
99-
</item>
100-
<item>
101-
<property name="text" >
102-
<string>gtiff</string>
103-
</property>
104-
</item>
105-
<item>
106-
<property name="text" >
107-
<string>jpeg</string>
108-
</property>
109-
</item>
110-
<item>
111-
<property name="text" >
112-
<string>png</string>
113-
</property>
114-
</item>
115-
<item>
116-
<property name="text" >
117-
<string>swf</string>
118-
</property>
119-
</item>
120-
<item>
121-
<property name="text" >
122-
<string>userdefined</string>
123-
</property>
124-
</item>
125-
<item>
126-
<property name="text" >
127-
<string>wbmp</string>
128-
</property>
129-
</item>
130-
</widget>
131-
</item>
132-
<item row="2" column="2" >
133-
<widget class="QLabel" name="textLabel4" >
134-
<property name="text" >
135-
<string>Image type</string>
136-
</property>
137-
<property name="buddy" >
138-
<cstring>cmbMapImageType</cstring>
139-
</property>
140-
</widget>
141-
</item>
142-
<item row="2" column="1" >
143-
<widget class="QComboBox" name="cmbMapUnits" >
144-
<item>
145-
<property name="text" >
146-
<string>dd</string>
147-
</property>
148-
</item>
149-
<item>
150-
<property name="text" >
151-
<string>feet</string>
152-
</property>
153-
</item>
154-
<item>
155-
<property name="text" >
156-
<string>meters</string>
157-
</property>
158-
</item>
159-
<item>
160-
<property name="text" >
161-
<string>miles</string>
162-
</property>
163-
</item>
164-
<item>
165-
<property name="text" >
166-
<string>inches</string>
167-
</property>
168-
</item>
169-
<item>
170-
<property name="text" >
171-
<string>kilometers</string>
172-
</property>
173-
</item>
174-
</widget>
175-
</item>
176-
<item row="2" column="0" >
177-
<widget class="QLabel" name="textLabel3" >
178-
<property name="text" >
179-
<string>Units</string>
180-
</property>
181-
<property name="buddy" >
182-
<cstring>cmbMapUnits</cstring>
183-
</property>
184-
</widget>
185-
</item>
186-
<item row="3" column="1" >
187-
<widget class="QLineEdit" name="txtMinScale" />
188-
</item>
189-
<item row="3" column="0" >
190-
<widget class="QLabel" name="textLabel6" >
191-
<property name="text" >
192-
<string>MinScale</string>
193-
</property>
194-
<property name="buddy" >
195-
<cstring>txtMinScale</cstring>
196-
</property>
197-
</widget>
198-
</item>
199-
<item row="0" column="0" >
200-
<widget class="QLabel" name="textLabel1" >
201-
<property name="toolTip" >
202-
<string/>
203-
</property>
204-
<property name="text" >
205-
<string>Name</string>
206-
</property>
207-
<property name="buddy" >
208-
<cstring>txtMapName</cstring>
209-
</property>
210-
</widget>
211-
</item>
212-
</layout>
213-
</widget>
214-
</item>
21528
<item row="5" column="0" colspan="3" >
21629
<layout class="QHBoxLayout" >
21730
<property name="margin" >
@@ -280,27 +93,343 @@
28093
</item>
28194
</layout>
28295
</item>
283-
<item row="0" column="2" >
284-
<widget class="QPushButton" name="btnChooseFile" >
285-
<property name="text" >
286-
<string>...</string>
96+
<item row="4" column="0" colspan="3" >
97+
<widget class="Q3GroupBox" name="grpWeb" >
98+
<property name="title" >
99+
<string>Web Interface Definition</string>
100+
</property>
101+
<property name="orientation" >
102+
<enum>Qt::Vertical</enum>
287103
</property>
104+
<layout class="QGridLayout" >
105+
<property name="margin" >
106+
<number>0</number>
107+
</property>
108+
<property name="spacing" >
109+
<number>0</number>
110+
</property>
111+
<item row="0" column="0" >
112+
<layout class="QHBoxLayout" >
113+
<property name="margin" >
114+
<number>4</number>
115+
</property>
116+
<property name="spacing" >
117+
<number>6</number>
118+
</property>
119+
<item>
120+
<widget class="QLabel" name="textLabel5_2" >
121+
<property name="minimumSize" >
122+
<size>
123+
<width>60</width>
124+
<height>0</height>
125+
</size>
126+
</property>
127+
<property name="text" >
128+
<string>Template</string>
129+
</property>
130+
<property name="buddy" >
131+
<cstring>txtWebTemplate</cstring>
132+
</property>
133+
</widget>
134+
</item>
135+
<item>
136+
<widget class="QLineEdit" name="txtWebTemplate" >
137+
<property name="toolTip" >
138+
<string>Path to the MapServer template file</string>
139+
</property>
140+
</widget>
141+
</item>
142+
<item>
143+
<widget class="QPushButton" name="btnChooseTemplateFile" >
144+
<property name="text" >
145+
<string>...</string>
146+
</property>
147+
</widget>
148+
</item>
149+
</layout>
150+
</item>
151+
<item row="1" column="0" >
152+
<layout class="QHBoxLayout" >
153+
<property name="margin" >
154+
<number>4</number>
155+
</property>
156+
<property name="spacing" >
157+
<number>6</number>
158+
</property>
159+
<item>
160+
<widget class="QLabel" name="textLabel5" >
161+
<property name="minimumSize" >
162+
<size>
163+
<width>60</width>
164+
<height>0</height>
165+
</size>
166+
</property>
167+
<property name="text" >
168+
<string>Header</string>
169+
</property>
170+
<property name="buddy" >
171+
<cstring>txtWebHeader</cstring>
172+
</property>
173+
</widget>
174+
</item>
175+
<item>
176+
<widget class="QLineEdit" name="txtWebHeader" />
177+
</item>
178+
<item>
179+
<widget class="QPushButton" name="btnChooseHeaderFile" >
180+
<property name="text" >
181+
<string>...</string>
182+
</property>
183+
</widget>
184+
</item>
185+
</layout>
186+
</item>
187+
<item row="2" column="0" >
188+
<layout class="QHBoxLayout" >
189+
<property name="margin" >
190+
<number>4</number>
191+
</property>
192+
<property name="spacing" >
193+
<number>6</number>
194+
</property>
195+
<item>
196+
<widget class="QLabel" name="textLabel5_3" >
197+
<property name="minimumSize" >
198+
<size>
199+
<width>60</width>
200+
<height>0</height>
201+
</size>
202+
</property>
203+
<property name="text" >
204+
<string>Footer</string>
205+
</property>
206+
<property name="buddy" >
207+
<cstring>txtWebFooter</cstring>
208+
</property>
209+
</widget>
210+
</item>
211+
<item>
212+
<widget class="QLineEdit" name="txtWebFooter" />
213+
</item>
214+
<item>
215+
<widget class="QPushButton" name="btnChooseFooterFile" >
216+
<property name="text" >
217+
<string>...</string>
218+
</property>
219+
</widget>
220+
</item>
221+
</layout>
222+
</item>
223+
</layout>
288224
</widget>
289225
</item>
290-
<item row="1" column="0" >
291-
<widget class="QLabel" name="textLabel7_2" >
226+
<item row="3" column="0" colspan="3" >
227+
<widget class="Q3GroupBox" name="grpMap" >
228+
<property name="title" >
229+
<string>Map</string>
230+
</property>
231+
<property name="orientation" >
232+
<enum>Qt::Vertical</enum>
233+
</property>
234+
<layout class="QGridLayout" >
235+
<property name="margin" >
236+
<number>0</number>
237+
</property>
238+
<property name="spacing" >
239+
<number>0</number>
240+
</property>
241+
<item row="2" column="0" >
242+
<layout class="QHBoxLayout" >
243+
<property name="margin" >
244+
<number>4</number>
245+
</property>
246+
<property name="spacing" >
247+
<number>6</number>
248+
</property>
249+
<item>
250+
<widget class="QLabel" name="textLabel3" >
251+
<property name="text" >
252+
<string>Units</string>
253+
</property>
254+
<property name="alignment" >
255+
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
256+
</property>
257+
<property name="buddy" >
258+
<cstring>cmbMapUnits</cstring>
259+
</property>
260+
</widget>
261+
</item>
262+
<item>
263+
<widget class="QComboBox" name="cmbMapUnits" >
264+
<item>
265+
<property name="text" >
266+
<string>dd</string>
267+
</property>
268+
</item>
269+
<item>
270+
<property name="text" >
271+
<string>feet</string>
272+
</property>
273+
</item>
274+
<item>
275+
<property name="text" >
276+
<string>meters</string>
277+
</property>
278+
</item>
279+
<item>
280+
<property name="text" >
281+
<string>miles</string>
282+
</property>
283+
</item>
284+
<item>
285+
<property name="text" >
286+
<string>inches</string>
287+
</property>
288+
</item>
289+
<item>
290+
<property name="text" >
291+
<string>kilometers</string>
292+
</property>
293+
</item>
294+
</widget>
295+
</item>
296+
<item>
297+
<widget class="QLabel" name="textLabel4" >
298+
<property name="text" >
299+
<string>Image type</string>
300+
</property>
301+
<property name="alignment" >
302+
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
303+
</property>
304+
<property name="buddy" >
305+
<cstring>cmbMapImageType</cstring>
306+
</property>
307+
</widget>
308+
</item>
309+
<item>
310+
<widget class="QComboBox" name="cmbMapImageType" >
311+
<item>
312+
<property name="text" >
313+
<string>gif</string>
314+
</property>
315+
</item>
316+
<item>
317+
<property name="text" >
318+
<string>gtiff</string>
319+
</property>
320+
</item>
321+
<item>
322+
<property name="text" >
323+
<string>jpeg</string>
324+
</property>
325+
</item>
326+
<item>
327+
<property name="text" >
328+
<string>png</string>
329+
</property>
330+
</item>
331+
<item>
332+
<property name="text" >
333+
<string>swf</string>
334+
</property>
335+
</item>
336+
<item>
337+
<property name="text" >
338+
<string>userdefined</string>
339+
</property>
340+
</item>
341+
<item>
342+
<property name="text" >
343+
<string>wbmp</string>
344+
</property>
345+
</item>
346+
</widget>
347+
</item>
348+
</layout>
349+
</item>
350+
<item row="1" column="0" >
351+
<layout class="QHBoxLayout" >
352+
<property name="margin" >
353+
<number>4</number>
354+
</property>
355+
<property name="spacing" >
356+
<number>6</number>
357+
</property>
358+
<item>
359+
<widget class="QLabel" name="textLabel2" >
360+
<property name="text" >
361+
<string>Width</string>
362+
</property>
363+
<property name="buddy" >
364+
<cstring>txtMapWidth</cstring>
365+
</property>
366+
</widget>
367+
</item>
368+
<item>
369+
<widget class="QLineEdit" name="txtMapWidth" />
370+
</item>
371+
<item>
372+
<widget class="QLabel" name="textLabel2_2" >
373+
<property name="text" >
374+
<string>Height</string>
375+
</property>
376+
<property name="buddy" >
377+
<cstring>txtMapHeight</cstring>
378+
</property>
379+
</widget>
380+
</item>
381+
<item>
382+
<widget class="QLineEdit" name="txtMapHeight" />
383+
</item>
384+
</layout>
385+
</item>
386+
<item row="0" column="0" >
387+
<layout class="QHBoxLayout" >
388+
<property name="margin" >
389+
<number>4</number>
390+
</property>
391+
<property name="spacing" >
392+
<number>6</number>
393+
</property>
394+
<item>
395+
<widget class="QLabel" name="textLabel1" >
396+
<property name="toolTip" >
397+
<string/>
398+
</property>
399+
<property name="text" >
400+
<string>Name</string>
401+
</property>
402+
<property name="buddy" >
403+
<cstring>txtMapName</cstring>
404+
</property>
405+
</widget>
406+
</item>
407+
<item>
408+
<widget class="QLineEdit" name="txtMapName" >
409+
<property name="toolTip" >
410+
<string>Prefix attached to map, scalebar and legend GIF filenames created using this MapFile</string>
411+
</property>
412+
</widget>
413+
</item>
414+
</layout>
415+
</item>
416+
</layout>
417+
</widget>
418+
</item>
419+
<item row="0" column="0" >
420+
<widget class="QLabel" name="textLabel7" >
292421
<property name="text" >
293-
<string>QGIS Project File</string>
422+
<string>Map file</string>
294423
</property>
295424
<property name="buddy" >
296-
<cstring>txtQgisFilePath</cstring>
425+
<cstring>txtMapFilePath</cstring>
297426
</property>
298427
</widget>
299428
</item>
300-
<item row="1" column="1" >
301-
<widget class="QLineEdit" name="txtQgisFilePath" >
429+
<item row="0" column="1" >
430+
<widget class="QLineEdit" name="txtMapFilePath" >
302431
<property name="toolTip" >
303-
<string>Full path to the QGIS project file to export to MapServer map format</string>
432+
<string>Name for the map file to be created from the QGIS project file</string>
304433
</property>
305434
</widget>
306435
</item>
@@ -311,119 +440,38 @@
311440
</property>
312441
</widget>
313442
</item>
314-
<item row="0" column="1" >
315-
<widget class="QLineEdit" name="txtMapFilePath" >
443+
<item row="1" column="1" >
444+
<widget class="QLineEdit" name="txtQgisFilePath" >
316445
<property name="toolTip" >
317-
<string>Name for the map file to be created from the QGIS project file</string>
446+
<string>Full path to the QGIS project file to export to MapServer map format</string>
318447
</property>
319448
</widget>
320449
</item>
321-
<item row="2" column="1" colspan="2" >
322-
<widget class="QCheckBox" name="chkExpLayersOnly" >
323-
<property name="toolTip" >
324-
<string>If checked, only the layer information will be processed</string>
325-
</property>
450+
<item row="1" column="0" >
451+
<widget class="QLabel" name="textLabel7_2" >
326452
<property name="text" >
327-
<string>Export LAYER information only</string>
453+
<string>QGIS Project File</string>
454+
</property>
455+
<property name="buddy" >
456+
<cstring>txtQgisFilePath</cstring>
328457
</property>
329458
</widget>
330459
</item>
331-
<item row="0" column="0" >
332-
<widget class="QLabel" name="textLabel7" >
460+
<item row="0" column="2" >
461+
<widget class="QPushButton" name="btnChooseFile" >
333462
<property name="text" >
334-
<string>Map file</string>
335-
</property>
336-
<property name="buddy" >
337-
<cstring>txtMapFilePath</cstring>
463+
<string>...</string>
338464
</property>
339465
</widget>
340466
</item>
341-
<item row="4" column="0" colspan="3" >
342-
<widget class="Q3GroupBox" name="grpWeb" >
343-
<property name="title" >
344-
<string>Web Interface Definition</string>
467+
<item row="2" column="1" colspan="2" >
468+
<widget class="QCheckBox" name="chkExpLayersOnly" >
469+
<property name="toolTip" >
470+
<string>If checked, only the layer information will be processed</string>
345471
</property>
346-
<property name="orientation" >
347-
<enum>Qt::Vertical</enum>
472+
<property name="text" >
473+
<string>Export LAYER information only</string>
348474
</property>
349-
<layout class="QGridLayout" >
350-
<property name="margin" >
351-
<number>0</number>
352-
</property>
353-
<property name="spacing" >
354-
<number>6</number>
355-
</property>
356-
<item row="2" column="1" >
357-
<widget class="QLineEdit" name="txtWebFooter" />
358-
<property name="toolTip" >
359-
<string>Path to the MapServer footer file (optional)</string>
360-
</property>
361-
</item>
362-
<item row="1" column="1" >
363-
<widget class="QLineEdit" name="txtWebHeader" />
364-
<property name="toolTip" >
365-
<string>Path to the MapServer header file (optional)</string>
366-
</property>
367-
</item>
368-
<item row="0" column="1" >
369-
<widget class="QLineEdit" name="txtWebTemplate" >
370-
<property name="toolTip" >
371-
<string>Path to the MapServer template file</string>
372-
</property>
373-
</widget>
374-
</item>
375-
<item row="0" column="2" >
376-
<widget class="QPushButton" name="btnChooseTemplateFile" >
377-
<property name="text" >
378-
<string>...</string>
379-
</property>
380-
</widget>
381-
</item>
382-
<item row="0" column="0" >
383-
<widget class="QLabel" name="textLabel5_2" >
384-
<property name="text" >
385-
<string>Template</string>
386-
</property>
387-
<property name="buddy" >
388-
<cstring>txtWebTemplate</cstring>
389-
</property>
390-
</widget>
391-
</item>
392-
<item row="1" column="0" >
393-
<widget class="QLabel" name="textLabel5" >
394-
<property name="text" >
395-
<string>Header</string>
396-
</property>
397-
<property name="buddy" >
398-
<cstring>txtWebHeader</cstring>
399-
</property>
400-
</widget>
401-
</item>
402-
<item row="1" column="2" >
403-
<widget class="QPushButton" name="btnChooseHeaderFile" >
404-
<property name="text" >
405-
<string>...</string>
406-
</property>
407-
</widget>
408-
</item>
409-
<item row="2" column="0" >
410-
<widget class="QLabel" name="textLabel5_3" >
411-
<property name="text" >
412-
<string>Footer</string>
413-
</property>
414-
<property name="buddy" >
415-
<cstring>txtWebFooter</cstring>
416-
</property>
417-
</widget>
418-
</item>
419-
<item row="2" column="2" >
420-
<widget class="QPushButton" name="btnChooseFooterFile" >
421-
<property name="text" >
422-
<string>...</string>
423-
</property>
424-
</widget>
425-
</item>
426-
</layout>
427475
</widget>
428476
</item>
429477
</layout>
@@ -433,7 +481,7 @@
433481
<customwidgets>
434482
<customwidget>
435483
<class>Q3GroupBox</class>
436-
<extends>QGroupBox</extends>
484+
<extends></extends>
437485
<header>Qt3Support/Q3GroupBox</header>
438486
<container>1</container>
439487
<pixmap></pixmap>
@@ -450,8 +498,6 @@
450498
<tabstop>txtMapHeight</tabstop>
451499
<tabstop>cmbMapUnits</tabstop>
452500
<tabstop>cmbMapImageType</tabstop>
453-
<tabstop>txtMinScale</tabstop>
454-
<tabstop>txtMaxScale</tabstop>
455501
<tabstop>txtWebTemplate</tabstop>
456502
<tabstop>btnChooseTemplateFile</tabstop>
457503
<tabstop>txtWebHeader</tabstop>

0 commit comments

Comments
 (0)
Please sign in to comment.