From 545f4fd47862ab1136f585be8bb7435973c2f83f Mon Sep 17 00:00:00 2001 From: Don Allingham Date: Tue, 6 Dec 2005 04:41:32 +0000 Subject: [PATCH] update svn: r5481 --- gramps2/src/FamilyView.py | 47 +++++++++++++++++++-------------------- 1 file changed, 23 insertions(+), 24 deletions(-) diff --git a/gramps2/src/FamilyView.py b/gramps2/src/FamilyView.py index fc7bb5121..a5999a340 100644 --- a/gramps2/src/FamilyView.py +++ b/gramps2/src/FamilyView.py @@ -68,10 +68,11 @@ class FamilyView(PageView.PageView): self.mother_box = gtk.ComboBox() self.spouse_box = gtk.ComboBox() self.person_name = gtk.Entry() - self.person_birth = gtk.Label() - self.person_death = gtk.Label() - self.marriage_type = gtk.Label() - self.marriage_info = gtk.Label() + self.person_birth = gtk.Entry() + self.person_death = gtk.Entry() + self.marriage_type = gtk.Entry() + self.marriage_info = gtk.Entry() + self.family_id = gtk.Entry() scrollwindow = gtk.ScrolledWindow() scrollwindow.set_policy(gtk.POLICY_AUTOMATIC,gtk.POLICY_AUTOMATIC) scrollwindow.set_shadow_type(gtk.SHADOW_IN) @@ -91,36 +92,34 @@ class FamilyView(PageView.PageView): table.set_row_spacings(6) table.set_border_width(6) - table.attach(Glabel(_('_Father')),0,3, 0,1, fill, 0,0,0) - table.attach(self.father_box, 1,3, 1,2, fill, 0,0,0) - table.attach(parents_down, 3,4, 1,2, 0,0,0,0) + table.attach(Glabel(_('_Parents')),0,6, 0,1, fill, 0,0,0) + table.attach(self.father_box, 1,9, 1,2, fill, 0,0,0) + table.attach(parents_down, 9,10, 1,2, 0,0,0,0) - table.attach(Glabel(_('_Mother')),5,9, 0,1, fill, 0,0,0) - table.attach(self.mother_box, 6,9, 1,2, fill, 0,0,0) - - table.attach(Glabel(_('_Active person')), 0,3, 3,4, fill,0,0,0) - table.attach(self.person_name, 1,3, 4,5, fill,0,0,0) + table.attach(Glabel(_('_Active person')), 0,5, 3,4, fill,0,0,0) + table.attach(self.person_name, 1,5, 4,5, fill,0,0,0) table.attach(Slabel(_('b.')), 1,2, 5,6, 0,0,0,0) table.attach(Slabel(_('d.')), 1,2, 6,7, 0,0,0,0) - table.attach(self.person_birth, 2,3, 5,6, fill,0,0,0) - table.attach(self.person_death, 2,3, 6,7, fill,0,0,0) + table.attach(self.person_birth, 2,5, 5,6, fill,0,0,0) + table.attach(self.person_death, 2,5, 6,7, fill,0,0,0) - table.attach(switch, 3,4, 4,5, 0,0,0,0) - table.attach(edit_active, 3,4, 5,6, 0,0,0,0) + table.attach(switch, 5,6, 4,5, 0,0,0,0) + table.attach(edit_active, 5,6, 5,6, 0,0,0,0) table.attach(new_spouse, 9,10, 4,5, 0,0,0,0) table.attach(spouse_select, 9,10, 5,6, 0,0,0,0) table.attach(rel_edit, 9,10, 6,7, 0,0,0,0) - table.attach(Glabel(_('_Spouse/partner')), 5,9, 3,4, fill,0,0,0) - table.attach(self.spouse_box, 6,9, 4,5, fill, 0,0,0) - table.attach(Slabel(_('Type:')), 6,7, 5,6, gtk.FILL, 0,0,0) - table.attach(self.marriage_type, 7,8, 5,6, fill, 0,0,0) - table.attach(Slabel(_('Marriage:')), 6,7, 6,7, gtk.FILL, 0,0,0) - table.attach(self.marriage_info, 7,8, 6,7, fill, 0,0,0) - table.attach(Slabel(_('ID:')), 6,7, 7,8, gtk.FILL, 0,0,0) + table.attach(Glabel(_('_Spouse/partner')), 6,9, 3,4, fill,0,0,0) + table.attach(self.spouse_box, 7,9, 4,5, fill, 0,0,0) + table.attach(Slabel(_('Type:')), 7,8, 5,6, gtk.FILL, 0,0,0) + table.attach(self.marriage_type, 8,9, 5,6, fill, 0,0,0) + table.attach(Slabel(_('Marriage:')), 7,8, 6,7, gtk.FILL,0,0,0) + table.attach(self.marriage_info, 8,9, 6,7, fill, 0,0,0) +# table.attach(Slabel(_('ID:')), 7,8, 7,8, gtk.FILL, 0,0,0) +# table.attach(self.family_id, 8,9, 7,8, fill, 0,0,0) table.attach(Glabel(_('_Children')), 0,8, 8,9, fill, 0,0,0) - table.attach(scrollwindow, 1,9, 9,10, fill, fill, 0,0) + table.attach(scrollwindow, 1,9, 9,10, fill, gtk.FILL, 0,0) bbox = gtk.VBox() bbox.set_spacing(6)