Skip to content

Commit a54a712

Browse files
author
timlinux
committedNov 14, 2009
Fix for missing label field combo
git-svn-id: http://svn.osgeo.org/qgis/trunk@12103 c8812cc2-4d05-0410-92ff-de0c093fc19c
·
ltr-3_40Before-merge-new_vector_api
1 parent 8ee164d commit a54a712

File tree

1 file changed

+393
-375
lines changed

1 file changed

+393
-375
lines changed
 

‎src/ui/qgslabeldialogbase.ui

Lines changed: 393 additions & 375 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<rect>
77
<x>0</x>
88
<y>0</y>
9-
<width>668</width>
9+
<width>642</width>
1010
<height>516</height>
1111
</rect>
1212
</property>
@@ -23,63 +23,7 @@
2323
<property name="margin">
2424
<number>0</number>
2525
</property>
26-
<item row="0" column="0" rowspan="2" colspan="2">
27-
<layout class="QHBoxLayout">
28-
<item>
29-
<widget class="QLabel" name="textLabel5">
30-
<property name="text">
31-
<string>Field containing label</string>
32-
</property>
33-
<property name="buddy">
34-
<cstring>cboLabelField</cstring>
35-
</property>
36-
</widget>
37-
</item>
38-
<item>
39-
<widget class="QComboBox" name="cboLabelField">
40-
<property name="sizePolicy">
41-
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
42-
<horstretch>1</horstretch>
43-
<verstretch>0</verstretch>
44-
</sizepolicy>
45-
</property>
46-
<property name="minimumSize">
47-
<size>
48-
<width>0</width>
49-
<height>20</height>
50-
</size>
51-
</property>
52-
</widget>
53-
</item>
54-
<item>
55-
<widget class="QLabel" name="textLabel1">
56-
<property name="text">
57-
<string>Default label</string>
58-
</property>
59-
<property name="buddy">
60-
<cstring>leDefaultLabel</cstring>
61-
</property>
62-
</widget>
63-
</item>
64-
<item>
65-
<widget class="QLineEdit" name="leDefaultLabel">
66-
<property name="sizePolicy">
67-
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
68-
<horstretch>2</horstretch>
69-
<verstretch>0</verstretch>
70-
</sizepolicy>
71-
</property>
72-
<property name="minimumSize">
73-
<size>
74-
<width>0</width>
75-
<height>20</height>
76-
</size>
77-
</property>
78-
</widget>
79-
</item>
80-
</layout>
81-
</item>
82-
<item row="1" column="1">
26+
<item row="0" column="0">
8327
<widget class="QScrollArea" name="scrollArea">
8428
<property name="widgetResizable">
8529
<bool>true</bool>
@@ -88,104 +32,163 @@
8832
<property name="geometry">
8933
<rect>
9034
<x>0</x>
91-
<y>0</y>
92-
<width>639</width>
93-
<height>1455</height>
35+
<y>-990</y>
36+
<width>619</width>
37+
<height>1440</height>
9438
</rect>
9539
</property>
9640
<layout class="QGridLayout" name="gridLayout">
97-
<item row="0" column="0" colspan="2">
41+
<item row="0" column="0">
9842
<layout class="QGridLayout">
9943
<item row="0" column="0">
100-
<widget class="QPushButton" name="btnDefaultFont">
101-
<property name="sizePolicy">
102-
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
103-
<horstretch>2</horstretch>
104-
<verstretch>0</verstretch>
105-
</sizepolicy>
106-
</property>
107-
<property name="text">
108-
<string>Font</string>
109-
</property>
110-
</widget>
111-
</item>
112-
<item row="0" column="1">
113-
<widget class="QLabel" name="textLabel5_2_2_3_2">
114-
<property name="text">
115-
<string>Font size</string>
116-
</property>
117-
<property name="alignment">
118-
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
119-
</property>
120-
<property name="buddy">
121-
<cstring>spinFontSize</cstring>
122-
</property>
123-
</widget>
124-
</item>
125-
<item row="0" column="2">
126-
<widget class="QDoubleSpinBox" name="spinFontSize">
127-
<property name="sizePolicy">
128-
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
129-
<horstretch>0</horstretch>
130-
<verstretch>0</verstretch>
131-
</sizepolicy>
132-
</property>
133-
<property name="minimumSize">
134-
<size>
135-
<width>50</width>
136-
<height>0</height>
137-
</size>
138-
</property>
139-
<property name="decimals">
140-
<number>6</number>
141-
</property>
142-
<property name="maximum">
143-
<double>1000000.000000000000000</double>
144-
</property>
145-
<property name="value">
146-
<double>0.000000000000000</double>
147-
</property>
148-
</widget>
149-
</item>
150-
<item row="1" column="0">
151-
<widget class="QPushButton" name="pbnDefaultFontColor">
152-
<property name="sizePolicy">
153-
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
154-
<horstretch>2</horstretch>
155-
<verstretch>0</verstretch>
156-
</sizepolicy>
157-
</property>
158-
<property name="text">
159-
<string>Color</string>
160-
</property>
161-
</widget>
162-
</item>
163-
<item row="1" column="1">
164-
<widget class="QLabel" name="textLabel1_2_2_2_2_2">
165-
<property name="text">
166-
<string>Angle (deg)</string>
167-
</property>
168-
<property name="buddy">
169-
<cstring>spinAngle</cstring>
170-
</property>
171-
</widget>
172-
</item>
173-
<item row="1" column="2">
174-
<widget class="QSpinBox" name="spinAngle">
175-
<property name="suffix">
176-
<string>°</string>
177-
</property>
178-
<property name="maximum">
179-
<number>360</number>
180-
</property>
181-
<property name="value">
182-
<number>0</number>
44+
<widget class="QGroupBox" name="groupBox_8">
45+
<property name="title">
46+
<string>Basic label options</string>
18347
</property>
48+
<layout class="QGridLayout" name="gridLayout_8">
49+
<item row="0" column="0">
50+
<widget class="QLabel" name="textLabel5">
51+
<property name="text">
52+
<string>Field containing label</string>
53+
</property>
54+
<property name="buddy">
55+
<cstring>cboLabelField</cstring>
56+
</property>
57+
</widget>
58+
</item>
59+
<item row="0" column="2">
60+
<widget class="QComboBox" name="cboLabelField">
61+
<property name="sizePolicy">
62+
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
63+
<horstretch>1</horstretch>
64+
<verstretch>0</verstretch>
65+
</sizepolicy>
66+
</property>
67+
</widget>
68+
</item>
69+
<item row="1" column="0">
70+
<widget class="QLabel" name="textLabel1">
71+
<property name="text">
72+
<string>Default label</string>
73+
</property>
74+
<property name="buddy">
75+
<cstring>leDefaultLabel</cstring>
76+
</property>
77+
</widget>
78+
</item>
79+
<item row="1" column="2">
80+
<widget class="QLineEdit" name="leDefaultLabel">
81+
<property name="sizePolicy">
82+
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
83+
<horstretch>2</horstretch>
84+
<verstretch>0</verstretch>
85+
</sizepolicy>
86+
</property>
87+
</widget>
88+
</item>
89+
<item row="2" column="0">
90+
<widget class="QPushButton" name="btnDefaultFont">
91+
<property name="sizePolicy">
92+
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
93+
<horstretch>2</horstretch>
94+
<verstretch>0</verstretch>
95+
</sizepolicy>
96+
</property>
97+
<property name="text">
98+
<string>Font</string>
99+
</property>
100+
</widget>
101+
</item>
102+
<item row="2" column="1">
103+
<widget class="QLabel" name="textLabel5_2_2_3_2">
104+
<property name="text">
105+
<string>Font size</string>
106+
</property>
107+
<property name="alignment">
108+
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
109+
</property>
110+
<property name="buddy">
111+
<cstring>spinFontSize</cstring>
112+
</property>
113+
</widget>
114+
</item>
115+
<item row="2" column="2">
116+
<widget class="QDoubleSpinBox" name="spinFontSize">
117+
<property name="sizePolicy">
118+
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
119+
<horstretch>0</horstretch>
120+
<verstretch>0</verstretch>
121+
</sizepolicy>
122+
</property>
123+
<property name="minimumSize">
124+
<size>
125+
<width>50</width>
126+
<height>0</height>
127+
</size>
128+
</property>
129+
<property name="decimals">
130+
<number>6</number>
131+
</property>
132+
<property name="maximum">
133+
<double>1000000.000000000000000</double>
134+
</property>
135+
<property name="value">
136+
<double>0.000000000000000</double>
137+
</property>
138+
</widget>
139+
</item>
140+
<item row="3" column="0">
141+
<widget class="QPushButton" name="pbnDefaultFontColor">
142+
<property name="sizePolicy">
143+
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
144+
<horstretch>2</horstretch>
145+
<verstretch>0</verstretch>
146+
</sizepolicy>
147+
</property>
148+
<property name="text">
149+
<string>Color</string>
150+
</property>
151+
</widget>
152+
</item>
153+
<item row="3" column="1">
154+
<widget class="QLabel" name="textLabel1_2_2_2_2_2">
155+
<property name="text">
156+
<string>Angle (deg)</string>
157+
</property>
158+
<property name="buddy">
159+
<cstring>spinAngle</cstring>
160+
</property>
161+
</widget>
162+
</item>
163+
<item row="3" column="2">
164+
<widget class="QSpinBox" name="spinAngle">
165+
<property name="suffix">
166+
<string>°</string>
167+
</property>
168+
<property name="maximum">
169+
<number>360</number>
170+
</property>
171+
<property name="value">
172+
<number>0</number>
173+
</property>
174+
</widget>
175+
</item>
176+
<item row="4" column="0">
177+
<widget class="QCheckBox" name="chkUseMultiline">
178+
<property name="text">
179+
<string>Multiline labels?</string>
180+
</property>
181+
<property name="checked">
182+
<bool>true</bool>
183+
</property>
184+
</widget>
185+
</item>
186+
</layout>
184187
</widget>
185188
</item>
186189
</layout>
187190
</item>
188-
<item row="1" column="0" colspan="2">
191+
<item row="1" column="0">
189192
<widget class="QGroupBox" name="groupBox_2">
190193
<property name="title">
191194
<string>Placement</string>
@@ -263,7 +266,7 @@
263266
</layout>
264267
</widget>
265268
</item>
266-
<item row="2" column="0" colspan="2">
269+
<item row="3" column="0">
267270
<widget class="QGroupBox" name="groupBox_3">
268271
<property name="title">
269272
<string>Font size units</string>
@@ -286,7 +289,7 @@
286289
</layout>
287290
</widget>
288291
</item>
289-
<item row="3" column="0" colspan="2">
292+
<item row="4" column="0">
290293
<widget class="QGroupBox" name="chkUseScaleDependentRendering">
291294
<property name="title">
292295
<string>Use scale dependent rendering</string>
@@ -347,155 +350,145 @@
347350
</layout>
348351
</widget>
349352
</item>
350-
<item row="4" column="0" colspan="2">
351-
<widget class="QCheckBox" name="chkUseMultiline">
352-
<property name="text">
353-
<string>Multiline labels?</string>
354-
</property>
355-
<property name="checked">
356-
<bool>true</bool>
357-
</property>
358-
</widget>
359-
</item>
360-
<item row="5" column="0">
361-
<widget class="QCheckBox" name="chkUseBuffer">
362-
<property name="text">
363-
<string>Buffer labels?</string>
364-
</property>
365-
<property name="checked">
366-
<bool>true</bool>
367-
</property>
368-
</widget>
369-
</item>
370-
<item row="6" column="0">
371-
<widget class="QLabel" name="textLabel4_3_2_2">
372-
<property name="text">
373-
<string>Buffer size</string>
374-
</property>
375-
</widget>
376-
</item>
377-
<item row="6" column="1">
378-
<widget class="QDoubleSpinBox" name="spinBufferSize"/>
379-
</item>
380-
<item row="7" column="0">
381-
<widget class="QLabel" name="textLabel5_2_2_3">
382-
<property name="enabled">
383-
<bool>false</bool>
384-
</property>
385-
<property name="text">
386-
<string>Transparency</string>
387-
</property>
388-
<property name="alignment">
389-
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
390-
</property>
391-
</widget>
392-
</item>
393-
<item row="7" column="1">
394-
<widget class="QSpinBox" name="spinBufferTransparency">
395-
<property name="enabled">
396-
<bool>false</bool>
397-
</property>
398-
<property name="sizePolicy">
399-
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
400-
<horstretch>0</horstretch>
401-
<verstretch>0</verstretch>
402-
</sizepolicy>
403-
</property>
404-
<property name="minimumSize">
405-
<size>
406-
<width>50</width>
407-
<height>0</height>
408-
</size>
409-
</property>
410-
<property name="suffix">
411-
<string>%</string>
412-
</property>
413-
<property name="maximum">
414-
<number>100</number>
415-
</property>
416-
<property name="value">
417-
<number>0</number>
418-
</property>
419-
</widget>
420-
</item>
421-
<item row="8" column="0" colspan="2">
422-
<widget class="QPushButton" name="pbnDefaultBufferColor_2">
423-
<property name="text">
424-
<string>Color</string>
425-
</property>
426-
</widget>
427-
</item>
428-
<item row="9" column="0" colspan="2">
353+
<item row="10" column="0">
429354
<widget class="QGroupBox" name="groupBox_4">
430355
<property name="title">
431356
<string>Buffer size units</string>
432357
</property>
433-
<layout class="QGridLayout">
434-
<item row="0" column="0">
358+
<layout class="QGridLayout" name="gridLayout_9">
359+
<item row="1" column="0">
360+
<widget class="QLabel" name="textLabel4_3_2_2">
361+
<property name="text">
362+
<string>Buffer size</string>
363+
</property>
364+
</widget>
365+
</item>
366+
<item row="1" column="1">
367+
<widget class="QDoubleSpinBox" name="spinBufferSize"/>
368+
</item>
369+
<item row="2" column="0">
435370
<widget class="QRadioButton" name="radioBufferUnitsPoints">
436371
<property name="text">
437372
<string>Size is in points</string>
438373
</property>
439374
</widget>
440375
</item>
441-
<item row="1" column="0">
376+
<item row="2" column="1">
442377
<widget class="QRadioButton" name="radioBufferUnitsMap">
443378
<property name="text">
444379
<string>Size is in map units</string>
445380
</property>
446381
</widget>
447382
</item>
383+
<item row="3" column="0">
384+
<widget class="QLabel" name="textLabel5_2_2_3">
385+
<property name="enabled">
386+
<bool>false</bool>
387+
</property>
388+
<property name="text">
389+
<string>Transparency</string>
390+
</property>
391+
<property name="alignment">
392+
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
393+
</property>
394+
</widget>
395+
</item>
396+
<item row="3" column="1">
397+
<widget class="QSpinBox" name="spinBufferTransparency">
398+
<property name="enabled">
399+
<bool>false</bool>
400+
</property>
401+
<property name="sizePolicy">
402+
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
403+
<horstretch>0</horstretch>
404+
<verstretch>0</verstretch>
405+
</sizepolicy>
406+
</property>
407+
<property name="minimumSize">
408+
<size>
409+
<width>50</width>
410+
<height>0</height>
411+
</size>
412+
</property>
413+
<property name="suffix">
414+
<string>%</string>
415+
</property>
416+
<property name="maximum">
417+
<number>100</number>
418+
</property>
419+
<property name="value">
420+
<number>0</number>
421+
</property>
422+
</widget>
423+
</item>
424+
<item row="0" column="0">
425+
<widget class="QCheckBox" name="chkUseBuffer">
426+
<property name="text">
427+
<string>Buffer labels?</string>
428+
</property>
429+
<property name="checked">
430+
<bool>true</bool>
431+
</property>
432+
</widget>
433+
</item>
434+
<item row="0" column="1">
435+
<widget class="QPushButton" name="pbnDefaultBufferColor_2">
436+
<property name="text">
437+
<string>Color</string>
438+
</property>
439+
</widget>
440+
</item>
448441
</layout>
449442
</widget>
450443
</item>
451-
<item row="10" column="0">
444+
<item row="11" column="0">
452445
<widget class="QGroupBox" name="buttonGroup10">
453446
<property name="title">
454447
<string>Offset units</string>
455448
</property>
456449
<layout class="QGridLayout" name="gridLayout_2">
457-
<item row="1" column="0">
458-
<widget class="QDoubleSpinBox" name="spinXOffset">
459-
<property name="minimum">
460-
<double>-99.000000000000000</double>
450+
<item row="0" column="0">
451+
<widget class="QLabel" name="textLabel1_2_2_2_3">
452+
<property name="text">
453+
<string>Y Offset (pts)</string>
461454
</property>
462455
</widget>
463456
</item>
464-
<item row="3" column="0">
457+
<item row="0" column="1">
465458
<widget class="QLabel" name="textLabel1_2_3_2">
466459
<property name="text">
467460
<string>X Offset (pts)</string>
468461
</property>
469462
</widget>
470463
</item>
471-
<item row="4" column="0">
464+
<item row="1" column="0">
465+
<widget class="QDoubleSpinBox" name="spinXOffset">
466+
<property name="minimum">
467+
<double>-99.000000000000000</double>
468+
</property>
469+
</widget>
470+
</item>
471+
<item row="1" column="1">
472472
<widget class="QDoubleSpinBox" name="spinYOffset">
473473
<property name="minimum">
474474
<double>-99.000000000000000</double>
475475
</property>
476476
</widget>
477477
</item>
478-
<item row="5" column="0">
478+
<item row="2" column="0">
479479
<widget class="QRadioButton" name="radioOffsetUnitsPoints">
480480
<property name="text">
481481
<string>Points</string>
482482
</property>
483483
</widget>
484484
</item>
485-
<item row="5" column="1">
485+
<item row="2" column="1">
486486
<widget class="QRadioButton" name="radioOffsetUnitsMap">
487487
<property name="text">
488488
<string>Map units</string>
489489
</property>
490490
</widget>
491491
</item>
492-
<item row="0" column="0">
493-
<widget class="QLabel" name="textLabel1_2_2_2_3">
494-
<property name="text">
495-
<string>Y Offset (pts)</string>
496-
</property>
497-
</widget>
498-
</item>
499492
</layout>
500493
</widget>
501494
</item>
@@ -540,303 +533,303 @@
540533
</layout>
541534
</widget>
542535
</item>
543-
<item row="14" column="0">
544-
<widget class="QGroupBox" name="groupBox_6">
536+
<item row="13" column="0">
537+
<widget class="QGroupBox" name="groupBox">
545538
<property name="title">
546-
<string>Data defined buffer</string>
539+
<string>Data defined properties</string>
547540
</property>
548-
<layout class="QGridLayout" name="gridLayout_5">
541+
<layout class="QGridLayout" name="gridLayout_3">
549542
<item row="0" column="0">
550-
<widget class="QLabel" name="textLabel1_3_2_2_2">
551-
<property name="enabled">
552-
<bool>false</bool>
553-
</property>
543+
<widget class="QLabel" name="lblFont">
554544
<property name="sizePolicy">
555545
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
556546
<horstretch>0</horstretch>
557547
<verstretch>0</verstretch>
558548
</sizepolicy>
559549
</property>
560-
<property name="minimumSize">
561-
<size>
562-
<width>70</width>
563-
<height>0</height>
564-
</size>
565-
</property>
566550
<property name="text">
567-
<string>Transparency:</string>
551+
<string>&amp;Font family</string>
568552
</property>
569553
<property name="buddy">
570-
<cstring>cboBufferTransparencyField</cstring>
554+
<cstring>cboFontField</cstring>
571555
</property>
572556
</widget>
573557
</item>
574558
<item row="0" column="1">
575-
<widget class="QComboBox" name="cboBufferTransparencyField">
576-
<property name="enabled">
577-
<bool>false</bool>
578-
</property>
579-
</widget>
559+
<widget class="QComboBox" name="cboFontField"/>
580560
</item>
581561
<item row="1" column="0">
582-
<widget class="QLabel" name="textLabel4_3_2_2_2">
562+
<widget class="QLabel" name="textLabel4">
583563
<property name="sizePolicy">
584564
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
585565
<horstretch>0</horstretch>
586566
<verstretch>0</verstretch>
587567
</sizepolicy>
588568
</property>
589569
<property name="text">
590-
<string>Size:</string>
570+
<string>&amp;Bold</string>
591571
</property>
592572
<property name="buddy">
593-
<cstring>cboBufferSizeField</cstring>
573+
<cstring>cboBoldField</cstring>
594574
</property>
595575
</widget>
596576
</item>
597577
<item row="1" column="1">
598-
<widget class="QComboBox" name="cboBufferSizeField"/>
578+
<widget class="QComboBox" name="cboBoldField"/>
599579
</item>
600-
</layout>
601-
</widget>
602-
</item>
603-
<item row="15" column="0">
604-
<widget class="QGroupBox" name="groupBox_7">
605-
<property name="title">
606-
<string>Data defined position</string>
607-
</property>
608-
<layout class="QGridLayout" name="gridLayout_6">
609-
<item row="0" column="0">
610-
<widget class="QLabel" name="textLabel1_2">
580+
<item row="2" column="0">
581+
<widget class="QLabel" name="textLabel4_2_4">
611582
<property name="sizePolicy">
612583
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
613584
<horstretch>0</horstretch>
614585
<verstretch>0</verstretch>
615586
</sizepolicy>
616587
</property>
617588
<property name="text">
618-
<string>X Coordinate</string>
589+
<string>&amp;Italic</string>
590+
</property>
591+
<property name="buddy">
592+
<cstring>cboItalicField</cstring>
619593
</property>
620594
</widget>
621595
</item>
622-
<item row="0" column="1">
623-
<widget class="QComboBox" name="cboXCoordinateField"/>
596+
<item row="2" column="1">
597+
<widget class="QComboBox" name="cboItalicField"/>
624598
</item>
625-
<item row="1" column="0">
626-
<widget class="QLabel" name="textLabel1_2_2">
599+
<item row="3" column="0">
600+
<widget class="QLabel" name="textLabel4_3">
627601
<property name="sizePolicy">
628602
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
629603
<horstretch>0</horstretch>
630604
<verstretch>0</verstretch>
631605
</sizepolicy>
632606
</property>
633607
<property name="text">
634-
<string>Y Coordinate</string>
608+
<string>&amp;Underline</string>
609+
</property>
610+
<property name="buddy">
611+
<cstring>cboUnderlineField</cstring>
635612
</property>
636613
</widget>
637614
</item>
638-
<item row="1" column="1">
639-
<widget class="QComboBox" name="cboYCoordinateField"/>
615+
<item row="3" column="1">
616+
<widget class="QComboBox" name="cboUnderlineField"/>
640617
</item>
641-
<item row="2" column="0">
642-
<widget class="QLabel" name="textLabel1_2_3">
618+
<item row="4" column="0">
619+
<widget class="QLabel" name="textLabel4_3_2">
643620
<property name="sizePolicy">
644621
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
645622
<horstretch>0</horstretch>
646623
<verstretch>0</verstretch>
647624
</sizepolicy>
648625
</property>
649626
<property name="text">
650-
<string>X Offset (pts)</string>
627+
<string>&amp;Size</string>
628+
</property>
629+
<property name="buddy">
630+
<cstring>cboFontSizeField</cstring>
651631
</property>
652632
</widget>
653633
</item>
654-
<item row="2" column="1">
655-
<widget class="QComboBox" name="cboXOffsetField"/>
634+
<item row="4" column="1">
635+
<widget class="QComboBox" name="cboFontSizeField"/>
656636
</item>
657-
<item row="3" column="0">
658-
<widget class="QLabel" name="textLabel1_2_2_2">
637+
<item row="5" column="0">
638+
<widget class="QLabel" name="textLabel4_3_2_4">
659639
<property name="sizePolicy">
660640
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
661641
<horstretch>0</horstretch>
662642
<verstretch>0</verstretch>
663643
</sizepolicy>
664644
</property>
665645
<property name="text">
666-
<string>Y Offset (pts)</string>
646+
<string>Size units</string>
647+
</property>
648+
<property name="buddy">
649+
<cstring>cboFontSizeTypeField</cstring>
667650
</property>
668651
</widget>
669652
</item>
670-
<item row="3" column="1">
671-
<widget class="QComboBox" name="cboYOffsetField"/>
653+
<item row="5" column="1">
654+
<widget class="QComboBox" name="cboFontSizeTypeField"/>
672655
</item>
673-
</layout>
674-
</widget>
675-
</item>
676-
<item row="13" column="0">
677-
<widget class="QGroupBox" name="groupBox">
678-
<property name="title">
679-
<string>Data defined properties</string>
680-
</property>
681-
<layout class="QGridLayout" name="gridLayout_3">
682-
<item row="0" column="0">
683-
<widget class="QLabel" name="lblFont">
656+
<item row="6" column="0">
657+
<widget class="QLabel" name="textLabel4_3_2_3">
658+
<property name="enabled">
659+
<bool>false</bool>
660+
</property>
684661
<property name="sizePolicy">
685662
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
686663
<horstretch>0</horstretch>
687664
<verstretch>0</verstretch>
688665
</sizepolicy>
689666
</property>
690667
<property name="text">
691-
<string>&amp;Font family</string>
668+
<string>Transparency</string>
692669
</property>
693670
<property name="buddy">
694-
<cstring>cboFontField</cstring>
671+
<cstring>cboFontTransparencyField</cstring>
695672
</property>
696673
</widget>
697674
</item>
698-
<item row="0" column="1">
699-
<widget class="QComboBox" name="cboFontField"/>
675+
<item row="6" column="1">
676+
<widget class="QComboBox" name="cboFontTransparencyField">
677+
<property name="enabled">
678+
<bool>false</bool>
679+
</property>
680+
</widget>
700681
</item>
701-
<item row="1" column="0">
702-
<widget class="QLabel" name="textLabel4">
682+
<item row="7" column="0">
683+
<widget class="QLabel" name="textLabel4_3_2_5">
703684
<property name="sizePolicy">
704685
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
705686
<horstretch>0</horstretch>
706687
<verstretch>0</verstretch>
707688
</sizepolicy>
708689
</property>
709690
<property name="text">
710-
<string>&amp;Bold</string>
691+
<string>&amp;Color</string>
711692
</property>
712693
<property name="buddy">
713-
<cstring>cboBoldField</cstring>
694+
<cstring>cboFontColorField</cstring>
714695
</property>
715696
</widget>
716697
</item>
717-
<item row="1" column="1">
718-
<widget class="QComboBox" name="cboBoldField"/>
698+
<item row="7" column="1">
699+
<widget class="QComboBox" name="cboFontColorField"/>
719700
</item>
720-
<item row="2" column="0">
721-
<widget class="QLabel" name="textLabel4_2_4">
701+
</layout>
702+
</widget>
703+
</item>
704+
<item row="14" column="0">
705+
<widget class="QGroupBox" name="groupBox_6">
706+
<property name="title">
707+
<string>Data defined buffer</string>
708+
</property>
709+
<layout class="QGridLayout" name="gridLayout_5">
710+
<item row="0" column="0">
711+
<widget class="QLabel" name="textLabel1_3_2_2_2">
712+
<property name="enabled">
713+
<bool>false</bool>
714+
</property>
722715
<property name="sizePolicy">
723716
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
724717
<horstretch>0</horstretch>
725718
<verstretch>0</verstretch>
726719
</sizepolicy>
727720
</property>
721+
<property name="minimumSize">
722+
<size>
723+
<width>70</width>
724+
<height>0</height>
725+
</size>
726+
</property>
728727
<property name="text">
729-
<string>&amp;Italic</string>
728+
<string>Transparency:</string>
730729
</property>
731730
<property name="buddy">
732-
<cstring>cboItalicField</cstring>
731+
<cstring>cboBufferTransparencyField</cstring>
733732
</property>
734733
</widget>
735734
</item>
736-
<item row="2" column="1">
737-
<widget class="QComboBox" name="cboItalicField"/>
735+
<item row="0" column="1">
736+
<widget class="QComboBox" name="cboBufferTransparencyField">
737+
<property name="enabled">
738+
<bool>false</bool>
739+
</property>
740+
</widget>
738741
</item>
739-
<item row="3" column="0">
740-
<widget class="QLabel" name="textLabel4_3">
742+
<item row="1" column="0">
743+
<widget class="QLabel" name="textLabel4_3_2_2_2">
741744
<property name="sizePolicy">
742745
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
743746
<horstretch>0</horstretch>
744747
<verstretch>0</verstretch>
745748
</sizepolicy>
746749
</property>
747750
<property name="text">
748-
<string>&amp;Underline</string>
751+
<string>Size:</string>
749752
</property>
750753
<property name="buddy">
751-
<cstring>cboUnderlineField</cstring>
754+
<cstring>cboBufferSizeField</cstring>
752755
</property>
753756
</widget>
754757
</item>
755-
<item row="3" column="1">
756-
<widget class="QComboBox" name="cboUnderlineField"/>
758+
<item row="1" column="1">
759+
<widget class="QComboBox" name="cboBufferSizeField"/>
757760
</item>
758-
<item row="4" column="0">
759-
<widget class="QLabel" name="textLabel4_3_2">
761+
</layout>
762+
</widget>
763+
</item>
764+
<item row="15" column="0">
765+
<widget class="QGroupBox" name="groupBox_7">
766+
<property name="title">
767+
<string>Data defined position</string>
768+
</property>
769+
<layout class="QGridLayout" name="gridLayout_6">
770+
<item row="0" column="0">
771+
<widget class="QLabel" name="textLabel1_2">
760772
<property name="sizePolicy">
761773
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
762774
<horstretch>0</horstretch>
763775
<verstretch>0</verstretch>
764776
</sizepolicy>
765777
</property>
766778
<property name="text">
767-
<string>&amp;Size</string>
768-
</property>
769-
<property name="buddy">
770-
<cstring>cboFontSizeField</cstring>
779+
<string>X Coordinate</string>
771780
</property>
772781
</widget>
773782
</item>
774-
<item row="4" column="1">
775-
<widget class="QComboBox" name="cboFontSizeField"/>
783+
<item row="0" column="1">
784+
<widget class="QComboBox" name="cboXCoordinateField"/>
776785
</item>
777-
<item row="5" column="0">
778-
<widget class="QLabel" name="textLabel4_3_2_4">
786+
<item row="1" column="0">
787+
<widget class="QLabel" name="textLabel1_2_2">
779788
<property name="sizePolicy">
780789
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
781790
<horstretch>0</horstretch>
782791
<verstretch>0</verstretch>
783792
</sizepolicy>
784793
</property>
785794
<property name="text">
786-
<string>Size units</string>
787-
</property>
788-
<property name="buddy">
789-
<cstring>cboFontSizeTypeField</cstring>
795+
<string>Y Coordinate</string>
790796
</property>
791797
</widget>
792798
</item>
793-
<item row="5" column="1">
794-
<widget class="QComboBox" name="cboFontSizeTypeField"/>
799+
<item row="1" column="1">
800+
<widget class="QComboBox" name="cboYCoordinateField"/>
795801
</item>
796-
<item row="6" column="0">
797-
<widget class="QLabel" name="textLabel4_3_2_3">
798-
<property name="enabled">
799-
<bool>false</bool>
800-
</property>
802+
<item row="2" column="0">
803+
<widget class="QLabel" name="textLabel1_2_3">
801804
<property name="sizePolicy">
802805
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
803806
<horstretch>0</horstretch>
804807
<verstretch>0</verstretch>
805808
</sizepolicy>
806809
</property>
807810
<property name="text">
808-
<string>Transparency</string>
809-
</property>
810-
<property name="buddy">
811-
<cstring>cboFontTransparencyField</cstring>
811+
<string>X Offset (pts)</string>
812812
</property>
813813
</widget>
814814
</item>
815-
<item row="6" column="1">
816-
<widget class="QComboBox" name="cboFontTransparencyField">
817-
<property name="enabled">
818-
<bool>false</bool>
819-
</property>
820-
</widget>
815+
<item row="2" column="1">
816+
<widget class="QComboBox" name="cboXOffsetField"/>
821817
</item>
822-
<item row="7" column="0">
823-
<widget class="QLabel" name="textLabel4_3_2_5">
818+
<item row="3" column="0">
819+
<widget class="QLabel" name="textLabel1_2_2_2">
824820
<property name="sizePolicy">
825821
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
826822
<horstretch>0</horstretch>
827823
<verstretch>0</verstretch>
828824
</sizepolicy>
829825
</property>
830826
<property name="text">
831-
<string>&amp;Color</string>
832-
</property>
833-
<property name="buddy">
834-
<cstring>cboFontColorField</cstring>
827+
<string>Y Offset (pts)</string>
835828
</property>
836829
</widget>
837830
</item>
838-
<item row="7" column="1">
839-
<widget class="QComboBox" name="cboFontColorField"/>
831+
<item row="3" column="1">
832+
<widget class="QComboBox" name="cboYOffsetField"/>
840833
</item>
841834
</layout>
842835
</widget>
@@ -845,7 +838,7 @@
845838
</widget>
846839
</widget>
847840
</item>
848-
<item row="2" column="0" colspan="2">
841+
<item row="1" column="0">
849842
<widget class="QGroupBox" name="groupBox5">
850843
<property name="sizePolicy">
851844
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
@@ -880,12 +873,14 @@
880873
</widget>
881874
<layoutdefault spacing="6" margin="11"/>
882875
<tabstops>
876+
<tabstop>scrollArea</tabstop>
883877
<tabstop>cboLabelField</tabstop>
884878
<tabstop>leDefaultLabel</tabstop>
885879
<tabstop>btnDefaultFont</tabstop>
886880
<tabstop>spinFontSize</tabstop>
887881
<tabstop>pbnDefaultFontColor</tabstop>
888882
<tabstop>spinAngle</tabstop>
883+
<tabstop>chkUseMultiline</tabstop>
889884
<tabstop>radioAboveLeft</tabstop>
890885
<tabstop>radioAbove</tabstop>
891886
<tabstop>radioAboveRight</tabstop>
@@ -897,12 +892,35 @@
897892
<tabstop>radioBelowRight</tabstop>
898893
<tabstop>radioFontSizeUnitsPoints</tabstop>
899894
<tabstop>radioFontSizeUnitsMap</tabstop>
895+
<tabstop>chkUseScaleDependentRendering</tabstop>
900896
<tabstop>spinMinimumScale</tabstop>
901897
<tabstop>spinMaximumScale</tabstop>
902-
<tabstop>radioOffsetUnitsPoints</tabstop>
903-
<tabstop>radioOffsetUnitsMap</tabstop>
898+
<tabstop>chkUseBuffer</tabstop>
899+
<tabstop>pbnDefaultBufferColor_2</tabstop>
900+
<tabstop>spinBufferSize</tabstop>
904901
<tabstop>radioBufferUnitsPoints</tabstop>
905902
<tabstop>radioBufferUnitsMap</tabstop>
903+
<tabstop>spinBufferTransparency</tabstop>
904+
<tabstop>spinXOffset</tabstop>
905+
<tabstop>spinYOffset</tabstop>
906+
<tabstop>radioOffsetUnitsPoints</tabstop>
907+
<tabstop>radioOffsetUnitsMap</tabstop>
908+
<tabstop>cboAlignmentField</tabstop>
909+
<tabstop>cboAngleField</tabstop>
910+
<tabstop>cboFontField</tabstop>
911+
<tabstop>cboBoldField</tabstop>
912+
<tabstop>cboItalicField</tabstop>
913+
<tabstop>cboUnderlineField</tabstop>
914+
<tabstop>cboFontSizeField</tabstop>
915+
<tabstop>cboFontSizeTypeField</tabstop>
916+
<tabstop>cboFontTransparencyField</tabstop>
917+
<tabstop>cboFontColorField</tabstop>
918+
<tabstop>cboBufferTransparencyField</tabstop>
919+
<tabstop>cboBufferSizeField</tabstop>
920+
<tabstop>cboXCoordinateField</tabstop>
921+
<tabstop>cboYCoordinateField</tabstop>
922+
<tabstop>cboXOffsetField</tabstop>
923+
<tabstop>cboYOffsetField</tabstop>
906924
</tabstops>
907925
<resources/>
908926
<connections>

0 commit comments

Comments
 (0)
Please sign in to comment.