[QGIS Commit] r12103 - trunk/qgis/src/ui
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Sat Nov 14 06:21:34 EST 2009
Author: timlinux
Date: 2009-11-14 06:21:34 -0500 (Sat, 14 Nov 2009)
New Revision: 12103
Modified:
trunk/qgis/src/ui/qgslabeldialogbase.ui
Log:
Fix for missing label field combo
Modified: trunk/qgis/src/ui/qgslabeldialogbase.ui
===================================================================
--- trunk/qgis/src/ui/qgslabeldialogbase.ui 2009-11-13 20:05:18 UTC (rev 12102)
+++ trunk/qgis/src/ui/qgslabeldialogbase.ui 2009-11-14 11:21:34 UTC (rev 12103)
@@ -6,7 +6,7 @@
<rect>
<x>0</x>
<y>0</y>
- <width>668</width>
+ <width>642</width>
<height>516</height>
</rect>
</property>
@@ -23,63 +23,7 @@
<property name="margin">
<number>0</number>
</property>
- <item row="0" column="0" rowspan="2" colspan="2">
- <layout class="QHBoxLayout">
- <item>
- <widget class="QLabel" name="textLabel5">
- <property name="text">
- <string>Field containing label</string>
- </property>
- <property name="buddy">
- <cstring>cboLabelField</cstring>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QComboBox" name="cboLabelField">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
- <horstretch>1</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="minimumSize">
- <size>
- <width>0</width>
- <height>20</height>
- </size>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLabel" name="textLabel1">
- <property name="text">
- <string>Default label</string>
- </property>
- <property name="buddy">
- <cstring>leDefaultLabel</cstring>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLineEdit" name="leDefaultLabel">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
- <horstretch>2</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="minimumSize">
- <size>
- <width>0</width>
- <height>20</height>
- </size>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- <item row="1" column="1">
+ <item row="0" column="0">
<widget class="QScrollArea" name="scrollArea">
<property name="widgetResizable">
<bool>true</bool>
@@ -88,104 +32,163 @@
<property name="geometry">
<rect>
<x>0</x>
- <y>0</y>
- <width>639</width>
- <height>1455</height>
+ <y>-990</y>
+ <width>619</width>
+ <height>1440</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout">
- <item row="0" column="0" colspan="2">
+ <item row="0" column="0">
<layout class="QGridLayout">
<item row="0" column="0">
- <widget class="QPushButton" name="btnDefaultFont">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
- <horstretch>2</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
+ <widget class="QGroupBox" name="groupBox_8">
+ <property name="title">
+ <string>Basic label options</string>
</property>
- <property name="text">
- <string>Font</string>
- </property>
+ <layout class="QGridLayout" name="gridLayout_8">
+ <item row="0" column="0">
+ <widget class="QLabel" name="textLabel5">
+ <property name="text">
+ <string>Field containing label</string>
+ </property>
+ <property name="buddy">
+ <cstring>cboLabelField</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="2">
+ <widget class="QComboBox" name="cboLabelField">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+ <horstretch>1</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="textLabel1">
+ <property name="text">
+ <string>Default label</string>
+ </property>
+ <property name="buddy">
+ <cstring>leDefaultLabel</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="2">
+ <widget class="QLineEdit" name="leDefaultLabel">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+ <horstretch>2</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="0">
+ <widget class="QPushButton" name="btnDefaultFont">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+ <horstretch>2</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string>Font</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1">
+ <widget class="QLabel" name="textLabel5_2_2_3_2">
+ <property name="text">
+ <string>Font size</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+ </property>
+ <property name="buddy">
+ <cstring>spinFontSize</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="2">
+ <widget class="QDoubleSpinBox" name="spinFontSize">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>50</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="decimals">
+ <number>6</number>
+ </property>
+ <property name="maximum">
+ <double>1000000.000000000000000</double>
+ </property>
+ <property name="value">
+ <double>0.000000000000000</double>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="0">
+ <widget class="QPushButton" name="pbnDefaultFontColor">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+ <horstretch>2</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string>Color</string>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="1">
+ <widget class="QLabel" name="textLabel1_2_2_2_2_2">
+ <property name="text">
+ <string>Angle (deg)</string>
+ </property>
+ <property name="buddy">
+ <cstring>spinAngle</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="2">
+ <widget class="QSpinBox" name="spinAngle">
+ <property name="suffix">
+ <string>°</string>
+ </property>
+ <property name="maximum">
+ <number>360</number>
+ </property>
+ <property name="value">
+ <number>0</number>
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="0">
+ <widget class="QCheckBox" name="chkUseMultiline">
+ <property name="text">
+ <string>Multiline labels?</string>
+ </property>
+ <property name="checked">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ </layout>
</widget>
</item>
- <item row="0" column="1">
- <widget class="QLabel" name="textLabel5_2_2_3_2">
- <property name="text">
- <string>Font size</string>
- </property>
- <property name="alignment">
- <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
- </property>
- <property name="buddy">
- <cstring>spinFontSize</cstring>
- </property>
- </widget>
- </item>
- <item row="0" column="2">
- <widget class="QDoubleSpinBox" name="spinFontSize">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="minimumSize">
- <size>
- <width>50</width>
- <height>0</height>
- </size>
- </property>
- <property name="decimals">
- <number>6</number>
- </property>
- <property name="maximum">
- <double>1000000.000000000000000</double>
- </property>
- <property name="value">
- <double>0.000000000000000</double>
- </property>
- </widget>
- </item>
- <item row="1" column="0">
- <widget class="QPushButton" name="pbnDefaultFontColor">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
- <horstretch>2</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text">
- <string>Color</string>
- </property>
- </widget>
- </item>
- <item row="1" column="1">
- <widget class="QLabel" name="textLabel1_2_2_2_2_2">
- <property name="text">
- <string>Angle (deg)</string>
- </property>
- <property name="buddy">
- <cstring>spinAngle</cstring>
- </property>
- </widget>
- </item>
- <item row="1" column="2">
- <widget class="QSpinBox" name="spinAngle">
- <property name="suffix">
- <string>°</string>
- </property>
- <property name="maximum">
- <number>360</number>
- </property>
- <property name="value">
- <number>0</number>
- </property>
- </widget>
- </item>
</layout>
</item>
- <item row="1" column="0" colspan="2">
+ <item row="1" column="0">
<widget class="QGroupBox" name="groupBox_2">
<property name="title">
<string>Placement</string>
@@ -263,7 +266,7 @@
</layout>
</widget>
</item>
- <item row="2" column="0" colspan="2">
+ <item row="3" column="0">
<widget class="QGroupBox" name="groupBox_3">
<property name="title">
<string>Font size units</string>
@@ -286,7 +289,7 @@
</layout>
</widget>
</item>
- <item row="3" column="0" colspan="2">
+ <item row="4" column="0">
<widget class="QGroupBox" name="chkUseScaleDependentRendering">
<property name="title">
<string>Use scale dependent rendering</string>
@@ -347,155 +350,145 @@
</layout>
</widget>
</item>
- <item row="4" column="0" colspan="2">
- <widget class="QCheckBox" name="chkUseMultiline">
- <property name="text">
- <string>Multiline labels?</string>
- </property>
- <property name="checked">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item row="5" column="0">
- <widget class="QCheckBox" name="chkUseBuffer">
- <property name="text">
- <string>Buffer labels?</string>
- </property>
- <property name="checked">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item row="6" column="0">
- <widget class="QLabel" name="textLabel4_3_2_2">
- <property name="text">
- <string>Buffer size</string>
- </property>
- </widget>
- </item>
- <item row="6" column="1">
- <widget class="QDoubleSpinBox" name="spinBufferSize"/>
- </item>
- <item row="7" column="0">
- <widget class="QLabel" name="textLabel5_2_2_3">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="text">
- <string>Transparency</string>
- </property>
- <property name="alignment">
- <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
- </property>
- </widget>
- </item>
- <item row="7" column="1">
- <widget class="QSpinBox" name="spinBufferTransparency">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="sizePolicy">
- <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="minimumSize">
- <size>
- <width>50</width>
- <height>0</height>
- </size>
- </property>
- <property name="suffix">
- <string>%</string>
- </property>
- <property name="maximum">
- <number>100</number>
- </property>
- <property name="value">
- <number>0</number>
- </property>
- </widget>
- </item>
- <item row="8" column="0" colspan="2">
- <widget class="QPushButton" name="pbnDefaultBufferColor_2">
- <property name="text">
- <string>Color</string>
- </property>
- </widget>
- </item>
- <item row="9" column="0" colspan="2">
+ <item row="10" column="0">
<widget class="QGroupBox" name="groupBox_4">
<property name="title">
<string>Buffer size units</string>
</property>
- <layout class="QGridLayout">
- <item row="0" column="0">
+ <layout class="QGridLayout" name="gridLayout_9">
+ <item row="1" column="0">
+ <widget class="QLabel" name="textLabel4_3_2_2">
+ <property name="text">
+ <string>Buffer size</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="QDoubleSpinBox" name="spinBufferSize"/>
+ </item>
+ <item row="2" column="0">
<widget class="QRadioButton" name="radioBufferUnitsPoints">
<property name="text">
<string>Size is in points</string>
</property>
</widget>
</item>
- <item row="1" column="0">
+ <item row="2" column="1">
<widget class="QRadioButton" name="radioBufferUnitsMap">
<property name="text">
<string>Size is in map units</string>
</property>
</widget>
</item>
+ <item row="3" column="0">
+ <widget class="QLabel" name="textLabel5_2_2_3">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="text">
+ <string>Transparency</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="1">
+ <widget class="QSpinBox" name="spinBufferTransparency">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>50</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="suffix">
+ <string>%</string>
+ </property>
+ <property name="maximum">
+ <number>100</number>
+ </property>
+ <property name="value">
+ <number>0</number>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="0">
+ <widget class="QCheckBox" name="chkUseBuffer">
+ <property name="text">
+ <string>Buffer labels?</string>
+ </property>
+ <property name="checked">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QPushButton" name="pbnDefaultBufferColor_2">
+ <property name="text">
+ <string>Color</string>
+ </property>
+ </widget>
+ </item>
</layout>
</widget>
</item>
- <item row="10" column="0">
+ <item row="11" column="0">
<widget class="QGroupBox" name="buttonGroup10">
<property name="title">
<string>Offset units</string>
</property>
<layout class="QGridLayout" name="gridLayout_2">
- <item row="1" column="0">
- <widget class="QDoubleSpinBox" name="spinXOffset">
- <property name="minimum">
- <double>-99.000000000000000</double>
+ <item row="0" column="0">
+ <widget class="QLabel" name="textLabel1_2_2_2_3">
+ <property name="text">
+ <string>Y Offset (pts)</string>
</property>
</widget>
</item>
- <item row="3" column="0">
+ <item row="0" column="1">
<widget class="QLabel" name="textLabel1_2_3_2">
<property name="text">
<string>X Offset (pts)</string>
</property>
</widget>
</item>
- <item row="4" column="0">
+ <item row="1" column="0">
+ <widget class="QDoubleSpinBox" name="spinXOffset">
+ <property name="minimum">
+ <double>-99.000000000000000</double>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
<widget class="QDoubleSpinBox" name="spinYOffset">
<property name="minimum">
<double>-99.000000000000000</double>
</property>
</widget>
</item>
- <item row="5" column="0">
+ <item row="2" column="0">
<widget class="QRadioButton" name="radioOffsetUnitsPoints">
<property name="text">
<string>Points</string>
</property>
</widget>
</item>
- <item row="5" column="1">
+ <item row="2" column="1">
<widget class="QRadioButton" name="radioOffsetUnitsMap">
<property name="text">
<string>Map units</string>
</property>
</widget>
</item>
- <item row="0" column="0">
- <widget class="QLabel" name="textLabel1_2_2_2_3">
- <property name="text">
- <string>Y Offset (pts)</string>
- </property>
- </widget>
- </item>
</layout>
</widget>
</item>
@@ -540,46 +533,33 @@
</layout>
</widget>
</item>
- <item row="14" column="0">
- <widget class="QGroupBox" name="groupBox_6">
+ <item row="13" column="0">
+ <widget class="QGroupBox" name="groupBox">
<property name="title">
- <string>Data defined buffer</string>
+ <string>Data defined properties</string>
</property>
- <layout class="QGridLayout" name="gridLayout_5">
+ <layout class="QGridLayout" name="gridLayout_3">
<item row="0" column="0">
- <widget class="QLabel" name="textLabel1_3_2_2_2">
- <property name="enabled">
- <bool>false</bool>
- </property>
+ <widget class="QLabel" name="lblFont">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
- <size>
- <width>70</width>
- <height>0</height>
- </size>
- </property>
<property name="text">
- <string>Transparency:</string>
+ <string>&Font family</string>
</property>
<property name="buddy">
- <cstring>cboBufferTransparencyField</cstring>
+ <cstring>cboFontField</cstring>
</property>
</widget>
</item>
<item row="0" column="1">
- <widget class="QComboBox" name="cboBufferTransparencyField">
- <property name="enabled">
- <bool>false</bool>
- </property>
- </widget>
+ <widget class="QComboBox" name="cboFontField"/>
</item>
<item row="1" column="0">
- <widget class="QLabel" name="textLabel4_3_2_2_2">
+ <widget class="QLabel" name="textLabel4">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
@@ -587,27 +567,18 @@
</sizepolicy>
</property>
<property name="text">
- <string>Size:</string>
+ <string>&Bold</string>
</property>
<property name="buddy">
- <cstring>cboBufferSizeField</cstring>
+ <cstring>cboBoldField</cstring>
</property>
</widget>
</item>
<item row="1" column="1">
- <widget class="QComboBox" name="cboBufferSizeField"/>
+ <widget class="QComboBox" name="cboBoldField"/>
</item>
- </layout>
- </widget>
- </item>
- <item row="15" column="0">
- <widget class="QGroupBox" name="groupBox_7">
- <property name="title">
- <string>Data defined position</string>
- </property>
- <layout class="QGridLayout" name="gridLayout_6">
- <item row="0" column="0">
- <widget class="QLabel" name="textLabel1_2">
+ <item row="2" column="0">
+ <widget class="QLabel" name="textLabel4_2_4">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
@@ -615,15 +586,18 @@
</sizepolicy>
</property>
<property name="text">
- <string>X Coordinate</string>
+ <string>&Italic</string>
</property>
+ <property name="buddy">
+ <cstring>cboItalicField</cstring>
+ </property>
</widget>
</item>
- <item row="0" column="1">
- <widget class="QComboBox" name="cboXCoordinateField"/>
+ <item row="2" column="1">
+ <widget class="QComboBox" name="cboItalicField"/>
</item>
- <item row="1" column="0">
- <widget class="QLabel" name="textLabel1_2_2">
+ <item row="3" column="0">
+ <widget class="QLabel" name="textLabel4_3">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
@@ -631,15 +605,18 @@
</sizepolicy>
</property>
<property name="text">
- <string>Y Coordinate</string>
+ <string>&Underline</string>
</property>
+ <property name="buddy">
+ <cstring>cboUnderlineField</cstring>
+ </property>
</widget>
</item>
- <item row="1" column="1">
- <widget class="QComboBox" name="cboYCoordinateField"/>
+ <item row="3" column="1">
+ <widget class="QComboBox" name="cboUnderlineField"/>
</item>
- <item row="2" column="0">
- <widget class="QLabel" name="textLabel1_2_3">
+ <item row="4" column="0">
+ <widget class="QLabel" name="textLabel4_3_2">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
@@ -647,15 +624,18 @@
</sizepolicy>
</property>
<property name="text">
- <string>X Offset (pts)</string>
+ <string>&Size</string>
</property>
+ <property name="buddy">
+ <cstring>cboFontSizeField</cstring>
+ </property>
</widget>
</item>
- <item row="2" column="1">
- <widget class="QComboBox" name="cboXOffsetField"/>
+ <item row="4" column="1">
+ <widget class="QComboBox" name="cboFontSizeField"/>
</item>
- <item row="3" column="0">
- <widget class="QLabel" name="textLabel1_2_2_2">
+ <item row="5" column="0">
+ <widget class="QLabel" name="textLabel4_3_2_4">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
@@ -663,24 +643,21 @@
</sizepolicy>
</property>
<property name="text">
- <string>Y Offset (pts)</string>
+ <string>Size units</string>
</property>
+ <property name="buddy">
+ <cstring>cboFontSizeTypeField</cstring>
+ </property>
</widget>
</item>
- <item row="3" column="1">
- <widget class="QComboBox" name="cboYOffsetField"/>
+ <item row="5" column="1">
+ <widget class="QComboBox" name="cboFontSizeTypeField"/>
</item>
- </layout>
- </widget>
- </item>
- <item row="13" column="0">
- <widget class="QGroupBox" name="groupBox">
- <property name="title">
- <string>Data defined properties</string>
- </property>
- <layout class="QGridLayout" name="gridLayout_3">
- <item row="0" column="0">
- <widget class="QLabel" name="lblFont">
+ <item row="6" column="0">
+ <widget class="QLabel" name="textLabel4_3_2_3">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
@@ -688,18 +665,22 @@
</sizepolicy>
</property>
<property name="text">
- <string>&Font family</string>
+ <string>Transparency</string>
</property>
<property name="buddy">
- <cstring>cboFontField</cstring>
+ <cstring>cboFontTransparencyField</cstring>
</property>
</widget>
</item>
- <item row="0" column="1">
- <widget class="QComboBox" name="cboFontField"/>
+ <item row="6" column="1">
+ <widget class="QComboBox" name="cboFontTransparencyField">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ </widget>
</item>
- <item row="1" column="0">
- <widget class="QLabel" name="textLabel4">
+ <item row="7" column="0">
+ <widget class="QLabel" name="textLabel4_3_2_5">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
@@ -707,37 +688,59 @@
</sizepolicy>
</property>
<property name="text">
- <string>&Bold</string>
+ <string>&Color</string>
</property>
<property name="buddy">
- <cstring>cboBoldField</cstring>
+ <cstring>cboFontColorField</cstring>
</property>
</widget>
</item>
- <item row="1" column="1">
- <widget class="QComboBox" name="cboBoldField"/>
+ <item row="7" column="1">
+ <widget class="QComboBox" name="cboFontColorField"/>
</item>
- <item row="2" column="0">
- <widget class="QLabel" name="textLabel4_2_4">
+ </layout>
+ </widget>
+ </item>
+ <item row="14" column="0">
+ <widget class="QGroupBox" name="groupBox_6">
+ <property name="title">
+ <string>Data defined buffer</string>
+ </property>
+ <layout class="QGridLayout" name="gridLayout_5">
+ <item row="0" column="0">
+ <widget class="QLabel" name="textLabel1_3_2_2_2">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
+ <property name="minimumSize">
+ <size>
+ <width>70</width>
+ <height>0</height>
+ </size>
+ </property>
<property name="text">
- <string>&Italic</string>
+ <string>Transparency:</string>
</property>
<property name="buddy">
- <cstring>cboItalicField</cstring>
+ <cstring>cboBufferTransparencyField</cstring>
</property>
</widget>
</item>
- <item row="2" column="1">
- <widget class="QComboBox" name="cboItalicField"/>
+ <item row="0" column="1">
+ <widget class="QComboBox" name="cboBufferTransparencyField">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ </widget>
</item>
- <item row="3" column="0">
- <widget class="QLabel" name="textLabel4_3">
+ <item row="1" column="0">
+ <widget class="QLabel" name="textLabel4_3_2_2_2">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
@@ -745,18 +748,27 @@
</sizepolicy>
</property>
<property name="text">
- <string>&Underline</string>
+ <string>Size:</string>
</property>
<property name="buddy">
- <cstring>cboUnderlineField</cstring>
+ <cstring>cboBufferSizeField</cstring>
</property>
</widget>
</item>
- <item row="3" column="1">
- <widget class="QComboBox" name="cboUnderlineField"/>
+ <item row="1" column="1">
+ <widget class="QComboBox" name="cboBufferSizeField"/>
</item>
- <item row="4" column="0">
- <widget class="QLabel" name="textLabel4_3_2">
+ </layout>
+ </widget>
+ </item>
+ <item row="15" column="0">
+ <widget class="QGroupBox" name="groupBox_7">
+ <property name="title">
+ <string>Data defined position</string>
+ </property>
+ <layout class="QGridLayout" name="gridLayout_6">
+ <item row="0" column="0">
+ <widget class="QLabel" name="textLabel1_2">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
@@ -764,18 +776,15 @@
</sizepolicy>
</property>
<property name="text">
- <string>&Size</string>
+ <string>X Coordinate</string>
</property>
- <property name="buddy">
- <cstring>cboFontSizeField</cstring>
- </property>
</widget>
</item>
- <item row="4" column="1">
- <widget class="QComboBox" name="cboFontSizeField"/>
+ <item row="0" column="1">
+ <widget class="QComboBox" name="cboXCoordinateField"/>
</item>
- <item row="5" column="0">
- <widget class="QLabel" name="textLabel4_3_2_4">
+ <item row="1" column="0">
+ <widget class="QLabel" name="textLabel1_2_2">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
@@ -783,21 +792,15 @@
</sizepolicy>
</property>
<property name="text">
- <string>Size units</string>
+ <string>Y Coordinate</string>
</property>
- <property name="buddy">
- <cstring>cboFontSizeTypeField</cstring>
- </property>
</widget>
</item>
- <item row="5" column="1">
- <widget class="QComboBox" name="cboFontSizeTypeField"/>
+ <item row="1" column="1">
+ <widget class="QComboBox" name="cboYCoordinateField"/>
</item>
- <item row="6" column="0">
- <widget class="QLabel" name="textLabel4_3_2_3">
- <property name="enabled">
- <bool>false</bool>
- </property>
+ <item row="2" column="0">
+ <widget class="QLabel" name="textLabel1_2_3">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
@@ -805,22 +808,15 @@
</sizepolicy>
</property>
<property name="text">
- <string>Transparency</string>
+ <string>X Offset (pts)</string>
</property>
- <property name="buddy">
- <cstring>cboFontTransparencyField</cstring>
- </property>
</widget>
</item>
- <item row="6" column="1">
- <widget class="QComboBox" name="cboFontTransparencyField">
- <property name="enabled">
- <bool>false</bool>
- </property>
- </widget>
+ <item row="2" column="1">
+ <widget class="QComboBox" name="cboXOffsetField"/>
</item>
- <item row="7" column="0">
- <widget class="QLabel" name="textLabel4_3_2_5">
+ <item row="3" column="0">
+ <widget class="QLabel" name="textLabel1_2_2_2">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
@@ -828,15 +824,12 @@
</sizepolicy>
</property>
<property name="text">
- <string>&Color</string>
+ <string>Y Offset (pts)</string>
</property>
- <property name="buddy">
- <cstring>cboFontColorField</cstring>
- </property>
</widget>
</item>
- <item row="7" column="1">
- <widget class="QComboBox" name="cboFontColorField"/>
+ <item row="3" column="1">
+ <widget class="QComboBox" name="cboYOffsetField"/>
</item>
</layout>
</widget>
@@ -845,7 +838,7 @@
</widget>
</widget>
</item>
- <item row="2" column="0" colspan="2">
+ <item row="1" column="0">
<widget class="QGroupBox" name="groupBox5">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
@@ -880,12 +873,14 @@
</widget>
<layoutdefault spacing="6" margin="11"/>
<tabstops>
+ <tabstop>scrollArea</tabstop>
<tabstop>cboLabelField</tabstop>
<tabstop>leDefaultLabel</tabstop>
<tabstop>btnDefaultFont</tabstop>
<tabstop>spinFontSize</tabstop>
<tabstop>pbnDefaultFontColor</tabstop>
<tabstop>spinAngle</tabstop>
+ <tabstop>chkUseMultiline</tabstop>
<tabstop>radioAboveLeft</tabstop>
<tabstop>radioAbove</tabstop>
<tabstop>radioAboveRight</tabstop>
@@ -897,12 +892,35 @@
<tabstop>radioBelowRight</tabstop>
<tabstop>radioFontSizeUnitsPoints</tabstop>
<tabstop>radioFontSizeUnitsMap</tabstop>
+ <tabstop>chkUseScaleDependentRendering</tabstop>
<tabstop>spinMinimumScale</tabstop>
<tabstop>spinMaximumScale</tabstop>
+ <tabstop>chkUseBuffer</tabstop>
+ <tabstop>pbnDefaultBufferColor_2</tabstop>
+ <tabstop>spinBufferSize</tabstop>
+ <tabstop>radioBufferUnitsPoints</tabstop>
+ <tabstop>radioBufferUnitsMap</tabstop>
+ <tabstop>spinBufferTransparency</tabstop>
+ <tabstop>spinXOffset</tabstop>
+ <tabstop>spinYOffset</tabstop>
<tabstop>radioOffsetUnitsPoints</tabstop>
<tabstop>radioOffsetUnitsMap</tabstop>
- <tabstop>radioBufferUnitsPoints</tabstop>
- <tabstop>radioBufferUnitsMap</tabstop>
+ <tabstop>cboAlignmentField</tabstop>
+ <tabstop>cboAngleField</tabstop>
+ <tabstop>cboFontField</tabstop>
+ <tabstop>cboBoldField</tabstop>
+ <tabstop>cboItalicField</tabstop>
+ <tabstop>cboUnderlineField</tabstop>
+ <tabstop>cboFontSizeField</tabstop>
+ <tabstop>cboFontSizeTypeField</tabstop>
+ <tabstop>cboFontTransparencyField</tabstop>
+ <tabstop>cboFontColorField</tabstop>
+ <tabstop>cboBufferTransparencyField</tabstop>
+ <tabstop>cboBufferSizeField</tabstop>
+ <tabstop>cboXCoordinateField</tabstop>
+ <tabstop>cboYCoordinateField</tabstop>
+ <tabstop>cboXOffsetField</tabstop>
+ <tabstop>cboYOffsetField</tabstop>
</tabstops>
<resources/>
<connections>
More information about the QGIS-commit
mailing list