diff --git a/gramps/src/Date.py b/gramps/src/Date.py index 43b0422dc..1e31e7898 100644 --- a/gramps/src/Date.py +++ b/gramps/src/Date.py @@ -427,7 +427,7 @@ class SingleDate: try: self.month = SingleDate.m2num[string.lower(text[0:3])] except KeyError: - self.month = -1 + self.setMonthStrEng(text) #-------------------------------------------------------------------- # diff --git a/gramps/src/EditPerson.glade b/gramps/src/EditPerson.glade index 11b8ddc96..b7da4789c 100644 --- a/gramps/src/EditPerson.glade +++ b/gramps/src/EditPerson.glade @@ -3320,21 +3320,6 @@ GTK_RELIEF_NORMAL - - GtkButton - button112 - True - True - - clicked - on_event_edit_apply_clicked - event_edit - Thu, 26 Jul 2001 20:29:24 GMT - - GNOME_STOCK_BUTTON_APPLY - GTK_RELIEF_NORMAL - - GtkButton button113 diff --git a/gramps/src/EditPerson.py b/gramps/src/EditPerson.py index 309381a8c..398a4fc8e 100644 --- a/gramps/src/EditPerson.py +++ b/gramps/src/EditPerson.py @@ -613,7 +613,7 @@ def on_update_attr_clicked(obj): epo = obj.get_data(EDITPERSON) attr = obj.get_row_data(row) - attr.setType(const.set_pattr(epo.attr_type.get_text())) + attr.setType(const.save_pattr(epo.attr_type.get_text())) attr.setValue(epo.attr_value.get_text()) epo.redraw_attr_list() @@ -1468,8 +1468,7 @@ class EventEditor: self.top.signal_autoconnect({ "destroy_passed_object" : utils.destroy_passed_object, "on_event_edit_ok_clicked" : on_event_edit_ok_clicked, - "on_source_clicked" : on_source_clicked, - "on_event_edit_apply_clicked" : on_event_edit_apply_clicked + "on_source_clicked" : on_source_clicked }) #------------------------------------------------------------------------- @@ -1486,7 +1485,7 @@ def on_source_clicked(obj): # # #------------------------------------------------------------------------- -def on_event_edit_apply_clicked(obj): +def on_event_edit_ok_clicked(obj): ee = obj.get_data("o") event = ee.event @@ -1504,12 +1503,5 @@ def on_event_edit_apply_clicked(obj): ee.parent.events_changed = 1 ee.parent.redraw_event_list() - -#------------------------------------------------------------------------- -# -# -# -#------------------------------------------------------------------------- -def on_event_edit_ok_clicked(obj): - on_event_edit_apply_clicked(obj) utils.destroy_passed_object(obj) + diff --git a/gramps/src/Sources.py b/gramps/src/Sources.py index a361c3c80..09083996e 100644 --- a/gramps/src/Sources.py +++ b/gramps/src/Sources.py @@ -82,7 +82,10 @@ class SourceEditor: self.author_field = self.get_widget("sauthor") self.pub_field = self.get_widget("spubinfo") - self.source_ref = active_entry.getSourceRef() + if active_entry: + self.source_ref = active_entry.getSourceRef() + else: + self.source_ref = None self.active_source = None self.draw() self.sourceDisplay.set_data(SOURCEDISP,self)