From ea2de726d3a2ca84cc898b112556af3d4c5383a7 Mon Sep 17 00:00:00 2001
From: Larry Shaffer <larrys@dakotacarto.com>
Date: Thu, 6 Sep 2012 06:24:10 -0600
Subject: [PATCH] Adjust wording about PAL engine

---
 src/ui/qgsdiagrampropertiesbase.ui |  2 +-
 src/ui/qgsengineconfigdialog.ui    | 53 ++++++++++++++++++++++--------
 src/ui/qgslabelingguibase.ui       |  2 +-
 3 files changed, 42 insertions(+), 15 deletions(-)

diff --git a/src/ui/qgsdiagrampropertiesbase.ui b/src/ui/qgsdiagrampropertiesbase.ui
index 4ece714521f..096f1e85490 100644
--- a/src/ui/qgsdiagrampropertiesbase.ui
+++ b/src/ui/qgsdiagrampropertiesbase.ui
@@ -674,7 +674,7 @@
               <item row="3" column="0">
                <widget class="QPushButton" name="mEngineSettingsButton">
                 <property name="text">
-                 <string>PAL engine settings</string>
+                 <string>Automated placement settings</string>
                 </property>
                </widget>
               </item>
diff --git a/src/ui/qgsengineconfigdialog.ui b/src/ui/qgsengineconfigdialog.ui
index cdf4b86f3a6..c931670dc29 100644
--- a/src/ui/qgsengineconfigdialog.ui
+++ b/src/ui/qgsengineconfigdialog.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>435</width>
-    <height>307</height>
+    <width>316</width>
+    <height>328</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -205,18 +205,45 @@
     </layout>
    </item>
    <item>
-    <widget class="QCheckBox" name="chkShowAllLabels">
-     <property name="text">
-      <string>Show all labels and features (i.e. including colliding objects)</string>
+    <layout class="QGridLayout" name="gridLayout_2">
+     <property name="verticalSpacing">
+      <number>6</number>
      </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QCheckBox" name="chkShowCandidates">
-     <property name="text">
-      <string>Show candidates (for debugging)</string>
-     </property>
-    </widget>
+     <item row="0" column="1">
+      <widget class="QLabel" name="label_5">
+       <property name="text">
+        <string>Show all labels and features for all layers</string>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="0">
+      <widget class="QCheckBox" name="chkShowAllLabels">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="text">
+        <string/>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="0" colspan="2">
+      <widget class="QCheckBox" name="chkShowCandidates">
+       <property name="text">
+        <string>Show candidates (for debugging)</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="1">
+      <widget class="QLabel" name="label_6">
+       <property name="text">
+        <string>(i.e. including colliding objects)</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
    </item>
    <item>
     <spacer name="verticalSpacer_2">
diff --git a/src/ui/qgslabelingguibase.ui b/src/ui/qgslabelingguibase.ui
index b0ff204bec6..202c07aaaee 100644
--- a/src/ui/qgslabelingguibase.ui
+++ b/src/ui/qgslabelingguibase.ui
@@ -1562,7 +1562,7 @@
                    <bool>true</bool>
                   </property>
                   <property name="text">
-                   <string>Engine settings</string>
+                   <string>Automated placement settings</string>
                   </property>
                  </widget>
                 </item>