From 379fc274adff2eb6112f3674fb1d26ffd5e458cf Mon Sep 17 00:00:00 2001 From: Nick Hall Date: Sat, 18 Aug 2012 22:03:01 +0000 Subject: [PATCH] Gtk3: Convert remaining glade files svn: r20230 --- src/gui/glade/addmedia.glade | 299 ++--- src/gui/glade/baseselector.glade | 136 ++- src/gui/glade/configure.glade | 125 ++- src/gui/glade/dbman.glade | 548 ++++----- src/gui/glade/editaddress.glade | 227 ++-- src/gui/glade/editattribute.glade | 161 +-- src/gui/glade/editchildref.glade | 192 ++-- src/gui/glade/editcitation.glade | 249 +++-- src/gui/glade/editeventref.glade | 258 +++-- src/gui/glade/editldsord.glade | 204 ++-- src/gui/glade/editlink.glade | 36 +- src/gui/glade/editlocation.glade | 181 +-- src/gui/glade/editmedia.glade | 188 ++-- src/gui/glade/editmediaref.glade | 313 ++++-- src/gui/glade/editname.glade | 248 +++-- src/gui/glade/editpersonref.glade | 164 +-- src/gui/glade/editplace.glade | 221 ++-- src/gui/glade/editreporef.glade | 211 ++-- src/gui/glade/editrepository.glade | 168 +-- src/gui/glade/editsource.glade | 175 +-- src/gui/glade/editsourceref.glade | 224 ++-- src/gui/glade/editurl.glade | 175 +-- src/gui/glade/mergecitation.glade | 273 +++-- src/gui/glade/mergedata.glade | 1286 ++++++++++++---------- src/gui/glade/mergeevent.glade | 236 ++-- src/gui/glade/mergefamily.glade | 223 ++-- src/gui/glade/mergemedia.glade | 222 ++-- src/gui/glade/mergenote.glade | 227 ++-- src/gui/glade/mergeperson.glade | 220 ++-- src/gui/glade/mergeplace.glade | 278 +++-- src/gui/glade/mergerepository.glade | 247 +++-- src/gui/glade/mergesource.glade | 275 +++-- src/gui/glade/papermenu.glade | 98 +- src/gui/glade/plugins.glade | 149 ++- src/gui/glade/reorder.glade | 158 +-- src/gui/glade/rule.glade | 1003 +++++++++-------- src/gui/glade/styleeditor.glade | 773 +++++++------ src/gui/glade/tipofday.glade | 38 +- src/gui/glade/updateaddons.glade | 118 +- src/plugins/bookreport.glade | 342 +++--- src/plugins/docgen/gtkprint.glade | 84 +- src/plugins/export/exportcsv.glade | 222 ++-- src/plugins/export/exportftree.glade | 167 +-- src/plugins/export/exportgeneweb.glade | 232 ++-- src/plugins/export/exportvcalendar.glade | 147 +-- src/plugins/export/exportvcard.glade | 157 +-- src/plugins/import/importgedcom.glade | 355 +++--- src/plugins/tool/changenames.glade | 33 +- src/plugins/tool/changetypes.glade | 139 ++- src/plugins/tool/check.glade | 79 +- src/plugins/tool/desbrowser.glade | 117 +- src/plugins/tool/eval.glade | 180 +-- src/plugins/tool/eventcmp.glade | 285 ++--- src/plugins/tool/finddupes.glade | 471 ++++---- src/plugins/tool/leak.glade | 118 +- src/plugins/tool/mergecitations.glade | 301 ++--- src/plugins/tool/notrelated.glade | 132 ++- src/plugins/tool/ownereditor.glade | 219 ++-- src/plugins/tool/patchnames.glade | 185 ++-- src/plugins/tool/phpgedview.glade | 138 ++- src/plugins/tool/relcalc.glade | 82 +- src/plugins/tool/removeunused.glade | 151 ++- src/plugins/tool/soundgen.glade | 133 ++- src/plugins/tool/verify.glade | 858 ++++++++------- 64 files changed, 9150 insertions(+), 6704 deletions(-) diff --git a/src/gui/glade/addmedia.glade b/src/gui/glade/addmedia.glade index a5554e313..f5c32334e 100644 --- a/src/gui/glade/addmedia.glade +++ b/src/gui/glade/addmedia.glade @@ -1,159 +1,30 @@ - - - + + False 650 450 dialog - + True + False 8 - - - True - 6 - 6 - - - True - - - False - False - 6 - 0 - - - - - True - 12 - 2 - 12 - 6 - - - True - vertical - - - - - - True - 0 - - - 100 - 100 - True - - - Image - - - - - - - True - <b>Preview</b> - True - - - - - 1 - 2 - - - - - - - 1 - - - - - True - 6 - 2 - 2 - 6 - 6 - - - True - 0 - _Title: - True - center - photoDescription - - - GTK_FILL - - - - - - True - True - ● - - - 1 - 2 - - - - - - Convert to a relative path - True - True - False - True - True - - - 1 - 2 - 1 - 2 - GTK_FILL - - - - - - - - - False - 2 - - - - - 1 - - - + True + False end gtk-cancel + False True True True True + False True @@ -165,11 +36,13 @@ gtk-ok + False True True True True True + False True @@ -181,10 +54,12 @@ gtk-help + False True True True True + False True @@ -196,10 +71,160 @@ False + True end 0 + + + True + False + 6 + 6 + + + True + False + + + False + False + 6 + 0 + + + + + True + False + 12 + 2 + 12 + 6 + + + True + False + vertical + + + + + + True + False + 0 + + + 100 + 100 + True + False + + + Image + + + + + + + True + False + <b>Preview</b> + True + + + + + 1 + 2 + + + + + + + True + True + 1 + + + + + True + False + 6 + 2 + 2 + 6 + 6 + + + + + + True + False + 0 + _Title: + True + center + photoDescription + + + GTK_FILL + + + + + + True + True + ● + + + 1 + 2 + + + + + + Convert to a relative path + False + True + True + False + False + True + 0.5 + True + + + 1 + 2 + 1 + 2 + GTK_FILL + + + + + + False + True + 2 + + + + + False + True + 1 + + diff --git a/src/gui/glade/baseselector.glade b/src/gui/glade/baseselector.glade index 8cc164add..68400a63a 100644 --- a/src/gui/glade/baseselector.glade +++ b/src/gui/glade/baseselector.glade @@ -1,82 +1,31 @@ - + - - + + False True center-on-parent 600 450 dialog - + True - - - True - 6 - vertical - 6 - - - True - - - False - False - 0 - - - - - True - True - automatic - automatic - in - - - True - True - True - True - - - - - 1 - - - - - Show all - True - False - True - True - - - False - False - 2 - - - - - 1 - - + False - + True + False end gtk-cancel + False True True True True + False True @@ -88,10 +37,12 @@ gtk-ok + False True True True True + False True @@ -103,10 +54,75 @@ False + True end 0 + + + True + False + 6 + 6 + + + True + False + + + False + False + 0 + + + + + True + True + in + + + True + True + True + True + + + + + + + + True + True + 1 + + + + + Show all + False + True + False + False + True + 0.5 + True + + + False + False + 2 + + + + + False + True + 1 + + diff --git a/src/gui/glade/configure.glade b/src/gui/glade/configure.glade index 543c38842..fa4552739 100644 --- a/src/gui/glade/configure.glade +++ b/src/gui/glade/configure.glade @@ -1,21 +1,71 @@ - + - - + True + False True 400 dialog - + True + False + + + True + False + end + + + gtk-cancel + False + True + True + True + False + False + True + + + False + False + 0 + + + + + gtk-ok + False + True + True + True + False + False + True + + + False + False + 1 + + + + + False + True + end + 0 + + True + False True + False 12 4 2 @@ -24,6 +74,7 @@ True + False 0 Format _name: True @@ -32,12 +83,13 @@ GTK_FILL - + True + False 0 Format _definition: True @@ -48,33 +100,33 @@ 1 2 GTK_FILL - + True True - • + • 1 2 - + True True - • + • 1 2 1 2 - + @@ -84,6 +136,7 @@ True + False 0 12 6 @@ -101,6 +154,7 @@ True + False Format definition details @@ -115,6 +169,7 @@ True + False 0 Example: center @@ -124,12 +179,13 @@ 2 3 GTK_FILL - + True + False 0 True center @@ -141,58 +197,21 @@ 2 3 GTK_FILL - + + True + True 0 - - 1 - - - - - True - end - - - gtk-cancel - True - True - True - False - True - - - False - False - 0 - - - - - gtk-ok - True - True - True - False - True - - - False - False - 1 - - - False - end - 0 + True + 1 diff --git a/src/gui/glade/dbman.glade b/src/gui/glade/dbman.glade index 7569ae17f..61b4df927 100644 --- a/src/gui/glade/dbman.glade +++ b/src/gui/glade/dbman.glade @@ -1,8 +1,103 @@ - + - - + + + False + Revision comment - Gramps + True + center-on-parent + 450 + dialog + + + True + False + + + True + False + end + + + gtk-ok + False + True + True + True + False + False + True + + + False + False + 0 + + + + + False + True + end + 0 + + + + + True + False + 6 + 2 + 3 + 6 + 6 + + + + + + True + False + 0 + <b>Version description</b> + True + + + 3 + GTK_FILL + + + + + + True + True + ● + True + + + 1 + 3 + 1 + 2 + + + + + + False + True + 1 + + + + + + okbutton3 + + + False 6 Family Trees - Gramps center-on-parent @@ -10,190 +105,39 @@ 300 dialog - + True + False vertical - - - True - vertical - 6 - - - True - - - True - - - True - True - automatic - automatic - in - - - True - True - - - - - 0 - - - - - True - center - - - False - False - 6 - 1 - - - - - 0 - - - - - True - - - True - 12 - - - True - vertical - 6 - start - - - gtk-new - True - True - True - False - True - - - False - False - 0 - - - - - gtk-delete - True - True - True - False - True - - - False - False - 1 - - - - - _Rename - True - True - True - False - True - - - False - False - 2 - - - - - Re_pair - True - True - True - False - True - - - False - False - 3 - - - - - _Archive - True - True - True - False - True - - - False - False - 4 - - - - - - - 0 - - - - - False - 6 - 1 - - - - - 0 - - - - - 1 - - - + True + False end + False True True True False + False True + False 0 0 2 True + False 2 True + False gtk-close @@ -205,6 +149,7 @@ True + False _Close Window True @@ -227,22 +172,27 @@ + False True True True False + False True + False 0 0 True + False 2 True + False gtk-apply @@ -254,6 +204,7 @@ True + False _Load Family Tree True @@ -277,10 +228,196 @@ False + True end 0 + + + True + False + 6 + + + True + False + + + True + False + + + True + True + in + + + True + True + + + + + + + + True + True + 0 + + + + + True + False + center + + + False + False + 6 + 1 + + + + + True + True + 0 + + + + + True + False + + + True + False + 12 + + + True + False + 6 + start + + + gtk-new + False + True + True + True + False + False + True + + + False + False + 0 + + + + + gtk-delete + False + True + True + True + False + False + True + + + False + False + 1 + + + + + _Rename + False + True + True + True + False + False + True + + + False + False + 2 + + + + + Re_pair + False + True + True + True + False + False + True + + + False + False + 3 + + + + + _Archive + False + True + True + True + False + False + True + + + False + False + 4 + + + + + + + True + True + 0 + + + + + False + True + 6 + 1 + + + + + True + True + 0 + + + + + False + True + 1 + + @@ -288,89 +425,4 @@ connect - - Revision comment - Gramps - True - center-on-parent - 450 - dialog - - - True - - - True - 6 - 2 - 3 - 6 - 6 - - - True - 0 - <b>Version description</b> - True - - - 3 - GTK_FILL - - - - - - True - True - ● - True - - - 1 - 3 - 1 - 2 - - - - - - - - - 1 - - - - - True - end - - - gtk-ok - True - True - True - False - True - - - False - False - 0 - - - - - False - end - 0 - - - - - - okbutton3 - - diff --git a/src/gui/glade/editaddress.glade b/src/gui/glade/editaddress.glade index f9ef77309..2275f4dfd 100644 --- a/src/gui/glade/editaddress.glade +++ b/src/gui/glade/editaddress.glade @@ -1,27 +1,107 @@ - - - + + False dialog - + True + False + + + True + False + end + + + gtk-cancel + False + True + True + True + True + False + True + + + False + False + 0 + + + + + gtk-ok + False + True + True + True + True + True + True + Accept changes and close window + Accept changes and close window + False + True + + + False + False + 1 + + + + + gtk-help + False + True + True + True + True + False + True + + + False + False + 2 + + + + + False + True + end + 0 + + True + False True + False 12 5 7 12 6 + + + + + + + + + True + False 0 _Date: True @@ -30,12 +110,13 @@ GTK_FILL - + True + False 0 St_reet: True @@ -46,12 +127,13 @@ 1 2 GTK_FILL - + True + False 0 C_ity: True @@ -62,7 +144,7 @@ 3 4 GTK_FILL - + @@ -77,12 +159,13 @@ 3 3 4 - + True + False 0 _State/County: True @@ -95,12 +178,13 @@ 2 3 GTK_FILL - + True + False 0 _ZIP/Postal code: True @@ -111,7 +195,7 @@ 4 5 GTK_FILL - + @@ -126,12 +210,13 @@ 3 4 5 - + True + False 0 Cou_ntry: True @@ -144,12 +229,13 @@ 3 4 GTK_FILL - + True + False 0 Phon_e: True @@ -161,7 +247,7 @@ 4 5 GTK_FILL - + @@ -176,7 +262,7 @@ 7 4 5 - + @@ -191,7 +277,7 @@ 7 2 3 - + @@ -206,7 +292,7 @@ 7 3 4 - + @@ -223,14 +309,25 @@ Note: Use Residence Event for genealogical address data. 6 1 2 - + + + + + + + + + + + False True True True + False none @@ -241,6 +338,7 @@ Note: Use Residence Event for genealogical address data. True + False gtk-dialog-authentication @@ -256,17 +354,19 @@ Note: Use Residence Event for genealogical address data. 7 1 2 - - + + + False True True True True Invoke date editor + False none @@ -280,6 +380,7 @@ Note: Use Residence Event for genealogical address data. True + False gramps-date @@ -292,7 +393,7 @@ Note: Use Residence Event for genealogical address data. 6 7 - + GTK_FILL @@ -311,6 +412,7 @@ Note: Use Residence Event for genealogical address data. True + False 0 _Locality: True @@ -320,7 +422,7 @@ Note: Use Residence Event for genealogical address data. 2 3 GTK_FILL - + @@ -335,99 +437,24 @@ Note: Use Residence Event for genealogical address data. 3 2 3 - + - - - - - - - - - - - - - - - - - - False + True 0 - - 1 - - - - - True - end - - - gtk-cancel - True - True - True - True - True - - - False - False - 0 - - - - - gtk-ok - True - True - True - True - True - True - Accept changes and close window - Accept changes and close window - True - - - False - False - 1 - - - - - gtk-help - True - True - True - True - True - - - False - False - 2 - - - False - end - 0 + True + 1 diff --git a/src/gui/glade/editattribute.glade b/src/gui/glade/editattribute.glade index b69c8ea56..fe24e8234 100644 --- a/src/gui/glade/editattribute.glade +++ b/src/gui/glade/editattribute.glade @@ -1,19 +1,86 @@ - - - + + False dialog - + True + False + + + True + False + end + + + gtk-cancel + False + True + True + True + True + False + True + + + False + False + 0 + + + + + gtk-ok + False + True + True + True + True + True + False + True + + + False + False + 1 + + + + + gtk-help + False + True + True + True + True + False + True + + + False + False + 2 + + + + + False + True + end + 0 + + True + False True + False 12 2 3 @@ -22,6 +89,7 @@ True + False 0 _Attribute: True @@ -30,12 +98,13 @@ GTK_FILL - + True + False 0 _Value: True @@ -46,7 +115,7 @@ 1 2 GTK_FILL - + @@ -61,14 +130,16 @@ 3 1 2 - + + False True True True + False none @@ -79,6 +150,7 @@ True + False gtk-dialog-authentication @@ -92,24 +164,25 @@ 2 3 - - + + True + False The name of an attribute you want to use. For example: Height (for a person), Weather on this Day (for an event), ... Use this to store snippets of information you collect and want to correctly link to sources. Attributes can be used for people, families, events and media. Note: several predefined attributes refer to values present in the GEDCOM standard. - True - - + True + + True True - - + + 1 @@ -120,69 +193,15 @@ Note: several predefined attributes refer to values present in the GEDCOM standa False + True 0 - - 1 - - - - - True - end - - - gtk-cancel - True - True - True - True - True - - - False - False - 0 - - - - - gtk-ok - True - True - True - True - True - True - - - False - False - 1 - - - - - gtk-help - True - True - True - True - True - - - False - False - 2 - - - False - end - 0 + True + 1 diff --git a/src/gui/glade/editchildref.glade b/src/gui/glade/editchildref.glade index 006bdcafa..0419565b5 100644 --- a/src/gui/glade/editchildref.glade +++ b/src/gui/glade/editchildref.glade @@ -1,28 +1,103 @@ - - + + False 600 400 dialog - + True + False + + + True + False + end + + + gtk-cancel + False + True + True + True + True + False + True + + + False + False + 0 + + + + + gtk-ok + False + True + True + True + True + True + True + Accept changes and close window + Accept changes and close window + False + True + + + False + False + 1 + + + + + gtk-help + False + True + True + True + True + False + True + + + False + False + 2 + + + + + False + True + end + 0 + + True + False True + False 12 3 7 12 6 + + + True + False 0 Relationship to _Mother: True @@ -33,19 +108,20 @@ 2 3 GTK_FILL - + True - True - - + False + True + + True True - - + + 1 @@ -59,6 +135,7 @@ True + False 0 Relationship to _Father: True @@ -69,19 +146,20 @@ 1 2 GTK_FILL - + True - True - - + False + True + + True True - - + + 1 @@ -93,9 +171,11 @@ + False True True True + False none @@ -106,6 +186,7 @@ True + False gtk-dialog-authentication @@ -121,13 +202,14 @@ 7 2 3 - - + + True + False 0 Name Child: True @@ -135,29 +217,32 @@ GTK_FILL - + True + False 0 1 6 GTK_FILL - + + False True True True True Open person editor of this child Open person editor of this child + False none @@ -171,6 +256,7 @@ True + False gtk-edit @@ -185,81 +271,21 @@ 6 7 GTK_FILL - + - - - False + True 0 - - 1 - - - - - True - end - - - gtk-cancel - True - True - True - True - True - - - False - False - 0 - - - - - gtk-ok - True - True - True - True - True - True - Accept changes and close window - Accept changes and close window - True - - - False - False - 1 - - - - - gtk-help - True - True - True - True - True - - - False - False - 2 - - - False - end - 0 + True + 1 diff --git a/src/gui/glade/editcitation.glade b/src/gui/glade/editcitation.glade index 233b0e4ed..96173c944 100644 --- a/src/gui/glade/editcitation.glade +++ b/src/gui/glade/editcitation.glade @@ -1,17 +1,88 @@ - - - + + + + + + + + False 600 dialog - + True + False + + + True + False + end + + + gtk-help + False + True + True + True + True + False + True + + + False + False + 0 + + + + + gtk-cancel + False + True + True + True + True + False + True + + + False + False + 1 + + + + + gtk-ok + False + True + True + True + True + False + True + + + False + False + 2 + + + + + False + True + end + 0 + + True + False 0 6 3 @@ -34,14 +105,25 @@ True + False 12 5 3 12 6 + + + + + + + + + True + False 1 _Date: True @@ -50,16 +132,18 @@ GTK_FILL - + + False True True True True Invoke date editor + False none @@ -70,6 +154,7 @@ True + False gramps-date @@ -83,7 +168,7 @@ 2 3 GTK_FILL - + @@ -98,12 +183,13 @@ 2 2 3 - + True + False 1 _Volume/Page: True @@ -114,12 +200,13 @@ 2 3 GTK_FILL - + True + False 1 Con_fidence: True @@ -130,12 +217,13 @@ 3 4 GTK_FILL - + True + False Conveys the submitter's quantitative evaluation of the credibility of a piece of information, based upon its supporting evidence. It is not intended to eliminate the receiver's need to evaluate the evidence for themselves. Very Low =Unreliable evidence or estimated data Low =Questionable reliability of evidence (interviews, census, oral genealogies, or potential for bias for example, an autobiography) @@ -155,7 +243,7 @@ Very High =Direct and primary evidence used, or by dominance of the evidence

3 4 GTK_FILL - + @@ -168,16 +256,18 @@ Very High =Direct and primary evidence used, or by dominance of the evidence

1 2 - + True + False 12 True + False gtk-dialog-warning 6 @@ -191,6 +281,7 @@ Very High =Direct and primary evidence used, or by dominance of the evidence

500 True + False 0 3 <b>Note:</b> Any changes in the shared citation information will be reflected in the citation itself, for all items that reference the citation. @@ -199,6 +290,8 @@ Very High =Direct and primary evidence used, or by dominance of the evidence

True + True + True 1 @@ -208,12 +301,13 @@ Very High =Direct and primary evidence used, or by dominance of the evidence

4 5 GTK_EXPAND | GTK_SHRINK | GTK_FILL - + True + False 12 @@ -223,14 +317,18 @@ Very High =Direct and primary evidence used, or by dominance of the evidence

• + True + True 0 + False True True True + False none @@ -241,6 +339,7 @@ Very High =Direct and primary evidence used, or by dominance of the evidence

True + False gtk-dialog-authentication @@ -263,12 +362,13 @@ Very High =Direct and primary evidence used, or by dominance of the evidence

1 2 GTK_FILL - + True + False 1 _ID: True @@ -278,23 +378,15 @@ Very High =Direct and primary evidence used, or by dominance of the evidence

1 2 GTK_FILL - + - - - - - - - - - True + False <b>General</b> True @@ -304,6 +396,8 @@ Very High =Direct and primary evidence used, or by dominance of the evidence

+ False + True 2 @@ -322,6 +416,7 @@ Very High =Direct and primary evidence used, or by dominance of the evidence

True + False 12 6 2 @@ -330,6 +425,7 @@ Very High =Direct and primary evidence used, or by dominance of the evidence

True + False 0 _Title: True @@ -338,12 +434,13 @@ Very High =Direct and primary evidence used, or by dominance of the evidence

GTK_FILL - + True + False 0 _Author: True @@ -354,12 +451,13 @@ Very High =Direct and primary evidence used, or by dominance of the evidence

1 2 GTK_FILL - + True + False 0 3 A_bbreviation: @@ -371,12 +469,13 @@ Very High =Direct and primary evidence used, or by dominance of the evidence

3 4 GTK_FILL - + True + False 0 _Pub. Info.: True @@ -387,7 +486,7 @@ Very High =Direct and primary evidence used, or by dominance of the evidence

4 5 GTK_FILL - + @@ -402,16 +501,18 @@ Very High =Direct and primary evidence used, or by dominance of the evidence

2 1 2 - + + False 6 12 True + False gtk-dialog-warning 6 @@ -425,6 +526,7 @@ Very High =Direct and primary evidence used, or by dominance of the evidence

500 True + False 0 3 <b>Note:</b> Any changes in the shared source information will be reflected in the source itself, for all items that reference the source. @@ -433,6 +535,8 @@ Very High =Direct and primary evidence used, or by dominance of the evidence

True + True + True 1 @@ -442,7 +546,7 @@ Very High =Direct and primary evidence used, or by dominance of the evidence

5 6 GTK_EXPAND | GTK_SHRINK | GTK_FILL - + @@ -457,7 +561,7 @@ Very High =Direct and primary evidence used, or by dominance of the evidence

2 3 4 - + @@ -472,12 +576,13 @@ Very High =Direct and primary evidence used, or by dominance of the evidence

2 4 5 - + True + False 0 _ID: True @@ -487,12 +592,13 @@ Very High =Direct and primary evidence used, or by dominance of the evidence

2 3 GTK_FILL - + True + False 12 @@ -502,14 +608,18 @@ Very High =Direct and primary evidence used, or by dominance of the evidence

● + True + True 0 + False True True True + False none @@ -519,6 +629,7 @@ Very High =Direct and primary evidence used, or by dominance of the evidence

True + False gtk-dialog-authentication @@ -541,7 +652,7 @@ Very High =Direct and primary evidence used, or by dominance of the evidence

2 3 GTK_FILL - + @@ -554,7 +665,7 @@ Very High =Direct and primary evidence used, or by dominance of the evidence

1 2 - + @@ -565,18 +676,23 @@ Very High =Direct and primary evidence used, or by dominance of the evidence

True + False + False gtk-file 1 + True + True 0 True + False <b>General</b> True center @@ -597,69 +713,16 @@ Very High =Direct and primary evidence used, or by dominance of the evidence

True + False <b>Shared source information</b> True - - 3 - - - - - True - end - - - gtk-help - True - True - True - True - True - - - False - False - 0 - - - - - gtk-cancel - True - True - True - True - True - - - False - False - 1 - - - - - gtk-ok - True - True - True - True - True - - - False - False - 2 - - - False - end - 0 + True + 3 @@ -670,10 +733,4 @@ Very High =Direct and primary evidence used, or by dominance of the evidence

ok - - - - - - diff --git a/src/gui/glade/editeventref.glade b/src/gui/glade/editeventref.glade index 2df9feb0c..2377a742c 100644 --- a/src/gui/glade/editeventref.glade +++ b/src/gui/glade/editeventref.glade @@ -1,17 +1,82 @@ - - - + + False 600 dialog - + True + False + + + True + False + end + + + gtk-help + False + True + True + True + True + False + True + + + False + False + 0 + + + + + gtk-cancel + False + True + True + True + True + False + True + + + False + False + 1 + + + + + gtk-ok + False + True + True + True + True + False + True + + + False + False + 2 + + + + + False + True + end + 0 + + True + False 0 6 3 @@ -34,6 +99,7 @@ True + False 12 4 12 @@ -41,6 +107,7 @@ True + False 0 3 _Role: @@ -50,14 +117,16 @@ GTK_FILL - + + False True True True + False none @@ -68,12 +137,13 @@ True + False gtk-dialog-authentication - - - Privacy - - + + + Privacy + + 1 @@ -82,24 +152,25 @@ 3 4 GTK_FILL - + True - True - - + False + True + + True True - - + + 1 3 - + @@ -107,6 +178,7 @@ True + False <b>General</b> True @@ -116,6 +188,8 @@ + False + True 2 @@ -134,14 +208,28 @@ True + False 12 7 3 12 6 + + + + + + + + + + + + True + False 0 _Event type: True @@ -150,12 +238,13 @@ GTK_FILL - + True + False 0 _Date: True @@ -166,12 +255,13 @@ 1 2 GTK_FILL - + True + False 0 De_scription: True @@ -182,12 +272,13 @@ 4 5 GTK_FILL - + True + False 0 3 _Place: @@ -199,12 +290,13 @@ 3 4 GTK_FILL - + True + False 0 _ID: True @@ -214,30 +306,37 @@ 2 3 GTK_FILL - + True + False True + False 0 + True + True 0 + False True True True + False none True + False @@ -254,18 +353,21 @@ 3 4 GTK_FILL - + + False True True True + False none True + False @@ -275,16 +377,18 @@ 3 4 GTK_FILL - + + False True True True True Invoke date editor + False none @@ -298,6 +402,7 @@ True + False gramps-date @@ -313,14 +418,16 @@ 1 2 GTK_FILL - + + False True True True + False none @@ -330,6 +437,7 @@ True + False gtk-dialog-authentication @@ -346,17 +454,18 @@ 1 4 GTK_FILL - + True + False True - True - True + True + True @@ -379,7 +488,7 @@ 2 2 3 - + @@ -393,16 +502,18 @@ 2 4 5 - + + False 6 12 True + False 0 gtk-dialog-warning 6 @@ -417,6 +528,7 @@ 500 True + False 0 4 <b>Note:</b> Any changes in the shared event information will be reflected in the event itself, for all participants in the event. @@ -425,6 +537,8 @@ True + True + True 1 @@ -436,6 +550,9 @@ GTK_SHRINK + + + True @@ -447,24 +564,9 @@ 2 1 2 - + - - - - - - - - - - - - - - - False @@ -473,20 +575,25 @@ True + False 6 True + False gtk-file 1 + True + True 0 True + False <b>General</b> True center @@ -507,69 +614,16 @@ True + False <b>Shared information</b> True - - 3 - - - - - True - end - - - gtk-help - True - True - True - True - True - - - False - False - 0 - - - - - gtk-cancel - True - True - True - True - True - - - False - False - 1 - - - - - gtk-ok - True - True - True - True - True - - - False - False - 2 - - - False - end - 0 + True + 3 diff --git a/src/gui/glade/editldsord.glade b/src/gui/glade/editldsord.glade index 06df9d511..cad5f869e 100644 --- a/src/gui/glade/editldsord.glade +++ b/src/gui/glade/editldsord.glade @@ -1,29 +1,106 @@ - - - + + False 600 450 dialog - + True + False + + + True + False + end + + + gtk-cancel + False + True + True + True + True + False + True + + + False + False + 0 + + + + + gtk-ok + False + True + True + True + True + True + True + Accept changes and close window + Accept changes and close window + False + True + + + False + False + 1 + + + + + gtk-help + False + True + True + True + True + False + True + + + False + False + 2 + + + + + False + True + end + 0 + + True + False True + False 12 6 3 12 6 + + + + + + True + False 0 _Date: True @@ -34,12 +111,13 @@ 3 4 GTK_FILL - + True + False 0 _Place: True @@ -50,16 +128,18 @@ 4 5 GTK_FILL - + + False True True True True Invoke date editor + False none @@ -73,6 +153,7 @@ True + False gramps-date @@ -87,24 +168,26 @@ 3 3 4 - + GTK_FILL True + False 0 Ordinance: GTK_FILL - + True + False 0 LDS _Temple: True @@ -114,12 +197,13 @@ 1 2 GTK_FILL - + True + False liststore3 @@ -139,6 +223,7 @@ + False 0 _Family: True @@ -148,11 +233,12 @@ 5 6 GTK_FILL - + + False 0 @@ -161,13 +247,15 @@ 5 6 GTK_FILL - + + False True True + False none @@ -181,6 +269,7 @@ True + False gtk-index @@ -196,12 +285,13 @@ 5 6 GTK_FILL - + True + False 0 _Status: True @@ -211,12 +301,13 @@ 2 3 GTK_FILL - + True + False liststore2 @@ -237,24 +328,31 @@ True + False True + False 0 + True + True 0 + False True True True + False none True + False @@ -276,9 +374,11 @@ + False True True True + False none @@ -289,6 +389,7 @@ True + False gtk-dialog-authentication @@ -303,18 +404,21 @@ 2 3 GTK_FILL - + + False True True True + False none True + False @@ -324,12 +428,13 @@ 4 5 GTK_FILL - + True + False liststore1 @@ -357,81 +462,18 @@ 4 - - - - - - False + True 0 - - 1 - - - - - True - end - - - gtk-cancel - True - True - True - True - True - - - False - False - 0 - - - - - gtk-ok - True - True - True - True - True - True - Accept changes and close window - Accept changes and close window - True - - - False - False - 1 - - - - - gtk-help - True - True - True - True - True - - - False - False - 2 - - - False - end - 0 + True + 1 diff --git a/src/gui/glade/editlink.glade b/src/gui/glade/editlink.glade index fc64442bc..d0eb84bc8 100644 --- a/src/gui/glade/editlink.glade +++ b/src/gui/glade/editlink.glade @@ -1,25 +1,24 @@ - - - + False 600 True dialog - + True False - + True False end gtk-cancel + False True True True @@ -36,6 +35,7 @@ gtk-ok + False True True True @@ -56,6 +56,7 @@ gtk-help + False True True True @@ -103,7 +104,7 @@ 1 2 GTK_FILL - + @@ -120,7 +121,7 @@ 2 3 GTK_FILL - + @@ -134,7 +135,7 @@ GTK_FILL - + @@ -152,11 +153,12 @@ 4 2 3 - + + False True True True @@ -184,8 +186,8 @@ 2 3 - - + + @@ -217,9 +219,13 @@ 2 + + + New + False True True True @@ -228,12 +234,13 @@ 3 4 - + Edit + False True True True @@ -244,12 +251,9 @@ 4 1 2 - + - - - False diff --git a/src/gui/glade/editlocation.glade b/src/gui/glade/editlocation.glade index 858d958a7..4348058b0 100644 --- a/src/gui/glade/editlocation.glade +++ b/src/gui/glade/editlocation.glade @@ -1,20 +1,87 @@ - - - + + False 550 dialog - + True + False + + + True + False + end + + + gtk-cancel + False + True + True + True + True + False + True + + + False + False + 0 + + + + + gtk-ok + False + True + True + True + True + True + False + True + + + False + False + 1 + + + + + gtk-help + False + True + True + True + True + False + True + + + False + False + 2 + + + + + False + True + end + 0 + + True + False True + False 12 5 4 @@ -23,6 +90,7 @@ True + False 0 C_ity: True @@ -33,7 +101,7 @@ 2 3 GTK_FILL - + @@ -48,12 +116,13 @@ 2 2 3 - + True + False 0 S_treet: True @@ -62,12 +131,13 @@ GTK_FILL - + True + False 0 Ch_urch parish: True @@ -80,7 +150,7 @@ 1 2 GTK_FILL - + @@ -95,12 +165,13 @@ 4 1 2 - + True + False 0 Co_unty: True @@ -111,7 +182,7 @@ 3 4 GTK_FILL - + @@ -126,12 +197,13 @@ 2 3 4 - + True + False 0 _State: True @@ -144,7 +216,7 @@ 2 3 GTK_FILL - + @@ -159,12 +231,13 @@ 4 2 3 - + True + False 0 Cou_ntry: True @@ -175,7 +248,7 @@ 4 5 GTK_FILL - + @@ -190,12 +263,13 @@ 2 4 5 - + True + False 0 _ZIP/Postal code: True @@ -207,7 +281,7 @@ 3 4 GTK_FILL - + @@ -221,12 +295,13 @@ 4 3 4 - + True + False 0 Phon_e: True @@ -238,7 +313,7 @@ 4 5 GTK_FILL - + @@ -252,7 +327,7 @@ 4 4 5 - + @@ -265,12 +340,13 @@ 1 4 - + True + False 0 _Locality: True @@ -280,7 +356,7 @@ 1 2 GTK_FILL - + @@ -295,74 +371,21 @@ 2 1 2 - + + True + True 0 - - 1 - - - - - True - end - - - gtk-cancel - True - True - True - True - True - - - False - False - 0 - - - - - gtk-ok - True - True - True - True - True - True - - - False - False - 1 - - - - - gtk-help - True - True - True - True - True - - - False - False - 2 - - - False - end - 0 + True + 1 diff --git a/src/gui/glade/editmedia.glade b/src/gui/glade/editmedia.glade index 19bd00b32..1694c7b0a 100644 --- a/src/gui/glade/editmedia.glade +++ b/src/gui/glade/editmedia.glade @@ -1,22 +1,89 @@ - - - + + False dialog - + True + False 8 + + + True + False + end + + + gtk-cancel + False + True + True + True + True + False + True + + + False + False + 0 + + + + + gtk-ok + False + True + True + True + True + True + False + True + + + False + False + 1 + + + + + gtk-help + False + True + True + True + True + False + True + + + False + False + 2 + + + + + False + True + end + 0 + + True + False 12 6 True + False 12 5 4 @@ -25,6 +92,7 @@ True + False 0 _ID: True @@ -37,12 +105,13 @@ 1 2 GTK_FILL - + True + False 0 _Title: True @@ -52,12 +121,13 @@ 1 2 GTK_FILL - + True + False 0 _Date: True @@ -69,12 +139,13 @@ 2 3 GTK_FILL - + True + False 0 _Path: True @@ -87,33 +158,37 @@ 3 4 GTK_FILL - + True + False center 4 5 GTK_FILL - + True + False 0 True + False 100 100 True + False Image preview @@ -126,6 +201,7 @@ True + False <b>Preview</b> True @@ -150,7 +226,7 @@ Gramps does not store the media internally, it only stores the path! Set the 'Re 3 3 4 - + @@ -163,16 +239,18 @@ Gramps does not store the media internally, it only stores the path! Set the 'Re 2 4 - + + False True True True True Invoke date editor + False none @@ -186,6 +264,7 @@ Gramps does not store the media internally, it only stores the path! Set the 'Re True + False gramps-date @@ -201,15 +280,17 @@ Gramps does not store the media internally, it only stores the path! Set the 'Re 2 3 GTK_FILL - + + False True True True Open File Browser to select a media file on your computer. + False none @@ -222,6 +303,7 @@ Gramps does not store the media internally, it only stores the path! Set the 'Re True + False gtk-open @@ -237,7 +319,7 @@ Gramps does not store the media internally, it only stores the path! Set the 'Re 3 4 GTK_FILL - + @@ -252,14 +334,16 @@ Gramps does not store the media internally, it only stores the path! Set the 'Re 3 1 2 - + + False True True True + False none @@ -270,6 +354,7 @@ Gramps does not store the media internally, it only stores the path! Set the 'Re True + False gtk-dialog-authentication @@ -285,7 +370,7 @@ Gramps does not store the media internally, it only stores the path! Set the 'Re 1 2 GTK_FILL - + @@ -300,12 +385,13 @@ Gramps does not store the media internally, it only stores the path! Set the 'Re 3 2 3 - + True + False 0 _Tags: True @@ -317,25 +403,31 @@ Gramps does not store the media internally, it only stores the path! Set the 'Re 4 5 GTK_FILL - + True + False True + False + True + True 0 + False True True True + False @@ -357,75 +449,21 @@ Gramps does not store the media internally, it only stores the path! Set the 'Re 4 4 5 - + False + True 0 - - 1 - - - - - True - end - - - gtk-cancel - True - True - True - True - True - - - False - False - 0 - - - - - gtk-ok - True - True - True - True - True - True - - - False - False - 1 - - - - - gtk-help - True - True - True - True - True - - - False - False - 2 - - - False - end - 0 + True + 1 diff --git a/src/gui/glade/editmediaref.glade b/src/gui/glade/editmediaref.glade index 2a7b89f4c..a3bb5a223 100644 --- a/src/gui/glade/editmediaref.glade +++ b/src/gui/glade/editmediaref.glade @@ -1,19 +1,105 @@ - - - + + + 100 + 1 + 10 + + + 100 + 1 + 10 + + + 100 + 1 + 10 + + + 100 + 1 + 10 + + False 600 450 dialog - + True + False 8 + + + True + False + end + + + gtk-cancel + False + True + True + True + True + False + True + + + False + False + 0 + + + + + gtk-ok + False + True + True + True + True + True + False + True + + + False + False + 1 + + + + + gtk-help + False + True + True + True + True + False + True + + + False + False + 2 + + + + + False + True + end + 0 + + True + False 6 6 @@ -23,14 +109,25 @@ True + False 12 5 5 12 6 + + + + + + + + + True + False 0 _Corner 2: X True @@ -41,13 +138,14 @@ 2 3 4 - - + + True + False 0 Y coordinate|Y True @@ -58,13 +156,14 @@ 4 3 4 - - + + True + False 0 <b>Referenced Region</b> True @@ -74,7 +173,7 @@ 1 2 GTK_FILL - + @@ -93,7 +192,7 @@ You can use the mouse on the picture to select a region, or use these spinbutton 5 3 4 - + @@ -112,23 +211,26 @@ You can use the mouse on the picture to select a region, or use these spinbutton 3 3 4 - + True + False Referenced region of the image media object. Select a region with clicking and holding the mouse button on the top left corner of the region you want, dragging the mouse to the bottom right corner of the region, and then releasing the mouse button. 0 True + False 100 100 True + False 0 @@ -137,6 +239,7 @@ Select a region with clicking and holding the mouse button on the top left corne True + False <b>Preview</b> True @@ -145,12 +248,13 @@ Select a region with clicking and holding the mouse button on the top left corne 2 5 - + True + False 0 _Corner 1: X True @@ -161,10 +265,13 @@ Select a region with clicking and holding the mouse button on the top left corne 2 2 3 - - + + + + + True @@ -182,7 +289,7 @@ You can use the mouse on the picture to select a region, or use these spinbutton 3 2 3 - + @@ -201,12 +308,13 @@ You can use the mouse on the picture to select a region, or use these spinbutton 5 2 3 - + True + False 0 Y coordinate|Y True @@ -217,13 +325,17 @@ You can use the mouse on the picture to select a region, or use these spinbutton 4 2 3 - - + + + + + True + False 2 @@ -232,14 +344,20 @@ You can use the mouse on the picture to select a region, or use these spinbutton 5 + + + True + False + False True True True + False none @@ -250,6 +368,7 @@ You can use the mouse on the picture to select a region, or use these spinbutton True + False gtk-dialog-authentication @@ -296,11 +415,15 @@ You can use the mouse on the picture to select a region, or use these spinbutton + + + True + False General @@ -309,6 +432,8 @@ You can use the mouse on the picture to select a region, or use these spinbutton + True + True 10 0 @@ -325,14 +450,28 @@ You can use the mouse on the picture to select a region, or use these spinbutton True + False 12 7 4 12 6 + + + + + + + + + + + + True + False 0 _Path: True @@ -345,12 +484,13 @@ You can use the mouse on the picture to select a region, or use these spinbutton 3 4 GTK_FILL - + True + False 0 _ID: True @@ -361,12 +501,13 @@ You can use the mouse on the picture to select a region, or use these spinbutton 1 2 GTK_FILL - + True + False 0 _Title: True @@ -394,16 +535,18 @@ You can use the mouse on the picture to select a region, or use these spinbutton 3 1 2 - + + False 6 12 True + False gtk-dialog-warning 6 @@ -417,6 +560,7 @@ You can use the mouse on the picture to select a region, or use these spinbutton 400 True + False 0 3 <b>Note:</b> Any changes in the shared media object information will be reflected in the media object itself. @@ -441,10 +585,12 @@ You can use the mouse on the picture to select a region, or use these spinbutton True + False 0 True + False True Double click image to view in an external viewer Double click image to view in an external viewer @@ -453,6 +599,7 @@ You can use the mouse on the picture to select a region, or use these spinbutton 100 100 True + False @@ -460,6 +607,7 @@ You can use the mouse on the picture to select a region, or use these spinbutton True + False <b>Preview</b> True @@ -474,6 +622,7 @@ You can use the mouse on the picture to select a region, or use these spinbutton True + False 0 Type: type @@ -484,12 +633,13 @@ You can use the mouse on the picture to select a region, or use these spinbutton 5 6 GTK_FILL - + True + False Type of media object as indicated by the computer, eg Image, Video, ... 0 @@ -499,12 +649,13 @@ You can use the mouse on the picture to select a region, or use these spinbutton 5 6 GTK_FILL - + True + False 0 _Date: True @@ -516,7 +667,7 @@ You can use the mouse on the picture to select a region, or use these spinbutton 2 3 GTK_FILL - + @@ -530,16 +681,18 @@ You can use the mouse on the picture to select a region, or use these spinbutton 3 2 3 - + + False True True True True Invoke date editor + False none @@ -553,6 +706,7 @@ You can use the mouse on the picture to select a region, or use these spinbutton True + False gramps-date @@ -568,14 +722,16 @@ You can use the mouse on the picture to select a region, or use these spinbutton 2 3 GTK_FILL - + + False True True True + False none @@ -585,6 +741,7 @@ You can use the mouse on the picture to select a region, or use these spinbutton True + False gtk-dialog-authentication @@ -613,11 +770,13 @@ You can use the mouse on the picture to select a region, or use these spinbutton + False True True True True Select a file + False none @@ -630,6 +789,7 @@ You can use the mouse on the picture to select a region, or use these spinbutton True + False gtk-open @@ -663,6 +823,7 @@ You can use the mouse on the picture to select a region, or use these spinbutton True + False 0 _Tags: True @@ -674,12 +835,13 @@ You can use the mouse on the picture to select a region, or use these spinbutton 4 5 GTK_FILL - + True + False 2 @@ -690,9 +852,11 @@ You can use the mouse on the picture to select a region, or use these spinbutton + False True True True + False @@ -709,23 +873,12 @@ You can use the mouse on the picture to select a region, or use these spinbutton 5 - - - - - - - - - - - - True + False <b>General</b> True @@ -738,75 +891,23 @@ You can use the mouse on the picture to select a region, or use these spinbutton True + False <b>Shared Information</b> True + True + True 1 - - 1 - - - - - True - end - - - gtk-cancel - True - True - True - True - True - - - False - False - 0 - - - - - gtk-ok - True - True - True - True - True - True - - - False - False - 1 - - - - - gtk-help - True - True - True - True - True - - - False - False - 2 - - - False - end - 0 + True + 1 @@ -817,24 +918,4 @@ You can use the mouse on the picture to select a region, or use these spinbutton button104 - - 100 - 1 - 10 - - - 100 - 1 - 10 - - - 100 - 1 - 10 - - - 100 - 1 - 10 - diff --git a/src/gui/glade/editname.glade b/src/gui/glade/editname.glade index bdeeec631..3f882199d 100644 --- a/src/gui/glade/editname.glade +++ b/src/gui/glade/editname.glade @@ -1,26 +1,100 @@ - - - + + False 600 dialog - + True + False + + + True + False + end + + + gtk-cancel + False + True + True + True + True + True + Abandon changes and close window + Abandon changes and close window + False + True + + + False + False + 0 + + + + + gtk-ok + False + True + True + True + True + True + Accept changes and close window + Accept changes and close window + False + True + + + False + False + 1 + + + + + gtk-help + False + True + True + True + True + False + True + + + False + False + 2 + + + + + False + True + end + 0 + + True + False True + False True + False True + False 0 4 _Type: @@ -38,17 +112,19 @@ True + False An identification of what type of Name this is, eg. Birth Name, Married Name. True - True - True + True + True False + True 1 @@ -66,9 +142,11 @@ + False True True True + False none @@ -79,6 +157,7 @@ True + False gtk-dialog-authentication @@ -107,14 +186,17 @@ True + False 0.029999999329447746 True + False 12 True + False 2 6 6 @@ -122,6 +204,7 @@ True + False 0 _Given: True @@ -130,12 +213,13 @@ GTK_FILL - + True + False 0 T_itle: True @@ -145,12 +229,13 @@ 1 2 GTK_FILL - + True + False 0 Suffi_x: True @@ -162,12 +247,13 @@ 1 2 GTK_FILL - + True + False 0 C_all Name: True @@ -177,7 +263,7 @@ 4 5 GTK_FILL - + @@ -192,12 +278,13 @@ 1 4 - + True + False 0 _Nick Name: True @@ -209,7 +296,7 @@ 1 2 GTK_FILL - + @@ -273,6 +360,7 @@ True + False 0 <i>Given Name(s) </i> True @@ -289,18 +377,22 @@ True + False 0.029999999329447746 none True + False 12 True + False True + False @@ -309,15 +401,19 @@ + True + True 0 True + False True + False 0 _Family Nick Name: True @@ -359,6 +455,7 @@ True + False 0 <i>Family Names </i> True @@ -366,12 +463,16 @@ + True + True 2 2 + True + True 0 @@ -382,14 +483,31 @@ True + False 12 4 4 12 6 + + + + + + + + + + + + + + + True + False 0 G_roup as: True @@ -399,12 +517,13 @@ 1 2 GTK_FILL - + True + False 0 _Sort as: True @@ -416,12 +535,13 @@ 1 2 GTK_FILL - + True + False 0 _Display as: True @@ -433,12 +553,13 @@ 2 3 GTK_FILL - + True + False People are displayed according to the name format given in the Preferences (the default). Here you can make sure this person is displayed according to a custom name format (extra formats can be set in the Preferences). @@ -454,12 +575,13 @@ Here you can make sure this person is displayed according to a custom name forma 2 3 GTK_FILL - + True + False 0 Dat_e: True @@ -472,12 +594,13 @@ Here you can make sure this person is displayed according to a custom name forma 3 4 GTK_FILL - + True + False People are sorted according to the name format given in the Preferences (the default). Here you can make sure this person is sorted according to a custom name format (extra formats can be set in the Preferences). @@ -492,17 +615,19 @@ Here you can make sure this person is sorted according to a custom name format ( 3 1 2 - + + False True True True True Invoke date editor Invoke date editor + False none @@ -516,6 +641,7 @@ Here you can make sure this person is sorted according to a custom name format ( True + False gramps-date @@ -531,12 +657,13 @@ Here you can make sure this person is sorted according to a custom name format ( 3 4 GTK_FILL - + True + False 6 @@ -549,16 +676,21 @@ You will be asked if you want to group this person only, or all people with this ● + True + True 0 O_verride + False True True False + False True + 0.5 True @@ -572,7 +704,7 @@ You will be asked if you want to group this person only, or all people with this 2 4 GTK_FILL - + @@ -587,7 +719,7 @@ You will be asked if you want to group this person only, or all people with this 3 3 4 - + @@ -608,22 +740,30 @@ You will be asked if you want to group this person only, or all people with this + + + True + False True + False + True + True 0 True + False General True center @@ -641,74 +781,16 @@ You will be asked if you want to group this person only, or all people with this + True + True 1 - - 2 - - - - - True - end - - - gtk-cancel - True - True - True - True - True - Abandon changes and close window - Abandon changes and close window - True - - - False - False - 0 - - - - - gtk-ok - True - True - True - True - True - Accept changes and close window - Accept changes and close window - True - - - False - False - 1 - - - - - gtk-help - True - True - True - True - True - - - False - False - 2 - - - False - end - 0 + True + 2 diff --git a/src/gui/glade/editpersonref.glade b/src/gui/glade/editpersonref.glade index 15e69484e..42433c056 100644 --- a/src/gui/glade/editpersonref.glade +++ b/src/gui/glade/editpersonref.glade @@ -1,19 +1,89 @@ - - - + + False dialog - + True + False + + + True + False + end + + + gtk-cancel + False + True + True + True + True + False + True + + + False + False + 0 + + + + + gtk-ok + False + True + True + True + True + True + True + Accept changes and close window + Accept changes and close window + False + True + + + False + False + 1 + + + + + gtk-help + False + True + True + True + True + False + True + + + False + False + 2 + + + + + False + True + end + 0 + + True + False True + False 12 2 7 @@ -22,6 +92,7 @@ True + False 0 _Person: True @@ -30,12 +101,13 @@ GTK_FILL - + True + False 0 _Association: True @@ -46,7 +118,7 @@ 1 2 GTK_FILL - + @@ -63,14 +135,16 @@ Note: Use Events instead for relations connected to specific time frames or occa 6 1 2 - + + False True True True + False none @@ -81,6 +155,7 @@ Note: Use Events instead for relations connected to specific time frames or occa True + False gtk-dialog-authentication @@ -96,13 +171,14 @@ Note: Use Events instead for relations connected to specific time frames or occa 7 1 2 - - + + True + False Use the select button to choose a person that has an association to the edited person. 0 @@ -110,15 +186,17 @@ Note: Use Events instead for relations connected to specific time frames or occa 1 6 GTK_FILL - + + False True True True Select a person that has an association to the edited person. + False @@ -131,6 +209,7 @@ Note: Use Events instead for relations connected to specific time frames or occa True + False gtk-index @@ -144,78 +223,21 @@ Note: Use Events instead for relations connected to specific time frames or occa 6 7 GTK_FILL - + False + True 0 - - 1 - - - - - True - end - - - gtk-cancel - True - True - True - True - True - - - False - False - 0 - - - - - gtk-ok - True - True - True - True - True - True - Accept changes and close window - Accept changes and close window - True - - - False - False - 1 - - - - - gtk-help - True - True - True - True - True - - - False - False - 2 - - - False - end - 0 + True + 1 diff --git a/src/gui/glade/editplace.glade b/src/gui/glade/editplace.glade index 40e70175e..eb347a985 100644 --- a/src/gui/glade/editplace.glade +++ b/src/gui/glade/editplace.glade @@ -1,27 +1,98 @@ - - - + + False dialog - + True + False + + + True + False + end + + + gtk-cancel + False + True + True + True + True + False + True + + + False + False + 0 + + + + + gtk-ok + False + True + True + True + True + True + False + True + + + False + False + 1 + + + + + gtk-help + False + True + True + True + True + False + True + + + False + False + 2 + + + + + False + True + end + 0 + + True + False True + False 12 3 4 6 4 + + + True + False 0 _Place Name: True @@ -30,12 +101,13 @@ GTK_FILL - + True + False 0 L_atitude: True @@ -46,12 +118,13 @@ 1 2 GTK_FILL - + True + False 0 _Longitude: True @@ -64,7 +137,7 @@ 1 2 GTK_FILL - + @@ -77,12 +150,13 @@ 1 4 - + True + False 0 _ID: True @@ -92,7 +166,7 @@ 2 3 GTK_FILL - + @@ -107,14 +181,16 @@ 2 2 3 - + + False True True True + False none @@ -125,6 +201,7 @@ True + False gtk-dialog-authentication @@ -139,8 +216,8 @@ 3 2 3 - - + + @@ -157,7 +234,7 @@ You can set these values via the Geography View by searching the place, or via a 2 1 2 - + @@ -174,15 +251,13 @@ You can set these values via the Geography View by searching the place, or via a 4 1 2 - + - - - False + True 0 @@ -193,6 +268,7 @@ You can set these values via the Geography View by searching the place, or via a True + False 12 5 4 @@ -201,6 +277,7 @@ You can set these values via the Geography View by searching the place, or via a True + False 0 C_ity: True @@ -211,12 +288,13 @@ You can set these values via the Geography View by searching the place, or via a 2 3 GTK_FILL - + True + False 0 S_treet: True @@ -225,7 +303,7 @@ You can set these values via the Geography View by searching the place, or via a GTK_FILL - + @@ -239,7 +317,7 @@ Use Alternate Locations tab to store the current name. 1 4 - + @@ -255,7 +333,7 @@ Use Alternate Locations tab to store the current name. 2 2 3 - + @@ -270,12 +348,13 @@ Use Alternate Locations tab to store the current name. 4 1 2 - + True + False 0 Ch_urch parish: True @@ -288,12 +367,13 @@ Use Alternate Locations tab to store the current name. 1 2 GTK_FILL - + True + False 0 Co_unty: True @@ -304,7 +384,7 @@ Use Alternate Locations tab to store the current name. 3 4 GTK_FILL - + @@ -319,12 +399,13 @@ Use Alternate Locations tab to store the current name. 2 3 4 - + True + False 0 _State: True @@ -337,7 +418,7 @@ Use Alternate Locations tab to store the current name. 2 3 GTK_FILL - + @@ -352,12 +433,13 @@ Use Alternate Locations tab to store the current name. 4 2 3 - + True + False 0 Count_ry: True @@ -368,7 +450,7 @@ Use Alternate Locations tab to store the current name. 4 5 GTK_FILL - + @@ -384,12 +466,13 @@ Use Alternate Locations tab to store the current name. 2 4 5 - + True + False 0 _ZIP/Postal code: True @@ -402,7 +485,7 @@ Use Alternate Locations tab to store the current name. 3 4 GTK_FILL - + @@ -416,12 +499,13 @@ Use Alternate Locations tab to store the current name. 4 3 4 - + True + False 0 Phon_e: True @@ -433,7 +517,7 @@ Use Alternate Locations tab to store the current name. 4 5 GTK_FILL - + @@ -447,12 +531,13 @@ Use Alternate Locations tab to store the current name. 4 4 5 - + True + False 0 _Locality: True @@ -462,7 +547,7 @@ Use Alternate Locations tab to store the current name. 1 2 GTK_FILL - + @@ -478,7 +563,7 @@ Use Alternate Locations tab to store the current name. 2 1 2 - + @@ -486,19 +571,24 @@ Use Alternate Locations tab to store the current name. True + False True + False gtk-file 1 + True + True 0 True + False <b>Location</b> True center @@ -516,69 +606,16 @@ Use Alternate Locations tab to store the current name. + True + True 1 - - 1 - - - - - True - end - - - gtk-cancel - True - True - True - True - True - - - False - False - 0 - - - - - gtk-ok - True - True - True - True - True - True - - - False - False - 1 - - - - - gtk-help - True - True - True - True - True - - - False - False - 2 - - - False - end - 0 + True + 1 diff --git a/src/gui/glade/editreporef.glade b/src/gui/glade/editreporef.glade index 8a9b370a5..7baaf87ea 100644 --- a/src/gui/glade/editreporef.glade +++ b/src/gui/glade/editreporef.glade @@ -1,20 +1,93 @@ - - - + + False dialog - + True + False 8 + + + True + False + end + + + gtk-cancel + False + True + True + True + True + True + Abandon changes and close window + Abandon changes and close window + False + True + + + False + False + 0 + + + + + gtk-ok + False + True + True + True + True + True + True + Accept changes and close window + Accept changes and close window + False + True + + + False + False + 1 + + + + + gtk-help + False + True + True + True + True + False + True + + + False + False + 2 + + + + + False + True + end + 0 + + True + False True + False 0 6 3 @@ -37,6 +110,7 @@ True + False 12 2 3 @@ -45,6 +119,7 @@ True + False 1 _Media Type: True @@ -53,12 +128,13 @@ GTK_FILL - + True + False 1 Call n_umber: True @@ -69,35 +145,38 @@ 1 2 GTK_FILL - + True + False On what type of media this source is available in the repository. True - True - True + True + True 1 2 - + + False True True True True Indicates if the record is private Indicates if the record is private + False none @@ -108,6 +187,7 @@ True + False gtk-dialog-authentication @@ -136,7 +216,7 @@ 3 1 2 - + @@ -144,6 +224,7 @@ True + False <b>General</b> True @@ -153,6 +234,8 @@ + True + True 1 @@ -169,6 +252,7 @@ True + False 12 4 2 @@ -177,6 +261,7 @@ True + False 1 _Name: True @@ -185,12 +270,13 @@ GTK_FILL - + True + False 1 _Type: True @@ -201,7 +287,7 @@ 1 2 GTK_FILL - + @@ -214,20 +300,23 @@ 1 2 - + + False 6 12 True + False gtk-dialog-warning 6 + True False 0 @@ -236,6 +325,7 @@ 400 True + False 0 3 <b>Note:</b> Any changes in the shared repository information will be reflected in the repository itself, for all items that reference the repository. @@ -244,6 +334,8 @@ True + True + True 1 @@ -258,6 +350,7 @@ True + False 1 _ID: True @@ -267,12 +360,13 @@ 2 3 GTK_FILL - + True + False 12 @@ -282,17 +376,21 @@ ● + True + True 0 + False True True True True Indicates if the record is private Indicates if the record is private + False none @@ -302,6 +400,7 @@ True + False gtk-dialog-authentication @@ -330,14 +429,15 @@ True + False Type of repository, eg., 'Library', 'Album', ... - True - - - True - True - - + True + + + True + True + + 1 @@ -353,6 +453,7 @@ True + False <b>General</b> True @@ -365,81 +466,23 @@ True + False <b>Shared information</b> True - 2 - - - - - 1 - - - - - True - end - - - gtk-cancel - True - True - True - True - True - Abandon changes and close window - Abandon changes and close window - True - - - False - False - 0 - - - - - gtk-ok - True - True - True - True - True - True - Accept changes and close window - Accept changes and close window - True - - - False - False - 1 - - - - - gtk-help - True - True - True - True - True - - - False - False + True + True 2 False - end - 0 + True + 1 diff --git a/src/gui/glade/editrepository.glade b/src/gui/glade/editrepository.glade index f3b86a5a5..add6e8b26 100644 --- a/src/gui/glade/editrepository.glade +++ b/src/gui/glade/editrepository.glade @@ -1,20 +1,93 @@ - - - + + False dialog - + True + False 8 + + + True + False + end + + + gtk-cancel + False + True + True + True + True + True + Abandon changes and close window + Abandon changes and close window + False + True + + + False + False + 0 + + + + + gtk-ok + False + True + True + True + True + True + True + Accept changes and close window + Accept changes and close window + False + True + + + False + False + 1 + + + + + gtk-help + False + True + True + True + True + False + True + + + False + False + 2 + + + + + False + True + end + 0 + + True + False True + False 12 2 2 @@ -23,6 +96,7 @@ True + False 1 _Name: True @@ -31,12 +105,13 @@ GTK_FILL - + True + False 0 _Type: True @@ -47,7 +122,7 @@ 1 2 GTK_FILL - + @@ -60,33 +135,37 @@ 1 2 - + True + False 12 True + False Type of repository, eg., 'Library', 'Album', ... True - True - True + True + True False + True 0 True + False 1 _ID: True @@ -106,17 +185,21 @@ ● + True + True 2 + False True True True True Indicates if the record is private Indicates if the record is private + False none @@ -127,6 +210,7 @@ True + False gtk-dialog-authentication @@ -155,75 +239,15 @@ False + True 0 - - 1 - - - - - True - end - - - gtk-cancel - True - True - True - True - True - Abandon changes and close window - Abandon changes and close window - True - - - False - False - 0 - - - - - gtk-ok - True - True - True - True - True - True - Accept changes and close window - Accept changes and close window - True - - - False - False - 1 - - - - - gtk-help - True - True - True - True - True - - - False - False - 2 - - - False - end - 0 + True + 1 diff --git a/src/gui/glade/editsource.glade b/src/gui/glade/editsource.glade index d97fff922..5f7301128 100644 --- a/src/gui/glade/editsource.glade +++ b/src/gui/glade/editsource.glade @@ -1,21 +1,93 @@ - - - + + False dialog - + - + True + False 8 + + + True + False + end + + + gtk-cancel + False + True + True + True + False + Abandon changes and close window + False + True + + + + False + False + 0 + + + + + gtk-ok + False + True + True + True + True + False + Accept changes and close window + False + True + + + + False + False + 1 + + + + + gtk-help + False + True + True + True + False + False + True + + + + False + False + 2 + + + + + False + True + end + 0 + + True + False True + False 12 5 2 @@ -24,6 +96,7 @@ True + False 0 _Title: True @@ -32,12 +105,13 @@ GTK_FILL - + True + False 0 _Author: True @@ -48,7 +122,7 @@ 1 2 GTK_FILL - + @@ -61,7 +135,7 @@ 1 2 - + @@ -75,12 +149,13 @@ 2 1 2 - + True + False 0 _Pub. info.: True @@ -91,7 +166,7 @@ 4 5 GTK_FILL - + @@ -105,7 +180,7 @@ 2 4 5 - + @@ -119,12 +194,13 @@ 2 3 4 - + True + False 0 A_bbreviation: True @@ -135,12 +211,13 @@ 3 4 GTK_FILL - + True + False 0 _ID: True @@ -150,12 +227,13 @@ 2 3 GTK_FILL - + True + False 12 @@ -165,15 +243,19 @@ ● + True + True 0 + False True True False Indicates if the record is private + False none @@ -184,6 +266,7 @@ True + False gtk-dialog-authentication @@ -217,70 +300,10 @@ - - 1 - - - - - True - end - - - gtk-cancel - True - True - True - False - Abandon changes and close window - True - - - - False - False - 0 - - - - - gtk-ok - True - True - True - True - False - Accept changes and close window - True - - - - False - False - 1 - - - - - gtk-help - True - True - True - False - True - - - - False - False - 2 - - - False - end - 0 + True + 1 diff --git a/src/gui/glade/editsourceref.glade b/src/gui/glade/editsourceref.glade index 69b8764a3..4c6eaafb2 100644 --- a/src/gui/glade/editsourceref.glade +++ b/src/gui/glade/editsourceref.glade @@ -1,17 +1,88 @@ - - - + + + + + + + + False 600 dialog - + True + False + + + True + False + end + + + gtk-help + False + True + True + True + True + False + True + + + False + False + 0 + + + + + gtk-cancel + False + True + True + True + True + False + True + + + False + False + 1 + + + + + gtk-ok + False + True + True + True + True + False + True + + + False + False + 2 + + + + + False + True + end + 0 + + True + False 0 6 3 @@ -34,14 +105,19 @@ True + False 12 3 3 12 6 + + + True + False 1 _Date: True @@ -50,16 +126,18 @@ GTK_FILL - + + False True True True True Invoke date editor + False none @@ -73,6 +151,7 @@ True + False gramps-date @@ -86,7 +165,7 @@ 2 3 GTK_FILL - + @@ -101,12 +180,13 @@ 2 1 2 - + True + False 1 _Volume/Page: True @@ -117,12 +197,13 @@ 1 2 GTK_FILL - + True + False 1 Con_fidence: True @@ -133,14 +214,16 @@ 2 3 GTK_FILL - + + False True True True + False none @@ -151,6 +234,7 @@ True + False gtk-dialog-authentication @@ -166,12 +250,13 @@ 2 3 GTK_FILL - + True + False Conveys the submitter's quantitative evaluation of the credibility of a piece of information, based upon its supporting evidence. It is not intended to eliminate the receiver's need to evaluate the evidence for themselves. Very Low =Unreliable evidence or estimated data Low =Questionable reliability of evidence (interviews, census, oral genealogies, or potential for bias for example, an autobiography) @@ -191,7 +276,7 @@ Very High =Direct and primary evidence used, or by dominance of the evidence

2 3 GTK_FILL - + @@ -204,17 +289,15 @@ Very High =Direct and primary evidence used, or by dominance of the evidence

1 2 - + - - - True + False <b>General</b> True @@ -224,6 +307,8 @@ Very High =Direct and primary evidence used, or by dominance of the evidence

+ False + True 2 @@ -242,6 +327,7 @@ Very High =Direct and primary evidence used, or by dominance of the evidence

True + False 12 6 2 @@ -250,6 +336,7 @@ Very High =Direct and primary evidence used, or by dominance of the evidence

True + False 0 _Title: True @@ -258,12 +345,13 @@ Very High =Direct and primary evidence used, or by dominance of the evidence

GTK_FILL - + True + False 0 _Author: True @@ -274,12 +362,13 @@ Very High =Direct and primary evidence used, or by dominance of the evidence

1 2 GTK_FILL - + True + False 0 3 A_bbreviation: @@ -291,12 +380,13 @@ Very High =Direct and primary evidence used, or by dominance of the evidence

3 4 GTK_FILL - + True + False 0 _Pub. Info.: True @@ -307,7 +397,7 @@ Very High =Direct and primary evidence used, or by dominance of the evidence

4 5 GTK_FILL - + @@ -322,16 +412,18 @@ Very High =Direct and primary evidence used, or by dominance of the evidence

2 1 2 - + + False 6 12 True + False gtk-dialog-warning 6 @@ -345,6 +437,7 @@ Very High =Direct and primary evidence used, or by dominance of the evidence

500 True + False 0 3 <b>Note:</b> Any changes in the shared source information will be reflected in the source itself, for all items that reference the source. @@ -353,6 +446,8 @@ Very High =Direct and primary evidence used, or by dominance of the evidence

True + True + True 1 @@ -362,7 +457,7 @@ Very High =Direct and primary evidence used, or by dominance of the evidence

5 6 GTK_EXPAND | GTK_SHRINK | GTK_FILL - + @@ -377,7 +472,7 @@ Very High =Direct and primary evidence used, or by dominance of the evidence

2 3 4 - + @@ -392,12 +487,13 @@ Very High =Direct and primary evidence used, or by dominance of the evidence

2 4 5 - + True + False 0 _ID: True @@ -407,12 +503,13 @@ Very High =Direct and primary evidence used, or by dominance of the evidence

2 3 GTK_FILL - + True + False 12 @@ -422,14 +519,18 @@ Very High =Direct and primary evidence used, or by dominance of the evidence

● + True + True 0 + False True True True + False none @@ -439,6 +540,7 @@ Very High =Direct and primary evidence used, or by dominance of the evidence

True + False gtk-dialog-authentication @@ -461,7 +563,7 @@ Very High =Direct and primary evidence used, or by dominance of the evidence

2 3 GTK_FILL - + @@ -474,7 +576,7 @@ Very High =Direct and primary evidence used, or by dominance of the evidence

1 2 - + @@ -485,18 +587,23 @@ Very High =Direct and primary evidence used, or by dominance of the evidence

True + False + False gtk-file 1 + True + True 0 True + False <b>General</b> True center @@ -517,69 +624,16 @@ Very High =Direct and primary evidence used, or by dominance of the evidence

True + False <b>Shared source information</b> True - - 3 - - - - - True - end - - - gtk-help - True - True - True - True - True - - - False - False - 0 - - - - - gtk-cancel - True - True - True - True - True - - - False - False - 1 - - - - - gtk-ok - True - True - True - True - True - - - False - False - 2 - - - False - end - 0 + True + 3 @@ -590,10 +644,4 @@ Very High =Direct and primary evidence used, or by dominance of the evidence

ok - - - - - - diff --git a/src/gui/glade/editurl.glade b/src/gui/glade/editurl.glade index f2e5f97a6..c1363a560 100644 --- a/src/gui/glade/editurl.glade +++ b/src/gui/glade/editurl.glade @@ -1,20 +1,90 @@ - - - + + False 600 dialog - + True + False + + + True + False + end + + + gtk-cancel + False + True + True + True + True + False + True + + + False + False + 0 + + + + + gtk-ok + False + True + True + True + True + True + True + Accept changes and close window + Accept changes and close window + False + True + + + False + False + 1 + + + + + gtk-help + False + True + True + True + True + False + True + + + False + False + 2 + + + + + False + True + end + 0 + + True + False True + False 12 3 3 @@ -23,6 +93,7 @@ True + False 0 _Web address: True @@ -33,12 +104,13 @@ 1 2 GTK_FILL - + True + False 0 _Description: True @@ -49,12 +121,13 @@ 2 3 GTK_FILL - + True + False 0 _Type: True @@ -62,14 +135,16 @@ GTK_FILL - + + False True True True + False none @@ -80,6 +155,7 @@ True + False gtk-dialog-authentication @@ -93,26 +169,27 @@ 2 3 GTK_FILL - + True + False Type of internet address, eg. E-mail, Web Page, ... - True - - + True + + True True - - + + 1 2 GTK_FILL - + @@ -127,17 +204,19 @@ 2 1 2 - + 3 gtk-jump-to + False True True True Open the web address in the default browser. + False True @@ -146,7 +225,7 @@ 1 2 GTK_FILL - + @@ -161,81 +240,23 @@ 3 2 3 - + False + True 0 False + True 1 - - - True - end - - - gtk-cancel - True - True - True - True - True - - - False - False - 0 - - - - - gtk-ok - True - True - True - True - True - True - Accept changes and close window - Accept changes and close window - True - - - False - False - 1 - - - - - gtk-help - True - True - True - True - True - - - False - False - 2 - - - - - False - end - 0 - - diff --git a/src/gui/glade/mergecitation.glade b/src/gui/glade/mergecitation.glade index 644dc3b67..86355929b 100644 --- a/src/gui/glade/mergecitation.glade +++ b/src/gui/glade/mergecitation.glade @@ -1,51 +1,127 @@ - + - - + + False True 500 dialog - + True + False vertical + + + True + False + end + + + gtk-cancel + False + True + True + True + False + False + True + + + False + False + 0 + + + + + gtk-ok + False + True + True + True + False + False + True + + + False + False + 1 + + + + + gtk-help + False + True + True + True + False + False + True + + + False + False + 2 + + + + + False + True + end + 0 + + True + False True + False True False False 15 + 0 True + False Select the citation that will provide the primary data for the merged citation. False + True 1 True + False + False True True + False + False + 0.5 True True + False True @@ -53,17 +129,23 @@ primary data for the merged citation. False False + 0 + False True True + False + False + 0.5 True handle_btn1 True + False True @@ -77,6 +159,7 @@ primary data for the merged citation. False + True 5 2 @@ -88,28 +171,44 @@ primary data for the merged citation. True + False True + False 6 6 4 6 6 + + + + + + + + + + + + True + False <b>Source 1</b> True GTK_FILL - + True + False <b>Source 2</b> True @@ -117,32 +216,38 @@ primary data for the merged citation. 2 3 GTK_FILL - + Volume/Page: + False True True False + False True + 0.5 True 1 2 GTK_FILL - + Volume/Page: + False True True False + False True + 0.5 True page_btn1 @@ -152,32 +257,38 @@ primary data for the merged citation. 1 2 GTK_FILL - + Date: + False True True False + False True + 0.5 True 2 3 GTK_FILL - + Date: + False True True False + False True + 0.5 True date_btn1 @@ -187,32 +298,38 @@ primary data for the merged citation. 2 3 GTK_FILL - + Confidence: + False True True False + False True + 0.5 True 3 4 GTK_FILL - + Confidence: + False True True False + False True + 0.5 True confidence_btn1 @@ -222,32 +339,38 @@ primary data for the merged citation. 3 4 GTK_FILL - + Gramps ID: + False True True False + False True + 0.5 True 5 6 GTK_FILL - + Gramps ID: + False True True False + False True + 0.5 True gramps_btn1 @@ -257,7 +380,7 @@ primary data for the merged citation. 5 6 GTK_FILL - + @@ -271,7 +394,7 @@ primary data for the merged citation. 2 1 2 - + @@ -285,7 +408,7 @@ primary data for the merged citation. 4 1 2 - + @@ -299,7 +422,7 @@ primary data for the merged citation. 2 2 3 - + @@ -313,7 +436,7 @@ primary data for the merged citation. 4 2 3 - + @@ -327,7 +450,7 @@ primary data for the merged citation. 2 3 4 - + @@ -341,7 +464,7 @@ primary data for the merged citation. 4 3 4 - + @@ -355,9 +478,12 @@ primary data for the merged citation. 2 5 6 - + + + + True @@ -369,54 +495,29 @@ primary data for the merged citation. 4 5 6 - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + True + True + 0 + True + False Notes, media objects and data-items of both citations will be combined. True + True + True 6 1 @@ -426,74 +527,22 @@ primary data for the merged citation. True + False Detailed Selection + False + True 3 - False - - - - - 1 - - - - - True - end - - - gtk-cancel - True - True - True - False - True - - - False - False - 0 - - - - - gtk-ok - True - True - True - False - True - - - False - False - 1 - - - - - gtk-help - True - True - True - False - True - - - False - False - 2 False - end - 0 + True + 1 diff --git a/src/gui/glade/mergedata.glade b/src/gui/glade/mergedata.glade index 76db3a042..dfaa62a61 100644 --- a/src/gui/glade/mergedata.glade +++ b/src/gui/glade/mergedata.glade @@ -1,189 +1,33 @@ - - - - + + + False True - 450 + 700 + 500 dialog - + True + False 8 - - - True - - - True - center - - - False - False - 6 - 0 - - - - - True - 6 - 4 - 3 - 6 - 6 - - - True - True - - - Other - - - - - 2 - 3 - 3 - 4 - - - - - - True - 0 - center - - - 2 - 3 - 1 - 2 - GTK_FILL - - - - - - True - 0 - center - - - 2 - 3 - 2 - 3 - GTK_FILL - - - - - - True - 0 - <b>Title selection</b> - True - - - 3 - GTK_FILL - - - - - - Place 1 - True - True - False - True - True - True - - - 1 - 2 - 1 - 2 - GTK_FILL - - - - - - Place 2 - True - True - False - True - True - place1 - - - 1 - 2 - 2 - 3 - GTK_FILL - - - - - - Other - True - True - False - True - True - place1 - - - 1 - 2 - 3 - 4 - GTK_FILL - - - - - - - - - - - - - - - 1 - - - - - 1 - - - + True + False end - + gtk-cancel + False True True True False + False True - + False @@ -192,14 +36,17 @@ - - gtk-ok + + Merge and _edit + False True + False True True False - True - + False + True + False @@ -208,14 +55,16 @@ - - gtk-help + + _Merge and close + False True True True False - True - + False + True + False @@ -223,36 +72,40 @@ 2 + + + gtk-help + False + True + True + True + False + False + True + + + + False + False + 3 + + False + True end 0 - - - - place_cancel - place_ok - place_help - - - - True - 700 - 500 - dialog - - - True - 8 True + False True + False center @@ -265,6 +118,7 @@ True + False 2 2 5 @@ -272,8 +126,6 @@ True True - automatic - automatic in @@ -292,8 +144,6 @@ True True - automatic - automatic in @@ -316,10 +166,13 @@ Select + False True True False + False True + 0.5 True @@ -327,17 +180,20 @@ 2 1 2 - - + + Select + False True True False + False True + 0.5 True True select2 @@ -345,94 +201,22 @@ 1 2 - - + + + True + True 1 - - 1 - - - - - True - end - - - gtk-cancel - True - True - True - False - True - - - - False - False - 0 - - - - - Merge and _edit - True - False - True - True - False - True - - - - False - False - 1 - - - - - _Merge and close - True - True - True - False - True - - - - False - False - 2 - - - - - gtk-help - True - True - True - False - True - - - - False - False - 3 - - - False - end - 0 + True + 1 @@ -444,23 +228,606 @@ merge_help + + False + True + 300 + dialog + + + True + False + 8 + + + True + False + end + + + gtk-cancel + False + True + True + True + False + False + True + + + False + False + 0 + + + + + gtk-ok + False + True + True + True + False + False + True + + + False + False + 1 + + + + + gtk-help + False + True + True + True + False + False + True + + + False + False + 2 + + + + + False + True + end + 0 + + + + + True + False + 12 + 6 + + + True + False + + + False + False + 0 + + + + + True + False + Select the person that will provide the primary data for the merged person. + True + + + False + False + 6 + 1 + + + + + True + False + 2 + 2 + + + True + False + 0 + center + + + 1 + 2 + GTK_FILL + + + + + + True + False + 0 + center + + + 1 + 2 + 1 + 2 + GTK_FILL + + + + + + False + True + True + False + False + True + 0.5 + True + True + + + GTK_FILL + + 5 + 5 + + + + + False + True + True + False + False + True + 0.5 + True + person1 + + + 1 + 2 + GTK_FILL + + 5 + 5 + + + + + True + True + 2 + + + + + False + True + 1 + + + + + + button15 + button16 + people_help + + + + False + True + 450 + dialog + + + True + False + 8 + + + True + False + end + + + gtk-cancel + False + True + True + True + False + False + True + + + + False + False + 0 + + + + + gtk-ok + False + True + True + True + False + False + True + + + + False + False + 1 + + + + + gtk-help + False + True + True + True + False + False + True + + + + False + False + 2 + + + + + False + True + end + 0 + + + + + True + False + + + True + False + center + + + False + False + 6 + 0 + + + + + True + False + 6 + 4 + 3 + 6 + 6 + + + + + + + + + + + + True + True + + + Other + + + + + 2 + 3 + 3 + 4 + + + + + + True + False + 0 + center + + + 2 + 3 + 1 + 2 + GTK_FILL + + + + + + True + False + 0 + center + + + 2 + 3 + 2 + 3 + GTK_FILL + + + + + + True + False + 0 + <b>Title selection</b> + True + + + 3 + GTK_FILL + + + + + + Place 1 + False + True + True + False + False + True + 0.5 + True + True + + + 1 + 2 + 1 + 2 + GTK_FILL + + + + + + Place 2 + False + True + True + False + False + True + 0.5 + True + place1 + + + 1 + 2 + 2 + 3 + GTK_FILL + + + + + + Other + False + True + True + False + False + True + 0.5 + True + place1 + + + 1 + 2 + 3 + 4 + GTK_FILL + + + + + + True + True + 1 + + + + + False + True + 1 + + + + + + place_cancel + place_ok + place_help + + + False 500 dialog - + True + False + + + True + False + end + + + gtk-cancel + False + True + True + True + False + False + True + + + False + False + 0 + + + + + gtk-ok + False + True + True + True + False + False + True + + + False + False + 1 + + + + + gtk-help + False + True + True + True + False + False + True + + + False + False + 2 + + + + + False + True + end + 0 + + True + False 6 7 7 6 6 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + True + False 0 <b>Source 1</b> True @@ -470,12 +837,13 @@ 1 2 GTK_FILL - + True + False 0 <b>Source 2</b> True @@ -486,16 +854,19 @@ 1 2 GTK_FILL - + Title: + False True True False + False True + 0.5 True @@ -504,16 +875,19 @@ 2 3 GTK_FILL - + Title: + False True True False + False True + 0.5 True title_btn1 @@ -523,16 +897,19 @@ 2 3 GTK_FILL - + Author: + False True True False + False True + 0.5 True @@ -541,16 +918,19 @@ 3 4 GTK_FILL - + Author: + False True True False + False True + 0.5 True author_btn1 @@ -560,16 +940,19 @@ 3 4 GTK_FILL - + Abbreviation: + False True True False + False True + 0.5 True @@ -578,16 +961,19 @@ 4 5 GTK_FILL - + Abbreviation: + False True True False + False True + 0.5 True abbrev_btn1 @@ -597,16 +983,19 @@ 4 5 GTK_FILL - + Publication: + False True True False + False True + 0.5 True @@ -615,16 +1004,19 @@ 5 6 GTK_FILL - + Publication: + False True True False + False True + 0.5 True pub_btn1 @@ -634,16 +1026,19 @@ 5 6 GTK_FILL - + Gramps ID: + False True True False + False True + 0.5 True @@ -652,16 +1047,19 @@ 6 7 GTK_FILL - + Gramps ID: + False True True False + False True + 0.5 True gramps_btn1 @@ -671,17 +1069,18 @@ 6 7 GTK_FILL - + True + False True 7 - + @@ -696,7 +1095,7 @@ 3 2 3 - + @@ -711,7 +1110,7 @@ 7 2 3 - + @@ -726,7 +1125,7 @@ 3 3 4 - + @@ -741,7 +1140,7 @@ 7 3 4 - + @@ -756,7 +1155,7 @@ 3 4 5 - + @@ -771,7 +1170,7 @@ 7 4 5 - + @@ -786,7 +1185,7 @@ 3 5 6 - + @@ -801,7 +1200,7 @@ 7 5 6 - + @@ -816,7 +1215,7 @@ 3 6 7 - + @@ -831,116 +1230,14 @@ 7 6 7 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - - - - - True - end - - - gtk-cancel - True - True - True - False - True - - - False - False - 0 - - - - - gtk-ok - True - True - True - False - True - - - False - False - 1 - - - - - gtk-help - True - True - True - False - True - - - False - False - 2 + False - end - 0 + True + 1 @@ -951,181 +1248,4 @@ source_help - - True - 300 - dialog - - - True - 8 - - - True - 12 - 6 - - - True - - - False - False - 0 - - - - - True - Select the person that will provide the primary data for the merged person. - True - - - False - False - 6 - 1 - - - - - True - 2 - 2 - - - True - 0 - center - - - 1 - 2 - GTK_FILL - - - - - - True - 0 - center - - - 1 - 2 - 1 - 2 - GTK_FILL - - - - - - True - True - False - True - True - True - - - GTK_FILL - - 5 - 5 - - - - - True - True - False - True - True - person1 - - - 1 - 2 - GTK_FILL - - 5 - 5 - - - - - 2 - - - - - 1 - - - - - True - end - - - gtk-cancel - True - True - True - False - True - - - False - False - 0 - - - - - gtk-ok - True - True - True - False - True - - - False - False - 1 - - - - - gtk-help - True - True - True - False - True - - - False - False - 2 - - - - - False - end - 0 - - - - - - button15 - button16 - people_help - - diff --git a/src/gui/glade/mergeevent.glade b/src/gui/glade/mergeevent.glade index 677cecb36..94ae568ef 100644 --- a/src/gui/glade/mergeevent.glade +++ b/src/gui/glade/mergeevent.glade @@ -1,21 +1,88 @@ - + - - + + False True 500 dialog - + True + False vertical + + + True + False + end + + + gtk-cancel + False + True + True + True + False + False + True + + + False + False + 0 + + + + + gtk-ok + False + True + True + True + False + False + True + + + False + False + 1 + + + + + gtk-help + False + True + True + True + False + False + True + + + False + False + 2 + + + + + False + True + end + 0 + + True + False True + False True @@ -28,26 +95,33 @@ True + False Select the event that will provide the primary data for the merged event. False + True 1 True + False + False True True False + False + 0.5 True True + False True @@ -60,14 +134,18 @@ primary data for the merged event. + False True True False + False + 0.5 True handle_btn1 True + False True @@ -81,6 +159,7 @@ primary data for the merged event. False + True 5 2 @@ -92,9 +171,11 @@ primary data for the merged event. True + False True + False 6 6 4 @@ -103,17 +184,19 @@ primary data for the merged event. True + False <b>Event 1</b> True GTK_FILL - + True + False <b>Event 2</b> True @@ -121,32 +204,38 @@ primary data for the merged event. 2 3 GTK_FILL - + Type: + False True True False + False True + 0.5 True 1 2 GTK_FILL - + Type: + False True True False + False True + 0.5 True type_btn1 @@ -156,32 +245,38 @@ primary data for the merged event. 1 2 GTK_FILL - + Date: + False True True False + False True + 0.5 True 2 3 GTK_FILL - + Date: + False True True False + False True + 0.5 True date_btn1 @@ -191,32 +286,38 @@ primary data for the merged event. 2 3 GTK_FILL - + Place: + False True True False + False True + 0.5 True 3 4 GTK_FILL - + Place: + False True True False + False True + 0.5 True place_btn1 @@ -226,32 +327,38 @@ primary data for the merged event. 3 4 GTK_FILL - + Description: + False True True False + False True + 0.5 True 4 5 GTK_FILL - + Description: + False True True False + False True + 0.5 True desc_btn1 @@ -261,32 +368,38 @@ primary data for the merged event. 4 5 GTK_FILL - + Gramps ID: + False True True False + False True + 0.5 True 5 6 GTK_FILL - + Gramps ID: + False True True False + False True + 0.5 True gramps_btn1 @@ -296,7 +409,7 @@ primary data for the merged event. 5 6 GTK_FILL - + @@ -310,7 +423,7 @@ primary data for the merged event. 2 1 2 - + @@ -324,7 +437,7 @@ primary data for the merged event. 4 1 2 - + @@ -338,7 +451,7 @@ primary data for the merged event. 2 2 3 - + @@ -352,7 +465,7 @@ primary data for the merged event. 4 2 3 - + @@ -366,7 +479,7 @@ primary data for the merged event. 2 3 4 - + @@ -380,7 +493,7 @@ primary data for the merged event. 4 3 4 - + @@ -394,7 +507,7 @@ primary data for the merged event. 2 4 5 - + @@ -408,7 +521,7 @@ primary data for the merged event. 4 4 5 - + @@ -422,9 +535,12 @@ primary data for the merged event. 2 5 6 - + + + + True @@ -436,27 +552,29 @@ primary data for the merged event. 4 5 6 - + - - - + True + True 0 True + False Attributes, notes, sources and media objects of both events will be combined. True + True + True 6 1 @@ -466,74 +584,22 @@ primary data for the merged event. True + False Detailed Selection False + True 3 - - 1 - - - - - True - end - - - gtk-cancel - True - True - True - False - True - - - False - False - 0 - - - - - gtk-ok - True - True - True - False - True - - - False - False - 1 - - - - - gtk-help - True - True - True - False - True - - - False - False - 2 - - - False - end - 0 + True + 1 diff --git a/src/gui/glade/mergefamily.glade b/src/gui/glade/mergefamily.glade index 4b1e0433e..3acd570a0 100644 --- a/src/gui/glade/mergefamily.glade +++ b/src/gui/glade/mergefamily.glade @@ -1,22 +1,88 @@ - + - - + + False True 500 dialog - + True + False vertical + + + True + False + end + + + gtk-cancel + False + True + True + True + False + False + True + + + False + False + 0 + + + + + gtk-ok + False + True + True + True + False + False + True + + + False + False + 1 + + + + + gtk-help + False + True + True + True + False + False + True + + + False + False + 2 + + + + + False + True + end + 0 + + True - vertical + False True + False True @@ -29,26 +95,33 @@ True + False Select the family that will provide the primary data for the merged family. False + True 1 True + False + False True True False + False + 0.5 True True + False True @@ -61,14 +134,18 @@ primary data for the merged family. + False True True False + False + 0.5 True handle_btn1 True + False True @@ -82,6 +159,7 @@ primary data for the merged family. False + True 5 2 @@ -93,9 +171,11 @@ primary data for the merged family. True + False True + False 6 5 4 @@ -104,17 +184,19 @@ primary data for the merged family. True + False <b>Family 1</b> True GTK_FILL - + True + False <b>Family 2</b> True @@ -122,32 +204,38 @@ primary data for the merged family. 2 3 GTK_FILL - + Father: + False True True False + False True + 0.5 True 1 2 GTK_FILL - + Father: + False True True False + False True + 0.5 True father_btn1 @@ -157,32 +245,38 @@ primary data for the merged family. 1 2 GTK_FILL - + Mother: + False True True False + False True + 0.5 True 2 3 GTK_FILL - + Mother: + False True True False + False True + 0.5 True mother_btn1 @@ -192,32 +286,38 @@ primary data for the merged family. 2 3 GTK_FILL - + Relationship: + False True True False + False True + 0.5 True 3 4 GTK_FILL - + Relationship: + False True True False + False True + 0.5 True rel_btn1 @@ -227,32 +327,38 @@ primary data for the merged family. 3 4 GTK_FILL - + Gramps ID: + False True True False + False True + 0.5 True 4 5 GTK_FILL - + Gramps ID: + False True True False + False True + 0.5 True gramps_btn1 @@ -262,7 +368,7 @@ primary data for the merged family. 4 5 GTK_FILL - + @@ -276,7 +382,7 @@ primary data for the merged family. 2 1 2 - + @@ -290,7 +396,7 @@ primary data for the merged family. 4 1 2 - + @@ -304,7 +410,7 @@ primary data for the merged family. 2 2 3 - + @@ -318,7 +424,7 @@ primary data for the merged family. 4 2 3 - + @@ -332,7 +438,7 @@ primary data for the merged family. 2 3 4 - + @@ -346,7 +452,7 @@ primary data for the merged family. 4 3 4 - + @@ -360,9 +466,12 @@ primary data for the merged family. 2 4 5 - + + + + True @@ -374,27 +483,29 @@ primary data for the merged family. 4 4 5 - + - - - + True + True 0 True + False Events, lds_ord, media objects, attributes, notes, sources and tags of both families will be combined. True + True + True 6 1 @@ -404,74 +515,22 @@ primary data for the merged family. True + False Detailed Selection False + True 3 - - 1 - - - - - True - end - - - gtk-cancel - True - True - True - False - True - - - False - False - 0 - - - - - gtk-ok - True - True - True - False - True - - - False - False - 1 - - - - - gtk-help - True - True - True - False - True - - - False - False - 2 - - - False - end - 0 + True + 1 diff --git a/src/gui/glade/mergemedia.glade b/src/gui/glade/mergemedia.glade index b4ec3115a..27e408d78 100644 --- a/src/gui/glade/mergemedia.glade +++ b/src/gui/glade/mergemedia.glade @@ -1,21 +1,88 @@ - + - - + + False True 500 dialog - + True + False vertical + + + True + False + end + + + gtk-cancel + False + True + True + True + False + False + True + + + False + False + 0 + + + + + gtk-ok + False + True + True + True + False + False + True + + + False + False + 1 + + + + + gtk-help + False + True + True + True + False + False + True + + + False + False + 2 + + + + + False + True + end + 0 + + True + False True + False True @@ -28,26 +95,33 @@ True + False Select the object that will provide the primary data for the merged object. False + True 1 True + False + False True True False + False + 0.5 True True + False True @@ -60,14 +134,18 @@ primary data for the merged object. + False True True False + False + 0.5 True handle_btn1 True + False True @@ -81,6 +159,7 @@ primary data for the merged object. False + True 5 2 @@ -92,9 +171,11 @@ primary data for the merged object. True + False True + False 6 5 4 @@ -103,17 +184,19 @@ primary data for the merged object. True + False <b>Object 1</b> True GTK_FILL - + True + False <b>Object 2</b> True @@ -121,32 +204,38 @@ primary data for the merged object. 2 3 GTK_FILL - + Title: + False True True False + False True + 0.5 True 1 2 GTK_FILL - + Title: + False True True False + False True + 0.5 True desc_btn1 @@ -156,32 +245,38 @@ primary data for the merged object. 1 2 GTK_FILL - + Path: + False True True False + False True + 0.5 True 2 3 GTK_FILL - + Path: + False True True False + False True + 0.5 True path_btn1 @@ -191,32 +286,38 @@ primary data for the merged object. 2 3 GTK_FILL - + Date: + False True True False + False True + 0.5 True 3 4 GTK_FILL - + Date: + False True True False + False True + 0.5 True date_btn1 @@ -226,32 +327,38 @@ primary data for the merged object. 3 4 GTK_FILL - + Gramps ID: + False True True False + False True + 0.5 True 4 5 GTK_FILL - + Gramps ID: + False True True False + False True + 0.5 True gramps_btn1 @@ -261,7 +368,7 @@ primary data for the merged object. 4 5 GTK_FILL - + @@ -275,7 +382,7 @@ primary data for the merged object. 2 1 2 - + @@ -289,7 +396,7 @@ primary data for the merged object. 4 1 2 - + @@ -303,7 +410,7 @@ primary data for the merged object. 2 2 3 - + @@ -317,7 +424,7 @@ primary data for the merged object. 4 2 3 - + @@ -331,7 +438,7 @@ primary data for the merged object. 2 3 4 - + @@ -345,7 +452,7 @@ primary data for the merged object. 4 3 4 - + @@ -359,9 +466,12 @@ primary data for the merged object. 2 4 5 - + + + + True @@ -373,27 +483,29 @@ primary data for the merged object. 4 4 5 - + - - - + True + True 0 True + False Attributes, sources, notes and tags of both objects will be combined. True + True + True 6 1 @@ -403,74 +515,22 @@ primary data for the merged object. True + False Detailed Selection False + True 3 - - 1 - - - - - True - end - - - gtk-cancel - True - True - True - False - True - - - False - False - 0 - - - - - gtk-ok - True - True - True - False - True - - - False - False - 1 - - - - - gtk-help - True - True - True - False - True - - - False - False - 2 - - - False - end - 0 + True + 1 diff --git a/src/gui/glade/mergenote.glade b/src/gui/glade/mergenote.glade index 834f4a2e8..691271644 100644 --- a/src/gui/glade/mergenote.glade +++ b/src/gui/glade/mergenote.glade @@ -1,21 +1,88 @@ - + - - + + False True 600 dialog - + True + False vertical + + + True + False + end + + + gtk-cancel + False + True + True + True + False + False + True + + + False + False + 0 + + + + + gtk-ok + False + True + True + True + False + False + True + + + False + False + 1 + + + + + gtk-help + False + True + True + True + False + False + True + + + False + False + 2 + + + + + False + True + end + 0 + + True + False True + False True @@ -28,26 +95,33 @@ True + False Select the note that will provide the primary data for the merged note. False + True 1 True + False + False True True False + False + 0.5 True True + False True @@ -60,14 +134,18 @@ primary data for the merged note. + False True True False + False + 0.5 True handle_btn1 True + False True @@ -81,6 +159,7 @@ primary data for the merged note. False + True 5 2 @@ -92,9 +171,11 @@ primary data for the merged note. True + False True + False 6 5 4 @@ -103,17 +184,19 @@ primary data for the merged note. True + False <b>Note 1</b> True GTK_FILL - + True + False <b>Note 2</b> True @@ -121,32 +204,38 @@ primary data for the merged note. 2 3 GTK_FILL - + Text: + False True True False + False True + 0.5 True 1 2 GTK_FILL - + Text: + False True True False + False True + 0.5 True text_btn1 @@ -156,32 +245,38 @@ primary data for the merged note. 1 2 GTK_FILL - + Type: + False True True False + False True + 0.5 True 2 3 GTK_FILL - + Type: + False True True False + False True + 0.5 True type_btn1 @@ -191,32 +286,38 @@ primary data for the merged note. 2 3 GTK_FILL - + Format: + False True True False + False True + 0.5 True 3 4 GTK_FILL - + Format: + False True True False + False True + 0.5 True format_btn1 @@ -226,32 +327,38 @@ primary data for the merged note. 3 4 GTK_FILL - + Gramps ID: + False True True False + False True + 0.5 True 4 5 GTK_FILL - + Gramps ID: + False True True False + False True + 0.5 True gramps_btn1 @@ -261,15 +368,13 @@ primary data for the merged note. 4 5 GTK_FILL - + True True - automatic - automatic in @@ -284,15 +389,13 @@ primary data for the merged note. 2 1 2 - + True True - automatic - automatic in @@ -307,7 +410,7 @@ primary data for the merged note. 4 1 2 - + @@ -321,7 +424,7 @@ primary data for the merged note. 2 2 3 - + @@ -335,7 +438,7 @@ primary data for the merged note. 4 2 3 - + @@ -349,7 +452,7 @@ primary data for the merged note. 2 3 4 - + @@ -363,7 +466,7 @@ primary data for the merged note. 4 3 4 - + @@ -377,9 +480,12 @@ primary data for the merged note. 2 4 5 - + + + + True @@ -391,26 +497,28 @@ primary data for the merged note. 4 4 5 - + - - - + True + True 0 True + False True + True + True 6 1 @@ -420,73 +528,22 @@ primary data for the merged note. True + False Detailed Selection + True + True 3 - - 1 - - - - - True - end - - - gtk-cancel - True - True - True - False - True - - - False - False - 0 - - - - - gtk-ok - True - True - True - False - True - - - False - False - 1 - - - - - gtk-help - True - True - True - False - True - - - False - False - 2 - - - False - end - 0 + True + 1 diff --git a/src/gui/glade/mergeperson.glade b/src/gui/glade/mergeperson.glade index 815e58421..2f717f271 100644 --- a/src/gui/glade/mergeperson.glade +++ b/src/gui/glade/mergeperson.glade @@ -1,21 +1,88 @@ - + - - + + False True 700 dialog - + True + False vertical + + + True + False + end + + + gtk-cancel + False + True + True + True + False + False + True + + + False + False + 0 + + + + + gtk-ok + False + True + True + True + False + False + True + + + False + False + 1 + + + + + gtk-help + False + True + True + True + False + False + True + + + False + False + 2 + + + + + False + True + end + 0 + + True + False True + False True @@ -28,26 +95,33 @@ True + False Select the person that will provide the primary data for the merged person. False + True 1 True + False + False True True False + False + 0.5 True True + False True @@ -60,14 +134,18 @@ primary data for the merged person. + False True True False + False + 0.5 True handle_btn1 True + False True @@ -81,6 +159,7 @@ primary data for the merged person. False + True 5 2 @@ -92,9 +171,11 @@ primary data for the merged person. True + False True + False 6 4 4 @@ -103,17 +184,19 @@ primary data for the merged person. True + False <b>Person 1</b> True GTK_FILL - + True + False <b>Person 2</b> True @@ -121,32 +204,38 @@ primary data for the merged person. 2 3 GTK_FILL - + Name: + False True True False + False True + 0.5 True 1 2 GTK_FILL - + Name: + False True True False + False True + 0.5 True name_btn1 @@ -156,32 +245,38 @@ primary data for the merged person. 1 2 GTK_FILL - + Gender: + False True True False + False True + 0.5 True 2 3 GTK_FILL - + Gender: + False True True False + False True + 0.5 True gender_btn1 @@ -191,32 +286,38 @@ primary data for the merged person. 2 3 GTK_FILL - + Gramps ID: + False True True False + False True + 0.5 True 3 4 GTK_FILL - + Gramps ID: + False True True False + False True + 0.5 True gramps_btn1 @@ -226,7 +327,7 @@ primary data for the merged person. 3 4 GTK_FILL - + @@ -240,7 +341,7 @@ primary data for the merged person. 2 1 2 - + @@ -254,7 +355,7 @@ primary data for the merged person. 4 1 2 - + @@ -268,7 +369,7 @@ primary data for the merged person. 2 2 3 - + @@ -282,7 +383,7 @@ primary data for the merged person. 4 2 3 - + @@ -296,9 +397,12 @@ primary data for the merged person. 2 3 4 - + + + + True @@ -310,27 +414,29 @@ primary data for the merged person. 4 3 4 - + - - - + True + True 0 True + False Events, media objects, addresses, attributes, urls, notes, sources and tags of both persons will be combined. True + True + True 6 1 @@ -340,12 +446,14 @@ primary data for the merged person. True + False Detailed Selection False + True 3 @@ -356,13 +464,12 @@ primary data for the merged person. True + False 5 True True - automatic - automatic in @@ -377,6 +484,8 @@ primary data for the merged person. + True + True 1 @@ -384,8 +493,6 @@ primary data for the merged person. True True - automatic - automatic in @@ -400,6 +507,8 @@ primary data for the merged person. + True + True 2 @@ -408,73 +517,22 @@ primary data for the merged person. True + False Context Information + True + True 4 - - 1 - - - - - True - end - - - gtk-cancel - True - True - True - False - True - - - False - False - 0 - - - - - gtk-ok - True - True - True - False - True - - - False - False - 1 - - - - - gtk-help - True - True - True - False - True - - - False - False - 2 - - - False - end - 0 + True + 1 diff --git a/src/gui/glade/mergeplace.glade b/src/gui/glade/mergeplace.glade index 0e203ed1d..765ce583a 100644 --- a/src/gui/glade/mergeplace.glade +++ b/src/gui/glade/mergeplace.glade @@ -1,52 +1,127 @@ - + - - + + False True 500 dialog - + True + False vertical + + + True + False + end + + + gtk-cancel + False + True + True + True + False + False + True + + + False + False + 0 + + + + + gtk-ok + False + True + True + True + False + False + True + + + False + False + 1 + + + + + gtk-help + False + True + True + True + False + False + True + + + False + False + 2 + + + + + False + True + end + 0 + + True - vertical + False True + False True False False 15 + 0 True + False Select the place that will provide the primary data for the merged place. False + True 1 True + False + False True True + False + False + 0.5 True True + False True @@ -54,17 +129,23 @@ primary data for the merged place. False False + 0 + False True True + False + False + 0.5 True handle_btn1 True + False True @@ -78,6 +159,7 @@ primary data for the merged place. False + True 5 2 @@ -89,9 +171,11 @@ primary data for the merged place. True + False True + False 6 6 4 @@ -100,17 +184,19 @@ primary data for the merged place. True + False <b>Place 1</b> True GTK_FILL - + True + False <b>Place 2</b> True @@ -118,32 +204,38 @@ primary data for the merged place. 2 3 GTK_FILL - + Title: + False True True False + False True + 0.5 True 1 2 GTK_FILL - + Title: + False True True False + False True + 0.5 True title_btn1 @@ -153,32 +245,38 @@ primary data for the merged place. 1 2 GTK_FILL - + Latitude: + False True True False + False True + 0.5 True 2 3 GTK_FILL - + Latitude: + False True True False + False True + 0.5 True lat_btn1 @@ -188,32 +286,38 @@ primary data for the merged place. 2 3 GTK_FILL - + Longitude: + False True True False + False True + 0.5 True 3 4 GTK_FILL - + Longitude: + False True True False + False True + 0.5 True long_btn1 @@ -223,32 +327,38 @@ primary data for the merged place. 3 4 GTK_FILL - + Location: + False True True False + False True + 0.5 True 4 5 GTK_FILL - + Location: + False True True False + False True + 0.5 True loc_btn1 @@ -258,32 +368,38 @@ primary data for the merged place. 4 5 GTK_FILL - + Gramps ID: + False True True False + False True + 0.5 True 5 6 GTK_FILL - + Gramps ID: + False True True False + False True + 0.5 True gramps_btn1 @@ -293,7 +409,7 @@ primary data for the merged place. 5 6 GTK_FILL - + @@ -307,7 +423,7 @@ primary data for the merged place. 2 1 2 - + @@ -321,7 +437,7 @@ primary data for the merged place. 4 1 2 - + @@ -335,7 +451,7 @@ primary data for the merged place. 2 2 3 - + @@ -349,7 +465,7 @@ primary data for the merged place. 4 2 3 - + @@ -363,7 +479,7 @@ primary data for the merged place. 2 3 4 - + @@ -377,12 +493,13 @@ primary data for the merged place. 4 3 4 - + True + False True @@ -396,12 +513,13 @@ primary data for the merged place. 2 4 5 - + True + False True @@ -415,7 +533,7 @@ primary data for the merged place. 4 4 5 - + @@ -429,9 +547,12 @@ primary data for the merged place. 2 5 6 - + + + + True @@ -443,54 +564,29 @@ primary data for the merged place. 4 5 6 - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + True + True + 0 + True + False Alternate locations, sources, urls, media objects and notes of both places will be combined. True + True + True 6 1 @@ -500,74 +596,22 @@ primary data for the merged place. True + False Detailed Selection + False + True 3 - False - - - - - 1 - - - - - True - end - - - gtk-cancel - True - True - True - False - True - - - False - False - 0 - - - - - gtk-ok - True - True - True - False - True - - - False - False - 1 - - - - - gtk-help - True - True - True - False - True - - - False - False - 2 False - end - 0 + True + 1 diff --git a/src/gui/glade/mergerepository.glade b/src/gui/glade/mergerepository.glade index cb08acae4..b94a2c70e 100644 --- a/src/gui/glade/mergerepository.glade +++ b/src/gui/glade/mergerepository.glade @@ -1,51 +1,127 @@ - + - - + + False True 500 dialog - + True + False vertical + + + True + False + end + + + gtk-cancel + False + True + True + True + False + False + True + + + False + False + 0 + + + + + gtk-ok + False + True + True + True + False + False + True + + + False + False + 1 + + + + + gtk-help + False + True + True + True + False + False + True + + + False + False + 2 + + + + + False + True + end + 0 + + True + False True + False True False False 15 + 0 True + False Select the repository that will provide the primary data for the merged repository. False + True 1 True + False + False True True + False + False + 0.5 True True + False True @@ -53,17 +129,23 @@ primary data for the merged repository. False False + 0 + False True True + False + False + 0.5 True handle_btn1 True + False True @@ -77,6 +159,7 @@ primary data for the merged repository. False + True 5 2 @@ -88,9 +171,11 @@ primary data for the merged repository. True + False True + False 6 4 4 @@ -99,17 +184,19 @@ primary data for the merged repository. True + False <b>Repository 1</b> True GTK_FILL - + True + False <b>Repository 2</b> True @@ -117,32 +204,38 @@ primary data for the merged repository. 2 3 GTK_FILL - + Name: + False True True False + False True + 0.5 True 1 2 GTK_FILL - + Name: + False True True False + False True + 0.5 True name_btn1 @@ -152,32 +245,38 @@ primary data for the merged repository. 1 2 GTK_FILL - + Type: + False True True False + False True + 0.5 True 2 3 GTK_FILL - + Type: + False True True False + False True + 0.5 True type_btn1 @@ -187,32 +286,38 @@ primary data for the merged repository. 2 3 GTK_FILL - + Gramps ID: + False True True False + False True + 0.5 True 3 4 GTK_FILL - + Gramps ID: + False True True False + False True + 0.5 True gramps_btn1 @@ -222,7 +327,7 @@ primary data for the merged repository. 3 4 GTK_FILL - + @@ -236,7 +341,7 @@ primary data for the merged repository. 2 1 2 - + @@ -250,7 +355,7 @@ primary data for the merged repository. 4 1 2 - + @@ -264,7 +369,7 @@ primary data for the merged repository. 2 2 3 - + @@ -278,7 +383,7 @@ primary data for the merged repository. 4 2 3 - + @@ -292,9 +397,12 @@ primary data for the merged repository. 2 3 4 - + + + + True @@ -306,54 +414,29 @@ primary data for the merged repository. 4 3 4 - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + True + True + 0 + True + False Addresses, urls and notes of both repositories will be combined. True + True + True 6 1 @@ -363,74 +446,22 @@ primary data for the merged repository. True + False Detailed Selection + False + True 3 - False - - - - - 1 - - - - - True - end - - - gtk-cancel - True - True - True - False - True - - - False - False - 0 - - - - - gtk-ok - True - True - True - False - True - - - False - False - 1 - - - - - gtk-help - True - True - True - False - True - - - False - False - 2 False - end - 0 + True + 1 diff --git a/src/gui/glade/mergesource.glade b/src/gui/glade/mergesource.glade index 09c446d78..73c53ab13 100644 --- a/src/gui/glade/mergesource.glade +++ b/src/gui/glade/mergesource.glade @@ -1,51 +1,127 @@ - + - - + + False True 500 dialog - + True + False vertical + + + True + False + end + + + gtk-cancel + False + True + True + True + False + False + True + + + False + False + 0 + + + + + gtk-ok + False + True + True + True + False + False + True + + + False + False + 1 + + + + + gtk-help + False + True + True + True + False + False + True + + + False + False + 2 + + + + + False + True + end + 0 + + True + False True + False True False False 15 + 0 True + False Select the source that will provide the primary data for the merged source. False + True 1 True + False + False True True + False + False + 0.5 True True + False True @@ -53,17 +129,23 @@ primary data for the merged source. False False + 0 + False True True + False + False + 0.5 True handle_btn1 True + False True @@ -77,6 +159,7 @@ primary data for the merged source. False + True 5 2 @@ -88,9 +171,11 @@ primary data for the merged source. True + False True + False 6 6 4 @@ -99,17 +184,19 @@ primary data for the merged source. True + False <b>Source 1</b> True GTK_FILL - + True + False <b>Source 2</b> True @@ -117,32 +204,38 @@ primary data for the merged source. 2 3 GTK_FILL - + Title: + False True True False + False True + 0.5 True 1 2 GTK_FILL - + Title: + False True True False + False True + 0.5 True title_btn1 @@ -152,32 +245,38 @@ primary data for the merged source. 1 2 GTK_FILL - + Author: + False True True False + False True + 0.5 True 2 3 GTK_FILL - + Author: + False True True False + False True + 0.5 True author_btn1 @@ -187,32 +286,38 @@ primary data for the merged source. 2 3 GTK_FILL - + Abbreviation: + False True True False + False True + 0.5 True 3 4 GTK_FILL - + Abbreviation: + False True True False + False True + 0.5 True abbrev_btn1 @@ -222,32 +327,38 @@ primary data for the merged source. 3 4 GTK_FILL - + Publication: + False True True False + False True + 0.5 True 4 5 GTK_FILL - + Publication: + False True True False + False True + 0.5 True pub_btn1 @@ -257,32 +368,38 @@ primary data for the merged source. 4 5 GTK_FILL - + Gramps ID: + False True True False + False True + 0.5 True 5 6 GTK_FILL - + Gramps ID: + False True True False + False True + 0.5 True gramps_btn1 @@ -292,7 +409,7 @@ primary data for the merged source. 5 6 GTK_FILL - + @@ -306,7 +423,7 @@ primary data for the merged source. 2 1 2 - + @@ -320,7 +437,7 @@ primary data for the merged source. 4 1 2 - + @@ -334,7 +451,7 @@ primary data for the merged source. 2 2 3 - + @@ -348,7 +465,7 @@ primary data for the merged source. 4 2 3 - + @@ -362,7 +479,7 @@ primary data for the merged source. 2 3 4 - + @@ -376,7 +493,7 @@ primary data for the merged source. 4 3 4 - + @@ -390,7 +507,7 @@ primary data for the merged source. 2 4 5 - + @@ -404,7 +521,7 @@ primary data for the merged source. 4 4 5 - + @@ -418,9 +535,12 @@ primary data for the merged source. 2 5 6 - + + + + True @@ -432,54 +552,29 @@ primary data for the merged source. 4 5 6 - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + True + True + 0 + True + False Notes, media objects, data-items and repository references of both sources will be combined. True + True + True 6 1 @@ -489,74 +584,22 @@ primary data for the merged source. True + False Detailed Selection + False + True 3 - False - - - - - 1 - - - - - True - end - - - gtk-cancel - True - True - True - False - True - - - False - False - 0 - - - - - gtk-ok - True - True - True - False - True - - - False - False - 1 - - - - - gtk-help - True - True - True - False - True - - - False - False - 2 False - end - 0 + True + 1 diff --git a/src/gui/glade/papermenu.glade b/src/gui/glade/papermenu.glade index f70a6c33a..6ec066cdb 100644 --- a/src/gui/glade/papermenu.glade +++ b/src/gui/glade/papermenu.glade @@ -1,13 +1,13 @@ - - - + + False Paper Settings True + False 6 6 @@ -16,9 +16,11 @@ True + False True + False 0 Paper format @@ -31,29 +33,39 @@ True + False 12 True + False 6 4 3 6 6 + + + + + + True + False 0 Size: GTK_FILL - + True + False 0 _Width: True @@ -63,12 +75,13 @@ 1 2 GTK_FILL - + True + False 0 _Height: True @@ -78,12 +91,13 @@ 2 3 GTK_FILL - + True + False 0 Orientation: @@ -91,7 +105,7 @@ 3 4 GTK_FILL - + @@ -106,12 +120,13 @@ 2 2 3 - + True + False 0 cm 3 @@ -122,12 +137,13 @@ 1 2 GTK_FILL - + True + False 0 cm 3 @@ -138,9 +154,12 @@ 2 3 GTK_FILL - + + + + True @@ -153,39 +172,36 @@ 2 1 2 - + - - - - - - - - - + True + True 1 + True + True 1 True + False True + False 0 Margins @@ -198,10 +214,12 @@ True + False 12 True + False 6 4 3 @@ -210,6 +228,7 @@ True + False 0 _Left: True @@ -217,12 +236,13 @@ GTK_FILL - + True + False 0 _Right: True @@ -232,12 +252,13 @@ 1 2 GTK_FILL - + True + False 0 _Top: True @@ -247,12 +268,13 @@ 2 3 GTK_FILL - + True + False 0 _Bottom: True @@ -262,12 +284,13 @@ 3 4 GTK_FILL - + True + False 0 cm 3 @@ -276,12 +299,13 @@ 2 3 GTK_FILL - + True + False 0 cm 3 @@ -292,12 +316,13 @@ 2 3 GTK_FILL - + True + False 0 cm 3 @@ -308,7 +333,7 @@ 3 4 GTK_FILL - + @@ -321,7 +346,7 @@ 1 2 - + @@ -336,7 +361,7 @@ 2 1 2 - + @@ -351,7 +376,7 @@ 2 2 3 - + @@ -366,12 +391,13 @@ 2 3 4 - + True + False 0 cm 3 @@ -382,34 +408,42 @@ 1 2 GTK_FILL - + + True + True 1 + True + True 2 True + False Metric + False True True False + False True + 0.5 True True diff --git a/src/gui/glade/plugins.glade b/src/gui/glade/plugins.glade index 27d813eaa..dc7176b10 100644 --- a/src/gui/glade/plugins.glade +++ b/src/gui/glade/plugins.glade @@ -1,15 +1,72 @@ - - + True + False 600 400 - + True + False + + + True + False + 6 + end + + + gtk-close + False + True + True + True + False + False + True + + + + False + False + 0 + + + + + False + True + True + True + False + Perform selected action + False + True + + + Run + + + + + + False + False + 1 + + + + + False + True + 6 + end + 0 + + True @@ -18,8 +75,6 @@ True False - automatic - automatic in @@ -27,6 +82,9 @@ True True False + + + @@ -38,12 +96,15 @@ True + False True + False True + False 0 10 10 @@ -51,12 +112,15 @@ center + True + True 0 False + True 20 0 @@ -64,6 +128,7 @@ True + False 0 0 10 @@ -72,16 +137,20 @@ True + True + True 1 + False 3 2 True + False 1 3 3 @@ -90,24 +159,26 @@ GTK_FILL - + True + False 0 5 1 2 - + True + False 1 3 3 @@ -117,12 +188,13 @@ 1 2 GTK_FILL - + True + False 1 3 3 @@ -132,12 +204,13 @@ 2 3 GTK_FILL - + True + False 0 5 @@ -147,12 +220,13 @@ 1 2 GTK_FILL - + True + False 0 5 @@ -162,12 +236,13 @@ 2 3 GTK_FILL - + False + True 2 @@ -179,59 +254,11 @@ + True + True 1 - - - True - 6 - end - - - gtk-close - True - True - True - False - True - - - - False - False - 0 - - - - - True - True - True - False - Perform selected action - True - - - Run - - - - - - False - False - 1 - - - - - False - 6 - end - 0 - - diff --git a/src/gui/glade/reorder.glade b/src/gui/glade/reorder.glade index def620092..429796266 100644 --- a/src/gui/glade/reorder.glade +++ b/src/gui/glade/reorder.glade @@ -1,43 +1,111 @@ - - + True + False 12 500 400 dialog - + True + False + + + True + False + end + + + gtk-cancel + False + True + True + True + True + False + True + + + False + False + 0 + + + + + gtk-ok + False + True + True + True + True + False + True + + + False + False + 1 + + + + + False + True + end + 0 + + True + False 5 3 6 6 + + + + + + + + + + + + + + + True + False 0 <b>Parent relationships</b> True 3 - + True + False + False True True True + False Move parent up @@ -46,6 +114,7 @@ True + False gtk-go-up @@ -63,9 +132,11 @@ + False True True True + False Move parent down @@ -74,6 +145,7 @@ True + False gtk-go-down @@ -106,13 +178,14 @@ True True - automatic - automatic in True True + + + @@ -126,6 +199,7 @@ True + False 0 <b>Family relationships</b> True @@ -135,20 +209,21 @@ 3 4 GTK_FILL - + True True - automatic - automatic in True True + + + @@ -163,11 +238,14 @@ True + False + False True True True + False Move family up @@ -176,6 +254,7 @@ True + False gtk-go-up @@ -193,9 +272,11 @@ + False True True True + False Move family down @@ -204,6 +285,7 @@ True + False gtk-go-down @@ -232,65 +314,11 @@ GTK_FILL - - - - - - - - - - - - - - - - - - 2 - - - - - True - end - - - gtk-cancel - True - True - True - True - True - - - False - False - 0 - - - - - gtk-ok - True - True - True - True - True - - - False - False - 1 - - False - end - 0 + True + 2 diff --git a/src/gui/glade/rule.glade b/src/gui/glade/rule.glade index e0af97c56..801aacea6 100644 --- a/src/gui/glade/rule.glade +++ b/src/gui/glade/rule.glade @@ -1,8 +1,284 @@ - - - + + + False + 400 + 350 + dialog + center + + + + True + False + 8 + + + True + False + end + + + gtk-close + False + True + True + True + False + False + True + + + + False + False + 0 + + + + + gtk-help + False + True + True + True + False + False + True + + + + False + False + 1 + + + + + False + True + end + 0 + + + + + True + False + + + True + False + center + + + False + False + 5 + 0 + + + + + True + False + 6 + 6 + + + True + False + in + + + True + True + + + + + + + + True + True + 0 + + + + + True + False + 6 + + + False + True + True + True + False + Add a new filter + False + + + + True + False + gtk-add + + + + + False + False + 0 + + + + + False + True + False + True + True + False + Edit the selected filter + False + + + + True + False + gtk-edit + + + + + False + False + 1 + + + + + False + True + False + True + True + False + Clone the selected filter + False + + + + True + False + gtk-copy + + + + + False + False + 2 + + + + + False + True + True + False + Test the selected filter + False + + + + True + False + gtk-execute + + + + + False + False + 3 + + + + + False + True + False + True + True + False + Delete the selected filter + False + + + + True + False + gtk-remove + + + + + False + False + 4 + + + + + + + + False + True + 1 + + + + + True + True + 5 + 1 + + + + + True + False + 6 + <i>Note: changes take effect only after this window is closed</i> + True + + + False + False + 2 + + + + + False + True + 1 + + + + + + filter_list_close + filter_list_help + + @@ -21,20 +297,92 @@ + False 500 dialog center - + - + True + False 8 + + + True + False + end + + + gtk-cancel + False + True + True + True + False + False + True + + + + False + False + 0 + + + + + gtk-ok + False + True + False + True + True + False + False + True + + + + False + False + 1 + + + + + gtk-help + False + True + True + True + False + False + True + + + + False + False + 2 + + + + + False + True + end + 0 + + True + False True + False 6 center @@ -47,31 +395,60 @@ True + False 12 8 4 12 6 + + + + + + + + + + + + + + + + + + + + + + + + True + False 6 + False True True True False Add another rule to the filter + False Add - + True + False gtk-add @@ -89,21 +466,24 @@ + False True False True True False Edit the selected rule + False Edit - + True + False gtk-edit @@ -121,21 +501,24 @@ + False True False True True False Delete the selected rule + False Remove - + True + False gtk-remove @@ -167,6 +550,7 @@ True + False 0 <b>Options</b> True @@ -176,12 +560,13 @@ 5 6 GTK_FILL - + True + False 0 <b>Rule list</b> True @@ -191,12 +576,13 @@ 3 4 GTK_FILL - + True + False 0 <b>Definition</b> True @@ -204,12 +590,13 @@ 4 GTK_FILL - + True + False 0 Co_mment: True @@ -221,20 +608,21 @@ 2 3 GTK_FILL - + True False - automatic - automatic in True True + + + @@ -248,6 +636,7 @@ True + False 0 _Name: True @@ -259,16 +648,19 @@ 1 2 GTK_FILL - + Return values that do no_t match the filter rules + False True True False + False True + 0.5 True @@ -277,12 +669,13 @@ 7 8 GTK_FILL - + True + False model1 @@ -297,7 +690,7 @@ 6 7 GTK_FILL - + @@ -312,7 +705,7 @@ 1 2 GTK_EXPAND | GTK_SHRINK | GTK_FILL - + @@ -325,101 +718,21 @@ 3 2 3 - + - - - - - - - - - - - - - - - - - - - - - - - - + True + True 1 - - 1 - - - - - True - end - - - gtk-cancel - True - True - True - False - True - - - - False - False - 0 - - - - - gtk-ok - True - False - True - True - False - True - - - - False - False - 1 - - - - - gtk-help - True - True - True - False - True - - - - False - False - 2 - - - False - end - 0 + True + 1 @@ -430,186 +743,68 @@ definition_help - - 400 - 350 + + False + center-on-parent dialog center - + - + True - 8 - - + False + + True + False + end - + + gtk-cancel + False True - center + True + True + False + False + True + False False - 5 0 - + + gtk-ok + False True - 6 - 6 - - - True - False - automatic - automatic - in - - - True - True - - - - - 0 - - - - - True - 6 - - - True - True - True - False - Add a new filter - - - - True - gtk-add - - - - - False - False - 0 - - - - - True - False - True - True - False - Edit the selected filter - - - - True - gtk-edit - - - - - False - False - 1 - - - - - True - False - True - True - False - Clone the selected filter - - - - True - gtk-copy - - - - - False - False - 2 - - - - - True - True - False - Test the selected filter - - - - True - gtk-execute - - - - - False - False - 3 - - - - - True - False - True - True - False - Delete the selected filter - - - - True - gtk-remove - - - - - False - False - 4 - - - - - - - - False - 1 - - + True + True + False + False + True + - 5 + False + False 1 - + + gtk-help + False True - 6 - <i>Note: changes take effect only after this window is closed</i> - True + True + True + False + False + True + False @@ -618,147 +813,22 @@ - - 1 - - - - - True - end - - - gtk-close - True - True - True - False - True - - - - False - False - 0 - - - - - gtk-help - True - True - True - False - True - - - - False - False - 1 - - - False + True end 0 - - - - filter_list_close - filter_list_help - - - - 450 - 400 - dialog - center - - - - True - 8 - - - True - 6 - - - False - False - 1 - - - - - True - True - never - automatic - in - - - True - True - - - - - 2 - - - - - True - end - - - gtk-close - True - True - True - False - True - - - - False - False - 0 - - - - - False - end - 0 - - - - - - test_close - - - - center-on-parent - dialog - center - - - - True True + False 6 True + False True @@ -777,8 +847,6 @@ True True - automatic - automatic in @@ -786,6 +854,9 @@ True True False + + + @@ -797,10 +868,12 @@ True + False 6 True + False 0 <b>Selected Rule</b> True @@ -814,6 +887,7 @@ True + False 0 12 No rule selected @@ -829,6 +903,7 @@ True + False 0 <b>Description</b> True @@ -842,6 +917,7 @@ True + False 0 0 12 @@ -858,6 +934,7 @@ True + False 0 <b>Values</b> True @@ -876,71 +953,16 @@ + True + True 1 - - 1 - - - - - True - end - - - gtk-cancel - True - True - True - False - True - - - - False - False - 0 - - - - - gtk-ok - True - True - True - False - True - - - - False - False - 1 - - - - - gtk-help - True - True - True - False - True - - - - False - False - 2 - - - False - end - 0 + True + 1 @@ -951,4 +973,87 @@ rule_editor_help + + False + 450 + 400 + dialog + center + + + + True + False + 8 + + + True + False + end + + + gtk-close + False + True + True + True + False + False + True + + + + False + False + 0 + + + + + False + True + end + 0 + + + + + True + False + 6 + + + False + False + 1 + + + + + True + True + never + in + + + True + True + + + + + + + + False + True + 2 + + + + + + test_close + + diff --git a/src/gui/glade/styleeditor.glade b/src/gui/glade/styleeditor.glade index fd0ae73f4..5f23461b9 100644 --- a/src/gui/glade/styleeditor.glade +++ b/src/gui/glade/styleeditor.glade @@ -1,179 +1,71 @@ - - - - - 400 - 300 + + + 100 + 0.20000000000000001 + 0.10000000000000001 + 1 + + + -100 + 100 + 0.10000000000000001 + 1 + + + -100 + 100 + 0.10000000000000001 + 1 + + + -100 + 100 + 0.10000000000000001 + 1 + + + -100 + 100 + 2 + 0.10000000000000001 + 1 + + + -100 + 100 + 0.10000000000000001 + 1 + + + 100 + 1 + 10 + + + False dialog - + True - - - True - - - True - 10 - True - center - - - False - False - 0 - - - - - True - 6 - 6 - - - True - False - automatic - automatic - in - - - True - True - - - - - - 0 - - - - - True - 10 - start - - - True - True - False - Add a new style - - - Add - - - - - - True - gtk-add - - - Add - - - - - - - False - False - 0 - - - - - True - True - False - Edit the selected style - - - Edit - - - - - - True - gtk-edit - - - Edition - - - - - - - False - False - 1 - - - - - True - True - False - Delete the selected style - - - Remove - - - - - - True - gtk-remove - - - Remove - - - - - - - False - False - 2 - - - - - False - False - 1 - - - - - 1 - - - - - 1 - - + False - + True + False end - + gtk-cancel + False True True True False + False True + False @@ -182,15 +74,17 @@ - + gtk-ok + False True True True True False + False True - + False @@ -201,28 +95,19 @@ False + True end 0 - - - - button2 - button1 - - - - dialog - - - True True + False True + False 5 5 True @@ -230,6 +115,7 @@ False + True 10 0 @@ -237,9 +123,11 @@ True + False True + False Style n_ame: True center @@ -264,6 +152,8 @@ + True + True 1 @@ -289,14 +179,15 @@ True True - automatic - automatic in 175 True True + + + @@ -313,11 +204,13 @@ True + False 12 12 True + False False @@ -328,6 +221,7 @@ True + False True @@ -341,6 +235,7 @@ True + False <b>Description</b> True @@ -351,14 +246,40 @@ True + False 12 11 4 12 6 + + + + + + + + + + + + + + + + + + + + + + + + True + False 0 0 3 @@ -369,16 +290,19 @@ 4 GTK_FILL - + _Roman (Times, serif) + False True True False + False True + 0.5 True @@ -387,16 +311,19 @@ 1 2 GTK_FILL - + _Swiss (Arial, Helvetica, sans-serif) + False True True False + False True + 0.5 True roman @@ -406,12 +333,13 @@ 2 3 GTK_FILL - + True + False 0 3 <b>Size</b> @@ -423,7 +351,7 @@ 3 4 GTK_FILL - + @@ -440,12 +368,13 @@ 4 5 GTK_FILL - + True + False 0 point size|pt center @@ -456,12 +385,13 @@ 4 5 GTK_FILL - + True + False 0 3 <b>Color</b> @@ -473,12 +403,13 @@ 5 6 GTK_FILL - + True + False 0 0 3 @@ -497,10 +428,13 @@ _Bold + False True True False + False True + 0.5 True @@ -509,16 +443,19 @@ 8 9 GTK_FILL - + _Italic + False True True False + False True + 0.5 True @@ -527,16 +464,19 @@ 9 10 GTK_FILL - + _Underline + False True True False + False True + 0.5 True @@ -545,7 +485,7 @@ 10 11 GTK_FILL - + @@ -561,14 +501,16 @@ 6 7 GTK_FILL - + + False True True False + False 1 @@ -576,33 +518,9 @@ 6 7 GTK_FILL - + - - - - - - - - - - - - - - - - - - - - - - - - 1 @@ -611,6 +529,7 @@ True + False <b>Font options</b> True @@ -622,18 +541,55 @@ True + False 12 14 5 12 6 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + _Left + False True True False + False True + 0.5 True @@ -642,16 +598,19 @@ 1 2 GTK_FILL - + _Right + False True True False + False True + 0.5 True lalign @@ -661,16 +620,19 @@ 1 2 GTK_FILL - + J_ustify + False True True False + False True + 0.5 True lalign @@ -680,16 +642,19 @@ 1 2 GTK_FILL - + Cen_ter + False True True False + False True + 0.5 True lalign @@ -699,12 +664,13 @@ 1 2 GTK_FILL - + True + False 0 0 3 @@ -721,6 +687,7 @@ True + False 0 3 <b>Background color</b> @@ -732,12 +699,13 @@ 2 3 GTK_FILL - + True + False 0 First li_ne: True @@ -750,12 +718,13 @@ 7 8 GTK_FILL - + True + False 0 cm center @@ -766,12 +735,13 @@ 5 6 GTK_FILL - + True + False 0 cm center @@ -782,12 +752,13 @@ 6 7 GTK_FILL - + True + False 0 cm center @@ -798,12 +769,13 @@ 7 8 GTK_FILL - + True + False 0 R_ight: True @@ -816,12 +788,13 @@ 6 7 GTK_FILL - + True + False 0 L_eft: True @@ -834,12 +807,13 @@ 5 6 GTK_FILL - + True + False 0 0 3 @@ -852,12 +826,13 @@ 8 9 GTK_FILL - + True + False 0 Abo_ve: True @@ -870,12 +845,13 @@ 9 10 GTK_FILL - + True + False 0 Belo_w: True @@ -888,12 +864,13 @@ 10 11 GTK_FILL - + True + False 0 cm center @@ -904,12 +881,13 @@ 9 10 GTK_FILL - + True + False 0 cm center @@ -920,12 +898,13 @@ 10 11 GTK_FILL - + True + False 0 0 3 @@ -938,7 +917,7 @@ 11 12 GTK_FILL - + @@ -955,7 +934,7 @@ 4 6 7 - + @@ -972,7 +951,7 @@ 4 7 8 - + @@ -989,7 +968,7 @@ 4 5 6 - + @@ -1006,7 +985,7 @@ 4 9 10 - + @@ -1023,16 +1002,19 @@ 4 10 11 - + Le_ft + False True True False + False True + 0.5 True @@ -1041,16 +1023,19 @@ 13 14 GTK_FILL - + Righ_t + False True True False + False True + 0.5 True @@ -1059,16 +1044,19 @@ 13 14 GTK_FILL - + _Top + False True True False + False True + 0.5 True @@ -1077,12 +1065,13 @@ 13 14 GTK_FILL - + True + False 0 _Padding: True @@ -1095,7 +1084,7 @@ 12 13 GTK_FILL - + @@ -1112,12 +1101,13 @@ 4 12 13 - + True + False 0 cm center @@ -1128,16 +1118,19 @@ 12 13 GTK_FILL - + _Bottom + False True True False + False True + 0.5 True @@ -1146,7 +1139,7 @@ 13 14 GTK_FILL - + @@ -1162,12 +1155,13 @@ 3 4 GTK_FILL - + True + False 0 <b>Indentation</b> True @@ -1177,14 +1171,16 @@ 4 5 GTK_FILL - + + False True True False + False 1 @@ -1192,42 +1188,9 @@ 3 4 GTK_FILL - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 2 @@ -1236,6 +1199,7 @@ True + False <b>Paragraph options</b> True @@ -1252,27 +1216,49 @@ + True + True 2 + False + True 1 + + + + button8 + button7 + + + + False + 400 + 300 + dialog + + + True + False - + True + False end - + gtk-cancel + False True True True False + False True - False @@ -1281,15 +1267,17 @@ - + gtk-ok + False True True True True False + False True - + False @@ -1300,57 +1288,188 @@ False + True end 0 + + + True + False + + + True + False + 10 + True + center + + + False + False + 0 + + + + + True + False + 6 + 6 + + + True + False + in + + + True + True + + + + + + + + + True + True + 0 + + + + + True + False + 10 + start + + + False + True + True + False + Add a new style + False + + + Add + + + + + + True + False + gtk-add + + + Add + + + + + + + False + False + 0 + + + + + False + True + True + False + Edit the selected style + False + + + Edit + + + + + + True + False + gtk-edit + + + Edition + + + + + + + False + False + 1 + + + + + False + True + True + False + Delete the selected style + False + + + Remove + + + + + + True + False + gtk-remove + + + Remove + + + + + + + False + False + 2 + + + + + False + False + 1 + + + + + True + True + 1 + + + + + False + True + 1 + + - button8 - button7 + button2 + button1 - - 0.20000000000000001 - 100 - 0.10000000000000001 - 1 - - - -100 - 100 - 0.10000000000000001 - 1 - - - -100 - 100 - 0.10000000000000001 - 1 - - - -100 - 100 - 0.10000000000000001 - 1 - - - 2 - -100 - 100 - 0.10000000000000001 - 1 - - - -100 - 100 - 0.10000000000000001 - 1 - - - 100 - 1 - 10 - diff --git a/src/gui/glade/tipofday.glade b/src/gui/glade/tipofday.glade index 4a73904d6..57905155e 100644 --- a/src/gui/glade/tipofday.glade +++ b/src/gui/glade/tipofday.glade @@ -1,9 +1,9 @@ - + - - + True + False 8 window1 500 @@ -11,15 +11,20 @@ True - vertical + False True + False 3 3 + + + True + False 6 6 True @@ -34,6 +39,7 @@ True + False True True @@ -46,10 +52,13 @@ _Display on startup + False True True False + False True + 0.5 True True @@ -61,38 +70,41 @@ GTK_FILL + + + True + False 2 - - + + - - - - - - + True + True 0 True + False end gtk-go-forward + False True True True True + False True @@ -104,10 +116,12 @@ gtk-close + False True True True True + False True diff --git a/src/gui/glade/updateaddons.glade b/src/gui/glade/updateaddons.glade index b3c7fc3f3..0d88286e7 100644 --- a/src/gui/glade/updateaddons.glade +++ b/src/gui/glade/updateaddons.glade @@ -1,9 +1,8 @@ - + - - - + + False 5 center 700 @@ -11,15 +10,65 @@ True normal - + True + False 2 + + + True + False + start + + + gtk-close + False + True + True + True + False + True + + + False + False + 0 + True + + + + + Install Selected _Addons + False + True + True + True + False + True + + + False + False + 1 + True + + + + + False + True + end + 0 + + True + False True + False <b>Available Gramps Updates for Addons</b> True @@ -34,23 +83,29 @@ 650 True + False Gramps comes with a core set of plugins which provide all of the necessary features. However, you can extend this functionality with additional Addons. These addons provide reports, listings, views, gramplets, and more. Here you can select among the available extra addons, they will be retrieved from the internet off of the Gramps website, and installed locally on your computer. If you close this dialog now, you can install addons later from the menu under Edit -> Preferences. True + True + True 1 True + False start _Select All + False True True True + False True @@ -62,9 +117,11 @@ Select _None + False True True True + False True @@ -76,6 +133,7 @@ False + True 8 2 @@ -83,6 +141,7 @@ False + True 1 @@ -90,59 +149,21 @@ True True - automatic - automatic True True + + + - - end - 2 - - - - - True - start - - - gtk-close - True - True - True - True - - - False - False - 0 - True - - - - - Install Selected _Addons - True - True - True - True - - - False - False - 1 - True - - - False + True end - 0 + 2 @@ -152,4 +173,5 @@ apply + diff --git a/src/plugins/bookreport.glade b/src/plugins/bookreport.glade index 3a2848415..a46cafbe4 100644 --- a/src/plugins/bookreport.glade +++ b/src/plugins/bookreport.glade @@ -1,23 +1,157 @@ - - + + + 300 + False + normal + + + True + False + + + True + False + end + + + gtk-delete + False + True + True + True + False + False + True + + + + False + False + 0 + + + + + gtk-close + False + True + True + True + False + False + True + + + + False + False + 1 + + + + + gtk-ok + False + True + True + True + False + False + True + + + + False + False + 2 + + + + + False + True + end + 0 + + + + + True + False + + + True + False + 6 + + + False + False + 0 + + + + + 500 + True + True + 12 + in + + + True + True + False + + + + + + + + True + True + 1 + + + + + False + True + 1 + + + + + + delete_button + close_button + ok_button + + 600 600 + False Book True + False True + False True + False True + False 12 12 @@ -30,12 +164,15 @@ True + False True + False True + False 12 Book _name: True @@ -53,29 +190,37 @@ True + True + True 6 1 + True + True 0 True + False + False True True True False Clear the book - + False + True + False gtk-clear @@ -88,16 +233,19 @@ + False True True True False Save current set of configured selections + False - + True + False gtk-save @@ -110,15 +258,18 @@ + False True True True False Open previously created book - + False + True + False gtk-open @@ -131,16 +282,19 @@ + False True True True False Manage previously created books + False - + True + False gtk-index @@ -170,10 +324,12 @@ True + False 2 True + False 0 0 12 @@ -182,20 +338,21 @@ avail_tree - + True True - automatic - automatic in True True + + + @@ -209,6 +366,8 @@ + True + True 6 2 @@ -216,10 +375,12 @@ True + False 2 True + False 0 0 12 @@ -228,20 +389,21 @@ book_tree - + True True - automatic - automatic etched-in True True + + + @@ -255,37 +417,46 @@ + True + True 6 3 + True + True 0 True + False True + False 2 + False True True True False Add an item to the book + False - + True + False gtk-add @@ -298,15 +469,18 @@ + False True True True False Remove currently selected item from the book - + False + True + False gtk-remove @@ -319,15 +493,18 @@ + False True True True False Move current selection one step up in the book - + False + True + False gtk-go-up @@ -340,15 +517,18 @@ + False True True True False Move current selection one step down in the book - + False + True + False gtk-go-down @@ -361,15 +541,18 @@ + False True True True False Configure currently selected item - + False + True + False gtk-preferences @@ -400,24 +583,29 @@ + True + True 0 True + False 6 6 end gtk-close + False True True True False + False True - + False @@ -428,12 +616,14 @@ gtk-ok + False True True True False + False True - + False @@ -444,123 +634,11 @@ False + True 1 - - 300 - normal - - - True - - - True - - - True - 6 - - - False - False - 0 - - - - - 500 - True - True - 12 - automatic - automatic - in - - - True - True - False - - - - - 1 - - - - - 1 - - - - - True - end - - - gtk-delete - True - True - True - False - True - - - - False - False - 0 - - - - - gtk-close - True - True - True - False - True - - - - False - False - 1 - - - - - gtk-ok - True - True - True - False - True - - - - False - False - 2 - - - - - False - end - 0 - - - - - - delete_button - close_button - ok_button - - diff --git a/src/plugins/docgen/gtkprint.glade b/src/plugins/docgen/gtkprint.glade index 1768cd1aa..36b6d1f6a 100644 --- a/src/plugins/docgen/gtkprint.glade +++ b/src/plugins/docgen/gtkprint.glade @@ -1,27 +1,32 @@ - + - - + + False Print Preview True center 800 600 - + True + False True + False icons + False True + False Closes print preview window + False gtk-quit - + False @@ -30,10 +35,13 @@ + False False + False Prints the current file + False gtk-print - + False @@ -43,6 +51,7 @@ True + False False @@ -50,12 +59,15 @@ + False True False + False Shows the first page + False True gtk-goto-first - + False @@ -64,12 +76,15 @@ + False True False + False Shows previous page + False True gtk-go-back - + False @@ -78,12 +93,15 @@ + False True False + False Shows the next page + False True gtk-go-forward - + False @@ -92,12 +110,15 @@ + False True False + False Shows the last page + False True gtk-goto-last - + False @@ -107,6 +128,7 @@ True + False False @@ -114,30 +136,38 @@ + False True + False + False True + False 6 True - • + False + • 6 - + False + True 0 True + False of 8 False + True 1 @@ -151,6 +181,7 @@ True + False False @@ -158,10 +189,13 @@ + False True + False Zooms to fit the page width + False True - + False @@ -170,10 +204,13 @@ + False True + False Zooms to fit the whole page + False gtk-zoom-fit - + False @@ -182,10 +219,13 @@ + False True + False Zooms the page in + False gtk-zoom-in - + False @@ -194,10 +234,13 @@ + False True + False Zooms the page out + False gtk-zoom-out - + False @@ -215,24 +258,25 @@ True False - automatic - automatic in - + True + False none True - + False + True + True 1 diff --git a/src/plugins/export/exportcsv.glade b/src/plugins/export/exportcsv.glade index e20d84157..7637992e6 100644 --- a/src/plugins/export/exportcsv.glade +++ b/src/plugins/export/exportcsv.glade @@ -1,34 +1,114 @@ - + - - + True + False True 400 dialog - False - + True + False 8 + + + True + False + end + + + gtk-cancel + False + True + True + True + False + False + True + + + + False + False + 0 + + + + + gtk-ok + False + True + True + True + False + False + True + + + + False + False + 1 + + + + + gtk-help + False + True + True + True + False + False + True + + + + False + False + 2 + + + + + False + False + end + 0 + + True + False True + False True + False 12 4 3 12 6 + + + + + + + + + True + False 0 <b>Options</b> True @@ -36,12 +116,13 @@ 3 GTK_FILL - + True + False 0 Filt_er: True @@ -52,23 +133,42 @@ 1 2 GTK_FILL - + True + False 5 2 12 6 + + + + + + + + + + + + + + + _Marriages + False True True False + False True + 0.5 True True @@ -78,16 +178,19 @@ 1 2 GTK_FILL - + Chil_dren + False True True False + False True + 0.5 True True @@ -97,16 +200,19 @@ 2 3 GTK_FILL - + I_ndividuals + False True True False + False True + 0.5 True True @@ -114,12 +220,13 @@ 1 2 GTK_FILL - + True + False GTK_SHRINK | GTK_FILL @@ -129,10 +236,13 @@ Translate _Headers + False True True False + False True + 0.5 True True @@ -142,24 +252,9 @@ 4 5 GTK_FILL - + - - - - - - - - - - - - - - - 1 @@ -172,6 +267,7 @@ True + False 0 Export: True @@ -182,12 +278,13 @@ 2 3 GTK_FILL - + True + False liststore1 @@ -203,89 +300,22 @@ 2 - - - - - - - - - False + True 0 False + True 1 - - - True - end - - - gtk-cancel - True - True - True - False - True - - - - False - False - 0 - - - - - gtk-ok - True - True - True - False - True - - - - False - False - 1 - - - - - gtk-help - True - True - True - False - True - - - - False - False - 2 - - - - - False - False - end - 0 - - diff --git a/src/plugins/export/exportftree.glade b/src/plugins/export/exportftree.glade index acbf81569..81376cf7d 100644 --- a/src/plugins/export/exportftree.glade +++ b/src/plugins/export/exportftree.glade @@ -1,23 +1,92 @@ - + - - + True + False True 480 dialog - False - + True + False 8 + + + True + False + end + + + gtk-cancel + False + True + True + True + False + False + True + + + + False + False + 0 + + + + + gtk-ok + False + True + True + True + False + False + True + + + + False + False + 1 + + + + + gtk-help + False + True + True + True + False + False + True + + + + False + False + 2 + + + + + False + True + end + 0 + + True + False True + False 6 center @@ -30,14 +99,22 @@ True + False 12 3 3 12 6 + + + + + + True + False 0 <b>Options</b> True @@ -45,12 +122,13 @@ 3 GTK_FILL - + True + False 0 Filt_er: True @@ -61,16 +139,19 @@ 1 2 GTK_SHRINK | GTK_FILL - + _Restrict data on living people + False True True False + False True + 0.5 True True @@ -80,12 +161,13 @@ 2 3 GTK_FILL - + True + False liststore1 @@ -102,79 +184,18 @@ GTK_FILL - - - - - - + True + True 1 - - 1 - - - - - True - end - - - gtk-cancel - True - True - True - False - True - - - - False - False - 0 - - - - - gtk-ok - True - True - True - False - True - - - - False - False - 1 - - - - - gtk-help - True - True - True - False - True - - - - False - False - 2 - - - False - end - 0 + True + 1 diff --git a/src/plugins/export/exportgeneweb.glade b/src/plugins/export/exportgeneweb.glade index 8c6ba4e25..525833953 100644 --- a/src/plugins/export/exportgeneweb.glade +++ b/src/plugins/export/exportgeneweb.glade @@ -1,31 +1,122 @@ - + - - + True + False True 400 dialog - False - + True + False 8 + + + True + False + end + + + gtk-cancel + False + True + True + True + False + False + True + + + + False + False + 0 + + + + + gtk-ok + False + True + True + True + False + False + True + + + + False + False + 1 + + + + + gtk-help + False + True + True + True + False + False + True + + + + False + False + 2 + + + + + False + True + end + 0 + + True + False True + False 12 6 3 12 6 + + + + + + + + + + + + + + + + + + + + + True + False 0 <b>Options</b> True @@ -33,12 +124,13 @@ 3 GTK_FILL - + True + False 0 Filt_er: True @@ -49,20 +141,23 @@ 1 2 GTK_FILL - + _Restrict data on living people + False True True False 3 + False True + 0.5 True True - + 1 @@ -70,23 +165,36 @@ 3 4 GTK_FILL - + True + False 3 2 12 6 + + + + + + + + + Exclude _notes + False True True False + False True + 0.5 True True @@ -96,16 +204,19 @@ 1 2 GTK_FILL - + Use _Living as first name + False True True False + False True + 0.5 True True @@ -113,27 +224,19 @@ 1 2 GTK_FILL - + True + False GTK_SHRINK | GTK_FILL GTK_FILL - - - - - - - - - 1 @@ -146,13 +249,17 @@ True + False Reference i_mages from path: + False True True False + False True + 0.5 True @@ -168,6 +275,8 @@ media + True + True 1 @@ -183,6 +292,7 @@ True + False liststore1 @@ -198,98 +308,20 @@ GTK_FILL - - - - - - - - - - - - - - - - - - - - - False + True 0 False + True 1 - - - True - end - - - gtk-cancel - True - True - True - False - True - - - - False - False - 0 - - - - - gtk-ok - True - True - True - False - True - - - - False - False - 1 - - - - - gtk-help - True - True - True - False - True - - - - False - False - 2 - - - - - False - end - 0 - - diff --git a/src/plugins/export/exportvcalendar.glade b/src/plugins/export/exportvcalendar.glade index 291dabcb9..d691d8877 100644 --- a/src/plugins/export/exportvcalendar.glade +++ b/src/plugins/export/exportvcalendar.glade @@ -1,23 +1,92 @@ - + - - + True + False True 400 dialog - False - + True + False 8 + + + True + False + end + + + gtk-cancel + False + True + True + True + False + False + True + + + + False + False + 0 + + + + + gtk-ok + False + True + True + True + False + False + True + + + + False + False + 1 + + + + + gtk-help + False + True + True + True + False + False + True + + + + False + False + 2 + + + + + False + True + end + 0 + + True + False True + False 12 2 3 @@ -26,6 +95,7 @@ True + False 0 <b>Options</b> True @@ -33,12 +103,13 @@ 3 GTK_FILL - + True + False 0 Filt_er: True @@ -47,12 +118,13 @@ 1 2 GTK_FILL - + True + False liststore1 @@ -71,74 +143,17 @@ False + True 1 False + True 1 - - - True - end - - - gtk-cancel - True - True - True - False - True - - - - False - False - 0 - - - - - gtk-ok - True - True - True - False - True - - - - False - False - 1 - - - - - gtk-help - True - True - True - False - True - - - - False - False - 2 - - - - - False - end - 0 - - diff --git a/src/plugins/export/exportvcard.glade b/src/plugins/export/exportvcard.glade index 6c01d020a..afe5b962e 100644 --- a/src/plugins/export/exportvcard.glade +++ b/src/plugins/export/exportvcard.glade @@ -1,31 +1,110 @@ - + - - + True + False True 400 dialog - False - + True + False 8 + + + True + False + end + + + gtk-cancel + False + True + True + True + False + False + True + + + + False + False + 0 + + + + + gtk-ok + False + True + True + True + False + False + True + + + + False + False + 1 + + + + + gtk-help + False + True + True + True + False + False + True + + + + False + False + 2 + + + + + False + True + end + 0 + + True + False True + False 12 3 3 12 6 + + + + + + + + + True + False 0 <b>Options</b> True @@ -33,12 +112,13 @@ 3 GTK_FILL - + True + False 0 Filt_er: True @@ -47,12 +127,13 @@ 1 2 GTK_FILL - + True + False liststore1 @@ -71,71 +152,15 @@ False + True 1 - - 1 - - - - - True - end - - - gtk-cancel - True - True - True - False - True - - - - False - False - 0 - - - - - gtk-ok - True - True - True - False - True - - - - False - False - 1 - - - - - gtk-help - True - True - True - False - True - - - - False - False - 2 - - - False - end - 0 + True + 1 diff --git a/src/plugins/import/importgedcom.glade b/src/plugins/import/importgedcom.glade index 43e016398..5806a6fdc 100644 --- a/src/plugins/import/importgedcom.glade +++ b/src/plugins/import/importgedcom.glade @@ -1,7 +1,155 @@ - + - - + + + 400 + False + Gramps - GEDCOM Encoding + center-on-parent + dialog + + + True + False + + + True + False + end + + + gtk-ok + False + True + True + True + False + False + True + + + False + False + 0 + + + + + False + True + end + 0 + + + + + True + False + + + True + False + <span size="larger" weight="bold">GEDCOM Encoding</span> + True + + + False + False + 6 + 0 + + + + + True + False + 6 + 6 + This GEDCOM file has identified itself as using ANSEL encoding. Sometimes, this is in error. If the imported data contains unusual characters, undo the import, and override the character set by selecting a different encoding below. + True + + + False + False + 1 + + + + + True + False + 6 + 6 + + + + + + True + False + + + True + False + Encoding: + + + False + False + 0 + + + + + True + False + model1 + + + + 0 + + + + + True + True + 1 + + + + + True + True + 1 + + + + + + + + True + True + 2 + + + + + + + + False + True + 1 + + + + + + okbutton1 + + @@ -26,15 +174,18 @@ + False True center 600 True + False True + False 6 center @@ -48,6 +199,7 @@ True + False 12 3 5 @@ -61,8 +213,6 @@ True True - automatic - automatic in @@ -76,6 +226,7 @@ True + False 0 <b>Warning messages</b> True @@ -96,13 +247,36 @@ True + False 8 5 6 6 + + + + + + + + + + + + + + + + + + + + + True + False 0 File: center @@ -111,12 +285,13 @@ 1 2 GTK_FILL - + True + False 0 Created by: center @@ -127,12 +302,13 @@ 1 2 GTK_FILL - + True + False 0 People: center @@ -143,7 +319,7 @@ 2 3 GTK_FILL - + @@ -155,7 +331,7 @@ 2 3 - + @@ -169,7 +345,7 @@ 3 1 2 - + @@ -183,12 +359,13 @@ 3 2 3 - + True + False 0 Encoding: center @@ -197,12 +374,13 @@ 3 4 GTK_FILL - + True + False 0 Version: center @@ -213,12 +391,13 @@ 1 2 GTK_FILL - + True + False 0 Families: center @@ -229,7 +408,7 @@ 2 3 GTK_FILL - + @@ -242,7 +421,7 @@ 4 5 - + @@ -257,7 +436,7 @@ 5 1 2 - + @@ -271,7 +450,7 @@ 5 2 3 - + @@ -313,11 +492,15 @@ + + + True + False <b>Status</b> True @@ -332,32 +515,38 @@ True + False 0.10000000149 5 GTK_FILL - + + True + True 1 True + False 12 12 end gtk-close + False True True True False + False True @@ -369,139 +558,11 @@ False + True 2 - - 400 - Gramps - GEDCOM Encoding - center-on-parent - dialog - False - - - True - - - True - - - True - <span size="larger" weight="bold">GEDCOM Encoding</span> - True - - - False - False - 6 - 0 - - - - - True - 6 - 6 - This GEDCOM file has identified itself as using ANSEL encoding. Sometimes, this is in error. If the imported data contains unusual characters, undo the import, and override the character set by selecting a different encoding below. - True - - - False - False - 1 - - - - - True - 6 - 6 - - - - - - True - - - True - Encoding: - - - False - False - 0 - - - - - True - model1 - - - - 0 - - - - - 1 - - - - - 1 - - - - - - - - 2 - - - - - - - - 1 - - - - - True - end - - - gtk-ok - True - True - True - False - True - - - False - False - 0 - - - - - False - end - 0 - - - - - - okbutton1 - - diff --git a/src/plugins/tool/changenames.glade b/src/plugins/tool/changenames.glade index 09c9f45d2..5c0adc235 100644 --- a/src/plugins/tool/changenames.glade +++ b/src/plugins/tool/changenames.glade @@ -1,20 +1,21 @@ - + - - + True + False 500 450 - + True + False 6 - vertical True + False False @@ -26,6 +27,7 @@ True + False 10 Below is a list of the family names that Gramps can convert to correct capitalization. @@ -41,34 +43,40 @@ Select the names you wish Gramps to convert. True True - automatic - automatic in True True + + + + True + True 2 True + False 6 end gtk-help + False True True True True + False True - + False @@ -79,12 +87,14 @@ Select the names you wish Gramps to convert. gtk-cancel + False True True True True + False True - + False @@ -95,12 +105,14 @@ Select the names you wish Gramps to convert. _Accept changes and close + False True True True True + False True - + False @@ -111,6 +123,7 @@ Select the names you wish Gramps to convert. False + True 6 end 3 diff --git a/src/plugins/tool/changetypes.glade b/src/plugins/tool/changetypes.glade index c1e975747..a7b5a5d96 100644 --- a/src/plugins/tool/changetypes.glade +++ b/src/plugins/tool/changetypes.glade @@ -1,22 +1,74 @@ - + - - + True + False dialog - + - + True + False 8 + + + True + False + end + + + gtk-cancel + False + True + True + True + False + False + True + + + + False + False + 0 + + + + + gtk-ok + False + True + True + True + False + False + True + + + + False + False + 1 + + + + + False + True + end + 0 + + True + False 10 True + False 10 center @@ -29,6 +81,7 @@ True + False 12 12 This tool will rename all events of one type to a different type. Once completed, this cannot be undone by the regular Undo function. @@ -43,6 +96,7 @@ True + False 12 2 2 @@ -51,18 +105,20 @@ True + False 0 _Original event type: True GTK_FILL - + True + False 0 _New event type: True @@ -71,19 +127,20 @@ 1 2 GTK_FILL - + True - True - - + False + True + + True True - - + + 1 @@ -97,13 +154,14 @@ True - True - - + False + True + + True True - - + + 1 @@ -113,55 +171,16 @@ + True + True 2 - - 1 - - - - - True - end - - - gtk-cancel - True - True - True - False - True - - - - False - False - 0 - - - - - gtk-ok - True - True - True - False - True - - - - False - False - 1 - - - False - end - 0 + True + 1 diff --git a/src/plugins/tool/check.glade b/src/plugins/tool/check.glade index b444a2be0..899e8a22b 100644 --- a/src/plugins/tool/check.glade +++ b/src/plugins/tool/check.glade @@ -1,27 +1,59 @@ - + - - + True + False 450 400 dialog - False - + - + True + False vertical + + + True + False + end + + + gtk-close + False + True + True + True + False + False + True + + + + False + False + 0 + + + + + False + True + end + 0 + + True + False 6 - vertical 6 True + False center @@ -35,8 +67,6 @@ True True - automatic - automatic out @@ -46,39 +76,16 @@ + True + True 1 - - 1 - - - - - True - end - - - gtk-close - True - True - True - False - True - - - - False - False - 0 - - - False - end - 0 + True + 1 diff --git a/src/plugins/tool/desbrowser.glade b/src/plugins/tool/desbrowser.glade index 8e28a10d0..e8dc402f8 100644 --- a/src/plugins/tool/desbrowser.glade +++ b/src/plugins/tool/desbrowser.glade @@ -1,23 +1,74 @@ - + - - + True + False 450 400 dialog - False - + - + True + False + + + True + False + end + + + gtk-close + False + True + True + True + False + False + True + + + + False + False + 0 + + + + + gtk-help + False + True + True + True + False + False + True + + + + False + False + 1 + + + + + False + True + end + 0 + + True + False True + False center @@ -31,22 +82,27 @@ True False - automatic - automatic in True + False + + + + True + True 1 True + False <i>Double-click on the row to edit personal information</i> True @@ -57,51 +113,10 @@ - - 1 - - - - - True - end - - - gtk-close - True - True - True - False - True - - - - False - False - 0 - - - - - gtk-help - True - True - True - False - True - - - - False - False - 1 - - - False - end - 0 + True + 1 diff --git a/src/plugins/tool/eval.glade b/src/plugins/tool/eval.glade index 3dcbf3ef6..f1e7fd4a1 100644 --- a/src/plugins/tool/eval.glade +++ b/src/plugins/tool/eval.glade @@ -1,25 +1,94 @@ - + - - + True + False 450 500 dialog - False - + - + True + False + + + True + False + end + + + gtk-clear + False + True + True + True + False + False + True + + + + False + False + 0 + + + + + gtk-close + False + True + True + True + False + False + True + + + + False + False + 1 + + + + + gtk-execute + False + True + True + True + False + False + True + + + + False + False + 2 + + + + + False + True + end + 0 + + True + False 6 6 True + False False @@ -30,17 +99,25 @@ True + False 6 6 2 6 6 + + + + + + + + + True True - automatic - automatic in @@ -60,8 +137,6 @@ True True - automatic - automatic in @@ -82,6 +157,7 @@ True + False 0 <b>Evaluation Window</b> True @@ -89,12 +165,13 @@ 2 GTK_FILL - + True + False 0 <b>Output Window</b> True @@ -104,15 +181,13 @@ 2 3 GTK_FILL - + True True - automatic - automatic in @@ -133,6 +208,7 @@ True + False 0 <b>Error Window</b> True @@ -142,97 +218,35 @@ 4 5 GTK_FILL - + - - - - - - - - - + True + True 1 True + False 6 6 end False - 2 - - - - - 1 - - - - - True - end - - - gtk-clear - True - True - True - False - True - - - - False - False - 0 - - - - - gtk-close - True - True - True - False - True - - - - False - False - 1 - - - - - gtk-execute - True - True - True - False - True - - - - False - False + True 2 False - end - 0 + True + 1 diff --git a/src/plugins/tool/eventcmp.glade b/src/plugins/tool/eventcmp.glade index 2b9f6d2cb..a992edd39 100644 --- a/src/plugins/tool/eventcmp.glade +++ b/src/plugins/tool/eventcmp.glade @@ -1,76 +1,33 @@ - + - - - - - - - - + + False 500 400 dialog - False - + True + False vertical 8 - - - True - 2 - - - True - center - - - GTK_FILL - - 10 - - - - - True - False - automatic - automatic - in - - - True - True - True - - - - - 1 - 2 - - - - - 1 - - - + True + False end gtk-close + False True True True False + False True - + False @@ -81,12 +38,14 @@ gtk-save-as + False True True True False + False True - + False @@ -97,12 +56,14 @@ gtk-help + False True True True False + False True - + False @@ -113,10 +74,56 @@ False + True end 0 + + + True + False + 2 + + + True + False + center + + + GTK_FILL + + 10 + + + + + True + False + in + + + True + True + True + + + + + + + + 1 + 2 + + + + + False + True + 1 + + @@ -125,26 +132,108 @@ button30 + + + + + + + False 400 dialog - False - + True + False vertical 8 + + + True + False + end + + + gtk-close + False + True + True + True + False + False + True + + + + False + False + 0 + + + + + gtk-apply + False + True + True + True + False + False + True + + + + False + False + 1 + + + + + gtk-help + False + True + True + True + False + False + True + + + + False + False + 2 + + + + + False + True + end + 0 + + True + False 12 3 3 12 12 + + + + + + True + False 1 5 _Filter: @@ -155,12 +244,13 @@ 1 2 GTK_FILL - + True + False The event comparison utility uses the filters defined in the Custom Filter Editor. True @@ -170,17 +260,19 @@ 2 3 GTK_FILL - + Custom filter _editor + False True True False + False True - + 2 @@ -188,23 +280,25 @@ 2 3 GTK_FILL - + True + False center 3 GTK_FILL - + True + False liststore1 @@ -220,74 +314,11 @@ 2 - - - - - - - - - 1 - - - - - True - end - - - gtk-close - True - True - True - False - True - - - - False - False - 0 - - - - - gtk-apply - True - True - True - False - True - - - - False - False - 1 - - - - - gtk-help - True - True - True - False - True - - - - False - False - 2 - - False - end - 0 + True + 1 diff --git a/src/plugins/tool/finddupes.glade b/src/plugins/tool/finddupes.glade index 1c05f0b96..7ec9a6f3a 100644 --- a/src/plugins/tool/finddupes.glade +++ b/src/plugins/tool/finddupes.glade @@ -1,133 +1,32 @@ - + - - - - True - - - True - 12 - - - True - center - - - False - False - 6 - 0 - - - - - True - 10 - Please be patient. This may take a while. - center - True - - - False - False - 20 - 1 - - - - - True - - - True - 0.10000000149 - - - 20 - 0 - - - - - False - False - 2 - - - - - - - - - - - - - 500 - 350 + + + False + 350 dialog - False - + - + True + False 8 - - - True - 6 - 12 - - - True - 6 - center - - - False - False - 0 - - - - - True - False - automatic - automatic - in - - - True - True - True - - - - - 1 - - - - - 1 - - - + True + False end - - gtk-close + + gtk-cancel + False True True True False + False True - + False @@ -136,14 +35,16 @@ - - Co_mpare + + gtk-ok + False True True True False - True - + False + True + False @@ -152,14 +53,16 @@ - + gtk-help + False True True True False + False True - + False @@ -170,35 +73,21 @@ False + True end 0 - - - - button9 - button7 - button13 - - - - 350 - dialog - False - - - - True - 8 True + False 6 6 True + False center @@ -211,14 +100,28 @@ True + False 12 5 2 12 6 + + + + + + + + + + + + True + False 0 <b>Match Threshold</b> True @@ -226,12 +129,13 @@ 2 GTK_FILL - + True + False 0 <b>Options</b> True @@ -241,16 +145,19 @@ 3 4 GTK_FILL - + Use soundex codes + False True True False + False True + 0.5 True True @@ -260,12 +167,13 @@ 4 5 GTK_FILL - + True + False liststore1 @@ -281,85 +189,18 @@ 2 - - - - - - - - - - - - + True + True 1 - - 1 - - - - - True - end - - - gtk-cancel - True - True - True - False - True - - - - False - False - 0 - - - - - gtk-ok - True - True - True - False - True - - - - False - False - 1 - - - - - gtk-help - True - True - True - False - True - - - - False - False - 2 - - - False - end - 0 + True + 1 @@ -370,4 +211,208 @@ button14 + + + + + + + + False + 500 + 350 + dialog + + + + True + False + 8 + + + True + False + end + + + gtk-close + False + True + True + True + False + False + True + + + + False + False + 0 + + + + + Co_mpare + False + True + True + True + False + False + True + + + + False + False + 1 + + + + + gtk-help + False + True + True + True + False + False + True + + + + False + False + 2 + + + + + False + True + end + 0 + + + + + True + False + 6 + 12 + + + True + False + 6 + center + + + False + False + 0 + + + + + True + False + in + + + True + True + True + + + + + + + + True + True + 1 + + + + + False + True + 1 + + + + + + button9 + button7 + button13 + + + + False + True + + + True + False + 12 + + + True + False + center + + + False + False + 6 + 0 + + + + + True + False + 10 + Please be patient. This may take a while. + center + True + + + False + False + 20 + 1 + + + + + True + False + + + True + False + 0.10000000149 + + + True + True + 20 + 0 + + + + + False + False + 2 + + + + + diff --git a/src/plugins/tool/leak.glade b/src/plugins/tool/leak.glade index f7518a105..7cd0e16bd 100644 --- a/src/plugins/tool/leak.glade +++ b/src/plugins/tool/leak.glade @@ -1,25 +1,76 @@ - + - - + True + False 450 500 dialog - False - + - + True + False + + + True + False + end + + + gtk-refresh + False + True + True + True + False + False + True + + + + False + False + 0 + + + + + gtk-close + False + True + True + True + False + False + True + + + + False + False + 1 + + + + + False + True + end + 0 + + True + False 6 6 True + False False @@ -30,6 +81,7 @@ True + False 6 2 6 @@ -37,21 +89,20 @@ True + False 0 <b>Uncollected Objects</b> True GTK_FILL - + True True - automatic - automatic in @@ -66,67 +117,30 @@ + True + True 1 True + False 6 6 end False + True 2 - - 1 - - - - - True - end - - - gtk-refresh - True - True - True - False - True - - - - False - False - 0 - - - - - gtk-close - True - True - True - False - True - - - - False - False - 1 - - - False - end - 0 + True + 1 diff --git a/src/plugins/tool/mergecitations.glade b/src/plugins/tool/mergecitations.glade index d3b747c77..b8f45fb97 100644 --- a/src/plugins/tool/mergecitations.glade +++ b/src/plugins/tool/mergecitations.glade @@ -1,63 +1,6 @@ - + - - - - True - - - True - 12 - - - True - center - - - False - False - 6 - 0 - - - - - True - 10 - Please be patient. This may take a while. - center - True - - - False - False - 20 - 1 - - - - - True - - - True - 0.10000000149 - - - 20 - 0 - - - - - False - False - 2 - - - - - + @@ -65,22 +8,92 @@ + False 350 dialog - False - + - + True + False 8 + + + True + False + end + + + gtk-cancel + False + True + True + True + False + False + True + + + + False + False + 0 + + + + + gtk-ok + False + True + True + True + False + False + True + + + + False + False + 1 + + + + + gtk-help + False + True + True + True + False + False + True + + + + False + False + 2 + + + + + False + True + end + 0 + + True + False 6 6 True + False center @@ -93,14 +106,28 @@ True + False 12 5 2 12 6 + + + + + + + + + + + + True + False 0 <b>Match Threshold</b> True @@ -108,12 +135,13 @@ 2 GTK_FILL - + True + False 0 <b>Options</b> True @@ -123,16 +151,19 @@ 3 4 GTK_FILL - + Don't merge if citation has notes + False True True False + False True + 0.5 True True @@ -142,12 +173,13 @@ 4 5 GTK_FILL - + True + False liststore1 @@ -163,85 +195,18 @@ 2 - - - - - - - - - - - - + True + True 1 - - 1 - - - - - True - end - - - gtk-cancel - True - True - True - False - True - - - - False - False - 0 - - - - - gtk-ok - True - True - True - False - True - - - - False - False - 1 - - - - - gtk-help - True - True - True - False - True - - - - False - False - 2 - - - False - end - 0 + True + 1 @@ -252,4 +217,68 @@ button14 + + False + True + + + True + False + 12 + + + True + False + center + + + False + False + 6 + 0 + + + + + True + False + 10 + Please be patient. This may take a while. + center + True + + + False + False + 20 + 1 + + + + + True + False + + + True + False + 0.10000000149 + + + True + True + 20 + 0 + + + + + False + False + 2 + + + + + diff --git a/src/plugins/tool/notrelated.glade b/src/plugins/tool/notrelated.glade index 345850321..f621d2275 100644 --- a/src/plugins/tool/notrelated.glade +++ b/src/plugins/tool/notrelated.glade @@ -1,26 +1,76 @@ - + - - + + False 450 400 dialog - False - + - + True + False vertical + + + True + False + end + + + gtk-close + False + True + True + True + False + False + True + + + + False + False + 0 + + + + + gtk-help + False + True + True + True + False + False + True + + + + False + False + 1 + + + + + False + True + end + 0 + + True + False 6 - vertical 6 True + False center @@ -34,62 +84,75 @@ True True - automatic - automatic out True True + + + + True + True 1 + False + True 1 True + False 6 0 in True + False 6 12 True + False 3 True + False True + - True - True + True + True - + True + True 0 gtk-apply + False True True False + False True @@ -105,6 +168,7 @@ True + False _Tag True True @@ -113,52 +177,10 @@ False + True 2 - - - True - end - - - gtk-close - True - True - True - False - True - - - - False - False - 0 - - - - - gtk-help - True - True - True - False - True - - - - False - False - 1 - - - - - False - end - 0 - - diff --git a/src/plugins/tool/ownereditor.glade b/src/plugins/tool/ownereditor.glade index b2fcfa1f8..67f167af6 100644 --- a/src/plugins/tool/ownereditor.glade +++ b/src/plugins/tool/ownereditor.glade @@ -1,22 +1,106 @@ - - + + + False center 500 - + True - + False + True + False 6 + + + True + False + end + + + gtk-cancel + False + True + True + True + False + False + True + + + + False + False + 0 + + + + + gtk-ok + False + True + True + True + False + False + True + + + + False + False + 1 + + + + + gtk-help + False + True + True + True + False + False + True + + + + False + False + 2 + + + + + False + True + end + 0 + + + + + True + False + + + False + True + 3 + end + 1 + + True + False False @@ -28,6 +112,7 @@ True + False 6 9 2 @@ -36,6 +121,7 @@ True + False 0 _Name: True @@ -43,12 +129,13 @@ GTK_FILL - + True + False 0 _Street: True @@ -58,12 +145,13 @@ 1 2 GTK_FILL - + True + False 0 _City: True @@ -73,12 +161,13 @@ 3 4 GTK_FILL - + True + False 0 _State/County: True @@ -88,12 +177,13 @@ 4 5 GTK_FILL - + True + False 0 _Country: True @@ -103,12 +193,13 @@ 5 6 GTK_FILL - + True + False 0 _ZIP/Postal Code: True @@ -118,12 +209,13 @@ 6 7 GTK_FILL - + True + False 0 _Phone: True @@ -133,12 +225,13 @@ 7 8 GTK_FILL - + True + False 0 _Email: True @@ -148,7 +241,7 @@ 8 9 GTK_FILL - + @@ -160,7 +253,7 @@ 1 2 - + @@ -174,7 +267,7 @@ 2 1 2 - + @@ -188,7 +281,7 @@ 2 3 4 - + @@ -202,7 +295,7 @@ 2 4 5 - + @@ -216,7 +309,7 @@ 2 5 6 - + @@ -230,7 +323,7 @@ 2 6 7 - + @@ -244,7 +337,7 @@ 2 7 8 - + @@ -258,12 +351,13 @@ 2 8 9 - + True + False 0 _Locality: True @@ -273,7 +367,7 @@ 2 3 GTK_FILL - + @@ -287,111 +381,46 @@ 2 2 3 - + False + True 3 - - - True - - - False - 3 - end - 1 - - - - - True - end - - - gtk-cancel - True - True - True - False - True - - - - False - False - 0 - - - - - gtk-ok - True - True - True - False - True - - - - False - False - 1 - - - - - gtk-help - True - True - True - False - True - - - - False - False - 2 - - - - - False - end - 0 - - + False Copy from DB to Preferences + False True + False True True accelgroup1 - + Copy from Preferences to DB + False True + False True True accelgroup1 - + - diff --git a/src/plugins/tool/patchnames.glade b/src/plugins/tool/patchnames.glade index 5ceb4c38e..486dd739d 100644 --- a/src/plugins/tool/patchnames.glade +++ b/src/plugins/tool/patchnames.glade @@ -1,102 +1,33 @@ - + - - + True + False 500 450 dialog - False - + - + True - - - True - 6 - - - True - - - False - False - 6 - 0 - - - - - True - 0 - 10 - Below is a list of the nicknames, titles, prefixes and compound surnames that Gramps can extract from the family tree. -If you accept the changes, Gramps will modify the entries that have been selected. - -Compound surnames are shown as lists of [prefix, surname, connector]. -For example, with the defaults, the name "de Mascarenhas da Silva e Lencastre" shows as: - [de, Mascarenhas]-[da, Silva, e]-[,Lencastre] - -Run this tool several times to correct names that have multiple information that can be extracted. - True - 100 - - - False - False - 1 - - - - - True - True - automatic - automatic - in - - - True - True - - - - - 2 - - - - - True - 6 - end - - - False - 6 - 3 - - - - - 1 - - + False - + True + False end gtk-help + False True True True False + False True - + False @@ -107,12 +38,14 @@ Run this tool several times to correct names that have multiple information that gtk-cancel + False True True True False + False True - + False @@ -122,23 +55,28 @@ Run this tool several times to correct names that have multiple information that + False True True True False - + False + True + False 0 0 True + False 2 True + False gtk-ok @@ -150,6 +88,7 @@ Run this tool several times to correct names that have multiple information that True + False _Accept and close True @@ -178,6 +117,88 @@ Run this tool several times to correct names that have multiple information that 0 + + + True + False + 6 + + + True + False + + + False + False + 6 + 0 + + + + + True + False + 0 + 10 + Below is a list of the nicknames, titles, prefixes and compound surnames that Gramps can extract from the family tree. +If you accept the changes, Gramps will modify the entries that have been selected. + +Compound surnames are shown as lists of [prefix, surname, connector]. +For example, with the defaults, the name "de Mascarenhas da Silva e Lencastre" shows as: + [de, Mascarenhas]-[da, Silva, e]-[,Lencastre] + +Run this tool several times to correct names that have multiple information that can be extracted. + True + 100 + + + False + False + 1 + + + + + True + True + in + + + True + True + + + + + + + + True + True + 2 + + + + + True + False + 6 + end + + + False + True + 6 + 3 + + + + + False + True + 1 + + diff --git a/src/plugins/tool/phpgedview.glade b/src/plugins/tool/phpgedview.glade index d93b41adc..797274e00 100644 --- a/src/plugins/tool/phpgedview.glade +++ b/src/plugins/tool/phpgedview.glade @@ -1,7 +1,6 @@ - + - - + @@ -15,24 +14,79 @@ True + False phpGedView import mouse True dialog - + True + False + + + True + False + end + + + gtk-cancel + False + True + True + True + False + False + True + + + False + False + 0 + + + + + gtk-apply + False + True + True + True + False + False + True + + + + False + False + 1 + + + + + False + True + end + 0 + + True + False 12 7 2 9 9 + + + True + False <b>phpGedView import</b> True center @@ -40,7 +94,7 @@ 2 GTK_FILL - + @@ -55,7 +109,7 @@ 2 1 2 - + @@ -70,7 +124,7 @@ 4 5 GTK_FILL - + @@ -86,12 +140,13 @@ 5 6 GTK_FILL - + True + False model1 @@ -112,6 +167,7 @@ True + False 0 File: @@ -119,13 +175,14 @@ 3 4 GTK_FILL - + 7 True + False 0 Username: @@ -133,13 +190,14 @@ 4 5 GTK_FILL - + 7 True + False 0 Password: @@ -147,13 +205,14 @@ 5 6 GTK_FILL - + 7 True + False 0 @@ -161,13 +220,14 @@ 2 3 GTK_FILL - + 7 True + False 0 URL: @@ -175,13 +235,14 @@ 1 2 GTK_FILL - + 7 True + False 0.10000000149 @@ -190,58 +251,15 @@ 6 7 GTK_FILL - - - - - - - - - 5 - 2 - - - - - True - end - - - gtk-cancel - True - True - True - False - True - - - False - False - 0 - - - - - gtk-apply - True - True - True - False - True - - - - False - False - 1 + False - end - 0 + True + 5 + 2 diff --git a/src/plugins/tool/relcalc.glade b/src/plugins/tool/relcalc.glade index 7cbd03acf..10046d9b5 100644 --- a/src/plugins/tool/relcalc.glade +++ b/src/plugins/tool/relcalc.glade @@ -1,26 +1,58 @@ - + - - + True + False 600 400 dialog - False - + - + True + False 8 + + + True + False + end + + + gtk-close + False + True + True + True + False + False + True + + + False + False + 0 + + + + + False + True + end + 0 + + True + False 6 6 True + False 6 center @@ -35,8 +67,6 @@ True True - automatic - automatic in @@ -44,10 +74,15 @@ True Select a person to determine the relationship True + + + + True + True 1 @@ -55,8 +90,6 @@ True False - automatic - automatic in @@ -70,38 +103,15 @@ False + True 2 - - 1 - - - - - True - end - - - gtk-close - True - True - True - False - True - - - False - False - 0 - - - False - end - 0 + True + 1 diff --git a/src/plugins/tool/removeunused.glade b/src/plugins/tool/removeunused.glade index df0dbcaf1..428383d0d 100644 --- a/src/plugins/tool/removeunused.glade +++ b/src/plugins/tool/removeunused.glade @@ -1,26 +1,76 @@ - + - - + True + False 500 300 dialog - False - + True + False vertical + + + True + False + end + + + gtk-remove + False + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + False + True + + + + False + False + 0 + + + + + gtk-close + False + True + True + True + False + False + True + + + + False + False + 1 + + + + + False + True + end + 0 + + True + False 6 - vertical 6 True + False False @@ -32,19 +82,23 @@ True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - vertical Search for events + False True True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + False + 0.5 True @@ -56,10 +110,13 @@ Search for sources + False True True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + False + 0.5 True @@ -71,10 +128,13 @@ Search for places + False True True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + False + 0.5 True @@ -86,10 +146,13 @@ Search for media + False True True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + False + 0.5 True @@ -101,10 +164,13 @@ Search for repositories + False True True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + False + 0.5 True @@ -116,10 +182,13 @@ Search for notes + False True True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + False + 0.5 True @@ -130,22 +199,27 @@ + True + True 0 True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK gtk-find + False True True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + False True - + False @@ -155,6 +229,7 @@ + True False 1 @@ -170,18 +245,21 @@ True True - automatic - automatic in True True True + + + + True + True 6 2 @@ -189,15 +267,18 @@ True + False 6 spread _Mark all + False True True True False + False True @@ -209,10 +290,12 @@ _Unmark all + False True True True False + False True @@ -224,10 +307,12 @@ In_vert marks + False True True True False + False True @@ -246,6 +331,7 @@ True + False <b>Double-click on a row to view/edit data</b> True @@ -256,51 +342,10 @@ - - 1 - - - - - True - end - - - gtk-remove - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - True - - - - False - False - 0 - - - - - gtk-close - True - True - True - False - True - - - - False - False - 1 - - - False - end - 0 + True + 1 diff --git a/src/plugins/tool/soundgen.glade b/src/plugins/tool/soundgen.glade index 3c3f8677e..dd33895f5 100644 --- a/src/plugins/tool/soundgen.glade +++ b/src/plugins/tool/soundgen.glade @@ -1,22 +1,74 @@ - + - - + True + False dialog - False - + - + True + False 8 + + + True + False + end + + + gtk-close + False + True + True + True + False + Close Window + False + True + + + + False + False + 0 + + + + + gtk-help + False + True + True + True + False + False + True + + + + False + False + 1 + + + + + False + True + end + 0 + + True + False True + False 6 center @@ -29,6 +81,7 @@ True + False 12 2 2 @@ -37,18 +90,20 @@ True + False 0 Name: center GTK_FILL - + True + False 1 SoundEx code: center @@ -57,12 +112,13 @@ 1 2 GTK_FILL - + True + False 0 center @@ -72,19 +128,20 @@ 1 2 GTK_FILL - + True - True - - + False + True + + True True - - + + 1 @@ -95,56 +152,16 @@ - 1 - - - - - 1 - - - - - True - end - - - gtk-close - True - True - True - False - Close Window - True - - - - False - False - 0 - - - - - gtk-help - True - True - True - False - True - - - - False - False + True + True 1 False - end - 0 + True + 1 diff --git a/src/plugins/tool/verify.glade b/src/plugins/tool/verify.glade index a37ae901c..f17f8fcae 100644 --- a/src/plugins/tool/verify.glade +++ b/src/plugins/tool/verify.glade @@ -1,20 +1,414 @@ - + - - - + + + 100 + 25 + 1 + 10 + + + 150 + 99 + 1 + 10 + + + 100 + 30 + 1 + 10 + + + 100 + 3 + 1 + 10 + + + 150 + 50 + 1 + 10 + + + 100 + 17 + 1 + 10 + + + 150 + 90 + 1 + 10 + + + 100 + 8 + 1 + 10 + + + 100 + 30 + 1 + 10 + + + 100 + 18 + 1 + 10 + + + 150 + 65 + 1 + 10 + + + 100 + 15 + 1 + 10 + + + 100 + 12 + 1 + 10 + + + 100 + 48 + 1 + 10 + + + 100 + 17 + 1 + 10 + + + False + 500 + 300 dialog - + True + False vertical + + + True + False + end + + + gtk-close + False + True + True + True + False + False + True + + + + False + False + 0 + + + + + False + True + end + 0 + + + + + True + False + 6 + 6 + + + True + False + + + False + False + 6 + 0 + + + + + True + False + + + True + True + + + True + True + True + + + + + + + + True + True + 0 + + + + + True + False + 6 + + + + + + + + + + + + + + + False + True + 6 + 1 + + + + + True + True + 1 + + + + + True + False + <b>Double-click on a row to view/edit data</b> + True + + + False + False + 2 + + + + + True + False + 6 + 18 + + + True + False + 6 + start + + + _Mark all + False + True + True + True + False + False + True + + + False + False + 0 + + + + + _Unmark all + False + True + True + True + False + False + True + + + False + False + 1 + + + + + In_vert marks + False + True + True + True + False + False + True + + + False + False + 2 + + + + + True + True + 0 + + + + + _Hide marked + False + True + True + False + False + True + + + False + False + 1 + + + + + False + True + 3 + + + + + False + True + 1 + + + + + + closebutton1 + + + + False + dialog + + + True + False + vertical + + + True + False + end + + + gtk-help + False + True + True + True + False + False + True + + + + False + False + 0 + + + + + gtk-close + False + True + True + True + False + False + True + + + + False + False + 1 + + + + + _Run + False + True + True + True + False + False + True + + + + False + False + 2 + + + + + False + True + end + 0 + + True - vertical + False True + False 6 @@ -30,6 +424,7 @@ True + False 12 8 2 @@ -47,12 +442,13 @@ 1 2 GTK_EXPAND | GTK_SHRINK | GTK_FILL - + True + False 0 Maximum _age True @@ -60,12 +456,13 @@ oldage - + True + False 0 Mi_nimum age to marry True @@ -75,7 +472,7 @@ 1 2 - + @@ -91,12 +488,13 @@ 1 2 GTK_EXPAND | GTK_SHRINK | GTK_FILL - + True + False 0 Ma_ximum age to marry True @@ -106,7 +504,7 @@ 2 3 - + @@ -122,12 +520,13 @@ 2 3 GTK_EXPAND | GTK_SHRINK | GTK_FILL - + True + False 0 Maximum number of _spouses for a person True @@ -138,7 +537,7 @@ 3 4 GTK_FILL - + @@ -154,7 +553,7 @@ 3 4 GTK_EXPAND | GTK_SHRINK | GTK_FILL - + @@ -170,12 +569,13 @@ 4 5 GTK_EXPAND | GTK_SHRINK | GTK_FILL - + True + False 0 Maximum number of consecutive years of _widowhood before next marriage True @@ -185,12 +585,13 @@ 4 5 - + True + False 0 Maximum age for an _unmarried person True @@ -201,7 +602,7 @@ 5 6 GTK_FILL - + @@ -216,39 +617,45 @@ 2 5 6 - + _Estimate missing or inexact dates + False True True False + False True + 0.5 True 2 6 7 - + _Identify invalid dates + False True True False + False True + 0.5 True 2 7 8 - + @@ -256,6 +663,7 @@ True + False 0 <b>General</b> True @@ -267,6 +675,7 @@ True + False 12 3 2 @@ -275,6 +684,7 @@ True + False 0 2 2 @@ -284,12 +694,13 @@ yngmom - + True + False 0 2 2 @@ -301,12 +712,13 @@ 1 2 - + True + False 0 2 2 @@ -318,7 +730,7 @@ 2 3 - + @@ -332,7 +744,7 @@ 1 2 GTK_SHRINK | GTK_FILL - + @@ -348,7 +760,7 @@ 1 2 GTK_SHRINK | GTK_FILL - + @@ -364,7 +776,7 @@ 2 3 GTK_SHRINK | GTK_FILL - + @@ -375,6 +787,7 @@ True + False 0 <b>Women</b> True @@ -387,6 +800,7 @@ True + False 12 3 2 @@ -395,6 +809,7 @@ True + False 0 2 2 @@ -404,12 +819,13 @@ yngdad - + True + False 0 2 2 @@ -421,12 +837,13 @@ 1 2 - + True + False 0 2 2 @@ -438,7 +855,7 @@ 2 3 - + @@ -454,7 +871,7 @@ 2 3 GTK_SHRINK | GTK_FILL - + @@ -470,7 +887,7 @@ 1 2 GTK_SHRINK | GTK_FILL - + @@ -484,7 +901,7 @@ 1 2 GTK_SHRINK | GTK_FILL - + @@ -495,6 +912,7 @@ True + False 0 <b>Men</b> True @@ -507,6 +925,7 @@ True + False 12 3 2 @@ -523,7 +942,7 @@ 1 2 GTK_EXPAND | GTK_SHRINK | GTK_FILL - + @@ -539,7 +958,7 @@ 1 2 GTK_EXPAND | GTK_SHRINK | GTK_FILL - + @@ -555,12 +974,13 @@ 2 3 GTK_EXPAND | GTK_SHRINK | GTK_FILL - + True + False 0 Maximum husband-wife age _difference True @@ -568,12 +988,13 @@ hwdif - + True + False 0 Maximum number of years _between children True @@ -583,12 +1004,13 @@ 1 2 - + True + False 0 Maximum _span of years for all children True @@ -598,7 +1020,7 @@ 2 3 - + @@ -609,6 +1031,7 @@ True + False 0 <b>Families</b> True @@ -620,71 +1043,16 @@ + True + True 1 - - 2 - - - - - True - end - - - gtk-help - True - True - True - False - True - - - - False - False - 0 - - - - - gtk-close - True - True - True - False - True - - - - False - False - 1 - - - - - _Run - True - True - True - False - True - - - - False - False - 2 - - - False - end - 0 + True + 2 @@ -695,300 +1063,4 @@ button4 - - 500 - 300 - dialog - False - - - True - vertical - - - True - 6 - vertical - 6 - - - True - - - False - False - 6 - 0 - - - - - True - - - True - True - automatic - automatic - - - True - True - True - - - - - 0 - - - - - True - vertical - 6 - - - - - - - - - - - - - - - False - 6 - 1 - - - - - 1 - - - - - True - <b>Double-click on a row to view/edit data</b> - True - - - False - False - 2 - - - - - True - 6 - 18 - - - True - 6 - start - - - _Mark all - True - True - True - False - True - - - False - False - 0 - - - - - _Unmark all - True - True - True - False - True - - - False - False - 1 - - - - - In_vert marks - True - True - True - False - True - - - False - False - 2 - - - - - 0 - - - - - _Hide marked - True - True - False - True - - - False - False - 1 - - - - - False - 3 - - - - - 1 - - - - - True - end - - - gtk-close - True - True - True - False - True - - - - False - False - 0 - - - - - False - end - 0 - - - - - - closebutton1 - - - - 25 - 100 - 1 - 10 - - - 8 - 100 - 1 - 10 - - - 30 - 100 - 1 - 10 - - - 18 - 100 - 1 - 10 - - - 65 - 150 - 1 - 10 - - - 15 - 100 - 1 - 10 - - - 12 - 100 - 1 - 10 - - - 48 - 100 - 1 - 10 - - - 17 - 100 - 1 - 10 - - - 99 - 150 - 1 - 10 - - - 30 - 100 - 1 - 10 - - - 3 - 100 - 1 - 10 - - - 50 - 150 - 1 - 10 - - - 17 - 100 - 1 - 10 - - - 90 - 150 - 1 - 10 -