Skip to content

Commit 759a148

Browse files
nyalldawsonnyalldawson
committedDec 6, 2014
Flip all labelling spin boxes to QgsSpinBox/QgsDoubleSpinBox
·
ltr-3_40archive/master_2
1 parent 26e06e6 commit 759a148

File tree

3 files changed

+443
-120
lines changed

3 files changed

+443
-120
lines changed
 

‎src/app/qgslabelinggui.cpp

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,16 @@ QgsLabelingGui::QgsLabelingGui( QgsVectorLayer* layer, QgsMapCanvas* mapCanvas,
6464
mLineDistanceUnitWidget->setUnits( QStringList() << tr( "mm" ) << tr( "map units" ), 1 );
6565
mRepeatDistanceUnitWidget->setUnits( QStringList() << tr( "mm" ) << tr( "map units" ), 1 );
6666

67+
mFontLineHeightSpinBox->setClearValue( 1.0 );
68+
mShapeRotationDblSpnBx->setClearValue( 0.0 );
69+
mShapeOffsetXSpnBx->setClearValue( 0.0 );
70+
mShapeOffsetYSpnBx->setClearValue( 0.0 );
71+
mPointOffsetXSpinBox->setClearValue( 0.0 );
72+
mPointOffsetYSpinBox->setClearValue( 0.0 );
73+
mPointAngleSpinBox->setClearValue( 0.0 );
74+
mFontLetterSpacingSpinBox->setClearValue( 0.0 );
75+
mFontWordSpacingSpinBox->setClearValue( 0.0 );
76+
6777
mCharDlg = new QgsCharacterSelectorDialog( this );
6878

6979
mRefFont = lblFontPreview->font();

‎src/ui/qgslabelingguibase.ui

Lines changed: 364 additions & 70 deletions
Large diffs are not rendered by default.

‎src/ui/qgslabelpropertydialogbase.ui

Lines changed: 69 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,6 @@
5454
</property>
5555
</widget>
5656
</item>
57-
<item row="1" column="1">
58-
<widget class="QComboBox" name="mFontStyleCmbBx">
59-
<property name="toolTip">
60-
<string>Available typeface styles</string>
61-
</property>
62-
</widget>
63-
</item>
6457
<item row="2" column="1" colspan="2">
6558
<layout class="QHBoxLayout" name="horizontalLayout_4">
6659
<item>
@@ -231,13 +224,13 @@
231224
</widget>
232225
</item>
233226
<item>
234-
<widget class="QDoubleSpinBox" name="mFontSizeSpinBox">
235-
<property name="alignment">
236-
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
237-
</property>
227+
<widget class="QgsDoubleSpinBox" name="mFontSizeSpinBox">
238228
<property name="maximum">
239229
<double>999999.000000000000000</double>
240230
</property>
231+
<property name="showClearButton">
232+
<bool>false</bool>
233+
</property>
241234
</widget>
242235
</item>
243236
</layout>
@@ -267,6 +260,13 @@
267260
</property>
268261
</widget>
269262
</item>
263+
<item row="1" column="1" colspan="2">
264+
<widget class="QComboBox" name="mFontStyleCmbBx">
265+
<property name="toolTip">
266+
<string>Available typeface styles</string>
267+
</property>
268+
</widget>
269+
</item>
270270
</layout>
271271
</widget>
272272
</item>
@@ -292,10 +292,7 @@
292292
</widget>
293293
</item>
294294
<item>
295-
<widget class="QSpinBox" name="mMinScaleSpinBox">
296-
<property name="alignment">
297-
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
298-
</property>
295+
<widget class="QgsSpinBox" name="mMinScaleSpinBox">
299296
<property name="prefix">
300297
<string>Min </string>
301298
</property>
@@ -305,13 +302,13 @@
305302
<property name="maximum">
306303
<number>999999999</number>
307304
</property>
305+
<property name="showClearButton">
306+
<bool>false</bool>
307+
</property>
308308
</widget>
309309
</item>
310310
<item>
311-
<widget class="QSpinBox" name="mMaxScaleSpinBox">
312-
<property name="alignment">
313-
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
314-
</property>
311+
<widget class="QgsSpinBox" name="mMaxScaleSpinBox">
315312
<property name="prefix">
316313
<string>Max </string>
317314
</property>
@@ -324,6 +321,9 @@
324321
<property name="value">
325322
<number>10000000</number>
326323
</property>
324+
<property name="showClearButton">
325+
<bool>false</bool>
326+
</property>
327327
</widget>
328328
</item>
329329
</layout>
@@ -370,13 +370,13 @@
370370
</widget>
371371
</item>
372372
<item>
373-
<widget class="QDoubleSpinBox" name="mBufferSizeSpinBox">
374-
<property name="alignment">
375-
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
376-
</property>
373+
<widget class="QgsDoubleSpinBox" name="mBufferSizeSpinBox">
377374
<property name="maximum">
378375
<double>999999.000000000000000</double>
379376
</property>
377+
<property name="showClearButton">
378+
<bool>false</bool>
379+
</property>
380380
</widget>
381381
</item>
382382
</layout>
@@ -429,11 +429,7 @@
429429
</widget>
430430
</item>
431431
<item row="0" column="1">
432-
<widget class="QDoubleSpinBox" name="mLabelDistanceSpinBox">
433-
<property name="alignment">
434-
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
435-
</property>
436-
</widget>
432+
<widget class="QgsDoubleSpinBox" name="mLabelDistanceSpinBox"/>
437433
</item>
438434
<item row="1" column="0">
439435
<widget class="QLabel" name="mXCoordLabel">
@@ -449,16 +445,16 @@
449445
</widget>
450446
</item>
451447
<item row="1" column="1">
452-
<widget class="QDoubleSpinBox" name="mXCoordSpinBox">
453-
<property name="alignment">
454-
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
455-
</property>
448+
<widget class="QgsDoubleSpinBox" name="mXCoordSpinBox">
456449
<property name="minimum">
457450
<double>-999999999.000000000000000</double>
458451
</property>
459452
<property name="maximum">
460453
<double>999999999.000000000000000</double>
461454
</property>
455+
<property name="showClearButton">
456+
<bool>false</bool>
457+
</property>
462458
</widget>
463459
</item>
464460
<item row="2" column="0">
@@ -475,16 +471,16 @@
475471
</widget>
476472
</item>
477473
<item row="2" column="1">
478-
<widget class="QDoubleSpinBox" name="mYCoordSpinBox">
479-
<property name="alignment">
480-
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
481-
</property>
474+
<widget class="QgsDoubleSpinBox" name="mYCoordSpinBox">
482475
<property name="minimum">
483476
<double>-999999999.000000000000000</double>
484477
</property>
485478
<property name="maximum">
486479
<double>999999999.000000000000000</double>
487480
</property>
481+
<property name="showClearButton">
482+
<bool>false</bool>
483+
</property>
488484
</widget>
489485
</item>
490486
<item row="3" column="0">
@@ -501,11 +497,7 @@
501497
</widget>
502498
</item>
503499
<item row="3" column="1">
504-
<widget class="QComboBox" name="mHaliComboBox">
505-
<property name="layoutDirection">
506-
<enum>Qt::RightToLeft</enum>
507-
</property>
508-
</widget>
500+
<widget class="QComboBox" name="mHaliComboBox"/>
509501
</item>
510502
<item row="4" column="0">
511503
<widget class="QLabel" name="mValiLabel">
@@ -521,11 +513,7 @@
521513
</widget>
522514
</item>
523515
<item row="4" column="1">
524-
<widget class="QComboBox" name="mValiComboBox">
525-
<property name="layoutDirection">
526-
<enum>Qt::RightToLeft</enum>
527-
</property>
528-
</widget>
516+
<widget class="QComboBox" name="mValiComboBox"/>
529517
</item>
530518
<item row="5" column="0">
531519
<widget class="QLabel" name="mRotationLabel">
@@ -541,10 +529,7 @@
541529
</widget>
542530
</item>
543531
<item row="5" column="1">
544-
<widget class="QDoubleSpinBox" name="mRotationSpinBox">
545-
<property name="alignment">
546-
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
547-
</property>
532+
<widget class="QgsDoubleSpinBox" name="mRotationSpinBox">
548533
<property name="maximum">
549534
<double>360.000000000000000</double>
550535
</property>
@@ -571,7 +556,41 @@
571556
<extends>QToolButton</extends>
572557
<header>qgscolorbuttonv2.h</header>
573558
</customwidget>
559+
<customwidget>
560+
<class>QgsDoubleSpinBox</class>
561+
<extends>QDoubleSpinBox</extends>
562+
<header>qgsdoublespinbox.h</header>
563+
</customwidget>
564+
<customwidget>
565+
<class>QgsSpinBox</class>
566+
<extends>QSpinBox</extends>
567+
<header>qgsspinbox.h</header>
568+
</customwidget>
574569
</customwidgets>
570+
<tabstops>
571+
<tabstop>mLabelTextLineEdit</tabstop>
572+
<tabstop>mShowLabelChkbx</tabstop>
573+
<tabstop>mMinScaleSpinBox</tabstop>
574+
<tabstop>mMaxScaleSpinBox</tabstop>
575+
<tabstop>mAlwaysShowChkbx</tabstop>
576+
<tabstop>mFontFamilyCmbBx</tabstop>
577+
<tabstop>mFontStyleCmbBx</tabstop>
578+
<tabstop>mFontUnderlineBtn</tabstop>
579+
<tabstop>mFontStrikethroughBtn</tabstop>
580+
<tabstop>mFontBoldBtn</tabstop>
581+
<tabstop>mFontItalicBtn</tabstop>
582+
<tabstop>mFontSizeSpinBox</tabstop>
583+
<tabstop>mFontColorButton</tabstop>
584+
<tabstop>mBufferSizeSpinBox</tabstop>
585+
<tabstop>mBufferColorButton</tabstop>
586+
<tabstop>mLabelDistanceSpinBox</tabstop>
587+
<tabstop>mXCoordSpinBox</tabstop>
588+
<tabstop>mYCoordSpinBox</tabstop>
589+
<tabstop>mHaliComboBox</tabstop>
590+
<tabstop>mValiComboBox</tabstop>
591+
<tabstop>mRotationSpinBox</tabstop>
592+
<tabstop>buttonBox</tabstop>
593+
</tabstops>
575594
<resources/>
576595
<connections>
577596
<connection>

0 commit comments

Comments
 (0)
Please sign in to comment.