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

Allow -for-x-theme specialization to work for icons overridden in the config dir

Browse Source
This commit is contained in:
Kovid Goyal 2022-07-19 21:37:48 +05:30
parent 178e75a58e
commit 290ecdf662
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -55,6 +55,7 @@ class IconResourceManager:
self.light_theme_name = self.default_light_theme_name = 'calibre-default-light' self.light_theme_name = self.default_light_theme_name = 'calibre-default-light'
self.user_any_theme_name = self.user_dark_theme_name = self.user_light_theme_name = None self.user_any_theme_name = self.user_dark_theme_name = self.user_light_theme_name = None
self.registered_user_resource_files = () self.registered_user_resource_files = ()
self.color_palette = 'light'
def user_theme_resource_file(self, which): def user_theme_resource_file(self, which):
return os.path.join(config_dir, f'icons-{which}.rcc') return os.path.join(config_dir, f'icons-{which}.rcc')
@ -135,6 +136,13 @@ class IconResourceManager:
legacy_theme_metadata = os.path.join(q, 'icon-theme.json') legacy_theme_metadata = os.path.join(q, 'icon-theme.json')
if os.path.exists(legacy_theme_metadata): if os.path.exists(legacy_theme_metadata):
self.migrate_legacy_icon_theme(legacy_theme_metadata) self.migrate_legacy_icon_theme(legacy_theme_metadata)
items = os.listdir(q)
self.override_items = {'': frozenset(items)}
for k in ('devices', 'mimetypes', 'plugins'):
items = frozenset()
with suppress(OSError):
items = frozenset(os.listdir(os.path.join(self.override_icon_path, k)))
self.override_items[k] = items
self.register_user_resource_files() self.register_user_resource_files()
def migrate_legacy_icon_theme(self, legacy_theme_metadata): def migrate_legacy_icon_theme(self, legacy_theme_metadata):
@ -152,6 +160,23 @@ class IconResourceManager:
else: else:
os.remove(q) os.remove(q)
def overriden_icon_path(self, name):
parts = name.replace(os.sep, '/').split('/')
ans = os.path.join(self.override_icon_path, name)
if len(parts) == 1:
sq, ext = os.path.splitext(parts[0])
sq = f'{sq}-for-{self.color_palette}-theme{ext}'
if sq in self.override_items['']:
ans = os.path.join(self.override_icon_path, sq)
elif len(parts) == 2:
entries = self.override_items.get(parts[0], ())
if entries:
sq, ext = os.path.splitext(parts[1])
sq = f'{sq}-for-{self.color_palette}-theme{ext}'
if sq in entries:
ans = os.path.join(self.override_icon_path, parts[0], sq)
return ans
def __call__(self, name): def __call__(self, name):
if isinstance(name, QIcon): if isinstance(name, QIcon):
return name return name
@ -160,16 +185,14 @@ class IconResourceManager:
if os.path.isabs(name): if os.path.isabs(name):
return QIcon(name) return QIcon(name)
if self.override_icon_path: if self.override_icon_path:
q = os.path.join(self.override_icon_path, name) qi = QIcon(self.overriden_icon_path(name))
qi = QIcon(q)
if qi.is_ok(): if qi.is_ok():
return qi return qi
icon_name = os.path.splitext(name.replace('\\', '__').replace('/', '__'))[0] icon_name = os.path.splitext(name.replace('\\', '__').replace('/', '__'))[0]
ans = QIcon.fromTheme(icon_name) ans = QIcon.fromTheme(icon_name)
if not ans.is_ok(): if not ans.is_ok():
if 'user-any' in QIcon.themeName(): if 'user-any' in QIcon.themeName():
tc = 'dark' if QApplication.instance().is_dark_theme else 'light' q = QIcon(f':/icons/calibre-default-{self.color_palette}/images/{name}')
q = QIcon(f':/icons/calibre-default-{tc}/images/{name}')
if q.is_ok(): if q.is_ok():
ans = q ans = q
return ans return ans
@ -191,7 +214,9 @@ class IconResourceManager:
def set_theme(self): def set_theme(self):
current = QIcon.themeName() current = QIcon.themeName()
new = self.dark_theme_name if QApplication.instance().is_dark_theme else self.light_theme_name is_dark = QApplication.instance().is_dark_theme
self.color_palette = 'dark' if is_dark else 'light'
new = self.dark_theme_name if is_dark else self.light_theme_name
if current == new and current not in (self.default_dark_theme_name, self.default_light_theme_name): if current == new and current not in (self.default_dark_theme_name, self.default_light_theme_name):
# force reload of user icons by first changing theme to default and # force reload of user icons by first changing theme to default and
# then to user # then to user