From 6e329879a4910297171f15d5058a0d964bc61ce7 Mon Sep 17 00:00:00 2001 From: Benny Malengier Date: Fri, 9 Nov 2007 11:51:57 +0000 Subject: [PATCH] 2007-11-07 Benny Malengier * TODO: update * src/DisplayTabs/_EventEmbedList.py: catch managed window crash svn: r9324 --- ChangeLog | 4 ++++ TODO | 9 ++++++++- src/DisplayTabs/_EventEmbedList.py | 20 +++++++++++++++----- 3 files changed, 27 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4a3115358..488f4ff26 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2007-11-07 Benny Malengier + * TODO: update + * src/DisplayTabs/_EventEmbedList.py: catch managed window crash + 2007-11-08 Stéphane Charette * src/DataViews/_RelationView.py: issue #1352 * src/GrampsWidgets.py: issue #1352, include all siblings in diff --git a/TODO b/TODO index 93748dffc..413a54deb 100644 --- a/TODO +++ b/TODO @@ -1,4 +1,4 @@ -* Remove GCONF, provide up grade path +* Remove GCONF, provide up grade path - IN PROGRESS * Replace the LPRDoc interface (based on gnome-print) with a GTK based print routine. This would remove one of the last gnome-specific @@ -17,6 +17,11 @@ * before release: fix command line options +* remove critical bugs: + - #1053 - DONE (testing of LDS privacy needed!!) + - #1318, wrong note backreferences + - #1208, relative path, see bug note for agreed solution + * before release on multiple notes: --> in note view: only show orphaned notes (notes are NOT in remove orphaned notes tool which is what we want ) @@ -42,6 +47,8 @@ * Remove import of global var in __init__.py, use functions or don't export. Eg. PluginUtils/__init__.py export of plugin lists (tool_list, ...). E +* Add forward/backward buttons (and active object) on all object views, not only person views. + * Split views * Export to spreadsheet, print, CSV of views - DONE diff --git a/src/DisplayTabs/_EventEmbedList.py b/src/DisplayTabs/_EventEmbedList.py index 8bbab9418..108b622a5 100644 --- a/src/DisplayTabs/_EventEmbedList.py +++ b/src/DisplayTabs/_EventEmbedList.py @@ -148,8 +148,8 @@ class EventEmbedList(EmbeddedList): def _handle_drag(self, row, obj): """ - And event reference that is from a drag and drop has - an unknown event reference type + An event reference that is from a drag and drop has + an unknown event reference role """ from gen.lib import EventRoleType @@ -157,9 +157,19 @@ class EventEmbedList(EmbeddedList): EmbeddedList._handle_drag(self, row, obj) event = self.dbstate.db.get_event_from_handle(obj.ref) - self.get_ref_editor()( - self.dbstate, self.uistate, self.track, - event, obj, self.object_edited) + try: + self.get_ref_editor()(self.dbstate, self.uistate, self.track, + event, obj, self.object_edited) + except Errors.WindowActiveError: + from QuestionDialog import WarningDialog + WarningDialog( + _("Cannot edit this reference"), + _("This event reference cannot be edited at this time. " + "Either the associated event is already being edited " + "or another event reference that is associated with " + "the same event is being edited.\n\nTo edit this event " + "reference, you need to close the event.") + ) def handle_extra_type(self, objtype, obj): try: