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 problem applying a search restriction if the VL menu has never been opened. See http://www.mobileread.com/forums/showthread.php?p=3047621#post3047621

Browse Source
This commit is contained in:
Charles Haley 2015-02-16 10:33:57 +01:00
parent 764683da58
commit af49a1ca4a
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/calibre/gui2/search_restriction_mixin.py
View File

@ -341,6 +341,7 @@ class SearchRestrictionMixin(object):
self.ar_menu = QMenu(_('Additional restriction')) self.ar_menu = QMenu(_('Additional restriction'))
self.edit_menu = QMenu(_('Edit Virtual Library')) self.edit_menu = QMenu(_('Edit Virtual Library'))
self.rm_menu = QMenu(_('Remove Virtual Library')) self.rm_menu = QMenu(_('Remove Virtual Library'))
self.search_restriction_list_built = False
def add_virtual_library(self, db, name, search): def add_virtual_library(self, db, name, search):
virt_libs = db.prefs.get('virtual_libraries', {}) virt_libs = db.prefs.get('virtual_libraries', {})
@ -498,6 +499,7 @@ class SearchRestrictionMixin(object):
return name[0:MAX_VIRTUAL_LIBRARY_NAME_LENGTH].strip() return name[0:MAX_VIRTUAL_LIBRARY_NAME_LENGTH].strip()
def build_search_restriction_list(self): def build_search_restriction_list(self):
self.search_restriction_list_built = True
from calibre.gui2.ui import get_gui from calibre.gui2.ui import get_gui
m = self.ar_menu m = self.ar_menu
m.clear() m.clear()
@ -539,6 +541,8 @@ class SearchRestrictionMixin(object):
self.apply_search_restriction(index) self.apply_search_restriction(index)
def apply_named_search_restriction(self, name): def apply_named_search_restriction(self, name):
if not self.search_restriction_list_built:
self.build_search_restriction_list()
if not name: if not name:
r = 0 r = 0
else: else:
@ -549,6 +553,8 @@ class SearchRestrictionMixin(object):
self.apply_search_restriction(r) self.apply_search_restriction(r)
def apply_text_search_restriction(self, search): def apply_text_search_restriction(self, search):
if not self.search_restriction_list_built:
self.build_search_restriction_list()
search = unicode(search) search = unicode(search)
if not search: if not search:
self.search_restriction.setCurrentIndex(0) self.search_restriction.setCurrentIndex(0)
@ -567,6 +573,8 @@ class SearchRestrictionMixin(object):
self._apply_search_restriction(search, self._trim_restriction_name(s)) self._apply_search_restriction(search, self._trim_restriction_name(s))
def apply_search_restriction(self, i): def apply_search_restriction(self, i):
if not self.search_restriction_list_built:
self.build_search_restriction_list()
if i == 1: if i == 1:
self.apply_text_search_restriction(unicode(self.search.currentText())) self.apply_text_search_restriction(unicode(self.search.currentText()))
elif i == 2 and unicode(self.search_restriction.currentText()).startswith('*'): elif i == 2 and unicode(self.search_restriction.currentText()).startswith('*'):