Use correct field icon in form view preview menu

nyalldawson · nyalldawson · commit ea10c5da3c23 · 2016-03-08T13:48:58.000+11:00
diff --git a/src/gui/attributetable/qgsdualview.cpp b/src/gui/attributetable/qgsdualview.cpp
@@ -108,17 +108,17 @@ void QgsDualView::columnBoxInit()
   QString displayExpression = mLayerCache->layer()->displayExpression();
 
   // if no display expression is saved: use display field instead
-  if ( displayExpression == "" )
+  if ( displayExpression.isEmpty() )
   {
-    if ( mLayerCache->layer()->displayField() != "" )
+    if ( !mLayerCache->layer()->displayField().isEmpty() )
     {
       defaultField = mLayerCache->layer()->displayField();
       displayExpression = QString( "COALESCE(\"%1\", '<NULL>')" ).arg( defaultField );
     }
   }
 
-  // if neither diaplay expression nor display field is saved...
-  if ( displayExpression == "" )
+  // if neither display expression nor display field is saved...
+  if ( displayExpression.isEmpty() )
   {
     QgsAttributeList pkAttrs = mLayerCache->layer()->pkAttributeList();
 
@@ -169,7 +169,7 @@ void QgsDualView::columnBoxInit()
 
     if ( mLayerCache->layer()->editFormConfig()->widgetType( fieldIndex ) != "Hidden" )
     {
-      QIcon icon = QgsApplication::getThemeIcon( "/mActionNewAttribute.png" );
+      QIcon icon = mLayerCache->layer()->fields().iconForField( fieldIndex );
       QString text = field.name();
 
       // Generate action for the preview popup button of the feature list

Original file line number	Diff line number	Diff line change
`@@ -108,17 +108,17 @@ void QgsDualView::columnBoxInit()`
`108`	`108`	`QString displayExpression = mLayerCache->layer()->displayExpression();`
`109`	`109`
`110`	`110`	`// if no display expression is saved: use display field instead`
`111`		`- if ( displayExpression == "" )`
	`111`	`+ if ( displayExpression.isEmpty() )`
`112`	`112`	`{`
`113`		`- if ( mLayerCache->layer()->displayField() != "" )`
	`113`	`+ if ( !mLayerCache->layer()->displayField().isEmpty() )`
`114`	`114`	`{`
`115`	`115`	`defaultField = mLayerCache->layer()->displayField();`
`116`	`116`	`displayExpression = QString( "COALESCE(\"%1\", '<NULL>')" ).arg( defaultField );`
`117`	`117`	`}`
`118`	`118`	`}`
`119`	`119`
`120`		`- // if neither diaplay expression nor display field is saved...`
`121`		`- if ( displayExpression == "" )`
	`120`	`+ // if neither display expression nor display field is saved...`
	`121`	`+ if ( displayExpression.isEmpty() )`
`122`	`122`	`{`
`123`	`123`	`QgsAttributeList pkAttrs = mLayerCache->layer()->pkAttributeList();`
`124`	`124`
`@@ -169,7 +169,7 @@ void QgsDualView::columnBoxInit()`
`169`	`169`
`170`	`170`	`if ( mLayerCache->layer()->editFormConfig()->widgetType( fieldIndex ) != "Hidden" )`
`171`	`171`	`{`
`172`		`- QIcon icon = QgsApplication::getThemeIcon( "/mActionNewAttribute.png" );`
	`172`	`+ QIcon icon = mLayerCache->layer()->fields().iconForField( fieldIndex );`
`173`	`173`	`QString text = field.name();`
`174`	`174`
`175`	`175`	`// Generate action for the preview popup button of the feature list`