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

Merge branch 'master' of https://github.com/cbhaley/calibre

Browse Source 
Fixes #2015317 [User Categories: Renaming removes custom icon](https://bugs.launchpad.net/calibre/+bug/2015317)
This commit is contained in:
Kovid Goyal 2023-04-05 17:07:45 +05:30
commit c325fd6d58
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/calibre/gui2/tag_browser/model.py
View File

@ -370,6 +370,22 @@ class TagsModel(QAbstractItemModel): # {{{
def gui_parent(self): def gui_parent(self):
return QObject.parent(self) return QObject.parent(self)
def rename_user_category_icon(self, old_key, new_key):
'''
This is required for user categories because the key (lookup name) changes
on rename. We must rename the old icon to use the new key then update
the preferences and internal tables.
'''
old_icon = self.prefs['tags_browser_category_icons'].get(old_key, None)
if old_icon is not None:
old_path = os.path.join(config_dir, 'tb_icons', old_icon)
_, ext = os.path.splitext(old_path)
new_icon = new_key + ext
new_path = os.path.join(config_dir, 'tb_icons', new_icon)
os.replace(old_path, new_path)
self.set_custom_category_icon(new_key, new_path)
self.set_custom_category_icon(old_key, None)
def set_custom_category_icon(self, key, path): def set_custom_category_icon(self, key, path):
d = self.prefs['tags_browser_category_icons'] d = self.prefs['tags_browser_category_icons']
if path: if path:
@ -1351,14 +1367,16 @@ class TagsModel(QAbstractItemModel): # {{{
return self.show_error_after_event_loop_tick(_('Rename User category'), return self.show_error_after_event_loop_tick(_('Rename User category'),
_('The name %s is already used')%nkey) _('The name %s is already used')%nkey)
user_cats[nkey] = user_cats[ckey] user_cats[nkey] = user_cats[ckey]
self.rename_user_category_icon('@' + c, '@' + nkey)
del user_cats[ckey] del user_cats[ckey]
elif c[len(ckey)] == '.': elif c[len(ckey)] == '.':
rest = c[len(ckey):] rest = c[len(ckey):]
if strcmp(ckey, nkey) != 0 and \ if strcmp(ckey, nkey) != 0 and \
icu_lower(nkey + rest) in user_cat_keys_lower: icu_lower(nkey + rest) in user_cat_keys_lower:
return self.show_error_after_event_loop_tick(_('Rename User category'), return self.show_error_after_event_loop_tick(_('Rename User category'),
_('The name %s is already used')%(nkey+rest)) _('The name %s is already used')%(nkey + rest))
user_cats[nkey + rest] = user_cats[ckey + rest] user_cats[nkey + rest] = user_cats[ckey + rest]
self.rename_user_category_icon('@' + ckey + rest, '@' + nkey + rest)
del user_cats[ckey + rest] del user_cats[ckey + rest]
self.user_categories_edited.emit(user_cats, nkey) # Does a refresh self.user_categories_edited.emit(user_cats, nkey) # Does a refresh
self.use_position_based_index_on_next_recount = True self.use_position_based_index_on_next_recount = True