From e3ba779edb5919cc181105cf125e498ba4c8632a Mon Sep 17 00:00:00 2001 From: Nick Hall Date: Fri, 15 May 2015 22:20:48 +0100 Subject: [PATCH] Convert deprecated xpad and ypad properties --- gramps/gui/glade/book.glade | 18 ++++++--- gramps/gui/glade/configure.glade | 6 ++- gramps/gui/glade/dialog.glade | 36 +++++++++++------ gramps/gui/glade/editdate.glade | 12 ++++-- gramps/gui/glade/editevent.glade | 3 +- gramps/gui/glade/editeventref.glade | 15 +++++--- gramps/gui/glade/editmediaref.glade | 3 +- gramps/gui/glade/editname.glade | 3 +- gramps/gui/glade/editperson.glade | 45 ++++++++++++++-------- gramps/gui/glade/editplaceref.glade | 15 +++++--- gramps/gui/glade/editreporef.glade | 9 +++-- gramps/gui/glade/editsource.glade | 3 +- gramps/gui/glade/plugins.glade | 39 ++++++++++++------- gramps/gui/glade/rule.glade | 21 ++++++---- gramps/gui/glade/styleeditor.glade | 45 ++++++++++++++-------- gramps/gui/glade/tipofday.glade | 6 ++- gramps/plugins/export/exportftree.glade | 3 +- gramps/plugins/importer/importgedcom.glade | 9 +++-- gramps/plugins/tool/changenames.glade | 3 +- gramps/plugins/tool/changetypes.glade | 9 +++-- gramps/plugins/tool/eventcmp.glade | 3 +- gramps/plugins/tool/finddupes.glade | 6 ++- gramps/plugins/tool/mergecitations.glade | 3 +- gramps/plugins/tool/patchnames.glade | 3 +- gramps/plugins/tool/relcalc.glade | 3 +- gramps/plugins/tool/verify.glade | 39 ++++++++++++------- 26 files changed, 240 insertions(+), 120 deletions(-) diff --git a/gramps/gui/glade/book.glade b/gramps/gui/glade/book.glade index c86336621..ab331fb96 100644 --- a/gramps/gui/glade/book.glade +++ b/gramps/gui/glade/book.glade @@ -25,8 +25,10 @@ True False - 12 - 12 + 12 + 12 + 12 + 12 False @@ -46,7 +48,8 @@ True False - 12 + 12 + 12 Book _name: True name_entry @@ -197,7 +200,8 @@ False start start - 6 + 6 + 6 True avail_tree @@ -251,7 +255,8 @@ False start start - 6 + 6 + 6 True book_tree @@ -580,7 +585,8 @@ True False - 6 + 6 + 6 False diff --git a/gramps/gui/glade/configure.glade b/gramps/gui/glade/configure.glade index e05db751c..4ba8a99b1 100644 --- a/gramps/gui/glade/configure.glade +++ b/gramps/gui/glade/configure.glade @@ -133,8 +133,10 @@ True False start - 12 - 6 + 12 + 12 + 6 + 6 The following conventions are used: <tt> <b>%f</b> - Given Name <b>%F</b> - GIVEN NAME <b>%l</b> - Surname <b>%L</b> - SURNAME diff --git a/gramps/gui/glade/dialog.glade b/gramps/gui/glade/dialog.glade index f75088d26..2e0e0c233 100644 --- a/gramps/gui/glade/dialog.glade +++ b/gramps/gui/glade/dialog.glade @@ -93,7 +93,8 @@ False True start - 12 + 12 + 12 True @@ -179,7 +180,8 @@ True False start - 6 + 6 + 6 True True @@ -375,8 +377,10 @@ False True start - 6 - 24 + 6 + 6 + 24 + 24 True True start @@ -405,7 +409,8 @@ False True start - 6 + 6 + 6 True True @@ -511,8 +516,10 @@ False True start - 6 - 12 + 6 + 6 + 12 + 12 True True @@ -540,7 +547,8 @@ False True start - 6 + 6 + 6 True True @@ -657,8 +665,10 @@ True False - 6 - 6 + 6 + 6 + 6 + 6 label True True @@ -768,7 +778,8 @@ True False start - 6 + 6 + 6 label True True @@ -796,7 +807,8 @@ True False start - 6 + 6 + 6 True True diff --git a/gramps/gui/glade/editdate.glade b/gramps/gui/glade/editdate.glade index 114a5085f..900e21b26 100644 --- a/gramps/gui/glade/editdate.glade +++ b/gramps/gui/glade/editdate.glade @@ -256,7 +256,8 @@ True False start - 6 + 6 + 6 Q_uality True quality_box @@ -287,7 +288,8 @@ True False start - 6 + 6 + 6 _Type True type_box @@ -317,7 +319,8 @@ True False start - 6 + 6 + 6 Date @@ -412,7 +415,8 @@ True False start - 6 + 6 + 6 Second date diff --git a/gramps/gui/glade/editevent.glade b/gramps/gui/glade/editevent.glade index 9c6929bc0..9ad55da6b 100644 --- a/gramps/gui/glade/editevent.glade +++ b/gramps/gui/glade/editevent.glade @@ -189,7 +189,8 @@ True False start - 3 + 3 + 3 _Place: True center diff --git a/gramps/gui/glade/editeventref.glade b/gramps/gui/glade/editeventref.glade index 99ad3f5bd..1bcafcec7 100644 --- a/gramps/gui/glade/editeventref.glade +++ b/gramps/gui/glade/editeventref.glade @@ -78,8 +78,10 @@ True False start - 6 - 3 + 6 + 6 + 3 + 3 Reference information True center @@ -110,7 +112,8 @@ True False start - 3 + 3 + 3 _Role: True center @@ -262,7 +265,8 @@ True False start - 3 + 3 + 3 _Place: True center @@ -490,7 +494,8 @@ True False start - 4 + 4 + 4 <b>Note:</b> Any changes in the shared event information will be reflected in the event itself, for all participants in the event. True fill diff --git a/gramps/gui/glade/editmediaref.glade b/gramps/gui/glade/editmediaref.glade index 9f28195ad..ebdf8834e 100644 --- a/gramps/gui/glade/editmediaref.glade +++ b/gramps/gui/glade/editmediaref.glade @@ -454,7 +454,8 @@ You can use the mouse on the picture to select a region, or use these spinbutton True False start - 3 + 3 + 3 <b>Note:</b> Any changes in the shared media object information will be reflected in the media object itself. True True diff --git a/gramps/gui/glade/editname.glade b/gramps/gui/glade/editname.glade index 04cbe7309..4c65fd4ec 100644 --- a/gramps/gui/glade/editname.glade +++ b/gramps/gui/glade/editname.glade @@ -98,7 +98,8 @@ True False start - 4 + 4 + 4 _Type: True center diff --git a/gramps/gui/glade/editperson.glade b/gramps/gui/glade/editperson.glade index a318004f6..26c4d7404 100644 --- a/gramps/gui/glade/editperson.glade +++ b/gramps/gui/glade/editperson.glade @@ -126,8 +126,10 @@ True False start - 3 - 3 + 3 + 3 + 3 + 3 _Given: True center @@ -187,8 +189,10 @@ True False start - 3 - 3 + 3 + 3 + 3 + 3 T_itle: True title @@ -235,7 +239,8 @@ True False start - 3 + 3 + 3 _Nick: True nickname @@ -371,7 +376,8 @@ Indicate that the surname consists of different parts. Every surname has its own True False start - 3 + 3 + 3 General @@ -436,8 +442,10 @@ Indicate that the surname consists of different parts. Every surname has its own True False start - 6 - 3 + 6 + 6 + 3 + 3 _Surname: True surname @@ -571,7 +579,8 @@ Indicate that the surname consists of different parts. Every surname has its own True False start - 6 + 6 + 6 G_ender: True gender @@ -635,7 +644,8 @@ Indicate that the surname consists of different parts. Every surname has its own True False start - 6 + 6 + 6 _Tags: True tag_button @@ -692,7 +702,8 @@ Indicate that the surname consists of different parts. Every surname has its own True False start - 3 + 3 + 3 Preferred Name @@ -708,8 +719,10 @@ Indicate that the surname consists of different parts. Every surname has its own True False start - 3 - 3 + 3 + 3 + 3 + 3 _Type: True center @@ -726,8 +739,10 @@ Indicate that the surname consists of different parts. Every surname has its own False True start - 3 - 3 + 3 + 3 + 3 + 3 True end diff --git a/gramps/gui/glade/editplaceref.glade b/gramps/gui/glade/editplaceref.glade index 2fef859d9..05962759a 100644 --- a/gramps/gui/glade/editplaceref.glade +++ b/gramps/gui/glade/editplaceref.glade @@ -77,8 +77,10 @@ True False - 6 - 3 + 6 + 6 + 3 + 3 Reference information True center @@ -109,7 +111,8 @@ True False - 3 + 3 + 3 _Date: True center @@ -221,7 +224,8 @@ True False - 3 + 3 + 3 ID: True center @@ -269,7 +273,8 @@ 500 True False - 4 + 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 diff --git a/gramps/gui/glade/editreporef.glade b/gramps/gui/glade/editreporef.glade index e5f2c073a..583f83521 100644 --- a/gramps/gui/glade/editreporef.glade +++ b/gramps/gui/glade/editreporef.glade @@ -90,8 +90,10 @@ True False start - 6 - 3 + 6 + 6 + 3 + 3 Reference information True center @@ -321,7 +323,8 @@ True False start - 3 + 3 + 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. True True diff --git a/gramps/gui/glade/editsource.glade b/gramps/gui/glade/editsource.glade index 26a26bcfd..3f542b7c9 100644 --- a/gramps/gui/glade/editsource.glade +++ b/gramps/gui/glade/editsource.glade @@ -240,7 +240,8 @@ False True start - 2 + 2 + 2 True diff --git a/gramps/gui/glade/plugins.glade b/gramps/gui/glade/plugins.glade index e628d1dda..7c669edbe 100644 --- a/gramps/gui/glade/plugins.glade +++ b/gramps/gui/glade/plugins.glade @@ -107,8 +107,10 @@ True False start - 10 - 10 + 10 + 10 + 10 + 10 True center @@ -132,8 +134,10 @@ False start start - 10 - 20 + 10 + 10 + 20 + 20 Select a report from those available on the left. True @@ -151,8 +155,10 @@ True False end - 6 - 3 + 6 + 6 + 3 + 3 Status: center @@ -166,7 +172,8 @@ True False start - 5 + 5 + 5 1 @@ -178,8 +185,10 @@ True False end - 6 - 3 + 6 + 6 + 3 + 3 Author: @@ -192,8 +201,10 @@ True False end - 6 - 3 + 6 + 6 + 3 + 3 Author's email: @@ -206,7 +217,8 @@ True False start - 5 + 5 + 5 1 @@ -218,7 +230,8 @@ True False start - 5 + 5 + 5 1 diff --git a/gramps/gui/glade/rule.glade b/gramps/gui/glade/rule.glade index 61398b4d4..37495cc4a 100644 --- a/gramps/gui/glade/rule.glade +++ b/gramps/gui/glade/rule.glade @@ -253,7 +253,8 @@ True False - 6 + 6 + 6 Note: changes take effect only after this window is closed @@ -382,7 +383,8 @@ True False - 6 + 6 + 6 center @@ -564,7 +566,8 @@ True False start - 6 + 6 + 6 Co_mment: True comment @@ -651,7 +654,8 @@ True False start - 6 + 6 + 6 _Name: True filter_name @@ -875,7 +879,8 @@ True False start - 12 + 12 + 12 No rule selected True @@ -908,7 +913,8 @@ False start start - 12 + 12 + 12 No description True @@ -1010,7 +1016,8 @@ True False - 6 + 6 + 6 False diff --git a/gramps/gui/glade/styleeditor.glade b/gramps/gui/glade/styleeditor.glade index d0f70320a..16f0517ff 100644 --- a/gramps/gui/glade/styleeditor.glade +++ b/gramps/gui/glade/styleeditor.glade @@ -133,8 +133,10 @@ True False - 5 - 5 + 5 + 5 + 5 + 5 True center @@ -279,7 +281,8 @@ False start start - 3 + 3 + 3 Type face center @@ -331,7 +334,8 @@ True False start - 3 + 3 + 3 Size center @@ -375,7 +379,8 @@ True False start - 3 + 3 + 3 Color center @@ -393,7 +398,8 @@ False start start - 3 + 3 + 3 Options center @@ -608,7 +614,8 @@ False start start - 3 + 3 + 3 Alignment center end @@ -626,7 +633,8 @@ True False start - 3 + 3 + 3 Background color center @@ -731,7 +739,8 @@ False start start - 3 + 3 + 3 Spacing center @@ -807,7 +816,8 @@ False start start - 3 + 3 + 3 Borders center @@ -1245,7 +1255,8 @@ False start start - 3 + 3 + 3 Borders center @@ -1400,7 +1411,8 @@ False start start - 3 + 3 + 3 Line center end @@ -1420,7 +1432,8 @@ False start start - 3 + 3 + 3 Color center end @@ -1492,7 +1505,8 @@ False start start - 3 + 3 + 3 Shadow center end @@ -1759,7 +1773,8 @@ True False - 10 + 10 + 10 True center diff --git a/gramps/gui/glade/tipofday.glade b/gramps/gui/glade/tipofday.glade index 9a5f1b4c1..965911919 100644 --- a/gramps/gui/glade/tipofday.glade +++ b/gramps/gui/glade/tipofday.glade @@ -62,8 +62,10 @@ True start start - 6 - 6 + 6 + 6 + 6 + 6 True diff --git a/gramps/plugins/export/exportftree.glade b/gramps/plugins/export/exportftree.glade index a34152277..667c229a8 100644 --- a/gramps/plugins/export/exportftree.glade +++ b/gramps/plugins/export/exportftree.glade @@ -87,7 +87,8 @@ True False - 6 + 6 + 6 center diff --git a/gramps/plugins/importer/importgedcom.glade b/gramps/plugins/importer/importgedcom.glade index c00d6f091..d20d686bf 100644 --- a/gramps/plugins/importer/importgedcom.glade +++ b/gramps/plugins/importer/importgedcom.glade @@ -89,8 +89,10 @@ True False - 6 - 6 + 6 + 6 + 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 @@ -189,7 +191,8 @@ True False - 6 + 6 + 6 center diff --git a/gramps/plugins/tool/changenames.glade b/gramps/plugins/tool/changenames.glade index cf7ce2dbc..537a6909a 100644 --- a/gramps/plugins/tool/changenames.glade +++ b/gramps/plugins/tool/changenames.glade @@ -30,7 +30,8 @@ True False - 10 + 10 + 10 Below is a list of the family names that Gramps can convert to correct capitalization. Select the names you wish Gramps to convert. diff --git a/gramps/plugins/tool/changetypes.glade b/gramps/plugins/tool/changetypes.glade index bbe24b53a..63b91cb0c 100644 --- a/gramps/plugins/tool/changetypes.glade +++ b/gramps/plugins/tool/changetypes.glade @@ -70,7 +70,8 @@ True False - 10 + 10 + 10 center @@ -83,8 +84,10 @@ True False - 12 - 12 + 12 + 12 + 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. True diff --git a/gramps/plugins/tool/eventcmp.glade b/gramps/plugins/tool/eventcmp.glade index b1b5daf25..f047665bd 100644 --- a/gramps/plugins/tool/eventcmp.glade +++ b/gramps/plugins/tool/eventcmp.glade @@ -223,7 +223,8 @@ True False end - 5 + 5 + 5 _Filter: True center diff --git a/gramps/plugins/tool/finddupes.glade b/gramps/plugins/tool/finddupes.glade index 4cbe2af8c..0b836f604 100644 --- a/gramps/plugins/tool/finddupes.glade +++ b/gramps/plugins/tool/finddupes.glade @@ -287,7 +287,8 @@ True False - 6 + 6 + 6 center @@ -360,7 +361,8 @@ True False - 10 + 10 + 10 Please be patient. This may take a while. center True diff --git a/gramps/plugins/tool/mergecitations.glade b/gramps/plugins/tool/mergecitations.glade index 1d05ae224..074c56fcc 100644 --- a/gramps/plugins/tool/mergecitations.glade +++ b/gramps/plugins/tool/mergecitations.glade @@ -226,7 +226,8 @@ True False - 10 + 10 + 10 Please be patient. This may take a while. center True diff --git a/gramps/plugins/tool/patchnames.glade b/gramps/plugins/tool/patchnames.glade index 298b4b51b..5b605b1d3 100644 --- a/gramps/plugins/tool/patchnames.glade +++ b/gramps/plugins/tool/patchnames.glade @@ -132,7 +132,8 @@ True False start - 10 + 10 + 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. diff --git a/gramps/plugins/tool/relcalc.glade b/gramps/plugins/tool/relcalc.glade index d593fa9e1..b0636260d 100644 --- a/gramps/plugins/tool/relcalc.glade +++ b/gramps/plugins/tool/relcalc.glade @@ -55,7 +55,8 @@ True False - 6 + 6 + 6 center diff --git a/gramps/plugins/tool/verify.glade b/gramps/plugins/tool/verify.glade index 7954d5dfe..0bcbd118b 100644 --- a/gramps/plugins/tool/verify.glade +++ b/gramps/plugins/tool/verify.glade @@ -173,7 +173,8 @@ True False - 6 + 6 + 6 False @@ -424,8 +425,10 @@ False True start - 2 - 2 + 2 + 2 + 2 + 2 Mi_nimum age to bear a child True yngmom @@ -441,8 +444,10 @@ False True start - 2 - 2 + 2 + 2 + 2 + 2 Ma_ximum age to bear a child True oldmom @@ -458,8 +463,10 @@ False True start - 2 - 2 + 2 + 2 + 2 + 2 Maximum number of chil_dren True mxchildmom @@ -538,8 +545,10 @@ False True start - 2 - 2 + 2 + 2 + 2 + 2 Mi_nimum age to father a child True yngdad @@ -555,8 +564,10 @@ False True start - 2 - 2 + 2 + 2 + 2 + 2 Ma_ximum age to father a child True olddad @@ -572,8 +583,10 @@ False True start - 2 - 2 + 2 + 2 + 2 + 2 Maximum number of chil_dren True mxchilddad