Backup_Repos/calibre
1
0
Fork 0
mirror of git://github.com/kovidgoyal/calibre.git synced 2026-05-05 02:23:37 +02:00
Code Issues Projects Releases Wiki Activity

Fix dropping a book onto an internal part of a hierarchical tag. Fix dropping a book onto a user category

Browse source
This commit is contained in:
Charles Haley 2011-02-25 16:56:24 +00:00
parent 0c3ef9d3ce
commit 4f22670377
1 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/calibre/gui2/tag_view.py
View file

@ -85,7 +85,7 @@ class TagsView(QTreeView): # {{{
author_sort_edit = pyqtSignal(object, object)
tag_item_renamed = pyqtSignal()
search_item_renamed = pyqtSignal()
drag_drop_finished = pyqtSignal(object, object)
drag_drop_finished = pyqtSignal(object)
def __init__(self, parent=None):
QTreeView.__init__(self, parent=None)
@ -921,7 +921,7 @@ def do_drop_from_library(self, md, action, row, column, parent):
def handle_user_category_drop(self, on_node, ids, column):
categories = self.db.prefs.get('user_categories', {})
category = categories.get(on_node.category_key[:-1], None)
category = categories.get(on_node.category_key[1:], None)
if category is None:
return
fm_src = self.db.metadata_for_field(column)
@ -955,9 +955,9 @@ def handle_user_category_drop(self, on_node, ids, column):
break
else:
category.append([val, column, vmap[val]])
categories[on_node.category_key[:-1]] = category
categories[on_node.category_key[1:]] = category
self.db.prefs.set('user_categories', categories)
self.drag_drop_finished.emit(None, True)
self.tags_view.recount()
def handle_drop(self, on_node, ids):
#print 'Dropped ids:', ids, on_node.tag
@ -975,7 +975,7 @@ def handle_drop(self, on_node, ids):
fm = self.db.metadata_for_field(key)
is_multiple = fm['is_multiple']
val = on_node.tag.name
val = original_name(on_node.tag)
for id in ids:
mi = self.db.get_metadata(id, index_is_id=True)
@ -1007,7 +1007,7 @@ def handle_drop(self, on_node, ids):
self.db.set_metadata(id, mi, set_title=False,
set_authors=set_authors, commit=False)
self.db.commit()
self.drag_drop_finished.emit(ids, False)
self.drag_drop_finished.emit(ids)
def set_search_restriction(self, s):
self.search_restriction = s
@ -1912,11 +1912,8 @@ def do_author_sort_edit(self, parent, id):
self.library_view.model().refresh()
self.tags_view.recount()
def drag_drop_finished(self, ids, is_category):
if is_category:
self.tags_view.recount()
else:
self.library_view.model().refresh_ids(ids)
def drag_drop_finished(self, ids):
self.library_view.model().refresh_ids(ids)
# }}}