Fix #7993, fields are listed twice in labeling data defined menu

dakcarto · dakcarto · commit 0192e37fe3e8 · 2013-06-03T16:54:04.000-06:00
diff --git a/src/gui/qgsdatadefinedbutton.cpp b/src/gui/qgsdatadefinedbutton.cpp
@@ -137,9 +137,6 @@ void QgsDataDefinedButton::init( const QgsVectorLayer* vl,
   {
     mDataTypesString = ts.join( ", " );
     mActionDataTypes = new QAction( tr( "Field type: " ) + mDataTypesString, this );
-
-    // list fields and types in submenu, since there may be many
-    mActionDataTypes->setMenu( mFieldsMenu );
   }
 
   if ( mVectorLayer )
@@ -277,6 +274,9 @@ void QgsDataDefinedButton::aboutToShowMenu()
       act->setEnabled( false );
     }
 
+    // list fields and types in submenu, since there may be many
+    mActionDataTypes->setMenu( mFieldsMenu );
+
     mDefineMenu->addSeparator();
   }
 

Original file line number	Diff line number	Diff line change
`@@ -137,9 +137,6 @@ void QgsDataDefinedButton::init( const QgsVectorLayer* vl,`
`137`	`137`	`{`
`138`	`138`	`mDataTypesString = ts.join( ", " );`
`139`	`139`	`mActionDataTypes = new QAction( tr( "Field type: " ) + mDataTypesString, this );`
`140`		`-`
`141`		`- // list fields and types in submenu, since there may be many`
`142`		`- mActionDataTypes->setMenu( mFieldsMenu );`
`143`	`140`	`}`
`144`	`141`
`145`	`142`	`if ( mVectorLayer )`
`@@ -277,6 +274,9 @@ void QgsDataDefinedButton::aboutToShowMenu()`
`277`	`274`	`act->setEnabled( false );`
`278`	`275`	`}`
`279`	`276`
	`277`	`+ // list fields and types in submenu, since there may be many`
	`278`	`+ mActionDataTypes->setMenu( mFieldsMenu );`
	`279`	`+`
`280`	`280`	`mDefineMenu->addSeparator();`
`281`	`281`	`}`
`282`	`282`