diff --git a/gramps/src/EditPerson.glade b/gramps/src/EditPerson.glade index 1de6f8eb9..debff5183 100644 --- a/gramps/src/EditPerson.glade +++ b/gramps/src/EditPerson.glade @@ -560,7 +560,7 @@ GtkTable table15 5 - 2 + 3 False 0 0 @@ -669,30 +669,6 @@ - - GtkEntry - givenName - True - True - True - 0 - - - 1 - 2 - 0 - 1 - 5 - 5 - True - False - False - False - True - False - - - GtkEntry suffix @@ -717,42 +693,6 @@ - - GtkCombo - lastNameList - False - True - False - True - False - - - 1 - 2 - 1 - 2 - 5 - 5 - True - False - False - False - True - False - - - - GtkEntry - GtkCombo:entry - surname - True - True - True - 0 - - - - GtkEntry title @@ -777,30 +717,6 @@ - - GtkEntry - nickname - True - True - True - 0 - - - 1 - 2 - 4 - 5 - 5 - 5 - True - False - False - False - True - False - - - GtkLabel label22 @@ -826,6 +742,146 @@ False + + + GtkEntry + givenName + True + True + True + 0 + + + 1 + 3 + 0 + 1 + 5 + 5 + True + False + False + False + True + False + + + + + GtkCombo + lastNameList + False + True + False + True + False + + + 1 + 3 + 1 + 2 + 5 + 5 + True + False + False + False + True + False + + + + GtkEntry + GtkCombo:entry + surname + True + True + True + 0 + + + + + + GtkEntry + nickname + True + True + True + 0 + + + 1 + 3 + 4 + 5 + 5 + 5 + True + False + False + False + True + False + + + + + GtkButton + button105 + True + + clicked + on_name_source_clicked + editPerson + Sat, 16 Jun 2001 03:00:44 GMT + + + GTK_RELIEF_NORMAL + + 2 + 3 + 2 + 3 + 5 + 0 + False + False + False + False + False + False + + + + + GtkButton + button106 + True + + clicked + on_name_note_clicked + editPerson + Sat, 16 Jun 2001 03:01:00 GMT + + + GTK_RELIEF_NORMAL + + 2 + 3 + 3 + 4 + 5 + 0 + False + False + False + False + True + False + + @@ -1017,7 +1073,7 @@ GtkTable table10 3 - 2 + 3 False 0 0 @@ -1176,6 +1232,62 @@ False + + + GtkButton + button103 + True + + clicked + on_showsource_clicked + nameList + Sat, 16 Jun 2001 02:32:54 GMT + + + GTK_RELIEF_NORMAL + + 2 + 3 + 0 + 1 + 5 + 0 + False + False + False + False + True + False + + + + + GtkButton + button104 + True + + clicked + on_event_note_clicked + nameList + Sat, 16 Jun 2001 02:34:02 GMT + + + GTK_RELIEF_NORMAL + + 2 + 3 + 1 + 2 + 5 + 0 + False + False + False + False + True + False + + diff --git a/gramps/src/EditPerson.py b/gramps/src/EditPerson.py index 6b2475c0c..9f1af8c0c 100644 --- a/gramps/src/EditPerson.py +++ b/gramps/src/EditPerson.py @@ -129,6 +129,8 @@ class EditPerson: self.top_window.signal_autoconnect({ "on_death_note_clicked" : on_death_note_clicked, "on_death_source_clicked" : on_death_source_clicked, + "on_name_note_clicked" : on_name_note_clicked, + "on_name_source_clicked" : on_name_source_clicked, "on_birth_note_clicked" : on_birth_note_clicked, "on_birth_source_clicked" : on_birth_source_clicked, "on_eventAddBtn_clicked" : on_event_add_clicked, @@ -1184,6 +1186,29 @@ def on_birth_note_clicked(obj): "destroy_passed_object" : utils.destroy_passed_object }) +#------------------------------------------------------------------------- +# +# +# +#------------------------------------------------------------------------- +def on_name_note_clicked(obj): + edit_person_obj = obj.get_data(EDITPERSON) + editnote = libglade.GladeXML(const.editnoteFile,"editnote") + data = edit_person_obj.person.getPrimaryName() + textobj = editnote.get_widget("notetext") + en_obj = editnote.get_widget("editnote") + en_obj.set_data("n",data) + en_obj.set_data("w",textobj) + + textobj.set_point(0) + textobj.insert_defaults(data.getNote()) + textobj.set_word_wrap(1) + + editnote.signal_autoconnect({ + "on_save_note_clicked" : on_save_note_clicked, + "destroy_passed_object" : utils.destroy_passed_object + }) + #------------------------------------------------------------------------- # # @@ -1216,6 +1241,15 @@ def on_death_source_clicked(obj): edit_person_obj = obj.get_data(EDITPERSON) Sources.SourceEditor(edit_person_obj.person.getDeath(),edit_person_obj.db) +#------------------------------------------------------------------------- +# +# +# +#------------------------------------------------------------------------- +def on_name_source_clicked(obj): + edit_person_obj = obj.get_data(EDITPERSON) + Sources.SourceEditor(edit_person_obj.person.getPrimaryName(),edit_person_obj.db) + #------------------------------------------------------------------------- # # diff --git a/gramps/src/GrampsParser.py b/gramps/src/GrampsParser.py index a65460c17..0ecc7ec60 100644 --- a/gramps/src/GrampsParser.py +++ b/gramps/src/GrampsParser.py @@ -80,6 +80,7 @@ class GrampsParser(handler.ContentHandler): self.in_stext = 0 self.in_scomments = 0 self.in_people = 0 + self.in_name = 0 self.db = database self.base = base self.in_family = 0 @@ -326,7 +327,8 @@ class GrampsParser(handler.ContentHandler): #--------------------------------------------------------------------- def start_name(self,attrs): self.name = Name() - + self.in_name = 1 + #--------------------------------------------------------------------- # # @@ -370,6 +372,8 @@ class GrampsParser(handler.ContentHandler): self.source_ref.setBase(self.source) if self.in_address: self.address.setSourceRef(self.source_ref) + elif self.in_name: + self.name.setSourceRef(self.source_ref) elif self.in_event: self.event.setSourceRef(self.source_ref) elif self.in_attribute: @@ -484,6 +488,7 @@ class GrampsParser(handler.ContentHandler): #--------------------------------------------------------------------- def stop_name(self,tag): self.person.setPrimaryName(self.name) + self.in_name = 0 #--------------------------------------------------------------------- # @@ -685,8 +690,10 @@ class GrampsParser(handler.ContentHandler): note = tag if self.in_address == 1: self.address.setNote(note) - if self.in_attribute == 1: + elif self.in_attribute == 1: self.attribute.setNote(note) + elif self.in_name == 1: + self.name.setNote(note) elif self.in_source == 1: self.source.setNote(note) elif self.in_event == 1: