Skip to content

Commit 16f309b

Browse files
committed
Fix display of descriptions for symbol layer data defined buttons
1 parent 77fcf8c commit 16f309b

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

src/gui/symbology-ng/qgssymbollayerv2widget.cpp

+7-4
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,11 @@
4545
#include <QStandardItemModel>
4646
#include <QSvgRenderer>
4747
#include <QMessageBox>
48-
#include <QTextDocument>
4948

5049
void QgsSymbolLayerV2Widget::registerDataDefinedButton( QgsDataDefinedButton * button, const QString & propertyName, QgsDataDefinedButton::DataType type, const QString & description )
5150
{
5251
QgsDataDefined dd( symbolLayer()->dataDefinedProperty( propertyName ) );
53-
button->init( mVectorLayer, &dd, type, Qt::escape( description ) );
52+
button->init( mVectorLayer, &dd, type, description );
5453
button->setProperty( "propertyName", propertyName );
5554
connect( button, SIGNAL( dataDefinedChanged( const QString& ) ), this, SLOT( updateDataDefinedProperty() ) );
5655
connect( button, SIGNAL( dataDefinedActivated( bool ) ), this, SLOT( updateDataDefinedProperty() ) );
@@ -422,7 +421,11 @@ void QgsSimpleMarkerSymbolLayerV2Widget::setSymbolLayer( QgsSymbolLayerV2* layer
422421
mHorizontalAnchorComboBox->blockSignals( false );
423422
mVerticalAnchorComboBox->blockSignals( false );
424423

425-
registerDataDefinedButton( mNameDDBtn, "name", QgsDataDefinedButton::String, "'square'|'rectangle'|'diamond'|'pentagon'|'triangle'|'equilateral_triangle'|'star'|'regular_star'|'arrow'|'filled_arrowhead'|'circle'|'cross'|'x'|'cross2'|'line'|'arrowhead'" );
424+
registerDataDefinedButton( mNameDDBtn, "name", QgsDataDefinedButton::String, tr( "string " ) + QString( "[<b>square</b>|<b>rectangle</b>|<b>diamond</b>|"
425+
"<b>pentagon</b>|<b>triangle</b>|<b>equilateral_triangle</b>|"
426+
"<b>star</b>|<b>regular_star</b>|<b>arrow</b>|<b>filled_arrowhead</b>|"
427+
"<b>circle</b>|<b>cross</b>|<b>x</b>|"
428+
"<b>cross2</b>|<b>line</b>|<b>arrowhead</b>]" ) );
426429
registerDataDefinedButton( mFillColorDDBtn, "color", QgsDataDefinedButton::String, QgsDataDefinedButton::colorAlphaDesc() );
427430
registerDataDefinedButton( mBorderColorDDBtn, "color_border", QgsDataDefinedButton::String, QgsDataDefinedButton::colorAlphaDesc() );
428431
registerDataDefinedButton( mOutlineWidthDDBtn, "outline_width", QgsDataDefinedButton::Double, QgsDataDefinedButton::doublePosDesc() );
@@ -1398,7 +1401,7 @@ void QgsMarkerLineSymbolLayerV2Widget::setSymbolLayer( QgsSymbolLayerV2* layer )
13981401

13991402
registerDataDefinedButton( mIntervalDDBtn, "interval", QgsDataDefinedButton::Double, QgsDataDefinedButton::doublePosDesc() );
14001403
registerDataDefinedButton( mLineOffsetDDBtn, "offset", QgsDataDefinedButton::Double, QgsDataDefinedButton::doubleDesc() );
1401-
registerDataDefinedButton( mPlacementDDBtn, "placement", QgsDataDefinedButton::String, "'vertex'|'lastvertex'|'firstvertex'|'centerpoint'" );
1404+
registerDataDefinedButton( mPlacementDDBtn, "placement", QgsDataDefinedButton::String, tr( "string " ) + QString( "[<b>vertex</b>|<b>lastvertex</b>|<b>firstvertex</b>|<b>centerpoint</b>]" ) );
14021405
registerDataDefinedButton( mOffsetAlongLineDDBtn, "offset_along_line", QgsDataDefinedButton::Double, QgsDataDefinedButton::doublePosDesc() );
14031406
}
14041407

0 commit comments

Comments
 (0)