[QGIS Commit] r12095 - in trunk/qgis/src: app
plugins/diagram_overlay ui
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Wed Nov 11 17:06:34 EST 2009
Author: timlinux
Date: 2009-11-11 17:06:32 -0500 (Wed, 11 Nov 2009)
New Revision: 12095
Modified:
trunk/qgis/src/app/qgslabeldialog.cpp
trunk/qgis/src/plugins/diagram_overlay/qgslinearlyscalingdialogbase.ui
trunk/qgis/src/plugins/diagram_overlay/qgssvgdiagramfactorywidgetbase.ui
trunk/qgis/src/plugins/diagram_overlay/qgswkndiagramfactorywidgetbase.ui
trunk/qgis/src/ui/qgsattributeactiondialogbase.ui
trunk/qgis/src/ui/qgslabeldialogbase.ui
trunk/qgis/src/ui/qgssinglesymboldialogbase.ui
trunk/qgis/src/ui/qgsvectorlayerpropertiesbase.ui
Log:
[FEATURE] UI cleanups in prep of using property lists. Main visual difference is that labels dont have property lists no in vec props
Modified: trunk/qgis/src/app/qgslabeldialog.cpp
===================================================================
--- trunk/qgis/src/app/qgslabeldialog.cpp 2009-11-11 21:37:52 UTC (rev 12094)
+++ trunk/qgis/src/app/qgslabeldialog.cpp 2009-11-11 22:06:32 UTC (rev 12095)
@@ -264,7 +264,6 @@
spinBufferSize->setValue( myLabelAttributes->bufferSize() );
//TODO - transparency attributes for buffers
- listWidget->setItemSelected( listWidget->item( 0 ), true );
}
Modified: trunk/qgis/src/plugins/diagram_overlay/qgslinearlyscalingdialogbase.ui
===================================================================
--- trunk/qgis/src/plugins/diagram_overlay/qgslinearlyscalingdialogbase.ui 2009-11-11 21:37:52 UTC (rev 12094)
+++ trunk/qgis/src/plugins/diagram_overlay/qgslinearlyscalingdialogbase.ui 2009-11-11 22:06:32 UTC (rev 12095)
@@ -14,11 +14,17 @@
<string>Form</string>
</property>
<layout class="QGridLayout">
+ <property name="margin">
+ <number>0</number>
+ </property>
<item row="0" column="0">
<widget class="QLabel" name="mTitleLabel">
<property name="text">
<string>Scale linearly between 0 and the following attribute value/ diagram size:</string>
</property>
+ <property name="wordWrap">
+ <bool>true</bool>
+ </property>
</widget>
</item>
<item row="1" column="0">
Modified: trunk/qgis/src/plugins/diagram_overlay/qgssvgdiagramfactorywidgetbase.ui
===================================================================
--- trunk/qgis/src/plugins/diagram_overlay/qgssvgdiagramfactorywidgetbase.ui 2009-11-11 21:37:52 UTC (rev 12094)
+++ trunk/qgis/src/plugins/diagram_overlay/qgssvgdiagramfactorywidgetbase.ui 2009-11-11 22:06:32 UTC (rev 12095)
@@ -1,7 +1,8 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
<class>QgsSVGDiagramFactoryWidgetBase</class>
- <widget class="QWidget" name="QgsSVGDiagramFactoryWidgetBase" >
- <property name="geometry" >
+ <widget class="QWidget" name="QgsSVGDiagramFactoryWidgetBase">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
@@ -9,28 +10,31 @@
<height>342</height>
</rect>
</property>
- <property name="windowTitle" >
+ <property name="windowTitle">
<string>Form</string>
</property>
- <layout class="QGridLayout" >
- <item row="0" column="0" >
- <widget class="QGroupBox" name="mSearchDirectoriesGroupBox" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
+ <layout class="QGridLayout">
+ <property name="margin">
+ <number>0</number>
+ </property>
+ <item row="0" column="0">
+ <widget class="QGroupBox" name="mSearchDirectoriesGroupBox">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="title" >
+ <property name="title">
<string>Search directories</string>
</property>
- <layout class="QGridLayout" >
- <item row="0" column="0" >
+ <layout class="QGridLayout">
+ <item row="0" column="0">
<spacer>
- <property name="orientation" >
+ <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0">
<size>
<width>101</width>
<height>20</height>
@@ -38,24 +42,24 @@
</property>
</spacer>
</item>
- <item row="0" column="1" >
- <widget class="QPushButton" name="mAddDirectoryButton" >
- <property name="text" >
+ <item row="0" column="1">
+ <widget class="QPushButton" name="mAddDirectoryButton">
+ <property name="text">
<string>Add...</string>
</property>
</widget>
</item>
- <item row="0" column="2" >
- <widget class="QPushButton" name="mRemoveDirectoryButton" >
- <property name="text" >
+ <item row="0" column="2">
+ <widget class="QPushButton" name="mRemoveDirectoryButton">
+ <property name="text">
<string>Remove</string>
</property>
</widget>
</item>
- <item row="1" column="0" colspan="3" >
- <widget class="QComboBox" name="mSearchDirectoriesComboBox" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
+ <item row="1" column="0" colspan="3">
+ <widget class="QComboBox" name="mSearchDirectoriesComboBox">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -65,39 +69,39 @@
</layout>
</widget>
</item>
- <item row="1" column="0" >
- <widget class="QGroupBox" name="mPreviewGroupBox" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
+ <item row="1" column="0">
+ <widget class="QGroupBox" name="mPreviewGroupBox">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="title" >
+ <property name="title">
<string>SVG Preview</string>
</property>
- <layout class="QGridLayout" >
- <item row="0" column="0" >
- <widget class="QListWidget" name="mPreviewListWidget" >
- <property name="movement" >
+ <layout class="QGridLayout">
+ <item row="0" column="0">
+ <widget class="QListWidget" name="mPreviewListWidget">
+ <property name="movement">
<enum>QListView::Free</enum>
</property>
- <property name="flow" >
+ <property name="flow">
<enum>QListView::LeftToRight</enum>
</property>
- <property name="isWrapping" stdset="0" >
+ <property name="isWrapping" stdset="0">
<bool>true</bool>
</property>
- <property name="gridSize" >
+ <property name="gridSize">
<size>
<width>30</width>
<height>30</height>
</size>
</property>
- <property name="viewMode" >
+ <property name="viewMode">
<enum>QListView::IconMode</enum>
</property>
- <property name="wordWrap" >
+ <property name="wordWrap">
<bool>true</bool>
</property>
</widget>
@@ -105,43 +109,22 @@
</layout>
</widget>
</item>
- <item row="2" column="0" >
- <layout class="QHBoxLayout" >
- <property name="spacing" >
+ <item row="2" column="0">
+ <layout class="QHBoxLayout">
+ <property name="spacing">
<number>6</number>
</property>
- <property name="leftMargin" >
+ <property name="margin">
<number>0</number>
</property>
- <property name="topMargin" >
- <number>0</number>
- </property>
- <property name="rightMargin" >
- <number>0</number>
- </property>
- <property name="bottomMargin" >
- <number>0</number>
- </property>
<item>
- <widget class="QLineEdit" name="mPictureLineEdit" />
+ <widget class="QLineEdit" name="mPictureLineEdit"/>
</item>
<item>
- <widget class="QPushButton" name="mPictureBrowseButton" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
+ <widget class="QToolButton" name="mPictureBrowseButton">
+ <property name="text">
+ <string>...</string>
</property>
- <property name="maximumSize" >
- <size>
- <width>150</width>
- <height>32767</height>
- </size>
- </property>
- <property name="text" >
- <string>Browse...</string>
- </property>
</widget>
</item>
</layout>
Modified: trunk/qgis/src/plugins/diagram_overlay/qgswkndiagramfactorywidgetbase.ui
===================================================================
--- trunk/qgis/src/plugins/diagram_overlay/qgswkndiagramfactorywidgetbase.ui 2009-11-11 21:37:52 UTC (rev 12094)
+++ trunk/qgis/src/plugins/diagram_overlay/qgswkndiagramfactorywidgetbase.ui 2009-11-11 22:06:32 UTC (rev 12095)
@@ -6,14 +6,17 @@
<rect>
<x>0</x>
<y>0</y>
- <width>342</width>
+ <width>412</width>
<height>277</height>
</rect>
</property>
<property name="windowTitle">
<string>Form</string>
</property>
- <layout class="QGridLayout">
+ <layout class="QGridLayout" name="gridLayout">
+ <property name="margin">
+ <number>0</number>
+ </property>
<item row="0" column="0">
<layout class="QHBoxLayout">
<property name="spacing">
@@ -30,51 +33,48 @@
</widget>
</item>
<item>
- <widget class="QComboBox" name="mAttributesComboBox"/>
+ <widget class="QComboBox" name="mAttributesComboBox">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ </widget>
</item>
</layout>
</item>
- <item row="1" column="0">
- <layout class="QGridLayout">
- <property name="margin">
- <number>0</number>
+ <item row="0" column="1">
+ <widget class="QPushButton" name="mAddPushButton">
+ <property name="text">
+ <string>Add</string>
</property>
- <property name="spacing">
- <number>6</number>
+ </widget>
+ </item>
+ <item row="0" column="2">
+ <widget class="QPushButton" name="mRemovePushButton">
+ <property name="text">
+ <string>Remove</string>
</property>
- <item row="1" column="0" colspan="2">
- <widget class="QTreeWidget" name="mAttributesTreeWidget">
- <property name="columnCount">
- <number>2</number>
- </property>
- <column>
- <property name="text">
- <string>1</string>
- </property>
- </column>
- <column>
- <property name="text">
- <string>1</string>
- </property>
- </column>
- </widget>
- </item>
- <item row="0" column="1">
- <widget class="QPushButton" name="mRemovePushButton">
- <property name="text">
- <string>Remove attribute</string>
- </property>
- </widget>
- </item>
- <item row="0" column="0">
- <widget class="QPushButton" name="mAddPushButton">
- <property name="text">
- <string>Add attribute</string>
- </property>
- </widget>
- </item>
- </layout>
+ </widget>
</item>
+ <item row="1" column="0" colspan="3">
+ <widget class="QTreeWidget" name="mAttributesTreeWidget">
+ <property name="columnCount">
+ <number>2</number>
+ </property>
+ <column>
+ <property name="text">
+ <string>1</string>
+ </property>
+ </column>
+ <column>
+ <property name="text">
+ <string>1</string>
+ </property>
+ </column>
+ </widget>
+ </item>
</layout>
</widget>
<tabstops>
Modified: trunk/qgis/src/ui/qgsattributeactiondialogbase.ui
===================================================================
--- trunk/qgis/src/ui/qgsattributeactiondialogbase.ui 2009-11-11 21:37:52 UTC (rev 12094)
+++ trunk/qgis/src/ui/qgsattributeactiondialogbase.ui 2009-11-11 22:06:32 UTC (rev 12095)
@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>424</width>
- <height>339</height>
+ <width>552</width>
+ <height>432</height>
</rect>
</property>
<property name="sizePolicy">
@@ -19,16 +19,16 @@
<property name="windowTitle">
<string>Attribute Actions</string>
</property>
- <layout class="QGridLayout">
+ <layout class="QGridLayout" name="gridLayout_3">
<property name="margin">
<number>0</number>
</property>
- <item row="0" column="0" colspan="2">
+ <item row="0" column="0">
<widget class="QGroupBox" name="groupBox">
<property name="title">
<string>Action properties</string>
</property>
- <layout class="QGridLayout">
+ <layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QLabel" name="textLabel1">
<property name="whatsThis">
@@ -42,7 +42,7 @@
</property>
</widget>
</item>
- <item row="0" column="1" colspan="3">
+ <item row="0" column="1">
<widget class="QLineEdit" name="actionName">
<property name="toolTip">
<string>Enter the action name here</string>
@@ -65,184 +65,201 @@
</property>
</widget>
</item>
- <item row="1" column="1" colspan="2">
- <widget class="QLineEdit" name="actionAction">
+ <item row="1" column="1">
+ <layout class="QHBoxLayout" name="horizontalLayout">
+ <item>
+ <widget class="QLineEdit" name="actionAction">
+ <property name="toolTip">
+ <string>Enter the action command here</string>
+ </property>
+ <property name="whatsThis">
+ <string>Enter the action here. This can be any program, script or command that is available on your system. When the action is invoked any set of characters that start with a % and then have the name of a field will be replaced by the value of that field. The special characters %% will be replaced by the value of the field that was selected. Double quote marks group text into single arguments to the program, script or command. Double quotes will be ignored if prefixed with a backslash</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QToolButton" name="browseButton">
+ <property name="toolTip">
+ <string>Browse for action</string>
+ </property>
+ <property name="statusTip">
+ <string>Click to browse for an action</string>
+ </property>
+ <property name="whatsThis">
+ <string>Clicking the button will let you select an application to use as the action</string>
+ </property>
+ <property name="text">
+ <string>...</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item row="2" column="0">
+ <widget class="QCheckBox" name="captureCB">
<property name="toolTip">
- <string>Enter the action command here</string>
+ <string>Captures any output from the action</string>
</property>
<property name="whatsThis">
- <string>Enter the action here. This can be any program, script or command that is available on your system. When the action is invoked any set of characters that start with a % and then have the name of a field will be replaced by the value of that field. The special characters %% will be replaced by the value of the field that was selected. Double quote marks group text into single arguments to the program, script or command. Double quotes will be ignored if prefixed with a backslash</string>
+ <string>Captures the standard output or error generated by the action and displays it in a dialog box</string>
</property>
+ <property name="text">
+ <string>Capture output</string>
+ </property>
</widget>
</item>
- <item row="1" column="3">
- <widget class="QToolButton" name="browseButton">
+ <item row="2" column="1">
+ <layout class="QHBoxLayout" name="horizontalLayout_2">
+ <item>
+ <widget class="QComboBox" name="fieldComboBox">
+ <property name="toolTip">
+ <string>The valid attribute names for this layer</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="insertFieldButton">
+ <property name="toolTip">
+ <string>Inserts the selected field into the action, prepended with a %</string>
+ </property>
+ <property name="text">
+ <string>Insert field</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="QGroupBox" name="groupBox_2">
+ <property name="title">
+ <string>Action list</string>
+ </property>
+ <layout class="QGridLayout" name="gridLayout_2">
+ <item row="0" column="0" rowspan="7">
+ <widget class="QTableWidget" name="attributeActionTable">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="whatsThis">
+ <string>This list contains all actions that have been defined for the current layer. Add actions by entering the details in the controls below and then pressing the Insert action button. Actions can be edited here by double clicking on the item.</string>
+ </property>
+ <property name="selectionMode">
+ <enum>QAbstractItemView::SingleSelection</enum>
+ </property>
+ <property name="selectionBehavior">
+ <enum>QAbstractItemView::SelectRows</enum>
+ </property>
+ <property name="columnCount">
+ <number>3</number>
+ </property>
+ <column>
+ <property name="text">
+ <string>Name</string>
+ </property>
+ </column>
+ <column>
+ <property name="text">
+ <string>Action</string>
+ </property>
+ </column>
+ <column>
+ <property name="text">
+ <string>Capture</string>
+ </property>
+ </column>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QPushButton" name="insertButton">
<property name="toolTip">
- <string>Browse for action</string>
+ <string>Inserts the action into the list above</string>
</property>
- <property name="statusTip">
- <string>Click to browse for an action</string>
+ <property name="text">
+ <string>Insert action</string>
</property>
- <property name="whatsThis">
- <string>Clicking the button will let you select an application to use as the action</string>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="QPushButton" name="updateButton">
+ <property name="toolTip">
+ <string>Update the selected action</string>
</property>
<property name="text">
- <string>...</string>
+ <string>Update action</string>
</property>
</widget>
</item>
<item row="2" column="1">
- <widget class="QComboBox" name="fieldComboBox">
+ <spacer>
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeType">
+ <enum>QSizePolicy::Expanding</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>85</width>
+ <height>35</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item row="3" column="1">
+ <widget class="QPushButton" name="moveUpButton">
<property name="toolTip">
- <string>The valid attribute names for this layer</string>
+ <string>Move the selected action up</string>
</property>
+ <property name="text">
+ <string>Move up</string>
+ </property>
</widget>
</item>
- <item row="2" column="2" colspan="2">
- <widget class="QPushButton" name="insertFieldButton">
+ <item row="4" column="1">
+ <widget class="QPushButton" name="moveDownButton">
<property name="toolTip">
- <string>Inserts the selected field into the action, prepended with a %</string>
+ <string>Move the selected action down</string>
</property>
<property name="text">
- <string>Insert field</string>
+ <string>Move down</string>
</property>
</widget>
</item>
- <item row="3" column="1" colspan="2">
- <widget class="QCheckBox" name="captureCB">
+ <item row="5" column="1">
+ <spacer>
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeType">
+ <enum>QSizePolicy::Expanding</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>85</width>
+ <height>41</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item row="6" column="1">
+ <widget class="QPushButton" name="removeButton">
<property name="toolTip">
- <string>Captures any output from the action</string>
+ <string>Remove the selected action</string>
</property>
- <property name="whatsThis">
- <string>Captures the standard output or error generated by the action and displays it in a dialog box</string>
- </property>
<property name="text">
- <string>Capture output</string>
+ <string>Remove</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
- <item row="1" column="0" rowspan="7">
- <widget class="QTableWidget" name="attributeActionTable">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="whatsThis">
- <string>This list contains all actions that have been defined for the current layer. Add actions by entering the details in the controls below and then pressing the Insert action button. Actions can be edited here by double clicking on the item.</string>
- </property>
- <property name="selectionMode">
- <enum>QAbstractItemView::SingleSelection</enum>
- </property>
- <property name="selectionBehavior">
- <enum>QAbstractItemView::SelectRows</enum>
- </property>
- <property name="columnCount">
- <number>3</number>
- </property>
- <column>
- <property name="text">
- <string>Name</string>
- </property>
- </column>
- <column>
- <property name="text">
- <string>Action</string>
- </property>
- </column>
- <column>
- <property name="text">
- <string>Capture</string>
- </property>
- </column>
- </widget>
- </item>
- <item row="1" column="1">
- <widget class="QPushButton" name="insertButton">
- <property name="toolTip">
- <string>Inserts the action into the list above</string>
- </property>
- <property name="text">
- <string>Insert action</string>
- </property>
- </widget>
- </item>
- <item row="2" column="1">
- <widget class="QPushButton" name="updateButton">
- <property name="toolTip">
- <string>Update the selected action</string>
- </property>
- <property name="text">
- <string>Update action</string>
- </property>
- </widget>
- </item>
- <item row="3" column="1">
- <spacer>
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeType">
- <enum>QSizePolicy::Expanding</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>85</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="4" column="1">
- <widget class="QPushButton" name="moveUpButton">
- <property name="toolTip">
- <string>Move the selected action up</string>
- </property>
- <property name="text">
- <string>Move up</string>
- </property>
- </widget>
- </item>
- <item row="5" column="1">
- <widget class="QPushButton" name="moveDownButton">
- <property name="toolTip">
- <string>Move the selected action down</string>
- </property>
- <property name="text">
- <string>Move down</string>
- </property>
- </widget>
- </item>
- <item row="6" column="1">
- <spacer>
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeType">
- <enum>QSizePolicy::Expanding</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>85</width>
- <height>41</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="7" column="1">
- <widget class="QPushButton" name="removeButton">
- <property name="toolTip">
- <string>Remove the selected action</string>
- </property>
- <property name="text">
- <string>Remove</string>
- </property>
- </widget>
- </item>
</layout>
</widget>
<layoutdefault spacing="6" margin="11"/>
@@ -250,14 +267,14 @@
<tabstop>actionName</tabstop>
<tabstop>actionAction</tabstop>
<tabstop>browseButton</tabstop>
+ <tabstop>captureCB</tabstop>
<tabstop>fieldComboBox</tabstop>
<tabstop>insertFieldButton</tabstop>
- <tabstop>captureCB</tabstop>
+ <tabstop>attributeActionTable</tabstop>
<tabstop>insertButton</tabstop>
<tabstop>updateButton</tabstop>
<tabstop>moveUpButton</tabstop>
<tabstop>moveDownButton</tabstop>
- <tabstop>attributeActionTable</tabstop>
<tabstop>removeButton</tabstop>
</tabstops>
<resources/>
Modified: trunk/qgis/src/ui/qgslabeldialogbase.ui
===================================================================
--- trunk/qgis/src/ui/qgslabeldialogbase.ui 2009-11-11 21:37:52 UTC (rev 12094)
+++ trunk/qgis/src/ui/qgslabeldialogbase.ui 2009-11-11 22:06:32 UTC (rev 12095)
@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>516</width>
- <height>487</height>
+ <width>668</width>
+ <height>516</height>
</rect>
</property>
<property name="sizePolicy">
@@ -19,11 +19,11 @@
<property name="windowTitle">
<string>Form1</string>
</property>
- <layout class="QGridLayout">
+ <layout class="QGridLayout" name="gridLayout_7">
<property name="margin">
<number>0</number>
</property>
- <item row="0" column="0" colspan="2">
+ <item row="0" column="0" rowspan="2" colspan="2">
<layout class="QHBoxLayout">
<item>
<widget class="QLabel" name="textLabel5">
@@ -79,96 +79,22 @@
</item>
</layout>
</item>
- <item row="1" column="0">
- <widget class="QListWidget" name="listWidget">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <item>
- <property name="text">
- <string>General</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>Buffer</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>Position</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>Data defined style</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>Data defined alignment</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>Data defined buffer</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>Data defined position</string>
- </property>
- </item>
- </widget>
- </item>
- <item row="2" column="0" colspan="2">
- <widget class="QGroupBox" name="groupBox5">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="maximumSize">
- <size>
- <width>800</width>
- <height>200</height>
- </size>
- </property>
- <property name="title">
- <string>Preview:</string>
- </property>
- <layout class="QGridLayout">
- <property name="margin">
- <number>11</number>
- </property>
- <item row="0" column="0">
- <widget class="QLabel" name="lblSample">
- <property name="text">
- <string>QGIS Rocks!</string>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
<item row="1" column="1">
- <widget class="QStackedWidget" name="stackedWidget">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
+ <widget class="QScrollArea" name="scrollArea">
+ <property name="widgetResizable">
+ <bool>true</bool>
</property>
- <property name="currentIndex">
- <number>0</number>
- </property>
- <widget class="QWidget" name="page">
- <layout class="QGridLayout">
- <item row="0" column="0">
+ <widget class="QWidget" name="scrollAreaWidgetContents_2">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>639</width>
+ <height>1455</height>
+ </rect>
+ </property>
+ <layout class="QGridLayout" name="gridLayout">
+ <item row="0" column="0" colspan="2">
<layout class="QGridLayout">
<item row="0" column="0">
<widget class="QPushButton" name="btnDefaultFont">
@@ -259,7 +185,7 @@
</item>
</layout>
</item>
- <item row="1" column="0">
+ <item row="1" column="0" colspan="2">
<widget class="QGroupBox" name="groupBox_2">
<property name="title">
<string>Placement</string>
@@ -337,7 +263,7 @@
</layout>
</widget>
</item>
- <item row="2" column="0">
+ <item row="2" column="0" colspan="2">
<widget class="QGroupBox" name="groupBox_3">
<property name="title">
<string>Font size units</string>
@@ -360,20 +286,7 @@
</layout>
</widget>
</item>
- <item row="3" column="0">
- <spacer>
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>40</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="4" column="0">
+ <item row="3" column="0" colspan="2">
<widget class="QGroupBox" name="chkUseScaleDependentRendering">
<property name="title">
<string>Use scale dependent rendering</string>
@@ -434,7 +347,7 @@
</layout>
</widget>
</item>
- <item row="5" column="0">
+ <item row="4" column="0" colspan="2">
<widget class="QCheckBox" name="chkUseMultiline">
<property name="text">
<string>Multiline labels?</string>
@@ -444,11 +357,7 @@
</property>
</widget>
</item>
- </layout>
- </widget>
- <widget class="QWidget" name="page_2">
- <layout class="QGridLayout">
- <item row="0" column="0">
+ <item row="5" column="0">
<widget class="QCheckBox" name="chkUseBuffer">
<property name="text">
<string>Buffer labels?</string>
@@ -458,17 +367,17 @@
</property>
</widget>
</item>
- <item row="1" column="0">
+ <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="1" column="1">
+ <item row="6" column="1">
<widget class="QDoubleSpinBox" name="spinBufferSize"/>
</item>
- <item row="2" column="0">
+ <item row="7" column="0">
<widget class="QLabel" name="textLabel5_2_2_3">
<property name="enabled">
<bool>false</bool>
@@ -481,7 +390,7 @@
</property>
</widget>
</item>
- <item row="2" column="1">
+ <item row="7" column="1">
<widget class="QSpinBox" name="spinBufferTransparency">
<property name="enabled">
<bool>false</bool>
@@ -509,14 +418,14 @@
</property>
</widget>
</item>
- <item row="3" column="0" colspan="2">
+ <item row="8" column="0" colspan="2">
<widget class="QPushButton" name="pbnDefaultBufferColor_2">
<property name="text">
<string>Color</string>
</property>
</widget>
</item>
- <item row="4" column="0" colspan="2">
+ <item row="9" column="0" colspan="2">
<widget class="QGroupBox" name="groupBox_4">
<property name="title">
<string>Buffer size units</string>
@@ -539,475 +448,440 @@
</layout>
</widget>
</item>
- <item row="5" column="0">
- <spacer>
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>40</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
- </widget>
- <widget class="QWidget" name="page_3">
- <layout class="QGridLayout">
- <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="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="2" column="0" colspan="2">
+ <item row="10" column="0">
<widget class="QGroupBox" name="buttonGroup10">
<property name="title">
<string>Offset units</string>
</property>
- <layout class="QGridLayout">
- <item row="0" column="0">
+ <layout class="QGridLayout" name="gridLayout_2">
+ <item row="1" column="0">
+ <widget class="QDoubleSpinBox" name="spinXOffset">
+ <property name="minimum">
+ <double>-99.000000000000000</double>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="0">
+ <widget class="QLabel" name="textLabel1_2_3_2">
+ <property name="text">
+ <string>X Offset (pts)</string>
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="0">
+ <widget class="QDoubleSpinBox" name="spinYOffset">
+ <property name="minimum">
+ <double>-99.000000000000000</double>
+ </property>
+ </widget>
+ </item>
+ <item row="5" column="0">
<widget class="QRadioButton" name="radioOffsetUnitsPoints">
<property name="text">
<string>Points</string>
</property>
</widget>
</item>
- <item row="0" column="1">
+ <item row="5" 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>
- <item row="3" column="0">
- <spacer>
- <property name="orientation">
- <enum>Qt::Vertical</enum>
+ <item row="12" column="0">
+ <widget class="QGroupBox" name="groupBox_5">
+ <property name="title">
+ <string>Data defined placement</string>
</property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>181</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
- </widget>
- <widget class="QWidget" name="page_4">
- <layout class="QGridLayout" name="gridLayout_1">
- <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>
+ <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="0" column="1">
- <widget class="QComboBox" name="cboFontField">
- <property name="minimumSize">
- <size>
- <width>0</width>
- <height>20</height>
- </size>
+ <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="1" column="0">
- <widget class="QLabel" name="textLabel4">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
+ <item row="15" column="0">
+ <widget class="QGroupBox" name="groupBox_7">
+ <property name="title">
+ <string>Data defined position</string>
</property>
- <property name="text">
- <string>&Bold</string>
- </property>
- <property name="buddy">
- <cstring>cboBoldField</cstring>
- </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>
- <item row="1" column="1">
- <widget class="QComboBox" name="cboBoldField">
- <property name="minimumSize">
- <size>
- <width>0</width>
- <height>20</height>
- </size>
+ <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="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">
- <property name="minimumSize">
- <size>
- <width>0</width>
- <height>20</height>
- </size>
- </property>
- </widget>
- </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">
- <property name="minimumSize">
- <size>
- <width>0</width>
- <height>20</height>
- </size>
- </property>
- </widget>
- </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">
- <property name="minimumSize">
- <size>
- <width>0</width>
- <height>20</height>
- </size>
- </property>
- </widget>
- </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">
- <property name="minimumSize">
- <size>
- <width>0</width>
- <height>20</height>
- </size>
- </property>
- </widget>
- </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>
- <property name="minimumSize">
- <size>
- <width>0</width>
- <height>20</height>
- </size>
- </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">
- <property name="minimumSize">
- <size>
- <width>0</width>
- <height>20</height>
- </size>
- </property>
- </widget>
- </item>
</layout>
</widget>
- <widget class="QWidget" name="page_5">
- <layout class="QGridLayout">
- <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="QWidget" name="page_6">
- <layout class="QGridLayout">
- <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="QWidget" name="page_7">
- <layout class="QGridLayout">
- <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>
</item>
+ <item row="2" column="0" colspan="2">
+ <widget class="QGroupBox" name="groupBox5">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>800</width>
+ <height>200</height>
+ </size>
+ </property>
+ <property name="title">
+ <string>Preview:</string>
+ </property>
+ <layout class="QGridLayout">
+ <property name="margin">
+ <number>11</number>
+ </property>
+ <item row="0" column="0">
+ <widget class="QLabel" name="lblSample">
+ <property name="text">
+ <string>QGIS Rocks!</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
</layout>
</widget>
<layoutdefault spacing="6" margin="11"/>
<tabstops>
<tabstop>cboLabelField</tabstop>
<tabstop>leDefaultLabel</tabstop>
- <tabstop>listWidget</tabstop>
<tabstop>btnDefaultFont</tabstop>
<tabstop>spinFontSize</tabstop>
<tabstop>pbnDefaultFontColor</tabstop>
@@ -1023,56 +897,16 @@
<tabstop>radioBelowRight</tabstop>
<tabstop>radioFontSizeUnitsPoints</tabstop>
<tabstop>radioFontSizeUnitsMap</tabstop>
- <tabstop>chkUseScaleDependentRendering</tabstop>
<tabstop>spinMinimumScale</tabstop>
<tabstop>spinMaximumScale</tabstop>
- <tabstop>chkUseMultiline</tabstop>
- <tabstop>spinXOffset</tabstop>
- <tabstop>spinYOffset</tabstop>
<tabstop>radioOffsetUnitsPoints</tabstop>
<tabstop>radioOffsetUnitsMap</tabstop>
- <tabstop>cboFontField</tabstop>
- <tabstop>cboBoldField</tabstop>
- <tabstop>cboItalicField</tabstop>
- <tabstop>cboUnderlineField</tabstop>
- <tabstop>cboFontSizeField</tabstop>
- <tabstop>cboFontTransparencyField</tabstop>
- <tabstop>cboAlignmentField</tabstop>
- <tabstop>cboAngleField</tabstop>
- <tabstop>cboBufferTransparencyField</tabstop>
- <tabstop>cboBufferSizeField</tabstop>
- <tabstop>cboXCoordinateField</tabstop>
- <tabstop>cboYCoordinateField</tabstop>
- <tabstop>cboXOffsetField</tabstop>
- <tabstop>cboYOffsetField</tabstop>
- <tabstop>chkUseBuffer</tabstop>
- <tabstop>spinBufferSize</tabstop>
- <tabstop>spinBufferTransparency</tabstop>
<tabstop>radioBufferUnitsPoints</tabstop>
<tabstop>radioBufferUnitsMap</tabstop>
- <tabstop>pbnDefaultBufferColor_2</tabstop>
- <tabstop>cboFontSizeTypeField</tabstop>
- <tabstop>cboFontColorField</tabstop>
</tabstops>
<resources/>
<connections>
<connection>
- <sender>listWidget</sender>
- <signal>currentRowChanged(int)</signal>
- <receiver>stackedWidget</receiver>
- <slot>setCurrentIndex(int)</slot>
- <hints>
- <hint type="sourcelabel">
- <x>121</x>
- <y>72</y>
- </hint>
- <hint type="destinationlabel">
- <x>269</x>
- <y>54</y>
- </hint>
- </hints>
- </connection>
- <connection>
<sender>chkUseBuffer</sender>
<signal>clicked(bool)</signal>
<receiver>spinBufferTransparency</receiver>
Modified: trunk/qgis/src/ui/qgssinglesymboldialogbase.ui
===================================================================
--- trunk/qgis/src/ui/qgssinglesymboldialogbase.ui 2009-11-11 21:37:52 UTC (rev 12094)
+++ trunk/qgis/src/ui/qgssinglesymboldialogbase.ui 2009-11-11 22:06:32 UTC (rev 12095)
@@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>703</width>
- <height>494</height>
+ <height>518</height>
</rect>
</property>
<property name="sizePolicy">
@@ -195,6 +195,19 @@
<item row="2" column="1">
<widget class="QComboBox" name="mSymbolComboBox"/>
</item>
+ <item row="3" column="0">
+ <spacer name="verticalSpacer_2">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>40</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
</layout>
</widget>
</item>
@@ -383,6 +396,19 @@
</layout>
</widget>
</item>
+ <item>
+ <spacer name="verticalSpacer">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>40</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
</layout>
</item>
</layout>
Modified: trunk/qgis/src/ui/qgsvectorlayerpropertiesbase.ui
===================================================================
--- trunk/qgis/src/ui/qgsvectorlayerpropertiesbase.ui 2009-11-11 21:37:52 UTC (rev 12094)
+++ trunk/qgis/src/ui/qgsvectorlayerpropertiesbase.ui 2009-11-11 22:06:32 UTC (rev 12095)
@@ -7,13 +7,13 @@
<x>0</x>
<y>0</y>
<width>678</width>
- <height>600</height>
+ <height>500</height>
</rect>
</property>
<property name="minimumSize">
<size>
<width>0</width>
- <height>600</height>
+ <height>500</height>
</size>
</property>
<property name="windowTitle">
More information about the QGIS-commit
mailing list