Skip to content

Commit

Permalink
Add missing caption and some tweaks to map units dialog
Browse files Browse the repository at this point in the history
  • Loading branch information
@DelazJ @nyalldawson
DelazJ authored and nyalldawson committed Mar 1, 2018
1 parent 7459539 commit 75f91e5
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 13 deletions.
1 change: 1 addition & 0 deletions src/gui/qgsunitselectionwidget.cpp
View file
Expand Up @@ -278,6 +278,7 @@ QgsMapUnitScaleDialog::QgsMapUnitScaleDialog( QWidget *parent )
connect( bbox, &QDialogButtonBox::rejected, this, &QgsMapUnitScaleDialog::reject );
vLayout->addWidget( bbox );
setLayout( vLayout );
setWindowTitle( tr( "Adjust Scaling Range" ) );
}

QgsMapUnitScale QgsMapUnitScaleDialog::getMapUnitScale() const
Expand Down
42 changes: 29 additions & 13 deletions src/ui/qgsmapunitscalewidgetbase.ui
View file
Expand Up @@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>316</width>
<height>276</height>
<width>285</width>
<height>233</height>
</rect>
</property>
<property name="windowTitle">
Expand All @@ -18,16 +18,7 @@
<normaloff>:/images/themes/default/mActionOptions.png</normaloff>:/images/themes/default/mActionOptions.png</iconset>
</property>
<layout class="QGridLayout" name="gridLayout">
<property name="leftMargin">
<number>3</number>
</property>
<property name="topMargin">
<number>3</number>
</property>
<property name="rightMargin">
<number>3</number>
</property>
<property name="bottomMargin">
<property name="margin">
<number>3</number>
</property>
<item row="0" column="0" colspan="2">
Expand Down Expand Up @@ -55,6 +46,12 @@
</item>
<item row="1" column="0">
<widget class="QCheckBox" name="mCheckBoxMinScale">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Minimum scale</string>
</property>
Expand All @@ -69,6 +66,12 @@
</item>
<item row="3" column="0">
<widget class="QCheckBox" name="mCheckBoxMaxScale">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Maximum scale</string>
</property>
Expand All @@ -85,7 +88,7 @@
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
<height>0</height>
</size>
</property>
</spacer>
Expand All @@ -98,13 +101,25 @@
<layout class="QGridLayout" name="gridLayout_3">
<item row="1" column="0">
<widget class="QCheckBox" name="mCheckBoxMinSize">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Minimum size</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QCheckBox" name="mCheckBoxMaxSize">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Maximum size</string>
</property>
Expand Down Expand Up @@ -157,6 +172,7 @@
<class>QgsPanelWidget</class>
<extends>QWidget</extends>
<header>qgspanelwidget.h</header>
<container>1</container>
</customwidget>
</customwidgets>
<tabstops>
Expand Down

0 comments on commit 75f91e5

Please sign in to comment.