[QGIS Commit] r11845 - trunk/qgis/src/core/symbology

[svn_qgis at osgeo.org]

Author: timlinux
Date: 2009-10-26 01:46:01 -0400 (Mon, 26 Oct 2009)
New Revision: 11845

Modified:
   trunk/qgis/src/core/symbology/qgsmarkercatalogue.cpp
Log:
Search also in root dirs of svg search paths

Modified: trunk/qgis/src/core/symbology/qgsmarkercatalogue.cpp
===================================================================
--- trunk/qgis/src/core/symbology/qgsmarkercatalogue.cpp	2009-10-26 05:36:52 UTC (rev 11844)
+++ trunk/qgis/src/core/symbology/qgsmarkercatalogue.cpp	2009-10-26 05:46:01 UTC (rev 11845)
@@ -77,9 +77,20 @@
     // TODO recursive ?
     QDir dir( svgPaths[i] );
     
+    //
+    // First check the root dir of this path for svgs
+    //
+    QStringList dl1 = dir.entryList( QStringList( "*.svg" ), QDir::Files );
+    for ( QStringList::iterator it1 = dl1.begin(); it1 != dl1.end(); ++it1 )
+    {
+      // TODO test if it is correct SVG
+      mList.append( "svg:" + dir.path() + "/" + *it1 );
+    }
 
+    //
+    // Now check in any nested dirs for svgs
+    //
     QStringList dl = dir.entryList( QDir::Dirs );
-
     for ( QStringList::iterator it = dl.begin(); it != dl.end(); ++it )
     {
       QgsDebugMsg( QString( "Looking for svgs in %1" ).arg( svgPaths[i] + *it ) );