[ui] remove use of system icons in browser directory properties

qgis · Oct 3, 2018 · 94aa8d0 · 94aa8d0
1 parent edc54b7
commit 94aa8d0
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 5 deletions.
diff --git a/images/images.qrc b/images/images.qrc
@@ -445,6 +445,8 @@
         <file>themes/default/mIconFieldInteger.svg</file>
         <file>themes/default/mIconFieldText.svg</file>
         <file>themes/default/mIconFieldTime.svg</file>
+        <file>themes/default/mIconFile.svg</file>
+        <file>themes/default/mIconFileLink.svg</file>
         <file>themes/default/mIconGeonode.svg</file>
         <file>themes/default/mIconInfo.svg</file>
         <file>themes/default/mIconImport.gif</file>
@@ -716,6 +718,7 @@
         <file>themes/default/mActionAdd3DMap.svg</file>
         <file>themes/default/mIndicatorNonRemovable.svg</file>
         <file>themes/default/mIconFolder.svg</file>
+        <file>themes/default/mIconFolderLink.svg</file>
         <file>themes/default/mIconFolderOpen.svg</file>
         <file>themes/default/mIconFolderProject.svg</file>
     </qresource>

diff --git a/images/themes/default/mIconFile.svg b/images/themes/default/mIconFile.svg
diff --git a/images/themes/default/mIconFileLink.svg b/images/themes/default/mIconFileLink.svg
diff --git a/images/themes/default/mIconFolderLink.svg b/images/themes/default/mIconFolderLink.svg
diff --git a/src/core/qgsdataitem.cpp b/src/core/qgsdataitem.cpp
@@ -960,11 +960,10 @@ QgsDirectoryParamWidget::QgsDirectoryParamWidget( const QString &path, QWidget *
   labels << tr( "Name" ) << tr( "Size" ) << tr( "Date" ) << tr( "Permissions" ) << tr( "Owner" ) << tr( "Group" ) << tr( "Type" );
   setHeaderLabels( labels );
 
-  QStyle *style = QApplication::style();
-  QIcon iconDirectory = QgsApplication::getThemeIcon( QStringLiteral( "mIconFolderOpen.svg" ) );
-  QIcon iconFile = QIcon( style->standardIcon( QStyle::SP_FileIcon ) );
-  QIcon iconDirLink = QIcon( style->standardIcon( QStyle::SP_DirLinkIcon ) );
-  QIcon iconFileLink = QIcon( style->standardIcon( QStyle::SP_FileLinkIcon ) );
+  QIcon iconDirectory = QgsApplication::getThemeIcon( QStringLiteral( "mIconFolder.svg" ) );
+  QIcon iconFile = QgsApplication::getThemeIcon( QStringLiteral( "mIconFile.svg" ) );
+  QIcon iconDirLink = QgsApplication::getThemeIcon( QStringLiteral( "mIconFolderLink.svg" ) );
+  QIcon iconFileLink = QgsApplication::getThemeIcon( QStringLiteral( "mIconFileLink.svg" ) );
 
   QList<QTreeWidgetItem *> items;