use layer items paramWidget() in browser properties

blazek · blazek · commit 2ef38ff922d6 · 2015-09-25T23:56:56.000+02:00
diff --git a/src/app/qgsbrowserdockwidget.cpp b/src/app/qgsbrowserdockwidget.cpp
@@ -281,18 +281,37 @@ QgsBrowserPropertiesWidget::QgsBrowserPropertiesWidget( QWidget* parent ) :
 {
 }
 
+void QgsBrowserPropertiesWidget::setWidget( QWidget* paramWidget )
+{
+  QVBoxLayout *layout = new QVBoxLayout( this );
+  paramWidget->setParent( this );
+  layout->addWidget( paramWidget );
+}
+
 QgsBrowserPropertiesWidget* QgsBrowserPropertiesWidget::createWidget( QgsDataItem* item, QWidget* parent )
 {
   QgsBrowserPropertiesWidget* propertiesWidget = 0;
-  if ( item->type() == QgsDataItem::Layer )
+  // In general, we would like to show all items' paramWidget, but top level items like
+  // WMS etc. have currently too large widgets which do not fit well to browser properties widget
+  if ( item->type() == QgsDataItem::Directory )
   {
-    propertiesWidget = new QgsBrowserLayerProperties( parent );
+    propertiesWidget = new QgsBrowserDirectoryProperties( parent );
     propertiesWidget->setItem( item );
   }
-  else if ( item->type() == QgsDataItem::Directory )
+  else if ( item->type() == QgsDataItem::Layer )
   {
-    propertiesWidget = new QgsBrowserDirectoryProperties( parent );
-    propertiesWidget->setItem( item );
+    // prefer item's widget over standard layer widget
+    QWidget *paramWidget = item->paramWidget();
+    if ( paramWidget )
+    {
+      propertiesWidget = new QgsBrowserPropertiesWidget( parent );
+      propertiesWidget->setWidget( paramWidget );
+    }
+    else
+    {
+      propertiesWidget = new QgsBrowserLayerProperties( parent );
+      propertiesWidget->setItem( item );
+    }
   }
   return propertiesWidget;
 }
diff --git a/src/app/qgsbrowserdockwidget.h b/src/app/qgsbrowserdockwidget.h
@@ -47,7 +47,9 @@ class QgsBrowserPropertiesWidget : public QWidget
   public:
     QgsBrowserPropertiesWidget( QWidget* parent = 0 );
     static QgsBrowserPropertiesWidget* createWidget( QgsDataItem* item, QWidget* parent = 0 );
-    virtual void setItem( QgsDataItem* item ) = 0;
+    virtual void setItem( QgsDataItem* item ) { Q_UNUSED( item ) }
+    /** Set content widget, usually item paramWidget. Takes ownership. */
+    virtual void setWidget( QWidget* widget );
 
     /** Sets whether the properties widget should display in condensed mode, ie, for display in a dock
      * widget rather than it's own separate dialog.

Original file line number	Diff line number	Diff line change
`@@ -281,18 +281,37 @@ QgsBrowserPropertiesWidget::QgsBrowserPropertiesWidget( QWidget* parent ) :`
`281`	`281`	`{`
`282`	`282`	`}`
`283`	`283`
	`284`	`+void QgsBrowserPropertiesWidget::setWidget( QWidget* paramWidget )`
	`285`	`+{`
	`286`	`+ QVBoxLayout *layout = new QVBoxLayout( this );`
	`287`	`+ paramWidget->setParent( this );`
	`288`	`+ layout->addWidget( paramWidget );`
	`289`	`+}`
	`290`	`+`
`284`	`291`	`QgsBrowserPropertiesWidget* QgsBrowserPropertiesWidget::createWidget( QgsDataItem* item, QWidget* parent )`
`285`	`292`	`{`
`286`	`293`	`QgsBrowserPropertiesWidget* propertiesWidget = 0;`
`287`		`- if ( item->type() == QgsDataItem::Layer )`
	`294`	`+ // In general, we would like to show all items' paramWidget, but top level items like`
	`295`	`+ // WMS etc. have currently too large widgets which do not fit well to browser properties widget`
	`296`	`+ if ( item->type() == QgsDataItem::Directory )`
`288`	`297`	`{`
`289`		`- propertiesWidget = new QgsBrowserLayerProperties( parent );`
	`298`	`+ propertiesWidget = new QgsBrowserDirectoryProperties( parent );`
`290`	`299`	`propertiesWidget->setItem( item );`
`291`	`300`	`}`
`292`		`- else if ( item->type() == QgsDataItem::Directory )`
	`301`	`+ else if ( item->type() == QgsDataItem::Layer )`
`293`	`302`	`{`
`294`		`- propertiesWidget = new QgsBrowserDirectoryProperties( parent );`
`295`		`- propertiesWidget->setItem( item );`
	`303`	`+ // prefer item's widget over standard layer widget`
	`304`	`+ QWidget *paramWidget = item->paramWidget();`
	`305`	`+ if ( paramWidget )`
	`306`	`+ {`
	`307`	`+ propertiesWidget = new QgsBrowserPropertiesWidget( parent );`
	`308`	`+ propertiesWidget->setWidget( paramWidget );`
	`309`	`+ }`
	`310`	`+ else`
	`311`	`+ {`
	`312`	`+ propertiesWidget = new QgsBrowserLayerProperties( parent );`
	`313`	`+ propertiesWidget->setItem( item );`
	`314`	`+ }`
`296`	`315`	`}`
`297`	`316`	`return propertiesWidget;`
`298`	`317`	`}`