Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

oops

Browse Source
This commit is contained in:
Kovid Goyal 2014-08-18 09:45:24 +05:30
parent 2639cc26ba
commit 5b9e305d5d
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/calibre/gui2/__init__.py
View File

@ -543,13 +543,16 @@ class FileIconProvider(QFileIconProvider):
if upath != bpath: if upath != bpath:
# User has chosen to override mimetype icons # User has chosen to override mimetype icons
path_map = {v:I('mimetypes/%s.png' % v) for v in set(self.ICONS.itervalues())} path_map = {v:I('mimetypes/%s.png' % v) for v in set(self.ICONS.itervalues())}
icons = self.ICONS.copy()
for uicon in glob.glob(os.path.join(upath, '*.png')): for uicon in glob.glob(os.path.join(upath, '*.png')):
ukey = os.path.basename(uicon).rpartition('.')[0].lower() ukey = os.path.basename(uicon).rpartition('.')[0].lower()
if ukey not in path_map: if ukey not in path_map:
path_map[ukey] = uicon path_map[ukey] = uicon
icons[ukey] = ukey
else: else:
path_map = {v:os.path.join(bpath, v + '.png') for v in set(self.ICONS.itervalues())} path_map = {v:os.path.join(bpath, v + '.png') for v in set(self.ICONS.itervalues())}
self.icons = {k:path_map[v] for k, v in self.ICONS.iteritems()} icons = self.ICONS
self.icons = {k:path_map[v] for k, v in icons.iteritems()}
self.icons['calibre'] = I('lt.png', allow_user_override=False) self.icons['calibre'] = I('lt.png', allow_user_override=False)
for i in ('dir', 'default', 'zero'): for i in ('dir', 'default', 'zero'):
self.icons[i] = QIcon(self.icons[i]) self.icons[i] = QIcon(self.icons[i])