Forms: Hide "Hidden" widgets

Partly fixes #10649
qgis · Jun 20, 2014 · 8b898b9 · 8b898b9
1 parent 196a667
commit 8b898b9
Showing 1 changed file with 21 additions and 17 deletions.
diff --git a/src/gui/qgsattributeform.cpp b/src/gui/qgsattributeform.cpp
@@ -378,26 +378,30 @@ void QgsAttributeForm::init()
       QString fieldName = mLayer->attributeDisplayName( idx );
 
       const QString widgetType = mLayer->editorWidgetV2( idx );
-      const QgsEditorWidgetConfig widgetConfig = mLayer->editorWidgetV2Config( idx );
-      bool labelOnTop = mLayer->labelOnTop( idx );
 
-      // This will also create the widget
-      QWidget *l = new QLabel( fieldName );
-      QgsEditorWidgetWrapper* eww = QgsEditorWidgetRegistry::instance()->create( widgetType, mLayer, idx, widgetConfig, 0, this, mContext );
-      QWidget *w = eww ? eww->widget() : new QLabel( QString( "<p style=\"color: red; font-style: italic;\">Failed to create widget with type '%1'</p>" ).arg( widgetType ) );
+      if ( widgetType != "Hidden" )
+      {
+        const QgsEditorWidgetConfig widgetConfig = mLayer->editorWidgetV2Config( idx );
+        bool labelOnTop = mLayer->labelOnTop( idx );
 
-      if ( eww )
-        mWidgets.append( eww );
+        // This will also create the widget
+        QWidget *l = new QLabel( fieldName );
+        QgsEditorWidgetWrapper* eww = QgsEditorWidgetRegistry::instance()->create( widgetType, mLayer, idx, widgetConfig, 0, this, mContext );
+        QWidget *w = eww ? eww->widget() : new QLabel( QString( "<p style=\"color: red; font-style: italic;\">Failed to create widget with type '%1'</p>" ).arg( widgetType ) );
 
-      if ( labelOnTop )
-      {
-        gridLayout->addWidget( l, row++, 0, 1, 2 );
-        gridLayout->addWidget( w, row++, 0, 1, 2 );
-      }
-      else
-      {
-        gridLayout->addWidget( l, row, 0 );
-        gridLayout->addWidget( w, row++, 1 );
+        if ( eww )
+          mWidgets.append( eww );
+
+        if ( labelOnTop )
+        {
+          gridLayout->addWidget( l, row++, 0, 1, 2 );
+          gridLayout->addWidget( w, row++, 0, 1, 2 );
+        }
+        else
+        {
+          gridLayout->addWidget( l, row, 0 );
+          gridLayout->addWidget( w, row++, 1 );
+        }
       }
     }