From 75009f0fe0ed6ecdc575c522f6a14a9d6262a666 Mon Sep 17 00:00:00 2001 From: Nick Hall Date: Thu, 21 May 2015 20:54:30 +0100 Subject: [PATCH] Convert deprecated stock items in glade files --- gramps/gui/dbman.py | 2 +- gramps/gui/glade/addmedia.glade | 12 +-- gramps/gui/glade/baseselector.glade | 8 +- gramps/gui/glade/book.glade | 38 ++++---- gramps/gui/glade/clipboard.glade | 12 +-- gramps/gui/glade/configure.glade | 8 +- gramps/gui/glade/dbman.glade | 88 +++-------------- gramps/gui/glade/dialog.glade | 126 +++++++------------------ gramps/gui/glade/displaystate.glade | 8 +- gramps/gui/glade/editaddress.glade | 14 +-- gramps/gui/glade/editattribute.glade | 14 +-- gramps/gui/glade/editchildref.glade | 18 ++-- gramps/gui/glade/editcitation.glade | 14 +-- gramps/gui/glade/editdate.glade | 12 +-- gramps/gui/glade/editevent.glade | 19 ++-- gramps/gui/glade/editeventref.glade | 23 ++--- gramps/gui/glade/editfamily.glade | 67 ++++++------- gramps/gui/glade/editldsord.glade | 19 ++-- gramps/gui/glade/editlink.glade | 20 ++-- gramps/gui/glade/editlocation.glade | 12 +-- gramps/gui/glade/editmedia.glade | 16 ++-- gramps/gui/glade/editmediaref.glade | 21 +++-- gramps/gui/glade/editname.glade | 16 ++-- gramps/gui/glade/editnote.glade | 14 +-- gramps/gui/glade/editperson.glade | 23 ++--- gramps/gui/glade/editpersonref.glade | 18 ++-- gramps/gui/glade/editplace.glade | 35 ++++--- gramps/gui/glade/editplaceref.glade | 46 ++++----- gramps/gui/glade/editreporef.glade | 19 ++-- gramps/gui/glade/editrepository.glade | 26 ++--- gramps/gui/glade/editsource.glade | 17 ++-- gramps/gui/glade/editurl.glade | 18 ++-- gramps/gui/glade/grampletpane.glade | 6 +- gramps/gui/glade/mergecitation.glade | 12 +-- gramps/gui/glade/mergedata.glade | 44 ++++----- gramps/gui/glade/mergeevent.glade | 12 +-- gramps/gui/glade/mergefamily.glade | 12 +-- gramps/gui/glade/mergemedia.glade | 12 +-- gramps/gui/glade/mergenote.glade | 12 +-- gramps/gui/glade/mergeperson.glade | 12 +-- gramps/gui/glade/mergeplace.glade | 12 +-- gramps/gui/glade/mergerepository.glade | 12 +-- gramps/gui/glade/mergesource.glade | 12 +-- gramps/gui/glade/plugins.glade | 4 +- gramps/gui/glade/reorder.glade | 16 ++-- gramps/gui/glade/rule.glade | 54 +++++------ gramps/gui/glade/styleeditor.glade | 72 +++++++------- gramps/gui/glade/tipofday.glade | 18 ++-- gramps/gui/glade/updateaddons.glade | 4 +- 49 files changed, 496 insertions(+), 633 deletions(-) diff --git a/gramps/gui/dbman.py b/gramps/gui/dbman.py index 1869a679a..f3e6214e3 100644 --- a/gramps/gui/dbman.py +++ b/gramps/gui/dbman.py @@ -126,7 +126,7 @@ class DbManager(CLIDbManager): the GTK widgets that are needed. """ CLIDbManager.__init__(self, dbstate) - self.glade = Glade() + self.glade = Glade(toplevel='dbmanager') self.top = self.glade.toplevel if parent: diff --git a/gramps/gui/glade/addmedia.glade b/gramps/gui/glade/addmedia.glade index 458943419..98b7a82f0 100644 --- a/gramps/gui/glade/addmedia.glade +++ b/gramps/gui/glade/addmedia.glade @@ -21,13 +21,13 @@ end - gtk-cancel + _Cancel False True True True True - True + True False @@ -37,14 +37,14 @@ - gtk-ok + _OK False True True True True True - True + True False @@ -54,13 +54,13 @@ - gtk-help + _Help False True True True True - True + True False diff --git a/gramps/gui/glade/baseselector.glade b/gramps/gui/glade/baseselector.glade index a631aad8a..63fbb5d2c 100644 --- a/gramps/gui/glade/baseselector.glade +++ b/gramps/gui/glade/baseselector.glade @@ -21,13 +21,13 @@ end - gtk-cancel + _Cancel False True True True True - True + True False @@ -37,13 +37,13 @@ - gtk-ok + _OK False True True True True - True + True False diff --git a/gramps/gui/glade/book.glade b/gramps/gui/glade/book.glade index ab331fb96..1d8c19796 100644 --- a/gramps/gui/glade/book.glade +++ b/gramps/gui/glade/book.glade @@ -95,7 +95,7 @@ True False - gtk-clear + edit-clear @@ -117,7 +117,7 @@ True False - gtk-save + document-save @@ -140,7 +140,7 @@ True False - gtk-open + document-open @@ -162,7 +162,7 @@ True False - gtk-index + gtk-index @@ -332,7 +332,7 @@ True False - gtk-add + list-add @@ -355,7 +355,7 @@ True False - gtk-remove + list-remove @@ -377,7 +377,7 @@ True False - gtk-go-up + go-up @@ -399,7 +399,7 @@ True False - gtk-go-down + go-down @@ -421,7 +421,7 @@ True False - gtk-preferences + preferences-desktop @@ -465,12 +465,12 @@ end - gtk-close + _Close True True True False - True + True @@ -481,12 +481,12 @@ - gtk-ok + _OK True True True False - True + True @@ -522,12 +522,12 @@ end - gtk-delete + _Delete True True True False - True + True @@ -538,12 +538,12 @@ - gtk-close + _Close True True True False - True + True @@ -554,12 +554,12 @@ - gtk-ok + _OK True True True False - True + True diff --git a/gramps/gui/glade/clipboard.glade b/gramps/gui/glade/clipboard.glade index 1a4c45a02..56c141c0a 100644 --- a/gramps/gui/glade/clipboard.glade +++ b/gramps/gui/glade/clipboard.glade @@ -20,13 +20,13 @@ end - gtk-help + _Help False True True True False - True + True @@ -53,13 +53,13 @@ - gtk-clear + _Clear False True True True False - True + True @@ -70,13 +70,13 @@ - gtk-close + _Close False True True True False - True + True diff --git a/gramps/gui/glade/configure.glade b/gramps/gui/glade/configure.glade index 4ba8a99b1..f6c26cc25 100644 --- a/gramps/gui/glade/configure.glade +++ b/gramps/gui/glade/configure.glade @@ -20,13 +20,13 @@ end - gtk-cancel + _Cancel False True True True False - True + True False @@ -36,13 +36,13 @@ - gtk-ok + _OK False True True True False - True + True False diff --git a/gramps/gui/glade/dbman.glade b/gramps/gui/glade/dbman.glade index a769709df..bbad9ed10 100644 --- a/gramps/gui/glade/dbman.glade +++ b/gramps/gui/glade/dbman.glade @@ -21,13 +21,13 @@ end - gtk-ok + _OK False True True True False - True + True False @@ -54,8 +54,8 @@ True False - Version description start + Version description @@ -118,44 +118,13 @@ end + _Close Window False True True True False - - - True - False - center - 2 - - - True - False - gtk-close - - - False - False - 0 - - - - - True - False - _Close Window - True - - - False - False - 1 - - - - + True False @@ -165,44 +134,13 @@ + _Load Family Tree False True True True False - - - True - False - center - 2 - - - True - False - gtk-apply - - - False - False - 0 - - - - - True - False - _Load Family Tree - True - - - False - False - 1 - - - - + True False @@ -280,13 +218,13 @@ start - gtk-new + _New False True True True False - True + True False @@ -296,12 +234,12 @@ - gtk-copy + _Copy True True True True - True + True False @@ -311,13 +249,13 @@ - gtk-delete + _Delete False True True True False - True + True False diff --git a/gramps/gui/glade/dialog.glade b/gramps/gui/glade/dialog.glade index 2e0e0c233..497858754 100644 --- a/gramps/gui/glade/dialog.glade +++ b/gramps/gui/glade/dialog.glade @@ -17,12 +17,12 @@ end - gtk-close + _Close True True True False - True + True False @@ -50,7 +50,8 @@ True False start - gtk-dialog-warning + 48 + dialog-warning 6 @@ -62,8 +63,8 @@ True False - True start + True True True @@ -78,8 +79,8 @@ True True False - True center + True True @@ -91,10 +92,10 @@ True False - True start 12 12 + True True @@ -136,12 +137,12 @@ end - gtk-close + _Close True True True False - True + True False @@ -167,7 +168,8 @@ True False start - gtk-dialog-info + 48 + dialog-information 6 @@ -248,44 +250,13 @@ end + _Remove Object True True True False Remove object and all references to it from the database - - - True - False - center - 2 - - - True - False - gtk-delete - - - False - False - 0 - - - - - True - False - _Remove Object - True - - - False - False - 1 - - - - + True False @@ -311,6 +282,7 @@ + _Select File True True True @@ -318,39 +290,7 @@ True False Select replacement for the missing file - - - True - False - center - 2 - - - True - False - gtk-find - - - False - False - 0 - - - - - True - False - _Select File - True - - - False - False - 1 - - - - + True False @@ -375,12 +315,12 @@ True False - True start 6 6 24 24 + True True True start @@ -395,7 +335,8 @@ True False start - gtk-dialog-warning + 48 + dialog-warning 6 @@ -407,10 +348,10 @@ True False - True start 6 6 + True True True @@ -426,8 +367,8 @@ True False If you check this button, all the missing media files will be automatically treated according to the currently selected option. No further dialogs will be presented for any missing media files. - True center + True True @@ -514,12 +455,12 @@ True False - True start 6 6 12 12 + True True True @@ -533,7 +474,8 @@ True False start - gtk-dialog-warning + 48 + dialog-warning 6 @@ -545,10 +487,10 @@ True False - True start 6 6 + True True True @@ -592,12 +534,12 @@ end - gtk-cancel + _Cancel True True True False - True + True False @@ -635,7 +577,8 @@ True False - gtk-dialog-question + 48 + dialog-question 6 @@ -730,14 +673,14 @@ - gtk-cancel + _Cancel True True True True True False - True + True False @@ -747,12 +690,12 @@ - gtk-save + _Save True True True False - True + True False @@ -794,7 +737,8 @@ True False start - gtk-dialog-warning + 48 + dialog-warning 6 @@ -823,8 +767,8 @@ True True False - True center + True True diff --git a/gramps/gui/glade/displaystate.glade b/gramps/gui/glade/displaystate.glade index d73727dd6..5cb12b68c 100644 --- a/gramps/gui/glade/displaystate.glade +++ b/gramps/gui/glade/displaystate.glade @@ -1,6 +1,7 @@ + - + True False @@ -21,14 +22,13 @@ end - gtk-close + _Close False True True True True - False - True + True False diff --git a/gramps/gui/glade/editaddress.glade b/gramps/gui/glade/editaddress.glade index ead555e5a..bc7399261 100644 --- a/gramps/gui/glade/editaddress.glade +++ b/gramps/gui/glade/editaddress.glade @@ -18,12 +18,12 @@ end - gtk-cancel + _Cancel True True True True - True + True False @@ -33,7 +33,7 @@ - gtk-ok + _OK True True True @@ -42,7 +42,7 @@ True Accept changes and close window Accept changes and close window - True + True False @@ -52,12 +52,12 @@ - gtk-help + _Help True True True True - True + True False @@ -283,7 +283,7 @@ Note: Use Residence Event for genealogical address data. True False - gtk-dialog-authentication + dialog-password 1 diff --git a/gramps/gui/glade/editattribute.glade b/gramps/gui/glade/editattribute.glade index 12f1e463c..d28c5a170 100644 --- a/gramps/gui/glade/editattribute.glade +++ b/gramps/gui/glade/editattribute.glade @@ -18,13 +18,13 @@ end - gtk-cancel + _Cancel False True True True True - True + True False @@ -34,14 +34,14 @@ - gtk-ok + _OK False True True True True True - True + True False @@ -51,13 +51,13 @@ - gtk-help + _Help False True True True True - True + True False @@ -139,7 +139,7 @@ True False - gtk-dialog-authentication + dialog-password 1 diff --git a/gramps/gui/glade/editchildref.glade b/gramps/gui/glade/editchildref.glade index 87b210754..08ee4a965 100644 --- a/gramps/gui/glade/editchildref.glade +++ b/gramps/gui/glade/editchildref.glade @@ -19,13 +19,13 @@ end - gtk-cancel + _Cancel False True True True True - True + True False @@ -35,7 +35,7 @@ - gtk-ok + _OK False True True @@ -45,7 +45,7 @@ True Accept changes and close window Accept changes and close window - True + True False @@ -55,13 +55,13 @@ - gtk-help + _Help False True True True True - True + True False @@ -166,7 +166,7 @@ True False - gtk-dialog-authentication + dialog-password 1 @@ -209,8 +209,8 @@ True False - True start + True @@ -233,7 +233,7 @@ True False - gtk-edit + gtk-edit 1 diff --git a/gramps/gui/glade/editcitation.glade b/gramps/gui/glade/editcitation.glade index 243c70449..0aa4d0fc3 100644 --- a/gramps/gui/glade/editcitation.glade +++ b/gramps/gui/glade/editcitation.glade @@ -25,12 +25,12 @@ end - gtk-help + _Help True True True True - True + True False @@ -40,12 +40,12 @@ - gtk-cancel + _Cancel True True True True - True + True False @@ -55,12 +55,12 @@ - gtk-ok + _OK True True True True - True + True False @@ -333,7 +333,7 @@ Very High =Direct and primary evidence used, or by dominance of the evidence

True False - gtk-dialog-authentication + dialog-password Privacy diff --git a/gramps/gui/glade/editdate.glade b/gramps/gui/glade/editdate.glade index 900e21b26..258f71130 100644 --- a/gramps/gui/glade/editdate.glade +++ b/gramps/gui/glade/editdate.glade @@ -50,13 +50,13 @@ end - gtk-help + _Help False True True True False - True + True False @@ -66,13 +66,13 @@ - gtk-cancel + _Cancel False True True True False - True + True False @@ -82,13 +82,13 @@ - gtk-ok + _OK False True True True False - True + True False diff --git a/gramps/gui/glade/editevent.glade b/gramps/gui/glade/editevent.glade index 9ad55da6b..4d13211c6 100644 --- a/gramps/gui/glade/editevent.glade +++ b/gramps/gui/glade/editevent.glade @@ -18,7 +18,7 @@ end - gtk-cancel + _Cancel True True True @@ -27,7 +27,7 @@ True Close window without changes Close window without changes - True + True False @@ -37,7 +37,7 @@ - gtk-ok + _OK True True True @@ -45,7 +45,7 @@ True Accept changes and close window Accept changes and close window - True + True False @@ -55,12 +55,12 @@ - gtk-help + _Help True True True True - True + True False @@ -232,8 +232,8 @@ True False - True start + True end @@ -342,7 +342,7 @@ True False - gtk-dialog-authentication + dialog-password Privacy @@ -399,9 +399,9 @@ True False - True start center + True True @@ -415,7 +415,6 @@ True True 1 - True right diff --git a/gramps/gui/glade/editeventref.glade b/gramps/gui/glade/editeventref.glade index 1bcafcec7..3cdfcaa8c 100644 --- a/gramps/gui/glade/editeventref.glade +++ b/gramps/gui/glade/editeventref.glade @@ -19,13 +19,13 @@ end - gtk-help + _Help False True True True True - True + True False @@ -35,13 +35,13 @@ - gtk-cancel + _Cancel False True True True True - True + True False @@ -51,13 +51,13 @@ - gtk-ok + _OK False True True True True - True + True False @@ -135,7 +135,7 @@ True False - gtk-dialog-authentication + dialog-password 1 @@ -303,8 +303,8 @@ True False - True start + True @@ -406,7 +406,7 @@ True False - gtk-dialog-authentication + dialog-password 1 @@ -479,7 +479,8 @@ True False start - gtk-dialog-warning + 48 + dialog-warning 6 @@ -546,7 +547,7 @@ True False - gtk-file + text-x-generic 1 diff --git a/gramps/gui/glade/editfamily.glade b/gramps/gui/glade/editfamily.glade index ec5944c6f..9b88ebd97 100644 --- a/gramps/gui/glade/editfamily.glade +++ b/gramps/gui/glade/editfamily.glade @@ -18,7 +18,7 @@ end - gtk-cancel + _Cancel False True True @@ -27,7 +27,7 @@ True Abandon changes and close window Abandon changes and close window - True + True False @@ -37,7 +37,7 @@ - gtk-ok + _OK False True True @@ -47,7 +47,7 @@ True Accept changes and close window Accept changes and close window - True + True False @@ -57,13 +57,13 @@ - gtk-help + _Help False True True True True - True + True False @@ -113,8 +113,8 @@ True False - 6 start + 6 Name: @@ -126,8 +126,8 @@ True False - 6 start + 6 Birth: @@ -139,8 +139,8 @@ True False - 6 start + 6 Death: @@ -179,7 +179,7 @@ True False - gtk-index + gtk-index Selector @@ -211,7 +211,7 @@ True False - gtk-add + list-add Add @@ -242,7 +242,7 @@ True False - gtk-remove + list-remove Remove @@ -273,7 +273,7 @@ True False - gtk-edit + gtk-edit Edition @@ -305,8 +305,8 @@ True False - True start + True 1 @@ -317,8 +317,8 @@ True False - True start + True 1 @@ -329,8 +329,8 @@ True False - True start + True end @@ -367,8 +367,8 @@ True False - 6 start + 6 Name: @@ -380,8 +380,8 @@ True False - 6 start + 6 Birth: @@ -393,8 +393,8 @@ True False - 6 start + 6 Death: @@ -406,8 +406,8 @@ True False - True start + True 1 @@ -418,8 +418,8 @@ True False - True start + True 1 @@ -457,7 +457,7 @@ True False - gtk-index + gtk-index Selector @@ -488,7 +488,7 @@ True False - gtk-add + list-add Add @@ -522,7 +522,7 @@ True False - gtk-dialog-authentication + dialog-password Privacy @@ -550,7 +550,7 @@ True False - gtk-remove + list-remove Remove @@ -581,7 +581,7 @@ True False - gtk-edit + gtk-edit Edition @@ -613,8 +613,8 @@ True False - True start + True end @@ -665,8 +665,8 @@ True False - 6 start + 6 _ID: True gid @@ -728,8 +728,8 @@ True False - 6 start + 6 _Tags: True tag_button @@ -787,15 +787,6 @@ 3 - - - - - - - - - False diff --git a/gramps/gui/glade/editldsord.glade b/gramps/gui/glade/editldsord.glade index ba256396d..1307cb7ae 100644 --- a/gramps/gui/glade/editldsord.glade +++ b/gramps/gui/glade/editldsord.glade @@ -38,13 +38,13 @@ end - gtk-cancel + _Cancel False True True True True - True + True False @@ -54,7 +54,7 @@ - gtk-ok + _OK False True True @@ -64,7 +64,7 @@ True Accept changes and close window Accept changes and close window - True + True False @@ -74,13 +74,13 @@ - gtk-help + _Help False True True True True - True + True False @@ -234,8 +234,8 @@ False - True start + True 1 @@ -252,7 +252,6 @@ True False - gtk-index Selector @@ -319,8 +318,8 @@ True False - True start + True end @@ -368,7 +367,7 @@ True False - gtk-dialog-authentication + dialog-password 1 diff --git a/gramps/gui/glade/editlink.glade b/gramps/gui/glade/editlink.glade index d7203b596..e4d37322d 100644 --- a/gramps/gui/glade/editlink.glade +++ b/gramps/gui/glade/editlink.glade @@ -20,13 +20,13 @@ end - gtk-cancel + _Cancel False True True True True - True + True False @@ -36,7 +36,7 @@ - gtk-ok + _OK False True True @@ -46,7 +46,7 @@ True Accept changes and close window Accept changes and close window - True + True False @@ -56,13 +56,13 @@ - gtk-help + _Help False True True True True - True + True False @@ -158,7 +158,7 @@ True False - gtk-index + gtk-index 2 @@ -206,11 +206,12 @@ - New + _New False True True True + True 3 @@ -219,11 +220,12 @@ - Edit + _Edit False True True True + True 3 diff --git a/gramps/gui/glade/editlocation.glade b/gramps/gui/glade/editlocation.glade index f3cc82a2a..20e3d1c9c 100644 --- a/gramps/gui/glade/editlocation.glade +++ b/gramps/gui/glade/editlocation.glade @@ -19,13 +19,13 @@ end - gtk-cancel + _Cancel False True True True True - True + True False @@ -35,14 +35,14 @@ - gtk-ok + _OK False True True True True True - True + True False @@ -52,13 +52,13 @@ - gtk-help + _Help False True True True True - True + True False diff --git a/gramps/gui/glade/editmedia.glade b/gramps/gui/glade/editmedia.glade index 0c9861c1f..db2beaeac 100644 --- a/gramps/gui/glade/editmedia.glade +++ b/gramps/gui/glade/editmedia.glade @@ -19,13 +19,13 @@ end - gtk-cancel + _Cancel False True True True True - True + True False @@ -35,14 +35,14 @@ - gtk-ok + _OK False True True True True True - True + True False @@ -52,13 +52,13 @@ - gtk-help + _Help False True True True True - True + True False @@ -273,7 +273,7 @@ Gramps does not store the media internally, it only stores the path! Set the 'Re True False - gtk-open + document-open Folder @@ -319,7 +319,7 @@ Gramps does not store the media internally, it only stores the path! Set the 'Re True False - gtk-dialog-authentication + dialog-password Privacy diff --git a/gramps/gui/glade/editmediaref.glade b/gramps/gui/glade/editmediaref.glade index ebdf8834e..13ed91b4e 100644 --- a/gramps/gui/glade/editmediaref.glade +++ b/gramps/gui/glade/editmediaref.glade @@ -41,12 +41,12 @@ end - gtk-cancel + _Cancel True True True True - True + True False @@ -56,13 +56,13 @@ - gtk-ok + _OK True True True True True - True + True False @@ -72,12 +72,12 @@ - gtk-help + _Help True True True True - True + True False @@ -287,7 +287,7 @@ You can use the mouse on the picture to select a region, or use these spinbutton True False - gtk-dialog-authentication + dialog-password 1 @@ -439,7 +439,8 @@ You can use the mouse on the picture to select a region, or use these spinbutton True False - gtk-dialog-warning + 48 + dialog-warning 6 @@ -609,7 +610,7 @@ You can use the mouse on the picture to select a region, or use these spinbutton True False - gtk-dialog-authentication + dialog-password 1 @@ -653,7 +654,7 @@ You can use the mouse on the picture to select a region, or use these spinbutton True False - gtk-open + document-open 1 diff --git a/gramps/gui/glade/editname.glade b/gramps/gui/glade/editname.glade index 4c65fd4ec..265f81f42 100644 --- a/gramps/gui/glade/editname.glade +++ b/gramps/gui/glade/editname.glade @@ -19,7 +19,7 @@ end - gtk-cancel + _Cancel False True True @@ -28,7 +28,7 @@ True Abandon changes and close window Abandon changes and close window - True + True False @@ -38,7 +38,7 @@ - gtk-ok + _OK False True True @@ -47,7 +47,7 @@ True Accept changes and close window Accept changes and close window - True + True False @@ -57,13 +57,13 @@ - gtk-help + _Help False True True True True - True + True False @@ -142,7 +142,7 @@ True False - gtk-dialog-authentication + dialog-password 1 @@ -618,8 +618,8 @@ You will be asked if you want to group this person only, or all people with this True True False - True center + True True diff --git a/gramps/gui/glade/editnote.glade b/gramps/gui/glade/editnote.glade index 13fe5732c..49688980a 100644 --- a/gramps/gui/glade/editnote.glade +++ b/gramps/gui/glade/editnote.glade @@ -20,13 +20,13 @@ end - gtk-cancel + _Cancel False True True True True - True + True False @@ -36,13 +36,13 @@ - gtk-ok + _OK False True True True True - True + True False @@ -52,13 +52,13 @@ - gtk-help + _Help False True True True True - True + True False @@ -221,7 +221,7 @@ Use monospace font to keep preformatting. True False - gtk-dialog-authentication + dialog-password 1 diff --git a/gramps/gui/glade/editperson.glade b/gramps/gui/glade/editperson.glade index 26c4d7404..e7857a63c 100644 --- a/gramps/gui/glade/editperson.glade +++ b/gramps/gui/glade/editperson.glade @@ -6,7 +6,7 @@ True False - gtk-edit + gtk-edit Edit @@ -16,7 +16,7 @@ True False - gtk-add + list-add Add @@ -43,14 +43,15 @@ end - gtk-cancel + _Cancel False True True True False Abandon changes and close window - True + True + bottom @@ -61,14 +62,14 @@ - gtk-ok + _OK False True True True False Accept changes and close window - True + True @@ -79,13 +80,13 @@ - gtk-help + _Help False True True True False - True + True @@ -396,14 +397,14 @@ Indicate that the surname consists of different parts. Every surname has its own True True Set person as private data - none end + none True False 16 - gtk-dialog-authentication + dialog-password Privacy @@ -737,12 +738,12 @@ Indicate that the surname consists of different parts. Every surname has its own True False - True start 3 3 3 3 + True True end diff --git a/gramps/gui/glade/editpersonref.glade b/gramps/gui/glade/editpersonref.glade index abcde0145..067d92714 100644 --- a/gramps/gui/glade/editpersonref.glade +++ b/gramps/gui/glade/editpersonref.glade @@ -18,13 +18,13 @@ end - gtk-cancel + _Cancel False True True True True - True + True False @@ -34,7 +34,7 @@ - gtk-ok + _OK False True True @@ -44,7 +44,7 @@ True Accept changes and close window Accept changes and close window - True + True False @@ -54,13 +54,13 @@ - gtk-help + _Help False True True True True - True + True False @@ -144,7 +144,7 @@ Note: Use Events instead for relations connected to specific time frames or occa True False - gtk-dialog-authentication + dialog-password 1 @@ -174,8 +174,8 @@ Note: Use Events instead for relations connected to specific time frames or occa True False Use the select button to choose a person that has an association to the edited person. - True start + True @@ -195,7 +195,7 @@ Note: Use Events instead for relations connected to specific time frames or occa True False - gtk-index + gtk-index Selector diff --git a/gramps/gui/glade/editplace.glade b/gramps/gui/glade/editplace.glade index 852f32e9c..2f945bb16 100644 --- a/gramps/gui/glade/editplace.glade +++ b/gramps/gui/glade/editplace.glade @@ -18,12 +18,12 @@ end - gtk-cancel + _Cancel True True True True - True + True False @@ -33,13 +33,13 @@ - gtk-ok + _OK True True True True True - True + True False @@ -49,12 +49,12 @@ - gtk-help + _Help True True True True - True + True False @@ -86,11 +86,11 @@ False True + start _Title: True center place_title - start 0 @@ -101,11 +101,11 @@ True False + start L_atitude: True center lat_entry - start 0 @@ -116,11 +116,11 @@ True False + start _Longitude: True center lon_entry - start 2 @@ -145,10 +145,10 @@ True False + start _ID: True gid - start 0 @@ -209,9 +209,9 @@ You can set these values via the Geography View by searching the place, or via a True False + start Code: True - start False @@ -249,7 +249,7 @@ You can set these values via the Geography View by searching the place, or via a True False - gtk-dialog-authentication + dialog-password Privacy @@ -274,7 +274,6 @@ You can set these values via the Geography View by searching the place, or via a True True True - True 4 @@ -285,8 +284,8 @@ You can set these values via the Geography View by searching the place, or via a True False - place|Name: start + place|Name: 0 @@ -297,8 +296,8 @@ You can set these values via the Geography View by searching the place, or via a True False - Type: start + Type: 2 @@ -341,8 +340,8 @@ You can set these values via the Geography View by searching the place, or via a True False - Tags: start + Tags: 2 @@ -353,8 +352,8 @@ You can set these values via the Geography View by searching the place, or via a True False - True start + True 3 @@ -365,8 +364,8 @@ You can set these values via the Geography View by searching the place, or via a True False - 6 start + 6 diff --git a/gramps/gui/glade/editplaceref.glade b/gramps/gui/glade/editplaceref.glade index 05962759a..46179a32a 100644 --- a/gramps/gui/glade/editplaceref.glade +++ b/gramps/gui/glade/editplaceref.glade @@ -19,13 +19,13 @@ end - gtk-help + _Help False True True True True - True + True False @@ -35,13 +35,13 @@ - gtk-cancel + _Cancel False True True True True - True + True False @@ -51,13 +51,13 @@ - gtk-ok + _OK False True True True True - True + True False @@ -77,6 +77,7 @@ True False + start 6 6 3 @@ -84,7 +85,6 @@ Reference information True center - start @@ -111,12 +111,12 @@ True False + start 3 3 _Date: True center - start 0 @@ -196,10 +196,10 @@ False True + start Title: True center - start 0 @@ -210,10 +210,10 @@ True False + start Name: True center - start 0 @@ -224,12 +224,12 @@ True False + start 3 3 ID: True center - start 0 @@ -240,9 +240,9 @@ True False + start Latitude: True - start 0 @@ -259,7 +259,8 @@ True False start - gtk-dialog-warning + 48 + dialog-warning 6 @@ -273,13 +274,13 @@ 500 True False + start 4 4 <b>Note:</b> Any changes in the enclosing place information will be reflected in the place itself, for places that it encloses. True fill True - start True @@ -298,10 +299,10 @@ True False + start Type: True center - start 2 @@ -312,10 +313,10 @@ True False + start Longitude: True center - start 2 @@ -351,7 +352,7 @@ True False - gtk-dialog-authentication + dialog-password Privacy @@ -452,9 +453,9 @@ You can set these values via the Geography View by searching the place, or via a True False + start Code: True - start False @@ -486,8 +487,8 @@ You can set these values via the Geography View by searching the place, or via a True False - Tags: start + Tags: 2 @@ -498,8 +499,8 @@ You can set these values via the Geography View by searching the place, or via a True False - True start + True 3 @@ -511,7 +512,6 @@ You can set these values via the Geography View by searching the place, or via a True True True - True 4 @@ -522,8 +522,8 @@ You can set these values via the Geography View by searching the place, or via a True False - 6 start + 6 @@ -551,7 +551,7 @@ You can set these values via the Geography View by searching the place, or via a True False - gtk-file + text-x-generic 1 diff --git a/gramps/gui/glade/editreporef.glade b/gramps/gui/glade/editreporef.glade index 583f83521..23011b160 100644 --- a/gramps/gui/glade/editreporef.glade +++ b/gramps/gui/glade/editreporef.glade @@ -19,7 +19,7 @@ end - gtk-cancel + _Cancel False True True @@ -28,7 +28,7 @@ True Abandon changes and close window Abandon changes and close window - True + True False @@ -38,7 +38,7 @@ - gtk-ok + _OK False True True @@ -48,7 +48,7 @@ True Accept changes and close window Accept changes and close window - True + True False @@ -58,13 +58,13 @@ - gtk-help + _Help False True True True True - True + True False @@ -182,7 +182,7 @@ True False - gtk-dialog-authentication + dialog-password Privacy @@ -308,7 +308,8 @@ True False - gtk-dialog-warning + 48 + dialog-warning 6 @@ -390,7 +391,7 @@ True False - gtk-dialog-authentication + dialog-password Privacy diff --git a/gramps/gui/glade/editrepository.glade b/gramps/gui/glade/editrepository.glade index 56a80971a..88bb2a0fd 100644 --- a/gramps/gui/glade/editrepository.glade +++ b/gramps/gui/glade/editrepository.glade @@ -19,7 +19,7 @@ end - gtk-cancel + _Cancel True True True @@ -27,7 +27,7 @@ True Abandon changes and close window Abandon changes and close window - True + True False @@ -37,7 +37,7 @@ - gtk-ok + _OK True True True @@ -46,7 +46,7 @@ True Accept changes and close window Accept changes and close window - True + True False @@ -56,12 +56,12 @@ - gtk-help + _Help True True True True - True + True False @@ -199,7 +199,7 @@ True False - gtk-dialog-authentication + dialog-password Privacy @@ -247,8 +247,8 @@ True False - True start + True True @@ -261,7 +261,6 @@ True True True - True False @@ -275,15 +274,6 @@ 2 - - - - - - - - - False diff --git a/gramps/gui/glade/editsource.glade b/gramps/gui/glade/editsource.glade index 3f542b7c9..05872049f 100644 --- a/gramps/gui/glade/editsource.glade +++ b/gramps/gui/glade/editsource.glade @@ -20,13 +20,13 @@ end - gtk-cancel + _Cancel True True True False Abandon changes and close window - True + True @@ -37,14 +37,14 @@ - gtk-ok + _OK True True True True False Accept changes and close window - True + True @@ -55,12 +55,12 @@ - gtk-help + _Help True True True False - True + True @@ -238,10 +238,10 @@ True False - True start 2 2 + True True @@ -282,7 +282,7 @@ True False - gtk-dialog-authentication + dialog-password Privacy @@ -307,7 +307,6 @@ True True True - True 2 diff --git a/gramps/gui/glade/editurl.glade b/gramps/gui/glade/editurl.glade index d80050d79..4e84f427d 100644 --- a/gramps/gui/glade/editurl.glade +++ b/gramps/gui/glade/editurl.glade @@ -19,13 +19,13 @@ end - gtk-cancel + _Cancel False True True True True - True + True False @@ -35,7 +35,7 @@ - gtk-ok + _OK False True True @@ -45,7 +45,7 @@ True Accept changes and close window Accept changes and close window - True + True False @@ -55,13 +55,13 @@ - gtk-help + _Help False True True True True - True + True False @@ -144,7 +144,7 @@ True False - gtk-dialog-authentication + dialog-password Privacy @@ -198,13 +198,13 @@ - gtk-jump-to + _Jump to False True True True Open the web address in the default browser. - True + True 2 diff --git a/gramps/gui/glade/grampletpane.glade b/gramps/gui/glade/grampletpane.glade index cf7234af1..b8d6b2cc2 100644 --- a/gramps/gui/glade/grampletpane.glade +++ b/gramps/gui/glade/grampletpane.glade @@ -65,7 +65,7 @@ True False - gtk-properties + document-properties Config @@ -98,7 +98,7 @@ True False - gtk-remove + list-remove Remove @@ -131,7 +131,7 @@ True False - gtk-close + window-close Close diff --git a/gramps/gui/glade/mergecitation.glade b/gramps/gui/glade/mergecitation.glade index 9f7b85bc8..90d867f8a 100644 --- a/gramps/gui/glade/mergecitation.glade +++ b/gramps/gui/glade/mergecitation.glade @@ -19,13 +19,13 @@ end - gtk-cancel + _Cancel False True True True False - True + True False @@ -35,13 +35,13 @@ - gtk-ok + _OK False True True True False - True + True False @@ -51,13 +51,13 @@ - gtk-help + _Help False True True True False - True + True False diff --git a/gramps/gui/glade/mergedata.glade b/gramps/gui/glade/mergedata.glade index 1b363e3b7..a80b048bf 100644 --- a/gramps/gui/glade/mergedata.glade +++ b/gramps/gui/glade/mergedata.glade @@ -22,13 +22,13 @@ end - gtk-cancel + _Cancel False True True True False - True + True @@ -74,13 +74,13 @@ - gtk-help + _Help False True True True False - True + True @@ -243,13 +243,13 @@ end - gtk-cancel + _Cancel False True True True False - True + True False @@ -259,13 +259,13 @@ - gtk-ok + _OK False True True True False - True + True False @@ -275,13 +275,13 @@ - gtk-help + _Help False True True True False - True + True False @@ -431,13 +431,13 @@ end - gtk-cancel + _Cancel False True True True False - True + True @@ -448,13 +448,13 @@ - gtk-ok + _OK False True True True False - True + True @@ -465,13 +465,13 @@ - gtk-help + _Help False True True True False - True + True @@ -663,13 +663,13 @@ end - gtk-cancel + _Cancel False True True True False - True + True False @@ -679,13 +679,13 @@ - gtk-ok + _OK False True True True False - True + True False @@ -695,13 +695,13 @@ - gtk-help + _Help False True True True False - True + True False diff --git a/gramps/gui/glade/mergeevent.glade b/gramps/gui/glade/mergeevent.glade index 8fbf5be35..30567a471 100644 --- a/gramps/gui/glade/mergeevent.glade +++ b/gramps/gui/glade/mergeevent.glade @@ -19,13 +19,13 @@ end - gtk-cancel + _Cancel False True True True False - True + True False @@ -35,13 +35,13 @@ - gtk-ok + _OK False True True True False - True + True False @@ -51,13 +51,13 @@ - gtk-help + _Help False True True True False - True + True False diff --git a/gramps/gui/glade/mergefamily.glade b/gramps/gui/glade/mergefamily.glade index 4be736d60..8b15de79b 100644 --- a/gramps/gui/glade/mergefamily.glade +++ b/gramps/gui/glade/mergefamily.glade @@ -19,13 +19,13 @@ end - gtk-cancel + _Cancel False True True True False - True + True False @@ -35,13 +35,13 @@ - gtk-ok + _OK False True True True False - True + True False @@ -51,13 +51,13 @@ - gtk-help + _Help False True True True False - True + True False diff --git a/gramps/gui/glade/mergemedia.glade b/gramps/gui/glade/mergemedia.glade index a45135650..c69ef0a29 100644 --- a/gramps/gui/glade/mergemedia.glade +++ b/gramps/gui/glade/mergemedia.glade @@ -19,13 +19,13 @@ end - gtk-cancel + _Cancel False True True True False - True + True False @@ -35,13 +35,13 @@ - gtk-ok + _OK False True True True False - True + True False @@ -51,13 +51,13 @@ - gtk-help + _Help False True True True False - True + True False diff --git a/gramps/gui/glade/mergenote.glade b/gramps/gui/glade/mergenote.glade index 6327d5dca..69c12ae5e 100644 --- a/gramps/gui/glade/mergenote.glade +++ b/gramps/gui/glade/mergenote.glade @@ -19,13 +19,13 @@ end - gtk-cancel + _Cancel False True True True False - True + True False @@ -35,13 +35,13 @@ - gtk-ok + _OK False True True True False - True + True False @@ -51,13 +51,13 @@ - gtk-help + _Help False True True True False - True + True False diff --git a/gramps/gui/glade/mergeperson.glade b/gramps/gui/glade/mergeperson.glade index 086d88151..915d52610 100644 --- a/gramps/gui/glade/mergeperson.glade +++ b/gramps/gui/glade/mergeperson.glade @@ -20,13 +20,13 @@ end - gtk-cancel + _Cancel False True True True False - True + True False @@ -36,13 +36,13 @@ - gtk-ok + _OK False True True True False - True + True False @@ -52,13 +52,13 @@ - gtk-help + _Help False True True True False - True + True False diff --git a/gramps/gui/glade/mergeplace.glade b/gramps/gui/glade/mergeplace.glade index 754b89a8d..3037e3cab 100644 --- a/gramps/gui/glade/mergeplace.glade +++ b/gramps/gui/glade/mergeplace.glade @@ -19,12 +19,12 @@ end - gtk-cancel + _Cancel True True True False - True + True False @@ -34,12 +34,12 @@ - gtk-ok + _OK True True True False - True + True False @@ -49,12 +49,12 @@ - gtk-help + _Help True True True False - True + True False diff --git a/gramps/gui/glade/mergerepository.glade b/gramps/gui/glade/mergerepository.glade index 6c8c02526..9253f36a4 100644 --- a/gramps/gui/glade/mergerepository.glade +++ b/gramps/gui/glade/mergerepository.glade @@ -19,13 +19,13 @@ end - gtk-cancel + _Cancel False True True True False - True + True False @@ -35,13 +35,13 @@ - gtk-ok + _OK False True True True False - True + True False @@ -51,13 +51,13 @@ - gtk-help + _Help False True True True False - True + True False diff --git a/gramps/gui/glade/mergesource.glade b/gramps/gui/glade/mergesource.glade index b3cbec80a..907ec9777 100644 --- a/gramps/gui/glade/mergesource.glade +++ b/gramps/gui/glade/mergesource.glade @@ -19,13 +19,13 @@ end - gtk-cancel + _Cancel False True True True False - True + True False @@ -35,13 +35,13 @@ - gtk-ok + _OK False True True True False - True + True False @@ -51,13 +51,13 @@ - gtk-help + _Help False True True True False - True + True False diff --git a/gramps/gui/glade/plugins.glade b/gramps/gui/glade/plugins.glade index 7c669edbe..fec0f1fee 100644 --- a/gramps/gui/glade/plugins.glade +++ b/gramps/gui/glade/plugins.glade @@ -21,13 +21,13 @@ end - gtk-close + _Close False True True True False - True + True diff --git a/gramps/gui/glade/reorder.glade b/gramps/gui/glade/reorder.glade index e77a9d11d..2eedc4c43 100644 --- a/gramps/gui/glade/reorder.glade +++ b/gramps/gui/glade/reorder.glade @@ -21,13 +21,13 @@ end - gtk-cancel + _Cancel False True True True True - True + True False @@ -37,13 +37,13 @@ - gtk-ok + _OK False True True True True - True + True False @@ -95,7 +95,7 @@ True False - gtk-go-up + go-up Arrow top @@ -125,7 +125,7 @@ True False - gtk-go-down + go-down Arrow bottom @@ -230,7 +230,7 @@ True False - gtk-go-up + go-up Arrow top @@ -260,7 +260,7 @@ True False - gtk-go-down + go-down Arrow bottom diff --git a/gramps/gui/glade/rule.glade b/gramps/gui/glade/rule.glade index 37495cc4a..141281531 100644 --- a/gramps/gui/glade/rule.glade +++ b/gramps/gui/glade/rule.glade @@ -23,13 +23,13 @@ end - gtk-close + _Close False True True True False - True + True @@ -40,13 +40,13 @@ - gtk-help + _Help False True True True False - True + True @@ -127,7 +127,7 @@ True False - gtk-add + list-add @@ -151,7 +151,7 @@ True False - gtk-edit + gtk-edit @@ -175,7 +175,7 @@ True False - gtk-copy + edit-copy @@ -197,7 +197,7 @@ True False - gtk-execute + system-run @@ -221,7 +221,7 @@ True False - gtk-remove + list-remove @@ -316,13 +316,13 @@ end - gtk-cancel + _Cancel False True True True False - True + True @@ -333,14 +333,14 @@ - gtk-ok + _OK False True False True True False - True + True @@ -351,13 +351,13 @@ - gtk-help + _Help False True True True False - True + True @@ -419,7 +419,7 @@ True False - gtk-add + list-add Add @@ -453,7 +453,7 @@ True False - gtk-edit + gtk-edit Edition @@ -487,7 +487,7 @@ True False - gtk-remove + list-remove Remove @@ -608,9 +608,9 @@ True True False + center 6 True - center True @@ -747,13 +747,13 @@ end - gtk-cancel + _Cancel False True True True False - True + True @@ -764,13 +764,13 @@ - gtk-ok + _OK False True True True False - True + True @@ -781,13 +781,13 @@ - gtk-help + _Help False True True True False - True + True @@ -989,13 +989,13 @@ end - gtk-close + _Close False True True True False - True + True diff --git a/gramps/gui/glade/styleeditor.glade b/gramps/gui/glade/styleeditor.glade index 16f0517ff..c67bb1f0c 100644 --- a/gramps/gui/glade/styleeditor.glade +++ b/gramps/gui/glade/styleeditor.glade @@ -83,13 +83,13 @@ end - gtk-cancel + _Cancel False True True True False - True + True @@ -100,14 +100,14 @@ - gtk-ok + _OK False True True True True False - True + True @@ -301,9 +301,9 @@ True True False + center 12 True - center True @@ -318,9 +318,9 @@ True True False + center 12 True - center True roman @@ -418,9 +418,9 @@ True True False + center 12 True - center True @@ -435,9 +435,9 @@ True True False + center 12 True - center True @@ -452,9 +452,9 @@ True True False + center 12 True - center True @@ -547,9 +547,9 @@ True True False + center 12 True - center True @@ -564,8 +564,8 @@ True True False - True center + True True lalign @@ -581,8 +581,8 @@ True True False - True center + True True lalign @@ -598,8 +598,8 @@ True True False - True center + True True lalign @@ -650,8 +650,8 @@ True False - 12 start + 12 First li_ne: True center @@ -705,8 +705,8 @@ True False - 12 start + 12 R_ight: True center @@ -721,8 +721,8 @@ True False - 12 start + 12 L_eft: True center @@ -756,8 +756,8 @@ True False - 12 start + 12 Abo_ve: True center @@ -772,8 +772,8 @@ True False - 12 start + 12 Belo_w: True center @@ -906,9 +906,9 @@ True True False + center 12 True - center True @@ -923,8 +923,8 @@ True True False - True center + True True @@ -939,8 +939,8 @@ True True False - True center + True True @@ -952,8 +952,8 @@ True False - 12 start + 12 _Padding: True center @@ -998,8 +998,8 @@ True True False - True center + True True @@ -1317,8 +1317,8 @@ True True False - 12 start + 12 True @@ -1451,8 +1451,8 @@ True False - 12 start + 12 Style: @@ -1464,8 +1464,8 @@ True False - 12 start + 12 Width: @@ -1477,8 +1477,8 @@ True False - 12 start + 12 Line: @@ -1490,8 +1490,8 @@ True False - 12 start + 12 Fill: @@ -1604,8 +1604,8 @@ True False - 12 start + 12 Spacing: @@ -1724,13 +1724,13 @@ end - gtk-cancel + _Cancel False True True True False - True + True False @@ -1740,14 +1740,14 @@ - gtk-ok + _OK False True True True True False - True + True @@ -1831,7 +1831,7 @@ True False - gtk-add + list-add Add @@ -1863,7 +1863,7 @@ True False - gtk-edit + gtk-edit Edition @@ -1895,7 +1895,7 @@ True False - gtk-remove + list-remove Remove diff --git a/gramps/gui/glade/tipofday.glade b/gramps/gui/glade/tipofday.glade index 965911919..a0fb6ca65 100644 --- a/gramps/gui/glade/tipofday.glade +++ b/gramps/gui/glade/tipofday.glade @@ -27,9 +27,8 @@ True False center - True - center start + True True True @@ -58,14 +57,14 @@ 300 True False - True - True start start 6 6 6 6 + True + True True @@ -79,8 +78,7 @@ False start True - start - gtk-missing-image + image-missing 0 @@ -101,12 +99,12 @@ end - gtk-go-forward + _Forward True True True True - True + True False @@ -116,12 +114,12 @@ - gtk-close + _Close True True True True - True + True False diff --git a/gramps/gui/glade/updateaddons.glade b/gramps/gui/glade/updateaddons.glade index 2ee99291e..b1272c419 100644 --- a/gramps/gui/glade/updateaddons.glade +++ b/gramps/gui/glade/updateaddons.glade @@ -23,12 +23,12 @@ start - gtk-close + _Close False True True True - True + True False