Fix some tiny browser icons on hidpi screens

nyalldawson · nyalldawson · commit 63bb1d80084d · 2018-09-14T11:02:00.000+10:00
(cherry picked from commit 8ecb943)
diff --git a/python/plugins/processing/gui/HistoryDialog.py b/python/plugins/processing/gui/HistoryDialog.py
@@ -55,8 +55,7 @@ def __init__(self):
         self.groupIcon.addPixmap(self.style().standardPixmap(
             QStyle.SP_DirOpenIcon), QIcon.Normal, QIcon.On)
 
-        self.keyIcon = QIcon()
-        self.keyIcon.addPixmap(self.style().standardPixmap(QStyle.SP_FileIcon))
+        self.keyIcon = self.style().standardIcon(QStyle.SP_FileIcon)
 
         self.clearButton = QPushButton(self.tr('Clear'))
         self.clearButton.setToolTip(self.tr('Clear history'))
diff --git a/src/app/qgssettingstree.cpp b/src/app/qgssettingstree.cpp
@@ -68,7 +68,7 @@ QgsSettingsTree::QgsSettingsTree( QWidget *parent )
                        QIcon::Normal, QIcon::Off );
   groupIcon.addPixmap( style()->standardPixmap( QStyle::SP_DirOpenIcon ),
                        QIcon::Normal, QIcon::On );
-  keyIcon.addPixmap( style()->standardPixmap( QStyle::SP_FileIcon ) );
+  keyIcon = style()->standardIcon( QStyle::SP_FileIcon );
 
   setEditTriggers( QAbstractItemView::AllEditTriggers );
 
diff --git a/src/core/qgsbrowsermodel.cpp b/src/core/qgsbrowsermodel.cpp
@@ -91,7 +91,7 @@ void QgsBrowserModel::addRootItems()
   QgsDirectoryItem *item = new QgsDirectoryItem( nullptr, tr( "Home" ), QDir::homePath(), QStringLiteral( HOME_PREFIX ) + QDir::homePath() );
   item->setSortKey( QStringLiteral( " 2" ) );
   QStyle *style = QApplication::style();
-  QIcon homeIcon( style->standardPixmap( QStyle::SP_DirHomeIcon ) );
+  QIcon homeIcon( style->standardIcon( QStyle::SP_DirHomeIcon ) );
   item->setIcon( homeIcon );
   connectItem( item );
   mRootItems << item;
diff --git a/src/core/qgsdataitem.cpp b/src/core/qgsdataitem.cpp
@@ -969,10 +969,10 @@ QgsDirectoryParamWidget::QgsDirectoryParamWidget( const QString &path, QWidget *
   setHeaderLabels( labels );
 
   QStyle *style = QApplication::style();
-  QIcon iconDirectory = QIcon( style->standardPixmap( QStyle::SP_DirClosedIcon ) );
-  QIcon iconFile = QIcon( style->standardPixmap( QStyle::SP_FileIcon ) );
-  QIcon iconDirLink = QIcon( style->standardPixmap( QStyle::SP_DirLinkIcon ) );
-  QIcon iconFileLink = QIcon( style->standardPixmap( QStyle::SP_FileLinkIcon ) );
+  QIcon iconDirectory = QIcon( style->standardIcon( QStyle::SP_DirClosedIcon ) );
+  QIcon iconFile = QIcon( style->standardIcon( QStyle::SP_FileIcon ) );
+  QIcon iconDirLink = QIcon( style->standardIcon( QStyle::SP_DirLinkIcon ) );
+  QIcon iconFileLink = QIcon( style->standardIcon( QStyle::SP_FileLinkIcon ) );
 
   QList<QTreeWidgetItem *> items;
 
@@ -1099,7 +1099,7 @@ void QgsDirectoryParamWidget::showHideColumn()
 QgsProjectItem::QgsProjectItem( QgsDataItem *parent, const QString &name, const QString &path )
   : QgsDataItem( QgsDataItem::Project, parent, name, path )
 {
-  mIconName = QStringLiteral( ":/images/icons/qgis-icon-16x16.png" );
+  mIconName = QStringLiteral( ":/images/icons/qgis_icon.svg" );
   setToolTip( QDir::toNativeSeparators( path ) );
   setState( Populated ); // no more children
 }
diff --git a/src/providers/mssql/qgsmssqldataitems.cpp b/src/providers/mssql/qgsmssqldataitems.cpp
@@ -45,7 +45,7 @@ QgsMssqlConnectionItem::QgsMssqlConnectionItem( QgsDataItem *parent, QString nam
   , mAllowGeometrylessTables( true )
 {
   mCapabilities |= Fast | Collapse;
-  mIconName = QStringLiteral( "mIconConnect.png" );
+  mIconName = QStringLiteral( "mIconConnect.svg" );
 }
 
 QgsMssqlConnectionItem::~QgsMssqlConnectionItem()

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ QgsMssqlConnectionItem::QgsMssqlConnectionItem( QgsDataItem *parent, QString nam`
`45`	`45`	`, mAllowGeometrylessTables( true )`
`46`	`46`	`{`
`47`	`47`	`mCapabilities \|= Fast \| Collapse;`
`48`		`- mIconName = QStringLiteral( "mIconConnect.png" );`
	`48`	`+ mIconName = QStringLiteral( "mIconConnect.svg" );`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`QgsMssqlConnectionItem::~QgsMssqlConnectionItem()`