[QGIS Commit] r11921 - in trunk/qgis/src: app
plugins/diagram_overlay ui
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Wed Nov 4 15:16:08 EST 2009
Author: timlinux
Date: 2009-11-04 15:16:07 -0500 (Wed, 04 Nov 2009)
New Revision: 11921
Modified:
trunk/qgis/src/app/qgsoptions.cpp
trunk/qgis/src/app/qgssinglesymboldialog.cpp
trunk/qgis/src/plugins/diagram_overlay/qgsdiagramdialogbase.ui
trunk/qgis/src/plugins/diagram_overlay/qgslinearlyscalingdialogbase.ui
trunk/qgis/src/plugins/diagram_overlay/qgswkndiagramfactorywidgetbase.ui
trunk/qgis/src/ui/qgscontinuouscolordialogbase.ui
trunk/qgis/src/ui/qgsgraduatedsymboldialogbase.ui
trunk/qgis/src/ui/qgssinglesymboldialogbase.ui
trunk/qgis/src/ui/qgsuniquevaluedialogbase.ui
trunk/qgis/src/ui/qgsvectorlayerpropertiesbase.ui
Log:
Usability cleanups for vector props dialogs. Also removed size adjustment to marker sizes in qgsoptions.
Modified: trunk/qgis/src/app/qgsoptions.cpp
===================================================================
--- trunk/qgis/src/app/qgsoptions.cpp 2009-11-04 17:13:33 UTC (rev 11920)
+++ trunk/qgis/src/app/qgsoptions.cpp 2009-11-04 20:16:07 UTC (rev 11921)
@@ -277,7 +277,7 @@
{
mMarkerStyleComboBox->setCurrentIndex( mMarkerStyleComboBox->findText( tr( "None" ) ) );
}
- mMarkerSizeSpinBox->setValue( settings.value( "/qgis/digitizing/marker_size", 7 ).toInt()*2 + 1 );
+ mMarkerSizeSpinBox->setValue( settings.value( "/qgis/digitizing/marker_size", 7 ).toInt() );
chkDisableAttributeValuesDlg->setChecked( settings.value( "/qgis/digitizing/disable_enter_attribute_values_dialog", false ).toBool() );
@@ -524,7 +524,7 @@
{
settings.setValue( "/qgis/digitizing/marker_style", "None" );
}
- settings.setValue( "/qgis/digitizing/marker_size", ( mMarkerSizeSpinBox->value() - 1 ) / 2 );
+ settings.setValue( "/qgis/digitizing/marker_size", ( mMarkerSizeSpinBox->value() ) );
settings.setValue( "/qgis/digitizing/disable_enter_attribute_values_dialog", chkDisableAttributeValuesDlg->isChecked() );
Modified: trunk/qgis/src/app/qgssinglesymboldialog.cpp
===================================================================
--- trunk/qgis/src/app/qgssinglesymboldialog.cpp 2009-11-04 17:13:33 UTC (rev 11920)
+++ trunk/qgis/src/app/qgssinglesymboldialog.cpp 2009-11-04 20:16:07 UTC (rev 11921)
@@ -156,37 +156,39 @@
//
//set outline / line style
//
- cboOutlineStyle->addItem( QIcon( QgsSymbologyUtils::char2LinePixmap( "SolidLine" ) ), tr( "Solid Line" ), "SolidLine" );
- cboOutlineStyle->addItem( QIcon( QgsSymbologyUtils::char2LinePixmap( "DashLine" ) ), tr( "Dash Line" ), "DashLine" );
- cboOutlineStyle->addItem( QIcon( QgsSymbologyUtils::char2LinePixmap( "DotLine" ) ), tr( "Dot Line" ), "DotLine" );
- cboOutlineStyle->addItem( QIcon( QgsSymbologyUtils::char2LinePixmap( "DashDotLine" ) ), tr( "Dash Dot Line" ), "DashDotLine" );
- cboOutlineStyle->addItem( QIcon( QgsSymbologyUtils::char2LinePixmap( "DashDotDotLine" ) ), tr( "Dash Dot Dot Line" ), "DashDotDotLine" );
- cboOutlineStyle->addItem( QIcon( QgsSymbologyUtils::char2LinePixmap( "NoPen" ) ), tr( "No Pen" ), "NoPen" );
+ cboOutlineStyle->addItem( QIcon( QgsSymbologyUtils::char2LinePixmap( "SolidLine" ) ), "", "SolidLine" );
+ cboOutlineStyle->addItem( QIcon( QgsSymbologyUtils::char2LinePixmap( "DashLine" ) ), "", "DashLine" );
+ cboOutlineStyle->addItem( QIcon( QgsSymbologyUtils::char2LinePixmap( "DotLine" ) ), "", "DotLine" );
+ cboOutlineStyle->addItem( QIcon( QgsSymbologyUtils::char2LinePixmap( "DashDotLine" ) ), "" , "DashDotLine" );
+ cboOutlineStyle->addItem( QIcon( QgsSymbologyUtils::char2LinePixmap( "DashDotDotLine" ) ),"", "DashDotDotLine" );
+ cboOutlineStyle->addItem( QIcon( QgsSymbologyUtils::char2LinePixmap( "NoPen" ) ), tr( "None" ), "NoPen" );
//
//set pattern icons and state
//
- cboFillStyle->addItem( QIcon( QgsSymbologyUtils::char2PatternPixmap( "SolidPattern" ) ), tr( "Solid" ), "SolidPattern" );
- cboFillStyle->addItem( QIcon( QgsSymbologyUtils::char2PatternPixmap( "HorPattern" ) ), tr( "Horizontal" ), "HorPattern" );
- cboFillStyle->addItem( QIcon( QgsSymbologyUtils::char2PatternPixmap( "VerPattern" ) ), tr( "Vertical" ), "VerPattern" );
- cboFillStyle->addItem( QIcon( QgsSymbologyUtils::char2PatternPixmap( "CrossPattern" ) ), tr( "Cross" ), "CrossPattern" );
- cboFillStyle->addItem( QIcon( QgsSymbologyUtils::char2PatternPixmap( "BDiagPattern" ) ), tr( "BDiagonal" ), "BDiagPattern" );
- cboFillStyle->addItem( QIcon( QgsSymbologyUtils::char2PatternPixmap( "FDiagPattern" ) ), tr( "FDiagonal" ), "FDiagPattern" );
- cboFillStyle->addItem( QIcon( QgsSymbologyUtils::char2PatternPixmap( "DiagCrossPattern" ) ), tr( "Diagonal X" ), "DiagCrossPattern" );
- cboFillStyle->addItem( QIcon( QgsSymbologyUtils::char2PatternPixmap( "Dense1Pattern" ) ), tr( "Dense1" ), "Dense1Pattern" );
- cboFillStyle->addItem( QIcon( QgsSymbologyUtils::char2PatternPixmap( "Dense2Pattern" ) ), tr( "Dense2" ), "Dense2Pattern" );
- cboFillStyle->addItem( QIcon( QgsSymbologyUtils::char2PatternPixmap( "Dense3Pattern" ) ), tr( "Dense3" ), "Dense3Pattern" );
- cboFillStyle->addItem( QIcon( QgsSymbologyUtils::char2PatternPixmap( "Dense4Pattern" ) ), tr( "Dense4" ), "Dense4Pattern" );
- cboFillStyle->addItem( QIcon( QgsSymbologyUtils::char2PatternPixmap( "Dense5Pattern" ) ), tr( "Dense5" ), "Dense5Pattern" );
- cboFillStyle->addItem( QIcon( QgsSymbologyUtils::char2PatternPixmap( "Dense6Pattern" ) ), tr( "Dense6" ), "Dense6Pattern" );
- cboFillStyle->addItem( QIcon( QgsSymbologyUtils::char2PatternPixmap( "Dense7Pattern" ) ), tr( "Dense7" ), "Dense7Pattern" );
- cboFillStyle->addItem( QIcon( QgsSymbologyUtils::char2PatternPixmap( "NoBrush" ) ), tr( "No Brush" ), "NoBrush" );
+ cboFillStyle->addItem( QIcon( QgsSymbologyUtils::char2PatternPixmap( "SolidPattern" ) ), "", "SolidPattern" );
+ cboFillStyle->addItem( QIcon( QgsSymbologyUtils::char2PatternPixmap( "HorPattern" ) ), "", "HorPattern" );
+ cboFillStyle->addItem( QIcon( QgsSymbologyUtils::char2PatternPixmap( "VerPattern" ) ), "", "VerPattern" );
+ cboFillStyle->addItem( QIcon( QgsSymbologyUtils::char2PatternPixmap( "CrossPattern" ) ),"", "CrossPattern" );
+ cboFillStyle->addItem( QIcon( QgsSymbologyUtils::char2PatternPixmap( "BDiagPattern" ) ), "", "BDiagPattern" );
+ cboFillStyle->addItem( QIcon( QgsSymbologyUtils::char2PatternPixmap( "FDiagPattern" ) ), "", "FDiagPattern" );
+ cboFillStyle->addItem( QIcon( QgsSymbologyUtils::char2PatternPixmap( "DiagCrossPattern" ) ), "", "DiagCrossPattern" );
+ cboFillStyle->addItem( QIcon( QgsSymbologyUtils::char2PatternPixmap( "Dense1Pattern" ) ), "", "Dense1Pattern" );
+ cboFillStyle->addItem( QIcon( QgsSymbologyUtils::char2PatternPixmap( "Dense2Pattern" ) ), "", "Dense2Pattern" );
+ cboFillStyle->addItem( QIcon( QgsSymbologyUtils::char2PatternPixmap( "Dense3Pattern" ) ), "", "Dense3Pattern" );
+ cboFillStyle->addItem( QIcon( QgsSymbologyUtils::char2PatternPixmap( "Dense4Pattern" ) ), "", "Dense4Pattern" );
+ cboFillStyle->addItem( QIcon( QgsSymbologyUtils::char2PatternPixmap( "Dense5Pattern" ) ), "", "Dense5Pattern" );
+ cboFillStyle->addItem( QIcon( QgsSymbologyUtils::char2PatternPixmap( "Dense6Pattern" ) ), "", "Dense6Pattern" );
+ cboFillStyle->addItem( QIcon( QgsSymbologyUtils::char2PatternPixmap( "Dense7Pattern" ) ), "", "Dense7Pattern" );
+ cboFillStyle->addItem( QIcon( QgsSymbologyUtils::char2PatternPixmap( "NoBrush" ) ), tr( "None" ), "NoBrush" );
cboFillStyle->addItem( QIcon( QgsSymbologyUtils::char2PatternPixmap( "TexturePattern" ) ), tr( "Texture" ), "TexturePattern" );
if ( mVectorLayer && mVectorLayer->geometryType() != QGis::Point )
{
mGroupPoint->setVisible( false );
mGroupPoint->setEnabled( false );
+ mGroupDrawingByField->setVisible( false );
+ mGroupDrawingByField->setEnabled( false );
}
if ( mDisabled )
Modified: trunk/qgis/src/plugins/diagram_overlay/qgsdiagramdialogbase.ui
===================================================================
--- trunk/qgis/src/plugins/diagram_overlay/qgsdiagramdialogbase.ui 2009-11-04 17:13:33 UTC (rev 11920)
+++ trunk/qgis/src/plugins/diagram_overlay/qgsdiagramdialogbase.ui 2009-11-04 20:16:07 UTC (rev 11921)
@@ -1,7 +1,8 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
<class>QgsDiagramDialogBase</class>
- <widget class="QDialog" name="QgsDiagramDialogBase" >
- <property name="geometry" >
+ <widget class="QDialog" name="QgsDiagramDialogBase">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
@@ -9,95 +10,74 @@
<height>441</height>
</rect>
</property>
- <property name="windowTitle" >
+ <property name="windowTitle">
<string>Dialog</string>
</property>
- <layout class="QGridLayout" >
- <item row="0" column="0" >
- <widget class="QCheckBox" name="mDisplayDiagramsCheckBox" >
- <property name="text" >
+ <layout class="QGridLayout">
+ <item row="0" column="0">
+ <widget class="QCheckBox" name="mDisplayDiagramsCheckBox">
+ <property name="text">
<string>Display diagrams</string>
</property>
</widget>
</item>
- <item row="1" column="0" >
- <layout class="QHBoxLayout" >
- <property name="spacing" >
+ <item row="1" 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="QLabel" name="mTypeLabel" >
- <property name="text" >
- <string>Diagram type:</string>
+ <widget class="QLabel" name="mTypeLabel">
+ <property name="text">
+ <string>Diagram type</string>
</property>
</widget>
</item>
<item>
- <widget class="QComboBox" name="mDiagramTypeComboBox" />
+ <widget class="QComboBox" name="mDiagramTypeComboBox"/>
</item>
</layout>
</item>
- <item row="2" column="0" >
- <widget class="QStackedWidget" name="mDiagramFactoryStackedWidget" >
- <widget class="QWidget" name="page_3" />
- <widget class="QWidget" name="page_4" />
+ <item row="2" column="0">
+ <widget class="QStackedWidget" name="mDiagramFactoryStackedWidget">
+ <widget class="QWidget" name="page_3"/>
+ <widget class="QWidget" name="page_4"/>
</widget>
</item>
- <item row="3" column="0" >
- <layout class="QGridLayout" >
- <property name="leftMargin" >
+ <item row="3" column="0">
+ <layout class="QGridLayout">
+ <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>
- <property name="horizontalSpacing" >
+ <property name="spacing">
<number>6</number>
</property>
- <property name="verticalSpacing" >
- <number>6</number>
- </property>
- <item row="0" column="1" >
- <widget class="QComboBox" name="mClassificationTypeComboBox" />
+ <item row="0" column="1">
+ <widget class="QComboBox" name="mClassificationTypeComboBox"/>
</item>
- <item row="2" column="0" colspan="2" >
- <widget class="QStackedWidget" name="mWidgetStackRenderers" >
- <widget class="QWidget" name="page" />
- <widget class="QWidget" name="page_2" />
+ <item row="2" column="0" colspan="2">
+ <widget class="QStackedWidget" name="mWidgetStackRenderers">
+ <widget class="QWidget" name="page"/>
+ <widget class="QWidget" name="page_2"/>
</widget>
</item>
- <item row="1" column="0" >
- <widget class="QLabel" name="mClassificationLabel" >
- <property name="text" >
- <string>Classification attribute:</string>
+ <item row="1" column="0">
+ <widget class="QLabel" name="mClassificationLabel">
+ <property name="text">
+ <string>Classification attribute</string>
</property>
</widget>
</item>
- <item row="1" column="1" >
- <widget class="QComboBox" name="mClassificationComboBox" />
+ <item row="1" column="1">
+ <widget class="QComboBox" name="mClassificationComboBox"/>
</item>
- <item row="0" column="0" >
- <widget class="QLabel" name="mClassificationTypeLabel" >
- <property name="text" >
- <string>Classification type:</string>
+ <item row="0" column="0">
+ <widget class="QLabel" name="mClassificationTypeLabel">
+ <property name="text">
+ <string>Classification type</string>
</property>
</widget>
</item>
Modified: trunk/qgis/src/plugins/diagram_overlay/qgslinearlyscalingdialogbase.ui
===================================================================
--- trunk/qgis/src/plugins/diagram_overlay/qgslinearlyscalingdialogbase.ui 2009-11-04 17:13:33 UTC (rev 11920)
+++ trunk/qgis/src/plugins/diagram_overlay/qgslinearlyscalingdialogbase.ui 2009-11-04 20:16:07 UTC (rev 11921)
@@ -1,7 +1,8 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
<class>QgsLinearlyScalingDialogBase</class>
- <widget class="QWidget" name="QgsLinearlyScalingDialogBase" >
- <property name="geometry" >
+ <widget class="QWidget" name="QgsLinearlyScalingDialogBase">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
@@ -9,52 +10,52 @@
<height>91</height>
</rect>
</property>
- <property name="windowTitle" >
+ <property name="windowTitle">
<string>Form</string>
</property>
- <layout class="QGridLayout" >
- <item row="0" column="0" >
- <widget class="QLabel" name="mTitleLabel" >
- <property name="text" >
+ <layout class="QGridLayout">
+ <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>
</widget>
</item>
- <item row="1" column="0" >
- <layout class="QHBoxLayout" >
+ <item row="1" column="0">
+ <layout class="QHBoxLayout">
<item>
- <widget class="QPushButton" name="mFindMaximumValueButton" >
- <property name="text" >
- <string>find maximum Value:</string>
+ <widget class="QPushButton" name="mFindMaximumValueButton">
+ <property name="text">
+ <string>Find maximum value</string>
</property>
</widget>
</item>
<item>
- <widget class="QLineEdit" name="mValueLineEdit" />
+ <widget class="QLineEdit" name="mValueLineEdit"/>
</item>
<item>
- <widget class="QLabel" name="mSizeLabel" >
- <property name="text" >
- <string>Size:</string>
+ <widget class="QLabel" name="mSizeLabel">
+ <property name="text">
+ <string>Size</string>
</property>
</widget>
</item>
<item>
- <widget class="QSpinBox" name="mSizeSpinBox" >
- <property name="maximum" >
+ <widget class="QSpinBox" name="mSizeSpinBox">
+ <property name="maximum">
<number>10000000</number>
</property>
</widget>
</item>
<item>
- <widget class="QLabel" name="mSizeUnitLabel" >
- <property name="text" >
- <string>Size unit: </string>
+ <widget class="QLabel" name="mSizeUnitLabel">
+ <property name="text">
+ <string>Size unit</string>
</property>
</widget>
</item>
<item>
- <widget class="QComboBox" name="mSizeUnitComboBox" />
+ <widget class="QComboBox" name="mSizeUnitComboBox"/>
</item>
</layout>
</item>
Modified: trunk/qgis/src/plugins/diagram_overlay/qgswkndiagramfactorywidgetbase.ui
===================================================================
--- trunk/qgis/src/plugins/diagram_overlay/qgswkndiagramfactorywidgetbase.ui 2009-11-04 17:13:33 UTC (rev 11920)
+++ trunk/qgis/src/plugins/diagram_overlay/qgswkndiagramfactorywidgetbase.ui 2009-11-04 20:16:07 UTC (rev 11921)
@@ -1,7 +1,8 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
<class>QgsWKNDiagramFactoryWidgetBase</class>
- <widget class="QWidget" name="QgsWKNDiagramFactoryWidgetBase" >
- <property name="geometry" >
+ <widget class="QWidget" name="QgsWKNDiagramFactoryWidgetBase">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
@@ -9,86 +10,65 @@
<height>277</height>
</rect>
</property>
- <property name="windowTitle" >
+ <property name="windowTitle">
<string>Form</string>
</property>
- <layout class="QGridLayout" >
- <item row="0" column="0" >
- <layout class="QHBoxLayout" >
- <property name="spacing" >
+ <layout class="QGridLayout">
+ <item row="0" 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="QLabel" name="mAttributesLabel" >
- <property name="text" >
- <string>Attributes:</string>
+ <widget class="QLabel" name="mAttributesLabel">
+ <property name="text">
+ <string>Attributes</string>
</property>
</widget>
</item>
<item>
- <widget class="QComboBox" name="mAttributesComboBox" />
+ <widget class="QComboBox" name="mAttributesComboBox"/>
</item>
</layout>
</item>
- <item row="1" column="0" >
- <layout class="QGridLayout" >
- <property name="leftMargin" >
+ <item row="1" column="0">
+ <layout class="QGridLayout">
+ <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>
- <property name="horizontalSpacing" >
+ <property name="spacing">
<number>6</number>
</property>
- <property name="verticalSpacing" >
- <number>6</number>
- </property>
- <item row="1" column="0" colspan="2" >
- <widget class="QTreeWidget" name="mAttributesTreeWidget" >
- <property name="columnCount" >
+ <item row="1" column="0" colspan="2">
+ <widget class="QTreeWidget" name="mAttributesTreeWidget">
+ <property name="columnCount">
<number>2</number>
</property>
<column>
- <property name="text" >
+ <property name="text">
<string>1</string>
</property>
</column>
<column>
- <property name="text" >
+ <property name="text">
<string>1</string>
</property>
</column>
</widget>
</item>
- <item row="0" column="1" >
- <widget class="QPushButton" name="mRemovePushButton" >
- <property name="text" >
+ <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" >
+ <item row="0" column="0">
+ <widget class="QPushButton" name="mAddPushButton">
+ <property name="text">
<string>Add attribute</string>
</property>
</widget>
@@ -97,6 +77,12 @@
</item>
</layout>
</widget>
+ <tabstops>
+ <tabstop>mAttributesComboBox</tabstop>
+ <tabstop>mAddPushButton</tabstop>
+ <tabstop>mRemovePushButton</tabstop>
+ <tabstop>mAttributesTreeWidget</tabstop>
+ </tabstops>
<resources/>
<connections/>
</ui>
Modified: trunk/qgis/src/ui/qgscontinuouscolordialogbase.ui
===================================================================
--- trunk/qgis/src/ui/qgscontinuouscolordialogbase.ui 2009-11-04 17:13:33 UTC (rev 11920)
+++ trunk/qgis/src/ui/qgscontinuouscolordialogbase.ui 2009-11-04 20:16:07 UTC (rev 11921)
@@ -1,7 +1,8 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
<class>QgsContinuousColorDialogBase</class>
- <widget class="QDialog" name="QgsContinuousColorDialogBase" >
- <property name="geometry" >
+ <widget class="QDialog" name="QgsContinuousColorDialogBase">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
@@ -9,22 +10,22 @@
<height>155</height>
</rect>
</property>
- <property name="windowTitle" >
+ <property name="windowTitle">
<string>Continuous color</string>
</property>
- <layout class="QGridLayout" >
- <property name="margin" >
+ <layout class="QGridLayout">
+ <property name="margin">
<number>9</number>
</property>
- <property name="spacing" >
+ <property name="spacing">
<number>6</number>
</property>
- <item row="3" column="1" >
- <widget class="QDoubleSpinBox" name="outlinewidthspinbox" />
+ <item row="3" column="1">
+ <widget class="QDoubleSpinBox" name="outlinewidthspinbox"/>
</item>
- <item row="0" column="1" >
- <widget class="QComboBox" name="classificationComboBox" >
- <property name="minimumSize" >
+ <item row="0" column="1">
+ <widget class="QComboBox" name="classificationComboBox">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>20</height>
@@ -32,9 +33,9 @@
</property>
</widget>
</item>
- <item row="1" column="1" >
- <widget class="QgsColorButton" name="btnMinValue" >
- <property name="minimumSize" >
+ <item row="1" column="1">
+ <widget class="QgsColorButton" name="btnMinValue">
+ <property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
@@ -42,25 +43,25 @@
</property>
</widget>
</item>
- <item row="2" column="0" >
- <widget class="QLabel" name="maxcolorlabel" >
- <property name="minimumSize" >
+ <item row="2" column="0">
+ <widget class="QLabel" name="maxcolorlabel">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>20</height>
</size>
</property>
- <property name="text" >
- <string>Maximum Value:</string>
+ <property name="text">
+ <string>Maximum value</string>
</property>
- <property name="buddy" >
+ <property name="buddy">
<cstring>btnMaxValue</cstring>
</property>
</widget>
</item>
- <item row="2" column="1" >
- <widget class="QgsColorButton" name="btnMaxValue" >
- <property name="minimumSize" >
+ <item row="2" column="1">
+ <widget class="QgsColorButton" name="btnMaxValue">
+ <property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
@@ -68,61 +69,61 @@
</property>
</widget>
</item>
- <item row="3" column="0" >
- <widget class="QLabel" name="outlinewidthlabel" >
- <property name="minimumSize" >
+ <item row="3" column="0">
+ <widget class="QLabel" name="outlinewidthlabel">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>20</height>
</size>
</property>
- <property name="text" >
- <string>Outline Width:</string>
+ <property name="text">
+ <string>Outline width</string>
</property>
</widget>
</item>
- <item row="1" column="0" >
- <widget class="QLabel" name="mincolorlabel" >
- <property name="minimumSize" >
+ <item row="1" column="0">
+ <widget class="QLabel" name="mincolorlabel">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>20</height>
</size>
</property>
- <property name="text" >
- <string>Minimum Value:</string>
+ <property name="text">
+ <string>Minimum value</string>
</property>
- <property name="buddy" >
+ <property name="buddy">
<cstring>btnMinValue</cstring>
</property>
</widget>
</item>
- <item row="0" column="0" >
- <widget class="QLabel" name="classvarlabel" >
- <property name="minimumSize" >
+ <item row="0" column="0">
+ <widget class="QLabel" name="classvarlabel">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>20</height>
</size>
</property>
- <property name="text" >
- <string>Classification Field:</string>
+ <property name="text">
+ <string>Classification field</string>
</property>
- <property name="buddy" >
+ <property name="buddy">
<cstring>classificationComboBox</cstring>
</property>
</widget>
</item>
- <item row="3" column="2" >
- <widget class="QCheckBox" name="cb_polygonOutline" >
- <property name="text" >
+ <item row="3" column="2">
+ <widget class="QCheckBox" name="cb_polygonOutline">
+ <property name="text">
<string>Draw polygon outline</string>
</property>
</widget>
</item>
</layout>
</widget>
- <layoutdefault spacing="6" margin="11" />
+ <layoutdefault spacing="6" margin="11"/>
<customwidgets>
<customwidget>
<class>QgsColorButton</class>
Modified: trunk/qgis/src/ui/qgsgraduatedsymboldialogbase.ui
===================================================================
--- trunk/qgis/src/ui/qgsgraduatedsymboldialogbase.ui 2009-11-04 17:13:33 UTC (rev 11920)
+++ trunk/qgis/src/ui/qgsgraduatedsymboldialogbase.ui 2009-11-04 20:16:07 UTC (rev 11921)
@@ -1,231 +1,210 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
<class>QgsGraduatedSymbolDialogBase</class>
- <widget class="QDialog" name="QgsGraduatedSymbolDialogBase" >
- <property name="geometry" >
+ <widget class="QDialog" name="QgsGraduatedSymbolDialogBase">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
- <width>500</width>
- <height>437</height>
+ <width>548</width>
+ <height>479</height>
</rect>
</property>
- <property name="minimumSize" >
+ <property name="minimumSize">
<size>
<width>300</width>
<height>100</height>
</size>
</property>
- <property name="maximumSize" >
+ <property name="maximumSize">
<size>
<width>32767</width>
<height>32767</height>
</size>
</property>
- <property name="windowTitle" >
+ <property name="windowTitle">
<string>graduated Symbol</string>
</property>
- <layout class="QGridLayout" >
- <property name="leftMargin" >
+ <layout class="QGridLayout" name="gridLayout_2">
+ <property name="margin">
<number>0</number>
</property>
- <property name="topMargin" >
- <number>8</number>
- </property>
- <property name="rightMargin" >
- <number>0</number>
- </property>
- <property name="bottomMargin" >
- <number>0</number>
- </property>
- <item row="0" column="0" >
- <widget class="QLabel" name="classvarlabel" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Preferred" hsizetype="Minimum" >
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="minimumSize" >
- <size>
- <width>0</width>
- <height>20</height>
- </size>
- </property>
- <property name="text" >
- <string>Classification field</string>
- </property>
- <property name="alignment" >
- <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
- </property>
- </widget>
- </item>
- <item row="0" column="1" >
- <widget class="QComboBox" name="classificationComboBox" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="minimumSize" >
- <size>
- <width>0</width>
- <height>20</height>
- </size>
- </property>
- </widget>
- </item>
- <item row="1" column="0" >
- <widget class="QLabel" name="modelabel" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Preferred" hsizetype="Minimum" >
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="minimumSize" >
- <size>
- <width>0</width>
- <height>20</height>
- </size>
- </property>
- <property name="text" >
- <string>Mode</string>
- </property>
- <property name="alignment" >
- <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
- </property>
- </widget>
- </item>
- <item row="1" column="1" >
- <widget class="QComboBox" name="modeComboBox" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="minimumSize" >
- <size>
- <width>0</width>
- <height>20</height>
- </size>
- </property>
- </widget>
- </item>
- <item row="2" column="0" >
- <widget class="QLabel" name="numberofclasseslabel" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Preferred" hsizetype="Minimum" >
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="minimumSize" >
- <size>
- <width>0</width>
- <height>30</height>
- </size>
- </property>
- <property name="text" >
- <string>Number of classes</string>
- </property>
- <property name="alignment" >
- <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
- </property>
- </widget>
- </item>
- <item row="2" column="1" >
- <widget class="QSpinBox" name="numberofclassesspinbox" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="minimumSize" >
- <size>
- <width>0</width>
- <height>20</height>
- </size>
- </property>
- </widget>
- </item>
- <item row="3" column="0" >
- <spacer>
- <property name="orientation" >
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeType" >
- <enum>QSizePolicy::Minimum</enum>
- </property>
- <property name="sizeHint" >
- <size>
- <width>40</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="3" column="1" >
- <layout class="QHBoxLayout" >
+ <item row="0" column="0">
+ <layout class="QHBoxLayout" name="horizontalLayout">
<item>
- <widget class="QPushButton" name="mClassifyButton" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Fixed" hsizetype="Minimum" >
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text" >
- <string>Classify</string>
- </property>
- </widget>
+ <layout class="QGridLayout" name="gridLayout">
+ <item row="0" column="0">
+ <widget class="QLabel" name="classvarlabel">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>0</width>
+ <height>20</height>
+ </size>
+ </property>
+ <property name="text">
+ <string>Classification field</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QComboBox" name="classificationComboBox">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>0</width>
+ <height>20</height>
+ </size>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="modelabel">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>0</width>
+ <height>20</height>
+ </size>
+ </property>
+ <property name="text">
+ <string>Mode</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="QComboBox" name="modeComboBox">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>0</width>
+ <height>20</height>
+ </size>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="0">
+ <widget class="QLabel" name="numberofclasseslabel">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>0</width>
+ <height>30</height>
+ </size>
+ </property>
+ <property name="text">
+ <string>Number of classes</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1">
+ <widget class="QSpinBox" name="numberofclassesspinbox">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>0</width>
+ <height>20</height>
+ </size>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="0">
+ <widget class="QPushButton" name="mClassifyButton">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string>Classify</string>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="1">
+ <widget class="QPushButton" name="mDeleteClassButton">
+ <property name="text">
+ <string>Delete class</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
</item>
- <item>
- <widget class="QPushButton" name="mDeleteClassButton" >
- <property name="text" >
- <string>Delete class</string>
- </property>
- </widget>
- </item>
</layout>
</item>
- <item row="4" column="0" >
- <widget class="QListWidget" name="mClassListWidget" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Expanding" hsizetype="Minimum" >
+ <item row="0" column="1" rowspan="2">
+ <widget class="QStackedWidget" name="mSymbolWidgetStack">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
+ <property name="currentIndex">
+ <number>0</number>
+ </property>
+ <widget class="QWidget" name="page"/>
+ <widget class="QWidget" name="page_2"/>
</widget>
</item>
- <item row="4" column="1" >
- <widget class="QStackedWidget" name="mSymbolWidgetStack" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Preferred" hsizetype="Expanding" >
+ <item row="1" column="0">
+ <widget class="QListWidget" name="mClassListWidget">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Minimum" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="currentIndex" >
- <number>1</number>
- </property>
- <widget class="QWidget" name="page" />
- <widget class="QWidget" name="page_2" />
</widget>
</item>
</layout>
</widget>
- <layoutdefault spacing="6" margin="11" />
+ <layoutdefault spacing="6" margin="11"/>
<tabstops>
<tabstop>classificationComboBox</tabstop>
<tabstop>modeComboBox</tabstop>
<tabstop>numberofclassesspinbox</tabstop>
<tabstop>mClassifyButton</tabstop>
<tabstop>mDeleteClassButton</tabstop>
- <tabstop>mClassListWidget</tabstop>
</tabstops>
<resources/>
<connections/>
Modified: trunk/qgis/src/ui/qgssinglesymboldialogbase.ui
===================================================================
--- trunk/qgis/src/ui/qgssinglesymboldialogbase.ui 2009-11-04 17:13:33 UTC (rev 11920)
+++ trunk/qgis/src/ui/qgssinglesymboldialogbase.ui 2009-11-04 20:16:07 UTC (rev 11921)
@@ -1,43 +1,47 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
<class>QgsSingleSymbolDialogBase</class>
- <widget class="QDialog" name="QgsSingleSymbolDialogBase" >
- <property name="geometry" >
+ <widget class="QDialog" name="QgsSingleSymbolDialogBase">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
- <width>710</width>
- <height>443</height>
+ <width>703</width>
+ <height>494</height>
</rect>
</property>
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="windowTitle" >
+ <property name="windowTitle">
<string>Single Symbol</string>
</property>
- <layout class="QGridLayout" >
- <item row="0" column="0" >
- <widget class="QLabel" name="mLabel" >
- <property name="minimumSize" >
+ <layout class="QGridLayout" name="gridLayout_5">
+ <property name="margin">
+ <number>0</number>
+ </property>
+ <item row="0" column="0">
+ <widget class="QLabel" name="mLabel">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>22</height>
</size>
</property>
- <property name="text" >
+ <property name="text">
<string>Label</string>
</property>
- <property name="buddy" >
+ <property name="buddy">
<cstring>mLabelEdit</cstring>
</property>
</widget>
</item>
- <item row="0" column="1" >
- <widget class="QLineEdit" name="mLabelEdit" >
- <property name="minimumSize" >
+ <item row="0" column="1">
+ <widget class="QLineEdit" name="mLabelEdit">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>22</height>
@@ -45,334 +49,347 @@
</property>
</widget>
</item>
- <item row="1" column="0" colspan="2" >
- <widget class="QGroupBox" name="mGroupPoint" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
+ <item row="1" column="0" colspan="2">
+ <widget class="QGroupBox" name="mGroupPoint">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="title" >
+ <property name="title">
<string>Point Symbol</string>
</property>
- <layout class="QGridLayout" >
- <item row="0" column="0" colspan="5" >
- <widget class="QListWidget" name="lstSymbols" >
- <property name="dragDropMode" >
+ <layout class="QGridLayout" name="gridLayout_4">
+ <item row="0" column="0" colspan="3">
+ <widget class="QListWidget" name="lstSymbols">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="MinimumExpanding">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="dragDropMode">
<enum>QAbstractItemView::DragDrop</enum>
</property>
- <property name="alternatingRowColors" >
+ <property name="alternatingRowColors">
<bool>false</bool>
</property>
- <property name="iconSize" >
+ <property name="iconSize">
<size>
<width>0</width>
<height>-1</height>
</size>
</property>
- <property name="resizeMode" >
+ <property name="resizeMode">
<enum>QListView::Adjust</enum>
</property>
- <property name="viewMode" >
+ <property name="viewMode">
<enum>QListView::IconMode</enum>
</property>
- <property name="uniformItemSizes" >
+ <property name="uniformItemSizes">
<bool>true</bool>
</property>
- <property name="wordWrap" >
+ <property name="wordWrap">
<bool>false</bool>
</property>
</widget>
</item>
- <item row="2" column="0" >
- <widget class="QLabel" name="textLabel1_3" >
- <property name="text" >
- <string>Rotation field</string>
- </property>
- <property name="buddy" >
- <cstring>mRotationClassificationComboBox</cstring>
- </property>
- </widget>
- </item>
- <item row="2" column="1" >
- <widget class="QComboBox" name="mRotationClassificationComboBox" >
- <property name="minimumSize" >
- <size>
- <width>0</width>
- <height>20</height>
- </size>
- </property>
- </widget>
- </item>
- <item row="3" column="1" >
- <widget class="QComboBox" name="mScaleClassificationComboBox" >
- <property name="minimumSize" >
- <size>
- <width>0</width>
- <height>20</height>
- </size>
- </property>
- </widget>
- </item>
- <item row="3" column="0" >
- <widget class="QLabel" name="textLabel9" >
- <property name="text" >
- <string>Area scale field</string>
- </property>
- <property name="buddy" >
- <cstring>mScaleClassificationComboBox</cstring>
- </property>
- </widget>
- </item>
- <item row="2" column="3" >
- <widget class="QComboBox" name="mSymbolComboBox" />
- </item>
- <item row="2" column="2" >
- <widget class="QLabel" name="label" >
- <property name="text" >
- <string>Symbol field</string>
- </property>
- <property name="buddy" >
- <cstring>mSymbolComboBox</cstring>
- </property>
- </widget>
- </item>
- <item row="3" column="2" >
- <widget class="QLabel" name="textLabel1_2" >
- <property name="text" >
+ <item row="1" column="0">
+ <widget class="QLabel" name="textLabel1_2">
+ <property name="text">
<string>Size</string>
</property>
- <property name="buddy" >
+ <property name="buddy">
<cstring>mPointSizeSpinBox</cstring>
</property>
</widget>
</item>
- <item row="3" column="3" >
- <widget class="QDoubleSpinBox" name="mPointSizeSpinBox" >
- <property name="decimals" >
+ <item row="1" column="1">
+ <widget class="QDoubleSpinBox" name="mPointSizeSpinBox">
+ <property name="decimals">
<number>5</number>
</property>
- <property name="maximum" >
+ <property name="maximum">
<double>1000000.000000000000000</double>
</property>
- <property name="singleStep" >
+ <property name="singleStep">
<double>0.100000000000000</double>
</property>
- <property name="value" >
+ <property name="value">
<double>1.000000000000000</double>
</property>
</widget>
</item>
- <item row="3" column="4" >
- <widget class="QCheckBox" name="mPointSizeUnitsCheckBox" >
- <property name="text" >
- <string>Size in map units</string>
+ <item row="1" column="2">
+ <widget class="QCheckBox" name="mPointSizeUnitsCheckBox">
+ <property name="text">
+ <string>In map units</string>
</property>
</widget>
</item>
+ <item row="2" column="2">
+ <layout class="QHBoxLayout" name="horizontalLayout"/>
+ </item>
</layout>
</widget>
</item>
- <item row="2" column="0" colspan="2" >
- <widget class="QGroupBox" name="groupBox_3" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="title" >
- <string>Style Options</string>
- </property>
- <layout class="QGridLayout" >
- <item row="0" column="0" >
- <widget class="QLabel" name="outlinecolorlabel_2" >
- <property name="text" >
- <string>Outline style</string>
- </property>
- <property name="buddy" >
- <cstring>cboOutlineStyle</cstring>
- </property>
- </widget>
- </item>
- <item row="0" column="1" >
- <widget class="QComboBox" name="cboOutlineStyle" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="minimumSize" >
- <size>
- <width>0</width>
- <height>20</height>
- </size>
- </property>
- <property name="maximumSize" >
- <size>
- <width>172</width>
- <height>16777215</height>
- </size>
- </property>
- </widget>
- </item>
- <item row="0" column="2" >
- <widget class="QLabel" name="outlinecolorlabel" >
- <property name="text" >
- <string>Outline color</string>
- </property>
- <property name="buddy" >
- <cstring>btnOutlineColor</cstring>
- </property>
- </widget>
- </item>
- <item row="0" column="3" >
- <widget class="QgsColorButton" name="btnOutlineColor" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Fixed" hsizetype="Minimum" >
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="minimumSize" >
- <size>
- <width>32</width>
- <height>20</height>
- </size>
- </property>
- <property name="maximumSize" >
- <size>
- <width>32</width>
- <height>16777215</height>
- </size>
- </property>
- <property name="text" >
- <string/>
- </property>
- </widget>
- </item>
- <item row="0" column="4" >
- <widget class="QLabel" name="outlinewidthlabel" >
- <property name="text" >
- <string>Outline width</string>
- </property>
- <property name="buddy" >
- <cstring>outlinewidthspinbox</cstring>
- </property>
- </widget>
- </item>
- <item row="0" column="5" >
- <widget class="QDoubleSpinBox" name="outlinewidthspinbox" >
- <property name="minimumSize" >
- <size>
- <width>0</width>
- <height>20</height>
- </size>
- </property>
- <property name="maximumSize" >
- <size>
- <width>172</width>
- <height>16777215</height>
- </size>
- </property>
- <property name="singleStep" >
- <double>0.100000000000000</double>
- </property>
- </widget>
- </item>
- <item row="1" column="0" >
- <widget class="QLabel" name="fillcolorlabel_2" >
- <property name="text" >
- <string>Fill style</string>
- </property>
- <property name="buddy" >
- <cstring>cboFillStyle</cstring>
- </property>
- </widget>
- </item>
- <item row="1" column="1" >
- <layout class="QHBoxLayout" >
- <item>
- <widget class="QComboBox" name="cboFillStyle" >
- <property name="minimumSize" >
+ <item row="2" column="0" colspan="2">
+ <layout class="QHBoxLayout" name="horizontalLayout_2">
+ <item>
+ <widget class="QGroupBox" name="mGroupDrawingByField">
+ <property name="title">
+ <string>Drawing by field</string>
+ </property>
+ <layout class="QGridLayout" name="gridLayout">
+ <item row="0" column="0">
+ <widget class="QLabel" name="mLblRotationField">
+ <property name="text">
+ <string>Rotation</string>
+ </property>
+ <property name="buddy">
+ <cstring>mRotationClassificationComboBox</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QComboBox" name="mRotationClassificationComboBox">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>20</height>
</size>
</property>
- <property name="maximumSize" >
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="textLabel9">
+ <property name="text">
+ <string>Area scale</string>
+ </property>
+ <property name="buddy">
+ <cstring>mScaleClassificationComboBox</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="QComboBox" name="mScaleClassificationComboBox">
+ <property name="minimumSize">
<size>
- <width>142</width>
- <height>16777215</height>
+ <width>0</width>
+ <height>20</height>
</size>
</property>
</widget>
</item>
- <item>
- <widget class="QToolButton" name="toolSelectTexture" >
- <property name="text" >
- <string>...</string>
+ <item row="2" column="0">
+ <widget class="QLabel" name="label">
+ <property name="text">
+ <string>Symbol</string>
</property>
+ <property name="buddy">
+ <cstring>mSymbolComboBox</cstring>
+ </property>
</widget>
</item>
+ <item row="2" column="1">
+ <widget class="QComboBox" name="mSymbolComboBox"/>
+ </item>
</layout>
- </item>
- <item row="1" column="2" >
- <widget class="QLabel" name="fillcolorlabel" >
- <property name="text" >
- <string>Fill color</string>
- </property>
- <property name="buddy" >
- <cstring>btnFillColor</cstring>
- </property>
- </widget>
- </item>
- <item row="1" column="3" >
- <widget class="QgsColorButton" name="btnFillColor" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="minimumSize" >
- <size>
- <width>32</width>
- <height>20</height>
- </size>
- </property>
- <property name="maximumSize" >
- <size>
- <width>32</width>
- <height>16777215</height>
- </size>
- </property>
- <property name="text" >
- <string/>
- </property>
- </widget>
- </item>
- <item row="1" column="4" colspan="2" >
- <spacer>
- <property name="orientation" >
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" >
- <size>
- <width>271</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
- </widget>
+ </widget>
+ </item>
+ <item>
+ <layout class="QVBoxLayout" name="verticalLayout">
+ <item>
+ <widget class="QGroupBox" name="groupBox">
+ <property name="title">
+ <string>Fill options</string>
+ </property>
+ <layout class="QGridLayout" name="gridLayout_3">
+ <item row="0" column="0">
+ <widget class="QComboBox" name="cboFillStyle">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>0</width>
+ <height>20</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>172</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QToolButton" name="toolSelectTexture">
+ <property name="text">
+ <string>...</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="2">
+ <widget class="QgsColorButton" name="btnFillColor">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>32</width>
+ <height>20</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>32</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="3">
+ <spacer name="horizontalSpacer">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item>
+ <widget class="QGroupBox" name="groupBox_3">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="title">
+ <string>Outline options</string>
+ </property>
+ <layout class="QGridLayout" name="gridLayout_2">
+ <item row="0" column="0">
+ <widget class="QComboBox" name="cboOutlineStyle">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>0</width>
+ <height>20</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>172</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QgsColorButton" name="btnOutlineColor">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>32</width>
+ <height>20</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>32</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="2">
+ <widget class="QLabel" name="outlinewidthlabel">
+ <property name="text">
+ <string>Width</string>
+ </property>
+ <property name="buddy">
+ <cstring>outlinewidthspinbox</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="3">
+ <widget class="QDoubleSpinBox" name="outlinewidthspinbox">
+ <property name="minimumSize">
+ <size>
+ <width>0</width>
+ <height>20</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>172</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ <property name="singleStep">
+ <double>0.100000000000000</double>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <layout class="QHBoxLayout"/>
+ </item>
+ <item row="0" column="4">
+ <spacer name="horizontalSpacer_2">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ </layout>
</item>
</layout>
</widget>
- <layoutdefault spacing="6" margin="11" />
+ <layoutdefault spacing="6" margin="11"/>
<customwidgets>
<customwidget>
<class>QgsColorButton</class>
@@ -386,14 +403,9 @@
<tabstop>mRotationClassificationComboBox</tabstop>
<tabstop>mSymbolComboBox</tabstop>
<tabstop>mScaleClassificationComboBox</tabstop>
- <tabstop>mPointSizeSpinBox</tabstop>
- <tabstop>mPointSizeUnitsCheckBox</tabstop>
<tabstop>cboOutlineStyle</tabstop>
<tabstop>btnOutlineColor</tabstop>
<tabstop>outlinewidthspinbox</tabstop>
- <tabstop>cboFillStyle</tabstop>
- <tabstop>toolSelectTexture</tabstop>
- <tabstop>btnFillColor</tabstop>
</tabstops>
<resources/>
<connections/>
Modified: trunk/qgis/src/ui/qgsuniquevaluedialogbase.ui
===================================================================
--- trunk/qgis/src/ui/qgsuniquevaluedialogbase.ui 2009-11-04 17:13:33 UTC (rev 11920)
+++ trunk/qgis/src/ui/qgsuniquevaluedialogbase.ui 2009-11-04 20:16:07 UTC (rev 11921)
@@ -1,67 +1,68 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
<class>QgsUniqueValueDialogBase</class>
- <widget class="QDialog" name="QgsUniqueValueDialogBase" >
- <property name="geometry" >
+ <widget class="QDialog" name="QgsUniqueValueDialogBase">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
- <width>500</width>
+ <width>661</width>
<height>408</height>
</rect>
</property>
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="windowTitle" >
+ <property name="windowTitle">
<string>Form1</string>
</property>
- <layout class="QGridLayout" >
- <property name="leftMargin" >
+ <layout class="QGridLayout">
+ <property name="leftMargin">
<number>0</number>
</property>
- <property name="topMargin" >
+ <property name="topMargin">
<number>8</number>
</property>
- <property name="rightMargin" >
+ <property name="rightMargin">
<number>0</number>
</property>
- <property name="bottomMargin" >
+ <property name="bottomMargin">
<number>0</number>
</property>
- <item row="0" column="0" >
- <widget class="QLabel" name="mClassVarLabel" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Preferred" hsizetype="Minimum" >
+ <item row="0" column="0">
+ <widget class="QLabel" name="mClassVarLabel">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize" >
+ <property name="minimumSize">
<size>
<width>0</width>
<height>20</height>
</size>
</property>
- <property name="text" >
+ <property name="text">
<string>Classification field</string>
</property>
- <property name="buddy" >
+ <property name="buddy">
<cstring>mClassificationComboBox</cstring>
</property>
</widget>
</item>
- <item row="0" column="1" >
- <widget class="QComboBox" name="mClassificationComboBox" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
+ <item row="0" column="1">
+ <widget class="QComboBox" name="mClassificationComboBox">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize" >
+ <property name="minimumSize">
<size>
<width>0</width>
<height>20</height>
@@ -69,17 +70,17 @@
</property>
</widget>
</item>
- <item row="1" column="0" colspan="2" >
- <layout class="QHBoxLayout" >
+ <item row="1" column="0" colspan="2">
+ <layout class="QHBoxLayout">
<item>
<spacer>
- <property name="orientation" >
+ <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeType" >
+ <property name="sizeType">
<enum>QSizePolicy::Minimum</enum>
</property>
- <property name="sizeHint" stdset="0" >
+ <property name="sizeHint" stdset="0">
<size>
<width>111</width>
<height>20</height>
@@ -88,65 +89,65 @@
</spacer>
</item>
<item>
- <widget class="QPushButton" name="mClassifyButton" >
- <property name="text" >
+ <widget class="QPushButton" name="mClassifyButton">
+ <property name="text">
<string>Classify</string>
</property>
</widget>
</item>
<item>
- <widget class="QPushButton" name="mAddButton" >
- <property name="text" >
+ <widget class="QPushButton" name="mAddButton">
+ <property name="text">
<string>Add class</string>
</property>
</widget>
</item>
<item>
- <widget class="QPushButton" name="mDeletePushButton" >
- <property name="text" >
+ <widget class="QPushButton" name="mDeletePushButton">
+ <property name="text">
<string>Delete classes</string>
</property>
</widget>
</item>
<item>
- <widget class="QPushButton" name="mRandomizeColors" >
- <property name="text" >
+ <widget class="QPushButton" name="mRandomizeColors">
+ <property name="text">
<string>Randomize Colors</string>
</property>
</widget>
</item>
<item>
- <widget class="QPushButton" name="mResetColors" >
- <property name="text" >
+ <widget class="QPushButton" name="mResetColors">
+ <property name="text">
<string>Reset Colors</string>
</property>
</widget>
</item>
</layout>
</item>
- <item row="2" column="0" rowspan="2" >
- <widget class="QListWidget" name="mClassListWidget" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Expanding" hsizetype="Minimum" >
+ <item row="2" column="0" rowspan="3">
+ <widget class="QListWidget" name="mClassListWidget">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Minimum" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
- <item row="2" column="1" >
- <widget class="QStackedWidget" name="mSymbolWidgetStack" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Preferred" hsizetype="Expanding" >
+ <item row="2" column="1">
+ <widget class="QStackedWidget" name="mSymbolWidgetStack">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <widget class="QWidget" name="page" />
- <widget class="QWidget" name="page_2" />
+ <widget class="QWidget" name="page"/>
+ <widget class="QWidget" name="page_2"/>
</widget>
</item>
- <item row="3" column="1">
+ <item row="4" column="1">
<widget class="QCheckBox" name="mCommonPropertyLock">
<property name="text">
<string>Restrict changes to common properties</string>
@@ -156,9 +157,22 @@
</property>
</widget>
</item>
+ <item row="3" column="1">
+ <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>
</widget>
- <layoutdefault spacing="6" margin="11" />
+ <layoutdefault spacing="6" margin="11"/>
<tabstops>
<tabstop>mClassificationComboBox</tabstop>
<tabstop>mClassifyButton</tabstop>
Modified: trunk/qgis/src/ui/qgsvectorlayerpropertiesbase.ui
===================================================================
--- trunk/qgis/src/ui/qgsvectorlayerpropertiesbase.ui 2009-11-04 17:13:33 UTC (rev 11920)
+++ trunk/qgis/src/ui/qgsvectorlayerpropertiesbase.ui 2009-11-04 20:16:07 UTC (rev 11921)
@@ -1,170 +1,171 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
<class>QgsVectorLayerPropertiesBase</class>
- <widget class="QDialog" name="QgsVectorLayerPropertiesBase" >
- <property name="geometry" >
+ <widget class="QDialog" name="QgsVectorLayerPropertiesBase">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
- <width>839</width>
- <height>675</height>
+ <width>678</width>
+ <height>600</height>
</rect>
</property>
- <property name="minimumSize" >
+ <property name="minimumSize">
<size>
<width>0</width>
<height>600</height>
</size>
</property>
- <property name="windowTitle" >
+ <property name="windowTitle">
<string>Layer Properties</string>
</property>
- <property name="windowIcon" >
+ <property name="windowIcon">
<iconset>
<normaloff/>
</iconset>
</property>
- <property name="modal" >
+ <property name="modal">
<bool>true</bool>
</property>
- <layout class="QGridLayout" >
- <item row="1" column="0" >
- <layout class="QHBoxLayout" >
- <property name="spacing" >
+ <layout class="QGridLayout">
+ <item row="1" column="0">
+ <layout class="QHBoxLayout">
+ <property name="spacing">
<number>3</number>
</property>
- <property name="margin" >
+ <property name="margin">
<number>1</number>
</property>
<item>
- <widget class="QPushButton" name="pbnLoadDefaultStyle" >
- <property name="text" >
+ <widget class="QPushButton" name="pbnLoadDefaultStyle">
+ <property name="text">
<string>Restore Default Style</string>
</property>
</widget>
</item>
<item>
- <widget class="QPushButton" name="pbnSaveDefaultStyle" >
- <property name="text" >
+ <widget class="QPushButton" name="pbnSaveDefaultStyle">
+ <property name="text">
<string>Save As Default</string>
</property>
</widget>
</item>
<item>
- <widget class="QPushButton" name="pbnLoadStyle" >
- <property name="text" >
+ <widget class="QPushButton" name="pbnLoadStyle">
+ <property name="text">
<string>Load Style ...</string>
</property>
</widget>
</item>
<item>
- <widget class="QPushButton" name="pbnSaveStyleAs" >
- <property name="text" >
+ <widget class="QPushButton" name="pbnSaveStyleAs">
+ <property name="text">
<string>Save Style ...</string>
</property>
</widget>
</item>
</layout>
</item>
- <item row="3" column="0" >
- <widget class="QDialogButtonBox" name="buttonBox" >
- <property name="orientation" >
+ <item row="3" column="0">
+ <widget class="QDialogButtonBox" name="buttonBox">
+ <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="standardButtons" >
+ <property name="standardButtons">
<set>QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Help|QDialogButtonBox::Ok</set>
</property>
</widget>
</item>
- <item row="0" column="0" >
- <widget class="QTabWidget" name="tabWidget" >
- <property name="enabled" >
+ <item row="0" column="0">
+ <widget class="QTabWidget" name="tabWidget">
+ <property name="enabled">
<bool>true</bool>
</property>
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="autoFillBackground" >
+ <property name="autoFillBackground">
<bool>false</bool>
</property>
- <property name="tabShape" >
+ <property name="tabShape">
<enum>QTabWidget::Rounded</enum>
</property>
- <property name="currentIndex" >
+ <property name="currentIndex">
<number>0</number>
</property>
- <widget class="QWidget" name="tab1" >
- <attribute name="title" >
+ <widget class="QWidget" name="tab1">
+ <attribute name="title">
<string>General</string>
</attribute>
- <layout class="QGridLayout" >
- <item row="0" column="0" >
- <widget class="QGroupBox" name="indexGroupBox" >
- <property name="title" >
+ <layout class="QGridLayout">
+ <item row="0" column="0">
+ <widget class="QGroupBox" name="indexGroupBox">
+ <property name="title">
<string>Options</string>
</property>
- <layout class="QGridLayout" >
- <item row="0" column="0" >
- <widget class="QLabel" name="textLabel3" >
- <property name="text" >
+ <layout class="QGridLayout">
+ <item row="0" column="0">
+ <widget class="QLabel" name="textLabel3">
+ <property name="text">
<string>Display name</string>
</property>
- <property name="buddy" >
+ <property name="buddy">
<cstring>txtDisplayName</cstring>
</property>
</widget>
</item>
- <item row="0" column="1" colspan="2" >
- <widget class="QLineEdit" name="txtDisplayName" />
+ <item row="0" column="1" colspan="2">
+ <widget class="QLineEdit" name="txtDisplayName"/>
</item>
- <item row="1" column="0" >
- <widget class="QLabel" name="textLabel2" >
- <property name="toolTip" >
+ <item row="1" column="0">
+ <widget class="QLabel" name="textLabel2">
+ <property name="toolTip">
<string>Display field for the Identify Results dialog box</string>
</property>
- <property name="whatsThis" >
+ <property name="whatsThis">
<string>This sets the display field for the Identify Results dialog box</string>
</property>
- <property name="text" >
+ <property name="text">
<string>Display field</string>
</property>
- <property name="buddy" >
+ <property name="buddy">
<cstring>displayFieldComboBox</cstring>
</property>
</widget>
</item>
- <item row="1" column="1" colspan="2" >
- <widget class="QComboBox" name="displayFieldComboBox" >
- <property name="whatsThis" >
+ <item row="1" column="1" colspan="2">
+ <widget class="QComboBox" name="displayFieldComboBox">
+ <property name="whatsThis">
<string>Use this control to set which field is placed at the top level of the Identify Results dialog box.</string>
</property>
</widget>
</item>
- <item row="2" column="0" colspan="3" >
- <widget class="QLineEdit" name="leSpatialRefSys" >
- <property name="readOnly" >
+ <item row="2" column="0" colspan="3">
+ <widget class="QLineEdit" name="leSpatialRefSys">
+ <property name="readOnly">
<bool>true</bool>
</property>
</widget>
</item>
- <item row="3" column="1" >
- <widget class="QPushButton" name="pbnIndex" >
- <property name="text" >
+ <item row="3" column="1">
+ <widget class="QPushButton" name="pbnIndex">
+ <property name="text">
<string>Create Spatial Index</string>
</property>
</widget>
</item>
- <item row="3" column="2" >
- <widget class="QPushButton" name="pbnChangeSpatialRefSys" >
- <property name="toolTip" >
+ <item row="3" column="2">
+ <widget class="QPushButton" name="pbnChangeSpatialRefSys">
+ <property name="toolTip">
<string>Specify the coordinate reference system of the layer's geometry.</string>
</property>
- <property name="whatsThis" >
+ <property name="whatsThis">
<string>Specify the coordinate reference system of the layer's geometry.</string>
</property>
- <property name="text" >
+ <property name="text">
<string>Specify CRS</string>
</property>
</widget>
@@ -172,60 +173,60 @@
</layout>
</widget>
</item>
- <item row="1" column="0" >
- <widget class="QGroupBox" name="chkUseScaleDependentRendering" >
- <property name="title" >
+ <item row="1" column="0">
+ <widget class="QGroupBox" name="chkUseScaleDependentRendering">
+ <property name="title">
<string>Use scale dependent rendering</string>
</property>
- <property name="checkable" >
+ <property name="checkable">
<bool>true</bool>
</property>
- <layout class="QGridLayout" >
- <property name="margin" >
+ <layout class="QGridLayout">
+ <property name="margin">
<number>11</number>
</property>
- <item row="0" column="2" >
- <widget class="QLabel" name="textLabel1_2_2" >
- <property name="text" >
+ <item row="0" column="2">
+ <widget class="QLabel" name="textLabel1_2_2">
+ <property name="text">
<string>Maximum</string>
</property>
- <property name="buddy" >
+ <property name="buddy">
<cstring>spinMaximumScale</cstring>
</property>
</widget>
</item>
- <item row="0" column="0" >
- <widget class="QLabel" name="textLabel1" >
- <property name="text" >
+ <item row="0" column="0">
+ <widget class="QLabel" name="textLabel1">
+ <property name="text">
<string>Minimum</string>
</property>
- <property name="buddy" >
+ <property name="buddy">
<cstring>spinMinimumScale</cstring>
</property>
</widget>
</item>
- <item row="0" column="1" >
- <widget class="QSpinBox" name="spinMinimumScale" >
- <property name="toolTip" >
+ <item row="0" column="1">
+ <widget class="QSpinBox" name="spinMinimumScale">
+ <property name="toolTip">
<string>Minimum scale at which this layer will be displayed. </string>
</property>
- <property name="minimum" >
+ <property name="minimum">
<number>1</number>
</property>
- <property name="maximum" >
+ <property name="maximum">
<number>100000000</number>
</property>
</widget>
</item>
- <item row="0" column="3" >
- <widget class="QSpinBox" name="spinMaximumScale" >
- <property name="toolTip" >
+ <item row="0" column="3">
+ <widget class="QSpinBox" name="spinMaximumScale">
+ <property name="toolTip">
<string>Maximum scale at which this layer will be displayed. </string>
</property>
- <property name="minimum" >
+ <property name="minimum">
<number>1</number>
</property>
- <property name="maximum" >
+ <property name="maximum">
<number>100000000</number>
</property>
</widget>
@@ -233,37 +234,37 @@
</layout>
</widget>
</item>
- <item row="2" column="0" >
- <widget class="QGroupBox" name="grpSubset" >
- <property name="title" >
+ <item row="2" column="0">
+ <widget class="QGroupBox" name="grpSubset">
+ <property name="title">
<string>Subset</string>
</property>
- <layout class="QGridLayout" >
- <property name="margin" >
+ <layout class="QGridLayout">
+ <property name="margin">
<number>11</number>
</property>
- <item row="0" column="0" colspan="2" >
- <widget class="QTextEdit" name="txtSubsetSQL" >
- <property name="enabled" >
+ <item row="0" column="0" colspan="2">
+ <widget class="QTextEdit" name="txtSubsetSQL">
+ <property name="enabled">
<bool>false</bool>
</property>
- <property name="acceptDrops" >
+ <property name="acceptDrops">
<bool>false</bool>
</property>
- <property name="acceptRichText" >
+ <property name="acceptRichText">
<bool>false</bool>
</property>
</widget>
</item>
- <item row="1" column="0" >
+ <item row="1" column="0">
<spacer>
- <property name="orientation" >
+ <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeType" >
+ <property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
- <property name="sizeHint" stdset="0" >
+ <property name="sizeHint" stdset="0">
<size>
<width>480</width>
<height>21</height>
@@ -271,9 +272,9 @@
</property>
</spacer>
</item>
- <item row="1" column="1" >
- <widget class="QPushButton" name="pbnQueryBuilder" >
- <property name="text" >
+ <item row="1" column="1">
+ <widget class="QPushButton" name="pbnQueryBuilder">
+ <property name="text">
<string>Query Builder</string>
</property>
</widget>
@@ -283,54 +284,54 @@
</item>
</layout>
</widget>
- <widget class="QWidget" name="tab2" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
+ <widget class="QWidget" name="tab2">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <attribute name="title" >
+ <attribute name="title">
<string>Symbology</string>
</attribute>
- <layout class="QGridLayout" >
- <item row="0" column="0" >
- <widget class="QLabel" name="legendtypelabel" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Preferred" hsizetype="Minimum" >
+ <layout class="QGridLayout">
+ <item row="0" column="0">
+ <widget class="QLabel" name="legendtypelabel">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="maximumSize" >
+ <property name="maximumSize">
<size>
<width>32767</width>
<height>22</height>
</size>
</property>
- <property name="text" >
+ <property name="text">
<string>Legend type</string>
</property>
- <property name="buddy" >
+ <property name="buddy">
<cstring>legendtypecombobox</cstring>
</property>
</widget>
</item>
- <item row="0" column="1" >
- <widget class="QComboBox" name="legendtypecombobox" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Fixed" hsizetype="Maximum" >
+ <item row="0" column="1">
+ <widget class="QComboBox" name="legendtypecombobox">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize" >
+ <property name="minimumSize">
<size>
<width>0</width>
<height>26</height>
</size>
</property>
- <property name="maximumSize" >
+ <property name="maximumSize">
<size>
<width>32767</width>
<height>22</height>
@@ -338,231 +339,231 @@
</property>
</widget>
</item>
- <item row="0" column="2" >
- <widget class="QLabel" name="lblTransparencyPercent" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Preferred" hsizetype="Minimum" >
+ <item row="0" column="2">
+ <widget class="QLabel" name="lblTransparencyPercent">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="text" >
+ <property name="text">
<string>Transparency</string>
</property>
- <property name="buddy" >
+ <property name="buddy">
<cstring>sliderTransparency</cstring>
</property>
</widget>
</item>
- <item row="0" column="3" >
- <widget class="QSlider" name="sliderTransparency" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Fixed" hsizetype="Minimum" >
+ <item row="0" column="3">
+ <widget class="QSlider" name="sliderTransparency">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="maximum" >
+ <property name="maximum">
<number>255</number>
</property>
- <property name="value" >
+ <property name="value">
<number>0</number>
</property>
- <property name="orientation" >
+ <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
- <item row="1" column="0" colspan="4" >
- <widget class="QStackedWidget" name="widgetStackRenderers" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
+ <item row="1" column="0" colspan="4">
+ <widget class="QStackedWidget" name="widgetStackRenderers">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="frameShape" >
+ <property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
- <property name="frameShadow" >
+ <property name="frameShadow">
<enum>QFrame::Sunken</enum>
</property>
- <property name="currentIndex" >
+ <property name="currentIndex">
<number>1</number>
</property>
- <widget class="QWidget" name="page" />
- <widget class="QWidget" name="page_2" />
+ <widget class="QWidget" name="page"/>
+ <widget class="QWidget" name="page_2"/>
</widget>
</item>
</layout>
</widget>
- <widget class="QWidget" name="tab3" >
- <attribute name="title" >
+ <widget class="QWidget" name="tab3">
+ <attribute name="title">
<string>Metadata</string>
</attribute>
- <layout class="QGridLayout" >
- <property name="margin" >
+ <layout class="QGridLayout">
+ <property name="margin">
<number>11</number>
</property>
- <item row="0" column="0" >
- <widget class="QTextEdit" name="teMetadata" >
- <property name="lineWidth" >
+ <item row="0" column="0">
+ <widget class="QTextEdit" name="teMetadata">
+ <property name="lineWidth">
<number>2</number>
</property>
- <property name="readOnly" >
+ <property name="readOnly">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</widget>
- <widget class="QWidget" name="tab4" >
- <attribute name="title" >
+ <widget class="QWidget" name="tab4">
+ <attribute name="title">
<string>Labels</string>
</attribute>
- <layout class="QGridLayout" >
- <item row="0" column="0" >
- <widget class="QCheckBox" name="labelCheckBox" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
+ <layout class="QGridLayout">
+ <item row="0" column="0">
+ <widget class="QCheckBox" name="labelCheckBox">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="text" >
+ <property name="text">
<string>Display labels</string>
</property>
</widget>
</item>
- <item row="1" column="0" >
- <widget class="QFrame" name="labelOptionsFrame" >
- <property name="enabled" >
+ <item row="1" column="0">
+ <widget class="QFrame" name="labelOptionsFrame">
+ <property name="enabled">
<bool>false</bool>
</property>
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="frameShape" >
+ <property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
- <property name="frameShadow" >
+ <property name="frameShadow">
<enum>QFrame::Plain</enum>
</property>
</widget>
</item>
</layout>
</widget>
- <widget class="QWidget" name="tab5" >
- <attribute name="title" >
+ <widget class="QWidget" name="tab5">
+ <attribute name="title">
<string>Actions</string>
</attribute>
- <layout class="QGridLayout" >
- <item row="0" column="0" >
- <widget class="QFrame" name="actionOptionsFrame" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
+ <layout class="QGridLayout">
+ <item row="0" column="0">
+ <widget class="QFrame" name="actionOptionsFrame">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="frameShape" >
+ <property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
- <property name="frameShadow" >
+ <property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
</widget>
</item>
</layout>
</widget>
- <widget class="QWidget" name="tab6" >
- <attribute name="title" >
+ <widget class="QWidget" name="tab6">
+ <attribute name="title">
<string>Attributes</string>
</attribute>
- <layout class="QGridLayout" name="gridLayout" >
- <item row="0" column="0" >
- <layout class="QHBoxLayout" name="horizontalLayout" >
+ <layout class="QGridLayout" name="gridLayout">
+ <item row="0" column="0">
+ <layout class="QHBoxLayout" name="horizontalLayout">
<item>
- <widget class="QToolButton" name="mAddAttributeButton" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+ <widget class="QToolButton" name="mAddAttributeButton">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="toolTip" >
+ <property name="toolTip">
<string>New column</string>
</property>
- <property name="text" >
+ <property name="text">
<string/>
</property>
- <property name="icon" >
+ <property name="icon">
<iconset>
<normaloff>../xpm/new_attribute.png</normaloff>../xpm/new_attribute.png</iconset>
</property>
- <property name="shortcut" >
+ <property name="shortcut">
<string>Ctrl+N</string>
</property>
</widget>
</item>
<item>
- <widget class="QToolButton" name="mDeleteAttributeButton" >
- <property name="toolTip" >
+ <widget class="QToolButton" name="mDeleteAttributeButton">
+ <property name="toolTip">
<string>Delete column</string>
</property>
- <property name="text" >
+ <property name="text">
<string/>
</property>
- <property name="icon" >
+ <property name="icon">
<iconset>
<normaloff>../xpm/delete_attribute.png</normaloff>../xpm/delete_attribute.png</iconset>
</property>
- <property name="shortcut" >
+ <property name="shortcut">
<string>Ctrl+X</string>
</property>
</widget>
</item>
<item>
- <widget class="QToolButton" name="mToggleEditingButton" >
- <property name="toolTip" >
+ <widget class="QToolButton" name="mToggleEditingButton">
+ <property name="toolTip">
<string>Toggle editing mode</string>
</property>
- <property name="whatsThis" >
+ <property name="whatsThis">
<string>Click to toggle table editing</string>
</property>
- <property name="text" >
+ <property name="text">
<string/>
</property>
- <property name="checkable" >
+ <property name="checkable">
<bool>true</bool>
</property>
</widget>
</item>
<item>
- <widget class="QToolButton" name="mCalculateFieldButton" >
- <property name="toolTip" >
+ <widget class="QToolButton" name="mCalculateFieldButton">
+ <property name="toolTip">
<string>Field calculator</string>
</property>
- <property name="whatsThis" >
+ <property name="whatsThis">
<string>Click to toggle table editing</string>
</property>
- <property name="text" >
+ <property name="text">
<string/>
</property>
- <property name="checkable" >
+ <property name="checkable">
<bool>false</bool>
</property>
</widget>
</item>
<item>
<spacer>
- <property name="orientation" >
+ <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeHint" stdset="0" >
+ <property name="sizeHint" stdset="0">
<size>
<width>658</width>
<height>19</height>
@@ -572,21 +573,21 @@
</item>
</layout>
</item>
- <item row="1" column="0" >
- <widget class="QTableWidget" name="tblAttributes" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
+ <item row="1" column="0">
+ <widget class="QTableWidget" name="tblAttributes">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize" >
+ <property name="minimumSize">
<size>
<width>256</width>
<height>0</height>
</size>
</property>
- <property name="sortingEnabled" >
+ <property name="sortingEnabled">
<bool>false</bool>
</property>
</widget>
@@ -597,7 +598,7 @@
</item>
</layout>
</widget>
- <layoutdefault spacing="6" margin="11" />
+ <layoutdefault spacing="6" margin="11"/>
<tabstops>
<tabstop>legendtypecombobox</tabstop>
<tabstop>sliderTransparency</tabstop>
@@ -628,11 +629,11 @@
<receiver>labelOptionsFrame</receiver>
<slot>setEnabled(bool)</slot>
<hints>
- <hint type="sourcelabel" >
+ <hint type="sourcelabel">
<x>60</x>
<y>53</y>
</hint>
- <hint type="destinationlabel" >
+ <hint type="destinationlabel">
<x>61</x>
<y>68</y>
</hint>
More information about the QGIS-commit
mailing list