From 4cab86897fbec8001675f43562c66ff538f37836 Mon Sep 17 00:00:00 2001 From: Paul Franklin Date: Thu, 21 May 2015 09:42:00 -0700 Subject: [PATCH 01/10] tweak POTFILES --- gramps/gen/db/dictionary.py | 3 +++ gramps/guiQML/grampsqml.py | 2 ++ po/POTFILES.in | 10 ++++++++++ po/POTFILES.skip | 11 ----------- 4 files changed, 15 insertions(+), 11 deletions(-) diff --git a/gramps/gen/db/dictionary.py b/gramps/gen/db/dictionary.py index d3974774a..36a8cd5fa 100644 --- a/gramps/gen/db/dictionary.py +++ b/gramps/gen/db/dictionary.py @@ -40,6 +40,9 @@ from . import (PERSON_KEY, NOTE_KEY, TAG_KEY) +from ..const import GRAMPS_LOCALE as glocale +_ = glocale.translation.gettext +from ..errors import DbError from ..utils.id import create_id from ..lib.researcher import Researcher from ..lib.mediaobj import MediaObject diff --git a/gramps/guiQML/grampsqml.py b/gramps/guiQML/grampsqml.py index 136d38f89..e366f6aef 100644 --- a/gramps/guiQML/grampsqml.py +++ b/gramps/guiQML/grampsqml.py @@ -41,6 +41,8 @@ LOG = logging.getLogger(".grampsqml") # GRAMPS modules # #------------------------------------------------------------------------- +from gramps.gen.const import GRAMPS_LOCALE as glocale +_ = glocale.translation.gettext from gramps.gen.constfunc import has_display from gramps.gen.config import config diff --git a/po/POTFILES.in b/po/POTFILES.in index dd038f897..0f668431f 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -13,6 +13,7 @@ gramps/gen/datehandler/_datedisplay.py gramps/gen/datehandler/_datestrings.py gramps/gen/datehandler/_dateparser.py gramps/gen/db/base.py +gramps/gen/db/dictionary.py gramps/gen/db/exceptions.py gramps/gen/db/undoredo.py gramps/gen/db/upgrade.py @@ -296,6 +297,7 @@ gramps/gen/lib/srcattrtype.py gramps/gen/lib/styledtexttagtype.py gramps/gen/lib/surnamebase.py gramps/gen/lib/urltype.py +gramps/gen/merge/diff.py gramps/gen/merge/mergecitationquery.py gramps/gen/merge/mergeeventquery.py gramps/gen/merge/mergefamilyquery.py @@ -305,6 +307,7 @@ gramps/gen/merge/mergepersonquery.py gramps/gen/merge/mergeplacequery.py gramps/gen/merge/mergerepositoryquery.py gramps/gen/merge/mergesourcequery.py +gramps/gen/merge/test/merge_ref_test.py gramps/gen/mime/_pythonmime.py gramps/gen/mime/_winmime.py gramps/gen/plug/_gramplet.py @@ -323,6 +326,7 @@ gramps/gen/plug/report/stdoptions.py gramps/gen/plug/report/utils.py gramps/gen/plug/utils.py gramps/gen/proxy/private.py +gramps/gen/recentfiles.py gramps/gen/relationship.py gramps/gen/simple/_simpleaccess.py gramps/gen/utils/alive.py @@ -338,6 +342,7 @@ gramps/gen/utils/string.py gramps/gen/utils/unknown.py gramps/grampsapp.py gramps/gui/aboutdialog.py +gramps/gui/autocomp.py gramps/gui/clipboard.py gramps/gui/columnorder.py gramps/gui/configure.py @@ -526,6 +531,8 @@ gramps/gui/widgets/reorderfam.py gramps/gui/widgets/styledtextbuffer.py gramps/gui/widgets/styledtexteditor.py gramps/gui/widgets/validatedmaskedentry.py +gramps/guiQML/grampsqml.py +gramps/guiQML/views/dbman.py gramps/plugins/docgen/asciidoc.py gramps/plugins/docgen/docgen.gpr.py gramps/plugins/docgen/gtkprint.glade @@ -660,6 +667,7 @@ gramps/plugins/tool/changenames.py gramps/plugins/tool/changetypes.glade gramps/plugins/tool/changetypes.py gramps/plugins/tool/check.py +gramps/plugins/tool/dateparserdisplaytest.py gramps/plugins/tool/dumpgenderstats.py gramps/plugins/tool/eventcmp.glade gramps/plugins/tool/eventcmp.py @@ -676,6 +684,7 @@ gramps/plugins/tool/ownereditor.glade gramps/plugins/tool/ownereditor.py gramps/plugins/tool/patchnames.glade gramps/plugins/tool/patchnames.py +gramps/plugins/tool/phpgedviewconnector.py gramps/plugins/tool/rebuild.py gramps/plugins/tool/rebuildgenderstat.py gramps/plugins/tool/rebuildrefmap.py @@ -685,6 +694,7 @@ gramps/plugins/tool/removeunused.glade gramps/plugins/tool/removeunused.py gramps/plugins/tool/reorderids.py gramps/plugins/tool/sortevents.py +gramps/plugins/tool/testcasegenerator.py gramps/plugins/tool/tools.gpr.py gramps/plugins/tool/verify.glade gramps/plugins/tool/verify.py diff --git a/po/POTFILES.skip b/po/POTFILES.skip index 1391b6877..ba2f0481d 100644 --- a/po/POTFILES.skip +++ b/po/POTFILES.skip @@ -17,7 +17,6 @@ gramps/gen/dbstate.py gramps/gen/errors.py gramps/gen/git_revision.py gramps/gen/__init__.py -gramps/gen/recentfiles.py gramps/gen/sort.py gramps/gen/soundex.py gramps/gen/updatecallback.py @@ -60,8 +59,6 @@ gramps/gen/db/backup.py gramps/gen/db/bsddbtxn.py gramps/gen/db/cursor.py gramps/gen/db/dbconst.py -gramps/gen/db/dictionary.py -#gramps/gen/db/read.py gramps/gen/db/test/db_test.py gramps/gen/db/txn.py # @@ -177,8 +174,6 @@ gramps/gen/lib/witness.py # gen.merge package # gramps/gen/merge/__init__.py -gramps/gen/merge/diff.py -gramps/gen/merge/test/merge_ref_test.py # # gen mime API # @@ -263,7 +258,6 @@ gramps/gen/utils/docgen/tabbeddoc.py # gui - GUI code # gramps/gui/__init__.py -gramps/gui/autocomp.py gramps/gui/basesidebar.py gramps/gui/dbguielement.py gramps/gui/ddtargets.py @@ -384,7 +378,6 @@ gramps/gui/widgets/valuetoolitem.py # # gui qt (do not need translation yet) # -gramps/guiQML/grampsqml.py gramps/guiQML/__init__.py gramps/guiQML/qmlwidgets/TextButton.qml gramps/guiQML/qmlwidgets/TopBar.qml @@ -392,7 +385,6 @@ gramps/guiQML/questiondialog.py gramps/guiQML/viewmanager.py gramps/guiQML/views/centralview.py gramps/guiQML/views/centralview.qml -gramps/guiQML/views/dbman.py gramps/guiQML/views/dbman.qml gramps/guiQML/views/__init__.py gramps/guiQML/views/peopleview.qml @@ -500,11 +492,8 @@ gramps/plugins/sidebar/__init__.py # # Development tools # -gramps/plugins/tool/dateparserdisplaytest.py gramps/plugins/tool/__init__.py -gramps/plugins/tool/phpgedviewconnector.py gramps/plugins/tool/populatesources.py -gramps/plugins/tool/testcasegenerator.py # # plugins/view directory # From bd5d4632992f5468cfd8243cfabb6249c373163c Mon Sep 17 00:00:00 2001 From: Paul Franklin Date: Thu, 21 May 2015 10:13:11 -0700 Subject: [PATCH 02/10] tweak POTFILES some more --- gramps/gui/plug/report/_fileentry.py | 3 +++ gramps/plugins/tool/populatesources.py | 2 ++ po/POTFILES.in | 3 ++- po/POTFILES.skip | 3 +-- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/gramps/gui/plug/report/_fileentry.py b/gramps/gui/plug/report/_fileentry.py index dc51a86e0..1ea48077d 100644 --- a/gramps/gui/plug/report/_fileentry.py +++ b/gramps/gui/plug/report/_fileentry.py @@ -24,6 +24,9 @@ import os from gi.repository import Gtk from gi.repository import GObject from gramps.gen.constfunc import conv_to_unicode, get_curr_dir +from gramps.gen.const import GRAMPS_LOCALE as glocale +_ = glocale.translation.gettext + class FileEntry(Gtk.Box): """ A widget that allows the user to select a file from the file system """ def __init__(self, defname, title, parent=None): diff --git a/gramps/plugins/tool/populatesources.py b/gramps/plugins/tool/populatesources.py index cf307f78a..9faac18ed 100644 --- a/gramps/plugins/tool/populatesources.py +++ b/gramps/plugins/tool/populatesources.py @@ -40,6 +40,8 @@ from gi.repository import Gtk # gramps modules # #------------------------------------------------------------------------- +from gramps.gen.const import GRAMPS_LOCALE as glocale +_ = glocale.translation.gettext from gramps.gui.utils import ProgressMeter from gramps.gui.plug import tool from gramps.gui.dialog import OkDialog diff --git a/po/POTFILES.in b/po/POTFILES.in index 0f668431f..0630d09fe 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -487,13 +487,13 @@ gramps/gui/plug/quick/_quicktable.py gramps/gui/plug/quick/_textbufdoc.py gramps/gui/plug/report/_bookdialog.py gramps/gui/plug/report/_docreportdialog.py +gramps/gui/plug/report/_fileentry.py gramps/gui/plug/report/_graphvizreportdialog.py gramps/gui/plug/report/_papermenu.py gramps/gui/plug/report/_reportdialog.py gramps/gui/plug/report/_stylecombobox.py gramps/gui/plug/report/_styleeditor.py gramps/gui/plug/tool.py -gramps/gui/pluginmanager.py gramps/gui/selectors/selectcitation.py gramps/gui/selectors/selectevent.py gramps/gui/selectors/selectfamily.py @@ -685,6 +685,7 @@ gramps/plugins/tool/ownereditor.py gramps/plugins/tool/patchnames.glade gramps/plugins/tool/patchnames.py gramps/plugins/tool/phpgedviewconnector.py +gramps/plugins/tool/populatesources.py gramps/plugins/tool/rebuild.py gramps/plugins/tool/rebuildgenderstat.py gramps/plugins/tool/rebuildrefmap.py diff --git a/po/POTFILES.skip b/po/POTFILES.skip index ba2f0481d..7cb119022 100644 --- a/po/POTFILES.skip +++ b/po/POTFILES.skip @@ -266,6 +266,7 @@ gramps/gui/glade.py gramps/gui/listmodel.py gramps/gui/managedwindow.py gramps/gui/navigator.py +gramps/gui/pluginmanager.py gramps/gui/thumbnails.py gramps/gui/user.py gramps/gui/glade/catalog/grampswidgets.py @@ -327,7 +328,6 @@ gramps/gui/plug/export/__init__.py gramps/gui/plug/__init__.py gramps/gui/plug/quick/__init__.py gramps/gui/plug/report/_drawreportdialog.py -gramps/gui/plug/report/_fileentry.py gramps/gui/plug/report/__init__.py gramps/gui/plug/report/_textreportdialog.py gramps/gui/plug/report/_webreportdialog.py @@ -493,7 +493,6 @@ gramps/plugins/sidebar/__init__.py # Development tools # gramps/plugins/tool/__init__.py -gramps/plugins/tool/populatesources.py # # plugins/view directory # From 75009f0fe0ed6ecdc575c522f6a14a9d6262a666 Mon Sep 17 00:00:00 2001 From: Nick Hall Date: Thu, 21 May 2015 20:54:30 +0100 Subject: [PATCH 03/10] 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 From 56d83c1c5c299e3345960cbc9c750b4e818f34f4 Mon Sep 17 00:00:00 2001 From: Nick Hall Date: Thu, 21 May 2015 21:15:03 +0100 Subject: [PATCH 04/10] Remove deprecated show-unicode-menu setting --- gramps/gui/widgets/styledtexteditor.py | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/gramps/gui/widgets/styledtexteditor.py b/gramps/gui/widgets/styledtexteditor.py index 43ca46cde..f8854ebbc 100644 --- a/gramps/gui/widgets/styledtexteditor.py +++ b/gramps/gui/widgets/styledtexteditor.py @@ -202,15 +202,6 @@ class StyledTextEditor(Gtk.TextView): self._connect_signals() - # we want to disable the unicode menu in the popup - settings = Gtk.Settings.get_default() - try: - self.show_unicode = settings.get_property('gtk-show-unicode-menu') - settings.set_property('gtk-show-unicode-menu', False) - except: - #GTK wants to deprecate show-unicode-menu, this prepares for this - self.show_unicode = False - # variable to not copy to clipboard on double/triple click self.selclick = False @@ -247,19 +238,6 @@ class StyledTextEditor(Gtk.TextView): window.set_cursor(REGULAR_CURSOR) self.url_match = None - def on_unrealize(self, widget): - """ - Signal handler. - - Set the default Gtk settings back before leaving. - """ - try: - settings = Gtk.Settings.get_default() - settings.set_property('gtk-show-unicode-menu', self.show_unicode) - except: - #GTK wants to deprecate show-unicode-menu, this prepares for this - pass - def on_key_press_event(self, widget, event): """Signal handler. @@ -461,7 +439,6 @@ class StyledTextEditor(Gtk.TextView): self.connect('button-press-event', self.on_button_press_event) self.connect('button-release-event', self.on_button_release_event) self.connect('populate-popup', self.on_populate_popup) - self.connect('unrealize', self.on_unrealize) def _create_toolbar(self): """ From e5591da4960695b182578f7662cb524be17fb209 Mon Sep 17 00:00:00 2001 From: Nick Hall Date: Thu, 21 May 2015 23:01:57 +0100 Subject: [PATCH 05/10] Specify required Pango and PangoCairo version --- gramps/gui/grampsgui.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gramps/gui/grampsgui.py b/gramps/gui/grampsgui.py index 3923f8a17..f2f73edc3 100644 --- a/gramps/gui/grampsgui.py +++ b/gramps/gui/grampsgui.py @@ -78,6 +78,8 @@ if PYGOBJ_ERR: sys.exit(0) try: + gi.require_version('Pango', '1.0') + gi.require_version('PangoCairo', '1.0') gi.require_version('Gtk', '3.0') #It is important to import Pango before Gtk, or some things start to go #wrong in GTK3 ! From e355a93dc171b6eb4ddc62c92ab636f1086f103a Mon Sep 17 00:00:00 2001 From: Nick Hall Date: Fri, 22 May 2015 14:49:02 +0100 Subject: [PATCH 06/10] Use escape utility from html rather than cgi module --- gramps/gen/simple/_simpletable.py | 8 ++--- gramps/gen/utils/libformatting.py | 20 ++++++------ gramps/gui/editors/displaytabs/childmodel.py | 6 ++-- .../gui/editors/displaytabs/eventrefmodel.py | 4 +-- .../gui/views/treemodels/citationbasemodel.py | 4 +-- gramps/gui/views/treemodels/eventmodel.py | 4 +-- gramps/gui/widgets/fanchart.py | 2 +- gramps/gui/widgets/fanchartdesc.py | 2 +- gramps/gui/widgets/labels.py | 4 +-- gramps/plugins/gramplet/pedigreegramplet.py | 10 +++--- gramps/plugins/view/geoclose.py | 10 +++--- gramps/plugins/view/pedigreeview.py | 2 +- gramps/plugins/view/relview.py | 32 +++++++++---------- 13 files changed, 54 insertions(+), 54 deletions(-) diff --git a/gramps/gen/simple/_simpletable.py b/gramps/gen/simple/_simpletable.py index 6ffdc6de9..d8393bee6 100644 --- a/gramps/gen/simple/_simpletable.py +++ b/gramps/gen/simple/_simpletable.py @@ -24,7 +24,7 @@ Provide a simplified table creation interface """ -import cgi +from html import escape from ..const import GRAMPS_LOCALE as glocale _ = glocale.translation.sgettext from ..lib import (Person, Family, Event, Source, Place, Citation, @@ -153,7 +153,7 @@ class SimpleTable(object): if item.get_valid(): if item.format: self.set_cell_markup(col, row, - item.format % cgi.escape(text)) + item.format % escape(text)) self.row_sort_val(col, item.sortval) else: # sort before others: @@ -161,7 +161,7 @@ class SimpleTable(object): # give formatted version: invalid_date_format = config.get('preferences.invalid-date-format') self.set_cell_markup(col, row, - invalid_date_format % cgi.escape(text)) + invalid_date_format % escape(text)) if (self._link_col == col or link is None): link = ('Date', item) elif isinstance(item, Span): @@ -261,7 +261,7 @@ class SimpleTable(object): elif y in self._cell_markup[x]: return self._cell_markup[x][y] else: - return cgi.escape(data) + return escape(data) else: if y is None: return False # no markup for this column diff --git a/gramps/gen/utils/libformatting.py b/gramps/gen/utils/libformatting.py index f5ff00f5f..2f4e29287 100644 --- a/gramps/gen/utils/libformatting.py +++ b/gramps/gen/utils/libformatting.py @@ -28,7 +28,7 @@ recompute # Python modules # #------------------------------------------------------------------------- -from cgi import escape +from html import escape #------------------------------------------------------------------------- # @@ -73,17 +73,17 @@ class FormattingHelper(object): text = "" marriage = get_marriage_or_fallback(self.dbstate.db, family) if marriage and use_markup and marriage.get_type() != EventType.MARRIAGE: - mdate = "%s %s" % (marriage.get_type().get_abbreviation(), + mdate = "%s %s" % (marriage.get_type().get_abbreviation(), escape(get_date(marriage))) mplace = "%s" % escape(self.get_place_name(marriage.get_place_handle())) name = "%s" % str(marriage.get_type()) elif marriage and use_markup: - mdate = "%s %s" % (marriage.get_type().get_abbreviation(), + mdate = "%s %s" % (marriage.get_type().get_abbreviation(), escape(get_date(marriage))) mplace = escape(self.get_place_name(marriage.get_place_handle())) name = str(marriage.get_type()) elif marriage: - mdate = "%s %s" % (marriage.get_type().get_abbreviation(), + mdate = "%s %s" % (marriage.get_type().get_abbreviation(), get_date(marriage)) mplace = self.get_place_name(marriage.get_place_handle()) name = str(marriage.get_type()) @@ -149,28 +149,28 @@ class FormattingHelper(object): if line_count >= 3: birth = get_birth_or_fallback(self.dbstate.db, person) if birth and use_markup and birth.get_type() != EventType.BIRTH: - bdate = "%s" % escape(get_date(birth)) + bdate = "%s" % escape(get_date(birth)) bplace = "%s" % escape(self.get_place_name( birth.get_place_handle())) elif birth and use_markup: - bdate = escape(get_date(birth)) + bdate = escape(get_date(birth)) bplace = escape(self.get_place_name(birth.get_place_handle())) elif birth: - bdate = get_date(birth) + bdate = get_date(birth) bplace = self.get_place_name(birth.get_place_handle()) else: bdate = "" bplace = "" death = get_death_or_fallback(self.dbstate.db, person) if death and use_markup and death.get_type() != EventType.DEATH: - ddate = "%s" % escape(get_date(death)) + ddate = "%s" % escape(get_date(death)) dplace = "%s" % escape(self.get_place_name( death.get_place_handle())) elif death and use_markup: - ddate = escape(get_date(death)) + ddate = escape(get_date(death)) dplace = escape(self.get_place_name(death.get_place_handle())) elif death: - ddate = get_date(death) + ddate = get_date(death) dplace = self.get_place_name(death.get_place_handle()) else: ddate = "" diff --git a/gramps/gui/editors/displaytabs/childmodel.py b/gramps/gui/editors/displaytabs/childmodel.py index b9f2006b5..2458ee71b 100644 --- a/gramps/gui/editors/displaytabs/childmodel.py +++ b/gramps/gui/editors/displaytabs/childmodel.py @@ -24,7 +24,7 @@ # #------------------------------------------------------------------------- from gi.repository import Gtk -import cgi +from html import escape #------------------------------------------------------------------------- # @@ -76,7 +76,7 @@ class ChildModel(Gtk.ListStore): if birth.get_type() == EventType.BIRTH: return get_date(birth) else: - return '%s' % cgi.escape(get_date(birth)) + return '%s' % escape(get_date(birth)) else: return "" @@ -99,7 +99,7 @@ class ChildModel(Gtk.ListStore): if death.get_type() == EventType.DEATH: return get_date(death) else: - return '%s' % cgi.escape(get_date(death)) + return '%s' % escape(get_date(death)) else: return "" diff --git a/gramps/gui/editors/displaytabs/eventrefmodel.py b/gramps/gui/editors/displaytabs/eventrefmodel.py index 16eb72fc0..a03df98b3 100644 --- a/gramps/gui/editors/displaytabs/eventrefmodel.py +++ b/gramps/gui/editors/displaytabs/eventrefmodel.py @@ -38,7 +38,7 @@ from gi.repository import Pango WEIGHT_NORMAL = Pango.Weight.NORMAL WEIGHT_BOLD = Pango.Weight.BOLD -import cgi +from html import escape #------------------------------------------------------------------------- # @@ -145,7 +145,7 @@ class EventRefModel(Gtk.TreeStore): event = self.db.get_event_from_handle(event_ref.ref) retval = get_date(event) if not get_date_valid(event): - return invalid_date_format % cgi.escape(retval) + return invalid_date_format % escape(retval) else: return retval diff --git a/gramps/gui/views/treemodels/citationbasemodel.py b/gramps/gui/views/treemodels/citationbasemodel.py index 6d55dffcc..1c47100ed 100644 --- a/gramps/gui/views/treemodels/citationbasemodel.py +++ b/gramps/gui/views/treemodels/citationbasemodel.py @@ -28,7 +28,7 @@ CitationBaseModel classes for GRAMPS. # python modules # #------------------------------------------------------------------------- -import cgi +from html import escape import logging log = logging.getLogger(".") LOG = logging.getLogger(".citation") @@ -90,7 +90,7 @@ class CitationBaseModel(object): citation.unserialize(data) date_str = get_date(citation) if date_str != "": - retval = cgi.escape(date_str) + retval = escape(date_str) if not get_date_valid(citation): return INVALID_DATE_FORMAT % retval else: diff --git a/gramps/gui/views/treemodels/eventmodel.py b/gramps/gui/views/treemodels/eventmodel.py index 9fe913657..6f57dfb66 100644 --- a/gramps/gui/views/treemodels/eventmodel.py +++ b/gramps/gui/views/treemodels/eventmodel.py @@ -23,7 +23,7 @@ # python modules # #------------------------------------------------------------------------- -import cgi +from html import escape import logging log = logging.getLogger(".") @@ -149,7 +149,7 @@ class EventModel(FlatBaseModel): event.unserialize(data) date_str = get_date(event) if date_str != "": - retval = cgi.escape(date_str) + retval = escape(date_str) if not get_date_valid(event): return INVALID_DATE_FORMAT % retval else: diff --git a/gramps/gui/widgets/fanchart.py b/gramps/gui/widgets/fanchart.py index e03063c17..60c9a4d0c 100644 --- a/gramps/gui/widgets/fanchart.py +++ b/gramps/gui/widgets/fanchart.py @@ -44,7 +44,7 @@ import math import colorsys import sys import pickle -from cgi import escape +from html import escape #------------------------------------------------------------------------- # diff --git a/gramps/gui/widgets/fanchartdesc.py b/gramps/gui/widgets/fanchartdesc.py index 57d6aa86b..ecee93cb1 100644 --- a/gramps/gui/widgets/fanchartdesc.py +++ b/gramps/gui/widgets/fanchartdesc.py @@ -42,7 +42,7 @@ import cairo import math import colorsys import pickle -from cgi import escape +from html import escape #------------------------------------------------------------------------- # diff --git a/gramps/gui/widgets/labels.py b/gramps/gui/widgets/labels.py index 5a0a3f8bd..80553ffa6 100644 --- a/gramps/gui/widgets/labels.py +++ b/gramps/gui/widgets/labels.py @@ -27,7 +27,7 @@ __all__ = ["LinkLabel", "EditLabel", "BasicLabel", "GenderLabel", # #------------------------------------------------------------------------- import os -import cgi +from html import escape from gramps.gen.const import GRAMPS_LOCALE as glocale _ = glocale.translation.gettext import logging @@ -112,7 +112,7 @@ class LinkLabel(Gtk.EventBox): else: raise AttributeError("invalid theme: '%s'" % theme) - self.orig_text = cgi.escape(label[0]) + self.orig_text = escape(label[0]) self.gender = label[1] self.decoration = format text = '%s' % (self.decoration, self.orig_text) diff --git a/gramps/plugins/gramplet/pedigreegramplet.py b/gramps/plugins/gramplet/pedigreegramplet.py index 6d70baa89..e61b06f71 100644 --- a/gramps/plugins/gramplet/pedigreegramplet.py +++ b/gramps/plugins/gramplet/pedigreegramplet.py @@ -22,7 +22,7 @@ # Python modules # #------------------------------------------------------------------------ -import cgi +from html import escape #------------------------------------------------------------------------ # @@ -196,11 +196,11 @@ class PedigreeGramplet(Gramplet): if birth and birth.get_type() != EventType.BIRTH: sdate = get_date(birth) if sdate: - bdate = "%s" % cgi.escape(sdate) + bdate = "%s" % escape(sdate) else: bdate = "" elif birth: - bdate = cgi.escape(get_date(birth)) + bdate = escape(get_date(birth)) else: bdate = "" @@ -208,11 +208,11 @@ class PedigreeGramplet(Gramplet): if death and death.get_type() != EventType.DEATH: sdate = get_date(death) if sdate: - ddate = "%s" % cgi.escape(sdate) + ddate = "%s" % escape(sdate) else: ddate = "" elif death: - ddate = cgi.escape(get_date(death)) + ddate = escape(get_date(death)) else: ddate = "" diff --git a/gramps/plugins/view/geoclose.py b/gramps/plugins/view/geoclose.py index be7d91255..db6b555a9 100644 --- a/gramps/plugins/view/geoclose.py +++ b/gramps/plugins/view/geoclose.py @@ -33,7 +33,7 @@ _ = glocale.translation.gettext import operator from gi.repository import Gtk from math import * -import cgi +from html import escape #------------------------------------------------------------------------- # @@ -249,11 +249,11 @@ class GeoClose(GeoGraphyView): if birth and birth.get_type() != EventType.BIRTH: sdate = get_date(birth) if sdate: - bdate = "%s" % cgi.escape(sdate) + bdate = "%s" % escape(sdate) else: bdate = "" elif birth: - bdate = cgi.escape(get_date(birth)) + bdate = escape(get_date(birth)) else: bdate = "" return bdate @@ -266,11 +266,11 @@ class GeoClose(GeoGraphyView): if death and death.get_type() != EventType.DEATH: sdate = get_date(death) if sdate: - ddate = "%s" % cgi.escape(sdate) + ddate = "%s" % escape(sdate) else: ddate = "" elif death: - ddate = cgi.escape(get_date(death)) + ddate = escape(get_date(death)) else: ddate = "" return ddate diff --git a/gramps/plugins/view/pedigreeview.py b/gramps/plugins/view/pedigreeview.py index a7ffd4b8b..33f40b075 100644 --- a/gramps/plugins/view/pedigreeview.py +++ b/gramps/plugins/view/pedigreeview.py @@ -27,7 +27,7 @@ # Python modules # #------------------------------------------------------------------------- -from cgi import escape +from html import escape import math import os import pickle diff --git a/gramps/plugins/view/relview.py b/gramps/plugins/view/relview.py index 55f817e48..a3499cda8 100644 --- a/gramps/plugins/view/relview.py +++ b/gramps/plugins/view/relview.py @@ -30,7 +30,7 @@ Relationship View from gramps.gen.const import GRAMPS_LOCALE as glocale _ = glocale.translation.sgettext ngettext = glocale.translation.ngettext # else "nearby" comments are ignored -import cgi +from html import escape import pickle #------------------------------------------------------------------------- @@ -206,7 +206,7 @@ class RelationshipView(NavigationView): def person_update(self, handle_list): if self.active: - person = self.get_active() + person = self.get_active() if person: while not self.change_person(person): pass @@ -219,7 +219,7 @@ class RelationshipView(NavigationView): """Large change to person database""" if self.active: self.bookmarks.redraw() - person = self.get_active() + person = self.get_active() if person: while not self.change_person(person): pass @@ -230,7 +230,7 @@ class RelationshipView(NavigationView): def family_update(self, handle_list): if self.active: - person = self.get_active() + person = self.get_active() if person: while not self.change_person(person): pass @@ -241,7 +241,7 @@ class RelationshipView(NavigationView): def family_add(self, handle_list): if self.active: - person = self.get_active() + person = self.get_active() if person: while not self.change_person(person): pass @@ -252,7 +252,7 @@ class RelationshipView(NavigationView): def family_delete(self, handle_list): if self.active: - person = self.get_active() + person = self.get_active() if person: while not self.change_person(person): pass @@ -263,7 +263,7 @@ class RelationshipView(NavigationView): def family_rebuild(self): if self.active: - person = self.get_active() + person = self.get_active() if person: while not self.change_person(person): pass @@ -558,7 +558,7 @@ class RelationshipView(NavigationView): # name and edit button name = name_displayer.display(person) fmt = '%s' - text = fmt % cgi.escape(name) + text = fmt % escape(name) label = widgets.DualMarkupLabel(text, _GenderCode[person.gender], x_align=1) if self._config.get('preferences.releditbtn'): @@ -740,7 +740,7 @@ class RelationshipView(NavigationView): Shows following elements: (collapse/expand arrow, Parents/Family title label, Family gramps_id, and add-choose-edit-delete buttons) """ - msg = '%s' % cgi.escape(title) + msg = '%s' % escape(title) hbox = Gtk.Box() label = widgets.MarkupLabel(msg, x_align=1) # Draw the collapse/expand button: @@ -1012,7 +1012,7 @@ class RelationshipView(NavigationView): else: format = "%s" - label = widgets.MarkupLabel(format % cgi.escape(title), + label = widgets.MarkupLabel(format % escape(title), x_align=1, y_align=0) if self._config.get('preferences.releditbtn'): label.set_padding(0, 5) @@ -1111,7 +1111,7 @@ class RelationshipView(NavigationView): else: format = "%s" - lbl = widgets.MarkupLabel(format % cgi.escape(title), + lbl = widgets.MarkupLabel(format % escape(title), x_align=1, y_align=.5) if self._config.get('preferences.releditbtn'): lbl.set_padding(0, 5) @@ -1201,11 +1201,11 @@ class RelationshipView(NavigationView): if birth and birth.get_type() != EventType.BIRTH: sdate = get_date(birth) if sdate: - bdate = "%s" % cgi.escape(sdate) + bdate = "%s" % escape(sdate) else: bdate = "" elif birth: - bdate = cgi.escape(get_date(birth)) + bdate = escape(get_date(birth)) else: bdate = "" @@ -1213,11 +1213,11 @@ class RelationshipView(NavigationView): if death and death.get_type() != EventType.DEATH: sdate = get_date(death) if sdate: - ddate = "%s" % cgi.escape(sdate) + ddate = "%s" % escape(sdate) else: ddate = "" elif death: - ddate = cgi.escape(get_date(death)) + ddate = escape(get_date(death)) else: ddate = "" @@ -1292,7 +1292,7 @@ class RelationshipView(NavigationView): pass def write_relationship(self, box, family): - msg = _('Relationship type: %s') % cgi.escape(str(family.get_relationship())) + msg = _('Relationship type: %s') % escape(str(family.get_relationship())) box.add(widgets.MarkupLabel(msg)) def write_relationship_events(self, vbox, family): From dd68fbf75d53589f0373665acb47f4de09fa5e44 Mon Sep 17 00:00:00 2001 From: Josip Date: Fri, 22 May 2015 18:48:49 +0200 Subject: [PATCH 07/10] 8398: lock.file with accent letter cause gramps to crash at start --- gramps/cli/clidbman.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gramps/cli/clidbman.py b/gramps/cli/clidbman.py index 1a7e51d85..404104afe 100644 --- a/gramps/cli/clidbman.py +++ b/gramps/cli/clidbman.py @@ -508,6 +508,6 @@ def find_locker_name(dirpath): # feature request 2356: avoid genitive form last = _("Locked by %s") % username ifile.close() - except (OSError, IOError): + except (OSError, IOError, UnicodeDecodeError): last = _("Unknown") return last From cd1a6ba45ae3113073739496f1e8e7f00223a05a Mon Sep 17 00:00:00 2001 From: Nick Hall Date: Fri, 22 May 2015 17:48:33 +0100 Subject: [PATCH 08/10] Use add instead of add_with_viewport The add method adds a viewport where necessary when adding a child to a scrolled window. The add_with_viewport method is deprecated. --- gramps/gui/clipboard.py | 2 +- gramps/gui/editors/edittaglist.py | 2 +- gramps/gui/editors/filtereditor.py | 2 +- gramps/gui/logger/_errorview.py | 2 +- gramps/gui/utils.py | 2 +- gramps/gui/views/bookmarks.py | 2 +- gramps/gui/views/tags.py | 2 +- gramps/gui/widgets/grampletpane.py | 2 +- gramps/plugins/gramplet/ageondategramplet.py | 2 +- gramps/plugins/gramplet/ancestor.py | 2 +- gramps/plugins/gramplet/calendargramplet.py | 2 +- gramps/plugins/gramplet/descendant.py | 2 +- gramps/plugins/gramplet/eval.py | 4 ++-- gramps/plugins/gramplet/fanchartdescgramplet.py | 2 +- gramps/plugins/gramplet/fanchartgramplet.py | 2 +- gramps/plugins/gramplet/filter.py | 2 +- gramps/plugins/gramplet/gallery.py | 2 +- gramps/plugins/gramplet/leak.py | 4 ++-- gramps/plugins/gramplet/mediapreview.py | 2 +- gramps/plugins/gramplet/metadataviewer.py | 2 +- gramps/plugins/gramplet/notes.py | 2 +- gramps/plugins/gramplet/persondetails.py | 2 +- gramps/plugins/gramplet/placedetails.py | 2 +- gramps/plugins/gramplet/repositorydetails.py | 2 +- gramps/plugins/gramplet/soundgen.py | 2 +- gramps/plugins/gramplet/todo.py | 2 +- gramps/plugins/gramplet/todogramplet.py | 2 +- gramps/plugins/gramplet/welcomegramplet.py | 2 +- gramps/plugins/sidebar/categorysidebar.py | 2 +- gramps/plugins/sidebar/dropdownsidebar.py | 2 +- gramps/plugins/sidebar/expandersidebar.py | 2 +- gramps/plugins/view/fanchartdescview.py | 2 +- gramps/plugins/view/fanchartview.py | 2 +- gramps/plugins/view/pedigreeview.py | 4 ++-- 34 files changed, 37 insertions(+), 37 deletions(-) diff --git a/gramps/gui/clipboard.py b/gramps/gui/clipboard.py index af0209276..06f189fd4 100644 --- a/gramps/gui/clipboard.py +++ b/gramps/gui/clipboard.py @@ -1371,7 +1371,7 @@ class ClipboardWindow(ManagedWindow): mtv = MultiTreeView(self.dbstate, self.uistate, _("Clipboard")) scrolledwindow = self.top.get_object('scrolledwindow86') scrolledwindow.remove(objectlist) - scrolledwindow.add_with_viewport(mtv) + scrolledwindow.add(mtv) self.object_list = ClipboardListView(self.dbstate, mtv) self.object_list.get_selection().connect('changed', self.set_clear_btn_sensitivity) diff --git a/gramps/gui/editors/edittaglist.py b/gramps/gui/editors/edittaglist.py index e13958a0e..0f027728e 100644 --- a/gramps/gui/editors/edittaglist.py +++ b/gramps/gui/editors/edittaglist.py @@ -110,7 +110,7 @@ class EditTagList(ManagedWindow): self.namemodel = ListModel(view, columns) slist = Gtk.ScrolledWindow() - slist.add_with_viewport(view) + slist.add(view) slist.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC) top.vbox.pack_start(slist, 1, 1, 5) diff --git a/gramps/gui/editors/filtereditor.py b/gramps/gui/editors/filtereditor.py index ecef0c2ea..d7e172eb3 100644 --- a/gramps/gui/editors/filtereditor.py +++ b/gramps/gui/editors/filtereditor.py @@ -612,7 +612,7 @@ class EditRule(ManagedWindow): # put the grid into a scrollable area: scrolled_win = Gtk.ScrolledWindow() - scrolled_win.add_with_viewport(grid) + scrolled_win.add(grid) scrolled_win.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC) scrolled_win.show() self.notebook.append_page(scrolled_win, Gtk.Label(label=class_obj.name)) diff --git a/gramps/gui/logger/_errorview.py b/gramps/gui/logger/_errorview.py index 80731c90e..1406316bc 100644 --- a/gramps/gui/logger/_errorview.py +++ b/gramps/gui/logger/_errorview.py @@ -127,7 +127,7 @@ class ErrorView(object): scroll.set_size_request(-1, 60) tb_frame.add(scroll) - scroll.add_with_viewport(tb_label) + scroll.add(tb_label) tb_expander = Gtk.Expander(label='%s' % _("Error Detail")) tb_expander.set_use_markup(True) diff --git a/gramps/gui/utils.py b/gramps/gui/utils.py index ad063859e..241812a4b 100644 --- a/gramps/gui/utils.py +++ b/gramps/gui/utils.py @@ -178,7 +178,7 @@ class ProgressMeter(object): text.set_border_width(6) text.set_editable(False) self.message_area = text - area.add_with_viewport(text) + area.add(text) area.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC) self.__dialog.vbox.add(area) self.message_area_ok = Gtk.Button.new_with_mnemonic(_('_OK')) diff --git a/gramps/gui/views/bookmarks.py b/gramps/gui/views/bookmarks.py index 007dfb37a..33c94136e 100644 --- a/gramps/gui/views/bookmarks.py +++ b/gramps/gui/views/bookmarks.py @@ -221,7 +221,7 @@ class Bookmarks : self.namemodel_cols = len(name_titles) slist = Gtk.ScrolledWindow() - slist.add_with_viewport(self.namelist) + slist.add(self.namelist) slist.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC) box.pack_start(slist, 1, 1, 5) bbox = Gtk.ButtonBox(orientation=Gtk.Orientation.VERTICAL) diff --git a/gramps/gui/views/tags.py b/gramps/gui/views/tags.py index eeb8d097f..643b855b9 100644 --- a/gramps/gui/views/tags.py +++ b/gramps/gui/views/tags.py @@ -399,7 +399,7 @@ class OrganizeTagsDialog(object): self.namemodel = ListModel(self.namelist, name_titles) slist = Gtk.ScrolledWindow() - slist.add_with_viewport(self.namelist) + slist.add(self.namelist) slist.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC) box.pack_start(slist, 1, 1, 5) bbox = Gtk.ButtonBox(orientation=Gtk.Orientation.VERTICAL) diff --git a/gramps/gui/widgets/grampletpane.py b/gramps/gui/widgets/grampletpane.py index d88042028..eedd3b7e1 100644 --- a/gramps/gui/widgets/grampletpane.py +++ b/gramps/gui/widgets/grampletpane.py @@ -995,7 +995,7 @@ class GrampletPane(Gtk.ScrolledWindow): self.eventb = Gtk.EventBox() self.hbox = Gtk.Box(homogeneous=True) self.eventb.add(self.hbox) - self.add_with_viewport(self.eventb) + self.add(self.eventb) self.set_kinetic_scrolling(True) self.set_capture_button_press(True) # Set up drag and drop diff --git a/gramps/plugins/gramplet/ageondategramplet.py b/gramps/plugins/gramplet/ageondategramplet.py index 8b6aad3ca..72aa93125 100644 --- a/gramps/plugins/gramplet/ageondategramplet.py +++ b/gramps/plugins/gramplet/ageondategramplet.py @@ -80,7 +80,7 @@ class AgeOnDateGramplet(Gramplet): vbox.pack_start(hbox, False, True, 0) vbox.pack_start(button, False, True, 0) self.gui.get_container_widget().remove(self.gui.textview) - self.gui.get_container_widget().add_with_viewport(vbox) + self.gui.get_container_widget().add(vbox) vbox.show_all() def post_init(self): diff --git a/gramps/plugins/gramplet/ancestor.py b/gramps/plugins/gramplet/ancestor.py index dfd9627bb..c11dc7203 100644 --- a/gramps/plugins/gramplet/ancestor.py +++ b/gramps/plugins/gramplet/ancestor.py @@ -49,7 +49,7 @@ class Ancestor(Gramplet): def init(self): self.gui.WIDGET = self.build_gui() self.gui.get_container_widget().remove(self.gui.textview) - self.gui.get_container_widget().add_with_viewport(self.gui.WIDGET) + self.gui.get_container_widget().add(self.gui.WIDGET) self.gui.WIDGET.show() def build_gui(self): diff --git a/gramps/plugins/gramplet/calendargramplet.py b/gramps/plugins/gramplet/calendargramplet.py index cd2cc4949..1cedd4deb 100644 --- a/gramps/plugins/gramplet/calendargramplet.py +++ b/gramps/plugins/gramplet/calendargramplet.py @@ -43,7 +43,7 @@ class CalendarGramplet(Gramplet): self.gui.get_container_widget().remove(self.gui.textview) vbox = Gtk.Box(orientation=Gtk.Orientation.VERTICAL) vbox.pack_start(self.gui.calendar, False, False, 0) - self.gui.get_container_widget().add_with_viewport(vbox) + self.gui.get_container_widget().add(vbox) vbox.show_all() #self.gui.calendar.show() diff --git a/gramps/plugins/gramplet/descendant.py b/gramps/plugins/gramplet/descendant.py index af3d72253..78530645f 100644 --- a/gramps/plugins/gramplet/descendant.py +++ b/gramps/plugins/gramplet/descendant.py @@ -55,7 +55,7 @@ class Descendant(Gramplet): def init(self): self.gui.WIDGET = self.build_gui() self.gui.get_container_widget().remove(self.gui.textview) - self.gui.get_container_widget().add_with_viewport(self.gui.WIDGET) + self.gui.get_container_widget().add(self.gui.WIDGET) self.gui.WIDGET.show() def build_gui(self): diff --git a/gramps/plugins/gramplet/eval.py b/gramps/plugins/gramplet/eval.py index d4e1b8d5d..dc3e7fab9 100644 --- a/gramps/plugins/gramplet/eval.py +++ b/gramps/plugins/gramplet/eval.py @@ -60,7 +60,7 @@ class PythonEvaluation(Gramplet): def init(self): self.gui.WIDGET = self.build_gui() self.gui.get_container_widget().remove(self.gui.textview) - self.gui.get_container_widget().add_with_viewport(self.gui.WIDGET) + self.gui.get_container_widget().add(self.gui.WIDGET) def build_gui(self): """ @@ -97,7 +97,7 @@ class PythonEvaluation(Gramplet): swin = Gtk.ScrolledWindow() swin.set_shadow_type(Gtk.ShadowType.IN) tview = Gtk.TextView() - swin.add_with_viewport(tview) + swin.add(tview) self.top.pack_start(swin, True, True, 6) return tview.get_buffer() diff --git a/gramps/plugins/gramplet/fanchartdescgramplet.py b/gramps/plugins/gramplet/fanchartdescgramplet.py index a7a94442f..f5bee81d0 100644 --- a/gramps/plugins/gramplet/fanchartdescgramplet.py +++ b/gramps/plugins/gramplet/fanchartdescgramplet.py @@ -70,7 +70,7 @@ class FanChartDescGramplet(FanChartDescGrampsGUI, Gramplet): self.set_fan(FanChartDescWidget(self.dbstate, self.uistate, self.on_popup)) # Replace the standard textview with the fan chart widget: self.gui.get_container_widget().remove(self.gui.textview) - self.gui.get_container_widget().add_with_viewport(self.fan) + self.gui.get_container_widget().add(self.fan) # Make sure it is visible: self.fan.show() diff --git a/gramps/plugins/gramplet/fanchartgramplet.py b/gramps/plugins/gramplet/fanchartgramplet.py index 0e610cc09..855073e1f 100644 --- a/gramps/plugins/gramplet/fanchartgramplet.py +++ b/gramps/plugins/gramplet/fanchartgramplet.py @@ -75,7 +75,7 @@ class FanChartGramplet(FanChartGrampsGUI, Gramplet): self.set_fan(FanChartWidget(self.dbstate, self.uistate, self.on_popup)) # Replace the standard textview with the fan chart widget: self.gui.get_container_widget().remove(self.gui.textview) - self.gui.get_container_widget().add_with_viewport(self.fan) + self.gui.get_container_widget().add(self.fan) # Make sure it is visible: self.fan.show() diff --git a/gramps/plugins/gramplet/filter.py b/gramps/plugins/gramplet/filter.py index df2e36090..8a7f9d76e 100644 --- a/gramps/plugins/gramplet/filter.py +++ b/gramps/plugins/gramplet/filter.py @@ -47,7 +47,7 @@ class Filter(Gramplet): self.__filter_clicked) self.widget = self.filter.get_widget() self.gui.get_container_widget().remove(self.gui.textview) - self.gui.get_container_widget().add_with_viewport(self.widget) + self.gui.get_container_widget().add(self.widget) self.widget.show_all() def __filter_clicked(self): diff --git a/gramps/plugins/gramplet/gallery.py b/gramps/plugins/gramplet/gallery.py index ea74fed63..dd6eb43ad 100644 --- a/gramps/plugins/gramplet/gallery.py +++ b/gramps/plugins/gramplet/gallery.py @@ -30,7 +30,7 @@ class Gallery(Gramplet): def init(self): self.gui.WIDGET = self.build_gui() self.gui.get_container_widget().remove(self.gui.textview) - self.gui.get_container_widget().add_with_viewport(self.gui.WIDGET) + self.gui.get_container_widget().add(self.gui.WIDGET) def build_gui(self): """ diff --git a/gramps/plugins/gramplet/leak.py b/gramps/plugins/gramplet/leak.py index 58ae93bd5..37079b953 100644 --- a/gramps/plugins/gramplet/leak.py +++ b/gramps/plugins/gramplet/leak.py @@ -63,7 +63,7 @@ class Leak(Gramplet): def init(self): self.gui.WIDGET = self.build_gui() self.gui.get_container_widget().remove(self.gui.textview) - self.gui.get_container_widget().add_with_viewport(self.gui.WIDGET) + self.gui.get_container_widget().add(self.gui.WIDGET) flags = gc.DEBUG_UNCOLLECTABLE|gc.DEBUG_SAVEALL if hasattr(gc, "DEBUG_OBJECTS"): @@ -86,7 +86,7 @@ class Leak(Gramplet): self.list = Gtk.TreeView() self.list.set_headers_visible(True) self.list.connect('button-press-event', self._button_press) - self.scroll.add_with_viewport(self.list) + self.scroll.add(self.list) #make a model self.modeldata = [] self.model = Gtk.ListStore(int, str) diff --git a/gramps/plugins/gramplet/mediapreview.py b/gramps/plugins/gramplet/mediapreview.py index 51fc082b3..0da4e781e 100644 --- a/gramps/plugins/gramplet/mediapreview.py +++ b/gramps/plugins/gramplet/mediapreview.py @@ -29,7 +29,7 @@ class MediaPreview(Gramplet): def init(self): self.gui.WIDGET = self.build_gui() self.gui.get_container_widget().remove(self.gui.textview) - self.gui.get_container_widget().add_with_viewport(self.gui.WIDGET) + self.gui.get_container_widget().add(self.gui.WIDGET) def build_gui(self): """ diff --git a/gramps/plugins/gramplet/metadataviewer.py b/gramps/plugins/gramplet/metadataviewer.py index ed7f1d8e2..1bdd6bf1f 100644 --- a/gramps/plugins/gramplet/metadataviewer.py +++ b/gramps/plugins/gramplet/metadataviewer.py @@ -31,7 +31,7 @@ class MetadataViewer(Gramplet): def init(self): self.gui.WIDGET = self.build_gui() self.gui.get_container_widget().remove(self.gui.textview) - self.gui.get_container_widget().add_with_viewport(self.gui.WIDGET) + self.gui.get_container_widget().add(self.gui.WIDGET) self.gui.WIDGET.show() self.connect_signal('Media', self.update) diff --git a/gramps/plugins/gramplet/notes.py b/gramps/plugins/gramplet/notes.py index efcf7e1d8..1cbda184b 100644 --- a/gramps/plugins/gramplet/notes.py +++ b/gramps/plugins/gramplet/notes.py @@ -33,7 +33,7 @@ class Notes(Gramplet): def init(self): self.gui.WIDGET = self.build_gui() self.gui.get_container_widget().remove(self.gui.textview) - self.gui.get_container_widget().add_with_viewport(self.gui.WIDGET) + self.gui.get_container_widget().add(self.gui.WIDGET) self.gui.WIDGET.show() def build_gui(self): diff --git a/gramps/plugins/gramplet/persondetails.py b/gramps/plugins/gramplet/persondetails.py index 515f0018b..68a64dc5d 100644 --- a/gramps/plugins/gramplet/persondetails.py +++ b/gramps/plugins/gramplet/persondetails.py @@ -37,7 +37,7 @@ class PersonDetails(Gramplet): def init(self): self.gui.WIDGET = self.build_gui() self.gui.get_container_widget().remove(self.gui.textview) - self.gui.get_container_widget().add_with_viewport(self.gui.WIDGET) + self.gui.get_container_widget().add(self.gui.WIDGET) self.uistate.connect('nameformat-changed', self.update) def build_gui(self): diff --git a/gramps/plugins/gramplet/placedetails.py b/gramps/plugins/gramplet/placedetails.py index 67211537c..bc9d1a42f 100644 --- a/gramps/plugins/gramplet/placedetails.py +++ b/gramps/plugins/gramplet/placedetails.py @@ -34,7 +34,7 @@ class PlaceDetails(Gramplet): def init(self): self.gui.WIDGET = self.build_gui() self.gui.get_container_widget().remove(self.gui.textview) - self.gui.get_container_widget().add_with_viewport(self.gui.WIDGET) + self.gui.get_container_widget().add(self.gui.WIDGET) def build_gui(self): """ diff --git a/gramps/plugins/gramplet/repositorydetails.py b/gramps/plugins/gramplet/repositorydetails.py index 459832535..99c843007 100644 --- a/gramps/plugins/gramplet/repositorydetails.py +++ b/gramps/plugins/gramplet/repositorydetails.py @@ -31,7 +31,7 @@ class RepositoryDetails(Gramplet): def init(self): self.gui.WIDGET = self.build_gui() self.gui.get_container_widget().remove(self.gui.textview) - self.gui.get_container_widget().add_with_viewport(self.gui.WIDGET) + self.gui.get_container_widget().add(self.gui.WIDGET) def build_gui(self): """ diff --git a/gramps/plugins/gramplet/soundgen.py b/gramps/plugins/gramplet/soundgen.py index b3dacafb6..2bbdfb5ff 100644 --- a/gramps/plugins/gramplet/soundgen.py +++ b/gramps/plugins/gramplet/soundgen.py @@ -52,7 +52,7 @@ class SoundGen(Gramplet): def init(self): self.gui.WIDGET = self.build_gui() self.gui.get_container_widget().remove(self.gui.textview) - self.gui.get_container_widget().add_with_viewport(self.gui.WIDGET) + self.gui.get_container_widget().add(self.gui.WIDGET) def build_gui(self): """ diff --git a/gramps/plugins/gramplet/todo.py b/gramps/plugins/gramplet/todo.py index 1b735759c..9cb006ba8 100644 --- a/gramps/plugins/gramplet/todo.py +++ b/gramps/plugins/gramplet/todo.py @@ -33,7 +33,7 @@ class ToDo(Gramplet): def init(self): self.gui.WIDGET = self.build_gui() self.gui.get_container_widget().remove(self.gui.textview) - self.gui.get_container_widget().add_with_viewport(self.gui.WIDGET) + self.gui.get_container_widget().add(self.gui.WIDGET) self.gui.WIDGET.show() def build_gui(self): diff --git a/gramps/plugins/gramplet/todogramplet.py b/gramps/plugins/gramplet/todogramplet.py index 50aacc997..61fe9a4e1 100644 --- a/gramps/plugins/gramplet/todogramplet.py +++ b/gramps/plugins/gramplet/todogramplet.py @@ -36,7 +36,7 @@ class ToDoGramplet(Gramplet): def init(self): self.gui.WIDGET = self.build_gui() self.gui.get_container_widget().remove(self.gui.textview) - self.gui.get_container_widget().add_with_viewport(self.gui.WIDGET) + self.gui.get_container_widget().add(self.gui.WIDGET) self.gui.WIDGET.show() def build_gui(self): diff --git a/gramps/plugins/gramplet/welcomegramplet.py b/gramps/plugins/gramplet/welcomegramplet.py index 97eda7acf..67b032e76 100644 --- a/gramps/plugins/gramplet/welcomegramplet.py +++ b/gramps/plugins/gramplet/welcomegramplet.py @@ -75,7 +75,7 @@ class WelcomeGramplet(Gramplet): def init(self): self.gui.WIDGET = self.build_gui() self.gui.get_container_widget().remove(self.gui.textview) - self.gui.get_container_widget().add_with_viewport(self.gui.WIDGET) + self.gui.get_container_widget().add(self.gui.WIDGET) self.gui.WIDGET.show() def build_gui(self): diff --git a/gramps/plugins/sidebar/categorysidebar.py b/gramps/plugins/sidebar/categorysidebar.py index 9990235a8..51a104d24 100644 --- a/gramps/plugins/sidebar/categorysidebar.py +++ b/gramps/plugins/sidebar/categorysidebar.py @@ -73,7 +73,7 @@ class CategorySidebar(BaseSidebar): self.window = Gtk.ScrolledWindow() vbox = Gtk.Box(orientation=Gtk.Orientation.VERTICAL) - self.window.add_with_viewport(vbox) + self.window.add(vbox) self.window.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC) self.window.show() diff --git a/gramps/plugins/sidebar/dropdownsidebar.py b/gramps/plugins/sidebar/dropdownsidebar.py index 6df3e09a4..b68015201 100644 --- a/gramps/plugins/sidebar/dropdownsidebar.py +++ b/gramps/plugins/sidebar/dropdownsidebar.py @@ -59,7 +59,7 @@ class DropdownSidebar(BaseSidebar): self.window = Gtk.ScrolledWindow() grid = Gtk.Grid() - self.window.add_with_viewport(grid) + self.window.add(grid) self.window.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC) self.window.show() diff --git a/gramps/plugins/sidebar/expandersidebar.py b/gramps/plugins/sidebar/expandersidebar.py index 63fc4712d..d0273920d 100644 --- a/gramps/plugins/sidebar/expandersidebar.py +++ b/gramps/plugins/sidebar/expandersidebar.py @@ -61,7 +61,7 @@ class ExpanderSidebar(BaseSidebar): self.window = Gtk.ScrolledWindow() vbox = Gtk.Box(orientation=Gtk.Orientation.VERTICAL) - self.window.add_with_viewport(vbox) + self.window.add(vbox) self.window.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC) self.window.show() diff --git a/gramps/plugins/view/fanchartdescview.py b/gramps/plugins/view/fanchartdescview.py index 978850b72..eb2a93673 100644 --- a/gramps/plugins/view/fanchartdescview.py +++ b/gramps/plugins/view/fanchartdescview.py @@ -104,7 +104,7 @@ class FanChartDescView(fanchartdesc.FanChartDescGrampsGUI, NavigationView): self.scrolledwindow.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC) self.fan.show_all() - self.scrolledwindow.add_with_viewport(self.fan) + self.scrolledwindow.add(self.fan) return self.scrolledwindow diff --git a/gramps/plugins/view/fanchartview.py b/gramps/plugins/view/fanchartview.py index fef8ef31c..f73182caf 100644 --- a/gramps/plugins/view/fanchartview.py +++ b/gramps/plugins/view/fanchartview.py @@ -102,7 +102,7 @@ class FanChartView(fanchart.FanChartGrampsGUI, NavigationView): self.scrolledwindow.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC) self.fan.show_all() - self.scrolledwindow.add_with_viewport(self.fan) + self.scrolledwindow.add(self.fan) return self.scrolledwindow diff --git a/gramps/plugins/view/pedigreeview.py b/gramps/plugins/view/pedigreeview.py index 33f40b075..95c96c4d4 100644 --- a/gramps/plugins/view/pedigreeview.py +++ b/gramps/plugins/view/pedigreeview.py @@ -595,7 +595,7 @@ class PedigreeView(NavigationView): event_box.connect("button-release-event", self.cb_bg_button_release) #Signal for controll motion-notify when left mouse button pressed event_box.connect("motion-notify-event", self.cb_bg_motion_notify_event) - self.scrolledwindow.add_with_viewport(event_box) + self.scrolledwindow.add(event_box) self.table = Gtk.Grid() # force LTR layout of the tree, even though the text might be RTL! @@ -1191,7 +1191,7 @@ class PedigreeView(NavigationView): vadjustment=None) frame.set_shadow_type(Gtk.ShadowType.NONE) frame.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.NEVER) - frame.add_with_viewport(label) + frame.add(label) table_widget.attach(frame, x_pos, y_pos, 1, 1) table_widget.show_all() From e554e324af9b6d5663c565824a4129eb5a6468e5 Mon Sep 17 00:00:00 2001 From: Nick Hall Date: Fri, 22 May 2015 18:13:07 +0100 Subject: [PATCH 09/10] Set new button labels as translatable --- gramps/gui/glade/addmedia.glade | 6 +++--- gramps/gui/glade/baseselector.glade | 4 ++-- gramps/gui/glade/book.glade | 10 +++++----- gramps/gui/glade/clipboard.glade | 6 +++--- gramps/gui/glade/configure.glade | 4 ++-- gramps/gui/glade/dbman.glade | 8 ++++---- gramps/gui/glade/dialog.glade | 10 +++++----- gramps/gui/glade/displaystate.glade | 2 +- gramps/gui/glade/editaddress.glade | 6 +++--- gramps/gui/glade/editattribute.glade | 6 +++--- gramps/gui/glade/editchildref.glade | 6 +++--- gramps/gui/glade/editcitation.glade | 6 +++--- gramps/gui/glade/editdate.glade | 6 +++--- gramps/gui/glade/editevent.glade | 6 +++--- gramps/gui/glade/editeventref.glade | 6 +++--- gramps/gui/glade/editfamily.glade | 6 +++--- gramps/gui/glade/editldsord.glade | 6 +++--- gramps/gui/glade/editlink.glade | 6 +++--- gramps/gui/glade/editlocation.glade | 6 +++--- gramps/gui/glade/editmedia.glade | 6 +++--- gramps/gui/glade/editmediaref.glade | 6 +++--- gramps/gui/glade/editname.glade | 6 +++--- gramps/gui/glade/editnote.glade | 6 +++--- gramps/gui/glade/editperson.glade | 6 +++--- gramps/gui/glade/editpersonref.glade | 6 +++--- gramps/gui/glade/editplace.glade | 6 +++--- gramps/gui/glade/editplaceref.glade | 6 +++--- gramps/gui/glade/editreporef.glade | 6 +++--- gramps/gui/glade/editrepository.glade | 6 +++--- gramps/gui/glade/editsource.glade | 6 +++--- gramps/gui/glade/editurl.glade | 8 ++++---- gramps/gui/glade/mergecitation.glade | 6 +++--- gramps/gui/glade/mergedata.glade | 22 +++++++++++----------- gramps/gui/glade/mergeevent.glade | 6 +++--- gramps/gui/glade/mergefamily.glade | 6 +++--- gramps/gui/glade/mergemedia.glade | 6 +++--- gramps/gui/glade/mergenote.glade | 6 +++--- gramps/gui/glade/mergeperson.glade | 6 +++--- gramps/gui/glade/mergeplace.glade | 6 +++--- gramps/gui/glade/mergerepository.glade | 6 +++--- gramps/gui/glade/mergesource.glade | 6 +++--- gramps/gui/glade/plugins.glade | 2 +- gramps/gui/glade/reorder.glade | 4 ++-- gramps/gui/glade/rule.glade | 18 +++++++++--------- gramps/gui/glade/styleeditor.glade | 8 ++++---- gramps/gui/glade/tipofday.glade | 4 ++-- gramps/gui/glade/updateaddons.glade | 2 +- 47 files changed, 152 insertions(+), 152 deletions(-) diff --git a/gramps/gui/glade/addmedia.glade b/gramps/gui/glade/addmedia.glade index 98b7a82f0..5a5762bac 100644 --- a/gramps/gui/glade/addmedia.glade +++ b/gramps/gui/glade/addmedia.glade @@ -21,7 +21,7 @@ end - _Cancel + _Cancel False True True @@ -37,7 +37,7 @@ - _OK + _OK False True True @@ -54,7 +54,7 @@ - _Help + _Help False True True diff --git a/gramps/gui/glade/baseselector.glade b/gramps/gui/glade/baseselector.glade index 63fbb5d2c..9ca962a5d 100644 --- a/gramps/gui/glade/baseselector.glade +++ b/gramps/gui/glade/baseselector.glade @@ -21,7 +21,7 @@ end - _Cancel + _Cancel False True True @@ -37,7 +37,7 @@ - _OK + _OK False True True diff --git a/gramps/gui/glade/book.glade b/gramps/gui/glade/book.glade index 1d8c19796..3dfc2e8a2 100644 --- a/gramps/gui/glade/book.glade +++ b/gramps/gui/glade/book.glade @@ -465,7 +465,7 @@ end - _Close + _Close True True True @@ -481,7 +481,7 @@ - _OK + _OK True True True @@ -522,7 +522,7 @@ end - _Delete + _Delete True True True @@ -538,7 +538,7 @@ - _Close + _Close True True True @@ -554,7 +554,7 @@ - _OK + _OK True True True diff --git a/gramps/gui/glade/clipboard.glade b/gramps/gui/glade/clipboard.glade index 56c141c0a..845da678f 100644 --- a/gramps/gui/glade/clipboard.glade +++ b/gramps/gui/glade/clipboard.glade @@ -20,7 +20,7 @@ end - _Help + _Help False True True @@ -53,7 +53,7 @@ - _Clear + _Clear False True True @@ -70,7 +70,7 @@ - _Close + _Close False True True diff --git a/gramps/gui/glade/configure.glade b/gramps/gui/glade/configure.glade index f6c26cc25..3381f716d 100644 --- a/gramps/gui/glade/configure.glade +++ b/gramps/gui/glade/configure.glade @@ -20,7 +20,7 @@ end - _Cancel + _Cancel False True True @@ -36,7 +36,7 @@ - _OK + _OK False True True diff --git a/gramps/gui/glade/dbman.glade b/gramps/gui/glade/dbman.glade index bbad9ed10..3e6f23641 100644 --- a/gramps/gui/glade/dbman.glade +++ b/gramps/gui/glade/dbman.glade @@ -21,7 +21,7 @@ end - _OK + _OK False True True @@ -218,7 +218,7 @@ start - _New + _New False True True @@ -234,7 +234,7 @@ - _Copy + _Copy True True True @@ -249,7 +249,7 @@ - _Delete + _Delete False True True diff --git a/gramps/gui/glade/dialog.glade b/gramps/gui/glade/dialog.glade index 497858754..ddbcf837d 100644 --- a/gramps/gui/glade/dialog.glade +++ b/gramps/gui/glade/dialog.glade @@ -17,7 +17,7 @@ end - _Close + _Close True True True @@ -137,7 +137,7 @@ end - _Close + _Close True True True @@ -534,7 +534,7 @@ end - _Cancel + _Cancel True True True @@ -673,7 +673,7 @@ - _Cancel + _Cancel True True True @@ -690,7 +690,7 @@ - _Save + _Save True True True diff --git a/gramps/gui/glade/displaystate.glade b/gramps/gui/glade/displaystate.glade index 5cb12b68c..90111df39 100644 --- a/gramps/gui/glade/displaystate.glade +++ b/gramps/gui/glade/displaystate.glade @@ -22,7 +22,7 @@ end - _Close + _Close False True True diff --git a/gramps/gui/glade/editaddress.glade b/gramps/gui/glade/editaddress.glade index bc7399261..f51ee2216 100644 --- a/gramps/gui/glade/editaddress.glade +++ b/gramps/gui/glade/editaddress.glade @@ -18,7 +18,7 @@ end - _Cancel + _Cancel True True True @@ -33,7 +33,7 @@ - _OK + _OK True True True @@ -52,7 +52,7 @@ - _Help + _Help True True True diff --git a/gramps/gui/glade/editattribute.glade b/gramps/gui/glade/editattribute.glade index d28c5a170..e9e7baf29 100644 --- a/gramps/gui/glade/editattribute.glade +++ b/gramps/gui/glade/editattribute.glade @@ -18,7 +18,7 @@ end - _Cancel + _Cancel False True True @@ -34,7 +34,7 @@ - _OK + _OK False True True @@ -51,7 +51,7 @@ - _Help + _Help False True True diff --git a/gramps/gui/glade/editchildref.glade b/gramps/gui/glade/editchildref.glade index 08ee4a965..d9867bcff 100644 --- a/gramps/gui/glade/editchildref.glade +++ b/gramps/gui/glade/editchildref.glade @@ -19,7 +19,7 @@ end - _Cancel + _Cancel False True True @@ -35,7 +35,7 @@ - _OK + _OK False True True @@ -55,7 +55,7 @@ - _Help + _Help False True True diff --git a/gramps/gui/glade/editcitation.glade b/gramps/gui/glade/editcitation.glade index 0aa4d0fc3..b99d60a01 100644 --- a/gramps/gui/glade/editcitation.glade +++ b/gramps/gui/glade/editcitation.glade @@ -25,7 +25,7 @@ end - _Help + _Help True True True @@ -40,7 +40,7 @@ - _Cancel + _Cancel True True True @@ -55,7 +55,7 @@ - _OK + _OK True True True diff --git a/gramps/gui/glade/editdate.glade b/gramps/gui/glade/editdate.glade index 258f71130..2aed504a7 100644 --- a/gramps/gui/glade/editdate.glade +++ b/gramps/gui/glade/editdate.glade @@ -50,7 +50,7 @@ end - _Help + _Help False True True @@ -66,7 +66,7 @@ - _Cancel + _Cancel False True True @@ -82,7 +82,7 @@ - _OK + _OK False True True diff --git a/gramps/gui/glade/editevent.glade b/gramps/gui/glade/editevent.glade index 4d13211c6..9e1e6406b 100644 --- a/gramps/gui/glade/editevent.glade +++ b/gramps/gui/glade/editevent.glade @@ -18,7 +18,7 @@ end - _Cancel + _Cancel True True True @@ -37,7 +37,7 @@ - _OK + _OK True True True @@ -55,7 +55,7 @@ - _Help + _Help True True True diff --git a/gramps/gui/glade/editeventref.glade b/gramps/gui/glade/editeventref.glade index 3cdfcaa8c..3908c2237 100644 --- a/gramps/gui/glade/editeventref.glade +++ b/gramps/gui/glade/editeventref.glade @@ -19,7 +19,7 @@ end - _Help + _Help False True True @@ -35,7 +35,7 @@ - _Cancel + _Cancel False True True @@ -51,7 +51,7 @@ - _OK + _OK False True True diff --git a/gramps/gui/glade/editfamily.glade b/gramps/gui/glade/editfamily.glade index 9b88ebd97..cca1daa4e 100644 --- a/gramps/gui/glade/editfamily.glade +++ b/gramps/gui/glade/editfamily.glade @@ -18,7 +18,7 @@ end - _Cancel + _Cancel False True True @@ -37,7 +37,7 @@ - _OK + _OK False True True @@ -57,7 +57,7 @@ - _Help + _Help False True True diff --git a/gramps/gui/glade/editldsord.glade b/gramps/gui/glade/editldsord.glade index 1307cb7ae..cf8956170 100644 --- a/gramps/gui/glade/editldsord.glade +++ b/gramps/gui/glade/editldsord.glade @@ -38,7 +38,7 @@ end - _Cancel + _Cancel False True True @@ -54,7 +54,7 @@ - _OK + _OK False True True @@ -74,7 +74,7 @@ - _Help + _Help False True True diff --git a/gramps/gui/glade/editlink.glade b/gramps/gui/glade/editlink.glade index e4d37322d..3b5686c7a 100644 --- a/gramps/gui/glade/editlink.glade +++ b/gramps/gui/glade/editlink.glade @@ -20,7 +20,7 @@ end - _Cancel + _Cancel False True True @@ -36,7 +36,7 @@ - _OK + _OK False True True @@ -56,7 +56,7 @@ - _Help + _Help False True True diff --git a/gramps/gui/glade/editlocation.glade b/gramps/gui/glade/editlocation.glade index 20e3d1c9c..beb29f09f 100644 --- a/gramps/gui/glade/editlocation.glade +++ b/gramps/gui/glade/editlocation.glade @@ -19,7 +19,7 @@ end - _Cancel + _Cancel False True True @@ -35,7 +35,7 @@ - _OK + _OK False True True @@ -52,7 +52,7 @@ - _Help + _Help False True True diff --git a/gramps/gui/glade/editmedia.glade b/gramps/gui/glade/editmedia.glade index db2beaeac..26ed83ba0 100644 --- a/gramps/gui/glade/editmedia.glade +++ b/gramps/gui/glade/editmedia.glade @@ -19,7 +19,7 @@ end - _Cancel + _Cancel False True True @@ -35,7 +35,7 @@ - _OK + _OK False True True @@ -52,7 +52,7 @@ - _Help + _Help False True True diff --git a/gramps/gui/glade/editmediaref.glade b/gramps/gui/glade/editmediaref.glade index 13ed91b4e..5d60417d8 100644 --- a/gramps/gui/glade/editmediaref.glade +++ b/gramps/gui/glade/editmediaref.glade @@ -41,7 +41,7 @@ end - _Cancel + _Cancel True True True @@ -56,7 +56,7 @@ - _OK + _OK True True True @@ -72,7 +72,7 @@ - _Help + _Help True True True diff --git a/gramps/gui/glade/editname.glade b/gramps/gui/glade/editname.glade index 265f81f42..7036b57d8 100644 --- a/gramps/gui/glade/editname.glade +++ b/gramps/gui/glade/editname.glade @@ -19,7 +19,7 @@ end - _Cancel + _Cancel False True True @@ -38,7 +38,7 @@ - _OK + _OK False True True @@ -57,7 +57,7 @@ - _Help + _Help False True True diff --git a/gramps/gui/glade/editnote.glade b/gramps/gui/glade/editnote.glade index 49688980a..437d20628 100644 --- a/gramps/gui/glade/editnote.glade +++ b/gramps/gui/glade/editnote.glade @@ -20,7 +20,7 @@ end - _Cancel + _Cancel False True True @@ -36,7 +36,7 @@ - _OK + _OK False True True @@ -52,7 +52,7 @@ - _Help + _Help False True True diff --git a/gramps/gui/glade/editperson.glade b/gramps/gui/glade/editperson.glade index e7857a63c..cfe976776 100644 --- a/gramps/gui/glade/editperson.glade +++ b/gramps/gui/glade/editperson.glade @@ -43,7 +43,7 @@ end - _Cancel + _Cancel False True True @@ -62,7 +62,7 @@ - _OK + _OK False True True @@ -80,7 +80,7 @@ - _Help + _Help False True True diff --git a/gramps/gui/glade/editpersonref.glade b/gramps/gui/glade/editpersonref.glade index 067d92714..89ffb1321 100644 --- a/gramps/gui/glade/editpersonref.glade +++ b/gramps/gui/glade/editpersonref.glade @@ -18,7 +18,7 @@ end - _Cancel + _Cancel False True True @@ -34,7 +34,7 @@ - _OK + _OK False True True @@ -54,7 +54,7 @@ - _Help + _Help False True True diff --git a/gramps/gui/glade/editplace.glade b/gramps/gui/glade/editplace.glade index 2f945bb16..1ce524081 100644 --- a/gramps/gui/glade/editplace.glade +++ b/gramps/gui/glade/editplace.glade @@ -18,7 +18,7 @@ end - _Cancel + _Cancel True True True @@ -33,7 +33,7 @@ - _OK + _OK True True True @@ -49,7 +49,7 @@ - _Help + _Help True True True diff --git a/gramps/gui/glade/editplaceref.glade b/gramps/gui/glade/editplaceref.glade index 46179a32a..b476aeea4 100644 --- a/gramps/gui/glade/editplaceref.glade +++ b/gramps/gui/glade/editplaceref.glade @@ -19,7 +19,7 @@ end - _Help + _Help False True True @@ -35,7 +35,7 @@ - _Cancel + _Cancel False True True @@ -51,7 +51,7 @@ - _OK + _OK False True True diff --git a/gramps/gui/glade/editreporef.glade b/gramps/gui/glade/editreporef.glade index 23011b160..0c0e1438f 100644 --- a/gramps/gui/glade/editreporef.glade +++ b/gramps/gui/glade/editreporef.glade @@ -19,7 +19,7 @@ end - _Cancel + _Cancel False True True @@ -38,7 +38,7 @@ - _OK + _OK False True True @@ -58,7 +58,7 @@ - _Help + _Help False True True diff --git a/gramps/gui/glade/editrepository.glade b/gramps/gui/glade/editrepository.glade index 88bb2a0fd..f4f006b8c 100644 --- a/gramps/gui/glade/editrepository.glade +++ b/gramps/gui/glade/editrepository.glade @@ -19,7 +19,7 @@ end - _Cancel + _Cancel True True True @@ -37,7 +37,7 @@ - _OK + _OK True True True @@ -56,7 +56,7 @@ - _Help + _Help True True True diff --git a/gramps/gui/glade/editsource.glade b/gramps/gui/glade/editsource.glade index 05872049f..fd5d2fa1c 100644 --- a/gramps/gui/glade/editsource.glade +++ b/gramps/gui/glade/editsource.glade @@ -20,7 +20,7 @@ end - _Cancel + _Cancel True True True @@ -37,7 +37,7 @@ - _OK + _OK True True True @@ -55,7 +55,7 @@ - _Help + _Help True True True diff --git a/gramps/gui/glade/editurl.glade b/gramps/gui/glade/editurl.glade index 4e84f427d..e99e0728d 100644 --- a/gramps/gui/glade/editurl.glade +++ b/gramps/gui/glade/editurl.glade @@ -19,7 +19,7 @@ end - _Cancel + _Cancel False True True @@ -35,7 +35,7 @@ - _OK + _OK False True True @@ -55,7 +55,7 @@ - _Help + _Help False True True @@ -198,7 +198,7 @@ - _Jump to + _Jump to False True True diff --git a/gramps/gui/glade/mergecitation.glade b/gramps/gui/glade/mergecitation.glade index 90d867f8a..bb970903e 100644 --- a/gramps/gui/glade/mergecitation.glade +++ b/gramps/gui/glade/mergecitation.glade @@ -19,7 +19,7 @@ end - _Cancel + _Cancel False True True @@ -35,7 +35,7 @@ - _OK + _OK False True True @@ -51,7 +51,7 @@ - _Help + _Help False True True diff --git a/gramps/gui/glade/mergedata.glade b/gramps/gui/glade/mergedata.glade index a80b048bf..997373e5a 100644 --- a/gramps/gui/glade/mergedata.glade +++ b/gramps/gui/glade/mergedata.glade @@ -22,7 +22,7 @@ end - _Cancel + _Cancel False True True @@ -74,7 +74,7 @@ - _Help + _Help False True True @@ -243,7 +243,7 @@ end - _Cancel + _Cancel False True True @@ -259,7 +259,7 @@ - _OK + _OK False True True @@ -275,7 +275,7 @@ - _Help + _Help False True True @@ -431,7 +431,7 @@ end - _Cancel + _Cancel False True True @@ -448,7 +448,7 @@ - _OK + _OK False True True @@ -465,7 +465,7 @@ - _Help + _Help False True True @@ -663,7 +663,7 @@ end - _Cancel + _Cancel False True True @@ -679,7 +679,7 @@ - _OK + _OK False True True @@ -695,7 +695,7 @@ - _Help + _Help False True True diff --git a/gramps/gui/glade/mergeevent.glade b/gramps/gui/glade/mergeevent.glade index 30567a471..a4fd8e8b0 100644 --- a/gramps/gui/glade/mergeevent.glade +++ b/gramps/gui/glade/mergeevent.glade @@ -19,7 +19,7 @@ end - _Cancel + _Cancel False True True @@ -35,7 +35,7 @@ - _OK + _OK False True True @@ -51,7 +51,7 @@ - _Help + _Help False True True diff --git a/gramps/gui/glade/mergefamily.glade b/gramps/gui/glade/mergefamily.glade index 8b15de79b..27b30a476 100644 --- a/gramps/gui/glade/mergefamily.glade +++ b/gramps/gui/glade/mergefamily.glade @@ -19,7 +19,7 @@ end - _Cancel + _Cancel False True True @@ -35,7 +35,7 @@ - _OK + _OK False True True @@ -51,7 +51,7 @@ - _Help + _Help False True True diff --git a/gramps/gui/glade/mergemedia.glade b/gramps/gui/glade/mergemedia.glade index c69ef0a29..92ece9cde 100644 --- a/gramps/gui/glade/mergemedia.glade +++ b/gramps/gui/glade/mergemedia.glade @@ -19,7 +19,7 @@ end - _Cancel + _Cancel False True True @@ -35,7 +35,7 @@ - _OK + _OK False True True @@ -51,7 +51,7 @@ - _Help + _Help False True True diff --git a/gramps/gui/glade/mergenote.glade b/gramps/gui/glade/mergenote.glade index 69c12ae5e..d130e4aa9 100644 --- a/gramps/gui/glade/mergenote.glade +++ b/gramps/gui/glade/mergenote.glade @@ -19,7 +19,7 @@ end - _Cancel + _Cancel False True True @@ -35,7 +35,7 @@ - _OK + _OK False True True @@ -51,7 +51,7 @@ - _Help + _Help False True True diff --git a/gramps/gui/glade/mergeperson.glade b/gramps/gui/glade/mergeperson.glade index 915d52610..95f5f631d 100644 --- a/gramps/gui/glade/mergeperson.glade +++ b/gramps/gui/glade/mergeperson.glade @@ -20,7 +20,7 @@ end - _Cancel + _Cancel False True True @@ -36,7 +36,7 @@ - _OK + _OK False True True @@ -52,7 +52,7 @@ - _Help + _Help False True True diff --git a/gramps/gui/glade/mergeplace.glade b/gramps/gui/glade/mergeplace.glade index 3037e3cab..91eb4be33 100644 --- a/gramps/gui/glade/mergeplace.glade +++ b/gramps/gui/glade/mergeplace.glade @@ -19,7 +19,7 @@ end - _Cancel + _Cancel True True True @@ -34,7 +34,7 @@ - _OK + _OK True True True @@ -49,7 +49,7 @@ - _Help + _Help True True True diff --git a/gramps/gui/glade/mergerepository.glade b/gramps/gui/glade/mergerepository.glade index 9253f36a4..f71d253a7 100644 --- a/gramps/gui/glade/mergerepository.glade +++ b/gramps/gui/glade/mergerepository.glade @@ -19,7 +19,7 @@ end - _Cancel + _Cancel False True True @@ -35,7 +35,7 @@ - _OK + _OK False True True @@ -51,7 +51,7 @@ - _Help + _Help False True True diff --git a/gramps/gui/glade/mergesource.glade b/gramps/gui/glade/mergesource.glade index 907ec9777..a154e4328 100644 --- a/gramps/gui/glade/mergesource.glade +++ b/gramps/gui/glade/mergesource.glade @@ -19,7 +19,7 @@ end - _Cancel + _Cancel False True True @@ -35,7 +35,7 @@ - _OK + _OK False True True @@ -51,7 +51,7 @@ - _Help + _Help False True True diff --git a/gramps/gui/glade/plugins.glade b/gramps/gui/glade/plugins.glade index fec0f1fee..95749ee0e 100644 --- a/gramps/gui/glade/plugins.glade +++ b/gramps/gui/glade/plugins.glade @@ -21,7 +21,7 @@ end - _Close + _Close False True True diff --git a/gramps/gui/glade/reorder.glade b/gramps/gui/glade/reorder.glade index 2eedc4c43..cad4cd6b0 100644 --- a/gramps/gui/glade/reorder.glade +++ b/gramps/gui/glade/reorder.glade @@ -21,7 +21,7 @@ end - _Cancel + _Cancel False True True @@ -37,7 +37,7 @@ - _OK + _OK False True True diff --git a/gramps/gui/glade/rule.glade b/gramps/gui/glade/rule.glade index 141281531..79b5fa979 100644 --- a/gramps/gui/glade/rule.glade +++ b/gramps/gui/glade/rule.glade @@ -23,7 +23,7 @@ end - _Close + _Close False True True @@ -40,7 +40,7 @@ - _Help + _Help False True True @@ -316,7 +316,7 @@ end - _Cancel + _Cancel False True True @@ -333,7 +333,7 @@ - _OK + _OK False True False @@ -351,7 +351,7 @@ - _Help + _Help False True True @@ -747,7 +747,7 @@ end - _Cancel + _Cancel False True True @@ -764,7 +764,7 @@ - _OK + _OK False True True @@ -781,7 +781,7 @@ - _Help + _Help False True True @@ -989,7 +989,7 @@ end - _Close + _Close False True True diff --git a/gramps/gui/glade/styleeditor.glade b/gramps/gui/glade/styleeditor.glade index c67bb1f0c..b18a29b89 100644 --- a/gramps/gui/glade/styleeditor.glade +++ b/gramps/gui/glade/styleeditor.glade @@ -83,7 +83,7 @@ end - _Cancel + _Cancel False True True @@ -100,7 +100,7 @@ - _OK + _OK False True True @@ -1724,7 +1724,7 @@ end - _Cancel + _Cancel False True True @@ -1740,7 +1740,7 @@ - _OK + _OK False True True diff --git a/gramps/gui/glade/tipofday.glade b/gramps/gui/glade/tipofday.glade index a0fb6ca65..5edf8c8b8 100644 --- a/gramps/gui/glade/tipofday.glade +++ b/gramps/gui/glade/tipofday.glade @@ -99,7 +99,7 @@ end - _Forward + _Forward True True True @@ -114,7 +114,7 @@ - _Close + _Close True True True diff --git a/gramps/gui/glade/updateaddons.glade b/gramps/gui/glade/updateaddons.glade index b1272c419..76d20fd44 100644 --- a/gramps/gui/glade/updateaddons.glade +++ b/gramps/gui/glade/updateaddons.glade @@ -23,7 +23,7 @@ start - _Close + _Close False True True From b8ffc8a77d2cb1d46b8b63e492df049261734b99 Mon Sep 17 00:00:00 2001 From: Doug Blank Date: Fri, 22 May 2015 14:25:40 -0400 Subject: [PATCH 10/10] Diff struct comparison, can be a list --- gramps/gen/merge/diff.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/gramps/gen/merge/diff.py b/gramps/gen/merge/diff.py index 67539a0bb..1152fac51 100644 --- a/gramps/gen/merge/diff.py +++ b/gramps/gen/merge/diff.py @@ -390,6 +390,12 @@ class Struct(object): def __eq__(self, other): if isinstance(other, Struct): return self.struct == other.struct + elif isinstance(self.struct, list): + ## FIXME: self.struct can be a dict, list, etc + for item in self.struct: + if item == other: + return True + return False else: return self.struct == other