Skip to content

Commit 2ab5702

Browse files
author
jef
committedAug 30, 2009
don't close wms layer dialog after addition and allow naming of layers
git-svn-id: http://svn.osgeo.org/qgis/trunk@11528 c8812cc2-4d05-0410-92ff-de0c093fc19c
·
ltr-3_40Before-merge-new_vector_api
1 parent 2e88599 commit 2ab5702

File tree

4 files changed

+191
-182
lines changed

4 files changed

+191
-182
lines changed
 

‎src/app/qgisapp.cpp

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2778,18 +2778,7 @@ void QgisApp::addWmsLayer()
27782778
QgsDebugMsg( "about to addRasterLayer" );
27792779

27802780
QgsServerSourceSelect *wmss = new QgsServerSourceSelect( this );
2781-
2782-
if ( wmss->exec() )
2783-
{
2784-
2785-
addRasterLayer( wmss->connectionInfo(),
2786-
/*wmss->connName()*/wmss->selectedLayers().join( "/" ),
2787-
"wms",
2788-
wmss->selectedLayers(),
2789-
wmss->selectedStylesForSelectedLayers(),
2790-
wmss->selectedImageEncoding(),
2791-
wmss->selectedCrs() );
2792-
}
2781+
wmss->exec();
27932782
}
27942783

27952784

‎src/app/qgsserversourceselect.cpp

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -439,7 +439,14 @@ void QgsServerSourceSelect::on_btnAdd_clicked()
439439
}
440440
else
441441
{
442-
accept();
442+
QgisApp::instance()->addRasterLayer(
443+
connectionInfo(),
444+
leLayerName->text().isEmpty() ? selectedLayers().join( "/" ) : leLayerName->text(),
445+
"wms",
446+
selectedLayers(),
447+
selectedStylesForSelectedLayers(),
448+
selectedImageEncoding(),
449+
selectedCrs() );
443450
}
444451
}
445452

‎src/app/qgsserversourceselect.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ class QgsServerSourceSelect : public QDialog, private Ui::QgsServerSourceSelectB
102102
*/
103103
void on_btnConnect_clicked();
104104

105-
//! Determines the layers the user selected and closes the dialog
105+
//! Determines the layers the user selected
106106
void on_btnAdd_clicked();
107107

108108
//! Opens the Spatial Reference System dialog.

‎src/ui/qgsserversourceselectbase.ui

Lines changed: 181 additions & 168 deletions
Original file line numberDiff line numberDiff line change
@@ -1,190 +1,191 @@
1-
<ui version="4.0" >
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<ui version="4.0">
23
<class>QgsServerSourceSelectBase</class>
3-
<widget class="QDialog" name="QgsServerSourceSelectBase" >
4-
<property name="geometry" >
4+
<widget class="QDialog" name="QgsServerSourceSelectBase">
5+
<property name="geometry">
56
<rect>
67
<x>0</x>
78
<y>0</y>
8-
<width>600</width>
9-
<height>481</height>
9+
<width>510</width>
10+
<height>439</height>
1011
</rect>
1112
</property>
12-
<property name="windowTitle" >
13+
<property name="windowTitle">
1314
<string>Add Layer(s) from a Server</string>
1415
</property>
15-
<property name="windowIcon" >
16+
<property name="windowIcon">
1617
<iconset>
1718
<normaloff/>
1819
</iconset>
1920
</property>
20-
<property name="sizeGripEnabled" >
21+
<property name="sizeGripEnabled">
2122
<bool>true</bool>
2223
</property>
23-
<property name="modal" >
24+
<property name="modal">
2425
<bool>true</bool>
2526
</property>
26-
<layout class="QGridLayout" >
27-
<item row="0" column="0" colspan="4" >
28-
<widget class="QTabWidget" name="tabWidget" >
29-
<property name="currentIndex" >
27+
<layout class="QGridLayout">
28+
<item row="0" column="1" colspan="4">
29+
<widget class="QTabWidget" name="tabWidget">
30+
<property name="currentIndex">
3031
<number>0</number>
3132
</property>
32-
<widget class="QWidget" name="tab" >
33-
<attribute name="title" >
33+
<widget class="QWidget" name="tab">
34+
<attribute name="title">
3435
<string>Servers</string>
3536
</attribute>
36-
<layout class="QGridLayout" >
37-
<item row="0" column="0" colspan="6" >
38-
<widget class="QComboBox" name="cmbConnections" />
37+
<layout class="QGridLayout">
38+
<item row="0" column="0" colspan="6">
39+
<widget class="QComboBox" name="cmbConnections"/>
3940
</item>
40-
<item row="1" column="0" >
41-
<widget class="QPushButton" name="btnConnect" >
42-
<property name="enabled" >
41+
<item row="1" column="0">
42+
<widget class="QPushButton" name="btnConnect">
43+
<property name="enabled">
4344
<bool>false</bool>
4445
</property>
45-
<property name="text" >
46+
<property name="text">
4647
<string>C&amp;onnect</string>
4748
</property>
4849
</widget>
4950
</item>
50-
<item row="1" column="1" >
51-
<widget class="QPushButton" name="btnNew" >
52-
<property name="text" >
51+
<item row="1" column="1">
52+
<widget class="QPushButton" name="btnNew">
53+
<property name="text">
5354
<string>&amp;New</string>
5455
</property>
5556
</widget>
5657
</item>
57-
<item row="1" column="2" >
58-
<widget class="QPushButton" name="btnEdit" >
59-
<property name="enabled" >
58+
<item row="1" column="2">
59+
<widget class="QPushButton" name="btnEdit">
60+
<property name="enabled">
6061
<bool>false</bool>
6162
</property>
62-
<property name="text" >
63+
<property name="text">
6364
<string>Edit</string>
6465
</property>
6566
</widget>
6667
</item>
67-
<item row="1" column="3" >
68-
<widget class="QPushButton" name="btnDelete" >
69-
<property name="enabled" >
68+
<item row="1" column="3">
69+
<widget class="QPushButton" name="btnDelete">
70+
<property name="enabled">
7071
<bool>false</bool>
7172
</property>
72-
<property name="text" >
73+
<property name="text">
7374
<string>Delete</string>
7475
</property>
7576
</widget>
7677
</item>
77-
<item row="1" column="4" >
78-
<widget class="QPushButton" name="btnAddDefault" >
79-
<property name="statusTip" >
78+
<item row="1" column="4">
79+
<widget class="QPushButton" name="btnAddDefault">
80+
<property name="statusTip">
8081
<string>Adds a few example WMS servers</string>
8182
</property>
82-
<property name="whatsThis" >
83-
<string comment="Adds several example WMS servers to the list" />
83+
<property name="whatsThis">
84+
<string comment="Adds several example WMS servers to the list"/>
8485
</property>
85-
<property name="text" >
86+
<property name="text">
8687
<string>Add default servers</string>
8788
</property>
8889
</widget>
8990
</item>
90-
<item row="1" column="5" >
91+
<item row="1" column="5">
9192
<spacer>
92-
<property name="orientation" >
93+
<property name="orientation">
9394
<enum>Qt::Horizontal</enum>
9495
</property>
95-
<property name="sizeType" >
96+
<property name="sizeType">
9697
<enum>QSizePolicy::Expanding</enum>
9798
</property>
98-
<property name="sizeHint" stdset="0" >
99+
<property name="sizeHint" stdset="0">
99100
<size>
100101
<width>131</width>
101102
<height>30</height>
102103
</size>
103104
</property>
104105
</spacer>
105106
</item>
106-
<item row="2" column="0" colspan="6" >
107-
<widget class="QTreeWidget" name="lstLayers" >
108-
<property name="sizePolicy" >
109-
<sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
107+
<item row="2" column="0" colspan="6">
108+
<widget class="QTreeWidget" name="lstLayers">
109+
<property name="sizePolicy">
110+
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
110111
<horstretch>0</horstretch>
111112
<verstretch>0</verstretch>
112113
</sizepolicy>
113114
</property>
114-
<property name="selectionMode" >
115+
<property name="selectionMode">
115116
<enum>QAbstractItemView::MultiSelection</enum>
116117
</property>
117-
<property name="allColumnsShowFocus" >
118+
<property name="allColumnsShowFocus">
118119
<bool>true</bool>
119120
</property>
120121
<column>
121-
<property name="text" >
122+
<property name="text">
122123
<string>ID</string>
123124
</property>
124125
</column>
125126
<column>
126-
<property name="text" >
127+
<property name="text">
127128
<string>Name</string>
128129
</property>
129130
</column>
130131
<column>
131-
<property name="text" >
132+
<property name="text">
132133
<string>Title</string>
133134
</property>
134135
</column>
135136
<column>
136-
<property name="text" >
137+
<property name="text">
137138
<string>Abstract</string>
138139
</property>
139140
</column>
140141
</widget>
141142
</item>
142143
</layout>
143144
</widget>
144-
<widget class="QWidget" name="tabLayerOrder" >
145-
<attribute name="title" >
145+
<widget class="QWidget" name="tabLayerOrder">
146+
<attribute name="title">
146147
<string>Layer Order</string>
147148
</attribute>
148-
<layout class="QGridLayout" name="gridLayout" >
149-
<item row="0" column="0" >
150-
<widget class="QPushButton" name="mLayerUpButton" >
151-
<property name="text" >
149+
<layout class="QGridLayout" name="gridLayout">
150+
<item row="0" column="0">
151+
<widget class="QPushButton" name="mLayerUpButton">
152+
<property name="text">
152153
<string/>
153154
</property>
154155
</widget>
155156
</item>
156-
<item row="0" column="1" >
157-
<widget class="QPushButton" name="mLayerDownButton" >
158-
<property name="text" >
157+
<item row="0" column="1">
158+
<widget class="QPushButton" name="mLayerDownButton">
159+
<property name="text">
159160
<string/>
160161
</property>
161162
</widget>
162163
</item>
163-
<item row="0" column="2" >
164-
<spacer name="horizontalSpacer" >
165-
<property name="orientation" >
164+
<item row="0" column="2">
165+
<spacer name="horizontalSpacer">
166+
<property name="orientation">
166167
<enum>Qt::Horizontal</enum>
167168
</property>
168-
<property name="sizeHint" stdset="0" >
169+
<property name="sizeHint" stdset="0">
169170
<size>
170171
<width>391</width>
171172
<height>30</height>
172173
</size>
173174
</property>
174175
</spacer>
175176
</item>
176-
<item row="1" column="0" colspan="3" >
177-
<widget class="QTreeWidget" name="mLayerOrderTreeWidget" >
178-
<property name="columnCount" >
177+
<item row="1" column="0" colspan="3">
178+
<widget class="QTreeWidget" name="mLayerOrderTreeWidget">
179+
<property name="columnCount">
179180
<number>2</number>
180181
</property>
181182
<column>
182-
<property name="text" >
183+
<property name="text">
183184
<string>Layer</string>
184185
</property>
185186
</column>
186187
<column>
187-
<property name="text" >
188+
<property name="text">
188189
<string>Style</string>
189190
</property>
190191
</column>
@@ -196,55 +197,55 @@
196197
<zorder>horizontalSpacer</zorder>
197198
<zorder>mLayerOrderTreeWidget</zorder>
198199
</widget>
199-
<widget class="QWidget" name="tab_2" >
200-
<attribute name="title" >
200+
<widget class="QWidget" name="tab_2">
201+
<attribute name="title">
201202
<string>Server Search</string>
202203
</attribute>
203-
<layout class="QGridLayout" >
204-
<item row="0" column="0" >
205-
<widget class="QLineEdit" name="leSearchTerm" />
204+
<layout class="QGridLayout">
205+
<item row="0" column="0">
206+
<widget class="QLineEdit" name="leSearchTerm"/>
206207
</item>
207-
<item row="0" column="1" >
208-
<widget class="QPushButton" name="btnSearch" >
209-
<property name="text" >
208+
<item row="0" column="1">
209+
<widget class="QPushButton" name="btnSearch">
210+
<property name="text">
210211
<string>Search</string>
211212
</property>
212-
<property name="default" >
213+
<property name="default">
213214
<bool>true</bool>
214215
</property>
215216
</widget>
216217
</item>
217-
<item row="1" column="0" colspan="2" >
218-
<widget class="QTableWidget" name="tableWidgetWMSList" >
219-
<property name="selectionMode" >
218+
<item row="1" column="0" colspan="2">
219+
<widget class="QTableWidget" name="tableWidgetWMSList">
220+
<property name="selectionMode">
220221
<enum>QAbstractItemView::SingleSelection</enum>
221222
</property>
222-
<property name="selectionBehavior" >
223+
<property name="selectionBehavior">
223224
<enum>QAbstractItemView::SelectRows</enum>
224225
</property>
225-
<property name="cornerButtonEnabled" >
226+
<property name="cornerButtonEnabled">
226227
<bool>false</bool>
227228
</property>
228229
<column>
229-
<property name="text" >
230+
<property name="text">
230231
<string>Title</string>
231232
</property>
232233
</column>
233234
<column>
234-
<property name="text" >
235+
<property name="text">
235236
<string>URL</string>
236237
</property>
237238
</column>
238239
<column>
239-
<property name="text" >
240+
<property name="text">
240241
<string>Description</string>
241242
</property>
242243
</column>
243244
</widget>
244245
</item>
245-
<item row="2" column="0" colspan="2" >
246-
<widget class="QPushButton" name="btnAddWMS" >
247-
<property name="text" >
246+
<item row="2" column="0" colspan="2">
247+
<widget class="QPushButton" name="btnAddWMS">
248+
<property name="text">
248249
<string>Add selected row to WMS list</string>
249250
</property>
250251
</widget>
@@ -253,150 +254,162 @@
253254
</widget>
254255
</widget>
255256
</item>
256-
<item row="1" column="0" colspan="4" >
257-
<widget class="QGroupBox" name="btnGrpImageEncoding" >
258-
<property name="sizePolicy" >
259-
<sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
257+
<item row="1" column="1" colspan="4">
258+
<widget class="QGroupBox" name="btnGrpImageEncoding">
259+
<property name="sizePolicy">
260+
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
260261
<horstretch>0</horstretch>
261262
<verstretch>0</verstretch>
262263
</sizepolicy>
263264
</property>
264-
<property name="minimumSize" >
265+
<property name="minimumSize">
265266
<size>
266267
<width>16</width>
267268
<height>64</height>
268269
</size>
269270
</property>
270-
<property name="title" >
271+
<property name="title">
271272
<string>Image encoding</string>
272273
</property>
273274
</widget>
274275
</item>
275-
<item row="2" column="0" colspan="4" >
276-
<widget class="QGroupBox" name="gbCRS" >
277-
<property name="title" >
278-
<string>Coordinate Reference System</string>
279-
</property>
280-
<layout class="QHBoxLayout" >
281-
<item>
282-
<widget class="QLabel" name="labelCoordRefSys" >
283-
<property name="text" >
284-
<string/>
285-
</property>
286-
</widget>
287-
</item>
288-
<item>
289-
<spacer>
290-
<property name="orientation" >
291-
<enum>Qt::Horizontal</enum>
292-
</property>
293-
<property name="sizeType" >
294-
<enum>QSizePolicy::Expanding</enum>
295-
</property>
296-
<property name="sizeHint" stdset="0" >
297-
<size>
298-
<width>441</width>
299-
<height>23</height>
300-
</size>
301-
</property>
302-
</spacer>
303-
</item>
304-
<item>
305-
<widget class="QPushButton" name="btnChangeSpatialRefSys" >
306-
<property name="enabled" >
307-
<bool>false</bool>
308-
</property>
309-
<property name="text" >
310-
<string>Change ...</string>
311-
</property>
312-
</widget>
313-
</item>
314-
</layout>
315-
</widget>
316-
</item>
317-
<item row="3" column="0" >
318-
<widget class="QPushButton" name="btnHelp" >
319-
<property name="enabled" >
276+
<item row="3" column="1">
277+
<widget class="QPushButton" name="btnHelp">
278+
<property name="enabled">
320279
<bool>true</bool>
321280
</property>
322-
<property name="text" >
281+
<property name="text">
323282
<string>Help</string>
324283
</property>
325-
<property name="shortcut" >
284+
<property name="shortcut">
326285
<string>F1</string>
327286
</property>
328-
<property name="autoDefault" >
287+
<property name="autoDefault">
329288
<bool>true</bool>
330289
</property>
331290
</widget>
332291
</item>
333-
<item row="3" column="1" >
292+
<item row="3" column="2">
334293
<spacer>
335-
<property name="orientation" >
294+
<property name="orientation">
336295
<enum>Qt::Horizontal</enum>
337296
</property>
338-
<property name="sizeType" >
297+
<property name="sizeType">
339298
<enum>QSizePolicy::Expanding</enum>
340299
</property>
341-
<property name="sizeHint" stdset="0" >
300+
<property name="sizeHint" stdset="0">
342301
<size>
343302
<width>284</width>
344303
<height>31</height>
345304
</size>
346305
</property>
347306
</spacer>
348307
</item>
349-
<item row="3" column="2" >
350-
<widget class="QPushButton" name="btnAdd" >
351-
<property name="enabled" >
308+
<item row="3" column="3">
309+
<widget class="QPushButton" name="btnAdd">
310+
<property name="enabled">
352311
<bool>false</bool>
353312
</property>
354-
<property name="text" >
313+
<property name="text">
355314
<string>&amp;Add</string>
356315
</property>
357-
<property name="shortcut" >
316+
<property name="shortcut">
358317
<string>Alt+A</string>
359318
</property>
360-
<property name="autoDefault" >
319+
<property name="autoDefault">
361320
<bool>true</bool>
362321
</property>
363-
<property name="default" >
322+
<property name="default">
364323
<bool>true</bool>
365324
</property>
366325
</widget>
367326
</item>
368-
<item row="3" column="3" >
369-
<widget class="QPushButton" name="btnCancel" >
370-
<property name="text" >
327+
<item row="3" column="4">
328+
<widget class="QPushButton" name="btnCancel">
329+
<property name="text">
371330
<string>C&amp;lose</string>
372331
</property>
373-
<property name="shortcut" >
332+
<property name="shortcut">
374333
<string>Alt+L</string>
375334
</property>
376-
<property name="autoDefault" >
335+
<property name="autoDefault">
377336
<bool>true</bool>
378337
</property>
379338
</widget>
380339
</item>
381-
<item row="4" column="0" colspan="4" >
382-
<widget class="QLabel" name="labelStatus" >
383-
<property name="sizePolicy" >
384-
<sizepolicy vsizetype="Preferred" hsizetype="Ignored" >
340+
<item row="4" column="1" colspan="4">
341+
<widget class="QLabel" name="labelStatus">
342+
<property name="sizePolicy">
343+
<sizepolicy hsizetype="Ignored" vsizetype="Preferred">
385344
<horstretch>0</horstretch>
386345
<verstretch>0</verstretch>
387346
</sizepolicy>
388347
</property>
389-
<property name="text" >
348+
<property name="text">
390349
<string>Ready</string>
391350
</property>
392-
<property name="wordWrap" >
351+
<property name="wordWrap">
393352
<bool>false</bool>
394353
</property>
395354
</widget>
396355
</item>
356+
<item row="2" column="4">
357+
<widget class="QGroupBox" name="gbCRS">
358+
<property name="title">
359+
<string>Coordinate Reference System</string>
360+
</property>
361+
<layout class="QHBoxLayout">
362+
<item>
363+
<widget class="QLabel" name="labelCoordRefSys">
364+
<property name="text">
365+
<string/>
366+
</property>
367+
</widget>
368+
</item>
369+
<item>
370+
<spacer>
371+
<property name="orientation">
372+
<enum>Qt::Horizontal</enum>
373+
</property>
374+
<property name="sizeType">
375+
<enum>QSizePolicy::Expanding</enum>
376+
</property>
377+
<property name="sizeHint" stdset="0">
378+
<size>
379+
<width>441</width>
380+
<height>23</height>
381+
</size>
382+
</property>
383+
</spacer>
384+
</item>
385+
<item>
386+
<widget class="QPushButton" name="btnChangeSpatialRefSys">
387+
<property name="enabled">
388+
<bool>false</bool>
389+
</property>
390+
<property name="text">
391+
<string>Change ...</string>
392+
</property>
393+
</widget>
394+
</item>
395+
</layout>
396+
</widget>
397+
</item>
398+
<item row="2" column="1" colspan="3">
399+
<widget class="QGroupBox" name="groupBox">
400+
<property name="title">
401+
<string>Layer name</string>
402+
</property>
403+
<layout class="QGridLayout" name="gridLayout_2">
404+
<item row="0" column="0">
405+
<widget class="QLineEdit" name="leLayerName"/>
406+
</item>
407+
</layout>
408+
</widget>
409+
</item>
397410
</layout>
398411
</widget>
399-
<layoutdefault spacing="6" margin="11" />
412+
<layoutdefault spacing="6" margin="11"/>
400413
<tabstops>
401414
<tabstop>cmbConnections</tabstop>
402415
<tabstop>btnConnect</tabstop>

0 commit comments

Comments
 (0)
Please sign in to comment.