Skip to content

Commit fa1a8bc

Browse files
author
mhugent
committedOct 24, 2007
applied patch for extended data defined labels provided by Juergen
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@7297 c8812cc2-4d05-0410-92ff-de0c093fc19c
·
final-1_7_1final-0_9_1
1 parent 09a075b commit fa1a8bc

File tree

4 files changed

+323
-134
lines changed

4 files changed

+323
-134
lines changed
 

‎src/app/qgslabeldialog.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,10 @@ void QgsLabelDialog::init ( )
114114
cboFontSizeField->insertStringList(myFieldStringList);
115115
cboFontSizeField->setCurrentItem(itemNoForField(mLabel->labelField(QgsLabel::Size),myFieldStringList));
116116

117+
cboFontSizeTypeField->clear();
118+
cboFontSizeTypeField->insertStringList(myFieldStringList);
119+
cboFontSizeTypeField->setCurrentItem(itemNoForField(mLabel->labelField(QgsLabel::SizeType),myFieldStringList));
120+
117121
cboFontTransparencyField->clear();
118122
cboFontTransparencyField->insertStringList(myFieldStringList);
119123
//cboFontTransparencyField->setCurrentItem(itemNoForField(mLabel->labelField(QgsLabel::FontTransparency),myFieldStringList));
@@ -392,6 +396,7 @@ void QgsLabelDialog::apply()
392396
mLabel->setLabelField( QgsLabel::Italic, fieldIndexFromName(cboItalicField->currentText()) );
393397
mLabel->setLabelField( QgsLabel::Underline, fieldIndexFromName(cboUnderlineField->currentText()) );
394398
mLabel->setLabelField( QgsLabel::Size, fieldIndexFromName(cboFontSizeField->currentText()) );
399+
mLabel->setLabelField( QgsLabel::SizeType, fieldIndexFromName(cboFontSizeTypeField->currentText()) );
395400
mLabel->setLabelField( QgsLabel::BufferSize, fieldIndexFromName(cboBufferSizeField->currentText()) );
396401
//mLabel->setLabelField( QgsLabel::BufferTransparency, cboBufferTransparencyField->currentText() );
397402
mLabel->setLabelField( QgsLabel::XCoordinate, fieldIndexFromName(cboXCoordinateField->currentText()) );

‎src/core/qgslabel.cpp

Lines changed: 53 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -135,13 +135,26 @@ void QgsLabel::renderLabel( QPainter * painter, QgsRect &viewExtent,
135135
{
136136
size = value.toDouble();
137137
}
138-
if ( mLabelAttributes->sizeType() == QgsLabelAttributes::MapUnits )
138+
int sizeType;
139+
value = fieldValue ( SizeType, feature );
140+
if( value.isEmpty() )
141+
sizeType = mLabelAttributes->sizeType();
142+
else
143+
{
144+
value = value.lower();
145+
if( value.compare("mapunits") == 0 )
146+
sizeType = QgsLabelAttributes::MapUnits;
147+
else
148+
sizeType = QgsLabelAttributes::PointUnits;
149+
}
150+
if ( sizeType == QgsLabelAttributes::MapUnits )
139151
{
140152
size *= scale;
141153
} else {
142154
size *= sizeScale;
143155
}
144-
font.setPointSizeFloat ( size );
156+
if(size>0.0)
157+
font.setPointSizeFloat ( size );
145158

146159
value = fieldValue ( Color, feature );
147160
if ( value.isEmpty() )
@@ -215,23 +228,22 @@ void QgsLabel::renderLabel( QPainter * painter, QgsRect &viewExtent,
215228
else
216229
{
217230
value = value.lower();
218-
alignment = Qt::AlignCenter;
219-
if ( value.compare("left") == 0 )
220-
{
221-
alignment = Qt::AlignLeft | Qt::AlignVCenter;
222-
}
223-
else if ( value.compare("right") == 0 )
224-
{
225-
alignment = Qt::AlignRight | Qt::AlignVCenter;
226-
}
227-
else if ( value.compare("bottom") == 0 )
228-
{
229-
alignment = Qt::AlignBottom | Qt::AlignHCenter;
230-
}
231-
else if ( value.compare("top") == 0 )
232-
{
233-
alignment = Qt::AlignTop | Qt::AlignHCenter;
234-
}
231+
232+
alignment=0;
233+
234+
if ( value.contains("left") )
235+
alignment |= Qt::AlignLeft;
236+
else if( value.contains("right") )
237+
alignment |= Qt::AlignRight;
238+
else
239+
alignment |= Qt::AlignHCenter;
240+
241+
if( value.contains("bottom") )
242+
alignment |= Qt::AlignBottom;
243+
else if( value.contains("top") )
244+
alignment |= Qt::AlignTop;
245+
else
246+
alignment |= Qt::AlignVCenter;
235247
}
236248

237249
if ( alignment & Qt::AlignLeft )
@@ -689,14 +701,22 @@ void QgsLabel::readXML( const QDomNode& node )
689701

690702
if ( scratchNode.isNull() )
691703
{
692-
QgsDebugMsg("couldn't find QgsLabel ``size'' attribute");
704+
QgsDebugMsg("couldn't find QgsLabel ``size'' attribute");
693705
}
694706
else
695707
{
696-
el = scratchNode.toElement();
697-
type = QgsLabelAttributes::unitsCode( el.attribute("units","") );
698-
mLabelAttributes->setSize ( el.attribute("value", "0.0").toDouble(), type );
699-
setLabelField ( Size, _elementFieldIndex(el) );
708+
el = scratchNode.toElement();
709+
if( !el.hasAttribute("unitfield") )
710+
{
711+
type = QgsLabelAttributes::unitsCode( el.attribute("units","") );
712+
mLabelAttributes->setSize ( el.attribute("value", "0.0").toDouble(), type );
713+
}
714+
else
715+
{
716+
QString str = el.attribute("unitfield","");
717+
setLabelField( SizeType, str=="" ? -1 : str.toInt() );
718+
}
719+
setLabelField ( Size, _elementFieldIndex(el) );
700720
}
701721

702722
/* Bold */
@@ -940,9 +960,18 @@ void QgsLabel::writeXML(std::ostream& xml)
940960
{
941961
if (mLabelFieldIdx[Size] != -1)
942962
{
963+
if (mLabelFieldIdx[SizeType] != -1)
964+
{
965+
xml << "\t\t\t<size value=\"" << mLabelAttributes->size()
966+
<< "\" unitfield=\"" << mLabelFieldIdx[SizeType]
967+
<< "\" field=\"" << mLabelFieldIdx[Size] << "\" />\n";
968+
}
969+
else
970+
{
943971
xml << "\t\t\t<size value=\"" << mLabelAttributes->size()
944972
<< "\" units=\"" << (const char *)QgsLabelAttributes::unitsName(mLabelAttributes->sizeType()).utf8()
945973
<< "\" field=\"" << mLabelFieldIdx[Size] << "\" />\n";
974+
}
946975
}
947976
else
948977
{

‎src/core/qgslabel.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ class CORE_EXPORT QgsLabel
5555
Text = 0,
5656
Family,
5757
Size,
58+
SizeType,
5859
Bold,
5960
Italic,
6061
Underline,

‎src/ui/qgslabeldialogbase.ui

Lines changed: 264 additions & 110 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,7 @@
1010
</rect>
1111
</property>
1212
<property name="sizePolicy" >
13-
<sizepolicy>
14-
<hsizetype>7</hsizetype>
15-
<vsizetype>7</vsizetype>
13+
<sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
1614
<horstretch>0</horstretch>
1715
<verstretch>0</verstretch>
1816
</sizepolicy>
@@ -21,34 +19,56 @@
2119
<string>Form1</string>
2220
</property>
2321
<layout class="QGridLayout" >
24-
<property name="margin" >
22+
<property name="leftMargin" >
2523
<number>1</number>
2624
</property>
27-
<property name="spacing" >
25+
<property name="topMargin" >
26+
<number>1</number>
27+
</property>
28+
<property name="rightMargin" >
29+
<number>1</number>
30+
</property>
31+
<property name="bottomMargin" >
32+
<number>1</number>
33+
</property>
34+
<property name="horizontalSpacing" >
35+
<number>2</number>
36+
</property>
37+
<property name="verticalSpacing" >
2838
<number>2</number>
2939
</property>
3040
<item row="1" column="0" >
3141
<widget class="QTabWidget" name="tabWidget2" >
3242
<property name="sizePolicy" >
33-
<sizepolicy>
34-
<hsizetype>3</hsizetype>
35-
<vsizetype>7</vsizetype>
43+
<sizepolicy vsizetype="Expanding" hsizetype="MinimumExpanding" >
3644
<horstretch>0</horstretch>
3745
<verstretch>0</verstretch>
3846
</sizepolicy>
3947
</property>
4048
<property name="currentIndex" >
41-
<number>3</number>
49+
<number>0</number>
4250
</property>
4351
<widget class="QWidget" name="tab1" >
4452
<attribute name="title" >
4553
<string>Font Style</string>
4654
</attribute>
4755
<layout class="QGridLayout" >
48-
<property name="margin" >
56+
<property name="leftMargin" >
57+
<number>9</number>
58+
</property>
59+
<property name="topMargin" >
60+
<number>9</number>
61+
</property>
62+
<property name="rightMargin" >
63+
<number>9</number>
64+
</property>
65+
<property name="bottomMargin" >
4966
<number>9</number>
5067
</property>
51-
<property name="spacing" >
68+
<property name="horizontalSpacing" >
69+
<number>6</number>
70+
</property>
71+
<property name="verticalSpacing" >
5272
<number>6</number>
5373
</property>
5474
<item row="4" column="1" >
@@ -70,10 +90,22 @@
7090
<string>Font size units</string>
7191
</property>
7292
<layout class="QGridLayout" >
73-
<property name="margin" >
93+
<property name="leftMargin" >
94+
<number>9</number>
95+
</property>
96+
<property name="topMargin" >
7497
<number>9</number>
7598
</property>
76-
<property name="spacing" >
99+
<property name="rightMargin" >
100+
<number>9</number>
101+
</property>
102+
<property name="bottomMargin" >
103+
<number>9</number>
104+
</property>
105+
<property name="horizontalSpacing" >
106+
<number>6</number>
107+
</property>
108+
<property name="verticalSpacing" >
77109
<number>6</number>
78110
</property>
79111
<item row="0" column="1" >
@@ -112,9 +144,7 @@
112144
<bool>false</bool>
113145
</property>
114146
<property name="sizePolicy" >
115-
<sizepolicy>
116-
<hsizetype>3</hsizetype>
117-
<vsizetype>0</vsizetype>
147+
<sizepolicy vsizetype="Fixed" hsizetype="MinimumExpanding" >
118148
<horstretch>0</horstretch>
119149
<verstretch>0</verstretch>
120150
</sizepolicy>
@@ -139,9 +169,7 @@
139169
<item row="0" column="0" colspan="3" >
140170
<widget class="QPushButton" name="btnDefaultFont" >
141171
<property name="sizePolicy" >
142-
<sizepolicy>
143-
<hsizetype>7</hsizetype>
144-
<vsizetype>0</vsizetype>
172+
<sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
145173
<horstretch>2</horstretch>
146174
<verstretch>0</verstretch>
147175
</sizepolicy>
@@ -154,9 +182,7 @@
154182
<item row="1" column="0" colspan="3" >
155183
<widget class="QPushButton" name="pbnDefaultFontColor" >
156184
<property name="sizePolicy" >
157-
<sizepolicy>
158-
<hsizetype>7</hsizetype>
159-
<vsizetype>0</vsizetype>
185+
<sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
160186
<horstretch>2</horstretch>
161187
<verstretch>0</verstretch>
162188
</sizepolicy>
@@ -172,9 +198,7 @@
172198
<bool>false</bool>
173199
</property>
174200
<property name="sizePolicy" >
175-
<sizepolicy>
176-
<hsizetype>0</hsizetype>
177-
<vsizetype>0</vsizetype>
201+
<sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
178202
<horstretch>0</horstretch>
179203
<verstretch>0</verstretch>
180204
</sizepolicy>
@@ -203,10 +227,22 @@
203227
<string>Font Alignment</string>
204228
</attribute>
205229
<layout class="QGridLayout" >
206-
<property name="margin" >
230+
<property name="leftMargin" >
231+
<number>9</number>
232+
</property>
233+
<property name="topMargin" >
234+
<number>9</number>
235+
</property>
236+
<property name="rightMargin" >
237+
<number>9</number>
238+
</property>
239+
<property name="bottomMargin" >
207240
<number>9</number>
208241
</property>
209-
<property name="spacing" >
242+
<property name="horizontalSpacing" >
243+
<number>6</number>
244+
</property>
245+
<property name="verticalSpacing" >
210246
<number>6</number>
211247
</property>
212248
<item row="3" column="1" >
@@ -228,10 +264,22 @@
228264
<string>Placement</string>
229265
</property>
230266
<layout class="QGridLayout" >
231-
<property name="margin" >
267+
<property name="leftMargin" >
268+
<number>9</number>
269+
</property>
270+
<property name="topMargin" >
271+
<number>9</number>
272+
</property>
273+
<property name="rightMargin" >
232274
<number>9</number>
233275
</property>
234-
<property name="spacing" >
276+
<property name="bottomMargin" >
277+
<number>9</number>
278+
</property>
279+
<property name="horizontalSpacing" >
280+
<number>6</number>
281+
</property>
282+
<property name="verticalSpacing" >
235283
<number>6</number>
236284
</property>
237285
<item row="2" column="2" >
@@ -319,9 +367,7 @@
319367
<item row="0" column="1" >
320368
<widget class="QSlider" name="sliderAngle" >
321369
<property name="sizePolicy" >
322-
<sizepolicy>
323-
<hsizetype>7</hsizetype>
324-
<vsizetype>0</vsizetype>
370+
<sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
325371
<horstretch>0</horstretch>
326372
<verstretch>0</verstretch>
327373
</sizepolicy>
@@ -351,10 +397,22 @@
351397
<string>Buffer</string>
352398
</attribute>
353399
<layout class="QGridLayout" >
354-
<property name="margin" >
400+
<property name="leftMargin" >
401+
<number>9</number>
402+
</property>
403+
<property name="topMargin" >
404+
<number>9</number>
405+
</property>
406+
<property name="rightMargin" >
407+
<number>9</number>
408+
</property>
409+
<property name="bottomMargin" >
355410
<number>9</number>
356411
</property>
357-
<property name="spacing" >
412+
<property name="horizontalSpacing" >
413+
<number>6</number>
414+
</property>
415+
<property name="verticalSpacing" >
358416
<number>6</number>
359417
</property>
360418
<item row="3" column="0" colspan="5" >
@@ -363,10 +421,22 @@
363421
<string>Buffer size units</string>
364422
</property>
365423
<layout class="QGridLayout" >
366-
<property name="margin" >
424+
<property name="leftMargin" >
425+
<number>9</number>
426+
</property>
427+
<property name="topMargin" >
428+
<number>9</number>
429+
</property>
430+
<property name="rightMargin" >
431+
<number>9</number>
432+
</property>
433+
<property name="bottomMargin" >
367434
<number>9</number>
368435
</property>
369-
<property name="spacing" >
436+
<property name="horizontalSpacing" >
437+
<number>6</number>
438+
</property>
439+
<property name="verticalSpacing" >
370440
<number>6</number>
371441
</property>
372442
<item row="0" column="1" >
@@ -428,9 +498,7 @@
428498
<bool>false</bool>
429499
</property>
430500
<property name="sizePolicy" >
431-
<sizepolicy>
432-
<hsizetype>0</hsizetype>
433-
<vsizetype>0</vsizetype>
501+
<sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
434502
<horstretch>0</horstretch>
435503
<verstretch>0</verstretch>
436504
</sizepolicy>
@@ -471,9 +539,7 @@
471539
<bool>false</bool>
472540
</property>
473541
<property name="sizePolicy" >
474-
<sizepolicy>
475-
<hsizetype>3</hsizetype>
476-
<vsizetype>0</vsizetype>
542+
<sizepolicy vsizetype="Fixed" hsizetype="MinimumExpanding" >
477543
<horstretch>0</horstretch>
478544
<verstretch>0</verstretch>
479545
</sizepolicy>
@@ -509,10 +575,22 @@
509575
<string>Position</string>
510576
</attribute>
511577
<layout class="QGridLayout" >
512-
<property name="margin" >
578+
<property name="leftMargin" >
513579
<number>9</number>
514580
</property>
515-
<property name="spacing" >
581+
<property name="topMargin" >
582+
<number>9</number>
583+
</property>
584+
<property name="rightMargin" >
585+
<number>9</number>
586+
</property>
587+
<property name="bottomMargin" >
588+
<number>9</number>
589+
</property>
590+
<property name="horizontalSpacing" >
591+
<number>6</number>
592+
</property>
593+
<property name="verticalSpacing" >
516594
<number>6</number>
517595
</property>
518596
<item row="3" column="1" >
@@ -534,10 +612,22 @@
534612
<string>Offset units</string>
535613
</property>
536614
<layout class="QGridLayout" >
537-
<property name="margin" >
615+
<property name="leftMargin" >
616+
<number>9</number>
617+
</property>
618+
<property name="topMargin" >
619+
<number>9</number>
620+
</property>
621+
<property name="rightMargin" >
622+
<number>9</number>
623+
</property>
624+
<property name="bottomMargin" >
538625
<number>9</number>
539626
</property>
540-
<property name="spacing" >
627+
<property name="horizontalSpacing" >
628+
<number>6</number>
629+
</property>
630+
<property name="verticalSpacing" >
541631
<number>6</number>
542632
</property>
543633
<item row="0" column="1" >
@@ -592,18 +682,28 @@
592682
<string>Data Defined Style</string>
593683
</attribute>
594684
<layout class="QGridLayout" >
595-
<property name="margin" >
685+
<property name="leftMargin" >
686+
<number>9</number>
687+
</property>
688+
<property name="topMargin" >
689+
<number>9</number>
690+
</property>
691+
<property name="rightMargin" >
596692
<number>9</number>
597693
</property>
598-
<property name="spacing" >
694+
<property name="bottomMargin" >
695+
<number>9</number>
696+
</property>
697+
<property name="horizontalSpacing" >
698+
<number>6</number>
699+
</property>
700+
<property name="verticalSpacing" >
599701
<number>6</number>
600702
</property>
601703
<item row="3" column="0" colspan="2" >
602704
<widget class="QLabel" name="textLabel4_2_4" >
603705
<property name="sizePolicy" >
604-
<sizepolicy>
605-
<hsizetype>0</hsizetype>
606-
<vsizetype>5</vsizetype>
706+
<sizepolicy vsizetype="Preferred" hsizetype="Fixed" >
607707
<horstretch>0</horstretch>
608708
<verstretch>0</verstretch>
609709
</sizepolicy>
@@ -619,9 +719,7 @@
619719
<item row="5" column="0" >
620720
<widget class="QLabel" name="textLabel4_3_2" >
621721
<property name="sizePolicy" >
622-
<sizepolicy>
623-
<hsizetype>0</hsizetype>
624-
<vsizetype>5</vsizetype>
722+
<sizepolicy vsizetype="Preferred" hsizetype="Fixed" >
625723
<horstretch>0</horstretch>
626724
<verstretch>0</verstretch>
627725
</sizepolicy>
@@ -637,9 +735,7 @@
637735
<item rowspan="2" row="1" column="0" >
638736
<widget class="QLabel" name="textLabel4" >
639737
<property name="sizePolicy" >
640-
<sizepolicy>
641-
<hsizetype>0</hsizetype>
642-
<vsizetype>5</vsizetype>
738+
<sizepolicy vsizetype="Preferred" hsizetype="Fixed" >
643739
<horstretch>0</horstretch>
644740
<verstretch>0</verstretch>
645741
</sizepolicy>
@@ -653,6 +749,16 @@
653749
</widget>
654750
</item>
655751
<item row="6" column="3" >
752+
<widget class="QComboBox" name="cboFontSizeTypeField" >
753+
<property name="minimumSize" >
754+
<size>
755+
<width>0</width>
756+
<height>20</height>
757+
</size>
758+
</property>
759+
</widget>
760+
</item>
761+
<item row="7" column="3" >
656762
<widget class="QComboBox" name="cboFontTransparencyField" >
657763
<property name="minimumSize" >
658764
<size>
@@ -665,9 +771,7 @@
665771
<item row="4" column="0" colspan="2" >
666772
<widget class="QLabel" name="textLabel4_3" >
667773
<property name="sizePolicy" >
668-
<sizepolicy>
669-
<hsizetype>0</hsizetype>
670-
<vsizetype>5</vsizetype>
774+
<sizepolicy vsizetype="Preferred" hsizetype="Fixed" >
671775
<horstretch>0</horstretch>
672776
<verstretch>0</verstretch>
673777
</sizepolicy>
@@ -711,11 +815,25 @@
711815
</widget>
712816
</item>
713817
<item row="6" column="0" colspan="2" >
818+
<widget class="QLabel" name="textLabel4_3_2_4" >
819+
<property name="sizePolicy" >
820+
<sizepolicy vsizetype="Preferred" hsizetype="Fixed" >
821+
<horstretch>0</horstretch>
822+
<verstretch>0</verstretch>
823+
</sizepolicy>
824+
</property>
825+
<property name="text" >
826+
<string>Size Units:</string>
827+
</property>
828+
<property name="buddy" >
829+
<cstring>cboFontSizeTypeField</cstring>
830+
</property>
831+
</widget>
832+
</item>
833+
<item row="7" column="0" colspan="2" >
714834
<widget class="QLabel" name="textLabel4_3_2_3" >
715835
<property name="sizePolicy" >
716-
<sizepolicy>
717-
<hsizetype>0</hsizetype>
718-
<vsizetype>5</vsizetype>
836+
<sizepolicy vsizetype="Preferred" hsizetype="Fixed" >
719837
<horstretch>0</horstretch>
720838
<verstretch>0</verstretch>
721839
</sizepolicy>
@@ -724,7 +842,7 @@
724842
<string>Transparency:</string>
725843
</property>
726844
<property name="buddy" >
727-
<cstring>cboFontSizeField</cstring>
845+
<cstring>cboFontTransparencyField</cstring>
728846
</property>
729847
</widget>
730848
</item>
@@ -741,9 +859,7 @@
741859
<item row="0" column="0" colspan="2" >
742860
<widget class="QLabel" name="lblFont" >
743861
<property name="sizePolicy" >
744-
<sizepolicy>
745-
<hsizetype>0</hsizetype>
746-
<vsizetype>5</vsizetype>
862+
<sizepolicy vsizetype="Preferred" hsizetype="Fixed" >
747863
<horstretch>0</horstretch>
748864
<verstretch>0</verstretch>
749865
</sizepolicy>
@@ -799,10 +915,22 @@
799915
<string>Data Defined Alignment</string>
800916
</attribute>
801917
<layout class="QGridLayout" >
802-
<property name="margin" >
918+
<property name="leftMargin" >
919+
<number>9</number>
920+
</property>
921+
<property name="topMargin" >
922+
<number>9</number>
923+
</property>
924+
<property name="rightMargin" >
925+
<number>9</number>
926+
</property>
927+
<property name="bottomMargin" >
803928
<number>9</number>
804929
</property>
805-
<property name="spacing" >
930+
<property name="horizontalSpacing" >
931+
<number>6</number>
932+
</property>
933+
<property name="verticalSpacing" >
806934
<number>6</number>
807935
</property>
808936
<item row="2" column="1" >
@@ -834,9 +962,7 @@
834962
<item row="1" column="0" >
835963
<widget class="QLabel" name="textLabel1_2_2_2_2" >
836964
<property name="sizePolicy" >
837-
<sizepolicy>
838-
<hsizetype>0</hsizetype>
839-
<vsizetype>5</vsizetype>
965+
<sizepolicy vsizetype="Preferred" hsizetype="Fixed" >
840966
<horstretch>0</horstretch>
841967
<verstretch>0</verstretch>
842968
</sizepolicy>
@@ -855,9 +981,7 @@
855981
<item row="0" column="0" >
856982
<widget class="QLabel" name="textLabel1_2_2_2_2_3" >
857983
<property name="sizePolicy" >
858-
<sizepolicy>
859-
<hsizetype>0</hsizetype>
860-
<vsizetype>5</vsizetype>
984+
<sizepolicy vsizetype="Preferred" hsizetype="Fixed" >
861985
<horstretch>0</horstretch>
862986
<verstretch>0</verstretch>
863987
</sizepolicy>
@@ -874,10 +998,22 @@
874998
<string>Data Defined Buffer</string>
875999
</attribute>
8761000
<layout class="QGridLayout" >
877-
<property name="margin" >
1001+
<property name="leftMargin" >
1002+
<number>9</number>
1003+
</property>
1004+
<property name="topMargin" >
1005+
<number>9</number>
1006+
</property>
1007+
<property name="rightMargin" >
1008+
<number>9</number>
1009+
</property>
1010+
<property name="bottomMargin" >
8781011
<number>9</number>
8791012
</property>
880-
<property name="spacing" >
1013+
<property name="horizontalSpacing" >
1014+
<number>6</number>
1015+
</property>
1016+
<property name="verticalSpacing" >
8811017
<number>6</number>
8821018
</property>
8831019
<item row="2" column="1" >
@@ -915,9 +1051,7 @@
9151051
<bool>false</bool>
9161052
</property>
9171053
<property name="sizePolicy" >
918-
<sizepolicy>
919-
<hsizetype>0</hsizetype>
920-
<vsizetype>5</vsizetype>
1054+
<sizepolicy vsizetype="Preferred" hsizetype="Fixed" >
9211055
<horstretch>0</horstretch>
9221056
<verstretch>0</verstretch>
9231057
</sizepolicy>
@@ -946,9 +1080,7 @@
9461080
<item row="1" column="0" >
9471081
<widget class="QLabel" name="textLabel4_3_2_2_2" >
9481082
<property name="sizePolicy" >
949-
<sizepolicy>
950-
<hsizetype>0</hsizetype>
951-
<vsizetype>5</vsizetype>
1083+
<sizepolicy vsizetype="Preferred" hsizetype="Fixed" >
9521084
<horstretch>0</horstretch>
9531085
<verstretch>0</verstretch>
9541086
</sizepolicy>
@@ -968,10 +1100,22 @@
9681100
<string>Data Defined Position</string>
9691101
</attribute>
9701102
<layout class="QGridLayout" >
971-
<property name="margin" >
1103+
<property name="leftMargin" >
9721104
<number>9</number>
9731105
</property>
974-
<property name="spacing" >
1106+
<property name="topMargin" >
1107+
<number>9</number>
1108+
</property>
1109+
<property name="rightMargin" >
1110+
<number>9</number>
1111+
</property>
1112+
<property name="bottomMargin" >
1113+
<number>9</number>
1114+
</property>
1115+
<property name="horizontalSpacing" >
1116+
<number>6</number>
1117+
</property>
1118+
<property name="verticalSpacing" >
9751119
<number>6</number>
9761120
</property>
9771121
<item row="4" column="0" >
@@ -1003,9 +1147,7 @@
10031147
<item row="0" column="0" >
10041148
<widget class="QLabel" name="textLabel1_2" >
10051149
<property name="sizePolicy" >
1006-
<sizepolicy>
1007-
<hsizetype>0</hsizetype>
1008-
<vsizetype>5</vsizetype>
1150+
<sizepolicy vsizetype="Preferred" hsizetype="Fixed" >
10091151
<horstretch>0</horstretch>
10101152
<verstretch>0</verstretch>
10111153
</sizepolicy>
@@ -1021,9 +1163,7 @@
10211163
<item row="2" column="0" >
10221164
<widget class="QLabel" name="textLabel1_2_3" >
10231165
<property name="sizePolicy" >
1024-
<sizepolicy>
1025-
<hsizetype>0</hsizetype>
1026-
<vsizetype>5</vsizetype>
1166+
<sizepolicy vsizetype="Preferred" hsizetype="Fixed" >
10271167
<horstretch>0</horstretch>
10281168
<verstretch>0</verstretch>
10291169
</sizepolicy>
@@ -1042,9 +1182,7 @@
10421182
<item row="1" column="0" >
10431183
<widget class="QLabel" name="textLabel1_2_2" >
10441184
<property name="sizePolicy" >
1045-
<sizepolicy>
1046-
<hsizetype>0</hsizetype>
1047-
<vsizetype>5</vsizetype>
1185+
<sizepolicy vsizetype="Preferred" hsizetype="Fixed" >
10481186
<horstretch>0</horstretch>
10491187
<verstretch>0</verstretch>
10501188
</sizepolicy>
@@ -1057,9 +1195,7 @@
10571195
<item row="3" column="0" >
10581196
<widget class="QLabel" name="textLabel1_2_2_2" >
10591197
<property name="sizePolicy" >
1060-
<sizepolicy>
1061-
<hsizetype>0</hsizetype>
1062-
<vsizetype>5</vsizetype>
1198+
<sizepolicy vsizetype="Preferred" hsizetype="Fixed" >
10631199
<horstretch>0</horstretch>
10641200
<verstretch>0</verstretch>
10651201
</sizepolicy>
@@ -1079,9 +1215,7 @@
10791215
<item row="2" column="0" >
10801216
<widget class="Q3GroupBox" name="groupBox5" >
10811217
<property name="sizePolicy" >
1082-
<sizepolicy>
1083-
<hsizetype>5</hsizetype>
1084-
<vsizetype>7</vsizetype>
1218+
<sizepolicy vsizetype="Expanding" hsizetype="Preferred" >
10851219
<horstretch>0</horstretch>
10861220
<verstretch>0</verstretch>
10871221
</sizepolicy>
@@ -1093,10 +1227,22 @@
10931227
<enum>Qt::Vertical</enum>
10941228
</property>
10951229
<layout class="QGridLayout" >
1096-
<property name="margin" >
1230+
<property name="leftMargin" >
1231+
<number>10</number>
1232+
</property>
1233+
<property name="topMargin" >
1234+
<number>10</number>
1235+
</property>
1236+
<property name="rightMargin" >
10971237
<number>10</number>
10981238
</property>
1099-
<property name="spacing" >
1239+
<property name="bottomMargin" >
1240+
<number>10</number>
1241+
</property>
1242+
<property name="horizontalSpacing" >
1243+
<number>6</number>
1244+
</property>
1245+
<property name="verticalSpacing" >
11001246
<number>6</number>
11011247
</property>
11021248
<item row="0" column="0" >
@@ -1121,10 +1267,22 @@
11211267
<string>Source</string>
11221268
</property>
11231269
<layout class="QGridLayout" >
1124-
<property name="margin" >
1270+
<property name="leftMargin" >
11251271
<number>9</number>
11261272
</property>
1127-
<property name="spacing" >
1273+
<property name="topMargin" >
1274+
<number>9</number>
1275+
</property>
1276+
<property name="rightMargin" >
1277+
<number>9</number>
1278+
</property>
1279+
<property name="bottomMargin" >
1280+
<number>9</number>
1281+
</property>
1282+
<property name="horizontalSpacing" >
1283+
<number>6</number>
1284+
</property>
1285+
<property name="verticalSpacing" >
11281286
<number>6</number>
11291287
</property>
11301288
<item row="0" column="0" colspan="2" >
@@ -1137,9 +1295,7 @@
11371295
<item row="0" column="2" >
11381296
<widget class="QComboBox" name="cboLabelField" >
11391297
<property name="sizePolicy" >
1140-
<sizepolicy>
1141-
<hsizetype>3</hsizetype>
1142-
<vsizetype>0</vsizetype>
1298+
<sizepolicy vsizetype="Fixed" hsizetype="MinimumExpanding" >
11431299
<horstretch>1</horstretch>
11441300
<verstretch>0</verstretch>
11451301
</sizepolicy>
@@ -1155,9 +1311,7 @@
11551311
<item row="1" column="1" colspan="2" >
11561312
<widget class="QLineEdit" name="leDefaultLabel" >
11571313
<property name="sizePolicy" >
1158-
<sizepolicy>
1159-
<hsizetype>3</hsizetype>
1160-
<vsizetype>0</vsizetype>
1314+
<sizepolicy vsizetype="Fixed" hsizetype="MinimumExpanding" >
11611315
<horstretch>2</horstretch>
11621316
<verstretch>0</verstretch>
11631317
</sizepolicy>

0 commit comments

Comments
 (0)
Please sign in to comment.