[QGIS Commit] r12642 - in trunk/qgis: python/core src/app src/core
src/ui
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Mon Dec 28 16:37:07 EST 2009
Author: jef
Date: 2009-12-28 16:37:07 -0500 (Mon, 28 Dec 2009)
New Revision: 12642
Modified:
trunk/qgis/python/core/qgslabel.sip
trunk/qgis/python/core/qgslabelattributes.sip
trunk/qgis/src/app/qgslabeldialog.cpp
trunk/qgis/src/core/qgslabel.cpp
trunk/qgis/src/core/qgslabel.h
trunk/qgis/src/core/qgslabelattributes.cpp
trunk/qgis/src/core/qgslabelattributes.h
trunk/qgis/src/ui/qgslabeldialogbase.ui
Log:
apply #2199
Modified: trunk/qgis/python/core/qgslabel.sip
===================================================================
--- trunk/qgis/python/core/qgslabel.sip 2009-12-28 21:35:24 UTC (rev 12641)
+++ trunk/qgis/python/core/qgslabel.sip 2009-12-28 21:37:07 UTC (rev 12642)
@@ -38,6 +38,7 @@
BorderColor,
BorderStyle,
MultilineEnabled,
+ StrikeOut, // added in 1.5
LabelFieldCount
};
Modified: trunk/qgis/python/core/qgslabelattributes.sip
===================================================================
--- trunk/qgis/python/core/qgslabelattributes.sip 2009-12-28 21:35:24 UTC (rev 12641)
+++ trunk/qgis/python/core/qgslabelattributes.sip 2009-12-28 21:37:07 UTC (rev 12642)
@@ -47,6 +47,11 @@
bool underlineIsSet ( ) const;
bool underline ( ) const;
+ /* strikeout added in 1.5 */
+ void setStrikeOut( bool enable );
+ bool strikeOutIsSet ( ) const;
+ bool strikeOut ( ) const;
+
void setSize ( double size, int type );
bool sizeIsSet ( ) const;
int sizeType ( ) const;
Modified: trunk/qgis/src/app/qgslabeldialog.cpp
===================================================================
--- trunk/qgis/src/app/qgslabeldialog.cpp 2009-12-28 21:35:24 UTC (rev 12641)
+++ trunk/qgis/src/app/qgslabeldialog.cpp 2009-12-28 21:37:07 UTC (rev 12642)
@@ -89,6 +89,10 @@
cboUnderlineField->addItems( myFieldStringList );
cboUnderlineField->setCurrentIndex( itemNoForField( mLabel->labelField( QgsLabel::Underline ), myFieldStringList ) );
+ cboStrikeOutField->clear();
+ cboStrikeOutField->addItems( myFieldStringList );
+ cboStrikeOutField->setCurrentIndex( itemNoForField( mLabel->labelField( QgsLabel::StrikeOut ), myFieldStringList ) );
+
cboFontSizeField->clear();
cboFontSizeField->addItems( myFieldStringList );
cboFontSizeField->setCurrentIndex( itemNoForField( mLabel->labelField( QgsLabel::Size ), myFieldStringList ) );
@@ -196,6 +200,14 @@
{
mFont.setUnderline( false );
}
+ if ( myLabelAttributes->strikeOutIsSet() )
+ {
+ mFont.setStrikeOut( myLabelAttributes->strikeOut() );
+ }
+ else
+ {
+ mFont.setStrikeOut( false );
+ }
mFontColor = myLabelAttributes->color();
@@ -270,8 +282,6 @@
//NOTE: do we need this line too? TS
spinBufferSize->setValue( myLabelAttributes->bufferSize() );
- //TODO - transparency attributes for buffers
-
}
@@ -364,6 +374,7 @@
myLabelAttributes->setBold( mFont.bold() );
myLabelAttributes->setItalic( mFont.italic() );
myLabelAttributes->setUnderline( mFont.underline() );
+ myLabelAttributes->setStrikeOut( mFont.strikeOut() );
myLabelAttributes->setColor( mFontColor );
myTypeInt = 0;
if ( radioOffsetUnitsPoints->isChecked() )
@@ -412,6 +423,7 @@
mLabel->setLabelField( QgsLabel::Bold, fieldIndexFromName( cboBoldField->currentText() ) );
mLabel->setLabelField( QgsLabel::Italic, fieldIndexFromName( cboItalicField->currentText() ) );
mLabel->setLabelField( QgsLabel::Underline, fieldIndexFromName( cboUnderlineField->currentText() ) );
+ mLabel->setLabelField( QgsLabel::StrikeOut, fieldIndexFromName( cboStrikeOutField->currentText() ) );
mLabel->setLabelField( QgsLabel::Size, fieldIndexFromName( cboFontSizeField->currentText() ) );
mLabel->setLabelField( QgsLabel::SizeType, fieldIndexFromName( cboFontSizeTypeField->currentText() ) );
mLabel->setLabelField( QgsLabel::Color, fieldIndexFromName( cboFontColorField->currentText() ) );
Modified: trunk/qgis/src/core/qgslabel.cpp
===================================================================
--- trunk/qgis/src/core/qgslabel.cpp 2009-12-28 21:35:24 UTC (rev 12641)
+++ trunk/qgis/src/core/qgslabel.cpp 2009-12-28 21:37:07 UTC (rev 12642)
@@ -207,6 +207,16 @@
font.setUnderline(( bool ) value.toInt() );
}
+ value = fieldValue( StrikeOut, feature );
+ if ( value.isEmpty() )
+ {
+ font.setStrikeOut( mLabelAttributes->strikeOut() );
+ }
+ else
+ {
+ font.setStrikeOut(( bool ) value.toInt() );
+ }
+
//
QgsPoint overridePoint;
bool useOverridePoint = false;
@@ -832,6 +842,20 @@
readLabelField( el, Underline );
}
+ /* Strikeout */
+ scratchNode = node.namedItem( "strikeout" );
+
+ if ( scratchNode.isNull() )
+ {
+ QgsDebugMsg( "couldn't find QgsLabel ``strikeout'' attribute" );
+ }
+ else
+ {
+ el = scratchNode.toElement();
+ mLabelAttributes->setStrikeOut(( bool )el.attribute( "on", "0" ).toInt() );
+ readLabelField( el, StrikeOut );
+ }
+
/* Color */
scratchNode = node.namedItem( "color" );
@@ -1130,6 +1154,27 @@
}
labelattributes.appendChild( underline );
+ // strikeout
+ QDomElement strikeOut = document.createElement( "strikeout" );
+ if ( mLabelAttributes->strikeOutIsSet() )
+ {
+ strikeOut.setAttribute( "on", mLabelAttributes->strikeOut() );
+ if ( mLabelFieldIdx[StrikeOut] != -1 )
+ {
+ strikeOut.setAttribute( "fieldname", labelField( StrikeOut ) );
+ }
+ else
+ {
+ strikeOut.setAttribute( "fieldname", "" );
+ }
+ }
+ else
+ {
+ strikeOut.setAttribute( "on", 0 );
+ strikeOut.setAttribute( "fieldname", "" );
+ }
+ labelattributes.appendChild( strikeOut );
+
// color
QDomElement color = document.createElement( "color" );
if ( mLabelAttributes->colorIsSet() )
Modified: trunk/qgis/src/core/qgslabel.h
===================================================================
--- trunk/qgis/src/core/qgslabel.h 2009-12-28 21:35:24 UTC (rev 12641)
+++ trunk/qgis/src/core/qgslabel.h 2009-12-28 21:37:07 UTC (rev 12642)
@@ -81,6 +81,7 @@
BorderColor,
BorderStyle,
MultilineEnabled,
+ StrikeOut, // added in 1.5
LabelFieldCount
};
Modified: trunk/qgis/src/core/qgslabelattributes.cpp
===================================================================
--- trunk/qgis/src/core/qgslabelattributes.cpp 2009-12-28 21:35:24 UTC (rev 12641)
+++ trunk/qgis/src/core/qgslabelattributes.cpp 2009-12-28 21:37:07 UTC (rev 12642)
@@ -31,6 +31,7 @@
mBoldIsSet( false ),
mItalicIsSet( false ),
mUnderlineIsSet( false ),
+ mStrikeOutIsSet( false ),
mSizeType( 0 ),
mSize( 0.0 ),
mSizeIsSet( false ),
@@ -247,7 +248,23 @@
return mFont.underline();
}
+void QgsLabelAttributes::setStrikeOut( bool enable )
+{
+ mFont.setStrikeOut( enable );
+ mStrikeOutIsSet = true;
+}
+bool QgsLabelAttributes::strikeOutIsSet( void ) const
+{
+ return mStrikeOutIsSet;
+}
+
+bool QgsLabelAttributes::strikeOut( void ) const
+{
+ return mFont.strikeOut();
+}
+
+
void QgsLabelAttributes::setSize( double size, int type )
{
mSizeType = type;
Modified: trunk/qgis/src/core/qgslabelattributes.h
===================================================================
--- trunk/qgis/src/core/qgslabelattributes.h 2009-12-28 21:35:24 UTC (rev 12641)
+++ trunk/qgis/src/core/qgslabelattributes.h 2009-12-28 21:37:07 UTC (rev 12642)
@@ -119,6 +119,11 @@
bool underlineIsSet( void ) const;
bool underline( void ) const;
+ /* strikeout added in 1.5 */
+ void setStrikeOut( bool enable );
+ bool strikeOutIsSet( void ) const;
+ bool strikeOut( void ) const;
+
void setSize( double size, int type );
bool sizeIsSet( void ) const;
int sizeType( void ) const;
@@ -185,12 +190,13 @@
QString mText;
bool mTextIsSet;
- /** Font (family, weight, italic, underline) */
+ /** Font (family, weight, italic, underline, strikeout) */
QFont mFont;
bool mFamilyIsSet;
bool mBoldIsSet;
bool mItalicIsSet;
bool mUnderlineIsSet;
+ bool mStrikeOutIsSet;
/** Font size, size type */
int mSizeType;
Modified: trunk/qgis/src/ui/qgslabeldialogbase.ui
===================================================================
--- trunk/qgis/src/ui/qgslabeldialogbase.ui 2009-12-28 21:35:24 UTC (rev 12641)
+++ trunk/qgis/src/ui/qgslabeldialogbase.ui 2009-12-28 21:37:07 UTC (rev 12642)
@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>642</width>
- <height>516</height>
+ <width>662</width>
+ <height>561</height>
</rect>
</property>
<property name="sizePolicy">
@@ -19,277 +19,275 @@
<property name="windowTitle">
<string>Form1</string>
</property>
- <layout class="QGridLayout" name="gridLayout_7">
- <property name="margin">
- <number>0</number>
- </property>
- <item row="0" column="0">
- <widget class="QScrollArea" name="scrollArea">
- <property name="widgetResizable">
- <bool>true</bool>
+ <layout class="QVBoxLayout" name="verticalLayout">
+ <item>
+ <widget class="QToolBox" name="toolBox">
+ <property name="currentIndex">
+ <number>0</number>
</property>
- <widget class="QWidget" name="scrollAreaWidgetContents_2">
+ <widget class="QWidget" name="page">
<property name="geometry">
<rect>
<x>0</x>
- <y>-990</y>
- <width>619</width>
- <height>1440</height>
+ <y>0</y>
+ <width>644</width>
+ <height>365</height>
</rect>
</property>
- <layout class="QGridLayout" name="gridLayout">
- <item row="0" column="0">
- <layout class="QGridLayout">
- <item row="0" column="0">
- <widget class="QGroupBox" name="groupBox_8">
- <property name="title">
- <string>Basic label options</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>
- </layout>
- </item>
- <item row="1" column="0">
- <widget class="QGroupBox" name="groupBox_2">
- <property name="title">
- <string>Placement</string>
- </property>
- <layout class="QGridLayout">
- <property name="margin">
- <number>11</number>
+ <attribute name="label">
+ <string>Basic label options and placement</string>
+ </attribute>
+ <widget class="QGroupBox" name="groupBox_8">
+ <property name="geometry">
+ <rect>
+ <x>10</x>
+ <y>0</y>
+ <width>621</width>
+ <height>174</height>
+ </rect>
+ </property>
+ <property name="title">
+ <string>Basic label options</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>
- <item row="2" column="2">
- <widget class="QRadioButton" name="radioBelowRight">
- <property name="text">
- <string>Below Right</string>
- </property>
- </widget>
- </item>
- <item row="1" column="2">
- <widget class="QRadioButton" name="radioRight">
- <property name="text">
- <string>Right</string>
- </property>
- </widget>
- </item>
- <item row="2" column="1">
- <widget class="QRadioButton" name="radioBelow">
- <property name="text">
- <string>Below</string>
- </property>
- </widget>
- </item>
- <item row="1" column="1">
- <widget class="QRadioButton" name="radioOver">
- <property name="text">
- <string>Over</string>
- </property>
- <property name="checked">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item row="0" column="1">
- <widget class="QRadioButton" name="radioAbove">
- <property name="text">
- <string>Above</string>
- </property>
- </widget>
- </item>
- <item row="1" column="0">
- <widget class="QRadioButton" name="radioLeft">
- <property name="text">
- <string>Left</string>
- </property>
- </widget>
- </item>
- <item row="2" column="0">
- <widget class="QRadioButton" name="radioBelowLeft">
- <property name="text">
- <string>Below Left</string>
- </property>
- </widget>
- </item>
- <item row="0" column="2">
- <widget class="QRadioButton" name="radioAboveRight">
- <property name="text">
- <string>Above Right</string>
- </property>
- </widget>
- </item>
- <item row="0" column="0">
- <widget class="QRadioButton" name="radioAboveLeft">
- <property name="text">
- <string>Above Left</string>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
- <item row="3" column="0">
- <widget class="QGroupBox" name="groupBox_3">
- <property name="title">
- <string>Font size units</string>
- </property>
- <layout class="QGridLayout">
- <item row="0" column="0">
- <widget class="QRadioButton" name="radioFontSizeUnitsPoints">
- <property name="text">
- <string>Points</string>
- </property>
- </widget>
- </item>
- <item row="0" column="1">
- <widget class="QRadioButton" name="radioFontSizeUnitsMap">
- <property name="text">
- <string>Map units</string>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
- <item row="4" column="0">
+ <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>
+ <widget class="QGroupBox" name="groupBox_2">
+ <property name="geometry">
+ <rect>
+ <x>10</x>
+ <y>180</y>
+ <width>621</width>
+ <height>106</height>
+ </rect>
+ </property>
+ <property name="title">
+ <string>Placement</string>
+ </property>
+ <layout class="QGridLayout">
+ <property name="margin">
+ <number>11</number>
+ </property>
+ <item row="2" column="2">
+ <widget class="QRadioButton" name="radioBelowRight">
+ <property name="text">
+ <string>Below Right</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="2">
+ <widget class="QRadioButton" name="radioRight">
+ <property name="text">
+ <string>Right</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1">
+ <widget class="QRadioButton" name="radioBelow">
+ <property name="text">
+ <string>Below</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="QRadioButton" name="radioOver">
+ <property name="text">
+ <string>Over</string>
+ </property>
+ <property name="checked">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QRadioButton" name="radioAbove">
+ <property name="text">
+ <string>Above</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="QRadioButton" name="radioLeft">
+ <property name="text">
+ <string>Left</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="0">
+ <widget class="QRadioButton" name="radioBelowLeft">
+ <property name="text">
+ <string>Below Left</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="2">
+ <widget class="QRadioButton" name="radioAboveRight">
+ <property name="text">
+ <string>Above Right</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="0">
+ <widget class="QRadioButton" name="radioAboveLeft">
+ <property name="text">
+ <string>Above Left</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </widget>
+ <widget class="QWidget" name="page_2">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>644</width>
+ <height>365</height>
+ </rect>
+ </property>
+ <attribute name="label">
+ <string>Scale dependent rendering, buffer labels, font size units and offset</string>
+ </attribute>
+ <layout class="QVBoxLayout" name="verticalLayout_2">
+ <item>
<widget class="QGroupBox" name="chkUseScaleDependentRendering">
<property name="title">
<string>Use scale dependent rendering</string>
@@ -350,7 +348,7 @@
</layout>
</widget>
</item>
- <item row="10" column="0">
+ <item>
<widget class="QGroupBox" name="chkUseBuffer">
<property name="enabled">
<bool>true</bool>
@@ -440,404 +438,465 @@
</layout>
</widget>
</item>
- <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="0" column="0">
- <widget class="QLabel" name="textLabel1_2_2_2_3">
- <property name="text">
- <string>X Offset (pts)</string>
- </property>
- </widget>
- </item>
- <item row="0" column="1">
- <widget class="QLabel" name="textLabel1_2_3_2">
- <property name="text">
- <string>Y Offset (pts)</string>
- </property>
- </widget>
- </item>
- <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="2" column="0">
- <widget class="QRadioButton" name="radioOffsetUnitsPoints">
- <property name="text">
- <string>Points</string>
- </property>
- </widget>
- </item>
- <item row="2" column="1">
- <widget class="QRadioButton" name="radioOffsetUnitsMap">
- <property name="text">
- <string>Map units</string>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_2">
+ <item>
+ <widget class="QGroupBox" name="groupBox_3">
+ <property name="title">
+ <string>Font size units</string>
+ </property>
+ <layout class="QGridLayout" name="_2">
+ <item row="0" column="0">
+ <widget class="QRadioButton" name="radioFontSizeUnitsPoints">
+ <property name="text">
+ <string>Points</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="QRadioButton" name="radioFontSizeUnitsMap">
+ <property name="text">
+ <string>Map units</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item>
+ <widget class="QGroupBox" name="buttonGroup10">
+ <property name="title">
+ <string>Offset units</string>
+ </property>
+ <layout class="QGridLayout" name="gridLayout">
+ <item row="0" column="0">
+ <widget class="QLabel" name="textLabel1_2_3_2">
+ <property name="text">
+ <string>X Offset (pts)</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QDoubleSpinBox" name="spinXOffset">
+ <property name="minimum">
+ <double>-99.000000000000000</double>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="2">
+ <widget class="QRadioButton" name="radioOffsetUnitsPoints">
+ <property name="text">
+ <string>Points</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="textLabel1_2_2_2_3">
+ <property name="text">
+ <string>Y Offset (pts)</string>
+ </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="1" column="2">
+ <widget class="QRadioButton" name="radioOffsetUnitsMap">
+ <property name="text">
+ <string>Map units</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ </layout>
</item>
- <item row="12" column="0">
- <widget class="QGroupBox" name="groupBox_5">
- <property name="title">
- <string>Data defined placement</string>
- </property>
- <layout class="QGridLayout" name="gridLayout_4">
- <item row="0" column="0">
- <widget class="QLabel" name="textLabel1_2_2_2_2_3">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text">
- <string>Placement</string>
- </property>
- </widget>
- </item>
- <item row="0" column="1">
- <widget class="QComboBox" name="cboAlignmentField"/>
- </item>
- <item row="1" column="0">
- <widget class="QLabel" name="textLabel1_2_2_2_2">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text">
- <string>Angle (deg)</string>
- </property>
- </widget>
- </item>
- <item row="1" column="1">
- <widget class="QComboBox" name="cboAngleField"/>
- </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">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text">
- <string>&Font family</string>
- </property>
- <property name="buddy">
- <cstring>cboFontField</cstring>
- </property>
- </widget>
- </item>
- <item row="0" column="1">
- <widget class="QComboBox" name="cboFontField"/>
- </item>
- <item row="1" column="0">
- <widget class="QLabel" name="textLabel4">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text">
- <string>&Bold</string>
- </property>
- <property name="buddy">
- <cstring>cboBoldField</cstring>
- </property>
- </widget>
- </item>
- <item row="1" column="1">
- <widget class="QComboBox" name="cboBoldField"/>
- </item>
- <item row="2" column="0">
- <widget class="QLabel" name="textLabel4_2_4">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text">
- <string>&Italic</string>
- </property>
- <property name="buddy">
- <cstring>cboItalicField</cstring>
- </property>
- </widget>
- </item>
- <item row="2" column="1">
- <widget class="QComboBox" name="cboItalicField"/>
- </item>
- <item row="3" column="0">
- <widget class="QLabel" name="textLabel4_3">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text">
- <string>&Underline</string>
- </property>
- <property name="buddy">
- <cstring>cboUnderlineField</cstring>
- </property>
- </widget>
- </item>
- <item row="3" column="1">
- <widget class="QComboBox" name="cboUnderlineField"/>
- </item>
- <item row="4" column="0">
- <widget class="QLabel" name="textLabel4_3_2">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text">
- <string>&Size</string>
- </property>
- <property name="buddy">
- <cstring>cboFontSizeField</cstring>
- </property>
- </widget>
- </item>
- <item row="4" column="1">
- <widget class="QComboBox" name="cboFontSizeField"/>
- </item>
- <item row="5" column="0">
- <widget class="QLabel" name="textLabel4_3_2_4">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text">
- <string>Size units</string>
- </property>
- <property name="buddy">
- <cstring>cboFontSizeTypeField</cstring>
- </property>
- </widget>
- </item>
- <item row="5" column="1">
- <widget class="QComboBox" name="cboFontSizeTypeField"/>
- </item>
- <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>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text">
- <string>Transparency</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>
- <item row="7" column="0">
- <widget class="QLabel" name="textLabel4_3_2_5">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text">
- <string>&Color</string>
- </property>
- <property name="buddy">
- <cstring>cboFontColorField</cstring>
- </property>
- </widget>
- </item>
- <item row="7" column="1">
- <widget class="QComboBox" name="cboFontColorField"/>
- </item>
- </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>Transparency:</string>
- </property>
- <property name="buddy">
- <cstring>cboBufferTransparencyField</cstring>
- </property>
- </widget>
- </item>
- <item row="0" column="1">
- <widget class="QComboBox" name="cboBufferTransparencyField">
- <property name="enabled">
- <bool>false</bool>
- </property>
- </widget>
- </item>
- <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>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text">
- <string>Size:</string>
- </property>
- <property name="buddy">
- <cstring>cboBufferSizeField</cstring>
- </property>
- </widget>
- </item>
- <item row="1" column="1">
- <widget class="QComboBox" name="cboBufferSizeField"/>
- </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">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text">
- <string>X Coordinate</string>
- </property>
- </widget>
- </item>
- <item row="0" column="1">
- <widget class="QComboBox" name="cboXCoordinateField"/>
- </item>
- <item row="1" column="0">
- <widget class="QLabel" name="textLabel1_2_2">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text">
- <string>Y Coordinate</string>
- </property>
- </widget>
- </item>
- <item row="1" column="1">
- <widget class="QComboBox" name="cboYCoordinateField"/>
- </item>
- <item row="2" column="0">
- <widget class="QLabel" name="textLabel1_2_3">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text">
- <string>X Offset (pts)</string>
- </property>
- </widget>
- </item>
- <item row="2" column="1">
- <widget class="QComboBox" name="cboXOffsetField"/>
- </item>
- <item row="3" column="0">
- <widget class="QLabel" name="textLabel1_2_2_2">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text">
- <string>Y Offset (pts)</string>
- </property>
- </widget>
- </item>
- <item row="3" column="1">
- <widget class="QComboBox" name="cboYOffsetField"/>
- </item>
- </layout>
- </widget>
- </item>
</layout>
</widget>
+ <widget class="QWidget" name="page_3">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>644</width>
+ <height>365</height>
+ </rect>
+ </property>
+ <attribute name="label">
+ <string>Data defined settings (placement and properties)</string>
+ </attribute>
+ <widget class="QGroupBox" name="groupBox_5">
+ <property name="geometry">
+ <rect>
+ <x>10</x>
+ <y>0</y>
+ <width>621</width>
+ <height>84</height>
+ </rect>
+ </property>
+ <property name="title">
+ <string>Data defined placement</string>
+ </property>
+ <layout class="QGridLayout" name="gridLayout_4">
+ <item row="0" column="0">
+ <widget class="QLabel" name="textLabel1_2_2_2_2_3">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string>Placement</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QComboBox" name="cboAlignmentField"/>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="textLabel1_2_2_2_2">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string>Angle (deg)</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="QComboBox" name="cboAngleField"/>
+ </item>
+ </layout>
+ </widget>
+ <widget class="QGroupBox" name="groupBox">
+ <property name="geometry">
+ <rect>
+ <x>10</x>
+ <y>90</y>
+ <width>621</width>
+ <height>246</height>
+ </rect>
+ </property>
+ <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">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string>&Font family</string>
+ </property>
+ <property name="buddy">
+ <cstring>cboFontField</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QComboBox" name="cboFontField"/>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="textLabel4">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string>&Bold</string>
+ </property>
+ <property name="buddy">
+ <cstring>cboBoldField</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="QComboBox" name="cboBoldField"/>
+ </item>
+ <item row="2" column="0">
+ <widget class="QLabel" name="textLabel4_2_4">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string>&Italic</string>
+ </property>
+ <property name="buddy">
+ <cstring>cboItalicField</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1">
+ <widget class="QComboBox" name="cboItalicField"/>
+ </item>
+ <item row="3" column="0">
+ <widget class="QLabel" name="textLabel4_3">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string>&Underline</string>
+ </property>
+ <property name="buddy">
+ <cstring>cboUnderlineField</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="1">
+ <widget class="QComboBox" name="cboUnderlineField"/>
+ </item>
+ <item row="6" column="0">
+ <widget class="QLabel" name="textLabel4_3_2">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string>&Size</string>
+ </property>
+ <property name="buddy">
+ <cstring>cboFontSizeField</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="6" column="1">
+ <widget class="QComboBox" name="cboFontSizeField"/>
+ </item>
+ <item row="7" column="0">
+ <widget class="QLabel" name="textLabel4_3_2_4">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string>Size units</string>
+ </property>
+ <property name="buddy">
+ <cstring>cboFontSizeTypeField</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="7" column="1">
+ <widget class="QComboBox" name="cboFontSizeTypeField"/>
+ </item>
+ <item row="8" column="0">
+ <widget class="QLabel" name="textLabel4_3_2_5">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string>&Color</string>
+ </property>
+ <property name="buddy">
+ <cstring>cboFontColorField</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="8" column="1">
+ <widget class="QComboBox" name="cboFontColorField"/>
+ </item>
+ <item row="4" column="1">
+ <widget class="QComboBox" name="cboStrikeOutField"/>
+ </item>
+ <item row="4" column="0">
+ <widget class="QLabel" name="label">
+ <property name="text">
+ <string>Strikeout</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </widget>
+ <widget class="QWidget" name="page_4">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>644</width>
+ <height>365</height>
+ </rect>
+ </property>
+ <attribute name="label">
+ <string>Data defined settings: buffer and position</string>
+ </attribute>
+ <widget class="QGroupBox" name="groupBox_6">
+ <property name="geometry">
+ <rect>
+ <x>10</x>
+ <y>0</y>
+ <width>621</width>
+ <height>84</height>
+ </rect>
+ </property>
+ <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>Transparency:</string>
+ </property>
+ <property name="buddy">
+ <cstring>cboBufferTransparencyField</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QComboBox" name="cboBufferTransparencyField">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ </widget>
+ </item>
+ <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>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string>Size:</string>
+ </property>
+ <property name="buddy">
+ <cstring>cboBufferSizeField</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="QComboBox" name="cboBufferSizeField"/>
+ </item>
+ </layout>
+ </widget>
+ <widget class="QGroupBox" name="groupBox_7">
+ <property name="geometry">
+ <rect>
+ <x>10</x>
+ <y>90</y>
+ <width>621</width>
+ <height>138</height>
+ </rect>
+ </property>
+ <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>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string>X Coordinate</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QComboBox" name="cboXCoordinateField"/>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="textLabel1_2_2">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string>Y Coordinate</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="QComboBox" name="cboYCoordinateField"/>
+ </item>
+ <item row="2" column="0">
+ <widget class="QLabel" name="textLabel1_2_3">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string>X Offset (pts)</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1">
+ <widget class="QComboBox" name="cboXOffsetField"/>
+ </item>
+ <item row="3" column="0">
+ <widget class="QLabel" name="textLabel1_2_2_2">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string>Y Offset (pts)</string>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="1">
+ <widget class="QComboBox" name="cboYOffsetField"/>
+ </item>
+ </layout>
+ </widget>
+ </widget>
</widget>
</item>
- <item row="1" column="0">
+ <item>
<widget class="QGroupBox" name="groupBox5">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
@@ -872,7 +931,6 @@
</widget>
<layoutdefault spacing="6" margin="11"/>
<tabstops>
- <tabstop>scrollArea</tabstop>
<tabstop>cboLabelField</tabstop>
<tabstop>leDefaultLabel</tabstop>
<tabstop>btnDefaultFont</tabstop>
@@ -889,21 +947,13 @@
<tabstop>radioBelowLeft</tabstop>
<tabstop>radioBelow</tabstop>
<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>cboAlignmentField</tabstop>
<tabstop>cboAngleField</tabstop>
<tabstop>cboFontField</tabstop>
@@ -912,7 +962,7 @@
<tabstop>cboUnderlineField</tabstop>
<tabstop>cboFontSizeField</tabstop>
<tabstop>cboFontSizeTypeField</tabstop>
- <tabstop>cboFontTransparencyField</tabstop>
+ <tabstop>cboStrikeOutField</tabstop>
<tabstop>cboFontColorField</tabstop>
<tabstop>cboBufferTransparencyField</tabstop>
<tabstop>cboBufferSizeField</tabstop>
More information about the QGIS-commit
mailing list