add signal with expression validity

qgis · May 2, 2014 · 778fb62 · 778fb62
1 parent d828f6b
commit 778fb62
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/gui/qgsfieldexpressionwidget.cpp b/src/gui/qgsfieldexpressionwidget.cpp
@@ -147,6 +147,7 @@ void QgsFieldExpressionWidget::indexChanged( int i )
   Q_UNUSED( i );
   bool isExpression;
   QString fieldName = currentField( &isExpression );
+  bool isValid = true;
 
   QFont font = mCombo->lineEdit()->font();
   font.setItalic( isExpression );
@@ -159,7 +160,7 @@ void QgsFieldExpressionWidget::indexChanged( int i )
     QModelIndex idx = mFieldModel->indexFromName( fieldName );
     if ( idx.isValid() )
     {
-      bool isValid = mFieldModel->data( idx, QgsFieldModel::ExpressionValidityRole ).toBool();
+      isValid = mFieldModel->data( idx, QgsFieldModel::ExpressionValidityRole ).toBool();
       if ( !isValid )
       {
         palette.setColor( QPalette::Text, Qt::red );
@@ -169,4 +170,5 @@ void QgsFieldExpressionWidget::indexChanged( int i )
   mCombo->lineEdit()->setPalette( palette );
 
   emit fieldChanged( fieldName );
+  emit fieldChanged( fieldName, isValid );
 }
diff --git a/src/gui/qgsfieldexpressionwidget.h b/src/gui/qgsfieldexpressionwidget.h
@@ -57,6 +57,9 @@ class GUI_EXPORT QgsFieldExpressionWidget : public QWidget
     //! the signal is emitted when the currently selected field changes
     void fieldChanged( QString fieldName );
 
+    //! fieldChanged signal with indication of the validity of the expression
+    void fieldChanged( QString fieldName, bool isValid );
+
   public slots:
     //! set the layer used to display the fields and expression
     void setLayer( QgsVectorLayer* layer );