Skip to content

Commit e7b6deb

Browse files
author
timlinux
committed
Usability cleanups for vector props dialogs. Also removed size adjustment to marker sizes in qgsoptions.
git-svn-id: http://svn.osgeo.org/qgis/trunk@11921 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 49873f7 commit e7b6deb

10 files changed

+916
-940
lines changed

‎src/app/qgsoptions.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ QgsOptions::QgsOptions( QWidget *parent, Qt::WFlags fl ) :
277277
{
278278
mMarkerStyleComboBox->setCurrentIndex( mMarkerStyleComboBox->findText( tr( "None" ) ) );
279279
}
280-
mMarkerSizeSpinBox->setValue( settings.value( "/qgis/digitizing/marker_size", 7 ).toInt()*2 + 1 );
280+
mMarkerSizeSpinBox->setValue( settings.value( "/qgis/digitizing/marker_size", 7 ).toInt() );
281281

282282
chkDisableAttributeValuesDlg->setChecked( settings.value( "/qgis/digitizing/disable_enter_attribute_values_dialog", false ).toBool() );
283283

@@ -524,7 +524,7 @@ void QgsOptions::saveOptions()
524524
{
525525
settings.setValue( "/qgis/digitizing/marker_style", "None" );
526526
}
527-
settings.setValue( "/qgis/digitizing/marker_size", ( mMarkerSizeSpinBox->value() - 1 ) / 2 );
527+
settings.setValue( "/qgis/digitizing/marker_size", ( mMarkerSizeSpinBox->value() ) );
528528

529529
settings.setValue( "/qgis/digitizing/disable_enter_attribute_values_dialog", chkDisableAttributeValuesDlg->isChecked() );
530530

‎src/app/qgssinglesymboldialog.cpp‎

Lines changed: 23 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -156,37 +156,39 @@ void QgsSingleSymbolDialog::refreshMarkers()
156156
//
157157
//set outline / line style
158158
//
159-
cboOutlineStyle->addItem( QIcon( QgsSymbologyUtils::char2LinePixmap( "SolidLine" ) ), tr( "Solid Line" ), "SolidLine" );
160-
cboOutlineStyle->addItem( QIcon( QgsSymbologyUtils::char2LinePixmap( "DashLine" ) ), tr( "Dash Line" ), "DashLine" );
161-
cboOutlineStyle->addItem( QIcon( QgsSymbologyUtils::char2LinePixmap( "DotLine" ) ), tr( "Dot Line" ), "DotLine" );
162-
cboOutlineStyle->addItem( QIcon( QgsSymbologyUtils::char2LinePixmap( "DashDotLine" ) ), tr( "Dash Dot Line" ), "DashDotLine" );
163-
cboOutlineStyle->addItem( QIcon( QgsSymbologyUtils::char2LinePixmap( "DashDotDotLine" ) ), tr( "Dash Dot Dot Line" ), "DashDotDotLine" );
164-
cboOutlineStyle->addItem( QIcon( QgsSymbologyUtils::char2LinePixmap( "NoPen" ) ), tr( "No Pen" ), "NoPen" );
159+
cboOutlineStyle->addItem( QIcon( QgsSymbologyUtils::char2LinePixmap( "SolidLine" ) ), "", "SolidLine" );
160+
cboOutlineStyle->addItem( QIcon( QgsSymbologyUtils::char2LinePixmap( "DashLine" ) ), "", "DashLine" );
161+
cboOutlineStyle->addItem( QIcon( QgsSymbologyUtils::char2LinePixmap( "DotLine" ) ), "", "DotLine" );
162+
cboOutlineStyle->addItem( QIcon( QgsSymbologyUtils::char2LinePixmap( "DashDotLine" ) ), "" , "DashDotLine" );
163+
cboOutlineStyle->addItem( QIcon( QgsSymbologyUtils::char2LinePixmap( "DashDotDotLine" ) ),"", "DashDotDotLine" );
164+
cboOutlineStyle->addItem( QIcon( QgsSymbologyUtils::char2LinePixmap( "NoPen" ) ), tr( "None" ), "NoPen" );
165165

166166
//
167167
//set pattern icons and state
168168
//
169-
cboFillStyle->addItem( QIcon( QgsSymbologyUtils::char2PatternPixmap( "SolidPattern" ) ), tr( "Solid" ), "SolidPattern" );
170-
cboFillStyle->addItem( QIcon( QgsSymbologyUtils::char2PatternPixmap( "HorPattern" ) ), tr( "Horizontal" ), "HorPattern" );
171-
cboFillStyle->addItem( QIcon( QgsSymbologyUtils::char2PatternPixmap( "VerPattern" ) ), tr( "Vertical" ), "VerPattern" );
172-
cboFillStyle->addItem( QIcon( QgsSymbologyUtils::char2PatternPixmap( "CrossPattern" ) ), tr( "Cross" ), "CrossPattern" );
173-
cboFillStyle->addItem( QIcon( QgsSymbologyUtils::char2PatternPixmap( "BDiagPattern" ) ), tr( "BDiagonal" ), "BDiagPattern" );
174-
cboFillStyle->addItem( QIcon( QgsSymbologyUtils::char2PatternPixmap( "FDiagPattern" ) ), tr( "FDiagonal" ), "FDiagPattern" );
175-
cboFillStyle->addItem( QIcon( QgsSymbologyUtils::char2PatternPixmap( "DiagCrossPattern" ) ), tr( "Diagonal X" ), "DiagCrossPattern" );
176-
cboFillStyle->addItem( QIcon( QgsSymbologyUtils::char2PatternPixmap( "Dense1Pattern" ) ), tr( "Dense1" ), "Dense1Pattern" );
177-
cboFillStyle->addItem( QIcon( QgsSymbologyUtils::char2PatternPixmap( "Dense2Pattern" ) ), tr( "Dense2" ), "Dense2Pattern" );
178-
cboFillStyle->addItem( QIcon( QgsSymbologyUtils::char2PatternPixmap( "Dense3Pattern" ) ), tr( "Dense3" ), "Dense3Pattern" );
179-
cboFillStyle->addItem( QIcon( QgsSymbologyUtils::char2PatternPixmap( "Dense4Pattern" ) ), tr( "Dense4" ), "Dense4Pattern" );
180-
cboFillStyle->addItem( QIcon( QgsSymbologyUtils::char2PatternPixmap( "Dense5Pattern" ) ), tr( "Dense5" ), "Dense5Pattern" );
181-
cboFillStyle->addItem( QIcon( QgsSymbologyUtils::char2PatternPixmap( "Dense6Pattern" ) ), tr( "Dense6" ), "Dense6Pattern" );
182-
cboFillStyle->addItem( QIcon( QgsSymbologyUtils::char2PatternPixmap( "Dense7Pattern" ) ), tr( "Dense7" ), "Dense7Pattern" );
183-
cboFillStyle->addItem( QIcon( QgsSymbologyUtils::char2PatternPixmap( "NoBrush" ) ), tr( "No Brush" ), "NoBrush" );
169+
cboFillStyle->addItem( QIcon( QgsSymbologyUtils::char2PatternPixmap( "SolidPattern" ) ), "", "SolidPattern" );
170+
cboFillStyle->addItem( QIcon( QgsSymbologyUtils::char2PatternPixmap( "HorPattern" ) ), "", "HorPattern" );
171+
cboFillStyle->addItem( QIcon( QgsSymbologyUtils::char2PatternPixmap( "VerPattern" ) ), "", "VerPattern" );
172+
cboFillStyle->addItem( QIcon( QgsSymbologyUtils::char2PatternPixmap( "CrossPattern" ) ),"", "CrossPattern" );
173+
cboFillStyle->addItem( QIcon( QgsSymbologyUtils::char2PatternPixmap( "BDiagPattern" ) ), "", "BDiagPattern" );
174+
cboFillStyle->addItem( QIcon( QgsSymbologyUtils::char2PatternPixmap( "FDiagPattern" ) ), "", "FDiagPattern" );
175+
cboFillStyle->addItem( QIcon( QgsSymbologyUtils::char2PatternPixmap( "DiagCrossPattern" ) ), "", "DiagCrossPattern" );
176+
cboFillStyle->addItem( QIcon( QgsSymbologyUtils::char2PatternPixmap( "Dense1Pattern" ) ), "", "Dense1Pattern" );
177+
cboFillStyle->addItem( QIcon( QgsSymbologyUtils::char2PatternPixmap( "Dense2Pattern" ) ), "", "Dense2Pattern" );
178+
cboFillStyle->addItem( QIcon( QgsSymbologyUtils::char2PatternPixmap( "Dense3Pattern" ) ), "", "Dense3Pattern" );
179+
cboFillStyle->addItem( QIcon( QgsSymbologyUtils::char2PatternPixmap( "Dense4Pattern" ) ), "", "Dense4Pattern" );
180+
cboFillStyle->addItem( QIcon( QgsSymbologyUtils::char2PatternPixmap( "Dense5Pattern" ) ), "", "Dense5Pattern" );
181+
cboFillStyle->addItem( QIcon( QgsSymbologyUtils::char2PatternPixmap( "Dense6Pattern" ) ), "", "Dense6Pattern" );
182+
cboFillStyle->addItem( QIcon( QgsSymbologyUtils::char2PatternPixmap( "Dense7Pattern" ) ), "", "Dense7Pattern" );
183+
cboFillStyle->addItem( QIcon( QgsSymbologyUtils::char2PatternPixmap( "NoBrush" ) ), tr( "None" ), "NoBrush" );
184184
cboFillStyle->addItem( QIcon( QgsSymbologyUtils::char2PatternPixmap( "TexturePattern" ) ), tr( "Texture" ), "TexturePattern" );
185185

186186
if ( mVectorLayer && mVectorLayer->geometryType() != QGis::Point )
187187
{
188188
mGroupPoint->setVisible( false );
189189
mGroupPoint->setEnabled( false );
190+
mGroupDrawingByField->setVisible( false );
191+
mGroupDrawingByField->setEnabled( false );
190192
}
191193

192194
if ( mDisabled )

‎src/plugins/diagram_overlay/qgsdiagramdialogbase.ui‎

Lines changed: 41 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -1,103 +1,83 @@
1-
<ui version="4.0" >
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<ui version="4.0">
23
<class>QgsDiagramDialogBase</class>
3-
<widget class="QDialog" name="QgsDiagramDialogBase" >
4-
<property name="geometry" >
4+
<widget class="QDialog" name="QgsDiagramDialogBase">
5+
<property name="geometry">
56
<rect>
67
<x>0</x>
78
<y>0</y>
89
<width>398</width>
910
<height>441</height>
1011
</rect>
1112
</property>
12-
<property name="windowTitle" >
13+
<property name="windowTitle">
1314
<string>Dialog</string>
1415
</property>
15-
<layout class="QGridLayout" >
16-
<item row="0" column="0" >
17-
<widget class="QCheckBox" name="mDisplayDiagramsCheckBox" >
18-
<property name="text" >
16+
<layout class="QGridLayout">
17+
<item row="0" column="0">
18+
<widget class="QCheckBox" name="mDisplayDiagramsCheckBox">
19+
<property name="text">
1920
<string>Display diagrams</string>
2021
</property>
2122
</widget>
2223
</item>
23-
<item row="1" column="0" >
24-
<layout class="QHBoxLayout" >
25-
<property name="spacing" >
24+
<item row="1" column="0">
25+
<layout class="QHBoxLayout">
26+
<property name="spacing">
2627
<number>6</number>
2728
</property>
28-
<property name="leftMargin" >
29-
<number>0</number>
30-
</property>
31-
<property name="topMargin" >
32-
<number>0</number>
33-
</property>
34-
<property name="rightMargin" >
35-
<number>0</number>
36-
</property>
37-
<property name="bottomMargin" >
29+
<property name="margin">
3830
<number>0</number>
3931
</property>
4032
<item>
41-
<widget class="QLabel" name="mTypeLabel" >
42-
<property name="text" >
43-
<string>Diagram type:</string>
33+
<widget class="QLabel" name="mTypeLabel">
34+
<property name="text">
35+
<string>Diagram type</string>
4436
</property>
4537
</widget>
4638
</item>
4739
<item>
48-
<widget class="QComboBox" name="mDiagramTypeComboBox" />
40+
<widget class="QComboBox" name="mDiagramTypeComboBox"/>
4941
</item>
5042
</layout>
5143
</item>
52-
<item row="2" column="0" >
53-
<widget class="QStackedWidget" name="mDiagramFactoryStackedWidget" >
54-
<widget class="QWidget" name="page_3" />
55-
<widget class="QWidget" name="page_4" />
44+
<item row="2" column="0">
45+
<widget class="QStackedWidget" name="mDiagramFactoryStackedWidget">
46+
<widget class="QWidget" name="page_3"/>
47+
<widget class="QWidget" name="page_4"/>
5648
</widget>
5749
</item>
58-
<item row="3" column="0" >
59-
<layout class="QGridLayout" >
60-
<property name="leftMargin" >
61-
<number>0</number>
62-
</property>
63-
<property name="topMargin" >
64-
<number>0</number>
65-
</property>
66-
<property name="rightMargin" >
50+
<item row="3" column="0">
51+
<layout class="QGridLayout">
52+
<property name="margin">
6753
<number>0</number>
6854
</property>
69-
<property name="bottomMargin" >
70-
<number>0</number>
71-
</property>
72-
<property name="horizontalSpacing" >
73-
<number>6</number>
74-
</property>
75-
<property name="verticalSpacing" >
55+
<property name="spacing">
7656
<number>6</number>
7757
</property>
78-
<item row="0" column="1" >
79-
<widget class="QComboBox" name="mClassificationTypeComboBox" />
58+
<item row="0" column="1">
59+
<widget class="QComboBox" name="mClassificationTypeComboBox"/>
8060
</item>
81-
<item row="2" column="0" colspan="2" >
82-
<widget class="QStackedWidget" name="mWidgetStackRenderers" >
83-
<widget class="QWidget" name="page" />
84-
<widget class="QWidget" name="page_2" />
61+
<item row="2" column="0" colspan="2">
62+
<widget class="QStackedWidget" name="mWidgetStackRenderers">
63+
<widget class="QWidget" name="page"/>
64+
<widget class="QWidget" name="page_2"/>
8565
</widget>
8666
</item>
87-
<item row="1" column="0" >
88-
<widget class="QLabel" name="mClassificationLabel" >
89-
<property name="text" >
90-
<string>Classification attribute:</string>
67+
<item row="1" column="0">
68+
<widget class="QLabel" name="mClassificationLabel">
69+
<property name="text">
70+
<string>Classification attribute</string>
9171
</property>
9272
</widget>
9373
</item>
94-
<item row="1" column="1" >
95-
<widget class="QComboBox" name="mClassificationComboBox" />
74+
<item row="1" column="1">
75+
<widget class="QComboBox" name="mClassificationComboBox"/>
9676
</item>
97-
<item row="0" column="0" >
98-
<widget class="QLabel" name="mClassificationTypeLabel" >
99-
<property name="text" >
100-
<string>Classification type:</string>
77+
<item row="0" column="0">
78+
<widget class="QLabel" name="mClassificationTypeLabel">
79+
<property name="text">
80+
<string>Classification type</string>
10181
</property>
10282
</widget>
10383
</item>

‎src/plugins/diagram_overlay/qgslinearlyscalingdialogbase.ui‎

Lines changed: 24 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,60 +1,61 @@
1-
<ui version="4.0" >
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<ui version="4.0">
23
<class>QgsLinearlyScalingDialogBase</class>
3-
<widget class="QWidget" name="QgsLinearlyScalingDialogBase" >
4-
<property name="geometry" >
4+
<widget class="QWidget" name="QgsLinearlyScalingDialogBase">
5+
<property name="geometry">
56
<rect>
67
<x>0</x>
78
<y>0</y>
89
<width>527</width>
910
<height>91</height>
1011
</rect>
1112
</property>
12-
<property name="windowTitle" >
13+
<property name="windowTitle">
1314
<string>Form</string>
1415
</property>
15-
<layout class="QGridLayout" >
16-
<item row="0" column="0" >
17-
<widget class="QLabel" name="mTitleLabel" >
18-
<property name="text" >
16+
<layout class="QGridLayout">
17+
<item row="0" column="0">
18+
<widget class="QLabel" name="mTitleLabel">
19+
<property name="text">
1920
<string>Scale linearly between 0 and the following attribute value/ diagram size:</string>
2021
</property>
2122
</widget>
2223
</item>
23-
<item row="1" column="0" >
24-
<layout class="QHBoxLayout" >
24+
<item row="1" column="0">
25+
<layout class="QHBoxLayout">
2526
<item>
26-
<widget class="QPushButton" name="mFindMaximumValueButton" >
27-
<property name="text" >
28-
<string>find maximum Value:</string>
27+
<widget class="QPushButton" name="mFindMaximumValueButton">
28+
<property name="text">
29+
<string>Find maximum value</string>
2930
</property>
3031
</widget>
3132
</item>
3233
<item>
33-
<widget class="QLineEdit" name="mValueLineEdit" />
34+
<widget class="QLineEdit" name="mValueLineEdit"/>
3435
</item>
3536
<item>
36-
<widget class="QLabel" name="mSizeLabel" >
37-
<property name="text" >
38-
<string>Size:</string>
37+
<widget class="QLabel" name="mSizeLabel">
38+
<property name="text">
39+
<string>Size</string>
3940
</property>
4041
</widget>
4142
</item>
4243
<item>
43-
<widget class="QSpinBox" name="mSizeSpinBox" >
44-
<property name="maximum" >
44+
<widget class="QSpinBox" name="mSizeSpinBox">
45+
<property name="maximum">
4546
<number>10000000</number>
4647
</property>
4748
</widget>
4849
</item>
4950
<item>
50-
<widget class="QLabel" name="mSizeUnitLabel" >
51-
<property name="text" >
52-
<string>Size unit: </string>
51+
<widget class="QLabel" name="mSizeUnitLabel">
52+
<property name="text">
53+
<string>Size unit</string>
5354
</property>
5455
</widget>
5556
</item>
5657
<item>
57-
<widget class="QComboBox" name="mSizeUnitComboBox" />
58+
<widget class="QComboBox" name="mSizeUnitComboBox"/>
5859
</item>
5960
</layout>
6061
</item>

0 commit comments

Comments
 (0)