diff --git a/gramps/src/RelLib.py b/gramps/src/RelLib.py index 051569c68..0f427247a 100644 --- a/gramps/src/RelLib.py +++ b/gramps/src/RelLib.py @@ -1101,7 +1101,6 @@ class Person: """sets the main Family of the Person, the Family in which the Person is a natural born child""" print family,self.AltFamilyList - assert(family in self.AltFamilyList) f = self.removeAltFamily(family) if f: self.AltFamilyList = [f] + self.AltFamilyList diff --git a/gramps/src/gramps.glade b/gramps/src/gramps.glade index 0e60d4a37..014f0c213 100644 --- a/gramps/src/gramps.glade +++ b/gramps/src/gramps.glade @@ -4960,21 +4960,12 @@ 0 - GtkCList - fatherList - 3 - 400 - 100 - True - - select_row - on_fatherList_select_row - - 2 - 198,80 - GTK_SELECTION_SINGLE - True - GTK_SHADOW_IN + GtkScrolledWindow + scrolledwindow33 + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_UPDATE_CONTINUOUS + GTK_UPDATE_CONTINUOUS 0 True @@ -4982,29 +4973,47 @@ - GtkLabel - CList:title - label81 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - + GtkCList + fatherList + 3 + 400 + 100 + True + + select_row + on_fatherList_select_row + + 2 + 198,80 + GTK_SELECTION_SINGLE + True + GTK_SHADOW_IN - - GtkLabel - CList:title - label82 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 + + GtkLabel + CList:title + label81 + + GTK_JUSTIFY_CENTER + False + 0.5 + 0.5 + 0 + 0 + + + + GtkLabel + CList:title + label82 + + GTK_JUSTIFY_CENTER + False + 0.5 + 0.5 + 0 + 0 + @@ -5098,20 +5107,12 @@ Unknown 0 - GtkCList - motherList - 3 - 100 - True - - select_row - on_motherList_select_row - - 2 - 198,80 - GTK_SELECTION_SINGLE - True - GTK_SHADOW_IN + GtkScrolledWindow + scrolledwindow34 + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_UPDATE_CONTINUOUS + GTK_UPDATE_CONTINUOUS 0 True @@ -5119,29 +5120,46 @@ Unknown - GtkLabel - CList:title - label84 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - + GtkCList + motherList + 3 + 100 + True + + select_row + on_motherList_select_row + + 2 + 198,80 + GTK_SELECTION_SINGLE + True + GTK_SHADOW_IN - - GtkLabel - CList:title - label85 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 + + GtkLabel + CList:title + label84 + + GTK_JUSTIFY_CENTER + False + 0.5 + 0.5 + 0 + 0 + + + + GtkLabel + CList:title + label85 + + GTK_JUSTIFY_CENTER + False + 0.5 + 0.5 + 0 + 0 + diff --git a/gramps/src/gramps_main.py b/gramps/src/gramps_main.py index 20087156a..42cc7061b 100755 --- a/gramps/src/gramps_main.py +++ b/gramps/src/gramps_main.py @@ -1381,6 +1381,7 @@ class Gramps: mymap = {} mynmap = {} list = [] + sel = 0 for f in self.active_person.getFamilyList(): if self.active_person == f.getFather(): if f.getMother() == None: