fixed browser symlink icons

qgis · May 21, 2015 · c0361ba · c0361ba
1 parent e3a832c
commit c0361ba
Showing 1 changed file with 13 additions and 7 deletions.
diff --git a/src/core/qgsdataitem.cpp b/src/core/qgsdataitem.cpp
@@ -888,7 +888,8 @@ QgsDirectoryParamWidget::QgsDirectoryParamWidget( QString path, QWidget* parent
   QStyle* style = QApplication::style();
   QIcon iconDirectory = QIcon( style->standardPixmap( QStyle::SP_DirClosedIcon ) );
   QIcon iconFile = QIcon( style->standardPixmap( QStyle::SP_FileIcon ) );
-  QIcon iconLink = QIcon( style->standardPixmap( QStyle::SP_FileLinkIcon ) ); // TODO: symlink to directory?
+  QIcon iconDirLink = QIcon( style->standardPixmap( QStyle::SP_DirLinkIcon ) );
+  QIcon iconFileLink = QIcon( style->standardPixmap( QStyle::SP_FileLinkIcon ) );
 
   QList<QTreeWidgetItem *> items;
 
@@ -932,20 +933,25 @@ QgsDirectoryParamWidget::QgsDirectoryParamWidget( QString path, QWidget* parent
 
     QString type;
     QIcon icon;
-    if ( fi.isDir() )
+    if ( fi.isDir() && fi.isSymLink() )
+    {
+      type = tr( "folder" );
+      icon = iconDirLink;
+    }
+    else if ( fi.isDir() )
     {
       type = tr( "folder" );
       icon = iconDirectory;
     }
-    else if ( fi.isFile() )
+    else if ( fi.isFile() && fi.isSymLink() )
     {
       type = tr( "file" );
-      icon = iconFile;
+      icon = iconFileLink;
     }
-    else if ( fi.isSymLink() )
+    else if ( fi.isFile() )
     {
-      type = tr( "link" );
-      icon = iconLink;
+      type = tr( "file" );
+      icon = iconFile;
     }
 
     texts << type;