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

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

Browse Source
This commit is contained in:
Kovid Goyal 2022-11-20 06:57:14 +05:30
commit 4e54cd601a
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/calibre/gui2/preferences/search.py
View File

@ -234,6 +234,7 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
'The option to have un-accented characters match accented characters has no effect' 'The option to have un-accented characters match accented characters has no effect'
' if you also turn on case-sensitive searching. So only turn on one of those options'), show=True) ' if you also turn on case-sensitive searching. So only turn on one of those options'), show=True)
raise AbortCommit() raise AbortCommit()
restart = ConfigWidgetBase.commit(self)
if self.gst_changed: if self.gst_changed:
self.db.new_api.set_pref('grouped_search_terms', self.gst) self.db.new_api.set_pref('grouped_search_terms', self.gst)
self.db.field_metadata.add_grouped_search_terms(self.gst) self.db.field_metadata.add_grouped_search_terms(self.gst)
@ -252,7 +253,7 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
else: else:
cats.discard('search') cats.discard('search')
self.db.new_api.set_pref('categories_using_hierarchy', list(cats)) self.db.new_api.set_pref('categories_using_hierarchy', list(cats))
return ConfigWidgetBase.commit(self) return restart
def refresh_gui(self, gui): def refresh_gui(self, gui):
gui.refresh_search_bar_widgets() gui.refresh_search_bar_widgets()
@ -260,8 +261,8 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
gui.current_db.new_api.clear_caches() gui.current_db.new_api.clear_caches()
set_use_primary_find_in_search(prefs['use_primary_find_in_search']) set_use_primary_find_in_search(prefs['use_primary_find_in_search'])
gui.set_highlight_only_button_icon() gui.set_highlight_only_button_icon()
if self.muc_changed: if self.gst_changed or self.muc_changed:
gui.tags_view.recount() gui.tags_view.model().reset_tag_browser()
gui.search.search_as_you_type(config['search_as_you_type']) gui.search.search_as_you_type(config['search_as_you_type'])
gui.search.do_search() gui.search.do_search()

3
src/calibre/gui2/tag_browser/view.py
View File

@ -715,6 +715,7 @@ class TagsView(QTreeView): # {{{
index = self.indexAt(point) index = self.indexAt(point)
self.context_menu = QMenu(self) self.context_menu = QMenu(self)
added_show_hidden_categories = False added_show_hidden_categories = False
key = None
def add_show_hidden_categories(): def add_show_hidden_categories():
nonlocal added_show_hidden_categories nonlocal added_show_hidden_categories
@ -1046,7 +1047,7 @@ class TagsView(QTreeView): # {{{
# partioning. If partitioning is active, provide a way to turn it on or # partioning. If partitioning is active, provide a way to turn it on or
# off for this category. # off for this category.
if gprefs['tags_browser_partition_method'] != 'disable': if gprefs['tags_browser_partition_method'] != 'disable' and key is not None:
m = self.context_menu m = self.context_menu
p = self.db.prefs.get('tag_browser_dont_collapse', gprefs['tag_browser_dont_collapse']) p = self.db.prefs.get('tag_browser_dont_collapse', gprefs['tag_browser_dont_collapse'])
if key in p: if key in p: