From 63a5ebf57ce46c187ad6ac521aaa12b689543f08 Mon Sep 17 00:00:00 2001
From: Nyall Dawson <nyall.dawson@gmail.com>
Date: Thu, 13 Dec 2018 13:38:03 +1000
Subject: [PATCH] Wording update

---
 .../layout/qgslayoutmaplabelingwidgetbase.ui  | 33 ++++++++++---------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/src/ui/layout/qgslayoutmaplabelingwidgetbase.ui b/src/ui/layout/qgslayoutmaplabelingwidgetbase.ui
index d1135082b058..2bfa52dbcb22 100644
--- a/src/ui/layout/qgslayoutmaplabelingwidgetbase.ui
+++ b/src/ui/layout/qgslayoutmaplabelingwidgetbase.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>326</width>
+    <width>174</width>
     <height>424</height>
    </rect>
   </property>
@@ -35,19 +35,25 @@
    <item>
     <widget class="QgsCollapsibleGroupBoxBasic" name="qgsCollapsibleGroupBoxBasic">
      <property name="title">
-      <string>Label Settings</string>
+      <string>Placement</string>
      </property>
      <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">
         <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 name="wordWrap">
          <bool>true</bool>
         </property>
        </widget>
       </item>
+      <item row="2" column="2">
+       <widget class="QgsLayoutUnitsComboBox" name="mLabelBoundaryUnitsCombo"/>
+      </item>
       <item row="2" column="0" colspan="2">
        <widget class="QgsDoubleSpinBox" name="mLabelBoundarySpinBox">
         <property name="prefix">
@@ -67,19 +73,16 @@
         </property>
        </widget>
       </item>
-      <item row="1" column="0" colspan="2">
+      <item row="0" column="0" colspan="4">
        <widget class="QLabel" name="label_8">
         <property name="text">
-         <string>Avoid placing labels within</string>
+         <string>&lt;b&gt;Margin from map edges&lt;/b&gt;</string>
         </property>
         <property name="wordWrap">
          <bool>true</bool>
         </property>
        </widget>
       </item>
-      <item row="2" column="2">
-       <widget class="QgsLayoutUnitsComboBox" name="mLabelBoundaryUnitsCombo"/>
-      </item>
       <item row="2" column="3">
        <widget class="QgsPropertyOverrideButton" name="mLabelMarginDDBtn">
         <property name="text">
@@ -107,12 +110,6 @@
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <customwidgets>
-  <customwidget>
-   <class>QgsCollapsibleGroupBoxBasic</class>
-   <extends>QGroupBox</extends>
-   <header>qgscollapsiblegroupbox.h</header>
-   <container>1</container>
-  </customwidget>
   <customwidget>
    <class>QgsDoubleSpinBox</class>
    <extends>QDoubleSpinBox</extends>
@@ -123,6 +120,12 @@
    <extends>QToolButton</extends>
    <header>qgspropertyoverridebutton.h</header>
   </customwidget>
+  <customwidget>
+   <class>QgsCollapsibleGroupBoxBasic</class>
+   <extends>QGroupBox</extends>
+   <header location="global">qgscollapsiblegroupbox.h</header>
+   <container>1</container>
+  </customwidget>
   <customwidget>
    <class>QgsLayoutUnitsComboBox</class>
    <extends>QComboBox</extends>