Show message in dd menu if no variables set

nyalldawson · nyalldawson · commit 81d7ce7e5d68 · 2015-08-22T19:01:43.000+10:00
diff --git a/src/gui/qgsdatadefinedbutton.cpp b/src/gui/qgsdatadefinedbutton.cpp
@@ -344,13 +344,15 @@ void QgsDataDefinedButton::aboutToShowMenu()
         variableActive = true;
       }
     }
+  }
 
-    if ( !variables.isEmpty() )
-    {
-      mDefineMenu->addAction( mActionVariables );
-    }
+  if ( mVariablesMenu->actions().isEmpty() )
+  {
+    QAction* act = mVariablesMenu->addAction( tr( "No variables set" ) );
+    act->setEnabled( false );
   }
 
+  mDefineMenu->addAction( mActionVariables );
   mVariablesMenu->menuAction()->setCheckable( true );
   mVariablesMenu->menuAction()->setChecked( variableActive );
 

Original file line number	Diff line number	Diff line change
`@@ -344,13 +344,15 @@ void QgsDataDefinedButton::aboutToShowMenu()`
`344`	`344`	`variableActive = true;`
`345`	`345`	`}`
`346`	`346`	`}`
	`347`	`+ }`
`347`	`348`
`348`		`- if ( !variables.isEmpty() )`
`349`		`- {`
`350`		`- mDefineMenu->addAction( mActionVariables );`
`351`		`- }`
	`349`	`+ if ( mVariablesMenu->actions().isEmpty() )`
	`350`	`+ {`
	`351`	`+ QAction* act = mVariablesMenu->addAction( tr( "No variables set" ) );`
	`352`	`+ act->setEnabled( false );`
`352`	`353`	`}`
`353`	`354`
	`355`	`+ mDefineMenu->addAction( mActionVariables );`
`354`	`356`	`mVariablesMenu->menuAction()->setCheckable( true );`
`355`	`357`	`mVariablesMenu->menuAction()->setChecked( variableActive );`
`356`	`358`