diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog index 62e0d5e50..1a62d619e 100644 --- a/gramps2/ChangeLog +++ b/gramps2/ChangeLog @@ -1,6 +1,12 @@ 2005-06-16 Alex Roitman * src/EventEdit.py: Remove unused variable. + * src/EventEdit.py: Hide warning message for new events and for + existing events with the default role; Only commit new Event when + OK clicked in the editor. + * src/RelLib.py: Add assertions for external witness methods. + * src/gramps.glade: + 2005-06-15 Don Allingham * src/DisplayModels.py: fixed event type display * src/ReadXML.py: build child/family relationships properly on diff --git a/gramps2/src/EventEdit.py b/gramps2/src/EventEdit.py index c7f3a89bf..db78bc8d5 100644 --- a/gramps2/src/EventEdit.py +++ b/gramps2/src/EventEdit.py @@ -455,6 +455,7 @@ class EventRefEditor: self.preform = self.top.get_widget("eer_ev_preform") self.ok = self.top.get_widget('ok') self.expander = self.top.get_widget("eer_expander") + self.warning = self.top.get_widget("eer_warning") add_src = self.top.get_widget('eer_add_src') del_src = self.top.get_widget('eer_del_src') @@ -496,16 +497,24 @@ class EventRefEditor: RelLib.Event.CUSTOM,default_type) if self.event: + self.event_added = False self.date = Date.Date(self.event.get_date_object()) - self.expander.set_expanded(False) + if self.event_ref: + if self.event_ref.get_role()[0] == default_role: + self.expander.set_expanded(True) + self.warning.hide() + else: + self.expander.set_expanded(False) + self.warning.show_all() else: - trans = self.db.transaction_begin() self.event = RelLib.Event() self.event.set_type((default_type,ev_dict[default_type])) - self.db.add_event(self.event,trans) - self.db.transaction_commit(trans,_("Add Event")) + self.event.set_handle(self.db.create_id()) + self.event.set_gramps_id(self.db.find_next_event_gramps_id()) + self.event_added = True self.date = Date.Date(None) self.expander.set_expanded(True) + self.warning.hide() if not self.event_ref: self.event_ref = RelLib.EventRef() @@ -615,7 +624,10 @@ class EventRefEditor: if self.parent.lists_changed: trans = self.db.transaction_begin() self.db.commit_event(self.event,trans) - self.db.transaction_commit(trans,_("Modify Event")) + if self.event_added: + self.db.transaction_commit(trans,_("Add Event")) + else: + self.db.transaction_commit(trans,_("Modify Event")) # then, set properties of the event_ref self.event_ref.set_role(self.role_selector.get_values()) @@ -625,7 +637,6 @@ class EventRefEditor: stop = buf.get_end_iter() note = unicode(buf.get_text(start,stop,False)) self.event_ref.set_note(note) - #self.referent.add_event_ref(self.event_ref) self.close(None) if self.update: diff --git a/gramps2/src/RelLib.py b/gramps2/src/RelLib.py index ad18eb7f6..6ddbdd91f 100644 --- a/gramps2/src/RelLib.py +++ b/gramps2/src/RelLib.py @@ -2424,9 +2424,11 @@ class Event(PrimaryObject,PrivateSourceNote,MediaBase,DateBase,PlaceBase): return self.description def add_ext_witness(self,witness): + assert type(witness) == tuple self.ext_witness_list.append(witness) def remove_ext_witness(self,witness): + assert type(witness) == tuple if witness in self.ext_witness_list: self.ext_witness_list.remove(witness) return True diff --git a/gramps2/src/gramps.glade b/gramps2/src/gramps.glade index 86de11939..8c160f40b 100644 --- a/gramps2/src/gramps.glade +++ b/gramps2/src/gramps.glade @@ -37421,7 +37421,7 @@ Family name Given name 12 True 6 - 4 + 3 False 6 12 @@ -37592,6 +37592,28 @@ Family name Given name + + + True + True + _Private record + True + GTK_RELIEF_NORMAL + True + False + False + True + + + 2 + 3 + 4 + 5 + fill + + + + 6 @@ -37916,50 +37938,62 @@ Family name Given name - + + 6 True - <b>Note:</b> Any changes in the shared event information will be reflected in the event itself, for all participants in the event. - True - True - GTK_JUSTIFY_FILL - True - False - 0 - 0.5 - 0 - 3 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 1 - 3 - 6 - 7 - fill - - - + False + 12 - - - True - gtk-dialog-warning - 6 - 0.5 - 0.5 - 0 - 0 + + + True + gtk-dialog-warning + 6 + 0.5 + 0.5 + 0 + 0 + + + 0 + True + True + + + + + + True + <b>Note:</b> Any changes in the shared event information will be reflected in the event itself, for all participants in the event. + True + True + GTK_JUSTIFY_LEFT + True + False + 0 + 0.5 + 0 + 3 + eer_ev_priv + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + 0 - 1 + 3 6 7 - fill - fill + expand|shrink|fill + expand|shrink|fill @@ -38918,36 +38952,14 @@ Family name Given name 3 5 6 - fill + expand|shrink|fill expand|shrink|fill - - - - True - True - _Private record - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 2 - 4 - 4 - 5 - fill - - - 0 - True + False True