From a102f2ec6124d1b2d32fe8cef3a2e5b6fa1e2e86 Mon Sep 17 00:00:00 2001 From: Don Allingham Date: Sat, 27 Jan 2007 18:28:29 +0000 Subject: [PATCH] 2007-01-27 Don Allingham * src/Editors/_EditPerson.py (EditPerson._image_button_press): check for window already being open (#882) svn: r7995 --- gramps2/ChangeLog | 4 ++++ gramps2/NEWS | 9 +++++++++ gramps2/src/Editors/_EditPerson.py | 9 +++++++-- 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog index 4053da20b..9d5a12a38 100644 --- a/gramps2/ChangeLog +++ b/gramps2/ChangeLog @@ -1,3 +1,7 @@ +2007-01-27 Don Allingham + * src/Editors/_EditPerson.py (EditPerson._image_button_press): check + for window already being open (#882) + 2007-01-26 Don Allingham * src/GrampsDb/_WriteGedcom.py: make unicode the default for export * src/GrampsDb/gedcompexport.glade: remove unused dialog diff --git a/gramps2/NEWS b/gramps2/NEWS index 33b79cf7f..0926582fd 100644 --- a/gramps2/NEWS +++ b/gramps2/NEWS @@ -1,3 +1,12 @@ +Version 2.2.5 -- the "Now go away or I shall taunt you a second time" release +* Peformance optimizations (Don Allingham, Alex Roitman, Richard Taylor) +* New date entry provides a new visual indicator (fade in/out of background + color) instead of the old "LED" buttons. (Zsolt Foldvari) +* Better error checking +* Better longitude/lattitude handling, mapping (Benny Malengier, Zolt Foldvari) +* Bug fixes (Don Allingham, Martin Hawlisch, Brian Matherly, Alex Roitman, Douglas Blank, + Stefan Bjork, Richard Taylor) + Version 2.2.4 -- the "When you're chewing on life's gristle, Don't grumble, give a whistle" release * Improved handling of readonly files * Enhanced parsing of longitute and latitude and mapping diff --git a/gramps2/src/Editors/_EditPerson.py b/gramps2/src/Editors/_EditPerson.py index 28e6c2a69..1b9329120 100644 --- a/gramps2/src/Editors/_EditPerson.py +++ b/gramps2/src/Editors/_EditPerson.py @@ -59,6 +59,7 @@ import Mime import RelLib import GrampsWidgets import NameDisplay +import Errors from GrampsDb import set_birth_death_index @@ -407,8 +408,12 @@ class EditPerson(EditPrimary): object_handle = media_ref.get_reference_handle() media_obj = self.db.get_object_from_handle(object_handle) - EditMediaRef(self.dbstate, self.uistate, self.track, - media_obj, media_ref, self._image_callback) + try: + EditMediaRef(self.dbstate, self.uistate, self.track, + media_obj, media_ref, self._image_callback) + except Errors.WindowActiveError, msg: + pass + elif event.type == gtk.gdk.BUTTON_PRESS and event.button == 3: media_list = self.obj.get_media_list() if media_list: