diff --git a/src/gui/glade/mergeperson.glade b/src/gui/glade/mergeperson.glade index 2f717f271..cbe3f50cf 100644 --- a/src/gui/glade/mergeperson.glade +++ b/src/gui/glade/mergeperson.glade @@ -81,8 +81,11 @@ False + 200 True False + center + True True @@ -94,14 +97,16 @@ + 200 True False + True Select the person that will provide the primary data for the merged person. False - True + False 1 @@ -109,19 +114,23 @@ primary data for the merged person. True False + True False True True False + True False 0.5 True + 200 True False + True True @@ -138,14 +147,17 @@ primary data for the merged person. True True False + True False 0.5 True handle_btn1 + 200 True False + True True @@ -159,7 +171,7 @@ primary data for the merged person. False - True + False 5 2 @@ -189,8 +201,8 @@ primary data for the merged person. True - GTK_FILL - + + @@ -203,8 +215,8 @@ primary data for the merged person. 2 3 - GTK_FILL - + + @@ -223,7 +235,7 @@ primary data for the merged person. 1 2 GTK_FILL - + @@ -245,7 +257,7 @@ primary data for the merged person. 1 2 GTK_FILL - + @@ -264,7 +276,7 @@ primary data for the merged person. 2 3 GTK_FILL - + @@ -286,7 +298,7 @@ primary data for the merged person. 2 3 GTK_FILL - + @@ -305,7 +317,7 @@ primary data for the merged person. 3 4 GTK_FILL - + @@ -327,7 +339,7 @@ primary data for the merged person. 3 4 GTK_FILL - + @@ -341,7 +353,7 @@ primary data for the merged person. 2 1 2 - + @@ -355,7 +367,7 @@ primary data for the merged person. 4 1 2 - + @@ -369,7 +381,7 @@ primary data for the merged person. 2 2 3 - + @@ -383,7 +395,7 @@ primary data for the merged person. 4 2 3 - + @@ -397,7 +409,7 @@ primary data for the merged person. 2 3 4 - + @@ -414,7 +426,7 @@ primary data for the merged person. 4 3 4 - + @@ -422,8 +434,8 @@ primary data for the merged person. - True - True + False + False 0 @@ -431,12 +443,13 @@ primary data for the merged person. True False + True Events, media objects, addresses, attributes, urls, notes, sources and tags of both persons will be combined. True - True - True + False + False 6 1 @@ -453,7 +466,7 @@ primary data for the merged person. False - True + False 3 @@ -530,7 +543,7 @@ primary data for the merged person. - False + True True 1 diff --git a/src/gui/merge/mergeperson.py b/src/gui/merge/mergeperson.py index e998b8233..5a04fc078 100644 --- a/src/gui/merge/mergeperson.py +++ b/src/gui/merge/mergeperson.py @@ -174,7 +174,7 @@ class MergePerson(ManagedWindow): indent.set_property('pixels-below-lines', 1) title = tobj.create_tag() title.set_property('weight', Pango.Weight.BOLD) - title.set_property('scale', Pango.SCALE_LARGE) + title.set_property('scale', 1.2) self.add(tobj, title, name_displayer.display(person)) self.add(tobj, normal, "%s:\t%s" % (_('ID'), person.get_gramps_id()))