Skip to content

Commit 08233ec

Browse files
author
mhugent
committedOct 17, 2009
Fix for first part of bug #2008
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@11820 c8812cc2-4d05-0410-92ff-de0c093fc19c
·
final-1_7_1final-1_7_0
1 parent c6f767f commit 08233ec

File tree

4 files changed

+190
-191
lines changed

4 files changed

+190
-191
lines changed
 

‎src/app/composer/qgscomposermapwidget.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -474,46 +474,46 @@ void QgsComposerMapWidget::on_mGridCheckBox_stateChanged( int state )
474474
mComposerMap->update();
475475
}
476476

477-
void QgsComposerMapWidget::on_mIntervalXSpinBox_valueChanged( double d )
477+
void QgsComposerMapWidget::on_mIntervalXSpinBox_editingFinished()
478478
{
479479
if ( !mComposerMap )
480480
{
481481
return;
482482
}
483-
mComposerMap->setGridIntervalX( d );
483+
mComposerMap->setGridIntervalX( mIntervalXSpinBox->value() );
484484
mComposerMap->updateBoundingRect();
485485
mComposerMap->update();
486486
}
487487

488-
void QgsComposerMapWidget::on_mIntervalYSpinBox_valueChanged( double d )
488+
void QgsComposerMapWidget::on_mIntervalYSpinBox_editingFinished()
489489
{
490490
if ( !mComposerMap )
491491
{
492492
return;
493493
}
494-
mComposerMap->setGridIntervalY( d );
494+
mComposerMap->setGridIntervalY( mIntervalYSpinBox->value() );
495495
mComposerMap->updateBoundingRect();
496496
mComposerMap->update();
497497
}
498498

499-
void QgsComposerMapWidget::on_mOffsetXSpinBox_valueChanged( double d )
499+
void QgsComposerMapWidget::on_mOffsetXSpinBox_editingFinished()
500500
{
501501
if ( !mComposerMap )
502502
{
503503
return;
504504
}
505-
mComposerMap->setGridOffsetX( d );
505+
mComposerMap->setGridOffsetX( mOffsetXSpinBox->value() );
506506
mComposerMap->updateBoundingRect();
507507
mComposerMap->update();
508508
}
509509

510-
void QgsComposerMapWidget::on_mOffsetYSpinBox_valueChanged( double d )
510+
void QgsComposerMapWidget::on_mOffsetYSpinBox_editingFinished()
511511
{
512512
if ( !mComposerMap )
513513
{
514514
return;
515515
}
516-
mComposerMap->setGridOffsetY( d );
516+
mComposerMap->setGridOffsetY( mOffsetYSpinBox->value() );
517517
mComposerMap->updateBoundingRect();
518518
mComposerMap->update();
519519
}

‎src/app/composer/qgscomposermapwidget.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,10 @@ class QgsComposerMapWidget: public QWidget, private Ui::QgsComposerMapWidgetBase
4949
void on_mYMaxLineEdit_editingFinished();
5050

5151
void on_mGridCheckBox_stateChanged( int state );
52-
void on_mIntervalXSpinBox_valueChanged( double d );
53-
void on_mIntervalYSpinBox_valueChanged( double d );
54-
void on_mOffsetXSpinBox_valueChanged( double d );
55-
void on_mOffsetYSpinBox_valueChanged( double d );
52+
void on_mIntervalXSpinBox_editingFinished();
53+
void on_mIntervalYSpinBox_editingFinished();
54+
void on_mOffsetXSpinBox_editingFinished();
55+
void on_mOffsetYSpinBox_editingFinished();
5656
void on_mLineWidthSpinBox_valueChanged( double d );
5757
void on_mLineColorButton_clicked();
5858
void on_mGridTypeComboBox_currentIndexChanged( const QString& text );

‎src/core/composer/qgscomposermap.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -568,7 +568,7 @@ bool QgsComposerMap::writeXML( QDomElement& elem, QDomDocument & doc ) const
568568
annotationElem.setAttribute( "frameDistance", mAnnotationFrameDistance );
569569
annotationElem.setAttribute( "direction", mGridAnnotationDirection );
570570
annotationElem.setAttribute( "font", mGridAnnotationFont.toString() );
571-
annotationElem.setAttribute( "type", mGridAnnotationType);
571+
annotationElem.setAttribute( "type", mGridAnnotationType );
572572

573573
gridElem.appendChild( annotationElem );
574574
composerMapElem.appendChild( gridElem );
@@ -1051,7 +1051,7 @@ QgsRectangle QgsComposerMap::transformedExtent() const
10511051

10521052
double QgsComposerMap::maxExtensionXDirection() const
10531053
{
1054-
if ( mGridAnnotationPosition != OutsideMapFrame )
1054+
if ( !mGridEnabled || !mShowGridAnnotation || mGridAnnotationPosition != OutsideMapFrame )
10551055
{
10561056
return 0;
10571057
}
@@ -1090,7 +1090,7 @@ double QgsComposerMap::maxExtensionXDirection() const
10901090

10911091
double QgsComposerMap::maxExtensionYDirection() const
10921092
{
1093-
if ( mGridAnnotationPosition != OutsideMapFrame )
1093+
if ( !mGridEnabled || !mShowGridAnnotation || mGridAnnotationPosition != OutsideMapFrame )
10941094
{
10951095
return 0;
10961096
}

‎src/ui/qgscomposermapwidgetbase.ui

Lines changed: 175 additions & 176 deletions
Original file line numberDiff line numberDiff line change
@@ -1,167 +1,166 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
2-
<ui version="4.0">
1+
<ui version="4.0" >
32
<class>QgsComposerMapWidgetBase</class>
4-
<widget class="QWidget" name="QgsComposerMapWidgetBase">
5-
<property name="geometry">
3+
<widget class="QWidget" name="QgsComposerMapWidgetBase" >
4+
<property name="geometry" >
65
<rect>
76
<x>0</x>
87
<y>0</y>
9-
<width>472</width>
8+
<width>506</width>
109
<height>708</height>
1110
</rect>
1211
</property>
13-
<property name="sizePolicy">
14-
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
12+
<property name="sizePolicy" >
13+
<sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
1514
<horstretch>0</horstretch>
1615
<verstretch>0</verstretch>
1716
</sizepolicy>
1817
</property>
19-
<property name="windowTitle">
18+
<property name="windowTitle" >
2019
<string>Map options</string>
2120
</property>
22-
<layout class="QGridLayout" name="gridLayout_3">
23-
<item row="0" column="0">
24-
<widget class="QGroupBox" name="mMapGroupBox">
25-
<property name="title">
21+
<layout class="QGridLayout" name="gridLayout_3" >
22+
<item row="0" column="0" >
23+
<widget class="QGroupBox" name="mMapGroupBox" >
24+
<property name="title" >
2625
<string>Map</string>
2726
</property>
28-
<layout class="QGridLayout" name="gridLayout_2">
29-
<item row="0" column="0">
30-
<widget class="QLabel" name="textLabel1">
31-
<property name="text">
27+
<layout class="QGridLayout" name="gridLayout_2" >
28+
<item row="0" column="0" >
29+
<widget class="QLabel" name="textLabel1" >
30+
<property name="text" >
3231
<string>Width</string>
3332
</property>
34-
<property name="wordWrap">
33+
<property name="wordWrap" >
3534
<bool>true</bool>
3635
</property>
37-
<property name="buddy">
36+
<property name="buddy" >
3837
<cstring>mWidthLineEdit</cstring>
3938
</property>
4039
</widget>
4140
</item>
42-
<item row="0" column="1">
43-
<widget class="QLineEdit" name="mWidthLineEdit"/>
41+
<item row="0" column="1" >
42+
<widget class="QLineEdit" name="mWidthLineEdit" />
4443
</item>
45-
<item row="1" column="0">
46-
<widget class="QLabel" name="label_3">
47-
<property name="text">
44+
<item row="1" column="0" >
45+
<widget class="QLabel" name="label_3" >
46+
<property name="text" >
4847
<string>Height</string>
4948
</property>
5049
</widget>
5150
</item>
52-
<item row="1" column="1">
53-
<widget class="QLineEdit" name="mHeightLineEdit"/>
51+
<item row="1" column="1" >
52+
<widget class="QLineEdit" name="mHeightLineEdit" />
5453
</item>
55-
<item row="2" column="0">
56-
<layout class="QHBoxLayout" name="horizontalLayout">
54+
<item row="2" column="0" >
55+
<layout class="QHBoxLayout" name="horizontalLayout" >
5756
<item>
58-
<widget class="QLabel" name="label_2">
59-
<property name="sizePolicy">
60-
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
57+
<widget class="QLabel" name="label_2" >
58+
<property name="sizePolicy" >
59+
<sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
6160
<horstretch>0</horstretch>
6261
<verstretch>0</verstretch>
6362
</sizepolicy>
6463
</property>
65-
<property name="text">
64+
<property name="text" >
6665
<string>Scale</string>
6766
</property>
68-
<property name="wordWrap">
67+
<property name="wordWrap" >
6968
<bool>true</bool>
7069
</property>
7170
</widget>
7271
</item>
7372
<item>
74-
<widget class="QLabel" name="label">
75-
<property name="text">
73+
<widget class="QLabel" name="label" >
74+
<property name="text" >
7675
<string>1:</string>
7776
</property>
7877
</widget>
7978
</item>
8079
</layout>
8180
</item>
82-
<item row="2" column="1">
83-
<widget class="QLineEdit" name="mScaleLineEdit">
84-
<property name="inputMask">
81+
<item row="2" column="1" >
82+
<widget class="QLineEdit" name="mScaleLineEdit" >
83+
<property name="inputMask" >
8584
<string/>
8685
</property>
8786
</widget>
8887
</item>
8988
</layout>
9089
</widget>
9190
</item>
92-
<item row="1" column="0">
93-
<widget class="QGroupBox" name="mMapExtentGroupBox">
94-
<property name="title">
91+
<item row="1" column="0" >
92+
<widget class="QGroupBox" name="mMapExtentGroupBox" >
93+
<property name="title" >
9594
<string>Map extent</string>
9695
</property>
97-
<layout class="QVBoxLayout" name="verticalLayout">
96+
<layout class="QVBoxLayout" name="verticalLayout" >
9897
<item>
99-
<layout class="QGridLayout" name="gridLayout_4">
100-
<item row="0" column="1">
101-
<widget class="QLineEdit" name="mXMinLineEdit"/>
98+
<layout class="QGridLayout" name="gridLayout_4" >
99+
<item row="0" column="1" >
100+
<widget class="QLineEdit" name="mXMinLineEdit" />
102101
</item>
103-
<item row="0" column="0">
104-
<widget class="QLabel" name="mXMinLabel">
105-
<property name="enabled">
102+
<item row="0" column="0" >
103+
<widget class="QLabel" name="mXMinLabel" >
104+
<property name="enabled" >
106105
<bool>true</bool>
107106
</property>
108-
<property name="text">
107+
<property name="text" >
109108
<string>X min</string>
110109
</property>
111-
<property name="buddy">
110+
<property name="buddy" >
112111
<cstring>mXMinLineEdit</cstring>
113112
</property>
114113
</widget>
115114
</item>
116-
<item row="1" column="1">
117-
<widget class="QLineEdit" name="mYMinLineEdit"/>
115+
<item row="1" column="1" >
116+
<widget class="QLineEdit" name="mYMinLineEdit" />
118117
</item>
119-
<item row="1" column="0">
120-
<widget class="QLabel" name="mYMinLabel">
121-
<property name="text">
118+
<item row="1" column="0" >
119+
<widget class="QLabel" name="mYMinLabel" >
120+
<property name="text" >
122121
<string>Y min</string>
123122
</property>
124-
<property name="buddy">
123+
<property name="buddy" >
125124
<cstring>mYMinLineEdit</cstring>
126125
</property>
127126
</widget>
128127
</item>
129-
<item row="0" column="3">
130-
<widget class="QLineEdit" name="mXMaxLineEdit"/>
128+
<item row="0" column="3" >
129+
<widget class="QLineEdit" name="mXMaxLineEdit" />
131130
</item>
132-
<item row="1" column="3">
133-
<widget class="QLineEdit" name="mYMaxLineEdit"/>
131+
<item row="1" column="3" >
132+
<widget class="QLineEdit" name="mYMaxLineEdit" />
134133
</item>
135-
<item row="0" column="2">
136-
<widget class="QLabel" name="mXMaxLabel">
137-
<property name="text">
134+
<item row="0" column="2" >
135+
<widget class="QLabel" name="mXMaxLabel" >
136+
<property name="text" >
138137
<string>X max</string>
139138
</property>
140-
<property name="buddy">
139+
<property name="buddy" >
141140
<cstring>mXMaxLineEdit</cstring>
142141
</property>
143142
</widget>
144143
</item>
145-
<item row="1" column="2">
146-
<widget class="QLabel" name="mYMaxLabel">
147-
<property name="text">
144+
<item row="1" column="2" >
145+
<widget class="QLabel" name="mYMaxLabel" >
146+
<property name="text" >
148147
<string>Y max</string>
149148
</property>
150-
<property name="buddy">
149+
<property name="buddy" >
151150
<cstring>mYMaxLineEdit</cstring>
152151
</property>
153152
</widget>
154153
</item>
155154
</layout>
156155
</item>
157156
<item>
158-
<layout class="QHBoxLayout" name="horizontalLayout_5">
157+
<layout class="QHBoxLayout" name="horizontalLayout_5" >
159158
<item>
160159
<spacer>
161-
<property name="orientation">
160+
<property name="orientation" >
162161
<enum>Qt::Horizontal</enum>
163162
</property>
164-
<property name="sizeHint" stdset="0">
163+
<property name="sizeHint" stdset="0" >
165164
<size>
166165
<width>311</width>
167166
<height>20</height>
@@ -170,14 +169,14 @@
170169
</spacer>
171170
</item>
172171
<item>
173-
<widget class="QPushButton" name="mSetToMapCanvasExtentButton">
174-
<property name="sizePolicy">
175-
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
172+
<widget class="QPushButton" name="mSetToMapCanvasExtentButton" >
173+
<property name="sizePolicy" >
174+
<sizepolicy vsizetype="Fixed" hsizetype="Minimum" >
176175
<horstretch>0</horstretch>
177176
<verstretch>0</verstretch>
178177
</sizepolicy>
179178
</property>
180-
<property name="text">
179+
<property name="text" >
181180
<string>Set to map canvas extent</string>
182181
</property>
183182
</widget>
@@ -187,223 +186,223 @@
187186
</layout>
188187
</widget>
189188
</item>
190-
<item row="2" column="0">
191-
<layout class="QHBoxLayout" name="horizontalLayout_2">
189+
<item row="2" column="0" >
190+
<layout class="QHBoxLayout" name="horizontalLayout_2" >
192191
<item>
193-
<widget class="QLabel" name="mPreviewModeLabel">
194-
<property name="text">
192+
<widget class="QLabel" name="mPreviewModeLabel" >
193+
<property name="text" >
195194
<string>Preview</string>
196195
</property>
197-
<property name="wordWrap">
196+
<property name="wordWrap" >
198197
<bool>true</bool>
199198
</property>
200-
<property name="buddy">
199+
<property name="buddy" >
201200
<cstring>mPreviewModeComboBox</cstring>
202201
</property>
203202
</widget>
204203
</item>
205204
<item>
206-
<widget class="QComboBox" name="mPreviewModeComboBox">
207-
<property name="sizePolicy">
208-
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
205+
<widget class="QComboBox" name="mPreviewModeComboBox" >
206+
<property name="sizePolicy" >
207+
<sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
209208
<horstretch>0</horstretch>
210209
<verstretch>0</verstretch>
211210
</sizepolicy>
212211
</property>
213212
</widget>
214213
</item>
215214
<item>
216-
<widget class="QPushButton" name="mUpdatePreviewButton">
217-
<property name="text">
215+
<widget class="QPushButton" name="mUpdatePreviewButton" >
216+
<property name="text" >
218217
<string>Update preview</string>
219218
</property>
220219
</widget>
221220
</item>
222221
</layout>
223222
</item>
224-
<item row="3" column="0">
225-
<widget class="QCheckBox" name="mKeepLayerListCheckBox">
226-
<property name="text">
223+
<item row="3" column="0" >
224+
<widget class="QCheckBox" name="mKeepLayerListCheckBox" >
225+
<property name="text" >
227226
<string>Keep layer list</string>
228227
</property>
229228
</widget>
230229
</item>
231-
<item row="4" column="0">
232-
<widget class="QCheckBox" name="mShowGridDialogCheckBox">
233-
<property name="text">
230+
<item row="4" column="0" >
231+
<widget class="QCheckBox" name="mShowGridDialogCheckBox" >
232+
<property name="text" >
234233
<string>Show composer grid widget</string>
235234
</property>
236235
</widget>
237236
</item>
238-
<item row="5" column="0">
239-
<widget class="QDockWidget" name="mGridDockWidget">
240-
<property name="floating">
237+
<item row="5" column="0" >
238+
<widget class="QDockWidget" name="mGridDockWidget" >
239+
<property name="floating" >
241240
<bool>true</bool>
242241
</property>
243-
<property name="features">
242+
<property name="features" >
244243
<set>QDockWidget::DockWidgetFloatable|QDockWidget::DockWidgetMovable</set>
245244
</property>
246-
<property name="windowTitle">
245+
<property name="windowTitle" >
247246
<string>Grid</string>
248247
</property>
249-
<widget class="QWidget" name="dockWidgetContents">
250-
<layout class="QGridLayout" name="gridLayout">
251-
<item row="0" column="0">
252-
<widget class="QCheckBox" name="mGridCheckBox">
253-
<property name="text">
248+
<widget class="QWidget" name="dockWidgetContents" >
249+
<layout class="QGridLayout" name="gridLayout" >
250+
<item row="0" column="0" >
251+
<widget class="QCheckBox" name="mGridCheckBox" >
252+
<property name="text" >
254253
<string>Show grid</string>
255254
</property>
256255
</widget>
257256
</item>
258-
<item row="1" column="0">
259-
<widget class="QLabel" name="mGridTypeLabel">
260-
<property name="text">
257+
<item row="1" column="0" >
258+
<widget class="QLabel" name="mGridTypeLabel" >
259+
<property name="text" >
261260
<string>Grid type:</string>
262261
</property>
263262
</widget>
264263
</item>
265-
<item row="1" column="1" colspan="2">
266-
<widget class="QComboBox" name="mGridTypeComboBox"/>
264+
<item row="1" column="1" colspan="2" >
265+
<widget class="QComboBox" name="mGridTypeComboBox" />
267266
</item>
268-
<item row="2" column="0">
269-
<widget class="QLabel" name="mIntervalXLabel">
270-
<property name="text">
267+
<item row="2" column="0" >
268+
<widget class="QLabel" name="mIntervalXLabel" >
269+
<property name="text" >
271270
<string>Interval X:</string>
272271
</property>
273272
</widget>
274273
</item>
275-
<item row="2" column="1" colspan="2">
276-
<widget class="QDoubleSpinBox" name="mIntervalXSpinBox">
277-
<property name="maximum">
278-
<double>999999.000000000000000</double>
274+
<item row="2" column="1" colspan="2" >
275+
<widget class="QDoubleSpinBox" name="mIntervalXSpinBox" >
276+
<property name="maximum" >
277+
<double>99999999.000000000000000</double>
279278
</property>
280279
</widget>
281280
</item>
282-
<item row="2" column="3">
283-
<widget class="QLabel" name="mIntervalYLabel">
284-
<property name="text">
281+
<item row="2" column="3" >
282+
<widget class="QLabel" name="mIntervalYLabel" >
283+
<property name="text" >
285284
<string>Interval Y:</string>
286285
</property>
287286
</widget>
288287
</item>
289-
<item row="2" column="4">
290-
<widget class="QDoubleSpinBox" name="mIntervalYSpinBox">
291-
<property name="maximum">
292-
<double>9999999.000000000000000</double>
288+
<item row="2" column="4" >
289+
<widget class="QDoubleSpinBox" name="mIntervalYSpinBox" >
290+
<property name="maximum" >
291+
<double>99999999.000000000000000</double>
293292
</property>
294293
</widget>
295294
</item>
296-
<item row="3" column="0">
297-
<widget class="QLabel" name="mOffsetXLabel">
298-
<property name="text">
295+
<item row="3" column="0" >
296+
<widget class="QLabel" name="mOffsetXLabel" >
297+
<property name="text" >
299298
<string>Offset X:</string>
300299
</property>
301300
</widget>
302301
</item>
303-
<item row="3" column="1" colspan="2">
304-
<widget class="QDoubleSpinBox" name="mOffsetXSpinBox">
305-
<property name="maximum">
302+
<item row="3" column="1" colspan="2" >
303+
<widget class="QDoubleSpinBox" name="mOffsetXSpinBox" >
304+
<property name="maximum" >
306305
<double>9999999.000000000000000</double>
307306
</property>
308307
</widget>
309308
</item>
310-
<item row="3" column="3">
311-
<widget class="QLabel" name="mOffsetYLabel">
312-
<property name="text">
309+
<item row="3" column="3" >
310+
<widget class="QLabel" name="mOffsetYLabel" >
311+
<property name="text" >
313312
<string>Offset Y:</string>
314313
</property>
315314
</widget>
316315
</item>
317-
<item row="3" column="4">
318-
<widget class="QDoubleSpinBox" name="mOffsetYSpinBox">
319-
<property name="maximum">
316+
<item row="3" column="4" >
317+
<widget class="QDoubleSpinBox" name="mOffsetYSpinBox" >
318+
<property name="maximum" >
320319
<double>9999999.000000000000000</double>
321320
</property>
322321
</widget>
323322
</item>
324-
<item row="4" column="0">
325-
<widget class="QLabel" name="mLineWidthLabel">
326-
<property name="text">
323+
<item row="4" column="0" >
324+
<widget class="QLabel" name="mLineWidthLabel" >
325+
<property name="text" >
327326
<string>Line width:</string>
328327
</property>
329328
</widget>
330329
</item>
331-
<item row="4" column="1" colspan="2">
332-
<widget class="QDoubleSpinBox" name="mLineWidthSpinBox"/>
330+
<item row="4" column="1" colspan="2" >
331+
<widget class="QDoubleSpinBox" name="mLineWidthSpinBox" />
333332
</item>
334-
<item row="4" column="3">
335-
<widget class="QLabel" name="mLineColorLabel">
336-
<property name="text">
333+
<item row="4" column="3" >
334+
<widget class="QLabel" name="mLineColorLabel" >
335+
<property name="text" >
337336
<string>Line color:</string>
338337
</property>
339338
</widget>
340339
</item>
341-
<item row="4" column="4">
342-
<widget class="QgsColorButton" name="mLineColorButton">
343-
<property name="sizePolicy">
344-
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
340+
<item row="4" column="4" >
341+
<widget class="QgsColorButton" name="mLineColorButton" >
342+
<property name="sizePolicy" >
343+
<sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
345344
<horstretch>0</horstretch>
346345
<verstretch>0</verstretch>
347346
</sizepolicy>
348347
</property>
349-
<property name="text">
348+
<property name="text" >
350349
<string/>
351350
</property>
352351
</widget>
353352
</item>
354-
<item row="5" column="0" colspan="2">
355-
<widget class="QCheckBox" name="mDrawAnnotationCheckBox">
356-
<property name="text">
353+
<item row="5" column="0" colspan="2" >
354+
<widget class="QCheckBox" name="mDrawAnnotationCheckBox" >
355+
<property name="text" >
357356
<string>Draw annotation</string>
358357
</property>
359358
</widget>
360359
</item>
361-
<item row="6" column="0" colspan="2">
362-
<widget class="QLabel" name="mAnnotationPositionLabel">
363-
<property name="text">
360+
<item row="6" column="0" colspan="2" >
361+
<widget class="QLabel" name="mAnnotationPositionLabel" >
362+
<property name="text" >
364363
<string>Annotation position:</string>
365364
</property>
366365
</widget>
367366
</item>
368-
<item row="6" column="2">
369-
<widget class="QComboBox" name="mAnnotationPositionComboBox"/>
367+
<item row="6" column="2" >
368+
<widget class="QComboBox" name="mAnnotationPositionComboBox" />
370369
</item>
371-
<item row="6" column="3">
372-
<widget class="QLabel" name="mAnnotationDirectionLabel">
373-
<property name="frameShape">
370+
<item row="6" column="3" >
371+
<widget class="QLabel" name="mAnnotationDirectionLabel" >
372+
<property name="frameShape" >
374373
<enum>QFrame::NoFrame</enum>
375374
</property>
376-
<property name="text">
375+
<property name="text" >
377376
<string>Annotation direction:</string>
378377
</property>
379378
</widget>
380379
</item>
381-
<item row="6" column="4">
382-
<widget class="QComboBox" name="mAnnotationDirectionComboBox"/>
380+
<item row="6" column="4" >
381+
<widget class="QComboBox" name="mAnnotationDirectionComboBox" />
383382
</item>
384-
<item row="7" column="0" colspan="2">
385-
<widget class="QLabel" name="mDistanceToFrameLabel">
386-
<property name="text">
383+
<item row="7" column="0" colspan="2" >
384+
<widget class="QLabel" name="mDistanceToFrameLabel" >
385+
<property name="text" >
387386
<string>Distance to map frame:</string>
388387
</property>
389388
</widget>
390389
</item>
391-
<item row="7" column="2">
392-
<widget class="QDoubleSpinBox" name="mDistanceToMapFrameSpinBox"/>
390+
<item row="7" column="2" >
391+
<widget class="QDoubleSpinBox" name="mDistanceToMapFrameSpinBox" />
393392
</item>
394-
<item row="7" column="3">
395-
<widget class="QLabel" name="mAnnotationTypeLabel">
396-
<property name="text">
393+
<item row="7" column="3" >
394+
<widget class="QLabel" name="mAnnotationTypeLabel" >
395+
<property name="text" >
397396
<string>Annotation type:</string>
398397
</property>
399398
</widget>
400399
</item>
401-
<item row="7" column="4">
402-
<widget class="QComboBox" name="mAnnotationTypeComboBox"/>
400+
<item row="7" column="4" >
401+
<widget class="QComboBox" name="mAnnotationTypeComboBox" />
403402
</item>
404-
<item row="8" column="0">
405-
<widget class="QPushButton" name="mAnnotationFontButton">
406-
<property name="text">
403+
<item row="8" column="0" >
404+
<widget class="QPushButton" name="mAnnotationFontButton" >
405+
<property name="text" >
407406
<string>Font...</string>
408407
</property>
409408
</widget>
@@ -412,12 +411,12 @@
412411
</widget>
413412
</widget>
414413
</item>
415-
<item row="6" column="0">
414+
<item row="6" column="0" >
416415
<spacer>
417-
<property name="orientation">
416+
<property name="orientation" >
418417
<enum>Qt::Vertical</enum>
419418
</property>
420-
<property name="sizeHint" stdset="0">
419+
<property name="sizeHint" stdset="0" >
421420
<size>
422421
<width>458</width>
423422
<height>31</height>
@@ -427,7 +426,7 @@
427426
</item>
428427
</layout>
429428
</widget>
430-
<layoutdefault spacing="6" margin="11"/>
429+
<layoutdefault spacing="6" margin="11" />
431430
<customwidgets>
432431
<customwidget>
433432
<class>QgsColorButton</class>

0 commit comments

Comments
 (0)
Please sign in to comment.