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

Fix a regression in 4.13 that broke the user category editor for all custom columns. Fixes #1877101 [manage user categories not working in 4.15](https://bugs.launchpad.net/calibre/+bug/1877101)

Browse Source 
Merge branch 'master' of https://github.com/cbhaley/calibre
This commit is contained in:
Kovid Goyal 2020-05-06 20:52:38 +05:30
commit 75a0cb950c
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/calibre/gui2/dialogs/tag_categories.py
View File

@ -38,7 +38,7 @@ class TagCategories(QDialog, Ui_TagCategories):
If you add a category, it is permissible to set v to zero. If you delete If you add a category, it is permissible to set v to zero. If you delete
a category, ensure that both the name and the category match. a category, ensure that both the name and the category match.
''' '''
category_labels_orig = ['', 'authors', 'series', 'publisher', 'tags'] category_labels_orig = ['', 'authors', 'series', 'publisher', 'tags', 'languages']
def __init__(self, window, db, on_category=None, book_ids=None): def __init__(self, window, db, on_category=None, book_ids=None):
QDialog.__init__(self, window) QDialog.__init__(self, window)
@ -68,7 +68,8 @@ class TagCategories(QDialog, Ui_TagCategories):
self.category_labels = self.category_labels_orig[:] self.category_labels = self.category_labels_orig[:]
self.category_icons = [None, QIcon(I('user_profile.png')), QIcon(I('series.png')), self.category_icons = [None, QIcon(I('user_profile.png')), QIcon(I('series.png')),
QIcon(I('publisher.png')), QIcon(I('tags.png'))] QIcon(I('publisher.png')), QIcon(I('tags.png')),
QIcon(I('languages.png'))]
self.category_values = [None, self.category_values = [None,
lambda: [t.original_name.replace('|', ',') for t in self.db_categories['authors']], lambda: [t.original_name.replace('|', ',') for t in self.db_categories['authors']],
lambda: [t.original_name for t in self.db_categories['series']], lambda: [t.original_name for t in self.db_categories['series']],