Skip to content
Permalink
Browse files

[composer] Fix wording of scalebar widget controls (fix #12063)

Also add some tooltips to clarify meaning of various controls
  • Loading branch information
nyalldawson committed Oct 22, 2015
1 parent 0886e98 commit 71d88a753f98f42909b58ae46ccdf10986f0d987
Showing with 48 additions and 27 deletions.
  1. +48 −27 src/ui/composer/qgscomposerscalebarwidgetbase.ui
@@ -60,7 +60,7 @@
<property name="geometry">
<rect>
<x>0</x>
<y>-275</y>
<y>0</y>
<width>438</width>
<height>914</height>
</rect>
@@ -143,38 +143,32 @@
<property name="collapsed" stdset="0">
<bool>false</bool>
</property>
<layout class="QGridLayout" name="gridLayout_2" columnstretch="0,1">
<item row="1" column="0">
<widget class="QLabel" name="mUnitLabelLabel">
<layout class="QGridLayout" name="gridLayout_2" columnstretch="0,0">
<item row="0" column="0">
<widget class="QLabel" name="label_12">
<property name="text">
<string>&amp;Label</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
<property name="buddy">
<cstring>mUnitLabelLineEdit</cstring>
<string>Scalebar units</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLineEdit" name="mUnitLabelLineEdit"/>
</item>
<item row="2" column="0">
<widget class="QLabel" name="mMapUnitsPerBarUnitLabel">
<widget class="QLabel" name="mUnitLabelLabel">
<property name="text">
<string>Map &amp;units per bar unit</string>
<string>&amp;Label for units</string>
</property>
<property name="wordWrap">
<bool>false</bool>
<bool>true</bool>
</property>
<property name="buddy">
<cstring>mMapUnitsPerBarUnitSpinBox</cstring>
<cstring>mUnitLabelLineEdit</cstring>
</property>
</widget>
</item>
<item row="2" column="1">
<item row="1" column="1">
<widget class="QgsDoubleSpinBox" name="mMapUnitsPerBarUnitSpinBox">
<property name="toolTip">
<string>Specifies how many scalebar units per labeled unit. Eg, if your scalebar units are set to &quot;meters&quot;, a multiplier of 1000 will result in the scalebar labels in kilometers.</string>
</property>
<property name="decimals">
<number>6</number>
</property>
@@ -186,8 +180,32 @@
</property>
</widget>
</item>
<item row="0" column="0" colspan="2">
<widget class="QComboBox" name="mUnitsComboBox"/>
<item row="2" column="1">
<widget class="QLineEdit" name="mUnitLabelLineEdit">
<property name="toolTip">
<string>Text used for labeling the scalebar units, eg &quot;m&quot; or &quot;km&quot;. This should be matched to the reflect the multiplier above. </string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QComboBox" name="mUnitsComboBox">
<property name="toolTip">
<string>Specifies the underlying units used for scalebar calculations, eg &quot;meters&quot; or &quot;feet&quot;</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="mMapUnitsPerBarUnitLabel">
<property name="text">
<string>Label unit multiplier</string>
</property>
<property name="wordWrap">
<bool>false</bool>
</property>
<property name="buddy">
<cstring>mMapUnitsPerBarUnitSpinBox</cstring>
</property>
</widget>
</item>
</layout>
</widget>
@@ -216,6 +234,9 @@
</item>
<item row="2" column="2">
<widget class="QgsDoubleSpinBox" name="mSegmentSizeSpinBox">
<property name="toolTip">
<string>Number of scalebar units per scalebar segment</string>
</property>
<property name="suffix">
<string> units</string>
</property>
@@ -664,11 +685,6 @@
<extends>QDoubleSpinBox</extends>
<header>qgsdoublespinbox.h</header>
</customwidget>
<customwidget>
<class>QgsSpinBox</class>
<extends>QSpinBox</extends>
<header>qgsspinbox.h</header>
</customwidget>
<customwidget>
<class>QgsPenJoinStyleComboBox</class>
<extends>QComboBox</extends>
@@ -679,6 +695,11 @@
<extends>QComboBox</extends>
<header>qgspenstylecombobox.h</header>
</customwidget>
<customwidget>
<class>QgsSpinBox</class>
<extends>QSpinBox</extends>
<header>qgsspinbox.h</header>
</customwidget>
<customwidget>
<class>QgsCollapsibleGroupBoxBasic</class>
<extends>QGroupBox</extends>
@@ -693,8 +714,8 @@
<tabstop>mStyleComboBox</tabstop>
<tabstop>mGroupBoxUnits</tabstop>
<tabstop>mUnitsComboBox</tabstop>
<tabstop>mUnitLabelLineEdit</tabstop>
<tabstop>mMapUnitsPerBarUnitSpinBox</tabstop>
<tabstop>mUnitLabelLineEdit</tabstop>
<tabstop>mGroupBoxSegments</tabstop>
<tabstop>mSegmentsLeftSpinBox</tabstop>
<tabstop>mNumberOfSegmentsSpinBox</tabstop>

0 comments on commit 71d88a7

Please sign in to comment.
You can’t perform that action at this time.