Constraint Result Indicator invisible when not in editable mode

signedav · signedav · commit 53d642cecc3e · 2017-11-13T10:49:26.000+01:00
The icon for the constraint result indicator cross/tipp disappears when not in editable mode
this is made by the new method setconstraintresult.
diff --git a/python/gui/qgsattributeformeditorwidget.sip b/python/gui/qgsattributeformeditorwidget.sip
@@ -101,6 +101,11 @@ class QgsAttributeFormEditorWidget : QWidget
  Set the constraint status for this widget.
 %End
 
+    void setConstraintResultVisibility( bool editable );
+%Docstring
+ Set the constraint result lable visible or invisible according to the layer editable status
+%End
+
   public slots:
 
     void setIsMixed( bool mixed );
diff --git a/src/gui/qgsattributeform.cpp b/src/gui/qgsattributeform.cpp
@@ -966,6 +966,8 @@ void QgsAttributeForm::synchronizeEnabledState()
     QgsEditorWidgetWrapper *eww = qobject_cast<QgsEditorWidgetWrapper *>( ww );
     if ( eww )
     {
+      mFormEditorWidgets.value( eww->fieldIdx() )->setConstraintResultVisibility( isEditable );
+
       bool enabled = isEditable && fieldIsEditable( eww->fieldIdx() );
       ww->setEnabled( enabled );
 
diff --git a/src/gui/qgsattributeformeditorwidget.cpp b/src/gui/qgsattributeformeditorwidget.cpp
@@ -159,6 +159,11 @@ void QgsAttributeFormEditorWidget::setConstraintStatus( const QString &constrain
   }
 }
 
+void QgsAttributeFormEditorWidget::setConstraintResultVisibility( bool editable )
+{
+  mConstraintResultLabel->setHidden( !editable );
+}
+
 void QgsAttributeFormEditorWidget::setMode( QgsAttributeFormEditorWidget::Mode mode )
 {
   mMode = mode;
diff --git a/src/gui/qgsattributeformeditorwidget.h b/src/gui/qgsattributeformeditorwidget.h
@@ -123,6 +123,11 @@ class GUI_EXPORT QgsAttributeFormEditorWidget : public QWidget
      */
     void setConstraintStatus( const QString &constraint, const QString &description, const QString &err, QgsEditorWidgetWrapper::ConstraintResult result );
 
+    /**
+     * Set the constraint result lable visible or invisible according to the layer editable status
+     */
+    void setConstraintResultVisibility( bool editable );
+
   public slots:
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -966,6 +966,8 @@ void QgsAttributeForm::synchronizeEnabledState()`
`966`	`966`	`QgsEditorWidgetWrapper eww = qobject_cast<QgsEditorWidgetWrapper >( ww );`
`967`	`967`	`if ( eww )`
`968`	`968`	`{`
	`969`	`+ mFormEditorWidgets.value( eww->fieldIdx() )->setConstraintResultVisibility( isEditable );`
	`970`	`+`
`969`	`971`	`bool enabled = isEditable && fieldIsEditable( eww->fieldIdx() );`
`970`	`972`	`ww->setEnabled( enabled );`
`971`	`973`
Original file line number	Diff line number	Diff line change
`@@ -159,6 +159,11 @@ void QgsAttributeFormEditorWidget::setConstraintStatus( const QString &constrain`
`159`	`159`	`}`
`160`	`160`	`}`
`161`	`161`
	`162`	`+void QgsAttributeFormEditorWidget::setConstraintResultVisibility( bool editable )`
	`163`	`+{`
	`164`	`+ mConstraintResultLabel->setHidden( !editable );`
	`165`	`+}`
	`166`	`+`
`162`	`167`	`void QgsAttributeFormEditorWidget::setMode( QgsAttributeFormEditorWidget::Mode mode )`
`163`	`168`	`{`
`164`	`169`	`mMode = mode;`