browser favourites: add items for providers

qgis · Feb 22, 2016 · 847f1c0 · 847f1c0 · NathanW2 · Feb 22, 2016
1 parent 138be4a
commit 847f1c0
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 8 deletions.
diff --git a/src/core/qgsdataitem.cpp b/src/core/qgsdataitem.cpp
@@ -1139,12 +1139,7 @@ QVector<QgsDataItem*> QgsFavouritesItem::createChildren()
 
   Q_FOREACH ( const QString& favDir, favDirs )
   {
-    QString pathName = pathComponent( favDir );
-    QgsDataItem *item = new QgsDirectoryItem( this, favDir, favDir, mPath + '/' + pathName );
-    if ( item )
-    {
-      children.append( item );
-    }
+    children << createChildren( favDir );
   }
 
   return children;
@@ -1159,8 +1154,11 @@ void QgsFavouritesItem::addDirectory( const QString& favDir )
 
   if ( state() == Populated )
   {
-    QString pathName = pathComponent( favDir );
-    addChildItem( new QgsDirectoryItem( this, favDir, favDir, mPath + '/' + pathName ), true );
+    QVector<QgsDataItem*> items = createChildren( favDir );
+    Q_FOREACH ( QgsDataItem* item, items )
+    {
+      addChildItem( item, true );
+    }
   }
 }
 
@@ -1185,6 +1183,34 @@ void QgsFavouritesItem::removeDirectory( QgsDirectoryItem *item )
     deleteChildItem( mChildren.at( idx ) );
 }
 
+QVector<QgsDataItem*> QgsFavouritesItem::createChildren( const QString& favDir )
+{
+  QVector<QgsDataItem*> children;
+  QString pathName = pathComponent( favDir );
+  Q_FOREACH ( QgsDataItemProvider* provider, QgsDataItemProviderRegistry::instance()->providers() )
+  {
+    int capabilities = provider->capabilities();
+
+    if ( capabilities & QgsDataProvider::Dir )
+    {
+      QgsDataItem * item = provider->createDataItem( favDir, this );
+      if ( item )
+      {
+        children.append( item );
+      }
+    }
+  }
+  if ( children.isEmpty() )
+  {
+    QgsDataItem *item = new QgsDirectoryItem( this, favDir, favDir, mPath + '/' + pathName );
+    if ( item )
+    {
+      children.append( item );
+    }
+  }
+  return children;
+}
+
 //-----------------------------------------------------------------------
 QStringList QgsZipItem::mProviderNames = QStringList();
 QVector<dataItem_t *> QgsZipItem::mDataItemPtr = QVector<dataItem_t*>();

diff --git a/src/core/qgsdataitem.h b/src/core/qgsdataitem.h
@@ -507,6 +507,9 @@ class CORE_EXPORT QgsFavouritesItem : public QgsDataCollectionItem
     void removeDirectory( QgsDirectoryItem *item );
 
     static const QIcon &iconFavourites();
+
+  private:
+    QVector<QgsDataItem*> createChildren( const QString& favDir );
 };
 
 /** A zip file: contains layers, using GDAL/OGR VSIFILE mechanism */