Skip to content

Commit b8bf86b

Browse files
alexbruyalexbruy
committed
Merge pull request #148 from slarosa/master
minor fixes in fTools GUI
2 parents a442b89 + 474e04b commit b8bf86b

File tree

2 files changed

+134
-142
lines changed

2 files changed

+134
-142
lines changed

‎python/plugins/fTools/tools/frmSpatialJoin.ui‎

Lines changed: 68 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
<property name="sizeGripEnabled">
2020
<bool>true</bool>
2121
</property>
22-
<layout class="QGridLayout" name="gridLayout">
23-
<item row="0" column="0" colspan="3">
22+
<layout class="QVBoxLayout" name="verticalLayout">
23+
<item>
2424
<layout class="QVBoxLayout">
2525
<item>
2626
<widget class="QLabel" name="label_3">
@@ -34,7 +34,7 @@
3434
</item>
3535
</layout>
3636
</item>
37-
<item row="1" column="0" colspan="3">
37+
<item>
3838
<layout class="QVBoxLayout">
3939
<item>
4040
<widget class="QLabel" name="label">
@@ -48,28 +48,24 @@
4848
</item>
4949
</layout>
5050
</item>
51-
<item row="2" column="0" colspan="3">
51+
<item>
5252
<widget class="QGroupBox" name="groupBox_2">
5353
<property name="title">
5454
<string>Attribute Summary</string>
5555
</property>
5656
<layout class="QGridLayout">
57-
<item row="0" column="0" colspan="7">
58-
<widget class="QRadioButton" name="rdoFirst">
59-
<property name="text">
60-
<string>Take attributes of first located feature</string>
61-
</property>
62-
<property name="checked">
63-
<bool>true</bool>
57+
<item row="2" column="6">
58+
<spacer>
59+
<property name="orientation">
60+
<enum>Qt::Horizontal</enum>
6461
</property>
65-
</widget>
66-
</item>
67-
<item row="1" column="0" colspan="7">
68-
<widget class="QRadioButton" name="rdoSummary">
69-
<property name="text">
70-
<string>Take summary of intersecting features</string>
62+
<property name="sizeHint" stdset="0">
63+
<size>
64+
<width>40</width>
65+
<height>20</height>
66+
</size>
7167
</property>
72-
</widget>
68+
</spacer>
7369
</item>
7470
<item row="2" column="0">
7571
<spacer>
@@ -97,23 +93,20 @@
9793
</property>
9894
</widget>
9995
</item>
100-
<item row="2" column="2">
101-
<widget class="QCheckBox" name="chkMin">
102-
<property name="enabled">
103-
<bool>false</bool>
104-
</property>
96+
<item row="1" column="0" colspan="7">
97+
<widget class="QRadioButton" name="rdoSummary">
10598
<property name="text">
106-
<string>Min</string>
99+
<string>Take summary of intersecting features</string>
107100
</property>
108101
</widget>
109102
</item>
110-
<item row="2" column="3">
111-
<widget class="QCheckBox" name="chkMax">
103+
<item row="2" column="2">
104+
<widget class="QCheckBox" name="chkMin">
112105
<property name="enabled">
113106
<bool>false</bool>
114107
</property>
115108
<property name="text">
116-
<string>Max</string>
109+
<string>Min</string>
117110
</property>
118111
</widget>
119112
</item>
@@ -127,19 +120,6 @@
127120
</property>
128121
</widget>
129122
</item>
130-
<item row="2" column="6">
131-
<spacer>
132-
<property name="orientation">
133-
<enum>Qt::Horizontal</enum>
134-
</property>
135-
<property name="sizeHint" stdset="0">
136-
<size>
137-
<width>40</width>
138-
<height>20</height>
139-
</size>
140-
</property>
141-
</spacer>
142-
</item>
143123
<item row="2" column="5">
144124
<widget class="QCheckBox" name="chkMedian">
145125
<property name="enabled">
@@ -150,10 +130,30 @@
150130
</property>
151131
</widget>
152132
</item>
133+
<item row="2" column="3">
134+
<widget class="QCheckBox" name="chkMax">
135+
<property name="enabled">
136+
<bool>false</bool>
137+
</property>
138+
<property name="text">
139+
<string>Max</string>
140+
</property>
141+
</widget>
142+
</item>
143+
<item row="0" column="0" colspan="7">
144+
<widget class="QRadioButton" name="rdoFirst">
145+
<property name="text">
146+
<string>Take attributes of first located feature</string>
147+
</property>
148+
<property name="checked">
149+
<bool>true</bool>
150+
</property>
151+
</widget>
152+
</item>
153153
</layout>
154154
</widget>
155155
</item>
156-
<item row="3" column="0" colspan="3">
156+
<item>
157157
<layout class="QVBoxLayout">
158158
<item>
159159
<widget class="QLabel" name="label_2">
@@ -182,7 +182,7 @@
182182
</item>
183183
</layout>
184184
</item>
185-
<item row="4" column="0" colspan="3">
185+
<item>
186186
<widget class="QGroupBox" name="groupBox_3">
187187
<property name="title">
188188
<string>Output table</string>
@@ -208,41 +208,32 @@
208208
</layout>
209209
</widget>
210210
</item>
211-
<item row="5" column="0" rowspan="3" colspan="3">
212-
<spacer>
213-
<property name="orientation">
214-
<enum>Qt::Vertical</enum>
215-
</property>
216-
<property name="sizeHint" stdset="0">
217-
<size>
218-
<width>359</width>
219-
<height>16</height>
220-
</size>
221-
</property>
222-
</spacer>
223-
</item>
224-
<item row="7" column="1">
225-
<widget class="QProgressBar" name="progressBar">
226-
<property name="value">
227-
<number>24</number>
228-
</property>
229-
<property name="alignment">
230-
<set>Qt::AlignCenter</set>
231-
</property>
232-
<property name="textVisible">
233-
<bool>true</bool>
234-
</property>
235-
</widget>
236-
</item>
237-
<item row="6" column="2" rowspan="2">
238-
<widget class="QDialogButtonBox" name="buttonBox_2">
239-
<property name="orientation">
240-
<enum>Qt::Horizontal</enum>
241-
</property>
242-
<property name="standardButtons">
243-
<set>QDialogButtonBox::Close|QDialogButtonBox::Ok</set>
244-
</property>
245-
</widget>
211+
<item>
212+
<layout class="QHBoxLayout" name="horizontalLayout">
213+
<item>
214+
<widget class="QProgressBar" name="progressBar">
215+
<property name="value">
216+
<number>24</number>
217+
</property>
218+
<property name="alignment">
219+
<set>Qt::AlignCenter</set>
220+
</property>
221+
<property name="textVisible">
222+
<bool>true</bool>
223+
</property>
224+
</widget>
225+
</item>
226+
<item>
227+
<widget class="QDialogButtonBox" name="buttonBox_2">
228+
<property name="orientation">
229+
<enum>Qt::Horizontal</enum>
230+
</property>
231+
<property name="standardButtons">
232+
<set>QDialogButtonBox::Close|QDialogButtonBox::Ok</set>
233+
</property>
234+
</widget>
235+
</item>
236+
</layout>
246237
</item>
247238
</layout>
248239
</widget>

0 commit comments

Comments
 (0)