* src/AddMedia.py: Remove unneeded update argument.

* src/ArgHandler.py (auto_save_load): Mysterious workaround :-).
* src/EditPlace.py (display_references): Drop media objects;
(DeletePlaceQuery.query_response): use proper handle removal.
* src/GrampsBSDDB.py (remove_object): emit media signal.
* src/GrampsDbBase.py (GrampsDbBase): Add media-related signals;
(commit_media_object,transaction_commit,undo): emit media signals.
* src/ImageSelect.py (GlobalMediaProperties,DeleteMediaQuery):
Remove unneeded update argument.
* src/MediaView.py (media_add,media_update,media_delete): Add
callbacks; (change_db): connect callbacks to signals;
(popup_change_description): Call property editor without callback param;
(on_add_clicked): Call AddMedia without callback param;
(add_object,update_display,add_to_display): Remove unneeded methods;
(on_edit_clicked): call property editor without callback param;
(on_delete_clicked): call deleter without callback param;
(on_drag_data_received): Call property editor without callback param.
* src/PlaceView.py (new_place_after_edit): Remove unneeded method;
(delete_place): Remove unneeded tree update; (is_used) Add method;
(on_delete_clicked): Use new detection method.


svn: r4287
This commit is contained in:
Alex Roitman
2005-04-04 00:27:06 +00:00
parent 94b27d450c
commit 9a6894df98
9 changed files with 118 additions and 127 deletions

View File

@ -127,7 +127,11 @@ class GrampsDbBase(GrampsDBCallback.GrampsDBCallback):
'place-add' : (list,),
'place-update' : (list,),
'place-delete' : (list,),
'place-rebuild' : None
'place-rebuild' : None,
'media-add' : (list,),
'media-update' : (list,),
'media-delete' : (list,),
'media-rebuild' : None,
}
def __init__(self):
@ -285,6 +289,11 @@ class GrampsDbBase(GrampsDBCallback.GrampsDBCallback):
old_data = self.media_map.get(handle)
transaction.add(MEDIA_KEY,handle,old_data)
self.media_map[handle] = obj.serialize()
if transaction and not transaction.batch:
if old_data:
self.emit('media-update',([handle],))
else:
self.emit('media-add',([handle],))
def commit_source(self,source,transaction,change_time=None):
"""
@ -690,8 +699,6 @@ class GrampsDbBase(GrampsDBCallback.GrampsDBCallback):
if place.get_gramps_id() == None:
place.set_gramps_id(self.find_next_place_gramps_id())
self.commit_place(place,transaction)
if transaction and not transaction.batch:
self.emit('place-add',([place.handle],))
return place.get_handle()
def add_object(self,obj,transaction):
@ -955,6 +962,7 @@ class GrampsDbBase(GrampsDBCallback.GrampsDBCallback):
self.emit('family-rebuild')
self.emit('place-rebuild')
self.emit('source-rebuild')
self.emit('media-rebuild')
def undo(self):
"""
@ -1005,8 +1013,10 @@ class GrampsDbBase(GrampsDBCallback.GrampsDBCallback):
self.emit('place-update',([str(handle),]))
elif key == MEDIA_KEY:
if data == None:
self.emit('media-delete',([str(handle),]))
del self.media_map[str(handle)]
else:
self.emit('media-update',([str(handle),]))
self.media_map[str(handle)] = data
if self.undo_callback: