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

handle child type callback

Browse Source 
svn: r6346
This commit is contained in:
Don Allingham 2006-04-15 06:24:35 +00:00
parent 282480d097
commit 1891d33470
3 changed files with 34 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gramps2/ChangeLog
View File

@ -1,3 +1,7 @@
2006-04-15 Don Allingham <don@gramps-project.org>
* src/DisplayTabs.py: handle child type callback
* src/Editors/_EditFamily.py: handle child type callback
2006-04-14 Alex Roitman <shura@gramps-project.org> 2006-04-14 Alex Roitman <shura@gramps-project.org>
* src/DisplayTabs.py (edit_button_clicked): Proceed only if * src/DisplayTabs.py (edit_button_clicked): Proceed only if
selection exists. selection exists.

37
gramps2/src/DisplayTabs.py
View File

@ -1869,32 +1869,27 @@ class ChildModel(gtk.ListStore):
index = 1 index = 1
for child_ref in self.get_data(): for child_ref in self.get_data():
child = db.get_person_from_handle(child_ref.ref) child = db.get_person_from_handle(child_ref.ref)
self.append(row=[index, self.append(row=[
child.get_gramps_id(), index,
NameDisplay.displayer.display(child), child.get_gramps_id(),
Utils.gender[child.get_gender()], NameDisplay.displayer.display(child),
self.column_father_rel(child_ref), Utils.gender[child.get_gender()],
self.column_mother_rel(child_ref), str(child_ref.get_father_relation()),
self.column_birth_day(child), str(child_ref.get_mother_relation()),
self.column_death_day(child), self.column_birth_day(child),
self.column_birth_place(child), self.column_death_day(child),
self.column_death_place(child), self.column_birth_place(child),
child.get_handle(), self.column_death_place(child),
NameDisplay.displayer.sort_string(child.primary_name), child.get_handle(),
self.column_birth_sort(child), NameDisplay.displayer.sort_string(child.primary_name),
self.column_death_sort(child), self.column_birth_sort(child),
]) self.column_death_sort(child),
])
index += 1 index += 1
def get_data(self): def get_data(self):
return self.family.get_child_ref_list() return self.family.get_child_ref_list()
def column_father_rel(self, data):
return str(data.get_father_relation())
def column_mother_rel(self, data):
return str(data.get_mother_relation())
def column_birth_day(self, data): def column_birth_day(self, data):
event_ref = data.get_birth_ref() event_ref = data.get_birth_ref()
if event_ref and event_ref.ref: if event_ref and event_ref.ref:

29
gramps2/src/Editors/_EditFamily.py
View File

@ -185,15 +185,18 @@ class ChildEmbedList(EmbeddedList):
return len(self.family.get_child_ref_list()) == 0 return len(self.family.get_child_ref_list()) == 0
def mrel_edited(self, renderer, index, value): def mrel_edited(self, renderer, index, value):
ref = self.family.get_child_ref_list()[int(index)] row = int(index)
new_type = RelLib.ChildRefType(value) ref = self.family.get_child_ref_list()[row]
print "Before", str(new_type) ref.set_mother_relation(RelLib.ChildRefType(value))
ref.set_mother_relation(new_type) node = self.model.get_iter((row,))
print "After", str(ref.get_mother_relation()) self.model.set_value(node, 5, value)
def frel_edited(self, renderer, index, value): def frel_edited(self, renderer, index, value):
ref = self.family.get_child_ref_list()[int(index)] row = int(index)
ref = self.family.get_child_ref_list()[row]
ref.set_father_relation(RelLib.ChildRefType(value)) ref.set_father_relation(RelLib.ChildRefType(value))
node = self.model.get_iter((row,))
self.model.set_value(node, 4, value)
def get_data(self): def get_data(self):
""" """
@ -856,19 +859,15 @@ class EditFamily(EditPrimary):
new_set = set(self.obj.get_child_ref_list()) new_set = set(self.obj.get_child_ref_list())
# remove the family from children which have been removed # remove the family from children which have been removed
for handle in orig_set.difference(new_set): for ref in orig_set.difference(new_set):
person = self.db.get_person_from_handle(handle) person = self.db.get_person_from_handle(ref.ref)
person.remove_parent_family_handle(self.obj.handle) person.remove_parent_family_handle(self.obj.handle)
self.db.commit_person(person,trans) self.db.commit_person(person,trans)
# add the family from children which have been addedna # add the family from children which have been addedna
for handle in new_set.difference(orig_set): for ref in new_set.difference(orig_set):
person = self.db.get_person_from_handle(handle) person = self.db.get_person_from_handle(ref.ref)
person.add_parent_family_handle( person.add_parent_family_handle(self.obj.handle)
self.obj.handle,
RelLib.ChildRefType(),
RelLib.ChildRefType(),
)
self.db.commit_person(person,trans) self.db.commit_person(person,trans)
if self.object_is_empty(): if self.object_is_empty():