Skip to content

Commit 75f91e5

Browse files
DelazJnyalldawson
authored andcommittedMar 1, 2018
Add missing caption and some tweaks to map units dialog
1 parent 7459539 commit 75f91e5

File tree

2 files changed

+30
-13
lines changed

2 files changed

+30
-13
lines changed
 

‎src/gui/qgsunitselectionwidget.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -278,6 +278,7 @@ QgsMapUnitScaleDialog::QgsMapUnitScaleDialog( QWidget *parent )
278278
connect( bbox, &QDialogButtonBox::rejected, this, &QgsMapUnitScaleDialog::reject );
279279
vLayout->addWidget( bbox );
280280
setLayout( vLayout );
281+
setWindowTitle( tr( "Adjust Scaling Range" ) );
281282
}
282283

283284
QgsMapUnitScale QgsMapUnitScaleDialog::getMapUnitScale() const

‎src/ui/qgsmapunitscalewidgetbase.ui

Lines changed: 29 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
<rect>
77
<x>0</x>
88
<y>0</y>
9-
<width>316</width>
10-
<height>276</height>
9+
<width>285</width>
10+
<height>233</height>
1111
</rect>
1212
</property>
1313
<property name="windowTitle">
@@ -18,16 +18,7 @@
1818
<normaloff>:/images/themes/default/mActionOptions.png</normaloff>:/images/themes/default/mActionOptions.png</iconset>
1919
</property>
2020
<layout class="QGridLayout" name="gridLayout">
21-
<property name="leftMargin">
22-
<number>3</number>
23-
</property>
24-
<property name="topMargin">
25-
<number>3</number>
26-
</property>
27-
<property name="rightMargin">
28-
<number>3</number>
29-
</property>
30-
<property name="bottomMargin">
21+
<property name="margin">
3122
<number>3</number>
3223
</property>
3324
<item row="0" column="0" colspan="2">
@@ -55,6 +46,12 @@
5546
</item>
5647
<item row="1" column="0">
5748
<widget class="QCheckBox" name="mCheckBoxMinScale">
49+
<property name="sizePolicy">
50+
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
51+
<horstretch>0</horstretch>
52+
<verstretch>0</verstretch>
53+
</sizepolicy>
54+
</property>
5855
<property name="text">
5956
<string>Minimum scale</string>
6057
</property>
@@ -69,6 +66,12 @@
6966
</item>
7067
<item row="3" column="0">
7168
<widget class="QCheckBox" name="mCheckBoxMaxScale">
69+
<property name="sizePolicy">
70+
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
71+
<horstretch>0</horstretch>
72+
<verstretch>0</verstretch>
73+
</sizepolicy>
74+
</property>
7275
<property name="text">
7376
<string>Maximum scale</string>
7477
</property>
@@ -85,7 +88,7 @@
8588
<property name="sizeHint" stdset="0">
8689
<size>
8790
<width>20</width>
88-
<height>40</height>
91+
<height>0</height>
8992
</size>
9093
</property>
9194
</spacer>
@@ -98,13 +101,25 @@
98101
<layout class="QGridLayout" name="gridLayout_3">
99102
<item row="1" column="0">
100103
<widget class="QCheckBox" name="mCheckBoxMinSize">
104+
<property name="sizePolicy">
105+
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
106+
<horstretch>0</horstretch>
107+
<verstretch>0</verstretch>
108+
</sizepolicy>
109+
</property>
101110
<property name="text">
102111
<string>Minimum size</string>
103112
</property>
104113
</widget>
105114
</item>
106115
<item row="2" column="0">
107116
<widget class="QCheckBox" name="mCheckBoxMaxSize">
117+
<property name="sizePolicy">
118+
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
119+
<horstretch>0</horstretch>
120+
<verstretch>0</verstretch>
121+
</sizepolicy>
122+
</property>
108123
<property name="text">
109124
<string>Maximum size</string>
110125
</property>
@@ -157,6 +172,7 @@
157172
<class>QgsPanelWidget</class>
158173
<extends>QWidget</extends>
159174
<header>qgspanelwidget.h</header>
175+
<container>1</container>
160176
</customwidget>
161177
</customwidgets>
162178
<tabstops>

0 commit comments

Comments
 (0)
Please sign in to comment.