diff --git a/src/glade/editperson.glade b/src/glade/editperson.glade index aaafd06b6..8ff9fc79a 100644 --- a/src/glade/editperson.glade +++ b/src/glade/editperson.glade @@ -1,4 +1,4 @@ - + @@ -7,7 +7,6 @@ True 500 dialog - False @@ -22,15 +21,15 @@ True - 11 - 8 + 9 + 10 6 - 6 True 0 6 + 3 _Given: True center @@ -50,15 +49,16 @@ True True The person's given names - ● + ● 1 - 4 + 6 1 2 + 3 @@ -70,8 +70,8 @@ call - 4 - 5 + 6 + 7 1 2 GTK_FILL @@ -80,16 +80,18 @@ + 75 True True Part of the Given name that is the normally used name. - ● + ● - 5 - 6 + 7 + 8 1 2 + @@ -97,6 +99,7 @@ True 0 6 + 3 T_itle: True title @@ -110,16 +113,20 @@ + 35 True True A title used to refer to the person, such as 'Dr.' or 'Rev.' - ● + ● 1 2 2 3 + GTK_EXPAND | GTK_SHRINK | GTK_FILL + + 3 @@ -141,16 +148,18 @@ + 35 True True An optional suffix to the name, such as "Jr." or "III" - ● + ● 3 4 2 3 + @@ -162,8 +171,8 @@ nickname - 4 - 5 + 6 + 7 2 3 GTK_FILL @@ -172,21 +181,24 @@ + 75 True True A descriptive name given in place of or in addition to the official given name. - ● + ● - 5 - 6 + 7 + 8 2 3 + - 124 + 114 + 114 True 2.2351741291171123e-10 @@ -194,9 +206,8 @@ True - 120 - 100 True + 0 @@ -210,53 +221,63 @@ - 6 - 8 + 8 + 10 5 + + GTK_FILL True 0 - 6 _Prefix: True prefix - 4 - 5 + 2 + 3 + 3 + 4 GTK_FILL + + 35 True True An optional prefix for the family that is not used in sorting, such as "de" or "van". - ● + ● - 1 - 2 - 4 - 5 + 3 + 4 + 3 + 4 + GTK_EXPAND | GTK_SHRINK | GTK_FILL + + 3 True 0 - 6 _Surname: True surname - 5 - 6 + 4 + 5 + 3 + 4 GTK_FILL + @@ -264,13 +285,13 @@ True True Part of a person's name indicating the family to which the person belongs - ● + ● - 1 - 4 - 5 - 6 + 5 + 6 + 3 + 4 GTK_FILL @@ -279,16 +300,18 @@ True 0 - 6 _Type: True center ntype - 3 - 4 + 4 + 5 + 2 + 3 GTK_FILL + @@ -297,10 +320,11 @@ An identification of what type of Name this is, eg. Birth Name, Married Name. - 1 - 2 - 3 - 4 + 5 + 6 + 2 + 3 + @@ -313,25 +337,28 @@ gender - 9 - 10 + 7 + 8 GTK_FILL + 35 True True A unique ID for the person. - ● + ● 6 3 4 - 9 - 10 + 7 + 8 + + 3 @@ -345,13 +372,15 @@ 2 3 - 9 - 10 + 7 + 8 GTK_SHRINK | GTK_FILL + + 35 True @@ -363,10 +392,10 @@ 1 2 - 9 - 10 - GTK_FILL - GTK_FILL + 7 + 8 + GTK_SHRINK | GTK_FILL + @@ -381,11 +410,13 @@ - 8 - 7 - 8 + 10 + 5 + 6 GTK_FILL + GTK_SHRINK 6 + 3 @@ -397,27 +428,62 @@ cmborigin - 4 - 5 - 5 - 6 + 6 + 7 + 3 + 4 GTK_FILL + 75 True The origin of this family name for this family, eg 'Inherited' or 'Patronymic'. - 5 - 6 - 5 - 6 + 7 + 8 + 3 + 4 + + + _Multiple Surnames + True + True + True + Indicate that the surname consists of different parts. Every surname has it's own prefix and a possible connector to the next surname. Eg., the surname Ramón y Cajal can be stored as Ramón, which is inherited from the father, the connector y, and Cajal, which is inherited from the mother. + True + + + 2 + 3 + 4 + GTK_FILL + + 6 + + + + + True + 0 + <b>Multiple Surnames</b> + True + + + 2 + 4 + 5 + GTK_FILL + GTK_SHRINK + 3 + + True @@ -426,42 +492,64 @@ Tags: - 10 - 11 + 4 + 5 + 7 + 8 GTK_FILL - + True - 0 - <b>Preferred Name </b> - True + + + True + + + 0 + + + + + True + True + True + Edit the tag list + 1 + + + False + False + end + 1 + + - 2 - GTK_FILL + 5 + 10 + 7 + 8 - - - True - - - 1 - 7 - 10 - 11 - GTK_FILL - - True - + + True + 0 + 3 + <b>General</b> + True + + + False + 0 + @@ -481,105 +569,51 @@ - 7 - 8 - 9 - 10 + 2 + 6 + 7 + GTK_FILL + GTK_FILL - + True - + + True + 0 + 3 + <b>Preferred Name </b> + True + + + 0 + - + + More Name Details True True True - Edit the tag list - 1 + image1 + False - False end 1 - 7 - 8 - 10 - 11 - - - - - More Name Details - True - True - True - Open the name editor to edit the preferred name in detail. This allows to set eg. Family Nick Name, Date, ... - image1 - - - - 5 - 6 - 3 - 4 - - - - - - Use _Multiple Surnames - True - True - True - Indicate that the surname consists of different parts. Every surname has it's own prefix and a possible connector to the next surname. Eg., the surname Ramón y Cajal can be stored as Ramón, which is inherited from the father, the connector y, and Cajal, which is inherited from the mother. - True - - - 5 - 6 - 4 - 5 - - - - - - True - 0 - <b>General</b> - True - - - 2 - 8 - 9 + 4 GTK_FILL - - - True - 0 - <b>Multiple Surnames</b> - True - - - 2 - 6 - 7 - GTK_FILL - - + diff --git a/src/gui/editors/editperson.py b/src/gui/editors/editperson.py index b3afea7cb..50517194c 100644 --- a/src/gui/editors/editperson.py +++ b/src/gui/editors/editperson.py @@ -728,7 +728,7 @@ class EditPerson(EditPrimary): i = i.subpixbuf(sub_x, sub_y, sub_width, sub_height) ratio = float(max(i.get_height(), i.get_width())) - scale = float(100.0)/ratio + scale = float(110.0)/ratio x = int(scale*(i.get_width())) y = int(scale*(i.get_height())) i = i.scale_simple(x, y, gtk.gdk.INTERP_BILINEAR)