Skip to content

Commit 61abea5

Browse files
author
macho
committedNov 10, 2009
last ui cleanups from my list -> buttonbox
git-svn-id: http://svn.osgeo.org/qgis/trunk@12080 c8812cc2-4d05-0410-92ff-de0c093fc19c
·
ltr-3_40Before-merge-new_vector_api
1 parent fe94d6b commit 61abea5

File tree

3 files changed

+170
-195
lines changed

3 files changed

+170
-195
lines changed
 

‎src/app/qgswmssourceselect.cpp

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,16 @@ QgsWMSSourceSelect::QgsWMSSourceSelect( QWidget * parent, Qt::WFlags fl )
5656
mWmsProvider( 0 )
5757
{
5858
setupUi( this );
59+
mAddButton = new QPushButton( tr( "&Add" ) );
60+
buttonBox->addButton( mAddButton, QDialogButtonBox::ActionRole );
61+
connect( mAddButton,SIGNAL( clicked() ), this, SLOT( addClicked() ) );
62+
connect( buttonBox,SIGNAL( helpRequested() ), this, SLOT( helpClicked() ) );
63+
5964
mLayerUpButton->setIcon( QgisApp::getThemeIcon( "/mActionArrowUp.png" ) );
6065
mLayerDownButton->setIcon( QgisApp::getThemeIcon( "/mActionArrowDown.png" ) );
61-
connect( btnCancel, SIGNAL( clicked() ), this, SLOT( reject() ) );
66+
67+
mAddButton->setEnabled( false );
68+
populateConnectionList();
6269

6370
// Qt Designer 4.1 doesn't let us use a QButtonGroup, so it has to
6471
// be done manually... Unless I'm missing something, it's a whole
@@ -201,7 +208,7 @@ void QgsWMSSourceSelect::on_btnDelete_clicked()
201208
}
202209
}
203210

204-
void QgsWMSSourceSelect::on_btnHelp_clicked()
211+
void QgsWMSSourceSelect::helpClicked()
205212
{
206213

207214
QgsContextHelp::run( context_id );
@@ -283,7 +290,7 @@ bool QgsWMSSourceSelect::populateLayerList( QgsWmsProvider *wmsProvider )
283290
// If we got some layers, let the user add them to the map
284291
if ( lstLayers->topLevelItemCount() > 0 )
285292
{
286-
btnAdd->setEnabled( TRUE );
293+
mAddButton->setEnabled( TRUE );
287294

288295
if ( lstLayers->topLevelItemCount() == 1 )
289296
{
@@ -292,7 +299,7 @@ bool QgsWMSSourceSelect::populateLayerList( QgsWmsProvider *wmsProvider )
292299
}
293300
else
294301
{
295-
btnAdd->setEnabled( FALSE );
302+
mAddButton->setEnabled( FALSE );
296303
}
297304

298305
return TRUE;
@@ -427,7 +434,7 @@ void QgsWMSSourceSelect::on_btnConnect_clicked()
427434

428435
}
429436

430-
void QgsWMSSourceSelect::on_btnAdd_clicked()
437+
void QgsWMSSourceSelect::addClicked()
431438
{
432439
if ( selectedLayers().empty() == TRUE )
433440
{

‎src/app/qgswmssourceselect.h

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
#include "qgisgui.h"
2323

2424
#include <QStringList>
25+
#include <QPushButton>
2526

2627
class QgisApp;
2728
class QgsWmsProvider;
@@ -103,13 +104,14 @@ class QgsWMSSourceSelect : public QDialog, private Ui::QgsWMSSourceSelectBase
103104
void on_btnConnect_clicked();
104105

105106
//! Determines the layers the user selected
106-
void on_btnAdd_clicked();
107+
void addClicked();
108+
107109

108110
//! Opens the Spatial Reference System dialog.
109111
void on_btnChangeSpatialRefSys_clicked();
110112

111113
//! Opens help application
112-
void on_btnHelp_clicked();
114+
void helpClicked();
113115

114116
//! Signaled when a layer selection is changed. Ensures that only one style is selected per layer.
115117
void on_lstLayers_itemSelectionChanged();
@@ -182,6 +184,8 @@ class QgsWMSSourceSelect : public QDialog, private Ui::QgsWMSSourceSelectBase
182184
QButtonGroup* m_imageFormatGroup;
183185
QHBoxLayout* m_imageFormatLayout;
184186

187+
QPushButton * mAddButton;
188+
185189
//! The WMS provider that retrieves information for this dialog
186190
QgsWmsProvider * mWmsProvider;
187191

‎src/ui/qgswmssourceselectbase.ui

Lines changed: 152 additions & 188 deletions
Original file line numberDiff line numberDiff line change
@@ -1,246 +1,247 @@
1-
<ui version="4.0" >
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<ui version="4.0">
23
<class>QgsWMSSourceSelectBase</class>
3-
<widget class="QDialog" name="QgsWMSSourceSelectBase" >
4-
<property name="geometry" >
4+
<widget class="QDialog" name="QgsWMSSourceSelectBase">
5+
<property name="geometry">
56
<rect>
67
<x>0</x>
78
<y>0</y>
8-
<width>510</width>
9+
<width>555</width>
910
<height>508</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>
17-
<normaloff/>
18+
<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" >
30-
<number>0</number>
27+
<layout class="QGridLayout">
28+
<item row="0" column="0" colspan="2">
29+
<widget class="QTabWidget" name="tabWidget">
30+
<property name="currentIndex">
31+
<number>2</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+
<item row="1" column="4">
7879
<spacer>
79-
<property name="orientation" >
80+
<property name="orientation">
8081
<enum>Qt::Horizontal</enum>
8182
</property>
82-
<property name="sizeType" >
83+
<property name="sizeType">
8384
<enum>QSizePolicy::Expanding</enum>
8485
</property>
85-
<property name="sizeHint" >
86+
<property name="sizeHint" stdset="0">
8687
<size>
8788
<width>16</width>
8889
<height>31</height>
8990
</size>
9091
</property>
9192
</spacer>
9293
</item>
93-
<item row="1" column="5" >
94-
<widget class="QPushButton" name="btnAddDefault" >
95-
<property name="statusTip" >
94+
<item row="1" column="5">
95+
<widget class="QPushButton" name="btnAddDefault">
96+
<property name="statusTip">
9697
<string>Adds a few example WMS servers</string>
9798
</property>
98-
<property name="whatsThis" >
99-
<string comment="Adds several example WMS servers to the list" />
99+
<property name="whatsThis">
100+
<string comment="Adds several example WMS servers to the list"/>
100101
</property>
101-
<property name="text" >
102+
<property name="text">
102103
<string>Add default servers</string>
103104
</property>
104105
</widget>
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" >
149-
<item row="0" column="0" >
150-
<widget class="QPushButton" name="mLayerUpButton" >
151-
<property name="text" >
149+
<layout class="QGridLayout">
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+
<item row="0" column="2">
164165
<spacer>
165-
<property name="orientation" >
166+
<property name="orientation">
166167
<enum>Qt::Horizontal</enum>
167168
</property>
168-
<property name="sizeHint" >
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>
191192
</widget>
192193
</item>
193194
</layout>
194195
</widget>
195-
<widget class="QWidget" name="tab_2" >
196-
<attribute name="title" >
196+
<widget class="QWidget" name="tab_2">
197+
<attribute name="title">
197198
<string>Server Search</string>
198199
</attribute>
199-
<layout class="QGridLayout" >
200-
<item row="0" column="0" >
201-
<widget class="QLineEdit" name="leSearchTerm" />
200+
<layout class="QGridLayout">
201+
<item row="0" column="0">
202+
<widget class="QLineEdit" name="leSearchTerm"/>
202203
</item>
203-
<item row="0" column="1" >
204-
<widget class="QPushButton" name="btnSearch" >
205-
<property name="text" >
204+
<item row="0" column="1">
205+
<widget class="QPushButton" name="btnSearch">
206+
<property name="text">
206207
<string>Search</string>
207208
</property>
208-
<property name="default" >
209+
<property name="default">
209210
<bool>true</bool>
210211
</property>
211212
</widget>
212213
</item>
213-
<item row="1" column="0" colspan="2" >
214-
<widget class="QTableWidget" name="tableWidgetWMSList" >
215-
<property name="selectionMode" >
214+
<item row="1" column="0" colspan="2">
215+
<widget class="QTableWidget" name="tableWidgetWMSList">
216+
<property name="selectionMode">
216217
<enum>QAbstractItemView::SingleSelection</enum>
217218
</property>
218-
<property name="selectionBehavior" >
219+
<property name="selectionBehavior">
219220
<enum>QAbstractItemView::SelectRows</enum>
220221
</property>
221-
<property name="cornerButtonEnabled" >
222+
<property name="cornerButtonEnabled">
222223
<bool>false</bool>
223224
</property>
224225
<column>
225-
<property name="text" >
226+
<property name="text">
226227
<string>Title</string>
227228
</property>
228229
</column>
229230
<column>
230-
<property name="text" >
231+
<property name="text">
231232
<string>URL</string>
232233
</property>
233234
</column>
234235
<column>
235-
<property name="text" >
236+
<property name="text">
236237
<string>Description</string>
237238
</property>
238239
</column>
239240
</widget>
240241
</item>
241-
<item row="2" column="0" colspan="2" >
242-
<widget class="QPushButton" name="btnAddWMS" >
243-
<property name="text" >
242+
<item row="2" column="0" colspan="2">
243+
<widget class="QPushButton" name="btnAddWMS">
244+
<property name="text">
244245
<string>Add selected row to WMS list</string>
245246
</property>
246247
</widget>
@@ -249,155 +250,118 @@
249250
</widget>
250251
</widget>
251252
</item>
252-
<item row="1" column="0" colspan="4" >
253-
<widget class="QGroupBox" name="btnGrpImageEncoding" >
254-
<property name="sizePolicy" >
255-
<sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
253+
<item row="1" column="0" colspan="2">
254+
<widget class="QGroupBox" name="btnGrpImageEncoding">
255+
<property name="sizePolicy">
256+
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
256257
<horstretch>0</horstretch>
257258
<verstretch>0</verstretch>
258259
</sizepolicy>
259260
</property>
260-
<property name="minimumSize" >
261+
<property name="minimumSize">
261262
<size>
262263
<width>16</width>
263264
<height>64</height>
264265
</size>
265266
</property>
266-
<property name="title" >
267+
<property name="title">
267268
<string>Image encoding</string>
268269
</property>
269270
</widget>
270271
</item>
271-
<item row="2" column="0" colspan="4" >
272-
<widget class="QGroupBox" name="gbCRS" >
273-
<property name="title" >
272+
<item row="2" column="0" colspan="2">
273+
<widget class="QGroupBox" name="gbCRS">
274+
<property name="title">
274275
<string>Options</string>
275276
</property>
276-
<layout class="QGridLayout" >
277-
<item row="0" column="0" >
278-
<widget class="QLabel" name="label" >
279-
<property name="text" >
277+
<layout class="QGridLayout">
278+
<item row="0" column="0">
279+
<widget class="QLabel" name="label">
280+
<property name="text">
280281
<string>Layer name</string>
281282
</property>
283+
<property name="buddy">
284+
<cstring>leLayerName</cstring>
285+
</property>
282286
</widget>
283287
</item>
284-
<item row="0" column="1" colspan="2" >
285-
<widget class="QLineEdit" name="leLayerName" />
288+
<item row="0" column="1" colspan="2">
289+
<widget class="QLineEdit" name="leLayerName"/>
286290
</item>
287-
<item row="1" column="0" colspan="2" >
288-
<widget class="QLabel" name="labelCoordRefSys" >
289-
<property name="text" >
291+
<item row="1" column="0" colspan="2">
292+
<widget class="QLabel" name="labelCoordRefSys">
293+
<property name="text">
290294
<string>Coordinate Reference System</string>
291295
</property>
296+
<property name="buddy">
297+
<cstring>btnChangeSpatialRefSys</cstring>
298+
</property>
292299
</widget>
293300
</item>
294-
<item row="1" column="2" >
295-
<widget class="QPushButton" name="btnChangeSpatialRefSys" >
296-
<property name="enabled" >
301+
<item row="1" column="2">
302+
<widget class="QPushButton" name="btnChangeSpatialRefSys">
303+
<property name="enabled">
297304
<bool>false</bool>
298305
</property>
299-
<property name="text" >
306+
<property name="text">
300307
<string>Change ...</string>
301308
</property>
302309
</widget>
303310
</item>
304311
</layout>
305312
</widget>
306313
</item>
307-
<item row="3" column="0" >
308-
<widget class="QPushButton" name="btnHelp" >
309-
<property name="enabled" >
310-
<bool>true</bool>
311-
</property>
312-
<property name="text" >
313-
<string>Help</string>
314-
</property>
315-
<property name="shortcut" >
316-
<string>F1</string>
317-
</property>
318-
<property name="autoDefault" >
319-
<bool>true</bool>
320-
</property>
321-
</widget>
322-
</item>
323-
<item row="3" column="1" >
324-
<spacer>
325-
<property name="orientation" >
326-
<enum>Qt::Horizontal</enum>
327-
</property>
328-
<property name="sizeType" >
329-
<enum>QSizePolicy::Expanding</enum>
330-
</property>
331-
<property name="sizeHint" >
332-
<size>
333-
<width>284</width>
334-
<height>31</height>
335-
</size>
336-
</property>
337-
</spacer>
338-
</item>
339-
<item row="3" column="2" >
340-
<widget class="QPushButton" name="btnAdd" >
341-
<property name="enabled" >
342-
<bool>false</bool>
343-
</property>
344-
<property name="text" >
345-
<string>&amp;Add</string>
346-
</property>
347-
<property name="shortcut" >
348-
<string>Alt+A</string>
349-
</property>
350-
<property name="autoDefault" >
351-
<bool>true</bool>
352-
</property>
353-
<property name="default" >
354-
<bool>true</bool>
355-
</property>
356-
</widget>
357-
</item>
358-
<item row="3" column="3" >
359-
<widget class="QPushButton" name="btnCancel" >
360-
<property name="text" >
361-
<string>C&amp;lose</string>
362-
</property>
363-
<property name="shortcut" >
364-
<string>Alt+L</string>
365-
</property>
366-
<property name="autoDefault" >
367-
<bool>true</bool>
368-
</property>
369-
</widget>
370-
</item>
371-
<item row="4" column="0" colspan="4" >
372-
<widget class="QLabel" name="labelStatus" >
373-
<property name="sizePolicy" >
374-
<sizepolicy vsizetype="Preferred" hsizetype="Ignored" >
314+
<item row="4" column="0" colspan="2">
315+
<widget class="QLabel" name="labelStatus">
316+
<property name="sizePolicy">
317+
<sizepolicy hsizetype="Ignored" vsizetype="Preferred">
375318
<horstretch>0</horstretch>
376319
<verstretch>0</verstretch>
377320
</sizepolicy>
378321
</property>
379-
<property name="text" >
322+
<property name="text">
380323
<string>Ready</string>
381324
</property>
382-
<property name="wordWrap" >
325+
<property name="wordWrap">
383326
<bool>false</bool>
384327
</property>
385328
</widget>
386329
</item>
330+
<item row="3" column="0" colspan="2">
331+
<widget class="QDialogButtonBox" name="buttonBox">
332+
<property name="standardButtons">
333+
<set>QDialogButtonBox::Close|QDialogButtonBox::Help</set>
334+
</property>
335+
</widget>
336+
</item>
387337
</layout>
388338
</widget>
389-
<layoutdefault spacing="6" margin="11" />
339+
<layoutdefault spacing="6" margin="11"/>
390340
<tabstops>
391341
<tabstop>cmbConnections</tabstop>
392342
<tabstop>btnConnect</tabstop>
393343
<tabstop>btnNew</tabstop>
394344
<tabstop>btnEdit</tabstop>
395345
<tabstop>btnDelete</tabstop>
396346
<tabstop>btnChangeSpatialRefSys</tabstop>
397-
<tabstop>btnHelp</tabstop>
398-
<tabstop>btnAdd</tabstop>
399-
<tabstop>btnCancel</tabstop>
400347
</tabstops>
401348
<resources/>
402-
<connections/>
349+
<connections>
350+
<connection>
351+
<sender>buttonBox</sender>
352+
<signal>rejected()</signal>
353+
<receiver>QgsWMSSourceSelectBase</receiver>
354+
<slot>reject()</slot>
355+
<hints>
356+
<hint type="sourcelabel">
357+
<x>509</x>
358+
<y>461</y>
359+
</hint>
360+
<hint type="destinationlabel">
361+
<x>551</x>
362+
<y>370</y>
363+
</hint>
364+
</hints>
365+
</connection>
366+
</connections>
403367
</ui>

0 commit comments

Comments
 (0)
Please sign in to comment.