DnD forms: Make tabs scrollable

m-kuhn · m-kuhn · commit 7f21918e77cb · 2014-06-02T15:20:47.000+02:00
Fix #10389
diff --git a/src/core/qgsvectorlayer.h b/src/core/qgsvectorlayer.h
@@ -97,17 +97,21 @@ class CORE_EXPORT QgsAttributeEditorContainer : public QgsAttributeEditorElement
 {
   public:
     QgsAttributeEditorContainer( QString name, QObject *parent )
-        : QgsAttributeEditorElement( AeTypeContainer, name, parent ) {}
+        : QgsAttributeEditorElement( AeTypeContainer, name, parent )
+        , mIsGroupBox( true )
+    {}
 
     ~QgsAttributeEditorContainer() {}
 
     virtual QDomElement toDomElement( QDomDocument& doc ) const;
     virtual void addChildElement( QgsAttributeEditorElement *widget );
-    virtual bool isGroupBox() const { return true; }
+    virtual void setIsGroupBox( bool isGroupBox ) { mIsGroupBox = isGroupBox; }
+    virtual bool isGroupBox() const { return mIsGroupBox; }
     QList<QgsAttributeEditorElement*> children() const { return mChildren; }
     virtual QList<QgsAttributeEditorElement*> findElements( AttributeEditorType type ) const;
 
   private:
+    bool mIsGroupBox;
     QList<QgsAttributeEditorElement*> mChildren;
 };
 
diff --git a/src/gui/qgsattributeform.cpp b/src/gui/qgsattributeform.cpp
@@ -321,7 +321,7 @@ void QgsAttributeForm::init()
     QTabWidget* tabWidget = new QTabWidget( this );
     layout()->addWidget( tabWidget );
 
-    Q_FOREACH( const QgsAttributeEditorElement *widgDef, mLayer->attributeEditorElements() )
+    Q_FOREACH( QgsAttributeEditorElement *widgDef, mLayer->attributeEditorElements() )
     {
       QWidget* tabPage = new QWidget( tabWidget );
 
@@ -330,6 +330,8 @@ void QgsAttributeForm::init()
 
       if ( widgDef->type() == QgsAttributeEditorElement::AeTypeContainer )
       {
+        QgsAttributeEditorContainer* containerDef = dynamic_cast<QgsAttributeEditorContainer*>( widgDef );
+        containerDef->setIsGroupBox( false ); // Toplevel widgets are tabs not groupboxes
         QString dummy1;
         bool dummy2;
         tabPageLayout->addWidget( createWidgetFromDef( widgDef, tabPage, mLayer, mContext, dummy1, dummy2 ) );

Original file line number	Diff line number	Diff line change
`@@ -321,7 +321,7 @@ void QgsAttributeForm::init()`
`321`	`321`	`QTabWidget* tabWidget = new QTabWidget( this );`
`322`	`322`	`layout()->addWidget( tabWidget );`
`323`	`323`
`324`		`- Q_FOREACH( const QgsAttributeEditorElement *widgDef, mLayer->attributeEditorElements() )`
	`324`	`+ Q_FOREACH( QgsAttributeEditorElement *widgDef, mLayer->attributeEditorElements() )`
`325`	`325`	`{`
`326`	`326`	`QWidget* tabPage = new QWidget( tabWidget );`
`327`	`327`
`@@ -330,6 +330,8 @@ void QgsAttributeForm::init()`
`330`	`330`
`331`	`331`	`if ( widgDef->type() == QgsAttributeEditorElement::AeTypeContainer )`
`332`	`332`	`{`
	`333`	`+ QgsAttributeEditorContainer* containerDef = dynamic_cast<QgsAttributeEditorContainer*>( widgDef );`
	`334`	`+ containerDef->setIsGroupBox( false ); // Toplevel widgets are tabs not groupboxes`
`333`	`335`	`QString dummy1;`
`334`	`336`	`bool dummy2;`
`335`	`337`	`tabPageLayout->addWidget( createWidgetFromDef( widgDef, tabPage, mLayer, mContext, dummy1, dummy2 ) );`