Hide relation widgets when in multiedit/search mode

nyalldawson · nyalldawson · commit 015ee77a7c62 · 2016-06-09T16:48:27.000+10:00
diff --git a/src/gui/editorwidgets/qgsrelationwidgetwrapper.cpp b/src/gui/editorwidgets/qgsrelationwidgetwrapper.cpp
@@ -39,6 +39,12 @@ void QgsRelationWidgetWrapper::setFeature( const QgsFeature& feature )
     mWidget->setFeature( feature );
 }
 
+void QgsRelationWidgetWrapper::setVisible( bool visible )
+{
+  if ( mWidget )
+    mWidget->setVisible( visible );
+}
+
 void QgsRelationWidgetWrapper::initWidget( QWidget* editor )
 {
   QgsRelationEditorWidget* w = dynamic_cast<QgsRelationEditorWidget*>( editor );
diff --git a/src/gui/editorwidgets/qgsrelationwidgetwrapper.h b/src/gui/editorwidgets/qgsrelationwidgetwrapper.h
@@ -38,6 +38,7 @@ class GUI_EXPORT QgsRelationWidgetWrapper : public QgsWidgetWrapper
 
   public slots:
     void setFeature( const QgsFeature& feature ) override;
+    void setVisible( bool visible );
 
   private:
     QgsRelation mRelation;
diff --git a/src/gui/qgsattributeform.cpp b/src/gui/qgsattributeform.cpp
@@ -174,6 +174,12 @@ void QgsAttributeForm::setMode( QgsAttributeForm::Mode mode )
     }
   }
 
+  bool relationWidgetsVisible = ( mMode == QgsAttributeForm::SingleEditMode || mMode == QgsAttributeForm::AddFeatureMode );
+  Q_FOREACH ( QgsRelationWidgetWrapper* w, findChildren<  QgsRelationWidgetWrapper* >() )
+  {
+    w->setVisible( relationWidgetsVisible );
+  }
+
   switch ( mode )
   {
     case QgsAttributeForm::SingleEditMode:

Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,12 @@ void QgsRelationWidgetWrapper::setFeature( const QgsFeature& feature )`
`39`	`39`	`mWidget->setFeature( feature );`
`40`	`40`	`}`
`41`	`41`
	`42`	`+void QgsRelationWidgetWrapper::setVisible( bool visible )`
	`43`	`+{`
	`44`	`+ if ( mWidget )`
	`45`	`+ mWidget->setVisible( visible );`
	`46`	`+}`
	`47`	`+`
`42`	`48`	`void QgsRelationWidgetWrapper::initWidget( QWidget* editor )`
`43`	`49`	`{`
`44`	`50`	`QgsRelationEditorWidget* w = dynamic_cast<QgsRelationEditorWidget*>( editor );`
Original file line number	Diff line number	Diff line change
`@@ -174,6 +174,12 @@ void QgsAttributeForm::setMode( QgsAttributeForm::Mode mode )`
`174`	`174`	`}`
`175`	`175`	`}`
`176`	`176`
	`177`	`+ bool relationWidgetsVisible = ( mMode == QgsAttributeForm::SingleEditMode \|\| mMode == QgsAttributeForm::AddFeatureMode );`
	`178`	`+ Q_FOREACH ( QgsRelationWidgetWrapper* w, findChildren< QgsRelationWidgetWrapper* >() )`
	`179`	`+ {`
	`180`	`+ w->setVisible( relationWidgetsVisible );`
	`181`	`+ }`
	`182`	`+`
`177`	`183`	`switch ( mode )`
`178`	`184`	`{`
`179`	`185`	`case QgsAttributeForm::SingleEditMode:`