Skip to content

Commit 63a5ebf

Browse files
committedDec 15, 2018
Wording update
1 parent 8d7e21f commit 63a5ebf

File tree

1 file changed

+18
-15
lines changed

1 file changed

+18
-15
lines changed
 

‎src/ui/layout/qgslayoutmaplabelingwidgetbase.ui

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<rect>
77
<x>0</x>
88
<y>0</y>
9-
<width>326</width>
9+
<width>174</width>
1010
<height>424</height>
1111
</rect>
1212
</property>
@@ -35,19 +35,25 @@
3535
<item>
3636
<widget class="QgsCollapsibleGroupBoxBasic" name="qgsCollapsibleGroupBoxBasic">
3737
<property name="title">
38-
<string>Label Settings</string>
38+
<string>Placement</string>
3939
</property>
4040
<layout class="QGridLayout" name="gridLayout_6" columnstretch="0,0,0,0">
41-
<item row="3" column="0" colspan="2">
41+
<item row="1" column="0" colspan="4">
4242
<widget class="QLabel" name="label_10">
4343
<property name="text">
44-
<string>of map edges</string>
44+
<string>Map labels will be placed at least this far away from the edges of the map item.</string>
45+
</property>
46+
<property name="scaledContents">
47+
<bool>false</bool>
4548
</property>
4649
<property name="wordWrap">
4750
<bool>true</bool>
4851
</property>
4952
</widget>
5053
</item>
54+
<item row="2" column="2">
55+
<widget class="QgsLayoutUnitsComboBox" name="mLabelBoundaryUnitsCombo"/>
56+
</item>
5157
<item row="2" column="0" colspan="2">
5258
<widget class="QgsDoubleSpinBox" name="mLabelBoundarySpinBox">
5359
<property name="prefix">
@@ -67,19 +73,16 @@
6773
</property>
6874
</widget>
6975
</item>
70-
<item row="1" column="0" colspan="2">
76+
<item row="0" column="0" colspan="4">
7177
<widget class="QLabel" name="label_8">
7278
<property name="text">
73-
<string>Avoid placing labels within</string>
79+
<string>&lt;b&gt;Margin from map edges&lt;/b&gt;</string>
7480
</property>
7581
<property name="wordWrap">
7682
<bool>true</bool>
7783
</property>
7884
</widget>
7985
</item>
80-
<item row="2" column="2">
81-
<widget class="QgsLayoutUnitsComboBox" name="mLabelBoundaryUnitsCombo"/>
82-
</item>
8386
<item row="2" column="3">
8487
<widget class="QgsPropertyOverrideButton" name="mLabelMarginDDBtn">
8588
<property name="text">
@@ -107,12 +110,6 @@
107110
</widget>
108111
<layoutdefault spacing="6" margin="11"/>
109112
<customwidgets>
110-
<customwidget>
111-
<class>QgsCollapsibleGroupBoxBasic</class>
112-
<extends>QGroupBox</extends>
113-
<header>qgscollapsiblegroupbox.h</header>
114-
<container>1</container>
115-
</customwidget>
116113
<customwidget>
117114
<class>QgsDoubleSpinBox</class>
118115
<extends>QDoubleSpinBox</extends>
@@ -123,6 +120,12 @@
123120
<extends>QToolButton</extends>
124121
<header>qgspropertyoverridebutton.h</header>
125122
</customwidget>
123+
<customwidget>
124+
<class>QgsCollapsibleGroupBoxBasic</class>
125+
<extends>QGroupBox</extends>
126+
<header location="global">qgscollapsiblegroupbox.h</header>
127+
<container>1</container>
128+
</customwidget>
126129
<customwidget>
127130
<class>QgsLayoutUnitsComboBox</class>
128131
<extends>QComboBox</extends>

0 commit comments

Comments
 (0)
Please sign in to comment.