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

Make drag from news work (change category to tags)

Browse Source 
Correctly distinguish between copy and move when repainting
This commit is contained in:
Charles Haley 2011-02-23 21:58:10 +00:00
commit 1ad3979e38
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -727,15 +727,21 @@ class TagsModel(QAbstractItemModel): # {{{
if s[0] != TagTreeItem.TAG: if s[0] != TagTreeItem.TAG:
return False return False
user_cats = self.db.prefs.get('user_categories', {}) user_cats = self.db.prefs.get('user_categories', {})
parent_node = None
for s in src: for s in src:
src_parent, src_name, src_cat = s[1:4] src_parent, src_name, src_cat = s[1:4]
src_parent = src_parent[1:] parent_node = src_parent
if src_parent.startswith('@'):
is_uc = True
src_parent = src_parent[1:]
else:
is_uc = False
dest_key = dest.category_key[1:] dest_key = dest.category_key[1:]
if dest_key not in user_cats: if dest_key not in user_cats:
continue continue
new_cat = [] new_cat = []
# delete the item if the source is a user category and action is move # delete the item if the source is a user category and action is move
if src_parent in user_cats and action == Qt.MoveAction: if is_uc and src_parent in user_cats and action == Qt.MoveAction:
for tup in user_cats[src_parent]: for tup in user_cats[src_parent]:
if src_name == tup[0] and src_cat == tup[1]: if src_name == tup[0] and src_cat == tup[1]:
continue continue
@ -743,6 +749,8 @@ class TagsModel(QAbstractItemModel): # {{{
user_cats[src_parent] = new_cat user_cats[src_parent] = new_cat
# Now add the item to the destination user category # Now add the item to the destination user category
add_it = True add_it = True
if not is_uc and src_cat == 'news':
src_cat = 'tags'
for tup in user_cats[dest_key]: for tup in user_cats[dest_key]:
if src_name == tup[0] and src_cat == tup[1]: if src_name == tup[0] and src_cat == tup[1]:
add_it = False add_it = False
@ -750,12 +758,13 @@ class TagsModel(QAbstractItemModel): # {{{
user_cats[dest_key].append([src_name, src_cat, 0]) user_cats[dest_key].append([src_name, src_cat, 0])
self.db.prefs.set('user_categories', user_cats) self.db.prefs.set('user_categories', user_cats)
self.tags_view.set_new_model() self.tags_view.set_new_model()
# Must work with the new model here if parent_node is not None:
m = self.tags_view.model() # Must work with the new model here
path = m.find_category_node('@' + src_parent) m = self.tags_view.model()
idx = m.index_for_path(path) path = m.find_category_node(parent_node)
self.tags_view.setExpanded(idx, True) idx = m.index_for_path(path)
m.show_item_at_index(idx) self.tags_view.setExpanded(idx, True)
m.show_item_at_index(idx)
return True return True
def do_drop_from_library(self, md, action, row, column, parent): def do_drop_from_library(self, md, action, row, column, parent):