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

...

Browse Source
This commit is contained in:
Kovid Goyal 2011-06-27 07:27:46 -06:00
parent 8c7c3acf99
commit 4ce3217a2e
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/calibre/gui2/tag_browser/ui.py
View File

@ -416,10 +416,10 @@ class TagBrowserWidget(QWidget): # {{{
self.tags_view.set_new_model(filter_categories_by=txt[1:]) self.tags_view.set_new_model(filter_categories_by=txt[1:])
self.current_find_position = None self.current_find_position = None
return return
if model.get_filter_categories_by(): if model.filter_categories_by:
self.tags_view.set_new_model(filter_categories_by=None) model.filter_categories_by = None
self.tags_view.recount()
self.current_find_position = None self.current_find_position = None
model = self.tags_view.model()
if not txt: if not txt:
return return
@ -438,7 +438,7 @@ class TagBrowserWidget(QWidget): # {{{
self.current_find_position = \ self.current_find_position = \
model.find_item_node(key, txt, self.current_find_position) model.find_item_node(key, txt, self.current_find_position)
if self.current_find_position: if self.current_find_position:
model.show_item_at_path(self.current_find_position, box=True) self.tags_view.show_item_at_path(self.current_find_position, box=True)
elif self.item_search.text(): elif self.item_search.text():
self.not_found_label.setVisible(True) self.not_found_label.setVisible(True)
if self.tags_view.verticalScrollBar().isVisible(): if self.tags_view.verticalScrollBar().isVisible():

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

@ -71,7 +71,6 @@ class TagsView(QTreeView): # {{{
search_item_renamed = pyqtSignal() search_item_renamed = pyqtSignal()
drag_drop_finished = pyqtSignal(object) drag_drop_finished = pyqtSignal(object)
restriction_error = pyqtSignal() restriction_error = pyqtSignal()
show_at_path = pyqtSignal()
def __init__(self, parent=None): def __init__(self, parent=None):
QTreeView.__init__(self, parent=None) QTreeView.__init__(self, parent=None)
@ -96,8 +95,6 @@ class TagsView(QTreeView): # {{{
self.user_category_icon = QIcon(I('tb_folder.png')) self.user_category_icon = QIcon(I('tb_folder.png'))
self.delete_icon = QIcon(I('list_remove.png')) self.delete_icon = QIcon(I('list_remove.png'))
self.rename_icon = QIcon(I('edit-undo.png')) self.rename_icon = QIcon(I('edit-undo.png'))
self.show_at_path.connect(self.show_item_at_path,
type=Qt.QueuedConnection)
self._model = TagsModel(self) self._model = TagsModel(self)
self._model.search_item_renamed.connect(self.search_item_renamed) self._model.search_item_renamed.connect(self.search_item_renamed)
@ -176,7 +173,8 @@ class TagsView(QTreeView): # {{{
state_map = self.get_state()[1] state_map = self.get_state()[1]
self.db.prefs.set('user_categories', user_cats) self.db.prefs.set('user_categories', user_cats)
self._model.rebuild_node_tree(state_map=state_map) self._model.rebuild_node_tree(state_map=state_map)
self.show_at_path.emit('@'+nkey) p = self._model.find_category_node('@'+nkey)
self.show_item_at_path(p)
@property @property
def match_all(self): def match_all(self):