From 9d1102207537d0766830e97ce435185b1d635587 Mon Sep 17 00:00:00 2001
From: Martin Dobias <wonder.sk@gmail.com>
Date: Wed, 29 Jun 2016 17:16:28 +0200
Subject: [PATCH] [composer] map config: move layer related options to a
 dedicated group box

---
 src/ui/composer/qgscomposermapwidgetbase.ui | 29 ++++++++++++++-------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/src/ui/composer/qgscomposermapwidgetbase.ui b/src/ui/composer/qgscomposermapwidgetbase.ui
index 021fdd6b1241..814f75f45212 100644
--- a/src/ui/composer/qgscomposermapwidgetbase.ui
+++ b/src/ui/composer/qgscomposermapwidgetbase.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>465</width>
-    <height>2617</height>
+    <width>472</width>
+    <height>2688</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -55,8 +55,8 @@
        <rect>
         <x>0</x>
         <y>0</y>
-        <width>447</width>
-        <height>2584</height>
+        <width>466</width>
+        <height>2627</height>
        </rect>
       </property>
       <property name="sizePolicy">
@@ -165,7 +165,16 @@
             </property>
            </widget>
           </item>
-          <item row="4" column="0" colspan="2">
+         </layout>
+        </widget>
+       </item>
+       <item>
+        <widget class="QgsCollapsibleGroupBoxBasic" name="groupBox_2">
+         <property name="title">
+          <string>Layers</string>
+         </property>
+         <layout class="QVBoxLayout" name="verticalLayout_4">
+          <item>
            <layout class="QHBoxLayout" name="horizontalLayout_12">
             <item>
              <widget class="QCheckBox" name="mFollowVisibilityPresetCheckBox">
@@ -186,7 +195,7 @@
             </item>
            </layout>
           </item>
-          <item row="5" column="0" colspan="2">
+          <item>
            <layout class="QHBoxLayout" name="horizontalLayout_10">
             <item>
              <widget class="QCheckBox" name="mKeepLayerListCheckBox">
@@ -197,7 +206,7 @@
                </sizepolicy>
               </property>
               <property name="text">
-               <string>Lock layers for map item</string>
+               <string>Lock layers</string>
               </property>
              </widget>
             </item>
@@ -233,10 +242,10 @@
             </item>
            </layout>
           </item>
-          <item row="6" column="0" colspan="2">
+          <item>
            <widget class="QCheckBox" name="mKeepLayerStylesCheckBox">
             <property name="text">
-             <string>Lock layer styles for map item</string>
+             <string>Lock styles for layers</string>
             </property>
            </widget>
           </item>
@@ -1453,8 +1462,8 @@
   </customwidget>
  </customwidgets>
  <tabstops>
-  <tabstop>scrollArea</tabstop>
   <tabstop>groupBox</tabstop>
+  <tabstop>scrollArea</tabstop>
   <tabstop>mPreviewModeComboBox</tabstop>
   <tabstop>mUpdatePreviewButton</tabstop>
   <tabstop>mScaleLineEdit</tabstop>