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

Also save search settings when settings changed

Browse Source
This commit is contained in:
Kovid Goyal 2020-01-21 21:45:34 +05:30
parent 88109ad655
commit b0377d7eb5
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/calibre/gui2/viewer/search.py
View File

@ -177,6 +177,7 @@ class SearchInput(QWidget): # {{{
def __init__(self, parent=None): def __init__(self, parent=None):
QWidget.__init__(self, parent) QWidget.__init__(self, parent)
self.ignore_search_type_changes = False
self.l = l = QVBoxLayout(self) self.l = l = QVBoxLayout(self)
l.setContentsMargins(0, 0, 0, 0) l.setContentsMargins(0, 0, 0, 0)
h = QHBoxLayout() h = QHBoxLayout()
@ -219,11 +220,13 @@ class SearchInput(QWidget): # {{{
' equal the entered text and Regex will interpret the text as a' ' equal the entered text and Regex will interpret the text as a'
' regular expression.'))) ' regular expression.')))
qt.setCurrentIndex(qt.findData(vprefs.get('viewer-search-mode', 'normal') or 'normal')) qt.setCurrentIndex(qt.findData(vprefs.get('viewer-search-mode', 'normal') or 'normal'))
qt.currentIndexChanged.connect(self.save_search_type)
h.addWidget(qt) h.addWidget(qt)
self.case_sensitive = cs = QCheckBox(_('&Case sensitive'), self) self.case_sensitive = cs = QCheckBox(_('&Case sensitive'), self)
cs.setFocusPolicy(Qt.NoFocus) cs.setFocusPolicy(Qt.NoFocus)
cs.setChecked(bool(vprefs.get('viewer-search-case-sensitive', False))) cs.setChecked(bool(vprefs.get('viewer-search-case-sensitive', False)))
cs.stateChanged.connect(self.save_search_type)
h.addWidget(cs) h.addWidget(cs)
def history_saved(self, new_text, history): def history_saved(self, new_text, history):
@ -234,17 +237,26 @@ class SearchInput(QWidget): # {{{
sss = {k: v for k, v in iteritems(sss) if k in history} sss = {k: v for k, v in iteritems(sss) if k in history}
vprefs['saved-search-settings'] = sss vprefs['saved-search-settings'] = sss
def save_search_type(self):
text = self.search_box.currentText().strip()
if text and not self.ignore_search_type_changes:
sss = vprefs.get('saved-search-settings') or {}
sss[text] = {'case_sensitive': self.case_sensitive.isChecked(), 'mode': self.query_type.currentData()}
vprefs['saved-search-settings'] = sss
def saved_search_selected(self): def saved_search_selected(self):
text = self.search_box.currentText().strip() text = self.search_box.currentText().strip()
if text: if text:
s = (vprefs.get('saved-search-settings') or {}).get(text) s = (vprefs.get('saved-search-settings') or {}).get(text)
if s: if s:
self.ignore_search_type_changes = True
if 'case_sensitive' in s: if 'case_sensitive' in s:
self.case_sensitive.setChecked(s['case_sensitive']) self.case_sensitive.setChecked(s['case_sensitive'])
if 'mode' in s: if 'mode' in s:
idx = self.query_type.findData(s['mode']) idx = self.query_type.findData(s['mode'])
if idx > -1: if idx > -1:
self.query_type.setCurrentIndex(idx) self.query_type.setCurrentIndex(idx)
self.ignore_search_type_changes = False
self.find_next() self.find_next()
def search_query(self, backwards=False): def search_query(self, backwards=False):