Skip to content
Permalink
Browse files

Usability cleanups for vector props dialogs. Also removed size adjust…

…ment to marker sizes in qgsoptions.

git-svn-id: http://svn.osgeo.org/qgis/trunk@11921 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
timlinux
timlinux committed Nov 4, 2009
1 parent 49873f7 commit e7b6deb35880ff3fcad21dc7d2dbb8370df44e87
@@ -277,7 +277,7 @@ QgsOptions::QgsOptions( QWidget *parent, Qt::WFlags fl ) :
{
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 @@ void QgsOptions::saveOptions()
{
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() );

@@ -156,37 +156,39 @@ void QgsSingleSymbolDialog::refreshMarkers()
//
//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 )
@@ -1,103 +1,83 @@
<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>
<width>398</width>
<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" >
<number>0</number>
</property>
<property name="topMargin" >
<number>0</number>
</property>
<property name="rightMargin" >
<number>0</number>
</property>
<property name="bottomMargin" >
<property name="margin">
<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" >
<number>0</number>
</property>
<property name="topMargin" >
<number>0</number>
</property>
<property name="rightMargin" >
<item row="3" column="0">
<layout class="QGridLayout">
<property name="margin">
<number>0</number>
</property>
<property name="bottomMargin" >
<number>0</number>
</property>
<property name="horizontalSpacing" >
<number>6</number>
</property>
<property name="verticalSpacing" >
<property name="spacing">
<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>
@@ -1,60 +1,61 @@
<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>
<width>527</width>
<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>

0 comments on commit e7b6deb

Please sign in to comment.
You can’t perform that action at this time.