Skip to content

Commit ae8c286

Browse files
author
timlinux
committed
UI cleanups
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@12069 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent ceb1185 commit ae8c286

File tree

3 files changed

+106
-102
lines changed

3 files changed

+106
-102
lines changed

‎src/ui/qgscomposerbase.ui‎

Lines changed: 2 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<bool>true</bool>
2222
</property>
2323
<layout class="QGridLayout">
24-
<item row="0" column="0">
24+
<item row="1" column="0">
2525
<widget class="QSplitter" name="mSplitter">
2626
<property name="mouseTracking">
2727
<bool>true</bool>
@@ -133,13 +133,6 @@
133133
</widget>
134134
</widget>
135135
</item>
136-
<item row="1" column="0">
137-
<widget class="QDialogButtonBox" name="buttonBox">
138-
<property name="standardButtons">
139-
<set>QDialogButtonBox::Help</set>
140-
</property>
141-
</widget>
142-
</item>
143136
</layout>
144137
</widget>
145138
<widget class="QToolBar" name="toolBar">
@@ -445,27 +438,9 @@
445438
</action>
446439
</widget>
447440
<tabstops>
448-
<tabstop>buttonBox</tabstop>
449441
<tabstop>mCompositionNameComboBox</tabstop>
450442
<tabstop>mOptionsTabWidget</tabstop>
451443
</tabstops>
452444
<resources/>
453-
<connections>
454-
<connection>
455-
<sender>buttonBox</sender>
456-
<signal>rejected()</signal>
457-
<receiver>QgsComposerBase</receiver>
458-
<slot>close()</slot>
459-
<hints>
460-
<hint type="sourcelabel">
461-
<x>612</x>
462-
<y>583</y>
463-
</hint>
464-
<hint type="destinationlabel">
465-
<x>735</x>
466-
<y>567</y>
467-
</hint>
468-
</hints>
469-
</connection>
470-
</connections>
445+
<connections/>
471446
</ui>

‎src/ui/qgscomposermapwidgetbase.ui‎

Lines changed: 51 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@
2626
<item row="0" column="0">
2727
<widget class="QToolBox" name="toolBox">
2828
<property name="currentIndex">
29-
<number>0</number>
29+
<number>1</number>
3030
</property>
3131
<widget class="QWidget" name="page">
3232
<property name="geometry">
3333
<rect>
3434
<x>0</x>
35-
<y>0</y>
35+
<y>-68</y>
3636
<width>386</width>
3737
<height>419</height>
3838
</rect>
@@ -172,6 +172,19 @@
172172
</item>
173173
</layout>
174174
</item>
175+
<item row="10" column="0">
176+
<spacer name="verticalSpacer">
177+
<property name="orientation">
178+
<enum>Qt::Vertical</enum>
179+
</property>
180+
<property name="sizeHint" stdset="0">
181+
<size>
182+
<width>20</width>
183+
<height>40</height>
184+
</size>
185+
</property>
186+
</spacer>
187+
</item>
175188
</layout>
176189
</widget>
177190
</item>
@@ -182,8 +195,8 @@
182195
<rect>
183196
<x>0</x>
184197
<y>0</y>
185-
<width>404</width>
186-
<height>351</height>
198+
<width>386</width>
199+
<height>352</height>
187200
</rect>
188201
</property>
189202
<attribute name="label">
@@ -279,9 +292,30 @@
279292
</layout>
280293
</widget>
281294
</item>
295+
<item row="1" column="0">
296+
<spacer name="verticalSpacer_3">
297+
<property name="orientation">
298+
<enum>Qt::Vertical</enum>
299+
</property>
300+
<property name="sizeHint" stdset="0">
301+
<size>
302+
<width>20</width>
303+
<height>40</height>
304+
</size>
305+
</property>
306+
</spacer>
307+
</item>
282308
</layout>
283309
</widget>
284310
<widget class="QWidget" name="page_3">
311+
<property name="geometry">
312+
<rect>
313+
<x>0</x>
314+
<y>-448</y>
315+
<width>386</width>
316+
<height>805</height>
317+
</rect>
318+
</property>
285319
<attribute name="label">
286320
<string>Grid</string>
287321
</attribute>
@@ -556,6 +590,19 @@
556590
</property>
557591
</widget>
558592
</item>
593+
<item row="37" column="0">
594+
<spacer name="verticalSpacer_2">
595+
<property name="orientation">
596+
<enum>Qt::Vertical</enum>
597+
</property>
598+
<property name="sizeHint" stdset="0">
599+
<size>
600+
<width>20</width>
601+
<height>40</height>
602+
</size>
603+
</property>
604+
</spacer>
605+
</item>
559606
</layout>
560607
</widget>
561608
</item>

‎src/ui/qgscomposerscalebarwidgetbase.ui‎

Lines changed: 53 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<x>0</x>
3535
<y>0</y>
3636
<width>307</width>
37-
<height>714</height>
37+
<height>616</height>
3838
</rect>
3939
</property>
4040
<attribute name="label">
@@ -85,35 +85,20 @@
8585
</widget>
8686
</item>
8787
<item row="4" column="0">
88-
<widget class="QLabel" name="mNumbereOfSegmentsLabel">
89-
<property name="text">
90-
<string>Number of segments</string>
91-
</property>
92-
<property name="wordWrap">
93-
<bool>true</bool>
94-
</property>
95-
<property name="buddy">
96-
<cstring>mNumberOfSegmentsSpinBox</cstring>
88+
<widget class="QSpinBox" name="mNumberOfSegmentsSpinBox">
89+
<property name="suffix">
90+
<string> Right segments</string>
9791
</property>
9892
</widget>
9993
</item>
10094
<item row="5" column="0">
101-
<widget class="QSpinBox" name="mNumberOfSegmentsSpinBox"/>
102-
</item>
103-
<item row="6" column="0">
104-
<widget class="QLabel" name="mSegmentsLeftLabel">
105-
<property name="text">
106-
<string>Segments left</string>
107-
</property>
108-
<property name="buddy">
109-
<cstring>mSegmentsLeftSpinBox</cstring>
95+
<widget class="QSpinBox" name="mSegmentsLeftSpinBox">
96+
<property name="suffix">
97+
<string> Left segments</string>
11098
</property>
11199
</widget>
112100
</item>
113-
<item row="7" column="0">
114-
<widget class="QSpinBox" name="mSegmentsLeftSpinBox"/>
115-
</item>
116-
<item row="8" column="0">
101+
<item row="6" column="0">
117102
<widget class="QLabel" name="mStyleLabel">
118103
<property name="text">
119104
<string>Style</string>
@@ -123,10 +108,10 @@
123108
</property>
124109
</widget>
125110
</item>
126-
<item row="9" column="0">
111+
<item row="7" column="0">
127112
<widget class="QComboBox" name="mStyleComboBox"/>
128113
</item>
129-
<item row="10" column="0">
114+
<item row="8" column="0">
130115
<widget class="QLabel" name="mMapLabel">
131116
<property name="sizePolicy">
132117
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
@@ -145,7 +130,7 @@
145130
</property>
146131
</widget>
147132
</item>
148-
<item row="11" column="0">
133+
<item row="9" column="0">
149134
<widget class="QComboBox" name="mMapComboBox">
150135
<property name="enabled">
151136
<bool>true</bool>
@@ -158,40 +143,30 @@
158143
</property>
159144
</widget>
160145
</item>
161-
<item row="12" column="0">
162-
<widget class="QLabel" name="mHeightLabel">
163-
<property name="text">
164-
<string>Height (mm)</string>
165-
</property>
166-
<property name="buddy">
167-
<cstring>mHeightSpinBox</cstring>
168-
</property>
169-
</widget>
170-
</item>
171-
<item row="13" column="0">
172-
<widget class="QSpinBox" name="mHeightSpinBox"/>
173-
</item>
174-
<item row="14" column="0">
175-
<widget class="QLabel" name="mLineWidthLabel">
176-
<property name="text">
177-
<string>Line width</string>
178-
</property>
179-
<property name="wordWrap">
180-
<bool>true</bool>
146+
<item row="10" column="0">
147+
<widget class="QSpinBox" name="mHeightSpinBox">
148+
<property name="suffix">
149+
<string> mm</string>
181150
</property>
182-
<property name="buddy">
183-
<cstring>mLineWidthSpinBox</cstring>
151+
<property name="prefix">
152+
<string>Height </string>
184153
</property>
185154
</widget>
186155
</item>
187-
<item row="15" column="0">
156+
<item row="11" column="0">
188157
<widget class="QDoubleSpinBox" name="mLineWidthSpinBox">
189158
<property name="sizePolicy">
190159
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
191160
<horstretch>0</horstretch>
192161
<verstretch>0</verstretch>
193162
</sizepolicy>
194163
</property>
164+
<property name="prefix">
165+
<string>Line width </string>
166+
</property>
167+
<property name="suffix">
168+
<string> mm</string>
169+
</property>
195170
<property name="minimum">
196171
<double>0.010000000000000</double>
197172
</property>
@@ -203,33 +178,27 @@
203178
</property>
204179
</widget>
205180
</item>
206-
<item row="16" column="0">
207-
<widget class="QLabel" name="mLabelBarSpaceLabel">
208-
<property name="text">
209-
<string>Label space</string>
181+
<item row="12" column="0">
182+
<widget class="QDoubleSpinBox" name="mLabelBarSpaceSpinBox">
183+
<property name="prefix">
184+
<string>Label space </string>
210185
</property>
211-
<property name="buddy">
212-
<cstring>mLabelBarSpaceSpinBox</cstring>
186+
<property name="suffix">
187+
<string> mm</string>
213188
</property>
214189
</widget>
215190
</item>
216-
<item row="17" column="0">
217-
<widget class="QDoubleSpinBox" name="mLabelBarSpaceSpinBox"/>
218-
</item>
219-
<item row="18" column="0">
220-
<widget class="QLabel" name="mBoxSpaceLabel">
221-
<property name="text">
222-
<string>Box space</string>
191+
<item row="13" column="0">
192+
<widget class="QDoubleSpinBox" name="mBoxSizeSpinBox">
193+
<property name="prefix">
194+
<string>Box space </string>
223195
</property>
224-
<property name="buddy">
225-
<cstring>mBoxSizeSpinBox</cstring>
196+
<property name="suffix">
197+
<string> mm</string>
226198
</property>
227199
</widget>
228200
</item>
229-
<item row="19" column="0">
230-
<widget class="QDoubleSpinBox" name="mBoxSizeSpinBox"/>
231-
</item>
232-
<item row="20" column="0">
201+
<item row="14" column="0">
233202
<widget class="QLabel" name="mUnitLabelLabel">
234203
<property name="text">
235204
<string>Unit label</string>
@@ -242,10 +211,10 @@
242211
</property>
243212
</widget>
244213
</item>
245-
<item row="21" column="0">
214+
<item row="15" column="0">
246215
<widget class="QLineEdit" name="mUnitLabelLineEdit"/>
247216
</item>
248-
<item row="22" column="0">
217+
<item row="16" column="0">
249218
<widget class="QPushButton" name="mFontButton">
250219
<property name="sizePolicy">
251220
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
@@ -258,13 +227,26 @@
258227
</property>
259228
</widget>
260229
</item>
261-
<item row="23" column="0">
230+
<item row="17" column="0">
262231
<widget class="QPushButton" name="mColorPushButton">
263232
<property name="text">
264233
<string>Color...</string>
265234
</property>
266235
</widget>
267236
</item>
237+
<item row="18" column="0">
238+
<spacer name="verticalSpacer">
239+
<property name="orientation">
240+
<enum>Qt::Vertical</enum>
241+
</property>
242+
<property name="sizeHint" stdset="0">
243+
<size>
244+
<width>20</width>
245+
<height>40</height>
246+
</size>
247+
</property>
248+
</spacer>
249+
</item>
268250
</layout>
269251
</widget>
270252
</widget>

0 commit comments

Comments
 (0)