Skip to content

Commit e80d8c3

Browse files
mhugentmhugent
committedMay 8, 2013
Merge branch 'dd_symbology_help'
·
ltr-3_40archive/master_2
2 parents 4c7f51e + c054c30 commit e80d8c3

File tree

5 files changed

+162
-78
lines changed

5 files changed

+162
-78
lines changed
 

‎src/gui/symbology-ng/qgsdatadefinedsymboldialog.cpp

Lines changed: 33 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@
55
#include <QComboBox>
66
#include <QPushButton>
77

8-
QgsDataDefinedSymbolDialog::QgsDataDefinedSymbolDialog( const QMap< QString, QPair< QString, QString > >& properties, const QgsVectorLayer* vl,
9-
QWidget* parent, Qt::WindowFlags f ): QDialog( parent, f ), mVectorLayer( vl )
8+
QgsDataDefinedSymbolDialog::QgsDataDefinedSymbolDialog( const QList< DataDefinedSymbolEntry >& entries, const QgsVectorLayer* vl, QWidget * parent, Qt::WindowFlags f ): QDialog( parent, f ), mVectorLayer( vl )
109
{
1110
setupUi( this );
1211

@@ -16,26 +15,26 @@ QgsDataDefinedSymbolDialog::QgsDataDefinedSymbolDialog( const QMap< QString, QPa
1615
attributeFields = mVectorLayer->pendingFields();
1716
}
1817

19-
mTableWidget->setRowCount( properties.size() );
18+
mTableWidget->setRowCount( entries.size() );
2019

2120
int i = 0;
22-
QMap< QString, QPair< QString, QString > >::const_iterator it = properties.constBegin();
23-
for ( ; it != properties.constEnd(); ++it )
21+
QList< DataDefinedSymbolEntry >::const_iterator entryIt = entries.constBegin();
22+
for ( ; entryIt != entries.constEnd(); ++entryIt )
2423
{
2524
//check box
2625
QCheckBox* cb = new QCheckBox( this );
27-
cb->setChecked( !it.value().second.isEmpty() );
26+
cb->setChecked( !entryIt->initialValue.isEmpty() );
2827
mTableWidget->setCellWidget( i, 0, cb );
2928
mTableWidget->setColumnWidth( 0, cb->width() );
3029

3130

3231
//property name
33-
QTableWidgetItem* propertyItem = new QTableWidgetItem( it.value().first );
34-
propertyItem->setData( Qt::UserRole, it.key() );
32+
QTableWidgetItem* propertyItem = new QTableWidgetItem( entryIt->title );
33+
propertyItem->setData( Qt::UserRole, entryIt->property );
3534
mTableWidget->setItem( i, 1, propertyItem );
3635

3736
//attribute list
38-
QString expressionString = it.value().second;
37+
QString expressionString = entryIt->initialValue;
3938
QComboBox* attributeComboBox = new QComboBox( this );
4039
attributeComboBox->addItem( QString() );
4140
for ( int j = 0; j < attributeFields.count(); ++j )
@@ -59,6 +58,11 @@ QgsDataDefinedSymbolDialog::QgsDataDefinedSymbolDialog( const QMap< QString, QPa
5958
QPushButton* expressionButton = new QPushButton( "...", this );
6059
QObject::connect( expressionButton, SIGNAL( clicked() ), this, SLOT( expressionButtonClicked() ) );
6160
mTableWidget->setCellWidget( i, 3, expressionButton );
61+
62+
//help text
63+
QTableWidgetItem* helpItem = new QTableWidgetItem( entryIt->helpText );
64+
mTableWidget->setItem( i, 4, helpItem );
65+
6266
++i;
6367
}
6468
}
@@ -158,3 +162,23 @@ int QgsDataDefinedSymbolDialog::comboIndexForExpressionString( const QString& ex
158162
}
159163
return comboIndex;
160164
}
165+
166+
QString QgsDataDefinedSymbolDialog::doubleHelpText()
167+
{
168+
return tr( "double" );
169+
}
170+
171+
QString QgsDataDefinedSymbolDialog::colorHelpText()
172+
{
173+
return tr( "'<red>,<green>,<blue>,<alpha>'" );
174+
}
175+
176+
QString QgsDataDefinedSymbolDialog::offsetHelpText()
177+
{
178+
return "<x>,<y>";
179+
}
180+
181+
QString QgsDataDefinedSymbolDialog::fileNameHelpText()
182+
{
183+
return tr( "'<filename>'" );
184+
}

‎src/gui/symbology-ng/qgsdatadefinedsymboldialog.h

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,33 @@
77
class QgsVectorLayer;
88
class QComboBox;
99

10+
11+
1012
class GUI_EXPORT QgsDataDefinedSymbolDialog: public QDialog, private Ui::QgsDataDefinedSymbolDialog
1113
{
1214
Q_OBJECT
1315
public:
14-
QgsDataDefinedSymbolDialog( const QMap< QString, QPair< QString, QString > >& properties, const QgsVectorLayer* vl, QWidget * parent = 0, Qt::WindowFlags f = 0 );
16+
17+
struct DataDefinedSymbolEntry
18+
{
19+
DataDefinedSymbolEntry( const QString& p, const QString& t, const QString& v, const QString& h ):
20+
property( p ), title( t ), initialValue( v ), helpText( h ) {}
21+
QString property;
22+
QString title;
23+
QString initialValue;
24+
QString helpText;
25+
};
26+
27+
QgsDataDefinedSymbolDialog( const QList< DataDefinedSymbolEntry >& entries, const QgsVectorLayer* vl, QWidget * parent = 0, Qt::WindowFlags f = 0 );
1528
~QgsDataDefinedSymbolDialog();
1629
QMap< QString, QString > dataDefinedProperties() const;
1730

31+
//common help texts
32+
static QString doubleHelpText();
33+
static QString colorHelpText();
34+
static QString offsetHelpText();
35+
static QString fileNameHelpText();
36+
1837
private slots:
1938
void expressionButtonClicked();
2039

‎src/gui/symbology-ng/qgsellipsesymbollayerv2widget.cpp

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -211,16 +211,23 @@ void QgsEllipseSymbolLayerV2Widget::on_mDataDefinedPropertiesButton_clicked()
211211
return;
212212
}
213213

214-
QMap<QString, QPair< QString, QString> > dataDefinedProperties;
215-
dataDefinedProperties.insert( "width", qMakePair( tr( "Symbol width" ), mLayer->dataDefinedPropertyString( "width" ) ) );
216-
dataDefinedProperties.insert( "height", qMakePair( tr( "Symbol height" ), mLayer->dataDefinedPropertyString( "height" ) ) );
217-
dataDefinedProperties.insert( "rotation", qMakePair( tr( "Rotation" ), mLayer->dataDefinedPropertyString( "rotation" ) ) );
218-
dataDefinedProperties.insert( "outline_width", qMakePair( tr( "Outline width" ), mLayer->dataDefinedPropertyString( "outline_width" ) ) );
219-
dataDefinedProperties.insert( "fill_color", qMakePair( tr( "Fill color" ), mLayer->dataDefinedPropertyString( "fill_color" ) ) );
220-
dataDefinedProperties.insert( "outline_color", qMakePair( tr( "Border color" ), mLayer->dataDefinedPropertyString( "outline_color" ) ) );
221-
dataDefinedProperties.insert( "symbol_name", qMakePair( tr( "Symbol name" ), mLayer->dataDefinedPropertyString( "symbol_name" ) ) );
222-
dataDefinedProperties.insert( "offset", qMakePair( tr( "Offset" ), mLayer->dataDefinedPropertyString( "offset" ) ) );
223-
214+
QList< QgsDataDefinedSymbolDialog::DataDefinedSymbolEntry > dataDefinedProperties;
215+
dataDefinedProperties << QgsDataDefinedSymbolDialog::DataDefinedSymbolEntry( "width", tr( "Symbol width" ), mLayer->dataDefinedPropertyString( "width" ),
216+
QgsDataDefinedSymbolDialog::doubleHelpText() );
217+
dataDefinedProperties << QgsDataDefinedSymbolDialog::DataDefinedSymbolEntry( "height", tr( "Symbol height" ), mLayer->dataDefinedPropertyString( "height" ),
218+
QgsDataDefinedSymbolDialog::doubleHelpText() );
219+
dataDefinedProperties << QgsDataDefinedSymbolDialog::DataDefinedSymbolEntry( "rotation", tr( "Rotation" ), mLayer->dataDefinedPropertyString( "rotation" ),
220+
QgsDataDefinedSymbolDialog::doubleHelpText() );
221+
dataDefinedProperties << QgsDataDefinedSymbolDialog::DataDefinedSymbolEntry( "outline_width", tr( "Outline width" ), mLayer->dataDefinedPropertyString( "outline_width" ),
222+
QgsDataDefinedSymbolDialog::doubleHelpText() );
223+
dataDefinedProperties << QgsDataDefinedSymbolDialog::DataDefinedSymbolEntry( "fill_color", tr( "Fill color" ), mLayer->dataDefinedPropertyString( "fill_color" ),
224+
QgsDataDefinedSymbolDialog::colorHelpText() );
225+
dataDefinedProperties << QgsDataDefinedSymbolDialog::DataDefinedSymbolEntry( "outline_color", tr( "Border color" ), mLayer->dataDefinedPropertyString( "outline_color" ),
226+
QgsDataDefinedSymbolDialog::colorHelpText() );
227+
dataDefinedProperties << QgsDataDefinedSymbolDialog::DataDefinedSymbolEntry( "symbol_name", tr( "Symbol name" ), mLayer->dataDefinedPropertyString( "symbol_name" ),
228+
"'circle'|'rectangle'|'cross'|'triangle'" );
229+
dataDefinedProperties << QgsDataDefinedSymbolDialog::DataDefinedSymbolEntry( "offset", tr( "Offset" ), mLayer->dataDefinedPropertyString( "offset" ),
230+
QgsDataDefinedSymbolDialog::offsetHelpText() );
224231
QgsDataDefinedSymbolDialog d( dataDefinedProperties, mVectorLayer );
225232
if ( d.exec() == QDialog::Accepted )
226233
{

‎src/gui/symbology-ng/qgssymbollayerv2widget.cpp

Lines changed: 85 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -196,15 +196,18 @@ void QgsSimpleLineSymbolLayerV2Widget::on_mDataDefinedPropertiesButton_clicked()
196196
return;
197197
}
198198

199-
QMap<QString, QPair< QString, QString> > dataDefinedProperties;
200-
dataDefinedProperties.insert( "color", qMakePair( tr( "Color" ), mLayer->dataDefinedPropertyString( "color" ) ) );
201-
dataDefinedProperties.insert( "width", qMakePair( tr( "Pen width" ), mLayer->dataDefinedPropertyString( "width" ) ) );
202-
dataDefinedProperties.insert( "offset", qMakePair( tr( "Offset" ), mLayer->dataDefinedPropertyString( "offset" ) ) );
203-
dataDefinedProperties.insert( "customdash", qMakePair( tr( "Dash pattern" ), mLayer->dataDefinedPropertyString( "customdash" ) ) );
204-
dataDefinedProperties.insert( "joinstyle", qMakePair( tr( "Join style" ), mLayer->dataDefinedPropertyString( "joinstyle" ) ) );
205-
dataDefinedProperties.insert( "capstyle", qMakePair( tr( "Cap style" ), mLayer->dataDefinedPropertyString( "capstyle" ) ) );
206-
199+
QList< QgsDataDefinedSymbolDialog::DataDefinedSymbolEntry > dataDefinedProperties;
200+
dataDefinedProperties << QgsDataDefinedSymbolDialog::DataDefinedSymbolEntry( "color", tr( "Color" ), mLayer->dataDefinedPropertyString( "color" ),
201+
QgsDataDefinedSymbolDialog::colorHelpText() );
202+
dataDefinedProperties << QgsDataDefinedSymbolDialog::DataDefinedSymbolEntry( "width", tr( "Pen width" ), mLayer->dataDefinedPropertyString( "width" ),
203+
QgsDataDefinedSymbolDialog::doubleHelpText() );
204+
dataDefinedProperties << QgsDataDefinedSymbolDialog::DataDefinedSymbolEntry( "offset", tr( "Offset" ), mLayer->dataDefinedPropertyString( "offset" ),
205+
QgsDataDefinedSymbolDialog::doubleHelpText() );
206+
dataDefinedProperties << QgsDataDefinedSymbolDialog::DataDefinedSymbolEntry( "customdash", tr( "Dash pattern" ), mLayer->dataDefinedPropertyString( "customdash" ), "<dash>;<space>" );
207+
dataDefinedProperties << QgsDataDefinedSymbolDialog::DataDefinedSymbolEntry( "joinstyle", tr( "Join style" ), mLayer->dataDefinedPropertyString( "joinstyle" ), "'bevel'|'miter'|'round'" );
208+
dataDefinedProperties << QgsDataDefinedSymbolDialog::DataDefinedSymbolEntry( "capstyle", tr( "Cap style" ), mLayer->dataDefinedPropertyString( "capstyle" ), "'square'|'flat'|'round'" );
207209
QgsDataDefinedSymbolDialog d( dataDefinedProperties, mVectorLayer );
210+
208211
if ( d.exec() == QDialog::Accepted )
209212
{
210213
//empty all existing properties first
@@ -403,15 +406,21 @@ void QgsSimpleMarkerSymbolLayerV2Widget::on_mDataDefinedPropertiesButton_clicked
403406
return;
404407
}
405408

406-
QMap<QString, QPair< QString, QString> > dataDefinedProperties;
407-
dataDefinedProperties.insert( "name", qMakePair( tr( "Name" ), mLayer->dataDefinedPropertyString( "name" ) ) );
408-
dataDefinedProperties.insert( "color", qMakePair( tr( "Fill color" ), mLayer->dataDefinedPropertyString( "color" ) ) );
409-
dataDefinedProperties.insert( "color_border", qMakePair( tr( "Border color" ), mLayer->dataDefinedPropertyString( "color_border" ) ) );
410-
dataDefinedProperties.insert( "outline_width", qMakePair( tr( "Outline width" ), mLayer->dataDefinedPropertyString( "outline_width" ) ) );
411-
dataDefinedProperties.insert( "size", qMakePair( tr( "Size" ), mLayer->dataDefinedPropertyString( "size" ) ) );
412-
dataDefinedProperties.insert( "angle", qMakePair( tr( "Angle" ), mLayer->dataDefinedPropertyString( "angle" ) ) );
413-
dataDefinedProperties.insert( "offset", qMakePair( tr( "Offset" ), mLayer->dataDefinedPropertyString( "offset" ) ) );
414-
409+
QList< QgsDataDefinedSymbolDialog::DataDefinedSymbolEntry > dataDefinedProperties;
410+
dataDefinedProperties << QgsDataDefinedSymbolDialog::DataDefinedSymbolEntry( "name", tr( "Name" ), mLayer->dataDefinedPropertyString( "name" ),
411+
"'square'|'rectangle'|'diamond'|'pentagon'\n|'triangle'|'equilateral_triangle'|'star'\n|'regular_star'|'arrow'|'filled_arrowhead'|'circle'\n|'cross'|'x'|'cross2'|'line'|'arrowhead'" );
412+
dataDefinedProperties << QgsDataDefinedSymbolDialog::DataDefinedSymbolEntry( "color", tr( "Fill color" ), mLayer->dataDefinedPropertyString( "color" ),
413+
QgsDataDefinedSymbolDialog::colorHelpText() );
414+
dataDefinedProperties << QgsDataDefinedSymbolDialog::DataDefinedSymbolEntry( "color_border", tr( "Border color" ), mLayer->dataDefinedPropertyString( "color_border" ),
415+
QgsDataDefinedSymbolDialog::colorHelpText() );
416+
dataDefinedProperties << QgsDataDefinedSymbolDialog::DataDefinedSymbolEntry( "outline_width", tr( "Outline width" ), mLayer->dataDefinedPropertyString( "outline_width" ),
417+
QgsDataDefinedSymbolDialog::doubleHelpText() );
418+
dataDefinedProperties << QgsDataDefinedSymbolDialog::DataDefinedSymbolEntry( "size", tr( "Size" ), mLayer->dataDefinedPropertyString( "size" ),
419+
QgsDataDefinedSymbolDialog::doubleHelpText() );
420+
dataDefinedProperties << QgsDataDefinedSymbolDialog::DataDefinedSymbolEntry( "angle", tr( "Angle" ), mLayer->dataDefinedPropertyString( "angle" ),
421+
QgsDataDefinedSymbolDialog::doubleHelpText() );
422+
dataDefinedProperties << QgsDataDefinedSymbolDialog::DataDefinedSymbolEntry( "offset", tr( "Offset" ), mLayer->dataDefinedPropertyString( "offset" ),
423+
QgsDataDefinedSymbolDialog::offsetHelpText() );
415424
QgsDataDefinedSymbolDialog d( dataDefinedProperties, mVectorLayer );
416425
if ( d.exec() == QDialog::Accepted )
417426
{
@@ -547,11 +556,12 @@ void QgsSimpleFillSymbolLayerV2Widget::on_mDataDefinedPropertiesButton_clicked()
547556
return;
548557
}
549558

550-
QMap<QString, QPair< QString, QString> > dataDefinedProperties;
551-
dataDefinedProperties.insert( "color", qMakePair( tr( "Color" ), mLayer->dataDefinedPropertyString( "color" ) ) );
552-
dataDefinedProperties.insert( "color_border", qMakePair( tr( "Border color" ), mLayer->dataDefinedPropertyString( "color_border" ) ) );
553-
dataDefinedProperties.insert( "width_border", qMakePair( tr( "Border width" ), mLayer->dataDefinedPropertyString( "width_border" ) ) );
554-
559+
QList< QgsDataDefinedSymbolDialog::DataDefinedSymbolEntry > dataDefinedProperties;
560+
dataDefinedProperties << QgsDataDefinedSymbolDialog::DataDefinedSymbolEntry( "color", tr( "Color" ), mLayer->dataDefinedPropertyString( "color" ), QgsDataDefinedSymbolDialog::colorHelpText() );
561+
dataDefinedProperties << QgsDataDefinedSymbolDialog::DataDefinedSymbolEntry( "color_border", tr( "Border color" ), mLayer->dataDefinedPropertyString( "color_border" ),
562+
QgsDataDefinedSymbolDialog::colorHelpText() );
563+
dataDefinedProperties << QgsDataDefinedSymbolDialog::DataDefinedSymbolEntry( "width_border", tr( "Border width" ), mLayer->dataDefinedPropertyString( "width_border" ),
564+
QgsDataDefinedSymbolDialog::doubleHelpText() );
555565
QgsDataDefinedSymbolDialog d( dataDefinedProperties, mVectorLayer );
556566
if ( d.exec() == QDialog::Accepted )
557567
{
@@ -691,11 +701,13 @@ void QgsMarkerLineSymbolLayerV2Widget::on_mDataDefinedPropertiesButton_clicked()
691701
return;
692702
}
693703

694-
QMap<QString, QPair< QString, QString> > dataDefinedProperties;
695-
dataDefinedProperties.insert( "interval", qMakePair( tr( "Interval" ), mLayer->dataDefinedPropertyString( "interval" ) ) );
696-
dataDefinedProperties.insert( "offset", qMakePair( tr( "Line offset" ), mLayer->dataDefinedPropertyString( "offset" ) ) );
697-
dataDefinedProperties.insert( "placement", qMakePair( tr( "Placement" ), mLayer->dataDefinedPropertyString( "placement" ) ) );
698-
704+
QList< QgsDataDefinedSymbolDialog::DataDefinedSymbolEntry > dataDefinedProperties;
705+
dataDefinedProperties << QgsDataDefinedSymbolDialog::DataDefinedSymbolEntry( "interval", tr( "Interval" ), mLayer->dataDefinedPropertyString( "interval" ),
706+
QgsDataDefinedSymbolDialog::doubleHelpText() );
707+
dataDefinedProperties << QgsDataDefinedSymbolDialog::DataDefinedSymbolEntry( "offset", tr( "Line offset" ), mLayer->dataDefinedPropertyString( "offset" ),
708+
QgsDataDefinedSymbolDialog::doubleHelpText() );
709+
dataDefinedProperties << QgsDataDefinedSymbolDialog::DataDefinedSymbolEntry( "placement", tr( "Placement" ), mLayer->dataDefinedPropertyString( "placement" ),
710+
tr( "'vertex'|'lastvertex'|'firstvertex'|'centerpoint'" ) );
699711
QgsDataDefinedSymbolDialog d( dataDefinedProperties, mVectorLayer );
700712
if ( d.exec() == QDialog::Accepted )
701713
{
@@ -1105,15 +1117,21 @@ void QgsSvgMarkerSymbolLayerV2Widget::on_mDataDefinedPropertiesButton_clicked()
11051117
return;
11061118
}
11071119

1108-
QMap<QString, QPair< QString, QString> > dataDefinedProperties;
1109-
dataDefinedProperties.insert( "size", qMakePair( tr( "Size" ), mLayer->dataDefinedPropertyString( "size" ) ) );
1110-
dataDefinedProperties.insert( "outline-width", qMakePair( tr( "Border width" ), mLayer->dataDefinedPropertyString( "outline-width" ) ) );
1111-
dataDefinedProperties.insert( "angle", qMakePair( tr( "Angle" ), mLayer->dataDefinedPropertyString( "angle" ) ) );
1112-
dataDefinedProperties.insert( "offset", qMakePair( tr( "Offset" ), mLayer->dataDefinedPropertyString( "offset" ) ) );
1113-
dataDefinedProperties.insert( "name", qMakePair( tr( "SVG file" ), mLayer->dataDefinedPropertyString( "name" ) ) );
1114-
dataDefinedProperties.insert( "fill", qMakePair( tr( "Color" ), mLayer->dataDefinedPropertyString( "fill" ) ) );
1115-
dataDefinedProperties.insert( "outline", qMakePair( tr( "Border color" ), mLayer->dataDefinedPropertyString( "outline" ) ) );
1116-
1120+
QList< QgsDataDefinedSymbolDialog::DataDefinedSymbolEntry > dataDefinedProperties;
1121+
dataDefinedProperties << QgsDataDefinedSymbolDialog::DataDefinedSymbolEntry( "size", tr( "Size" ), mLayer->dataDefinedPropertyString( "size" ),
1122+
QgsDataDefinedSymbolDialog::doubleHelpText() );
1123+
dataDefinedProperties << QgsDataDefinedSymbolDialog::DataDefinedSymbolEntry( "outline-width", tr( "Border width" ), mLayer->dataDefinedPropertyString( "outline-width" ),
1124+
QgsDataDefinedSymbolDialog::doubleHelpText() );
1125+
dataDefinedProperties << QgsDataDefinedSymbolDialog::DataDefinedSymbolEntry( "angle", tr( "Angle" ), mLayer->dataDefinedPropertyString( "angle" ),
1126+
QgsDataDefinedSymbolDialog::doubleHelpText() );
1127+
dataDefinedProperties << QgsDataDefinedSymbolDialog::DataDefinedSymbolEntry( "offset", tr( "Offset" ), mLayer->dataDefinedPropertyString( "offset" ),
1128+
QgsDataDefinedSymbolDialog::offsetHelpText() );
1129+
dataDefinedProperties << QgsDataDefinedSymbolDialog::DataDefinedSymbolEntry( "name", tr( "SVG file" ), mLayer->dataDefinedPropertyString( "name" ),
1130+
QgsDataDefinedSymbolDialog::fileNameHelpText() );
1131+
dataDefinedProperties << QgsDataDefinedSymbolDialog::DataDefinedSymbolEntry( "fill", tr( "Color" ), mLayer->dataDefinedPropertyString( "fill" ),
1132+
QgsDataDefinedSymbolDialog::colorHelpText() );
1133+
dataDefinedProperties << QgsDataDefinedSymbolDialog::DataDefinedSymbolEntry( "outline", tr( "Border color" ), mLayer->dataDefinedPropertyString( "outline" ),
1134+
QgsDataDefinedSymbolDialog::colorHelpText() );
11171135
QgsDataDefinedSymbolDialog d( dataDefinedProperties, mVectorLayer );
11181136
if ( d.exec() == QDialog::Accepted )
11191137
{
@@ -1418,14 +1436,19 @@ void QgsSVGFillSymbolLayerWidget::on_mDataDefinedPropertiesButton_clicked()
14181436
return;
14191437
}
14201438

1421-
QMap<QString, QPair< QString, QString> > dataDefinedProperties;
1422-
dataDefinedProperties.insert( "width", qMakePair( tr( "Texture width" ), mLayer->dataDefinedPropertyString( "width" ) ) );
1423-
dataDefinedProperties.insert( "svgFile", qMakePair( tr( "SVG file" ), mLayer->dataDefinedPropertyString( "svgFile" ) ) );
1424-
dataDefinedProperties.insert( "angle", qMakePair( tr( "Rotation" ), mLayer->dataDefinedPropertyString( "angle" ) ) );
1425-
dataDefinedProperties.insert( "svgFillColor", qMakePair( tr( "Color" ), mLayer->dataDefinedPropertyString( "svgFillColor" ) ) );
1426-
dataDefinedProperties.insert( "svgOutlineColor", qMakePair( tr( "Border color" ), mLayer->dataDefinedPropertyString( "svgOutlineColor" ) ) );
1427-
dataDefinedProperties.insert( "svgOutlineWidth", qMakePair( tr( "Border width" ), mLayer->dataDefinedPropertyString( "svgOutlineWidth" ) ) );
1428-
1439+
QList< QgsDataDefinedSymbolDialog::DataDefinedSymbolEntry > dataDefinedProperties;
1440+
dataDefinedProperties << QgsDataDefinedSymbolDialog::DataDefinedSymbolEntry( "width", tr( "Texture width" ), mLayer->dataDefinedPropertyString( "width" ),
1441+
QgsDataDefinedSymbolDialog::doubleHelpText() );
1442+
dataDefinedProperties << QgsDataDefinedSymbolDialog::DataDefinedSymbolEntry( "svgFile", tr( "SVG file" ), mLayer->dataDefinedPropertyString( "svgFile" ),
1443+
QgsDataDefinedSymbolDialog::fileNameHelpText() );
1444+
dataDefinedProperties << QgsDataDefinedSymbolDialog::DataDefinedSymbolEntry( "angle", tr( "Rotation" ), mLayer->dataDefinedPropertyString( "angle" ),
1445+
QgsDataDefinedSymbolDialog::doubleHelpText() );
1446+
dataDefinedProperties << QgsDataDefinedSymbolDialog::DataDefinedSymbolEntry( "svgFillColor", tr( "Color" ), mLayer->dataDefinedPropertyString( "svgFillColor" ),
1447+
QgsDataDefinedSymbolDialog::colorHelpText() );
1448+
dataDefinedProperties << QgsDataDefinedSymbolDialog::DataDefinedSymbolEntry( "svgOutlineColor", tr( "Border color" ), mLayer->dataDefinedPropertyString( "svgOutlineColor" ),
1449+
QgsDataDefinedSymbolDialog::colorHelpText() );
1450+
dataDefinedProperties << QgsDataDefinedSymbolDialog::DataDefinedSymbolEntry( "svgOutlineWidth", tr( "Border width" ), mLayer->dataDefinedPropertyString( "svgOutlineWidth" ),
1451+
QgsDataDefinedSymbolDialog::doubleHelpText() );
14291452
QgsDataDefinedSymbolDialog d( dataDefinedProperties, mVectorLayer );
14301453
if ( d.exec() == QDialog::Accepted )
14311454
{
@@ -1570,12 +1593,15 @@ void QgsLinePatternFillSymbolLayerWidget::on_mDataDefinedPropertiesButton_clicke
15701593
return;
15711594
}
15721595

1573-
QMap<QString, QPair< QString, QString> > dataDefinedProperties;
1574-
dataDefinedProperties.insert( "lineangle", qMakePair( tr( "Angle" ), mLayer->dataDefinedPropertyString( "lineangle" ) ) );
1575-
dataDefinedProperties.insert( "distance", qMakePair( tr( "Distance" ), mLayer->dataDefinedPropertyString( "distance" ) ) );
1576-
dataDefinedProperties.insert( "linewidth", qMakePair( tr( "Line width" ), mLayer->dataDefinedPropertyString( "linewidth" ) ) );
1577-
dataDefinedProperties.insert( "color", qMakePair( tr( "Color" ), mLayer->dataDefinedPropertyString( "color" ) ) );
1578-
1596+
QList< QgsDataDefinedSymbolDialog::DataDefinedSymbolEntry > dataDefinedProperties;
1597+
dataDefinedProperties << QgsDataDefinedSymbolDialog::DataDefinedSymbolEntry( "lineangle", tr( "Angle" ), mLayer->dataDefinedPropertyString( "lineangle" ),
1598+
QgsDataDefinedSymbolDialog::doubleHelpText() );
1599+
dataDefinedProperties << QgsDataDefinedSymbolDialog::DataDefinedSymbolEntry( "distance", tr( "Distance" ), mLayer->dataDefinedPropertyString( "distance" ),
1600+
QgsDataDefinedSymbolDialog::doubleHelpText() );
1601+
dataDefinedProperties << QgsDataDefinedSymbolDialog::DataDefinedSymbolEntry( "linewidth", tr( "Line width" ), mLayer->dataDefinedPropertyString( "linewidth" ),
1602+
QgsDataDefinedSymbolDialog::doubleHelpText() );
1603+
dataDefinedProperties << QgsDataDefinedSymbolDialog::DataDefinedSymbolEntry( "color", tr( "Color" ), mLayer->dataDefinedPropertyString( "color" ),
1604+
QgsDataDefinedSymbolDialog::colorHelpText() );
15791605
QgsDataDefinedSymbolDialog d( dataDefinedProperties, mVectorLayer );
15801606
if ( d.exec() == QDialog::Accepted )
15811607
{
@@ -1716,12 +1742,15 @@ void QgsPointPatternFillSymbolLayerWidget::on_mDataDefinedPropertiesButton_click
17161742
return;
17171743
}
17181744

1719-
QMap<QString, QPair< QString, QString> > dataDefinedProperties;
1720-
dataDefinedProperties.insert( "distance_x", qMakePair( tr( "Horizontal distance" ), mLayer->dataDefinedPropertyString( "distance_x" ) ) );
1721-
dataDefinedProperties.insert( "distance_y", qMakePair( tr( "Vertical distance" ), mLayer->dataDefinedPropertyString( "distance_y" ) ) );
1722-
dataDefinedProperties.insert( "displacement_x", qMakePair( tr( "Horizontal displacement" ), mLayer->dataDefinedPropertyString( "displacement_x" ) ) );
1723-
dataDefinedProperties.insert( "displacement_y", qMakePair( tr( "Vertical displacement" ), mLayer->dataDefinedPropertyString( "displacement_y" ) ) );
1724-
1745+
QList< QgsDataDefinedSymbolDialog::DataDefinedSymbolEntry > dataDefinedProperties;
1746+
dataDefinedProperties << QgsDataDefinedSymbolDialog::DataDefinedSymbolEntry( "distance_x", tr( "Horizontal distance" ), mLayer->dataDefinedPropertyString( "distance_x" ),
1747+
QgsDataDefinedSymbolDialog::doubleHelpText() );
1748+
dataDefinedProperties << QgsDataDefinedSymbolDialog::DataDefinedSymbolEntry( "distance_y", tr( "Vertical distance" ), mLayer->dataDefinedPropertyString( "distance_y" ),
1749+
QgsDataDefinedSymbolDialog::doubleHelpText() );
1750+
dataDefinedProperties << QgsDataDefinedSymbolDialog::DataDefinedSymbolEntry( "displacement_x", tr( "Horizontal displacement" ), mLayer->dataDefinedPropertyString( "displacement_x" ),
1751+
QgsDataDefinedSymbolDialog::doubleHelpText() );
1752+
dataDefinedProperties << QgsDataDefinedSymbolDialog::DataDefinedSymbolEntry( "displacement_y", tr( "Vertical displacement" ), mLayer->dataDefinedPropertyString( "displacement_y" ),
1753+
QgsDataDefinedSymbolDialog::doubleHelpText() );
17251754
QgsDataDefinedSymbolDialog d( dataDefinedProperties, mVectorLayer );
17261755
if ( d.exec() == QDialog::Accepted )
17271756
{

‎src/ui/qgsdatadefinedsymboldialogbase.ui

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
<rect>
77
<x>0</x>
88
<y>0</y>
9-
<width>406</width>
10-
<height>282</height>
9+
<width>409</width>
10+
<height>299</height>
1111
</rect>
1212
</property>
1313
<property name="windowTitle">
@@ -87,6 +87,11 @@
8787
<string>Expression</string>
8888
</property>
8989
</column>
90+
<column>
91+
<property name="text">
92+
<string>Help</string>
93+
</property>
94+
</column>
9095
</widget>
9196
</item>
9297
</layout>

0 commit comments

Comments
 (0)
Please sign in to comment.