Fix #913154 (Edit bulk metadata: UI messes up when choosing {template})

This commit is contained in:
Kovid Goyal 2012-01-08 20:35:10 +05:30
commit b3de340636
2 changed files with 15 additions and 13 deletions

View File

@ -373,7 +373,7 @@ class TagsView(QTreeView): # {{{
add_node_tree(tree_dict[k], tm, p)
p.pop()
add_node_tree(nt, m, [])
elif key == 'search':
elif key == 'search' and tag.is_searchable:
self.context_menu.addAction(self.rename_icon,
_('Rename %s')%display_name(tag),
partial(self.context_menu_handler, action='edit_item',
@ -389,6 +389,7 @@ class TagsView(QTreeView): # {{{
partial(self.context_menu_handler,
action='delete_item_from_user_category',
key = key, index = tag_item))
if tag.is_searchable:
# Add the search for value items. All leaf nodes are searchable
self.context_menu.addAction(self.search_icon,
_('Search for %s')%display_name(tag),

View File

@ -660,6 +660,7 @@ class HistoryLineEdit(QComboBox): # {{{
def focusOutEvent(self, e):
QComboBox.focusOutEvent(self, e)
if not (self.hasFocus() or self.view().hasFocus()):
self.lost_focus.emit()
# }}}