Use field icon for vector field symbol layer combo boxes

nyalldawson · nyalldawson · commit 9c16a958e18c · 2016-06-26T17:40:50.000+10:00
diff --git a/src/gui/symbology-ng/qgsvectorfieldsymbollayerwidget.cpp b/src/gui/symbology-ng/qgsvectorfieldsymbollayerwidget.cpp
@@ -26,11 +26,13 @@ QgsVectorFieldSymbolLayerWidget::QgsVectorFieldSymbolLayerWidget( const QgsVecto
   {
     mXAttributeComboBox->addItem( "" );
     mYAttributeComboBox->addItem( "" );
+    int i = 0;
     Q_FOREACH ( const QgsField& f, mVectorLayer->fields() )
     {
       QString fieldName = f.name();
-      mXAttributeComboBox->addItem( fieldName );
-      mYAttributeComboBox->addItem( fieldName );
+      mXAttributeComboBox->addItem( mVectorLayer->fields().iconForField( i ), fieldName );
+      mYAttributeComboBox->addItem( mVectorLayer->fields().iconForField( i ), fieldName );
+      i++;
     }
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -26,11 +26,13 @@ QgsVectorFieldSymbolLayerWidget::QgsVectorFieldSymbolLayerWidget( const QgsVecto`
`26`	`26`	`{`
`27`	`27`	`mXAttributeComboBox->addItem( "" );`
`28`	`28`	`mYAttributeComboBox->addItem( "" );`
	`29`	`+ int i = 0;`
`29`	`30`	`Q_FOREACH ( const QgsField& f, mVectorLayer->fields() )`
`30`	`31`	`{`
`31`	`32`	`QString fieldName = f.name();`
`32`		`- mXAttributeComboBox->addItem( fieldName );`
`33`		`- mYAttributeComboBox->addItem( fieldName );`
	`33`	`+ mXAttributeComboBox->addItem( mVectorLayer->fields().iconForField( i ), fieldName );`
	`34`	`+ mYAttributeComboBox->addItem( mVectorLayer->fields().iconForField( i ), fieldName );`
	`35`	`+ i++;`
`34`	`36`	`}`
`35`	`37`	`}`
`36`	`38`	`}`