Skip to content

Commit 5211029

Browse files
author
timlinux
committedOct 3, 2009
HIG compliance for composer and it's dialogs
git-svn-id: http://svn.osgeo.org/qgis/trunk@11747 c8812cc2-4d05-0410-92ff-de0c093fc19c
·
ltr-3_40Before-merge-new_vector_api
1 parent 943a312 commit 5211029

8 files changed

+547
-504
lines changed
 

‎src/ui/qgscomposerbase.ui

Lines changed: 25 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -19,23 +19,8 @@
1919
<property name="mouseTracking" >
2020
<bool>true</bool>
2121
</property>
22-
<layout class="QVBoxLayout" >
23-
<property name="spacing" >
24-
<number>6</number>
25-
</property>
26-
<property name="leftMargin" >
27-
<number>9</number>
28-
</property>
29-
<property name="topMargin" >
30-
<number>9</number>
31-
</property>
32-
<property name="rightMargin" >
33-
<number>9</number>
34-
</property>
35-
<property name="bottomMargin" >
36-
<number>9</number>
37-
</property>
38-
<item>
22+
<layout class="QGridLayout" >
23+
<item row="0" column="0" >
3924
<widget class="QSplitter" name="mSplitter" >
4025
<property name="mouseTracking" >
4126
<bool>true</bool>
@@ -171,51 +156,12 @@
171156
</widget>
172157
</widget>
173158
</item>
174-
<item>
175-
<layout class="QHBoxLayout" >
176-
<property name="spacing" >
177-
<number>6</number>
159+
<item row="1" column="0" >
160+
<widget class="QDialogButtonBox" name="buttonBox" >
161+
<property name="standardButtons" >
162+
<set>QDialogButtonBox::Close|QDialogButtonBox::Help|QDialogButtonBox::NoButton</set>
178163
</property>
179-
<property name="leftMargin" >
180-
<number>0</number>
181-
</property>
182-
<property name="topMargin" >
183-
<number>0</number>
184-
</property>
185-
<property name="rightMargin" >
186-
<number>0</number>
187-
</property>
188-
<property name="bottomMargin" >
189-
<number>0</number>
190-
</property>
191-
<item>
192-
<widget class="QPushButton" name="helpPButton" >
193-
<property name="text" >
194-
<string>Help</string>
195-
</property>
196-
</widget>
197-
</item>
198-
<item>
199-
<spacer>
200-
<property name="orientation" >
201-
<enum>Qt::Horizontal</enum>
202-
</property>
203-
<property name="sizeHint" >
204-
<size>
205-
<width>40</width>
206-
<height>20</height>
207-
</size>
208-
</property>
209-
</spacer>
210-
</item>
211-
<item>
212-
<widget class="QPushButton" name="closePButton" >
213-
<property name="text" >
214-
<string>Close</string>
215-
</property>
216-
</widget>
217-
</item>
218-
</layout>
164+
</widget>
219165
</item>
220166
</layout>
221167
</widget>
@@ -502,5 +448,22 @@
502448
<tabstop>mSplitter</tabstop>
503449
</tabstops>
504450
<resources/>
505-
<connections/>
451+
<connections>
452+
<connection>
453+
<sender>buttonBox</sender>
454+
<signal>rejected()</signal>
455+
<receiver>QgsComposerBase</receiver>
456+
<slot>close()</slot>
457+
<hints>
458+
<hint type="sourcelabel" >
459+
<x>612</x>
460+
<y>583</y>
461+
</hint>
462+
<hint type="destinationlabel" >
463+
<x>735</x>
464+
<y>567</y>
465+
</hint>
466+
</hints>
467+
</connection>
468+
</connections>
506469
</ui>

‎src/ui/qgscomposeritemwidgetbase.ui

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,10 @@
2222
<item row="0" column="0" >
2323
<widget class="QLabel" name="mColorLabel" >
2424
<property name="text" >
25-
<string>Color:</string>
25+
<string>Color</string>
26+
</property>
27+
<property name="buddy" >
28+
<cstring>mFrameColorButton</cstring>
2629
</property>
2730
</widget>
2831
</item>
@@ -43,7 +46,10 @@
4346
<item row="1" column="0" colspan="2" >
4447
<widget class="QLabel" name="mOpacityLabel" >
4548
<property name="text" >
46-
<string>Opacity:</string>
49+
<string>Opacity</string>
50+
</property>
51+
<property name="buddy" >
52+
<cstring>mOpacitySlider</cstring>
4753
</property>
4854
</widget>
4955
</item>
@@ -60,7 +66,10 @@
6066
<item row="2" column="0" colspan="2" >
6167
<widget class="QLabel" name="mOutlineWidthLabel" >
6268
<property name="text" >
63-
<string>Outline width: </string>
69+
<string>Outline width</string>
70+
</property>
71+
<property name="buddy" >
72+
<cstring>mOutlineWidthSpinBox</cstring>
6473
</property>
6574
</widget>
6675
</item>

‎src/ui/qgscomposerlabelwidgetbase.ui

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,10 @@
4242
<item row="2" column="0" >
4343
<widget class="QLabel" name="mMarginTextLabel" >
4444
<property name="text" >
45-
<string>Margin (mm):</string>
45+
<string>Margin (mm)</string>
46+
</property>
47+
<property name="buddy" >
48+
<cstring>mMarginDoubleSpinBox</cstring>
4649
</property>
4750
</widget>
4851
</item>
@@ -53,7 +56,9 @@
5356
</widget>
5457
<layoutdefault spacing="6" margin="11" />
5558
<tabstops>
59+
<tabstop>mTextEdit</tabstop>
5660
<tabstop>mFontButton</tabstop>
61+
<tabstop>mMarginDoubleSpinBox</tabstop>
5762
</tabstops>
5863
<resources/>
5964
<connections/>

‎src/ui/qgscomposerlegenditemdialogbase.ui

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,10 @@
1616
<item row="0" column="0" >
1717
<widget class="QLabel" name="mItemTextLabel" >
1818
<property name="text" >
19-
<string>Item text:</string>
19+
<string>Item text</string>
20+
</property>
21+
<property name="buddy" >
22+
<cstring>mItemTextLineEdit</cstring>
2023
</property>
2124
</widget>
2225
</item>
@@ -44,8 +47,8 @@
4447
<slot>accept()</slot>
4548
<hints>
4649
<hint type="sourcelabel" >
47-
<x>248</x>
48-
<y>254</y>
50+
<x>257</x>
51+
<y>76</y>
4952
</hint>
5053
<hint type="destinationlabel" >
5154
<x>157</x>
@@ -60,8 +63,8 @@
6063
<slot>reject()</slot>
6164
<hints>
6265
<hint type="sourcelabel" >
63-
<x>316</x>
64-
<y>260</y>
66+
<x>325</x>
67+
<y>76</y>
6568
</hint>
6669
<hint type="destinationlabel" >
6770
<x>286</x>

‎src/ui/qgscomposerlegendwidgetbase.ui

Lines changed: 159 additions & 138 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
<rect>
66
<x>0</x>
77
<y>0</y>
8-
<width>560</width>
9-
<height>537</height>
8+
<width>520</width>
9+
<height>498</height>
1010
</rect>
1111
</property>
1212
<property name="sizePolicy" >
@@ -26,124 +26,129 @@
2626
</property>
2727
<layout class="QGridLayout" >
2828
<item row="0" column="0" >
29-
<layout class="QHBoxLayout" >
30-
<item>
31-
<widget class="QLabel" name="mTitleLabel" >
32-
<property name="text" >
33-
<string>Title:</string>
34-
</property>
35-
</widget>
36-
</item>
37-
<item>
38-
<widget class="QLineEdit" name="mTitleLineEdit" />
39-
</item>
40-
</layout>
29+
<widget class="QLabel" name="mTitleLabel" >
30+
<property name="text" >
31+
<string>Title</string>
32+
</property>
33+
<property name="buddy" >
34+
<cstring>mTitleLineEdit</cstring>
35+
</property>
36+
</widget>
4137
</item>
42-
<item row="1" column="0" >
43-
<layout class="QHBoxLayout" >
44-
<item>
45-
<widget class="QLabel" name="mFontLabel" >
46-
<property name="text" >
47-
<string>Font:</string>
48-
</property>
49-
</widget>
50-
</item>
51-
<item>
52-
<widget class="QPushButton" name="mTitleFontButton" >
53-
<property name="sizePolicy" >
54-
<sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
55-
<horstretch>0</horstretch>
56-
<verstretch>0</verstretch>
57-
</sizepolicy>
58-
</property>
59-
<property name="text" >
60-
<string>Title...</string>
61-
</property>
62-
</widget>
63-
</item>
64-
<item>
65-
<widget class="QPushButton" name="mLayerFontButton" >
66-
<property name="text" >
67-
<string>Layer...</string>
68-
</property>
69-
</widget>
70-
</item>
71-
<item>
72-
<widget class="QPushButton" name="mItemFontButton" >
73-
<property name="text" >
74-
<string>Item...</string>
75-
</property>
76-
</widget>
77-
</item>
78-
</layout>
79-
</item>
80-
<item row="2" column="0" >
81-
<layout class="QGridLayout" >
82-
<item row="0" column="0" colspan="2" >
83-
<widget class="QLabel" name="mSymbolWidthLabel" >
84-
<property name="text" >
85-
<string>Symbol width: </string>
86-
</property>
87-
</widget>
88-
</item>
89-
<item row="0" column="2" >
90-
<widget class="QDoubleSpinBox" name="mSymbolWidthSpinBox" />
91-
</item>
92-
<item row="0" column="3" colspan="2" >
93-
<widget class="QLabel" name="mSymbolHeightLabel" >
94-
<property name="text" >
95-
<string>Symbol height:</string>
96-
</property>
97-
</widget>
98-
</item>
99-
<item row="0" column="5" >
100-
<widget class="QDoubleSpinBox" name="mSymbolHeightSpinBox" />
101-
</item>
102-
<item row="1" column="0" >
103-
<widget class="QLabel" name="mLayerSpaceLabel" >
104-
<property name="text" >
105-
<string>Layer space: </string>
106-
</property>
107-
</widget>
108-
</item>
109-
<item row="1" column="1" colspan="2" >
110-
<widget class="QDoubleSpinBox" name="mLayerSpaceSpinBox" />
111-
</item>
112-
<item row="1" column="3" >
113-
<widget class="QLabel" name="mSymbolSpaceLabel" >
114-
<property name="text" >
115-
<string>Symbol space:</string>
116-
</property>
117-
</widget>
118-
</item>
119-
<item row="1" column="4" colspan="2" >
120-
<widget class="QDoubleSpinBox" name="mSymbolSpaceSpinBox" />
121-
</item>
122-
</layout>
123-
</item>
124-
<item row="3" column="0" >
125-
<layout class="QHBoxLayout" >
126-
<item>
127-
<widget class="QLabel" name="mIconLabelSpaceLabel" >
128-
<property name="text" >
129-
<string>Icon label space:</string>
130-
</property>
131-
</widget>
132-
</item>
133-
<item>
134-
<widget class="QDoubleSpinBox" name="mIconLabelSpaceSpinBox" />
135-
</item>
136-
<item>
137-
<widget class="QLabel" name="mBoxSpaceLabel" >
138-
<property name="text" >
139-
<string>Box space:</string>
140-
</property>
141-
</widget>
142-
</item>
143-
<item>
144-
<widget class="QDoubleSpinBox" name="mBoxSpaceSpinBox" />
145-
</item>
146-
</layout>
38+
<item row="0" column="1" colspan="8" >
39+
<widget class="QLineEdit" name="mTitleLineEdit" />
40+
</item>
41+
<item row="1" column="0" colspan="3" >
42+
<widget class="QLabel" name="mFontLabel" >
43+
<property name="text" >
44+
<string>Font</string>
45+
</property>
46+
</widget>
47+
</item>
48+
<item row="1" column="3" colspan="2" >
49+
<widget class="QPushButton" name="mTitleFontButton" >
50+
<property name="sizePolicy" >
51+
<sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
52+
<horstretch>0</horstretch>
53+
<verstretch>0</verstretch>
54+
</sizepolicy>
55+
</property>
56+
<property name="text" >
57+
<string>Title...</string>
58+
</property>
59+
</widget>
60+
</item>
61+
<item row="1" column="5" colspan="2" >
62+
<widget class="QPushButton" name="mLayerFontButton" >
63+
<property name="text" >
64+
<string>Layer...</string>
65+
</property>
66+
</widget>
67+
</item>
68+
<item row="1" column="7" colspan="2" >
69+
<widget class="QPushButton" name="mItemFontButton" >
70+
<property name="text" >
71+
<string>Item...</string>
72+
</property>
73+
</widget>
74+
</item>
75+
<item row="2" column="0" colspan="4" >
76+
<widget class="QLabel" name="mSymbolWidthLabel" >
77+
<property name="text" >
78+
<string>Symbol width</string>
79+
</property>
80+
<property name="buddy" >
81+
<cstring>mSymbolWidthSpinBox</cstring>
82+
</property>
83+
</widget>
84+
</item>
85+
<item row="2" column="4" >
86+
<widget class="QDoubleSpinBox" name="mSymbolWidthSpinBox" />
87+
</item>
88+
<item row="2" column="5" colspan="3" >
89+
<widget class="QLabel" name="mSymbolHeightLabel" >
90+
<property name="text" >
91+
<string>Symbol height</string>
92+
</property>
93+
<property name="buddy" >
94+
<cstring>mSymbolHeightSpinBox</cstring>
95+
</property>
96+
</widget>
97+
</item>
98+
<item row="2" column="8" >
99+
<widget class="QDoubleSpinBox" name="mSymbolHeightSpinBox" />
100+
</item>
101+
<item row="3" column="0" colspan="2" >
102+
<widget class="QLabel" name="mLayerSpaceLabel" >
103+
<property name="text" >
104+
<string>Layer space</string>
105+
</property>
106+
<property name="buddy" >
107+
<cstring>mLayerSpaceSpinBox</cstring>
108+
</property>
109+
</widget>
110+
</item>
111+
<item row="3" column="2" colspan="3" >
112+
<widget class="QDoubleSpinBox" name="mLayerSpaceSpinBox" />
113+
</item>
114+
<item row="3" column="5" >
115+
<widget class="QLabel" name="mSymbolSpaceLabel" >
116+
<property name="text" >
117+
<string>Symbol space</string>
118+
</property>
119+
<property name="buddy" >
120+
<cstring>mSymbolSpaceSpinBox</cstring>
121+
</property>
122+
</widget>
123+
</item>
124+
<item row="3" column="6" colspan="3" >
125+
<widget class="QDoubleSpinBox" name="mSymbolSpaceSpinBox" />
126+
</item>
127+
<item row="4" column="0" colspan="3" >
128+
<widget class="QLabel" name="mIconLabelSpaceLabel" >
129+
<property name="text" >
130+
<string>Icon label space</string>
131+
</property>
132+
<property name="buddy" >
133+
<cstring>mIconLabelSpaceSpinBox</cstring>
134+
</property>
135+
</widget>
136+
</item>
137+
<item row="4" column="3" colspan="2" >
138+
<widget class="QDoubleSpinBox" name="mIconLabelSpaceSpinBox" />
139+
</item>
140+
<item row="4" column="5" colspan="2" >
141+
<widget class="QLabel" name="mBoxSpaceLabel" >
142+
<property name="text" >
143+
<string>Box space</string>
144+
</property>
145+
<property name="buddy" >
146+
<cstring>mBoxSpaceSpinBox</cstring>
147+
</property>
148+
</widget>
149+
</item>
150+
<item row="4" column="7" colspan="2" >
151+
<widget class="QDoubleSpinBox" name="mBoxSpaceSpinBox" />
147152
</item>
148153
</layout>
149154
</widget>
@@ -154,52 +159,52 @@
154159
<string>Legend items</string>
155160
</property>
156161
<layout class="QGridLayout" >
157-
<item row="0" column="0" >
162+
<item row="0" column="0" colspan="6" >
163+
<widget class="QTreeView" name="mItemTreeView" >
164+
<property name="headerHidden" stdset="0" >
165+
<bool>true</bool>
166+
</property>
167+
</widget>
168+
</item>
169+
<item row="1" column="0" >
158170
<widget class="QPushButton" name="mMoveDownPushButton" >
159171
<property name="text" >
160-
<string>down</string>
172+
<string>Down</string>
161173
</property>
162174
</widget>
163175
</item>
164-
<item row="0" column="1" >
176+
<item row="1" column="1" >
165177
<widget class="QPushButton" name="mMoveUpPushButton" >
166178
<property name="text" >
167-
<string>up</string>
179+
<string>Up</string>
168180
</property>
169181
</widget>
170182
</item>
171-
<item row="0" column="2" >
183+
<item row="1" column="2" >
172184
<widget class="QPushButton" name="mRemovePushButton" >
173185
<property name="text" >
174-
<string>remove</string>
186+
<string>Remove</string>
175187
</property>
176188
</widget>
177189
</item>
178-
<item row="0" column="3" >
190+
<item row="1" column="3" >
179191
<widget class="QPushButton" name="mEditPushButton" >
180192
<property name="text" >
181-
<string>edit...</string>
193+
<string>Edit...</string>
182194
</property>
183195
</widget>
184196
</item>
185-
<item row="0" column="4" >
197+
<item row="1" column="4" >
186198
<widget class="QPushButton" name="mUpdatePushButton" >
187199
<property name="text" >
188-
<string>update</string>
200+
<string>Update</string>
189201
</property>
190202
</widget>
191203
</item>
192-
<item row="0" column="5" >
204+
<item row="1" column="5" >
193205
<widget class="QPushButton" name="mUpdateAllPushButton" >
194206
<property name="text" >
195-
<string>update all</string>
196-
</property>
197-
</widget>
198-
</item>
199-
<item row="1" column="0" colspan="6" >
200-
<widget class="QTreeView" name="mItemTreeView" >
201-
<property name="headerHidden" stdset="0" >
202-
<bool>true</bool>
207+
<string>Update all</string>
203208
</property>
204209
</widget>
205210
</item>
@@ -210,7 +215,23 @@
210215
</widget>
211216
<layoutdefault spacing="6" margin="11" />
212217
<tabstops>
218+
<tabstop>mTitleLineEdit</tabstop>
213219
<tabstop>mTitleFontButton</tabstop>
220+
<tabstop>mLayerFontButton</tabstop>
221+
<tabstop>mItemFontButton</tabstop>
222+
<tabstop>mSymbolWidthSpinBox</tabstop>
223+
<tabstop>mSymbolHeightSpinBox</tabstop>
224+
<tabstop>mLayerSpaceSpinBox</tabstop>
225+
<tabstop>mSymbolSpaceSpinBox</tabstop>
226+
<tabstop>mIconLabelSpaceSpinBox</tabstop>
227+
<tabstop>mBoxSpaceSpinBox</tabstop>
228+
<tabstop>mItemTreeView</tabstop>
229+
<tabstop>mMoveDownPushButton</tabstop>
230+
<tabstop>mMoveUpPushButton</tabstop>
231+
<tabstop>mRemovePushButton</tabstop>
232+
<tabstop>mEditPushButton</tabstop>
233+
<tabstop>mUpdatePushButton</tabstop>
234+
<tabstop>mUpdateAllPushButton</tabstop>
214235
</tabstops>
215236
<resources/>
216237
<connections/>

‎src/ui/qgscomposermapwidgetbase.ui

Lines changed: 172 additions & 176 deletions
Large diffs are not rendered by default.

‎src/ui/qgscomposerpicturewidgetbase.ui

Lines changed: 119 additions & 107 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<string>Picture Options</string>
2020
</property>
2121
<layout class="QGridLayout" >
22-
<item row="0" column="0" >
22+
<item row="0" column="0" colspan="4" >
2323
<widget class="QGroupBox" name="mSearchDirectoriesGroupBox" >
2424
<property name="sizePolicy" >
2525
<sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
@@ -31,47 +31,47 @@
3131
<string>Search directories</string>
3232
</property>
3333
<layout class="QGridLayout" >
34-
<item row="0" column="0" >
34+
<item row="0" column="0" colspan="3" >
35+
<widget class="QComboBox" name="mSearchDirectoriesComboBox" >
36+
<property name="sizePolicy" >
37+
<sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
38+
<horstretch>0</horstretch>
39+
<verstretch>0</verstretch>
40+
</sizepolicy>
41+
</property>
42+
</widget>
43+
</item>
44+
<item row="1" column="0" >
3545
<spacer>
3646
<property name="orientation" >
3747
<enum>Qt::Horizontal</enum>
3848
</property>
39-
<property name="sizeHint" stdset="0" >
49+
<property name="sizeHint" >
4050
<size>
4151
<width>101</width>
4252
<height>20</height>
4353
</size>
4454
</property>
4555
</spacer>
4656
</item>
47-
<item row="0" column="1" >
57+
<item row="1" column="1" >
4858
<widget class="QPushButton" name="mAddDirectoryButton" >
4959
<property name="text" >
5060
<string>Add...</string>
5161
</property>
5262
</widget>
5363
</item>
54-
<item row="0" column="2" >
64+
<item row="1" column="2" >
5565
<widget class="QPushButton" name="mRemoveDirectoryButton" >
5666
<property name="text" >
5767
<string>Remove</string>
5868
</property>
5969
</widget>
6070
</item>
61-
<item row="1" column="0" colspan="3" >
62-
<widget class="QComboBox" name="mSearchDirectoriesComboBox" >
63-
<property name="sizePolicy" >
64-
<sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
65-
<horstretch>0</horstretch>
66-
<verstretch>0</verstretch>
67-
</sizepolicy>
68-
</property>
69-
</widget>
70-
</item>
7171
</layout>
7272
</widget>
7373
</item>
74-
<item row="1" column="0" >
74+
<item row="1" column="0" colspan="4" >
7575
<widget class="QGroupBox" name="mPreviewGroupBox" >
7676
<property name="sizePolicy" >
7777
<sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
@@ -89,7 +89,7 @@
8989
<bool>false</bool>
9090
</property>
9191
<property name="dragDropMode" >
92-
<enum>QAbstractItemView::NoDragDrop</enum>
92+
<enum>QAbstractItemView::DragDrop</enum>
9393
</property>
9494
<property name="movement" >
9595
<enum>QListView::Free</enum>
@@ -118,104 +118,116 @@
118118
</widget>
119119
</item>
120120
<item row="2" column="0" >
121-
<layout class="QHBoxLayout" >
122-
<property name="spacing" >
123-
<number>6</number>
124-
</property>
125-
<property name="margin" >
126-
<number>0</number>
127-
</property>
128-
<item>
129-
<widget class="QLineEdit" name="mPictureLineEdit" />
130-
</item>
131-
<item>
132-
<widget class="QPushButton" name="mPictureBrowseButton" >
133-
<property name="sizePolicy" >
134-
<sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
135-
<horstretch>0</horstretch>
136-
<verstretch>0</verstretch>
137-
</sizepolicy>
138-
</property>
139-
<property name="maximumSize" >
140-
<size>
141-
<width>150</width>
142-
<height>32767</height>
143-
</size>
144-
</property>
145-
<property name="text" >
146-
<string>Browse...</string>
147-
</property>
148-
</widget>
149-
</item>
150-
</layout>
121+
<widget class="QLabel" name="label" >
122+
<property name="text" >
123+
<string>Load</string>
124+
</property>
125+
<property name="buddy" >
126+
<cstring>mPictureLineEdit</cstring>
127+
</property>
128+
</widget>
129+
</item>
130+
<item row="2" column="1" colspan="2" >
131+
<widget class="QLineEdit" name="mPictureLineEdit" />
132+
</item>
133+
<item row="2" column="3" >
134+
<widget class="QPushButton" name="mPictureBrowseButton" >
135+
<property name="sizePolicy" >
136+
<sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
137+
<horstretch>0</horstretch>
138+
<verstretch>0</verstretch>
139+
</sizepolicy>
140+
</property>
141+
<property name="maximumSize" >
142+
<size>
143+
<width>150</width>
144+
<height>32767</height>
145+
</size>
146+
</property>
147+
<property name="text" >
148+
<string>...</string>
149+
</property>
150+
</widget>
151151
</item>
152152
<item row="3" column="0" >
153-
<layout class="QGridLayout" >
154-
<item row="0" column="0" >
155-
<widget class="QLabel" name="textLabel3" >
156-
<property name="sizePolicy" >
157-
<sizepolicy vsizetype="Preferred" hsizetype="Minimum" >
158-
<horstretch>0</horstretch>
159-
<verstretch>0</verstretch>
160-
</sizepolicy>
161-
</property>
162-
<property name="text" >
163-
<string>Width:</string>
164-
</property>
165-
<property name="wordWrap" >
166-
<bool>true</bool>
167-
</property>
168-
</widget>
169-
</item>
170-
<item row="0" column="1" colspan="2" >
171-
<widget class="QLineEdit" name="mWidthLineEdit" />
172-
</item>
173-
<item row="1" column="0" >
174-
<widget class="QLabel" name="textLabel4" >
175-
<property name="sizePolicy" >
176-
<sizepolicy vsizetype="Preferred" hsizetype="Minimum" >
177-
<horstretch>0</horstretch>
178-
<verstretch>0</verstretch>
179-
</sizepolicy>
180-
</property>
181-
<property name="text" >
182-
<string>Height:</string>
183-
</property>
184-
<property name="wordWrap" >
185-
<bool>true</bool>
186-
</property>
187-
</widget>
188-
</item>
189-
<item row="1" column="1" colspan="2" >
190-
<widget class="QLineEdit" name="mHeightLineEdit" />
191-
</item>
192-
<item row="2" column="0" colspan="2" >
193-
<widget class="QLabel" name="mRotationLabel" >
194-
<property name="sizePolicy" >
195-
<sizepolicy vsizetype="Preferred" hsizetype="Minimum" >
196-
<horstretch>0</horstretch>
197-
<verstretch>0</verstretch>
198-
</sizepolicy>
199-
</property>
200-
<property name="text" >
201-
<string>Rotation:</string>
202-
</property>
203-
<property name="wordWrap" >
204-
<bool>true</bool>
205-
</property>
206-
</widget>
207-
</item>
208-
<item row="2" column="2" >
209-
<widget class="QDoubleSpinBox" name="mRotationSpinBox" />
210-
</item>
211-
</layout>
153+
<widget class="QLabel" name="textLabel3" >
154+
<property name="sizePolicy" >
155+
<sizepolicy vsizetype="Preferred" hsizetype="Minimum" >
156+
<horstretch>0</horstretch>
157+
<verstretch>0</verstretch>
158+
</sizepolicy>
159+
</property>
160+
<property name="text" >
161+
<string>Width</string>
162+
</property>
163+
<property name="wordWrap" >
164+
<bool>true</bool>
165+
</property>
166+
<property name="buddy" >
167+
<cstring>mWidthLineEdit</cstring>
168+
</property>
169+
</widget>
170+
</item>
171+
<item row="3" column="1" colspan="3" >
172+
<widget class="QLineEdit" name="mWidthLineEdit" />
173+
</item>
174+
<item row="4" column="0" >
175+
<widget class="QLabel" name="textLabel4" >
176+
<property name="sizePolicy" >
177+
<sizepolicy vsizetype="Preferred" hsizetype="Minimum" >
178+
<horstretch>0</horstretch>
179+
<verstretch>0</verstretch>
180+
</sizepolicy>
181+
</property>
182+
<property name="text" >
183+
<string>Height</string>
184+
</property>
185+
<property name="wordWrap" >
186+
<bool>true</bool>
187+
</property>
188+
<property name="buddy" >
189+
<cstring>mHeightLineEdit</cstring>
190+
</property>
191+
</widget>
192+
</item>
193+
<item row="4" column="1" colspan="3" >
194+
<widget class="QLineEdit" name="mHeightLineEdit" />
195+
</item>
196+
<item row="5" column="0" colspan="2" >
197+
<widget class="QLabel" name="mRotationLabel" >
198+
<property name="sizePolicy" >
199+
<sizepolicy vsizetype="Preferred" hsizetype="Minimum" >
200+
<horstretch>0</horstretch>
201+
<verstretch>0</verstretch>
202+
</sizepolicy>
203+
</property>
204+
<property name="text" >
205+
<string>Rotation</string>
206+
</property>
207+
<property name="wordWrap" >
208+
<bool>true</bool>
209+
</property>
210+
<property name="buddy" >
211+
<cstring>mRotationSpinBox</cstring>
212+
</property>
213+
</widget>
214+
</item>
215+
<item row="5" column="2" colspan="2" >
216+
<widget class="QDoubleSpinBox" name="mRotationSpinBox" />
212217
</item>
213218
</layout>
214219
</widget>
215220
<layoutdefault spacing="6" margin="11" />
216221
<tabstops>
217-
<tabstop>mPictureBrowseButton</tabstop>
222+
<tabstop>mSearchDirectoriesComboBox</tabstop>
223+
<tabstop>mAddDirectoryButton</tabstop>
224+
<tabstop>mRemoveDirectoryButton</tabstop>
225+
<tabstop>mPreviewListWidget</tabstop>
218226
<tabstop>mPictureLineEdit</tabstop>
227+
<tabstop>mPictureBrowseButton</tabstop>
228+
<tabstop>mWidthLineEdit</tabstop>
229+
<tabstop>mHeightLineEdit</tabstop>
230+
<tabstop>mRotationSpinBox</tabstop>
219231
</tabstops>
220232
<resources/>
221233
<connections/>

‎src/ui/qgscomposerscalebarwidgetbase.ui

Lines changed: 46 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,14 @@
2222
<item row="0" column="0" >
2323
<widget class="QLabel" name="mSegmentSizeLabel" >
2424
<property name="text" >
25-
<string>Segment size (map units):</string>
25+
<string>Segment size (map units)</string>
2626
</property>
2727
<property name="wordWrap" >
2828
<bool>true</bool>
2929
</property>
30+
<property name="buddy" >
31+
<cstring>mSegmentSizeSpinBox</cstring>
32+
</property>
3033
</widget>
3134
</item>
3235
<item row="0" column="1" >
@@ -42,11 +45,14 @@
4245
<item row="0" column="2" colspan="2" >
4346
<widget class="QLabel" name="mMapUnitsPerBarUnitLabel" >
4447
<property name="text" >
45-
<string>Map units per bar unit:</string>
48+
<string>Map units per bar unit</string>
4649
</property>
4750
<property name="wordWrap" >
4851
<bool>true</bool>
4952
</property>
53+
<property name="buddy" >
54+
<cstring>mMapUnitsPerBarUnitSpinBox</cstring>
55+
</property>
5056
</widget>
5157
</item>
5258
<item row="0" column="4" >
@@ -59,11 +65,14 @@
5965
<item row="1" column="0" >
6066
<widget class="QLabel" name="mNumbereOfSegmentsLabel" >
6167
<property name="text" >
62-
<string>Number of segments:</string>
68+
<string>Number of segments</string>
6369
</property>
6470
<property name="wordWrap" >
6571
<bool>true</bool>
6672
</property>
73+
<property name="buddy" >
74+
<cstring>mNumberOfSegmentsSpinBox</cstring>
75+
</property>
6776
</widget>
6877
</item>
6978
<item row="1" column="1" >
@@ -72,7 +81,10 @@
7281
<item row="1" column="2" colspan="2" >
7382
<widget class="QLabel" name="mSegmentsLeftLabel" >
7483
<property name="text" >
75-
<string>Segments left:</string>
84+
<string>Segments left</string>
85+
</property>
86+
<property name="buddy" >
87+
<cstring>mSegmentsLeftSpinBox</cstring>
7688
</property>
7789
</widget>
7890
</item>
@@ -82,7 +94,10 @@
8294
<item row="2" column="0" >
8395
<widget class="QLabel" name="mStyleLabel" >
8496
<property name="text" >
85-
<string>Style:</string>
97+
<string>Style</string>
98+
</property>
99+
<property name="buddy" >
100+
<cstring>mStyleComboBox</cstring>
86101
</property>
87102
</widget>
88103
</item>
@@ -98,7 +113,7 @@
98113
</sizepolicy>
99114
</property>
100115
<property name="text" >
101-
<string>Map:</string>
116+
<string>Map</string>
102117
</property>
103118
<property name="wordWrap" >
104119
<bool>true</bool>
@@ -124,7 +139,10 @@
124139
<item row="3" column="0" >
125140
<widget class="QLabel" name="mHeightLabel" >
126141
<property name="text" >
127-
<string>Height (mm):</string>
142+
<string>Height (mm)</string>
143+
</property>
144+
<property name="buddy" >
145+
<cstring>mHeightSpinBox</cstring>
128146
</property>
129147
</widget>
130148
</item>
@@ -134,7 +152,7 @@
134152
<item row="3" column="2" colspan="2" >
135153
<widget class="QLabel" name="mLineWidthLabel" >
136154
<property name="text" >
137-
<string>Line width:</string>
155+
<string>Line width</string>
138156
</property>
139157
<property name="wordWrap" >
140158
<bool>true</bool>
@@ -166,7 +184,10 @@
166184
<item row="4" column="0" >
167185
<widget class="QLabel" name="mLabelBarSpaceLabel" >
168186
<property name="text" >
169-
<string>Label space:</string>
187+
<string>Label space</string>
188+
</property>
189+
<property name="buddy" >
190+
<cstring>mLabelBarSpaceSpinBox</cstring>
170191
</property>
171192
</widget>
172193
</item>
@@ -176,7 +197,10 @@
176197
<item row="4" column="2" colspan="2" >
177198
<widget class="QLabel" name="mBoxSpaceLabel" >
178199
<property name="text" >
179-
<string>Box space:</string>
200+
<string>Box space</string>
201+
</property>
202+
<property name="buddy" >
203+
<cstring>mBoxSizeSpinBox</cstring>
180204
</property>
181205
</widget>
182206
</item>
@@ -186,7 +210,7 @@
186210
<item row="5" column="0" >
187211
<widget class="QLabel" name="mUnitLabelLabel" >
188212
<property name="text" >
189-
<string>Unit label:</string>
213+
<string>Unit label</string>
190214
</property>
191215
<property name="wordWrap" >
192216
<bool>true</bool>
@@ -223,9 +247,19 @@
223247
</widget>
224248
<layoutdefault spacing="6" margin="11" />
225249
<tabstops>
226-
<tabstop>mUnitLabelLineEdit</tabstop>
250+
<tabstop>mSegmentSizeSpinBox</tabstop>
251+
<tabstop>mMapUnitsPerBarUnitSpinBox</tabstop>
252+
<tabstop>mNumberOfSegmentsSpinBox</tabstop>
253+
<tabstop>mSegmentsLeftSpinBox</tabstop>
254+
<tabstop>mStyleComboBox</tabstop>
227255
<tabstop>mMapComboBox</tabstop>
256+
<tabstop>mHeightSpinBox</tabstop>
257+
<tabstop>mLineWidthSpinBox</tabstop>
258+
<tabstop>mLabelBarSpaceSpinBox</tabstop>
259+
<tabstop>mBoxSizeSpinBox</tabstop>
260+
<tabstop>mUnitLabelLineEdit</tabstop>
228261
<tabstop>mFontButton</tabstop>
262+
<tabstop>mColorPushButton</tabstop>
229263
</tabstops>
230264
<resources/>
231265
<connections/>

0 commit comments

Comments
 (0)
Please sign in to comment.