@@ -25,12 +25,12 @@ QgsScaleRangeWidget::QgsScaleRangeWidget( QWidget *parent )
25
25
mLayout = new QGridLayout ( this );
26
26
mLayout ->setContentsMargins ( 0 , 0 , 0 , 0 );
27
27
28
- QLabel* minLbl = new QLabel ( tr ( " Minimum\n (exclusive)" ), this );
28
+ QLabel* minLbl = new QLabel ( tr ( " Minimum (exclusive)" ), this );
29
29
minLbl->setWordWrap ( true );
30
30
minLbl->setAlignment ( Qt::AlignTop );
31
31
minLbl->setToolTip ( tr ( " Minimum scale, i.e. maximum scale denominator. "
32
32
" This limit is exclusive, that means the layer will not be displayed on this scale." ) );
33
- QLabel* maxLbl = new QLabel ( tr ( " Maximum\n (inclusive)" ), this );
33
+ QLabel* maxLbl = new QLabel ( tr ( " Maximum (inclusive)" ), this );
34
34
maxLbl->setWordWrap ( true );
35
35
maxLbl->setAlignment ( Qt::AlignTop );
36
36
maxLbl->setToolTip ( tr ( " Maximum scale, i.e. minimum scale denominator. "
@@ -51,19 +51,17 @@ QgsScaleRangeWidget::QgsScaleRangeWidget( QWidget *parent )
51
51
mMinimumScaleWidget ->setScale ( 1.0 / 100000 );
52
52
mMaximumScaleWidget ->setScale ( 1.0 / 1000 );
53
53
54
- mLayout ->addWidget ( minLbl, 0 , 0 , 2 , 1 );
55
- mLayout ->addWidget ( mMinimumScaleIconLabel , 0 , 1 );
56
- mLayout ->addWidget ( mMinimumScaleWidget , 0 , 2 );
57
- mLayout ->addWidget ( maxLbl, 0 , 3 , 2 , 1 );
58
- mLayout ->addWidget ( mMaximumScaleIconLabel , 0 , 4 );
59
- mLayout ->addWidget ( mMaximumScaleWidget , 0 , 5 );
54
+ mLayout ->addWidget ( minLbl, 0 , 0 , 1 , 2 );
55
+ mLayout ->addWidget ( mMinimumScaleIconLabel , 1 , 0 );
56
+ mLayout ->addWidget ( mMinimumScaleWidget , 1 , 1 );
57
+ mLayout ->addWidget ( maxLbl, 0 , 2 , 1 , 2 );
58
+ mLayout ->addWidget ( mMaximumScaleIconLabel , 1 , 2 );
59
+ mLayout ->addWidget ( mMaximumScaleWidget , 1 , 3 );
60
60
61
61
mLayout ->setColumnStretch ( 0 , 0 );
62
- mLayout ->setColumnStretch ( 1 , 0 );
63
- mLayout ->setColumnStretch ( 2 , 3 );
64
- mLayout ->setColumnStretch ( 3 , 0 );
65
- mLayout ->setColumnStretch ( 4 , 0 );
66
- mLayout ->setColumnStretch ( 5 , 3 );
62
+ mLayout ->setColumnStretch ( 1 , 3 );
63
+ mLayout ->setColumnStretch ( 2 , 0 );
64
+ mLayout ->setColumnStretch ( 3 , 3 );
67
65
68
66
connect ( mMinimumScaleWidget , SIGNAL ( scaleChanged ( double ) ), this , SLOT ( emitRangeChanged () ) );
69
67
connect ( mMaximumScaleWidget , SIGNAL ( scaleChanged ( double ) ), this , SLOT ( emitRangeChanged () ) );
0 commit comments