Make it more obvious if a field is selected in a data defined button

nyalldawson · nyalldawson · commit 2f6b8e7a3f1d · 2015-05-06T18:35:59.000+10:00
by ticking the "fields" submenu as well as the field
diff --git a/src/gui/qgsdatadefinedbutton.cpp b/src/gui/qgsdatadefinedbutton.cpp
@@ -262,6 +262,7 @@ void QgsDataDefinedButton::aboutToShowMenu()
 
   mDefineMenu->addSeparator();
 
+  bool fieldActive = false;
   if ( !mDataTypesString.isEmpty() )
   {
     QAction* fieldTitleAct = mDefineMenu->addAction( tr( "Attribute field" ) );
@@ -284,6 +285,7 @@ void QgsDataDefinedButton::aboutToShowMenu()
         {
           act->setCheckable( true );
           act->setChecked( !useExpression() );
+          fieldActive = !useExpression();
         }
       }
     }
@@ -296,6 +298,9 @@ void QgsDataDefinedButton::aboutToShowMenu()
     mDefineMenu->addSeparator();
   }
 
+  mFieldsMenu->menuAction()->setCheckable( true );
+  mFieldsMenu->menuAction()->setChecked( fieldActive );
+
   QAction* exprTitleAct = mDefineMenu->addAction( tr( "Expression" ) );
   exprTitleAct->setFont( titlefont );
   exprTitleAct->setEnabled( false );

Original file line number	Diff line number	Diff line change
`@@ -262,6 +262,7 @@ void QgsDataDefinedButton::aboutToShowMenu()`
`262`	`262`
`263`	`263`	`mDefineMenu->addSeparator();`
`264`	`264`
	`265`	`+ bool fieldActive = false;`
`265`	`266`	`if ( !mDataTypesString.isEmpty() )`
`266`	`267`	`{`
`267`	`268`	`QAction* fieldTitleAct = mDefineMenu->addAction( tr( "Attribute field" ) );`
`@@ -284,6 +285,7 @@ void QgsDataDefinedButton::aboutToShowMenu()`
`284`	`285`	`{`
`285`	`286`	`act->setCheckable( true );`
`286`	`287`	`act->setChecked( !useExpression() );`
	`288`	`+ fieldActive = !useExpression();`
`287`	`289`	`}`
`288`	`290`	`}`
`289`	`291`	`}`
`@@ -296,6 +298,9 @@ void QgsDataDefinedButton::aboutToShowMenu()`
`296`	`298`	`mDefineMenu->addSeparator();`
`297`	`299`	`}`
`298`	`300`
	`301`	`+ mFieldsMenu->menuAction()->setCheckable( true );`
	`302`	`+ mFieldsMenu->menuAction()->setChecked( fieldActive );`
	`303`	`+`
`299`	`304`	`QAction* exprTitleAct = mDefineMenu->addAction( tr( "Expression" ) );`
`300`	`305`	`exprTitleAct->setFont( titlefont );`
`301`	`306`	`exprTitleAct->setEnabled( false );`