Skip to content

Commit 2d4de7b

Browse files
author
mhugent
committed
rearranged composer scalebar widget to have less height
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@9201 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 3531fb9 commit 2d4de7b

File tree

2 files changed

+55
-68
lines changed

2 files changed

+55
-68
lines changed

‎src/app/composer/qgscomposerscalebarwidget.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ QgsComposerScaleBarWidget::QgsComposerScaleBarWidget( QgsComposerScaleBar* scale
2828

2929
//add widget for general composer item properties
3030
QgsComposerItemWidget* itemPropertiesWidget = new QgsComposerItemWidget( this, scaleBar );
31-
gridLayout->addWidget( itemPropertiesWidget, 14, 0, 1, 3 );
31+
gridLayout->addWidget( itemPropertiesWidget, 14, 0, 1, 5 );
3232

3333
blockMemberSignals( true );
3434
mStyleComboBox->insertItem( 0, tr( "Single Box" ) );

‎src/ui/qgscomposerscalebarwidgetbase.ui

Lines changed: 54 additions & 67 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>367</width>
9-
<height>476</height>
8+
<width>561</width>
9+
<height>228</height>
1010
</rect>
1111
</property>
1212
<property name="sizePolicy" >
@@ -29,7 +29,7 @@
2929
</property>
3030
</widget>
3131
</item>
32-
<item row="0" column="2" >
32+
<item row="0" column="1" >
3333
<widget class="QDoubleSpinBox" name="mSegmentSizeSpinBox" >
3434
<property name="decimals" >
3535
<number>4</number>
@@ -39,7 +39,24 @@
3939
</property>
4040
</widget>
4141
</item>
42-
<item row="1" column="0" colspan="2" >
42+
<item row="0" column="2" colspan="2" >
43+
<widget class="QLabel" name="mMapUnitsPerBarUnitLabel" >
44+
<property name="text" >
45+
<string>Map units per bar unit:</string>
46+
</property>
47+
<property name="wordWrap" >
48+
<bool>true</bool>
49+
</property>
50+
</widget>
51+
</item>
52+
<item row="0" column="4" >
53+
<widget class="QDoubleSpinBox" name="mMapUnitsPerBarUnitSpinBox" >
54+
<property name="maximum" >
55+
<double>9999999999999.000000000000000</double>
56+
</property>
57+
</widget>
58+
</item>
59+
<item row="1" column="0" >
4360
<widget class="QLabel" name="mNumbereOfSegmentsLabel" >
4461
<property name="text" >
4562
<string>Number of segments:</string>
@@ -49,63 +66,30 @@
4966
</property>
5067
</widget>
5168
</item>
52-
<item row="1" column="2" >
69+
<item row="1" column="1" >
5370
<widget class="QSpinBox" name="mNumberOfSegmentsSpinBox" />
5471
</item>
55-
<item row="2" column="0" colspan="2" >
72+
<item row="1" column="2" colspan="2" >
5673
<widget class="QLabel" name="mSegmentsLeftLabel" >
5774
<property name="text" >
5875
<string>Segments left:</string>
5976
</property>
6077
</widget>
6178
</item>
62-
<item row="2" column="2" >
79+
<item row="1" column="4" >
6380
<widget class="QSpinBox" name="mSegmentsLeftSpinBox" />
6481
</item>
65-
<item row="3" column="0" >
82+
<item row="2" column="0" >
6683
<widget class="QLabel" name="mStyleLabel" >
6784
<property name="text" >
6885
<string>Style:</string>
6986
</property>
7087
</widget>
7188
</item>
72-
<item row="3" column="2" >
89+
<item row="2" column="1" >
7390
<widget class="QComboBox" name="mStyleComboBox" />
7491
</item>
75-
<item row="4" column="0" >
76-
<widget class="QLabel" name="mUnitLabelLabel" >
77-
<property name="text" >
78-
<string>Unit label:</string>
79-
</property>
80-
<property name="wordWrap" >
81-
<bool>true</bool>
82-
</property>
83-
<property name="buddy" >
84-
<cstring>mUnitLabelLineEdit</cstring>
85-
</property>
86-
</widget>
87-
</item>
88-
<item row="4" column="2" >
89-
<widget class="QLineEdit" name="mUnitLabelLineEdit" />
90-
</item>
91-
<item row="5" column="0" >
92-
<widget class="QLabel" name="mMapUnitsPerBarUnitLabel" >
93-
<property name="text" >
94-
<string>Map units per bar unit:</string>
95-
</property>
96-
<property name="wordWrap" >
97-
<bool>true</bool>
98-
</property>
99-
</widget>
100-
</item>
101-
<item row="5" column="2" >
102-
<widget class="QDoubleSpinBox" name="mMapUnitsPerBarUnitSpinBox" >
103-
<property name="maximum" >
104-
<double>9999999999999.000000000000000</double>
105-
</property>
106-
</widget>
107-
</item>
108-
<item row="6" column="0" >
92+
<item row="2" column="2" >
10993
<widget class="QLabel" name="mMapLabel" >
11094
<property name="sizePolicy" >
11195
<sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
@@ -124,7 +108,7 @@
124108
</property>
125109
</widget>
126110
</item>
127-
<item row="6" column="2" >
111+
<item row="2" column="4" >
128112
<widget class="QComboBox" name="mMapComboBox" >
129113
<property name="enabled" >
130114
<bool>true</bool>
@@ -137,17 +121,17 @@
137121
</property>
138122
</widget>
139123
</item>
140-
<item row="7" column="0" >
124+
<item row="3" column="0" >
141125
<widget class="QLabel" name="mHeightLabel" >
142126
<property name="text" >
143127
<string>Height (mm):</string>
144128
</property>
145129
</widget>
146130
</item>
147-
<item row="7" column="2" >
131+
<item row="3" column="1" >
148132
<widget class="QSpinBox" name="mHeightSpinBox" />
149133
</item>
150-
<item row="8" column="0" >
134+
<item row="3" column="2" colspan="2" >
151135
<widget class="QLabel" name="mLineWidthLabel" >
152136
<property name="text" >
153137
<string>Line width:</string>
@@ -160,7 +144,7 @@
160144
</property>
161145
</widget>
162146
</item>
163-
<item row="8" column="2" >
147+
<item row="3" column="4" >
164148
<widget class="QDoubleSpinBox" name="mLineWidthSpinBox" >
165149
<property name="sizePolicy" >
166150
<sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
@@ -179,27 +163,43 @@
179163
</property>
180164
</widget>
181165
</item>
182-
<item row="9" column="0" >
166+
<item row="4" column="0" >
183167
<widget class="QLabel" name="mLabelBarSpaceLabel" >
184168
<property name="text" >
185169
<string>Label space:</string>
186170
</property>
187171
</widget>
188172
</item>
189-
<item row="9" column="2" >
173+
<item row="4" column="1" >
190174
<widget class="QDoubleSpinBox" name="mLabelBarSpaceSpinBox" />
191175
</item>
192-
<item row="10" column="0" >
176+
<item row="4" column="2" colspan="2" >
193177
<widget class="QLabel" name="mBoxSpaceLabel" >
194178
<property name="text" >
195179
<string>Box space:</string>
196180
</property>
197181
</widget>
198182
</item>
199-
<item row="10" column="2" >
183+
<item row="4" column="4" >
200184
<widget class="QDoubleSpinBox" name="mBoxSizeSpinBox" />
201185
</item>
202-
<item row="11" column="0" >
186+
<item row="5" column="0" >
187+
<widget class="QLabel" name="mUnitLabelLabel" >
188+
<property name="text" >
189+
<string>Unit label:</string>
190+
</property>
191+
<property name="wordWrap" >
192+
<bool>true</bool>
193+
</property>
194+
<property name="buddy" >
195+
<cstring>mUnitLabelLineEdit</cstring>
196+
</property>
197+
</widget>
198+
</item>
199+
<item row="5" column="1" >
200+
<widget class="QLineEdit" name="mUnitLabelLineEdit" />
201+
</item>
202+
<item row="5" column="2" >
203203
<widget class="QPushButton" name="mFontButton" >
204204
<property name="sizePolicy" >
205205
<sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
@@ -212,26 +212,13 @@
212212
</property>
213213
</widget>
214214
</item>
215-
<item row="11" column="2" >
215+
<item row="5" column="3" colspan="2" >
216216
<widget class="QPushButton" name="mColorPushButton" >
217217
<property name="text" >
218218
<string>Color...</string>
219219
</property>
220220
</widget>
221221
</item>
222-
<item row="12" column="1" >
223-
<spacer>
224-
<property name="orientation" >
225-
<enum>Qt::Vertical</enum>
226-
</property>
227-
<property name="sizeHint" >
228-
<size>
229-
<width>20</width>
230-
<height>16</height>
231-
</size>
232-
</property>
233-
</spacer>
234-
</item>
235222
</layout>
236223
</widget>
237224
<layoutdefault spacing="6" margin="11" />

0 commit comments

Comments
 (0)