Update adv labeling groupbox layout

Author: dakcarto

src/app/qgslabelinggui.cpp

@@ -268,10 +268,16 @@ QgsLabelingGui::QgsLabelingGui( QgsPalLabeling* lbl, QgsVectorLayer* layer, QgsM
     connect( quadrantRadios[i], SIGNAL( toggled( bool ) ), this, SLOT( updateQuadrant() ) );
   }
 
+  // Label tab collapsed groupboxes
   chkBuffer->setCollapsed( true );
-  groupBox_2->setCollapsed( true );
+  mFontMultiLineGroupBox->setCollapsed( true );
   chkFormattedNumbers->setCollapsed( true );
   chkScaleBasedVisibility->setCollapsed( true );
+
+  // Data defined tab collapsed groupboxes
+  mBufferAttributesPropertiesGroupBox->setCollapsed( true );
+  mFontAttributePropertiesGroupBox->setCollapsed( true );
+
 }
 
 QgsLabelingGui::~QgsLabelingGui()

src/ui/qgslabelingguibase.ui

@@ -438,7 +438,7 @@
              <number>20</number>
             </property>
             <item row="5" column="0">
-             <widget class="QgsCollapsibleGroupBox" name="groupBox_2">
+             <widget class="QgsCollapsibleGroupBox" name="mFontMultiLineGroupBox">
               <property name="minimumSize">
                <size>
                 <width>0</width>
@@ -586,7 +586,7 @@
              </widget>
             </item>
             <item row="2" column="0">
-             <widget class="QgsCollapsibleGroupBox" name="groupBox_6">
+             <widget class="QgsCollapsibleGroupBox" name="mFontStyleGroupBox">
               <property name="sizePolicy">
                <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
                 <horstretch>0</horstretch>
@@ -1478,7 +1478,7 @@
             <number>6</number>
            </property>
            <item row="2" column="0">
-            <widget class="QgsCollapsibleGroupBox" name="groupBox">
+            <widget class="QgsCollapsibleGroupBox" name="mOptionsGroupBox">
              <property name="maximumSize">
               <size>
                <width>16777215</width>
@@ -1579,7 +1579,7 @@
             </widget>
            </item>
            <item row="1" column="0">
-            <widget class="QgsCollapsibleGroupBox" name="groupBox_7">
+            <widget class="QgsCollapsibleGroupBox" name="mPriorityGroupBox">
              <property name="maximumSize">
               <size>
                <width>16777215</width>
@@ -1627,7 +1627,7 @@
             </widget>
            </item>
            <item row="0" column="0">
-            <widget class="QgsCollapsibleGroupBox" name="groupBox_5">
+            <widget class="QgsCollapsibleGroupBox" name="mPlacementGroupBox">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
                <horstretch>0</horstretch>