[QGIS Commit] r14653 - trunk/qgis/src/ui

svn_qgis at osgeo.org svn_qgis at osgeo.org
Sun Nov 14 15:20:54 EST 2010


Author: timlinux
Date: 2010-11-14 12:20:54 -0800 (Sun, 14 Nov 2010)
New Revision: 14653

Modified:
   trunk/qgis/src/ui/qgslabelingguibase.ui
Log:
Cleanups for label dialog

Modified: trunk/qgis/src/ui/qgslabelingguibase.ui
===================================================================
--- trunk/qgis/src/ui/qgslabelingguibase.ui	2010-11-14 19:08:48 UTC (rev 14652)
+++ trunk/qgis/src/ui/qgslabelingguibase.ui	2010-11-14 20:20:54 UTC (rev 14653)
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>515</width>
-    <height>692</height>
+    <width>703</width>
+    <height>446</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -17,8 +17,87 @@
    <iconset>
     <normaloff>../../../../.designer/backup</normaloff>../../../../.designer/backup</iconset>
   </property>
-  <layout class="QGridLayout" name="gridLayout_13">
+  <layout class="QGridLayout" name="gridLayout_8">
    <item row="0" column="0">
+    <layout class="QHBoxLayout" name="horizontalLayout_3">
+     <item>
+      <widget class="QCheckBox" name="chkEnableLabeling">
+       <property name="text">
+        <string>Label this layer</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer_5">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QLabel" name="label_20">
+       <property name="text">
+        <string>Field with labels</string>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QComboBox" name="cboFieldName"/>
+     </item>
+    </layout>
+   </item>
+   <item row="1" column="0">
+    <layout class="QHBoxLayout" name="horizontalLayout_4">
+     <item>
+      <widget class="QLabel" name="label_33">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="text">
+        <string>Sample</string>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QgsLabelPreview" name="lblFontPreview">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="minimumSize">
+        <size>
+         <width>30</width>
+         <height>30</height>
+        </size>
+       </property>
+       <property name="text">
+        <string>Lorem Ipsum</string>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignCenter</set>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item row="2" column="0">
     <widget class="QTabWidget" name="mTabWidget">
      <property name="currentIndex">
       <number>0</number>
@@ -27,301 +106,398 @@
       <attribute name="title">
        <string>Label settings</string>
       </attribute>
-      <layout class="QGridLayout" name="gridLayout_6">
+      <layout class="QGridLayout" name="gridLayout_14">
        <item row="0" column="0">
-        <widget class="QCheckBox" name="chkEnableLabeling">
-         <property name="text">
-          <string>Label this layer</string>
+        <widget class="QGroupBox" name="groupBox_6">
+         <property name="title">
+          <string>Text style</string>
          </property>
+         <layout class="QGridLayout" name="gridLayout_9">
+          <item row="0" column="0">
+           <widget class="QLabel" name="label_28">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="text">
+             <string>Font</string>
+            </property>
+            <property name="alignment">
+             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="1">
+           <layout class="QHBoxLayout" name="horizontalLayout_15">
+            <item>
+             <widget class="QLabel" name="lblFontName">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+                <horstretch>1</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="text">
+               <string>TextLabel</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QToolButton" name="btnChangeFont">
+              <property name="text">
+               <string>...</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <spacer name="horizontalSpacer_6">
+              <property name="orientation">
+               <enum>Qt::Horizontal</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>999</width>
+                <height>20</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+           </layout>
+          </item>
+          <item row="1" column="0">
+           <widget class="QLabel" name="mFontSizeLabel">
+            <property name="text">
+             <string>Font size</string>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="1">
+           <layout class="QHBoxLayout" name="horizontalLayout">
+            <item>
+             <widget class="QDoubleSpinBox" name="mFontSizeSpinBox">
+              <property name="decimals">
+               <number>4</number>
+              </property>
+              <property name="maximum">
+               <double>999999999.000000000000000</double>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QComboBox" name="mFontSizeUnitComboBox">
+              <item>
+               <property name="text">
+                <string>In points</string>
+               </property>
+              </item>
+              <item>
+               <property name="text">
+                <string>In map units</string>
+               </property>
+              </item>
+             </widget>
+            </item>
+           </layout>
+          </item>
+          <item row="2" column="0">
+           <widget class="QLabel" name="label_29">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="text">
+             <string>Color</string>
+            </property>
+            <property name="alignment">
+             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="1">
+           <layout class="QHBoxLayout" name="horizontalLayout_16">
+            <item>
+             <widget class="QgsColorButton" name="btnTextColor">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="text">
+               <string/>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <spacer name="horizontalSpacer_7">
+              <property name="orientation">
+               <enum>Qt::Horizontal</enum>
+              </property>
+              <property name="sizeType">
+               <enum>QSizePolicy::Preferred</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>142</width>
+                <height>20</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+           </layout>
+          </item>
+         </layout>
         </widget>
        </item>
        <item row="1" column="0">
-        <layout class="QHBoxLayout" name="horizontalLayout_11">
-         <item>
-          <widget class="QLabel" name="label_20">
-           <property name="text">
-            <string>Field with labels</string>
-           </property>
-           <property name="alignment">
-            <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QComboBox" name="cboFieldName"/>
-         </item>
-         <item>
-          <spacer name="horizontalSpacer_5">
-           <property name="orientation">
-            <enum>Qt::Horizontal</enum>
-           </property>
-           <property name="sizeHint" stdset="0">
-            <size>
-             <width>40</width>
-             <height>20</height>
-            </size>
-           </property>
-          </spacer>
-         </item>
-        </layout>
+        <widget class="QGroupBox" name="chkBuffer">
+         <property name="title">
+          <string>Buffer</string>
+         </property>
+         <property name="checkable">
+          <bool>true</bool>
+         </property>
+         <layout class="QGridLayout" name="gridLayout_5">
+          <item row="0" column="0">
+           <layout class="QHBoxLayout" name="horizontalLayout_17">
+            <item>
+             <widget class="QLabel" name="label_31">
+              <property name="text">
+               <string>Size</string>
+              </property>
+              <property name="alignment">
+               <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QDoubleSpinBox" name="spinBufferSize">
+              <property name="suffix">
+               <string> mm</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QLabel" name="label_32">
+              <property name="text">
+               <string>Color</string>
+              </property>
+              <property name="alignment">
+               <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QgsColorButton" name="btnBufferColor">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="text">
+               <string>...</string>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </item>
+         </layout>
+        </widget>
        </item>
        <item row="2" column="0">
-        <widget class="QGroupBox" name="groupBox_5">
+        <widget class="QGroupBox" name="chkScaleBasedVisibility">
          <property name="title">
-          <string>Placement</string>
+          <string>Scale-based visibility</string>
          </property>
-         <layout class="QHBoxLayout" name="horizontalLayout_12">
-          <property name="leftMargin">
-           <number>0</number>
+         <property name="checkable">
+          <bool>true</bool>
+         </property>
+         <layout class="QGridLayout" name="gridLayout_10">
+          <item row="1" column="1">
+           <widget class="QSpinBox" name="spinScaleMax">
+            <property name="prefix">
+             <string>Maximum </string>
+            </property>
+            <property name="minimum">
+             <number>1</number>
+            </property>
+            <property name="maximum">
+             <number>10000000</number>
+            </property>
+            <property name="value">
+             <number>10000000</number>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="0">
+           <widget class="QSpinBox" name="spinScaleMin">
+            <property name="prefix">
+             <string>Minimum </string>
+            </property>
+            <property name="minimum">
+             <number>1</number>
+            </property>
+            <property name="maximum">
+             <number>10000000</number>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="tab">
+      <attribute name="title">
+       <string>Advanced</string>
+      </attribute>
+      <layout class="QGridLayout" name="gridLayout_6">
+       <item row="0" column="0">
+        <widget class="QScrollArea" name="scrollArea_2">
+         <property name="widgetResizable">
+          <bool>true</bool>
+         </property>
+         <widget class="QWidget" name="scrollAreaWidgetContents_2">
+          <property name="geometry">
+           <rect>
+            <x>0</x>
+            <y>0</y>
+            <width>645</width>
+            <height>495</height>
+           </rect>
           </property>
-          <property name="topMargin">
-           <number>0</number>
-          </property>
-          <property name="rightMargin">
-           <number>0</number>
-          </property>
-          <property name="bottomMargin">
-           <number>4</number>
-          </property>
-          <item>
-           <widget class="QStackedWidget" name="stackedPlacement">
-            <property name="currentIndex">
-             <number>2</number>
-            </property>
-            <widget class="QWidget" name="pagePoint">
-             <layout class="QVBoxLayout" name="verticalLayout_6">
+          <layout class="QGridLayout" name="gridLayout_13">
+           <item row="1" column="0">
+            <widget class="QGroupBox" name="groupBox_7">
+             <property name="title">
+              <string>Priority</string>
+             </property>
+             <layout class="QHBoxLayout" name="horizontalLayout_18">
               <item>
-               <widget class="QRadioButton" name="radAroundPoint">
+               <widget class="QLabel" name="label_34">
                 <property name="text">
-                 <string>around point</string>
+                 <string>Low</string>
                 </property>
-                <property name="checked">
-                 <bool>true</bool>
-                </property>
                </widget>
               </item>
               <item>
-               <widget class="QRadioButton" name="radOverPoint">
-                <property name="text">
-                 <string>over point</string>
+               <widget class="QSlider" name="sliderPriority">
+                <property name="maximum">
+                 <number>10</number>
                 </property>
-               </widget>
-              </item>
-             </layout>
-            </widget>
-            <widget class="QWidget" name="pageLine">
-             <layout class="QVBoxLayout" name="verticalLayout_7">
-              <item>
-               <widget class="QRadioButton" name="radLineParallel">
-                <property name="text">
-                 <string>parallel</string>
+                <property name="value">
+                 <number>5</number>
                 </property>
-                <property name="checked">
-                 <bool>true</bool>
+                <property name="orientation">
+                 <enum>Qt::Horizontal</enum>
                 </property>
-               </widget>
-              </item>
-              <item>
-               <widget class="QRadioButton" name="radLineCurved">
-                <property name="text">
-                 <string>curved</string>
+                <property name="tickPosition">
+                 <enum>QSlider::TicksBelow</enum>
                 </property>
-               </widget>
-              </item>
-              <item>
-               <widget class="QRadioButton" name="radLineHorizontal">
-                <property name="text">
-                 <string>horizontal</string>
+                <property name="tickInterval">
+                 <number>1</number>
                 </property>
                </widget>
               </item>
-             </layout>
-            </widget>
-            <widget class="QWidget" name="pagePolygon">
-             <layout class="QVBoxLayout" name="verticalLayout_8">
               <item>
-               <widget class="QRadioButton" name="radOverCentroid">
+               <widget class="QLabel" name="label_35">
                 <property name="text">
-                 <string>over centroid</string>
+                 <string>High</string>
                 </property>
-                <property name="checked">
-                 <bool>true</bool>
-                </property>
                </widget>
               </item>
-              <item>
-               <widget class="QRadioButton" name="radAroundCentroid">
-                <property name="text">
-                 <string>around centroid</string>
-                </property>
-               </widget>
-              </item>
-              <item>
-               <widget class="QRadioButton" name="radPolygonHorizontal">
-                <property name="text">
-                 <string>horizontal (slow)</string>
-                </property>
-               </widget>
-              </item>
-              <item>
-               <widget class="QRadioButton" name="radPolygonFree">
-                <property name="text">
-                 <string>free (slow)</string>
-                </property>
-               </widget>
-              </item>
-              <item>
-               <widget class="QRadioButton" name="radPolygonPerimeter">
-                <property name="text">
-                 <string>using perimeter</string>
-                </property>
-               </widget>
-              </item>
              </layout>
             </widget>
-           </widget>
-          </item>
-          <item>
-           <widget class="Line" name="line_3">
-            <property name="orientation">
-             <enum>Qt::Vertical</enum>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QStackedWidget" name="stackedOptions">
-            <property name="currentIndex">
-             <number>1</number>
-            </property>
-            <widget class="QWidget" name="pageOptionsPoint">
-             <layout class="QGridLayout" name="gridLayout_7">
+           </item>
+           <item row="2" column="0">
+            <widget class="QGroupBox" name="groupBox">
+             <property name="title">
+              <string>Options</string>
+             </property>
+             <layout class="QGridLayout" name="gridLayout_12">
               <item row="0" column="0">
-               <widget class="QLabel" name="label_21">
+               <widget class="QCheckBox" name="chkLabelPerFeaturePart">
                 <property name="text">
-                 <string>Label distance</string>
+                 <string>Label every part of multi-part features</string>
                 </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
                </widget>
               </item>
-              <item row="0" column="1">
-               <widget class="QDoubleSpinBox" name="spinDistPoint">
-                <property name="decimals">
-                 <number>2</number>
-                </property>
-               </widget>
-              </item>
-              <item row="0" column="2">
-               <widget class="QLabel" name="label_22">
-                <property name="text">
-                 <string>mm</string>
-                </property>
-               </widget>
-              </item>
               <item row="1" column="0">
-               <widget class="QLabel" name="label_23">
+               <widget class="QCheckBox" name="chkMergeLines">
                 <property name="text">
-                 <string>Rotation</string>
+                 <string>Merge connected lines to avoid duplicate labels</string>
                 </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
                </widget>
               </item>
-              <item row="1" column="1">
-               <widget class="QSpinBox" name="spinAngle">
-                <property name="enabled">
-                 <bool>false</bool>
-                </property>
-               </widget>
-              </item>
-              <item row="1" column="2">
-               <widget class="QLabel" name="label_24">
+              <item row="2" column="0">
+               <widget class="QCheckBox" name="chkMultiLine">
                 <property name="text">
-                 <string>degrees</string>
+                 <string>Multiline labels</string>
                 </property>
                </widget>
               </item>
-             </layout>
-            </widget>
-            <widget class="QWidget" name="pageOptionsLine">
-             <layout class="QVBoxLayout" name="verticalLayout_9">
-              <item>
-               <widget class="QCheckBox" name="chkLineAbove">
+              <item row="3" column="0">
+               <widget class="QCheckBox" name="chkAddDirectionSymbol">
                 <property name="text">
-                 <string>above line</string>
+                 <string>Add direction symbol</string>
                 </property>
-                <property name="checked">
-                 <bool>true</bool>
-                </property>
                </widget>
               </item>
-              <item>
-               <widget class="QCheckBox" name="chkLineOn">
-                <property name="text">
-                 <string>on line</string>
-                </property>
-               </widget>
-              </item>
-              <item>
-               <widget class="QCheckBox" name="chkLineBelow">
-                <property name="text">
-                 <string>below line</string>
-                </property>
-               </widget>
-              </item>
-              <item>
-               <layout class="QHBoxLayout" name="horizontalLayout_13">
+              <item row="4" column="0">
+               <layout class="QHBoxLayout" name="horizontalLayout_2">
                 <item>
-                 <widget class="QLabel" name="label_25">
+                 <widget class="QLabel" name="label_19">
                   <property name="text">
-                   <string>Orientation</string>
+                   <string>Suppress labeling of features smaller than</string>
                   </property>
                  </widget>
                 </item>
                 <item>
-                 <widget class="QRadioButton" name="radOrientationMap">
-                  <property name="text">
-                   <string>map</string>
+                 <widget class="QDoubleSpinBox" name="mMinSizeSpinBox">
+                  <property name="suffix">
+                   <string> mm</string>
                   </property>
-                  <property name="checked">
-                   <bool>true</bool>
-                  </property>
                  </widget>
                 </item>
+               </layout>
+              </item>
+              <item row="5" column="0">
+               <layout class="QHBoxLayout" name="horizontalLayout_20">
                 <item>
-                 <widget class="QRadioButton" name="radOrientationLine">
+                 <widget class="QCheckBox" name="chkNoObstacle">
+                  <property name="enabled">
+                   <bool>true</bool>
+                  </property>
                   <property name="text">
-                   <string>line</string>
+                   <string>Features don't act as obstacles for labels</string>
                   </property>
                  </widget>
                 </item>
-               </layout>
-              </item>
-              <item>
-               <layout class="QHBoxLayout" name="horizontalLayout_14">
                 <item>
-                 <widget class="QLabel" name="label_26">
-                  <property name="text">
-                   <string>Label distance</string>
+                 <spacer name="horizontalSpacer_8">
+                  <property name="orientation">
+                   <enum>Qt::Horizontal</enum>
                   </property>
-                  <property name="alignment">
-                   <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+                  <property name="sizeHint" stdset="0">
+                   <size>
+                    <width>40</width>
+                    <height>20</height>
+                   </size>
                   </property>
-                 </widget>
+                 </spacer>
                 </item>
                 <item>
-                 <widget class="QDoubleSpinBox" name="spinDistLine">
-                  <property name="decimals">
-                   <number>2</number>
+                 <widget class="QPushButton" name="btnEngineSettings">
+                  <property name="enabled">
+                   <bool>true</bool>
                   </property>
-                 </widget>
-                </item>
-                <item>
-                 <widget class="QLabel" name="label_27">
                   <property name="text">
-                   <string>mm</string>
+                   <string>Engine settings</string>
                   </property>
                  </widget>
                 </item>
@@ -329,666 +505,495 @@
               </item>
              </layout>
             </widget>
-            <widget class="QWidget" name="pageOptionsEmpty"/>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item row="3" column="0">
-        <layout class="QGridLayout" name="gridLayout_8">
-         <item row="0" column="0" rowspan="2">
-          <widget class="QGroupBox" name="groupBox_6">
-           <property name="title">
-            <string>Text style</string>
-           </property>
-           <layout class="QGridLayout" name="gridLayout_9">
-            <item row="0" column="0">
-             <widget class="QLabel" name="label_28">
-              <property name="sizePolicy">
-               <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-                <horstretch>0</horstretch>
-                <verstretch>0</verstretch>
-               </sizepolicy>
+           </item>
+           <item row="0" column="0">
+            <widget class="QGroupBox" name="groupBox_5">
+             <property name="title">
+              <string>Placement</string>
+             </property>
+             <layout class="QHBoxLayout" name="horizontalLayout_12">
+              <property name="leftMargin">
+               <number>0</number>
               </property>
-              <property name="text">
-               <string>Font</string>
+              <property name="topMargin">
+               <number>0</number>
               </property>
-              <property name="alignment">
-               <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+              <property name="rightMargin">
+               <number>0</number>
               </property>
-             </widget>
-            </item>
-            <item row="0" column="1">
-             <layout class="QHBoxLayout" name="horizontalLayout_15">
+              <property name="bottomMargin">
+               <number>4</number>
+              </property>
               <item>
-               <widget class="QLabel" name="lblFontName">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
-                  <horstretch>1</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
+               <widget class="QStackedWidget" name="stackedPlacement">
+                <property name="currentIndex">
+                 <number>2</number>
                 </property>
-                <property name="text">
-                 <string>TextLabel</string>
-                </property>
+                <widget class="QWidget" name="pagePoint">
+                 <layout class="QVBoxLayout" name="verticalLayout_6">
+                  <item>
+                   <widget class="QRadioButton" name="radAroundPoint">
+                    <property name="text">
+                     <string>around point</string>
+                    </property>
+                    <property name="checked">
+                     <bool>true</bool>
+                    </property>
+                   </widget>
+                  </item>
+                  <item>
+                   <widget class="QRadioButton" name="radOverPoint">
+                    <property name="text">
+                     <string>over point</string>
+                    </property>
+                   </widget>
+                  </item>
+                 </layout>
+                </widget>
+                <widget class="QWidget" name="pageLine">
+                 <layout class="QVBoxLayout" name="verticalLayout_7">
+                  <item>
+                   <widget class="QRadioButton" name="radLineParallel">
+                    <property name="text">
+                     <string>parallel</string>
+                    </property>
+                    <property name="checked">
+                     <bool>true</bool>
+                    </property>
+                   </widget>
+                  </item>
+                  <item>
+                   <widget class="QRadioButton" name="radLineCurved">
+                    <property name="text">
+                     <string>curved</string>
+                    </property>
+                   </widget>
+                  </item>
+                  <item>
+                   <widget class="QRadioButton" name="radLineHorizontal">
+                    <property name="text">
+                     <string>horizontal</string>
+                    </property>
+                   </widget>
+                  </item>
+                 </layout>
+                </widget>
+                <widget class="QWidget" name="pagePolygon">
+                 <layout class="QVBoxLayout" name="verticalLayout_8">
+                  <item>
+                   <widget class="QRadioButton" name="radOverCentroid">
+                    <property name="text">
+                     <string>over centroid</string>
+                    </property>
+                    <property name="checked">
+                     <bool>true</bool>
+                    </property>
+                   </widget>
+                  </item>
+                  <item>
+                   <widget class="QRadioButton" name="radAroundCentroid">
+                    <property name="text">
+                     <string>around centroid</string>
+                    </property>
+                   </widget>
+                  </item>
+                  <item>
+                   <widget class="QRadioButton" name="radPolygonHorizontal">
+                    <property name="text">
+                     <string>horizontal (slow)</string>
+                    </property>
+                   </widget>
+                  </item>
+                  <item>
+                   <widget class="QRadioButton" name="radPolygonFree">
+                    <property name="text">
+                     <string>free (slow)</string>
+                    </property>
+                   </widget>
+                  </item>
+                  <item>
+                   <widget class="QRadioButton" name="radPolygonPerimeter">
+                    <property name="text">
+                     <string>using perimeter</string>
+                    </property>
+                   </widget>
+                  </item>
+                 </layout>
+                </widget>
                </widget>
               </item>
               <item>
-               <spacer name="horizontalSpacer_6">
+               <widget class="Line" name="line_3">
                 <property name="orientation">
-                 <enum>Qt::Horizontal</enum>
+                 <enum>Qt::Vertical</enum>
                 </property>
-                <property name="sizeHint" stdset="0">
-                 <size>
-                  <width>40</width>
-                  <height>20</height>
-                 </size>
-                </property>
-               </spacer>
+               </widget>
               </item>
               <item>
-               <widget class="QToolButton" name="btnChangeFont">
-                <property name="text">
-                 <string>...</string>
+               <widget class="QStackedWidget" name="stackedOptions">
+                <property name="currentIndex">
+                 <number>1</number>
                 </property>
+                <widget class="QWidget" name="pageOptionsPoint">
+                 <layout class="QGridLayout" name="gridLayout_7">
+                  <item row="0" column="0">
+                   <widget class="QLabel" name="label_21">
+                    <property name="text">
+                     <string>Label distance</string>
+                    </property>
+                    <property name="alignment">
+                     <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+                    </property>
+                   </widget>
+                  </item>
+                  <item row="0" column="1">
+                   <widget class="QDoubleSpinBox" name="spinDistPoint">
+                    <property name="decimals">
+                     <number>2</number>
+                    </property>
+                   </widget>
+                  </item>
+                  <item row="0" column="2">
+                   <widget class="QLabel" name="label_22">
+                    <property name="text">
+                     <string>mm</string>
+                    </property>
+                   </widget>
+                  </item>
+                  <item row="1" column="0">
+                   <widget class="QLabel" name="label_23">
+                    <property name="text">
+                     <string>Rotation</string>
+                    </property>
+                    <property name="alignment">
+                     <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+                    </property>
+                   </widget>
+                  </item>
+                  <item row="1" column="1">
+                   <widget class="QSpinBox" name="spinAngle">
+                    <property name="enabled">
+                     <bool>false</bool>
+                    </property>
+                   </widget>
+                  </item>
+                  <item row="1" column="2">
+                   <widget class="QLabel" name="label_24">
+                    <property name="text">
+                     <string>degrees</string>
+                    </property>
+                   </widget>
+                  </item>
+                 </layout>
+                </widget>
+                <widget class="QWidget" name="pageOptionsLine">
+                 <layout class="QVBoxLayout" name="verticalLayout_9">
+                  <item>
+                   <widget class="QCheckBox" name="chkLineAbove">
+                    <property name="text">
+                     <string>above line</string>
+                    </property>
+                    <property name="checked">
+                     <bool>true</bool>
+                    </property>
+                   </widget>
+                  </item>
+                  <item>
+                   <widget class="QCheckBox" name="chkLineOn">
+                    <property name="text">
+                     <string>on line</string>
+                    </property>
+                   </widget>
+                  </item>
+                  <item>
+                   <widget class="QCheckBox" name="chkLineBelow">
+                    <property name="text">
+                     <string>below line</string>
+                    </property>
+                   </widget>
+                  </item>
+                  <item>
+                   <layout class="QHBoxLayout" name="horizontalLayout_13">
+                    <item>
+                     <widget class="QLabel" name="label_25">
+                      <property name="text">
+                       <string>Orientation</string>
+                      </property>
+                     </widget>
+                    </item>
+                    <item>
+                     <widget class="QRadioButton" name="radOrientationMap">
+                      <property name="text">
+                       <string>map</string>
+                      </property>
+                      <property name="checked">
+                       <bool>true</bool>
+                      </property>
+                     </widget>
+                    </item>
+                    <item>
+                     <widget class="QRadioButton" name="radOrientationLine">
+                      <property name="text">
+                       <string>line</string>
+                      </property>
+                     </widget>
+                    </item>
+                   </layout>
+                  </item>
+                  <item>
+                   <layout class="QHBoxLayout" name="horizontalLayout_14">
+                    <item>
+                     <widget class="QLabel" name="label_26">
+                      <property name="text">
+                       <string>Label distance</string>
+                      </property>
+                      <property name="alignment">
+                       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+                      </property>
+                     </widget>
+                    </item>
+                    <item>
+                     <widget class="QDoubleSpinBox" name="spinDistLine">
+                      <property name="decimals">
+                       <number>2</number>
+                      </property>
+                     </widget>
+                    </item>
+                    <item>
+                     <widget class="QLabel" name="label_27">
+                      <property name="text">
+                       <string>mm</string>
+                      </property>
+                     </widget>
+                    </item>
+                   </layout>
+                  </item>
+                 </layout>
+                </widget>
+                <widget class="QWidget" name="pageOptionsEmpty"/>
                </widget>
               </item>
              </layout>
-            </item>
-            <item row="2" column="0">
-             <widget class="QLabel" name="label_29">
-              <property name="sizePolicy">
-               <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-                <horstretch>0</horstretch>
-                <verstretch>0</verstretch>
-               </sizepolicy>
-              </property>
-              <property name="text">
-               <string>Color</string>
-              </property>
-              <property name="alignment">
-               <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-              </property>
-             </widget>
-            </item>
-            <item row="2" column="1">
-             <layout class="QHBoxLayout" name="horizontalLayout_16">
-              <item>
-               <widget class="QgsColorButton" name="btnTextColor">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
+            </widget>
+           </item>
+          </layout>
+         </widget>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="tab_4">
+      <attribute name="title">
+       <string>Data defined settings</string>
+      </attribute>
+      <layout class="QGridLayout" name="gridLayout_3">
+       <item row="3" column="1">
+        <widget class="QScrollArea" name="scrollArea">
+         <property name="widgetResizable">
+          <bool>true</bool>
+         </property>
+         <widget class="QWidget" name="scrollAreaWidgetContents">
+          <property name="geometry">
+           <rect>
+            <x>0</x>
+            <y>0</y>
+            <width>645</width>
+            <height>615</height>
+           </rect>
+          </property>
+          <layout class="QGridLayout" name="gridLayout_11">
+           <item row="0" column="0">
+            <widget class="QGroupBox" name="mFontAttributePropertiesGroupBox">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+             <property name="title">
+              <string>Font properties</string>
+             </property>
+             <layout class="QGridLayout" name="gridLayout">
+              <item row="0" column="0">
+               <widget class="QLabel" name="mSizeLabel">
+                <property name="text">
+                 <string>Size</string>
                 </property>
+               </widget>
+              </item>
+              <item row="0" column="1">
+               <widget class="QComboBox" name="mSizeAttributeComboBox"/>
+              </item>
+              <item row="1" column="0">
+               <widget class="QLabel" name="mColorLabel">
                 <property name="text">
-                 <string/>
+                 <string>Color</string>
                 </property>
                </widget>
               </item>
-              <item>
-               <spacer name="horizontalSpacer_7">
-                <property name="orientation">
-                 <enum>Qt::Horizontal</enum>
+              <item row="1" column="1">
+               <widget class="QComboBox" name="mColorAttributeComboBox"/>
+              </item>
+              <item row="2" column="0">
+               <widget class="QLabel" name="mBoldLabel">
+                <property name="text">
+                 <string>Bold</string>
                 </property>
-                <property name="sizeType">
-                 <enum>QSizePolicy::Preferred</enum>
+               </widget>
+              </item>
+              <item row="2" column="1">
+               <widget class="QComboBox" name="mBoldAttributeComboBox"/>
+              </item>
+              <item row="3" column="0">
+               <widget class="QLabel" name="mItalicLabel">
+                <property name="text">
+                 <string>Italic</string>
                 </property>
-                <property name="sizeHint" stdset="0">
-                 <size>
-                  <width>142</width>
-                  <height>20</height>
-                 </size>
+               </widget>
+              </item>
+              <item row="3" column="1">
+               <widget class="QComboBox" name="mItalicAttributeComboBox"/>
+              </item>
+              <item row="4" column="0">
+               <widget class="QLabel" name="mUnderlineLabel">
+                <property name="text">
+                 <string>Underline</string>
                 </property>
-               </spacer>
+               </widget>
               </item>
-             </layout>
-            </item>
-            <item row="3" column="0">
-             <widget class="QLabel" name="label_30">
-              <property name="text">
-               <string>Buffer</string>
-              </property>
-              <property name="alignment">
-               <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-              </property>
-             </widget>
-            </item>
-            <item row="3" column="1">
-             <layout class="QHBoxLayout" name="horizontalLayout_17">
-              <item>
-               <widget class="QCheckBox" name="chkBuffer">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
+              <item row="4" column="1">
+               <widget class="QComboBox" name="mUnderlineAttributeComboBox"/>
+              </item>
+              <item row="5" column="0">
+               <widget class="QLabel" name="mStrikeoutLabel">
+                <property name="text">
+                 <string>Strikeout</string>
                 </property>
+               </widget>
+              </item>
+              <item row="5" column="1">
+               <widget class="QComboBox" name="mStrikeoutAttributeComboBox"/>
+              </item>
+              <item row="6" column="0">
+               <widget class="QLabel" name="mFontFamilyLabel">
                 <property name="text">
-                 <string/>
+                 <string>Font family</string>
                 </property>
                </widget>
               </item>
-              <item>
-               <widget class="QLabel" name="label_31">
+              <item row="6" column="1">
+               <widget class="QComboBox" name="mFontFamilyAttributeComboBox"/>
+              </item>
+             </layout>
+            </widget>
+           </item>
+           <item row="1" column="0">
+            <widget class="QGroupBox" name="mBufferAttributesPropertiesGroupBox">
+             <property name="title">
+              <string>Buffer properties</string>
+             </property>
+             <layout class="QGridLayout" name="gridLayout_2">
+              <item row="0" column="0">
+               <widget class="QLabel" name="mBufferSizeLabel">
                 <property name="text">
-                 <string>Size</string>
+                 <string>Buffer size</string>
                 </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+               </widget>
+              </item>
+              <item row="0" column="1">
+               <widget class="QComboBox" name="mBufferSizeAttributeComboBox"/>
+              </item>
+              <item row="1" column="0">
+               <widget class="QLabel" name="mBufferColorLabel">
+                <property name="text">
+                 <string>Buffer color</string>
                 </property>
                </widget>
               </item>
-              <item>
-               <widget class="QDoubleSpinBox" name="spinBufferSize">
-                <property name="suffix">
-                 <string> mm</string>
+              <item row="1" column="1">
+               <widget class="QComboBox" name="mBufferColorAttributeComboBox"/>
+              </item>
+             </layout>
+            </widget>
+           </item>
+           <item row="2" column="0">
+            <widget class="QGroupBox" name="mPositionAttributeGroupBox">
+             <property name="title">
+              <string>Position</string>
+             </property>
+             <layout class="QGridLayout" name="gridLayout_4">
+              <item row="1" column="0">
+               <widget class="QLabel" name="mXCoordinateLabel">
+                <property name="text">
+                 <string>X Coordinate</string>
                 </property>
                </widget>
               </item>
-              <item>
-               <widget class="QLabel" name="label_32">
+              <item row="1" column="1">
+               <widget class="QComboBox" name="mXCoordinateComboBox"/>
+              </item>
+              <item row="2" column="0">
+               <widget class="QLabel" name="mYCoordinateLabel">
                 <property name="text">
-                 <string>Color</string>
+                 <string>Y Coordinate</string>
                 </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+               </widget>
+              </item>
+              <item row="2" column="1">
+               <widget class="QComboBox" name="mYCoordinateComboBox"/>
+              </item>
+              <item row="3" column="0">
+               <widget class="QLabel" name="mHorizontalAlignmentLabel">
+                <property name="text">
+                 <string>Horizontal alignment</string>
                 </property>
                </widget>
               </item>
-              <item>
-               <widget class="QgsColorButton" name="btnBufferColor">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
+              <item row="3" column="1">
+               <widget class="QComboBox" name="mHorizontalAlignmentComboBox"/>
+              </item>
+              <item row="4" column="0">
+               <widget class="QLabel" name="mVerticalAlignmentLabel">
                 <property name="text">
-                 <string>...</string>
+                 <string>Vertical alignment</string>
                 </property>
                </widget>
               </item>
-             </layout>
-            </item>
-            <item row="5" column="0">
-             <widget class="QLabel" name="label_33">
-              <property name="sizePolicy">
-               <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-                <horstretch>0</horstretch>
-                <verstretch>0</verstretch>
-               </sizepolicy>
-              </property>
-              <property name="text">
-               <string>Sample</string>
-              </property>
-              <property name="alignment">
-               <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-              </property>
-             </widget>
-            </item>
-            <item row="5" column="1">
-             <widget class="QgsLabelPreview" name="lblFontPreview">
-              <property name="sizePolicy">
-               <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-                <horstretch>0</horstretch>
-                <verstretch>0</verstretch>
-               </sizepolicy>
-              </property>
-              <property name="minimumSize">
-               <size>
-                <width>30</width>
-                <height>30</height>
-               </size>
-              </property>
-              <property name="text">
-               <string>Lorem Ipsum</string>
-              </property>
-              <property name="alignment">
-               <set>Qt::AlignCenter</set>
-              </property>
-             </widget>
-            </item>
-            <item row="4" column="0" colspan="2">
-             <widget class="Line" name="line_4">
-              <property name="orientation">
-               <enum>Qt::Horizontal</enum>
-              </property>
-             </widget>
-            </item>
-            <item row="1" column="0">
-             <widget class="QLabel" name="mFontSizeLabel">
-              <property name="text">
-               <string>Font size</string>
-              </property>
-             </widget>
-            </item>
-            <item row="1" column="1">
-             <layout class="QHBoxLayout" name="horizontalLayout">
-              <item>
-               <widget class="QDoubleSpinBox" name="mFontSizeSpinBox">
-                <property name="decimals">
-                 <number>4</number>
+              <item row="4" column="1">
+               <widget class="QComboBox" name="mVerticalAlignmentComboBox"/>
+              </item>
+              <item row="5" column="1">
+               <widget class="QComboBox" name="mRotationComboBox"/>
+              </item>
+              <item row="5" column="0">
+               <widget class="QLabel" name="mRotationLabel">
+                <property name="text">
+                 <string>Rotation</string>
                 </property>
-                <property name="maximum">
-                 <double>999999999.000000000000000</double>
-                </property>
                </widget>
               </item>
-              <item>
-               <widget class="QComboBox" name="mFontSizeUnitComboBox">
-                <item>
-                 <property name="text">
-                  <string>In points</string>
-                 </property>
-                </item>
-                <item>
-                 <property name="text">
-                  <string>In map units</string>
-                 </property>
-                </item>
+              <item row="0" column="1">
+               <widget class="QComboBox" name="mLabelDistanceComboBox"/>
+              </item>
+              <item row="0" column="0">
+               <widget class="QLabel" name="mLabelDistanceLabel">
+                <property name="text">
+                 <string>Label distance</string>
+                </property>
                </widget>
               </item>
              </layout>
-            </item>
-           </layout>
-          </widget>
-         </item>
-         <item row="0" column="1">
-          <widget class="QGroupBox" name="groupBox_7">
-           <property name="title">
-            <string>Priority</string>
-           </property>
-           <layout class="QHBoxLayout" name="horizontalLayout_18">
-            <item>
-             <widget class="QLabel" name="label_34">
-              <property name="text">
-               <string>Low</string>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QSlider" name="sliderPriority">
-              <property name="maximum">
-               <number>10</number>
-              </property>
-              <property name="value">
-               <number>5</number>
-              </property>
-              <property name="orientation">
-               <enum>Qt::Horizontal</enum>
-              </property>
-              <property name="tickPosition">
-               <enum>QSlider::TicksBelow</enum>
-              </property>
-              <property name="tickInterval">
-               <number>1</number>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QLabel" name="label_35">
-              <property name="text">
-               <string>High</string>
-              </property>
-             </widget>
-            </item>
-           </layout>
-          </widget>
-         </item>
-         <item row="1" column="1">
-          <widget class="QGroupBox" name="groupBox_8">
-           <property name="title">
-            <string>Scale-based visibility</string>
-           </property>
-           <layout class="QGridLayout" name="gridLayout_10">
-            <item row="0" column="0" colspan="2">
-             <widget class="QCheckBox" name="chkScaleBasedVisibility">
-              <property name="text">
-               <string>Enabled</string>
-              </property>
-             </widget>
-            </item>
-            <item row="1" column="0">
-             <widget class="QLabel" name="label_36">
-              <property name="text">
-               <string>Minimum</string>
-              </property>
-              <property name="alignment">
-               <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-              </property>
-             </widget>
-            </item>
-            <item row="1" column="1">
-             <widget class="QSpinBox" name="spinScaleMin">
-              <property name="minimum">
-               <number>1</number>
-              </property>
-              <property name="maximum">
-               <number>10000000</number>
-              </property>
-             </widget>
-            </item>
-            <item row="2" column="0">
-             <widget class="QLabel" name="label_37">
-              <property name="text">
-               <string>Maximum</string>
-              </property>
-              <property name="alignment">
-               <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-              </property>
-             </widget>
-            </item>
-            <item row="2" column="1">
-             <widget class="QSpinBox" name="spinScaleMax">
-              <property name="minimum">
-               <number>1</number>
-              </property>
-              <property name="maximum">
-               <number>10000000</number>
-              </property>
-              <property name="value">
-               <number>10000000</number>
-              </property>
-             </widget>
-            </item>
-           </layout>
-          </widget>
-         </item>
-        </layout>
-       </item>
-       <item row="4" column="0">
-        <widget class="QCheckBox" name="chkLabelPerFeaturePart">
-         <property name="text">
-          <string>label every part of multi-part features</string>
-         </property>
+            </widget>
+           </item>
+          </layout>
+         </widget>
         </widget>
        </item>
-       <item row="5" column="0">
-        <widget class="QCheckBox" name="chkMergeLines">
-         <property name="text">
-          <string>merge connected lines to avoid duplicate labels</string>
-         </property>
-        </widget>
-       </item>
-       <item row="6" column="0">
-        <widget class="QCheckBox" name="chkMultiLine">
-         <property name="text">
-          <string>multiline labels</string>
-         </property>
-        </widget>
-       </item>
-       <item row="8" column="0">
-        <layout class="QHBoxLayout" name="horizontalLayout_19">
-         <item>
-          <widget class="QLabel" name="label_19">
-           <property name="text">
-            <string>Suppress labeling of features smaller than</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QDoubleSpinBox" name="mMinSizeSpinBox">
-           <property name="suffix">
-            <string> mm</string>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </item>
-       <item row="9" column="0">
-        <layout class="QHBoxLayout" name="horizontalLayout_20">
-         <item>
-          <widget class="QCheckBox" name="chkNoObstacle">
-           <property name="enabled">
-            <bool>true</bool>
-           </property>
-           <property name="text">
-            <string>features don't act as obstacles for labels</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <spacer name="horizontalSpacer_8">
-           <property name="orientation">
-            <enum>Qt::Horizontal</enum>
-           </property>
-           <property name="sizeHint" stdset="0">
-            <size>
-             <width>40</width>
-             <height>20</height>
-            </size>
-           </property>
-          </spacer>
-         </item>
-         <item>
-          <widget class="QPushButton" name="btnEngineSettings">
-           <property name="enabled">
-            <bool>true</bool>
-           </property>
-           <property name="text">
-            <string>Engine settings</string>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </item>
-       <item row="7" column="0">
-        <widget class="QCheckBox" name="chkAddDirectionSymbol">
-         <property name="text">
-          <string>add direction symbol</string>
-         </property>
-        </widget>
-       </item>
       </layout>
      </widget>
-     <widget class="QWidget" name="tab_4">
-      <attribute name="title">
-       <string>Data defined settings</string>
-      </attribute>
-      <layout class="QGridLayout" name="gridLayout_3">
-       <item row="0" column="0">
-        <widget class="QGroupBox" name="mFontAttributePropertiesGroupBox">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="title">
-          <string>Font properties</string>
-         </property>
-         <layout class="QGridLayout" name="gridLayout">
-          <item row="0" column="0">
-           <widget class="QLabel" name="mSizeLabel">
-            <property name="text">
-             <string>Size</string>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="1">
-           <widget class="QComboBox" name="mSizeAttributeComboBox"/>
-          </item>
-          <item row="1" column="0">
-           <widget class="QLabel" name="mColorLabel">
-            <property name="text">
-             <string>Color</string>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="1">
-           <widget class="QComboBox" name="mColorAttributeComboBox"/>
-          </item>
-          <item row="2" column="0">
-           <widget class="QLabel" name="mBoldLabel">
-            <property name="text">
-             <string>Bold</string>
-            </property>
-           </widget>
-          </item>
-          <item row="2" column="1">
-           <widget class="QComboBox" name="mBoldAttributeComboBox"/>
-          </item>
-          <item row="3" column="0">
-           <widget class="QLabel" name="mItalicLabel">
-            <property name="text">
-             <string>Italic</string>
-            </property>
-           </widget>
-          </item>
-          <item row="3" column="1">
-           <widget class="QComboBox" name="mItalicAttributeComboBox"/>
-          </item>
-          <item row="4" column="0">
-           <widget class="QLabel" name="mUnderlineLabel">
-            <property name="text">
-             <string>Underline</string>
-            </property>
-           </widget>
-          </item>
-          <item row="4" column="1">
-           <widget class="QComboBox" name="mUnderlineAttributeComboBox"/>
-          </item>
-          <item row="5" column="0">
-           <widget class="QLabel" name="mStrikeoutLabel">
-            <property name="text">
-             <string>Strikeout</string>
-            </property>
-           </widget>
-          </item>
-          <item row="5" column="1">
-           <widget class="QComboBox" name="mStrikeoutAttributeComboBox"/>
-          </item>
-          <item row="6" column="0">
-           <widget class="QLabel" name="mFontFamilyLabel">
-            <property name="text">
-             <string>Font family</string>
-            </property>
-           </widget>
-          </item>
-          <item row="6" column="1">
-           <widget class="QComboBox" name="mFontFamilyAttributeComboBox"/>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item row="1" column="0">
-        <widget class="QGroupBox" name="mBufferAttributesPropertiesGroupBox">
-         <property name="title">
-          <string>Buffer properties</string>
-         </property>
-         <layout class="QGridLayout" name="gridLayout_2">
-          <item row="0" column="0">
-           <widget class="QLabel" name="mBufferSizeLabel">
-            <property name="text">
-             <string>Buffer size</string>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="1">
-           <widget class="QComboBox" name="mBufferSizeAttributeComboBox"/>
-          </item>
-          <item row="1" column="0">
-           <widget class="QLabel" name="mBufferColorLabel">
-            <property name="text">
-             <string>Buffer color</string>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="1">
-           <widget class="QComboBox" name="mBufferColorAttributeComboBox"/>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item row="2" column="0">
-        <widget class="QGroupBox" name="mPositionAttributeGroupBox">
-         <property name="title">
-          <string>Position</string>
-         </property>
-         <layout class="QGridLayout" name="gridLayout_4">
-          <item row="1" column="0">
-           <widget class="QLabel" name="mXCoordinateLabel">
-            <property name="text">
-             <string>X Coordinate</string>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="1">
-           <widget class="QComboBox" name="mXCoordinateComboBox"/>
-          </item>
-          <item row="2" column="0">
-           <widget class="QLabel" name="mYCoordinateLabel">
-            <property name="text">
-             <string>Y Coordinate</string>
-            </property>
-           </widget>
-          </item>
-          <item row="2" column="1">
-           <widget class="QComboBox" name="mYCoordinateComboBox"/>
-          </item>
-          <item row="3" column="0">
-           <widget class="QLabel" name="mHorizontalAlignmentLabel">
-            <property name="text">
-             <string>Horizontal alignment</string>
-            </property>
-           </widget>
-          </item>
-          <item row="3" column="1">
-           <widget class="QComboBox" name="mHorizontalAlignmentComboBox"/>
-          </item>
-          <item row="4" column="0">
-           <widget class="QLabel" name="mVerticalAlignmentLabel">
-            <property name="text">
-             <string>Vertical alignment</string>
-            </property>
-           </widget>
-          </item>
-          <item row="4" column="1">
-           <widget class="QComboBox" name="mVerticalAlignmentComboBox"/>
-          </item>
-          <item row="5" column="1">
-           <widget class="QComboBox" name="mRotationComboBox"/>
-          </item>
-          <item row="5" column="0">
-           <widget class="QLabel" name="mRotationLabel">
-            <property name="text">
-             <string>Rotation</string>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="1">
-           <widget class="QComboBox" name="mLabelDistanceComboBox"/>
-          </item>
-          <item row="0" column="0">
-           <widget class="QLabel" name="mLabelDistanceLabel">
-            <property name="text">
-             <string>Label distance</string>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item row="3" column="0">
-        <spacer name="verticalSpacer">
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>20</width>
-           <height>521</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-      </layout>
-     </widget>
     </widget>
    </item>
-   <item row="1" column="0">
+   <item row="3" column="0">
     <widget class="QDialogButtonBox" name="buttonBox">
      <property name="orientation">
       <enum>Qt::Horizontal</enum>



More information about the QGIS-commit mailing list