File tree Expand file tree Collapse file tree 3 files changed +9
-4
lines changed Expand file tree Collapse file tree 3 files changed +9
-4
lines changed Original file line number Diff line number Diff line change 17
17
#include " qgsapplication.h"
18
18
#include " qgsproject.h"
19
19
#include " qgsscalewidget.h"
20
+ #include " qgsguiutils.h"
20
21
21
22
QgsScaleRangeWidget::QgsScaleRangeWidget ( QWidget *parent )
22
23
: QWidget( parent )
@@ -36,10 +37,11 @@ QgsScaleRangeWidget::QgsScaleRangeWidget( QWidget *parent )
36
37
maxLbl->setToolTip ( tr ( " Maximum scale, i.e. most \" zoomed in\" . "
37
38
" This limit is inclusive, that means the layer will be displayed on this scale." ) );
38
39
40
+ const int iconSize = QgsGuiUtils::scaleIconSize ( 24 );
39
41
mMinimumScaleIconLabel = new QLabel ( this );
40
- mMinimumScaleIconLabel ->setPixmap ( QgsApplication::getThemePixmap ( QStringLiteral ( " /mActionZoomOut.svg" ) ) );
42
+ mMinimumScaleIconLabel ->setPixmap ( QgsApplication::getThemeIcon ( QStringLiteral ( " /mActionZoomOut.svg" ) ). pixmap ( QSize ( iconSize, iconSize ) ) );
41
43
mMaximumScaleIconLabel = new QLabel ( this );
42
- mMaximumScaleIconLabel ->setPixmap ( QgsApplication::getThemePixmap ( QStringLiteral ( " /mActionZoomIn.svg" ) ) );
44
+ mMaximumScaleIconLabel ->setPixmap ( QgsApplication::getThemeIcon ( QStringLiteral ( " /mActionZoomIn.svg" ) ). pixmap ( QSize ( iconSize, iconSize ) ) );
43
45
44
46
mMinimumScaleWidget = new QgsScaleWidget ( this );
45
47
mMaximumScaleWidget = new QgsScaleWidget ( this );
Original file line number Diff line number Diff line change @@ -83,6 +83,7 @@ void QgsTextFormatWidget::initWidget()
83
83
const int iconSize = QgsGuiUtils::scaleIconSize ( 20 );
84
84
mOptionsTab ->setIconSize ( QSize ( iconSize, iconSize ) );
85
85
const int iconSize32 = QgsGuiUtils::scaleIconSize ( 32 );
86
+ const int iconSize24 = QgsGuiUtils::scaleIconSize ( 24 );
86
87
const int iconSize18 = QgsGuiUtils::scaleIconSize ( 18 );
87
88
mPointOffsetAboveLeft ->setIconSize ( QSize ( iconSize32, iconSize18 ) );
88
89
mPointOffsetAbove ->setIconSize ( QSize ( iconSize32, iconSize18 ) );
@@ -93,6 +94,8 @@ void QgsTextFormatWidget::initWidget()
93
94
mPointOffsetBelowLeft ->setIconSize ( QSize ( iconSize32, iconSize18 ) );
94
95
mPointOffsetBelow ->setIconSize ( QSize ( iconSize32, iconSize18 ) );
95
96
mPointOffsetBelowRight ->setIconSize ( QSize ( iconSize32, iconSize18 ) );
97
+ mLabelMinScale ->setPixmap ( QgsApplication::getThemeIcon ( QStringLiteral ( " /mActionZoomOut.svg" ) ).pixmap ( QSize ( iconSize24, iconSize24 ) ) );
98
+ mLabelMaxScale ->setPixmap ( QgsApplication::getThemeIcon ( QStringLiteral ( " /mActionZoomIn.svg" ) ).pixmap ( QSize ( iconSize24, iconSize24 ) ) );
96
99
97
100
const int buttonSize = QgsGuiUtils::scaleIconSize ( 24 );
98
101
mFontUnderlineBtn ->setMinimumSize ( buttonSize, buttonSize );
Original file line number Diff line number Diff line change @@ -5482,7 +5482,7 @@ font-style: italic;</string>
5482
5482
</widget >
5483
5483
</item >
5484
5484
<item row =" 0" column =" 0" >
5485
- <widget class =" QLabel" name =" label " >
5485
+ <widget class =" QLabel" name =" mLabelMinScale " >
5486
5486
<property name =" toolTip" >
5487
5487
<string >Minimum scale, i.e. most " zoomed out" .</string >
5488
5488
</property >
@@ -5495,7 +5495,7 @@ font-style: italic;</string>
5495
5495
</widget >
5496
5496
</item >
5497
5497
<item row =" 1" column =" 0" >
5498
- <widget class =" QLabel" name =" label_11 " >
5498
+ <widget class =" QLabel" name =" mLabelMaxScale " >
5499
5499
<property name =" toolTip" >
5500
5500
<string >Maximum scale, i.e. most " zoomed in" .</string >
5501
5501
</property >
You can’t perform that action at this time.
0 commit comments