Skip to content

Commit 63ab9a5

Browse files
author
jef
committedJan 23, 2010
pack label dialog
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@12825 c8812cc2-4d05-0410-92ff-de0c093fc19c
·
final-1_7_1final-1_7_0
1 parent 4c9b4a0 commit 63ab9a5

File tree

2 files changed

+214
-283
lines changed

2 files changed

+214
-283
lines changed
 

‎src/app/qgslabeldialog.cpp

Lines changed: 11 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ QgsLabelDialog::QgsLabelDialog( QgsLabel *label, QWidget *parent )
4848

4949
connect( btnDefaultFont, SIGNAL( clicked() ),
5050
this, SLOT( changeFont() ) );
51-
connect( pbnDefaultBufferColor_2, SIGNAL( clicked() ),
51+
connect( pbnDefaultBufferColor, SIGNAL( clicked() ),
5252
this, SLOT( changeBufferColor() ) );
5353
connect( pbnDefaultFontColor, SIGNAL( clicked() ),
5454
this, SLOT( changeFontColor() ) );
@@ -165,19 +165,12 @@ void QgsLabelDialog::init( )
165165
mFont.setPointSizeF( myLabelAttributes->size() );
166166

167167
int myTypeInt = myLabelAttributes->sizeType();
168-
if ( myTypeInt == QgsLabelAttributes::PointUnits )
169-
{
170-
radioFontSizeUnitsPoints->setChecked( true );
171-
}
172-
else //assume map units is checked
173-
{
174-
radioFontSizeUnitsMap->setChecked( true );
175-
}
168+
cboFontSizeUnits->setCurrentIndex( myTypeInt == QgsLabelAttributes::PointUnits ? 0 : 1 );
176169
}
177170
else //defaults for when no size has been set
178171
{
179172
mFont.setPointSizeF( myLabelAttributes->size() );
180-
radioFontSizeUnitsPoints->setChecked( true );
173+
cboFontSizeUnits->setCurrentIndex( 0 );
181174
}
182175

183176
spinFontSize->setValue( myLabelAttributes->size() );
@@ -220,19 +213,13 @@ void QgsLabelDialog::init( )
220213
if ( myLabelAttributes->offsetIsSet() )
221214
{
222215
int myTypeInt = myLabelAttributes->offsetType();
223-
if ( myTypeInt == QgsLabelAttributes::PointUnits )
224-
{
225-
radioOffsetUnitsPoints->setChecked( true );
226-
}
227-
else
228-
{
229-
radioOffsetUnitsMap->setChecked( true );
230-
}
216+
cboOffsetUnits->setCurrentIndex( myTypeInt == QgsLabelAttributes::PointUnits ? 0 : 1 );
231217
spinXOffset->setValue( myLabelAttributes->xOffset() );
232218
spinYOffset->setValue( myLabelAttributes->yOffset() );
233219
}
234220
else //defaults for when no offset is defined
235221
{
222+
cboOffsetUnits->setCurrentIndex( 0 );
236223
spinXOffset->setValue( 0 );
237224
spinYOffset->setValue( 0 );
238225
}
@@ -267,18 +254,12 @@ void QgsLabelDialog::init( )
267254
if ( myLabelAttributes->bufferSizeIsSet() )
268255
{
269256
int myTypeInt = myLabelAttributes->bufferSizeType();
270-
if ( myTypeInt == QgsLabelAttributes::PointUnits )
271-
{
272-
radioBufferUnitsPoints->setChecked( true );
273-
}
274-
else
275-
{
276-
radioBufferUnitsMap->setChecked( true );
277-
}
257+
cboBufferSizeUnits->setCurrentIndex( myTypeInt == QgsLabelAttributes::PointUnits ? 0 : 1 );
278258
spinBufferSize->setValue( myLabelAttributes->bufferSize() );
279259
}
280260
else //defaults for when no offset is defined
281261
{
262+
cboBufferSizeUnits->setCurrentIndex( 0 );
282263
spinBufferSize->setValue( 1 );
283264
}
284265
//set the state of the multiline enabled checkbox
@@ -343,8 +324,7 @@ void QgsLabelDialog::changeBufferColor( void )
343324

344325
int QgsLabelDialog::itemNoForField( QString theFieldName, QStringList theFieldList )
345326
{
346-
int myItemInt = 0;
347-
for ( QStringList::Iterator it = theFieldList.begin(); it != theFieldList.end(); ++it )
327+
int myItemInt = 0; for ( QStringList::Iterator it = theFieldList.begin(); it != theFieldList.end(); ++it )
348328
{
349329
if ( theFieldName == *it ) return myItemInt;
350330
++myItemInt;
@@ -367,30 +347,14 @@ void QgsLabelDialog::apply()
367347
QgsLabelAttributes * myLabelAttributes = mLabel->labelAttributes();
368348
myLabelAttributes->setText( leDefaultLabel->text() );
369349
myLabelAttributes->setFamily( mFont.family() );
370-
int myTypeInt = 0;
371-
if ( radioFontSizeUnitsPoints->isChecked() )
372-
{
373-
myTypeInt = QgsLabelAttributes::PointUnits;
374-
}
375-
else //assume map units is checked
376-
{
377-
myTypeInt = QgsLabelAttributes::MapUnits;
378-
}
350+
int myTypeInt = cboFontSizeUnits->currentIndex() == 0 ? QgsLabelAttributes::PointUnits : QgsLabelAttributes::MapUnits;
379351
myLabelAttributes->setSize( mFont.pointSizeF(), myTypeInt );
380352
myLabelAttributes->setBold( mFont.bold() );
381353
myLabelAttributes->setItalic( mFont.italic() );
382354
myLabelAttributes->setUnderline( mFont.underline() );
383355
myLabelAttributes->setStrikeOut( mFont.strikeOut() );
384356
myLabelAttributes->setColor( mFontColor );
385-
myTypeInt = 0;
386-
if ( radioOffsetUnitsPoints->isChecked() )
387-
{
388-
myTypeInt = QgsLabelAttributes::PointUnits;
389-
}
390-
else
391-
{
392-
myTypeInt = QgsLabelAttributes::MapUnits;
393-
}
357+
myTypeInt = cboOffsetUnits->currentIndex() == 0 ? QgsLabelAttributes::PointUnits : QgsLabelAttributes::MapUnits;
394358
myLabelAttributes->setOffset( spinXOffset->value(), spinYOffset->value(), myTypeInt );
395359
myLabelAttributes->setAutoAngle( spinAngle->value() == -1 );
396360
myLabelAttributes->setAngle( spinAngle->value() );
@@ -411,15 +375,7 @@ void QgsLabelDialog::apply()
411375
myLabelAttributes->setMultilineEnabled( chkUseMultiline->isChecked() );
412376
myLabelAttributes->setBufferEnabled( chkUseBuffer->isChecked() );
413377
myLabelAttributes->setBufferColor( mBufferColor );
414-
myTypeInt = 0;
415-
if ( radioBufferUnitsPoints->isChecked() )
416-
{
417-
myTypeInt = QgsLabelAttributes::PointUnits;
418-
}
419-
else
420-
{
421-
myTypeInt = QgsLabelAttributes::MapUnits;
422-
}
378+
myTypeInt = cboBufferSizeUnits->currentIndex() == 0 ? QgsLabelAttributes::PointUnits : QgsLabelAttributes::MapUnits;
423379
myLabelAttributes->setBufferSize( spinBufferSize->value(), myTypeInt );
424380
//TODO - transparency attributes for buffers
425381

‎src/ui/qgslabeldialogbase.ui

Lines changed: 203 additions & 228 deletions
Original file line numberDiff line numberDiff line change
@@ -43,157 +43,11 @@
4343
<rect>
4444
<x>0</x>
4545
<y>0</y>
46-
<width>526</width>
47-
<height>740</height>
46+
<width>525</width>
47+
<height>512</height>
4848
</rect>
4949
</property>
5050
<layout class="QGridLayout" name="gridLayout_2">
51-
<item row="0" column="0">
52-
<widget class="QGroupBox" name="groupBox_8">
53-
<property name="title">
54-
<string>Basic label options</string>
55-
</property>
56-
<layout class="QGridLayout" name="gridLayout_8">
57-
<item row="0" column="0">
58-
<widget class="QLabel" name="textLabel5">
59-
<property name="text">
60-
<string>Field containing label</string>
61-
</property>
62-
<property name="buddy">
63-
<cstring>cboLabelField</cstring>
64-
</property>
65-
</widget>
66-
</item>
67-
<item row="0" column="2">
68-
<widget class="QComboBox" name="cboLabelField">
69-
<property name="sizePolicy">
70-
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
71-
<horstretch>1</horstretch>
72-
<verstretch>0</verstretch>
73-
</sizepolicy>
74-
</property>
75-
</widget>
76-
</item>
77-
<item row="1" column="0">
78-
<widget class="QLabel" name="textLabel1">
79-
<property name="text">
80-
<string>Default label</string>
81-
</property>
82-
<property name="buddy">
83-
<cstring>leDefaultLabel</cstring>
84-
</property>
85-
</widget>
86-
</item>
87-
<item row="1" column="2">
88-
<widget class="QLineEdit" name="leDefaultLabel">
89-
<property name="sizePolicy">
90-
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
91-
<horstretch>2</horstretch>
92-
<verstretch>0</verstretch>
93-
</sizepolicy>
94-
</property>
95-
</widget>
96-
</item>
97-
<item row="2" column="0">
98-
<widget class="QPushButton" name="btnDefaultFont">
99-
<property name="sizePolicy">
100-
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
101-
<horstretch>2</horstretch>
102-
<verstretch>0</verstretch>
103-
</sizepolicy>
104-
</property>
105-
<property name="text">
106-
<string>Font</string>
107-
</property>
108-
</widget>
109-
</item>
110-
<item row="2" column="1">
111-
<widget class="QLabel" name="textLabel5_2_2_3_2">
112-
<property name="text">
113-
<string>Font size</string>
114-
</property>
115-
<property name="alignment">
116-
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
117-
</property>
118-
<property name="buddy">
119-
<cstring>spinFontSize</cstring>
120-
</property>
121-
</widget>
122-
</item>
123-
<item row="2" column="2">
124-
<widget class="QDoubleSpinBox" name="spinFontSize">
125-
<property name="sizePolicy">
126-
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
127-
<horstretch>0</horstretch>
128-
<verstretch>0</verstretch>
129-
</sizepolicy>
130-
</property>
131-
<property name="minimumSize">
132-
<size>
133-
<width>50</width>
134-
<height>0</height>
135-
</size>
136-
</property>
137-
<property name="decimals">
138-
<number>6</number>
139-
</property>
140-
<property name="maximum">
141-
<double>1000000.000000000000000</double>
142-
</property>
143-
<property name="value">
144-
<double>0.000000000000000</double>
145-
</property>
146-
</widget>
147-
</item>
148-
<item row="3" column="0">
149-
<widget class="QPushButton" name="pbnDefaultFontColor">
150-
<property name="sizePolicy">
151-
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
152-
<horstretch>2</horstretch>
153-
<verstretch>0</verstretch>
154-
</sizepolicy>
155-
</property>
156-
<property name="text">
157-
<string>Color</string>
158-
</property>
159-
</widget>
160-
</item>
161-
<item row="3" column="1">
162-
<widget class="QLabel" name="textLabel1_2_2_2_2_2">
163-
<property name="text">
164-
<string>Angle (deg)</string>
165-
</property>
166-
<property name="buddy">
167-
<cstring>spinAngle</cstring>
168-
</property>
169-
</widget>
170-
</item>
171-
<item row="3" column="2">
172-
<widget class="QSpinBox" name="spinAngle">
173-
<property name="suffix">
174-
<string>°</string>
175-
</property>
176-
<property name="maximum">
177-
<number>360</number>
178-
</property>
179-
<property name="value">
180-
<number>0</number>
181-
</property>
182-
</widget>
183-
</item>
184-
<item row="4" column="0">
185-
<widget class="QCheckBox" name="chkUseMultiline">
186-
<property name="text">
187-
<string>Multiline labels?</string>
188-
</property>
189-
<property name="checked">
190-
<bool>true</bool>
191-
</property>
192-
</widget>
193-
</item>
194-
</layout>
195-
</widget>
196-
</item>
19751
<item row="1" column="0">
19852
<widget class="QGroupBox" name="groupBox_2">
19953
<property name="title">
@@ -341,37 +195,28 @@
341195
<item row="1" column="1">
342196
<widget class="QDoubleSpinBox" name="spinBufferSize"/>
343197
</item>
344-
<item row="2" column="0">
345-
<widget class="QRadioButton" name="radioBufferUnitsPoints">
346-
<property name="text">
347-
<string>Size is in points</string>
348-
</property>
349-
</widget>
350-
</item>
351-
<item row="2" column="1">
352-
<widget class="QRadioButton" name="radioBufferUnitsMap">
353-
<property name="text">
354-
<string>Size is in map units</string>
355-
</property>
356-
</widget>
357-
</item>
358-
<item row="3" column="0">
359-
<widget class="QLabel" name="textLabel5_2_2_3">
360-
<property name="enabled">
361-
<bool>false</bool>
362-
</property>
198+
<item row="1" column="2">
199+
<widget class="QComboBox" name="cboBufferSizeUnits">
200+
<item>
201+
<property name="text">
202+
<string>In points</string>
203+
</property>
204+
</item>
205+
<item>
206+
<property name="text">
207+
<string>In map units</string>
208+
</property>
209+
</item>
210+
</widget>
211+
</item>
212+
<item row="1" column="3">
213+
<widget class="QPushButton" name="pbnDefaultBufferColor">
363214
<property name="text">
364-
<string>Transparency</string>
365-
</property>
366-
<property name="alignment">
367-
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
368-
</property>
369-
<property name="buddy">
370-
<cstring>spinBufferTransparency</cstring>
215+
<string>Color</string>
371216
</property>
372217
</widget>
373218
</item>
374-
<item row="3" column="1">
219+
<item row="1" column="4">
375220
<widget class="QSpinBox" name="spinBufferTransparency">
376221
<property name="enabled">
377222
<bool>false</bool>
@@ -391,6 +236,9 @@
391236
<property name="suffix">
392237
<string>%</string>
393238
</property>
239+
<property name="prefix">
240+
<string>Transparency </string>
241+
</property>
394242
<property name="maximum">
395243
<number>100</number>
396244
</property>
@@ -399,82 +247,212 @@
399247
</property>
400248
</widget>
401249
</item>
402-
<item row="0" column="1">
403-
<widget class="QPushButton" name="pbnDefaultBufferColor_2">
404-
<property name="text">
405-
<string>Color</string>
406-
</property>
407-
</widget>
408-
</item>
409250
</layout>
410251
</widget>
411252
</item>
412253
<item row="4" column="0">
413-
<widget class="QGroupBox" name="groupBox_3">
254+
<widget class="QGroupBox" name="buttonGroup10">
414255
<property name="title">
415-
<string>Font size units</string>
256+
<string>Offset</string>
416257
</property>
417-
<layout class="QGridLayout" name="gridLayout_3">
258+
<layout class="QGridLayout" name="gridLayout_4">
418259
<item row="0" column="0">
419-
<widget class="QRadioButton" name="radioFontSizeUnitsPoints">
420-
<property name="text">
421-
<string>Points</string>
260+
<widget class="QDoubleSpinBox" name="spinXOffset">
261+
<property name="prefix">
262+
<string>X offset </string>
263+
</property>
264+
<property name="suffix">
265+
<string/>
266+
</property>
267+
<property name="minimum">
268+
<double>-99.000000000000000</double>
422269
</property>
423270
</widget>
424271
</item>
425272
<item row="0" column="1">
426-
<widget class="QRadioButton" name="radioFontSizeUnitsMap">
427-
<property name="text">
428-
<string>Map units</string>
273+
<widget class="QDoubleSpinBox" name="spinYOffset">
274+
<property name="prefix">
275+
<string>Y offset </string>
276+
</property>
277+
<property name="suffix">
278+
<string/>
279+
</property>
280+
<property name="minimum">
281+
<double>-99.000000000000000</double>
429282
</property>
430283
</widget>
431284
</item>
285+
<item row="0" column="2">
286+
<widget class="QComboBox" name="cboOffsetUnits">
287+
<item>
288+
<property name="text">
289+
<string>In points</string>
290+
</property>
291+
</item>
292+
<item>
293+
<property name="text">
294+
<string>In map units</string>
295+
</property>
296+
</item>
297+
</widget>
298+
</item>
432299
</layout>
433300
</widget>
434301
</item>
435-
<item row="5" column="0">
436-
<widget class="QGroupBox" name="buttonGroup10">
302+
<item row="0" column="0">
303+
<widget class="QGroupBox" name="groupBox_8">
437304
<property name="title">
438-
<string>Offset units</string>
305+
<string>Basic label options</string>
439306
</property>
440-
<layout class="QGridLayout" name="gridLayout_4">
307+
<layout class="QGridLayout" name="gridLayout_8">
441308
<item row="0" column="0">
442-
<widget class="QRadioButton" name="radioOffsetUnitsPoints">
309+
<widget class="QLabel" name="textLabel5">
443310
<property name="text">
444-
<string>Points</string>
311+
<string>Field containing label</string>
312+
</property>
313+
<property name="buddy">
314+
<cstring>cboLabelField</cstring>
445315
</property>
446316
</widget>
447317
</item>
448-
<item row="0" column="1">
449-
<widget class="QRadioButton" name="radioOffsetUnitsMap">
450-
<property name="text">
451-
<string>Map units</string>
318+
<item row="0" column="1" colspan="3">
319+
<widget class="QComboBox" name="cboLabelField">
320+
<property name="sizePolicy">
321+
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
322+
<horstretch>1</horstretch>
323+
<verstretch>0</verstretch>
324+
</sizepolicy>
452325
</property>
453326
</widget>
454327
</item>
455328
<item row="1" column="0">
456-
<widget class="QDoubleSpinBox" name="spinXOffset">
457-
<property name="prefix">
458-
<string>X offset </string>
329+
<widget class="QLabel" name="textLabel1">
330+
<property name="text">
331+
<string>Default label</string>
459332
</property>
460-
<property name="suffix">
461-
<string> points</string>
333+
<property name="buddy">
334+
<cstring>leDefaultLabel</cstring>
462335
</property>
463-
<property name="minimum">
464-
<double>-99.000000000000000</double>
336+
</widget>
337+
</item>
338+
<item row="1" column="1" colspan="3">
339+
<widget class="QLineEdit" name="leDefaultLabel">
340+
<property name="sizePolicy">
341+
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
342+
<horstretch>2</horstretch>
343+
<verstretch>0</verstretch>
344+
</sizepolicy>
465345
</property>
466346
</widget>
467347
</item>
468-
<item row="1" column="1">
469-
<widget class="QDoubleSpinBox" name="spinYOffset">
470-
<property name="prefix">
471-
<string>Y offset </string>
348+
<item row="3" column="0">
349+
<widget class="QLabel" name="textLabel5_2_2_3_2">
350+
<property name="text">
351+
<string>Font size</string>
352+
</property>
353+
<property name="alignment">
354+
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
355+
</property>
356+
<property name="buddy">
357+
<cstring>spinFontSize</cstring>
358+
</property>
359+
</widget>
360+
</item>
361+
<item row="6" column="0">
362+
<widget class="QLabel" name="textLabel1_2_2_2_2_2">
363+
<property name="text">
364+
<string>Angle (deg)</string>
365+
</property>
366+
<property name="buddy">
367+
<cstring>spinAngle</cstring>
368+
</property>
369+
</widget>
370+
</item>
371+
<item row="3" column="1">
372+
<widget class="QDoubleSpinBox" name="spinFontSize">
373+
<property name="sizePolicy">
374+
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
375+
<horstretch>0</horstretch>
376+
<verstretch>0</verstretch>
377+
</sizepolicy>
378+
</property>
379+
<property name="minimumSize">
380+
<size>
381+
<width>50</width>
382+
<height>0</height>
383+
</size>
472384
</property>
385+
<property name="decimals">
386+
<number>6</number>
387+
</property>
388+
<property name="maximum">
389+
<double>1000000.000000000000000</double>
390+
</property>
391+
<property name="value">
392+
<double>0.000000000000000</double>
393+
</property>
394+
</widget>
395+
</item>
396+
<item row="6" column="1">
397+
<widget class="QSpinBox" name="spinAngle">
473398
<property name="suffix">
474-
<string> points</string>
399+
<string>°</string>
475400
</property>
476-
<property name="minimum">
477-
<double>-99.000000000000000</double>
401+
<property name="maximum">
402+
<number>360</number>
403+
</property>
404+
<property name="value">
405+
<number>0</number>
406+
</property>
407+
</widget>
408+
</item>
409+
<item row="3" column="2">
410+
<widget class="QComboBox" name="cboFontSizeUnits">
411+
<item>
412+
<property name="text">
413+
<string>In points</string>
414+
</property>
415+
</item>
416+
<item>
417+
<property name="text">
418+
<string>In map units</string>
419+
</property>
420+
</item>
421+
</widget>
422+
</item>
423+
<item row="6" column="2">
424+
<widget class="QCheckBox" name="chkUseMultiline">
425+
<property name="text">
426+
<string>Multiline labels?</string>
427+
</property>
428+
<property name="checked">
429+
<bool>true</bool>
430+
</property>
431+
</widget>
432+
</item>
433+
<item row="3" column="3">
434+
<widget class="QPushButton" name="btnDefaultFont">
435+
<property name="sizePolicy">
436+
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
437+
<horstretch>2</horstretch>
438+
<verstretch>0</verstretch>
439+
</sizepolicy>
440+
</property>
441+
<property name="text">
442+
<string>Font</string>
443+
</property>
444+
</widget>
445+
</item>
446+
<item row="6" column="3">
447+
<widget class="QPushButton" name="pbnDefaultFontColor">
448+
<property name="sizePolicy">
449+
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
450+
<horstretch>2</horstretch>
451+
<verstretch>0</verstretch>
452+
</sizepolicy>
453+
</property>
454+
<property name="text">
455+
<string>Color</string>
478456
</property>
479457
</widget>
480458
</item>
@@ -505,8 +483,8 @@
505483
<rect>
506484
<x>0</x>
507485
<y>0</y>
508-
<width>621</width>
509-
<height>684</height>
486+
<width>525</width>
487+
<height>623</height>
510488
</rect>
511489
</property>
512490
<layout class="QGridLayout" name="gridLayout_7">
@@ -904,16 +882,17 @@
904882
<tabstop>scrollArea</tabstop>
905883
<tabstop>cboLabelField</tabstop>
906884
<tabstop>leDefaultLabel</tabstop>
907-
<tabstop>btnDefaultFont</tabstop>
908885
<tabstop>spinFontSize</tabstop>
909-
<tabstop>pbnDefaultFontColor</tabstop>
886+
<tabstop>cboFontSizeUnits</tabstop>
887+
<tabstop>btnDefaultFont</tabstop>
910888
<tabstop>spinAngle</tabstop>
911889
<tabstop>chkUseMultiline</tabstop>
890+
<tabstop>pbnDefaultFontColor</tabstop>
891+
<tabstop>radioOver</tabstop>
912892
<tabstop>radioAboveLeft</tabstop>
913893
<tabstop>radioAbove</tabstop>
914894
<tabstop>radioAboveRight</tabstop>
915895
<tabstop>radioLeft</tabstop>
916-
<tabstop>radioOver</tabstop>
917896
<tabstop>radioRight</tabstop>
918897
<tabstop>radioBelowLeft</tabstop>
919898
<tabstop>radioBelow</tabstop>
@@ -922,18 +901,13 @@
922901
<tabstop>leMinimumScale</tabstop>
923902
<tabstop>leMaximumScale</tabstop>
924903
<tabstop>chkUseBuffer</tabstop>
925-
<tabstop>pbnDefaultBufferColor_2</tabstop>
926904
<tabstop>spinBufferSize</tabstop>
927-
<tabstop>radioBufferUnitsPoints</tabstop>
928-
<tabstop>radioBufferUnitsMap</tabstop>
905+
<tabstop>cboBufferSizeUnits</tabstop>
906+
<tabstop>pbnDefaultBufferColor</tabstop>
929907
<tabstop>spinBufferTransparency</tabstop>
930-
<tabstop>radioFontSizeUnitsPoints</tabstop>
931-
<tabstop>radioFontSizeUnitsMap</tabstop>
932-
<tabstop>radioOffsetUnitsPoints</tabstop>
933-
<tabstop>radioOffsetUnitsMap</tabstop>
934908
<tabstop>spinXOffset</tabstop>
935909
<tabstop>spinYOffset</tabstop>
936-
<tabstop>scrollArea_2</tabstop>
910+
<tabstop>cboOffsetUnits</tabstop>
937911
<tabstop>cboAlignmentField</tabstop>
938912
<tabstop>cboAngleField</tabstop>
939913
<tabstop>cboFontField</tabstop>
@@ -950,6 +924,7 @@
950924
<tabstop>cboYCoordinateField</tabstop>
951925
<tabstop>cboXOffsetField</tabstop>
952926
<tabstop>cboYOffsetField</tabstop>
927+
<tabstop>scrollArea_2</tabstop>
953928
</tabstops>
954929
<resources/>
955930
<connections/>

0 commit comments

Comments
 (0)
Please sign in to comment.