Skip to content

Commit

Permalink
Wording update
Browse files Browse the repository at this point in the history
  • Loading branch information
@nyalldawson
nyalldawson committed Dec 15, 2018
1 parent 8d7e21f commit 63a5ebf
Showing 1 changed file with 18 additions and 15 deletions.
33 changes: 18 additions & 15 deletions src/ui/layout/qgslayoutmaplabelingwidgetbase.ui
View file
Expand Up @@ -6,7 +6,7 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>326</width> <width>174</width>
<height>424</height> <height>424</height>
</rect> </rect>
</property> </property>
Expand Down Expand Up @@ -35,19 +35,25 @@
<item> <item>
<widget class="QgsCollapsibleGroupBoxBasic" name="qgsCollapsibleGroupBoxBasic"> <widget class="QgsCollapsibleGroupBoxBasic" name="qgsCollapsibleGroupBoxBasic">
<property name="title"> <property name="title">
<string>Label Settings</string> <string>Placement</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout_6" columnstretch="0,0,0,0"> <layout class="QGridLayout" name="gridLayout_6" columnstretch="0,0,0,0">
<item row="3" column="0" colspan="2"> <item row="1" column="0" colspan="4">
<widget class="QLabel" name="label_10"> <widget class="QLabel" name="label_10">
<property name="text"> <property name="text">
<string>of map edges</string> <string>Map labels will be placed at least this far away from the edges of the map item.</string>
</property>
<property name="scaledContents">
<bool>false</bool>
</property> </property>
<property name="wordWrap"> <property name="wordWrap">
<bool>true</bool> <bool>true</bool>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="2">
<widget class="QgsLayoutUnitsComboBox" name="mLabelBoundaryUnitsCombo"/>
</item>
<item row="2" column="0" colspan="2"> <item row="2" column="0" colspan="2">
<widget class="QgsDoubleSpinBox" name="mLabelBoundarySpinBox"> <widget class="QgsDoubleSpinBox" name="mLabelBoundarySpinBox">
<property name="prefix"> <property name="prefix">
Expand All @@ -67,19 +73,16 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0" colspan="2"> <item row="0" column="0" colspan="4">
<widget class="QLabel" name="label_8"> <widget class="QLabel" name="label_8">
<property name="text"> <property name="text">
<string>Avoid placing labels within</string> <string>&lt;b&gt;Margin from map edges&lt;/b&gt;</string>
</property> </property>
<property name="wordWrap"> <property name="wordWrap">
<bool>true</bool> <bool>true</bool>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="2">
<widget class="QgsLayoutUnitsComboBox" name="mLabelBoundaryUnitsCombo"/>
</item>
<item row="2" column="3"> <item row="2" column="3">
<widget class="QgsPropertyOverrideButton" name="mLabelMarginDDBtn"> <widget class="QgsPropertyOverrideButton" name="mLabelMarginDDBtn">
<property name="text"> <property name="text">
Expand Down Expand Up @@ -107,12 +110,6 @@
</widget> </widget>
<layoutdefault spacing="6" margin="11"/> <layoutdefault spacing="6" margin="11"/>
<customwidgets> <customwidgets>
<customwidget>
<class>QgsCollapsibleGroupBoxBasic</class>
<extends>QGroupBox</extends>
<header>qgscollapsiblegroupbox.h</header>
<container>1</container>
</customwidget>
<customwidget> <customwidget>
<class>QgsDoubleSpinBox</class> <class>QgsDoubleSpinBox</class>
<extends>QDoubleSpinBox</extends> <extends>QDoubleSpinBox</extends>
Expand All @@ -123,6 +120,12 @@
<extends>QToolButton</extends> <extends>QToolButton</extends>
<header>qgspropertyoverridebutton.h</header> <header>qgspropertyoverridebutton.h</header>
</customwidget> </customwidget>
<customwidget>
<class>QgsCollapsibleGroupBoxBasic</class>
<extends>QGroupBox</extends>
<header location="global">qgscollapsiblegroupbox.h</header>
<container>1</container>
</customwidget>
<customwidget> <customwidget>
<class>QgsLayoutUnitsComboBox</class> <class>QgsLayoutUnitsComboBox</class>
<extends>QComboBox</extends> <extends>QComboBox</extends>
Expand Down

0 comments on commit 63a5ebf

Please sign in to comment.