From 2d44370c253c7d2a6498daaf4097f1cfd0a066df Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 9 Jan 2022 04:46:31 +0530
Subject: [PATCH] More QIcon.ic usage

---
 src/calibre/devices/hanlin/driver.py |  2 +-
 src/calibre/devices/kindle/driver.py |  2 +-
 src/calibre/devices/kobo/driver.py   |  2 +-
 src/calibre/devices/nook/driver.py   |  2 +-
 src/calibre/gui2/__init__.py         | 21 ++++-----------------
 5 files changed, 8 insertions(+), 21 deletions(-)

diff --git a/src/calibre/devices/hanlin/driver.py b/src/calibre/devices/hanlin/driver.py
index 98f84091cc..efdf8ff096 100644
--- a/src/calibre/devices/hanlin/driver.py
+++ b/src/calibre/devices/hanlin/driver.py
@@ -119,7 +119,7 @@ class BOOX(HANLINV3):
     supported_platforms = ['windows', 'osx', 'linux']
     METADATA_CACHE = '.metadata.calibre'
     DRIVEINFO = '.driveinfo.calibre'
-    icon           = I('devices/boox.png')
+    icon           = 'devices/boox.png'
 
     # Ordered list of supported formats
     FORMATS     = ['epub', 'fb2', 'djvu', 'pdf', 'html', 'txt', 'rtf', 'mobi',
diff --git a/src/calibre/devices/kindle/driver.py b/src/calibre/devices/kindle/driver.py
index 4c85b1f3a8..56285e7e4a 100644
--- a/src/calibre/devices/kindle/driver.py
+++ b/src/calibre/devices/kindle/driver.py
@@ -56,7 +56,7 @@ class KINDLE(USBMS):
 
     name           = 'Kindle Device Interface'
     gui_name       = 'Amazon Kindle'
-    icon           = I('devices/kindle.png')
+    icon           = 'devices/kindle.png'
     description    = _('Communicate with the Kindle e-book reader.')
     author         = 'John Schember'
     supported_platforms = ['windows', 'osx', 'linux']
diff --git a/src/calibre/devices/kobo/driver.py b/src/calibre/devices/kobo/driver.py
index 2f850644c9..93b71f0887 100644
--- a/src/calibre/devices/kobo/driver.py
+++ b/src/calibre/devices/kobo/driver.py
@@ -1382,7 +1382,7 @@ class KOBOTOUCH(KOBO):
         ' Aura H2O Edition 2, Clara HD, Forma, Libra H2O, Elipsa,'
         ' Sage and Libra 2 eReaders.'
         ' Based on the existing Kobo driver by %s.') % KOBO.author
-#    icon        = I('devices/kobotouch.jpg')
+#    icon        = 'devices/kobotouch.jpg'
 
     supported_dbversion             = 170
     min_supported_dbversion         = 53
diff --git a/src/calibre/devices/nook/driver.py b/src/calibre/devices/nook/driver.py
index 46d57f692c..199c1f2d8a 100644
--- a/src/calibre/devices/nook/driver.py
+++ b/src/calibre/devices/nook/driver.py
@@ -19,7 +19,7 @@ class NOOK(USBMS):
     gui_name       = _('The Nook')
     description    = _('Communicate with the Nook e-book reader.')
     author         = 'John Schember'
-    icon           = I('devices/nook.png')
+    icon           = 'devices/nook.png'
     supported_platforms = ['windows', 'linux', 'osx']
 
     # Ordered list of supported formats
diff --git a/src/calibre/gui2/__init__.py b/src/calibre/gui2/__init__.py
index 3a90e7257e..4ee96eb52b 100644
--- a/src/calibre/gui2/__init__.py
+++ b/src/calibre/gui2/__init__.py
@@ -37,7 +37,7 @@ from calibre.utils.date import UNDEFINED_DATE
 from calibre.utils.file_type_icons import EXT_MAP
 from calibre.utils.localization import get_lang
 from polyglot import queue
-from polyglot.builtins import iteritems, itervalues, string_or_bytes
+from polyglot.builtins import iteritems, string_or_bytes
 
 del pqc
 try:
@@ -645,23 +645,10 @@ class FileIconProvider(QFileIconProvider):
 
     def __init__(self):
         QFileIconProvider.__init__(self)
-        upath, bpath = I('mimetypes'), I('mimetypes', allow_user_override=False)
-        if upath != bpath:
-            # User has chosen to override mimetype icons
-            path_map = {v:I('mimetypes/%s.png' % v) for v in set(itervalues(self.ICONS))}
-            icons = self.ICONS.copy()
-            for uicon in glob.glob(os.path.join(upath, '*.png')):
-                ukey = os.path.basename(uicon).rpartition('.')[0].lower()
-                if ukey not in path_map:
-                    path_map[ukey] = uicon
-                    icons[ukey] = ukey
-        else:
-            path_map = {v:os.path.join(bpath, v + '.png') for v in set(itervalues(self.ICONS))}
-            icons = self.ICONS
-        self.icons = {k:path_map[v] for k, v in iteritems(icons)}
+        self.icons = {k:f'mimetypes/{v}.png' for k, v in self.ICONS.items()}
         self.icons['calibre'] = I('lt.png', allow_user_override=False)
         for i in ('dir', 'default', 'zero'):
-            self.icons[i] = QIcon(self.icons[i])
+            self.icons[i] = QIcon.ic(self.icons[i])
 
     def key_from_ext(self, ext):
         key = ext if ext in list(self.icons.keys()) else 'default'
@@ -674,7 +661,7 @@ class FileIconProvider(QFileIconProvider):
         candidate = self.icons[key]
         if isinstance(candidate, QIcon):
             return candidate
-        icon = QIcon(candidate)
+        icon = QIcon.ic(candidate)
         self.icons[key] = icon
         return icon