Skip to content

Commit c054c30

Browse files
mhugentmhugent
committed
More help text for data defined dialogs
1 parent dd9c563 commit c054c30

File tree

4 files changed

+126
-133
lines changed

4 files changed

+126
-133
lines changed

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

Lines changed: 20 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -5,64 +5,6 @@
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 )
10-
{
11-
setupUi( this );
12-
13-
QgsFields attributeFields;
14-
if ( mVectorLayer )
15-
{
16-
attributeFields = mVectorLayer->pendingFields();
17-
}
18-
19-
mTableWidget->setRowCount( properties.size() );
20-
21-
int i = 0;
22-
QMap< QString, QPair< QString, QString > >::const_iterator it = properties.constBegin();
23-
for ( ; it != properties.constEnd(); ++it )
24-
{
25-
//check box
26-
QCheckBox* cb = new QCheckBox( this );
27-
cb->setChecked( !it.value().second.isEmpty() );
28-
mTableWidget->setCellWidget( i, 0, cb );
29-
mTableWidget->setColumnWidth( 0, cb->width() );
30-
31-
32-
//property name
33-
QTableWidgetItem* propertyItem = new QTableWidgetItem( it.value().first );
34-
propertyItem->setData( Qt::UserRole, it.key() );
35-
mTableWidget->setItem( i, 1, propertyItem );
36-
37-
//attribute list
38-
QString expressionString = it.value().second;
39-
QComboBox* attributeComboBox = new QComboBox( this );
40-
attributeComboBox->addItem( QString() );
41-
for ( int j = 0; j < attributeFields.count(); ++j )
42-
{
43-
attributeComboBox->addItem( attributeFields.at( j ).name() );
44-
}
45-
46-
int attrComboIndex = comboIndexForExpressionString( expressionString, attributeComboBox );
47-
if ( attrComboIndex >= 0 )
48-
{
49-
attributeComboBox->setCurrentIndex( attrComboIndex );
50-
}
51-
else
52-
{
53-
attributeComboBox->setItemText( 0, expressionString );
54-
}
55-
56-
mTableWidget->setCellWidget( i, 2, attributeComboBox );
57-
58-
//expression button
59-
QPushButton* expressionButton = new QPushButton( "...", this );
60-
QObject::connect( expressionButton, SIGNAL( clicked() ), this, SLOT( expressionButtonClicked() ) );
61-
mTableWidget->setCellWidget( i, 3, expressionButton );
62-
++i;
63-
}
64-
}
65-
668
QgsDataDefinedSymbolDialog::QgsDataDefinedSymbolDialog( const QList< DataDefinedSymbolEntry >& entries, const QgsVectorLayer* vl, QWidget * parent, Qt::WindowFlags f ): QDialog( parent, f ), mVectorLayer( vl )
679
{
6810
setupUi( this );
@@ -220,3 +162,23 @@ int QgsDataDefinedSymbolDialog::comboIndexForExpressionString( const QString& ex
220162
}
221163
return comboIndex;
222164
}
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: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,16 @@ class GUI_EXPORT QgsDataDefinedSymbolDialog: public QDialog, private Ui::QgsData
2424
QString helpText;
2525
};
2626

27-
QgsDataDefinedSymbolDialog( const QMap< QString, QPair< QString, QString > >& properties, const QgsVectorLayer* vl, QWidget * parent = 0, Qt::WindowFlags f = 0 );
2827
QgsDataDefinedSymbolDialog( const QList< DataDefinedSymbolEntry >& entries, const QgsVectorLayer* vl, QWidget * parent = 0, Qt::WindowFlags f = 0 );
2928
~QgsDataDefinedSymbolDialog();
3029
QMap< QString, QString > dataDefinedProperties() const;
3130

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

‎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
{

0 commit comments

Comments
 (0)