Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-07 10:14:46 -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 2021-03-11 20:07:13 +05:30
commit 3b87094f70
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/calibre/gui2/preferences/look_feel.py
View File

@ -501,7 +501,6 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
choices=sorted(choices, key=sort_key)) choices=sorted(choices, key=sort_key))
choices -= {'authors', 'publisher', 'formats', 'news', 'identifiers'} choices -= {'authors', 'publisher', 'formats', 'news', 'identifiers'}
self.opt_categories_using_hierarchy.update_items_cache(choices)
r('categories_using_hierarchy', db.prefs, setting=CommaSeparatedList, r('categories_using_hierarchy', db.prefs, setting=CommaSeparatedList,
choices=sorted(choices, key=sort_key)) choices=sorted(choices, key=sort_key))

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

@ -6,7 +6,7 @@ __license__ = 'GPL v3'
__copyright__ = '2010, Kovid Goyal <kovid@kovidgoyal.net>' __copyright__ = '2010, Kovid Goyal <kovid@kovidgoyal.net>'
__docformat__ = 'restructuredtext en' __docformat__ = 'restructuredtext en'
from qt.core import QApplication from qt.core import QApplication, QTimer
from calibre.db.categories import find_categories from calibre.db.categories import find_categories
from calibre.gui2.preferences import ConfigWidgetBase, test_widget, \ from calibre.gui2.preferences import ConfigWidgetBase, test_widget, \
@ -34,9 +34,8 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
r('limit_search_columns', prefs) r('limit_search_columns', prefs)
r('use_primary_find_in_search', prefs) r('use_primary_find_in_search', prefs)
r('case_sensitive', prefs) r('case_sensitive', prefs)
r('limit_search_columns_to', prefs, setting=CommaSeparatedList)
fl = db.field_metadata.get_search_terms() fl = db.field_metadata.get_search_terms()
self.opt_limit_search_columns_to.update_items_cache(fl) r('limit_search_columns_to', prefs, setting=CommaSeparatedList, choices=fl)
self.clear_history_button.clicked.connect(self.clear_histories) self.clear_history_button.clicked.connect(self.clear_histories)
self.gst_explanation.setText('<p>' + _( self.gst_explanation.setText('<p>' + _(
@ -71,7 +70,7 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
fm = db.new_api.field_metadata fm = db.new_api.field_metadata
categories = [x[0] for x in find_categories(fm) if fm[x[0]]['search_terms']] categories = [x[0] for x in find_categories(fm) if fm[x[0]]['search_terms']]
self.gst_value.update_items_cache(categories) self.gst_value.update_items_cache(categories)
self.fill_gst_box(select=None) QTimer.singleShot(0, self.fill_gst_box)
self.user_category_layout.setContentsMargins(0, 30, 0, 0) self.user_category_layout.setContentsMargins(0, 30, 0, 0)
self.gst_names.lineEdit().setPlaceholderText( self.gst_names.lineEdit().setPlaceholderText(