sort items in browser dock: sort items by type, so directories are be…

…fore data items, sort top-level provider items by name

Signed-off-by: Tim Sutton <tim@linfiniti.com>

src/core/qgsbrowsermodel.cpp

@@ -54,7 +54,9 @@ void QgsBrowserModel::addRootItems()
   }
 
   // Add non file top level items
-  foreach( QString key, QgsProviderRegistry::instance()->providerList() )
+  QStringList providersList = QgsProviderRegistry::instance()->providerList();
+  providersList.sort();
+  foreach( QString key, providersList )
   {
     QLibrary *library = QgsProviderRegistry::instance()->providerLibrary( key );
     if ( !library )

src/core/qgsdataitem.cpp

@@ -206,10 +206,23 @@ void QgsDataItem::addChildItem( QgsDataItem * child, bool refresh )
   QgsDebugMsg( QString( "add child #%1 - %2" ).arg( mChildren.size() ).arg( child->mName ) );
 
   int i;
-  for ( i = 0; i < mChildren.size(); i++ )
+  if ( type() == Directory )
   {
-    if ( mChildren[i]->mName.localeAwareCompare( child->mName ) >= 0 )
-      break;
+    for ( i = 0; i < mChildren.size(); i++ )
+    {
+      // sort items by type, so directories are before data items
+      if ( mChildren[i]->mType == child->mType &&
+           mChildren[i]->mName.localeAwareCompare( child->mName ) >= 0 )
+        break;
+    }
+  }
+  else
+  {
+    for ( i = 0; i < mChildren.size(); i++ )
+    {
+      if ( mChildren[i]->mName.localeAwareCompare( child->mName ) >= 0 )
+        break;
+    }
   }
 
   if ( refresh )