|
45 | 45 | #include <QStandardItemModel>
|
46 | 46 | #include <QSvgRenderer>
|
47 | 47 | #include <QMessageBox>
|
48 |
| -#include <QTextDocument> |
49 | 48 |
|
50 | 49 | void QgsSymbolLayerV2Widget::registerDataDefinedButton( QgsDataDefinedButton * button, const QString & propertyName, QgsDataDefinedButton::DataType type, const QString & description )
|
51 | 50 | {
|
52 | 51 | QgsDataDefined dd( symbolLayer()->dataDefinedProperty( propertyName ) );
|
53 |
| - button->init( mVectorLayer, &dd, type, Qt::escape( description ) ); |
| 52 | + button->init( mVectorLayer, &dd, type, description ); |
54 | 53 | button->setProperty( "propertyName", propertyName );
|
55 | 54 | connect( button, SIGNAL( dataDefinedChanged( const QString& ) ), this, SLOT( updateDataDefinedProperty() ) );
|
56 | 55 | connect( button, SIGNAL( dataDefinedActivated( bool ) ), this, SLOT( updateDataDefinedProperty() ) );
|
@@ -422,7 +421,11 @@ void QgsSimpleMarkerSymbolLayerV2Widget::setSymbolLayer( QgsSymbolLayerV2* layer
|
422 | 421 | mHorizontalAnchorComboBox->blockSignals( false );
|
423 | 422 | mVerticalAnchorComboBox->blockSignals( false );
|
424 | 423 |
|
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>]" ) ); |
426 | 429 | registerDataDefinedButton( mFillColorDDBtn, "color", QgsDataDefinedButton::String, QgsDataDefinedButton::colorAlphaDesc() );
|
427 | 430 | registerDataDefinedButton( mBorderColorDDBtn, "color_border", QgsDataDefinedButton::String, QgsDataDefinedButton::colorAlphaDesc() );
|
428 | 431 | registerDataDefinedButton( mOutlineWidthDDBtn, "outline_width", QgsDataDefinedButton::Double, QgsDataDefinedButton::doublePosDesc() );
|
@@ -1398,7 +1401,7 @@ void QgsMarkerLineSymbolLayerV2Widget::setSymbolLayer( QgsSymbolLayerV2* layer )
|
1398 | 1401 |
|
1399 | 1402 | registerDataDefinedButton( mIntervalDDBtn, "interval", QgsDataDefinedButton::Double, QgsDataDefinedButton::doublePosDesc() );
|
1400 | 1403 | 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>]" ) ); |
1402 | 1405 | registerDataDefinedButton( mOffsetAlongLineDDBtn, "offset_along_line", QgsDataDefinedButton::Double, QgsDataDefinedButton::doublePosDesc() );
|
1403 | 1406 | }
|
1404 | 1407 |
|
|
0 commit comments