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

Add rename and delete search to tag browser context menu

Browse Source
This commit is contained in:
Charles Haley 2011-03-15 14:13:54 +00:00
parent c86cc4fe7b
commit d76a0e9c90
2 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/calibre/gui2/search_box.py
View File

@ -453,8 +453,11 @@ class SavedSearchBoxMixin(object): # {{{
d = SavedSearchEditor(self, search) d = SavedSearchEditor(self, search)
d.exec_() d.exec_()
if d.result() == d.Accepted: if d.result() == d.Accepted:
self.saved_searches_changed() self.do_rebuild_saved_searches()
self.saved_search.clear()
def do_rebuild_saved_searches(self):
self.saved_searches_changed()
self.saved_search.clear()
# }}} # }}}

25
src/calibre/gui2/tag_view.py
View File

@ -81,6 +81,7 @@ class TagsView(QTreeView): # {{{
add_subcategory = pyqtSignal(object) add_subcategory = pyqtSignal(object)
tag_list_edit = pyqtSignal(object, object) tag_list_edit = pyqtSignal(object, object)
saved_search_edit = pyqtSignal(object) saved_search_edit = pyqtSignal(object)
rebuild_saved_searches = pyqtSignal()
author_sort_edit = pyqtSignal(object, object) author_sort_edit = pyqtSignal(object, object)
tag_item_renamed = pyqtSignal() tag_item_renamed = pyqtSignal()
search_item_renamed = pyqtSignal() search_item_renamed = pyqtSignal()
@ -111,6 +112,8 @@ class TagsView(QTreeView): # {{{
self.collapse_model = gprefs['tags_browser_partition_method'] self.collapse_model = gprefs['tags_browser_partition_method']
self.search_icon = QIcon(I('search.png')) self.search_icon = QIcon(I('search.png'))
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.rename_icon = QIcon(I('edit-undo.png'))
def set_pane_is_visible(self, to_what): def set_pane_is_visible(self, to_what):
pv = self.pane_is_visible pv = self.pane_is_visible
@ -251,6 +254,10 @@ class TagsView(QTreeView): # {{{
if action == 'delete_user_category': if action == 'delete_user_category':
self.delete_user_category.emit(key) self.delete_user_category.emit(key)
return return
if action == 'delete_search':
saved_searches().delete(key)
self.rebuild_saved_searches.emit()
return
if action == 'delete_item_from_user_category': if action == 'delete_item_from_user_category':
tag = index.tag tag = index.tag
if len(index.children) > 0: if len(index.children) > 0:
@ -313,7 +320,8 @@ class TagsView(QTreeView): # {{{
# the possibility of renaming that item. # the possibility of renaming that item.
if tag.is_editable: if tag.is_editable:
# Add the 'rename' items # Add the 'rename' items
self.context_menu.addAction(_('Rename %s')%tag.name, self.context_menu.addAction(self.rename_icon,
_('Rename %s')%tag.name,
partial(self.context_menu_handler, action='edit_item', partial(self.context_menu_handler, action='edit_item',
index=index)) index=index))
if key == 'authors': if key == 'authors':
@ -341,7 +349,15 @@ class TagsView(QTreeView): # {{{
add_node_tree(tree_dict[k], tm, p) add_node_tree(tree_dict[k], tm, p)
p.pop() p.pop()
add_node_tree(nt, m, []) add_node_tree(nt, m, [])
elif key == 'search':
self.context_menu.addAction(self.rename_icon,
_('Rename %s')%tag.name,
partial(self.context_menu_handler, action='edit_item',
index=index))
self.context_menu.addAction(self.delete_icon,
_('Delete search %s')%tag.name,
partial(self.context_menu_handler,
action='delete_search', key=tag.name))
if key.startswith('@') and not item.is_gst: if key.startswith('@') and not item.is_gst:
self.context_menu.addAction(self.user_category_icon, self.context_menu.addAction(self.user_category_icon,
_('Remove %s from category %s')%(tag.name, item.py_name), _('Remove %s from category %s')%(tag.name, item.py_name),
@ -362,7 +378,7 @@ class TagsView(QTreeView): # {{{
self.context_menu.addSeparator() self.context_menu.addSeparator()
elif key.startswith('@') and not item.is_gst: elif key.startswith('@') and not item.is_gst:
if item.can_be_edited: if item.can_be_edited:
self.context_menu.addAction(self.user_category_icon, self.context_menu.addAction(self.rename_icon,
_('Rename %s')%item.py_name, _('Rename %s')%item.py_name,
partial(self.context_menu_handler, action='edit_item', partial(self.context_menu_handler, action='edit_item',
index=index)) index=index))
@ -370,7 +386,7 @@ class TagsView(QTreeView): # {{{
_('Add sub-category to %s')%item.py_name, _('Add sub-category to %s')%item.py_name,
partial(self.context_menu_handler, partial(self.context_menu_handler,
action='add_subcategory', key=key)) action='add_subcategory', key=key))
self.context_menu.addAction(self.user_category_icon, self.context_menu.addAction(self.delete_icon,
_('Delete user category %s')%item.py_name, _('Delete user category %s')%item.py_name,
partial(self.context_menu_handler, partial(self.context_menu_handler,
action='delete_user_category', key=key)) action='delete_user_category', key=key))
@ -1768,6 +1784,7 @@ class TagBrowserMixin(object): # {{{
self.tags_view.add_subcategory.connect(self.do_add_subcategory) self.tags_view.add_subcategory.connect(self.do_add_subcategory)
self.tags_view.add_item_to_user_cat.connect(self.do_add_item_to_user_cat) self.tags_view.add_item_to_user_cat.connect(self.do_add_item_to_user_cat)
self.tags_view.saved_search_edit.connect(self.do_saved_search_edit) self.tags_view.saved_search_edit.connect(self.do_saved_search_edit)
self.tags_view.rebuild_saved_searches.connect(self.do_rebuild_saved_searches)
self.tags_view.author_sort_edit.connect(self.do_author_sort_edit) self.tags_view.author_sort_edit.connect(self.do_author_sort_edit)
self.tags_view.tag_item_renamed.connect(self.do_tag_item_renamed) self.tags_view.tag_item_renamed.connect(self.do_tag_item_renamed)
self.tags_view.search_item_renamed.connect(self.saved_searches_changed) self.tags_view.search_item_renamed.connect(self.saved_searches_changed)