Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* src/EditPerson.py: fix after merge

Browse Source 
* src/GrampsDbBase.py: fix after merge
* src/edit_person.glade: fix after merge


svn: r5545
This commit is contained in:
Don Allingham
2005-12-14 01:23:23 +00:00
parent 8f6b51ccb2
commit 9dbbf2b512
4 changed files with 59 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
gramps2/ChangeLog
View File

@@ -1,3 +1,8 @@
2005-12-13 Don Allingham <don@gramps-project.org>
* src/EditPerson.py: fix after merge
* src/GrampsDbBase.py: fix after merge
* src/edit_person.glade: fix after merge
2005-12-12 Alex Roitman <shura@gramps-project.org> 2005-12-12 Alex Roitman <shura@gramps-project.org>
* various: merge changes made in gramps20 up until R2_0_9 tag. * various: merge changes made in gramps20 up until R2_0_9 tag.

99
gramps2/src/EditPerson.py
View File

@@ -236,7 +236,7 @@ class EditPerson(DisplayState.ManagedWindow):
self.addr_postal = self.top.get_widget("postal") self.addr_postal = self.top.get_widget("postal")
self.addr_phone = self.top.get_widget("phone") self.addr_phone = self.top.get_widget("phone")
self.event_list = self.top.get_widget("eventList") self.event_list = self.top.get_widget("eventList")
self.edit_person = self.top.get_widget("editPerson") self.edit_person = self.top.get_widget("edit_person")
self.name_list = self.top.get_widget("nameList") self.name_list = self.top.get_widget("nameList")
self.alt_given_field = self.top.get_widget("alt_given") self.alt_given_field = self.top.get_widget("alt_given")
self.alt_last_field = self.top.get_widget("alt_last") self.alt_last_field = self.top.get_widget("alt_last")
@@ -250,7 +250,7 @@ class EditPerson(DisplayState.ManagedWindow):
self.suffix.set_editable(mod) self.suffix.set_editable(mod)
self.prefix = self.top.get_widget("prefix") self.prefix = self.top.get_widget("prefix")
self.prefix.set_editable(mod) self.prefix.set_editable(mod)
self.given = self.top.get_widget("givenName") self.given = self.top.get_widget("given_name")
self.given.set_editable(mod) self.given.set_editable(mod)
# self.nick = self.top.get_widget("nickname") # self.nick = self.top.get_widget("nickname")
# self.nick.set_editable(mod) # self.nick.set_editable(mod)
@@ -269,15 +269,15 @@ class EditPerson(DisplayState.ManagedWindow):
self.slist = self.top.get_widget("slist") self.slist = self.top.get_widget("slist")
self.general_label = self.top.get_widget("general_label") self.general_label = self.top.get_widget("general_label")
self.names_label = self.top.get_widget("names_text") self.names_label = self.top.get_widget("names_label")
self.events_label = self.top.get_widget("events_text") self.events_label = self.top.get_widget("events_label")
self.attr_label = self.top.get_widget("attr_text") self.attr_label = self.top.get_widget("attr_label")
self.addr_label = self.top.get_widget("addr_text") self.addr_label = self.top.get_widget("addr_label")
self.notes_label = self.top.get_widget("notes_text") self.notes_label = self.top.get_widget("notes_label")
self.sources_label = self.top.get_widget("sources_text") self.sources_label = self.top.get_widget("sources_label")
self.inet_label = self.top.get_widget("inet_text") self.inet_label = self.top.get_widget("inet_label")
self.gallery_label = self.top.get_widget("gallery_text") self.gallery_label = self.top.get_widget("gallery_label")
self.lds_tab = self.top.get_widget("lds_text") self.lds_tab = self.top.get_widget("lds_tab")
self.person_photo = self.top.get_widget("personPix") self.person_photo = self.top.get_widget("personPix")
self.eventbox = self.top.get_widget("eventbox1") self.eventbox = self.top.get_widget("eventbox1")
self.prefix_label = self.top.get_widget('prefix_label') self.prefix_label = self.top.get_widget('prefix_label')
@@ -392,45 +392,46 @@ class EditPerson(DisplayState.ManagedWindow):
self.ad_drag_begin, self.ad_drag_data_received) self.ad_drag_begin, self.ad_drag_data_received)
self.gladeif.connect("editPerson", "delete_event", self.on_delete_event) self.gladeif.connect("edit_person", "delete_event", self.on_delete_event)
self.gladeif.connect("button15", "clicked", self.on_cancel_edit) self.gladeif.connect("button15", "clicked", self.on_cancel_edit)
self.gladeif.connect("ok", "clicked", self.on_apply_person_clicked) self.gladeif.connect("ok", "clicked", self.on_apply_person_clicked)
self.gladeif.connect("button134", "clicked", self.on_help_clicked) self.gladeif.connect("button134", "clicked", self.on_help_clicked)
self.gladeif.connect("notebook", "switch_page", self.on_switch_page) self.gladeif.connect("notebook", "switch_page", self.on_switch_page)
self.gladeif.connect("genderMale", "toggled", self.on_gender_activate) # self.gladeif.connect("genderMale", "toggled", self.on_gender_activate)
self.gladeif.connect("genderFemale", "toggled", self.on_gender_activate) # self.gladeif.connect("genderFemale", "toggled", self.on_gender_activate)
self.gladeif.connect("genderUnknown", "toggled", self.on_gender_activate) # self.gladeif.connect("genderUnknown", "toggled", self.on_gender_activate)
self.gladeif.connect("givenName", "focus_out_event", self.on_given_focus_out_event) self.gladeif.connect("given_name", "focus_out_event", self.on_given_focus_out_event)
self.gladeif.connect("button177", "clicked", self.on_edit_name_clicked) self.gladeif.connect("button177", "clicked", self.on_edit_name_clicked)
self.gladeif.connect("button99", "clicked", self.on_edit_birth_clicked) # self.gladeif.connect("button99", "clicked", self.on_edit_birth_clicked)
self.gladeif.connect("button126", "clicked", self.on_edit_death_clicked) # self.gladeif.connect("button126", "clicked", self.on_edit_death_clicked)
self.gladeif.connect("add_aka", "clicked", self.on_add_aka_clicked) # self.gladeif.connect("aka_add", "clicked", self.on_add_aka_clicked)
self.gladeif.connect("aka_edit", "clicked", self.on_aka_update_clicked) # self.gladeif.connect("aka_edit", "clicked", self.on_aka_update_clicked)
self.gladeif.connect("aka_delete", "clicked", self.on_aka_delete_clicked) # self.gladeif.connect("aka_delete", "clicked", self.on_aka_delete_clicked)
self.gladeif.connect("event_add", "clicked" , self.on_event_add_clicked) # self.gladeif.connect("event_add", "clicked" , self.on_event_add_clicked)
self.gladeif.connect("event_edit_btn", "clicked" ,self.on_event_update_clicked) # self.gladeif.connect("event_edit_btn", "clicked" ,self.on_event_update_clicked)
self.gladeif.connect("event_del", "clicked", self.on_event_delete_clicked) # self.gladeif.connect("event_del", "clicked", self.on_event_delete_clicked)
self.gladeif.connect("attr_add", "clicked" , self.on_add_attr_clicked) # self.gladeif.connect("attr_add", "clicked" , self.on_add_attr_clicked)
self.gladeif.connect("attr_edit_btn", "clicked", self.on_update_attr_clicked) # self.gladeif.connect("attr_edit_btn", "clicked", self.on_update_attr_clicked)
self.gladeif.connect("attr_del", "clicked", self.on_delete_attr_clicked) # self.gladeif.connect("attr_del", "clicked", self.on_delete_attr_clicked)
self.gladeif.connect("addr_add", "clicked", self.on_add_addr_clicked) # self.gladeif.connect("addr_add", "clicked", self.on_add_addr_clicked)
self.gladeif.connect("addr_edit_btn", "clicked", self.on_update_addr_clicked) # self.gladeif.connect("addr_edit_btn", "clicked", self.on_update_addr_clicked)
self.gladeif.connect("addr_del", "clicked", self.on_delete_addr_clicked) # self.gladeif.connect("addr_del", "clicked", self.on_delete_addr_clicked)
self.gladeif.connect("media_add", "clicked", self.gallery.on_add_media_clicked) # self.gladeif.connect("media_add", "clicked", self.gallery.on_add_media_clicked)
self.gladeif.connect("media_sel", "clicked", self.gallery.on_select_media_clicked) # self.gladeif.connect("media_sel", "clicked", self.gallery.on_select_media_clicked)
self.gladeif.connect("image_edit_btn", "clicked", self.gallery.on_edit_media_clicked) # self.gladeif.connect("image_edit_btn", "clicked", self.gallery.on_edit_media_clicked)
self.gladeif.connect("media_del", "clicked", self.gallery.on_delete_media_clicked) # self.gladeif.connect("media_del", "clicked", self.gallery.on_delete_media_clicked)
self.gladeif.connect("add_url", "clicked", self.on_add_url_clicked) # self.gladeif.connect("add_url", "clicked", self.on_add_url_clicked)
self.gladeif.connect("edit_url", "clicked", self.on_update_url_clicked,) # self.gladeif.connect("edit_url", "clicked", self.on_update_url_clicked,)
self.gladeif.connect("web_go", "clicked", self.on_web_go_clicked) # self.gladeif.connect("web_go", "clicked", self.on_web_go_clicked)
self.gladeif.connect("delete_url", "clicked", self.on_delete_url_clicked) # self.gladeif.connect("delete_url", "clicked", self.on_delete_url_clicked)
self.gladeif.connect("button131", "clicked", self.on_ldsbap_source_clicked,) # self.gladeif.connect("button131", "clicked", self.on_ldsbap_source_clicked,)
self.gladeif.connect("button128", "clicked", self.on_ldsbap_note_clicked) # self.gladeif.connect("button128", "clicked", self.on_ldsbap_note_clicked)
self.gladeif.connect("button132", "clicked", self.on_ldsendow_source_clicked) # self.gladeif.connect("button132", "clicked", self.on_ldsendow_source_clicked)
self.gladeif.connect("button129", "clicked", self.on_ldsendow_note_clicked) # self.gladeif.connect("button129", "clicked", self.on_ldsendow_note_clicked)
self.gladeif.connect("button133", "clicked", self.on_ldsseal_source_clicked) # self.gladeif.connect("button133", "clicked", self.on_ldsseal_source_clicked)
self.gladeif.connect("button130", "clicked", self.on_ldsseal_note_clicked) # self.gladeif.connect("button130", "clicked", self.on_ldsseal_note_clicked)
self.sourcetab = Sources.SourceTab( self.sourcetab = Sources.SourceTab(
self.srcreflist, self, self.top, self.window, self.slist, self.srcreflist, self, self.top, self.window, self.slist,
self.top.get_widget('add_src'), self.top.get_widget('edit_src'), self.top.get_widget('add_src'), self.top.get_widget('edit_src'),
@@ -452,8 +453,9 @@ class EditPerson(DisplayState.ManagedWindow):
"event_add", "attr_add", "attr_del", "addr_add", "event_add", "attr_add", "attr_del", "addr_add",
"addr_del", "media_add", "media_sel", "media_del", "addr_del", "media_add", "media_sel", "media_del",
"add_url", "delete_url", "add_src", "del_src" ]: "add_url", "delete_url", "add_src", "del_src" ]:
self.top.get_widget(i).set_sensitive(not self.db.readonly) widget = self.top.get_widget(i)
if widget:
widget.set_sensitive(not self.db.readonly)
self.window.show() self.window.show()
def set_list_dnd(self,obj, get, begin, receive): def set_list_dnd(self,obj, get, begin, receive):
@@ -1455,9 +1457,6 @@ class EditPerson(DisplayState.ManagedWindow):
def write_primary_name(self): def write_primary_name(self):
# initial values # initial values
name = '<span size="larger" weight="bold">%s</span>' % escape(self.nd.display(self.person))
self.top.get_widget("activepersonTitle").set_text( name)
self.top.get_widget("activepersonTitle").set_use_markup(True)
self.suffix.set_text(self.pname.get_suffix()) self.suffix.set_text(self.pname.get_suffix())
if self.use_patronymic: if self.use_patronymic:
self.prefix.set_text(self.pname.get_patronymic()) self.prefix.set_text(self.pname.get_patronymic())

6
gramps2/src/GrampsDbBase.py
View File

@@ -384,11 +384,13 @@ class GrampsDbBase(GrampsDBCallback.GrampsDBCallback):
transaction, change_time) transaction, change_time)
def commit_personal_event(self,event,transaction,change_time=None): def commit_personal_event(self,event,transaction,change_time=None):
self.individual_event_names.add(event.name) if event.type[0] == Event.CUSTOM:
self.individual_event_names.add(event.type[1])
self.commit_event(event,transaction,change_time) self.commit_event(event,transaction,change_time)
def commit_family_event(self,event,transaction,change_time=None): def commit_family_event(self,event,transaction,change_time=None):
self.family_event_names.add(event.name) if event.type[0] == Event.CUSTOM:
self.family_event_names.add(event.type[1])
self.commit_event(event,transaction,change_time) self.commit_event(event,transaction,change_time)
def commit_event(self,event,transaction,change_time=None): def commit_event(self,event,transaction,change_time=None):

3
gramps2/src/edit_person.glade
View File

@@ -138,7 +138,6 @@
<property name="yalign">0.5</property> <property name="yalign">0.5</property>
<property name="xpad">0</property> <property name="xpad">0</property>
<property name="ypad">0</property> <property name="ypad">0</property>
<property name="mnemonic_widget">givenName</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
<property name="width_chars">-1</property> <property name="width_chars">-1</property>
<property name="single_line_mode">False</property> <property name="single_line_mode">False</property>
@@ -508,7 +507,7 @@ Unknown</property>
<property name="spacing">6</property> <property name="spacing">6</property>
<child> <child>
<widget class="GtkEntry" id="givenName"> <widget class="GtkEntry" id="given_name">
<property name="visible">True</property> <property name="visible">True</property>
<property name="tooltip" translatable="yes">The person's given name</property> <property name="tooltip" translatable="yes">The person's given name</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>