mirror of
https://github.com/kovidgoyal/calibre.git
synced 2025-07-09 03:04:10 -04:00
Merge branch 'fix-icon_rules-only-current-library-filter' of https://github.com/un-pogaz/calibre
This commit is contained in:
commit
e98e5c863d
@ -355,6 +355,7 @@ class TbIconRulesTab(LazyConfigWidgetBase, Ui_Form):
|
|||||||
def populate_content(self):
|
def populate_content(self):
|
||||||
field_metadata = self.gui.current_db.field_metadata
|
field_metadata = self.gui.current_db.field_metadata
|
||||||
category_icons = self.gui.tags_view.model().category_custom_icons
|
category_icons = self.gui.tags_view.model().category_custom_icons
|
||||||
|
is_hierarchical_category = self.gui.tags_view.model().is_key_a_hierarchical_category
|
||||||
only_current_library = self.show_only_current_library.isChecked()
|
only_current_library = self.show_only_current_library.isChecked()
|
||||||
v = gprefs['tags_browser_value_icons']
|
v = gprefs['tags_browser_value_icons']
|
||||||
row = 0
|
row = 0
|
||||||
@ -366,6 +367,15 @@ class TbIconRulesTab(LazyConfigWidgetBase, Ui_Form):
|
|||||||
if category in field_metadata:
|
if category in field_metadata:
|
||||||
display_name = field_metadata[category]['name']
|
display_name = field_metadata[category]['name']
|
||||||
all_values = self.gui.current_db.new_api.all_field_names(category)
|
all_values = self.gui.current_db.new_api.all_field_names(category)
|
||||||
|
if is_hierarchical_category(category):
|
||||||
|
rslt = set()
|
||||||
|
for value in all_values:
|
||||||
|
idx = 0
|
||||||
|
while idx >= 0:
|
||||||
|
rslt.add(value)
|
||||||
|
idx = value.rfind('.')
|
||||||
|
value = value[:idx]
|
||||||
|
all_values = rslt
|
||||||
elif only_current_library:
|
elif only_current_library:
|
||||||
continue
|
continue
|
||||||
else:
|
else:
|
||||||
@ -532,7 +542,7 @@ class TbIconRulesTab(LazyConfigWidgetBase, Ui_Form):
|
|||||||
continue
|
continue
|
||||||
|
|
||||||
icon_item = self.rules_table.item(r, ICON_COLUMN)
|
icon_item = self.rules_table.item(r, ICON_COLUMN)
|
||||||
d = v[cat_item.lookup_name][value_text]
|
d = list(v[cat_item.lookup_name][value_text])
|
||||||
|
|
||||||
if icon_item.is_modified:
|
if icon_item.is_modified:
|
||||||
if value_item.is_template:
|
if value_item.is_template:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user