From c067c1c2ce3af0b8ebd55ae5a6e44cfe58c5d6ec Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Mon, 6 Dec 2021 06:45:09 +0530 Subject: [PATCH] ... --- src/calibre/gui2/__init__.py | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/src/calibre/gui2/__init__.py b/src/calibre/gui2/__init__.py index 366d2984fc..e9de463852 100644 --- a/src/calibre/gui2/__init__.py +++ b/src/calibre/gui2/__init__.py @@ -22,9 +22,8 @@ from threading import Lock, RLock import calibre.gui2.pyqt6_compat as pqc from calibre import as_unicode, prints from calibre.constants import ( - DEBUG, __appname__ as APP_UID, __version__, config_dir, filesystem_encoding, - is_running_from_develop, isbsd, isfrozen, islinux, ismacos, iswindows, isxp, - plugins_loc + DEBUG, __appname__ as APP_UID, __version__, config_dir, is_running_from_develop, + isbsd, isfrozen, islinux, ismacos, iswindows, isxp, plugins_loc ) from calibre.ebooks.metadata import MetaInformation from calibre.gui2.linux_file_dialogs import ( @@ -1167,7 +1166,7 @@ class Application(QApplication): def load_calibre_style(self): icon_map = self.__icon_map_memory_ = {} pcache = {} - for k, v in iteritems({ + for k, v in { 'DialogYesButton': 'ok.png', 'DialogNoButton': 'window-close.png', 'DialogCloseButton': 'window-close.png', @@ -1186,15 +1185,11 @@ class Application(QApplication): 'LineEditClearButton': 'clear_left.png', 'ToolBarHorizontalExtensionButton': 'v-ellipsis.png', 'ToolBarVerticalExtensionButton': 'h-ellipsis.png', - }): + }.items(): if v not in pcache: - p = I(v) - if isinstance(p, bytes): - p = p.decode(filesystem_encoding) - # if not os.path.exists(p): raise ValueError(p) - pcache[v] = p - v = pcache[v] - icon_map[getattr(QStyle.StandardPixmap, 'SP_'+k).value] = v + pcache[v] = I(v) + # if not os.path.exists(pcache[v]): raise ValueError(pcache[v]) + icon_map[getattr(QStyle.StandardPixmap, 'SP_'+k).value] = pcache[v] transient_scroller = 0 if ismacos: from calibre_extensions.cocoa import transient_scroller