Bug fixes for family view
svn: r863
This commit is contained in:
parent
579aa3e6e1
commit
6fc6496df2
@ -1101,7 +1101,6 @@ class Person:
|
|||||||
"""sets the main Family of the Person, the Family in which the
|
"""sets the main Family of the Person, the Family in which the
|
||||||
Person is a natural born child"""
|
Person is a natural born child"""
|
||||||
print family,self.AltFamilyList
|
print family,self.AltFamilyList
|
||||||
assert(family in self.AltFamilyList)
|
|
||||||
f = self.removeAltFamily(family)
|
f = self.removeAltFamily(family)
|
||||||
if f:
|
if f:
|
||||||
self.AltFamilyList = [f] + self.AltFamilyList
|
self.AltFamilyList = [f] + self.AltFamilyList
|
||||||
|
@ -4960,21 +4960,12 @@
|
|||||||
<spacing>0</spacing>
|
<spacing>0</spacing>
|
||||||
|
|
||||||
<widget>
|
<widget>
|
||||||
<class>GtkCList</class>
|
<class>GtkScrolledWindow</class>
|
||||||
<name>fatherList</name>
|
<name>scrolledwindow33</name>
|
||||||
<border_width>3</border_width>
|
<hscrollbar_policy>GTK_POLICY_AUTOMATIC</hscrollbar_policy>
|
||||||
<width>400</width>
|
<vscrollbar_policy>GTK_POLICY_AUTOMATIC</vscrollbar_policy>
|
||||||
<height>100</height>
|
<hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy>
|
||||||
<can_focus>True</can_focus>
|
<vupdate_policy>GTK_UPDATE_CONTINUOUS</vupdate_policy>
|
||||||
<signal>
|
|
||||||
<name>select_row</name>
|
|
||||||
<handler>on_fatherList_select_row</handler>
|
|
||||||
</signal>
|
|
||||||
<columns>2</columns>
|
|
||||||
<column_widths>198,80</column_widths>
|
|
||||||
<selection_mode>GTK_SELECTION_SINGLE</selection_mode>
|
|
||||||
<show_titles>True</show_titles>
|
|
||||||
<shadow_type>GTK_SHADOW_IN</shadow_type>
|
|
||||||
<child>
|
<child>
|
||||||
<padding>0</padding>
|
<padding>0</padding>
|
||||||
<expand>True</expand>
|
<expand>True</expand>
|
||||||
@ -4982,29 +4973,47 @@
|
|||||||
</child>
|
</child>
|
||||||
|
|
||||||
<widget>
|
<widget>
|
||||||
<class>GtkLabel</class>
|
<class>GtkCList</class>
|
||||||
<child_name>CList:title</child_name>
|
<name>fatherList</name>
|
||||||
<name>label81</name>
|
<border_width>3</border_width>
|
||||||
<label>Name</label>
|
<width>400</width>
|
||||||
<justify>GTK_JUSTIFY_CENTER</justify>
|
<height>100</height>
|
||||||
<wrap>False</wrap>
|
<can_focus>True</can_focus>
|
||||||
<xalign>0.5</xalign>
|
<signal>
|
||||||
<yalign>0.5</yalign>
|
<name>select_row</name>
|
||||||
<xpad>0</xpad>
|
<handler>on_fatherList_select_row</handler>
|
||||||
<ypad>0</ypad>
|
</signal>
|
||||||
</widget>
|
<columns>2</columns>
|
||||||
|
<column_widths>198,80</column_widths>
|
||||||
|
<selection_mode>GTK_SELECTION_SINGLE</selection_mode>
|
||||||
|
<show_titles>True</show_titles>
|
||||||
|
<shadow_type>GTK_SHADOW_IN</shadow_type>
|
||||||
|
|
||||||
<widget>
|
<widget>
|
||||||
<class>GtkLabel</class>
|
<class>GtkLabel</class>
|
||||||
<child_name>CList:title</child_name>
|
<child_name>CList:title</child_name>
|
||||||
<name>label82</name>
|
<name>label81</name>
|
||||||
<label>Birth Date</label>
|
<label>Name</label>
|
||||||
<justify>GTK_JUSTIFY_CENTER</justify>
|
<justify>GTK_JUSTIFY_CENTER</justify>
|
||||||
<wrap>False</wrap>
|
<wrap>False</wrap>
|
||||||
<xalign>0.5</xalign>
|
<xalign>0.5</xalign>
|
||||||
<yalign>0.5</yalign>
|
<yalign>0.5</yalign>
|
||||||
<xpad>0</xpad>
|
<xpad>0</xpad>
|
||||||
<ypad>0</ypad>
|
<ypad>0</ypad>
|
||||||
|
</widget>
|
||||||
|
|
||||||
|
<widget>
|
||||||
|
<class>GtkLabel</class>
|
||||||
|
<child_name>CList:title</child_name>
|
||||||
|
<name>label82</name>
|
||||||
|
<label>Birth Date</label>
|
||||||
|
<justify>GTK_JUSTIFY_CENTER</justify>
|
||||||
|
<wrap>False</wrap>
|
||||||
|
<xalign>0.5</xalign>
|
||||||
|
<yalign>0.5</yalign>
|
||||||
|
<xpad>0</xpad>
|
||||||
|
<ypad>0</ypad>
|
||||||
|
</widget>
|
||||||
</widget>
|
</widget>
|
||||||
</widget>
|
</widget>
|
||||||
|
|
||||||
@ -5098,20 +5107,12 @@ Unknown
|
|||||||
<spacing>0</spacing>
|
<spacing>0</spacing>
|
||||||
|
|
||||||
<widget>
|
<widget>
|
||||||
<class>GtkCList</class>
|
<class>GtkScrolledWindow</class>
|
||||||
<name>motherList</name>
|
<name>scrolledwindow34</name>
|
||||||
<border_width>3</border_width>
|
<hscrollbar_policy>GTK_POLICY_AUTOMATIC</hscrollbar_policy>
|
||||||
<height>100</height>
|
<vscrollbar_policy>GTK_POLICY_AUTOMATIC</vscrollbar_policy>
|
||||||
<can_focus>True</can_focus>
|
<hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy>
|
||||||
<signal>
|
<vupdate_policy>GTK_UPDATE_CONTINUOUS</vupdate_policy>
|
||||||
<name>select_row</name>
|
|
||||||
<handler>on_motherList_select_row</handler>
|
|
||||||
</signal>
|
|
||||||
<columns>2</columns>
|
|
||||||
<column_widths>198,80</column_widths>
|
|
||||||
<selection_mode>GTK_SELECTION_SINGLE</selection_mode>
|
|
||||||
<show_titles>True</show_titles>
|
|
||||||
<shadow_type>GTK_SHADOW_IN</shadow_type>
|
|
||||||
<child>
|
<child>
|
||||||
<padding>0</padding>
|
<padding>0</padding>
|
||||||
<expand>True</expand>
|
<expand>True</expand>
|
||||||
@ -5119,29 +5120,46 @@ Unknown
|
|||||||
</child>
|
</child>
|
||||||
|
|
||||||
<widget>
|
<widget>
|
||||||
<class>GtkLabel</class>
|
<class>GtkCList</class>
|
||||||
<child_name>CList:title</child_name>
|
<name>motherList</name>
|
||||||
<name>label84</name>
|
<border_width>3</border_width>
|
||||||
<label>Name</label>
|
<height>100</height>
|
||||||
<justify>GTK_JUSTIFY_CENTER</justify>
|
<can_focus>True</can_focus>
|
||||||
<wrap>False</wrap>
|
<signal>
|
||||||
<xalign>0.5</xalign>
|
<name>select_row</name>
|
||||||
<yalign>0.5</yalign>
|
<handler>on_motherList_select_row</handler>
|
||||||
<xpad>0</xpad>
|
</signal>
|
||||||
<ypad>0</ypad>
|
<columns>2</columns>
|
||||||
</widget>
|
<column_widths>198,80</column_widths>
|
||||||
|
<selection_mode>GTK_SELECTION_SINGLE</selection_mode>
|
||||||
|
<show_titles>True</show_titles>
|
||||||
|
<shadow_type>GTK_SHADOW_IN</shadow_type>
|
||||||
|
|
||||||
<widget>
|
<widget>
|
||||||
<class>GtkLabel</class>
|
<class>GtkLabel</class>
|
||||||
<child_name>CList:title</child_name>
|
<child_name>CList:title</child_name>
|
||||||
<name>label85</name>
|
<name>label84</name>
|
||||||
<label>Birth Date</label>
|
<label>Name</label>
|
||||||
<justify>GTK_JUSTIFY_CENTER</justify>
|
<justify>GTK_JUSTIFY_CENTER</justify>
|
||||||
<wrap>False</wrap>
|
<wrap>False</wrap>
|
||||||
<xalign>0.5</xalign>
|
<xalign>0.5</xalign>
|
||||||
<yalign>0.5</yalign>
|
<yalign>0.5</yalign>
|
||||||
<xpad>0</xpad>
|
<xpad>0</xpad>
|
||||||
<ypad>0</ypad>
|
<ypad>0</ypad>
|
||||||
|
</widget>
|
||||||
|
|
||||||
|
<widget>
|
||||||
|
<class>GtkLabel</class>
|
||||||
|
<child_name>CList:title</child_name>
|
||||||
|
<name>label85</name>
|
||||||
|
<label>Birth Date</label>
|
||||||
|
<justify>GTK_JUSTIFY_CENTER</justify>
|
||||||
|
<wrap>False</wrap>
|
||||||
|
<xalign>0.5</xalign>
|
||||||
|
<yalign>0.5</yalign>
|
||||||
|
<xpad>0</xpad>
|
||||||
|
<ypad>0</ypad>
|
||||||
|
</widget>
|
||||||
</widget>
|
</widget>
|
||||||
</widget>
|
</widget>
|
||||||
|
|
||||||
|
@ -1381,6 +1381,7 @@ class Gramps:
|
|||||||
mymap = {}
|
mymap = {}
|
||||||
mynmap = {}
|
mynmap = {}
|
||||||
list = []
|
list = []
|
||||||
|
sel = 0
|
||||||
for f in self.active_person.getFamilyList():
|
for f in self.active_person.getFamilyList():
|
||||||
if self.active_person == f.getFather():
|
if self.active_person == f.getFather():
|
||||||
if f.getMother() == None:
|
if f.getMother() == None:
|
||||||
|
Loading…
Reference in New Issue
Block a user