From 2eb73956917011ee007aebc649d03646052ba232 Mon Sep 17 00:00:00 2001 From: Alex Roitman Date: Fri, 4 Aug 2006 19:36:18 +0000 Subject: [PATCH] In .: 2006-08-04 Alex Roitman * src/DataViews/_MediaView.py (row_change): Work around older pygtk. * src/Filters/Rules/Family/Makefile.am (pkgdata_PYTHON): Ship new files. * src/Filters/Rules/Makefile.am (pkgdata_PYTHON): Ship new file. In po: 2006-08-04 Alex Roitman * POTFILES.in: Unlist plugins that are not shipped. svn: r7120 --- gramps2/ChangeLog | 6 ++++++ gramps2/po/ChangeLog | 3 +++ gramps2/po/POTFILES.in | 6 ------ gramps2/src/DataViews/_MediaView.py | 7 ++++++- gramps2/src/Filters/Rules/Family/Makefile.am | 10 +++++++++- gramps2/src/Filters/Rules/Makefile.am | 3 ++- 6 files changed, 26 insertions(+), 9 deletions(-) diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog index d867e6f4e..f980970bc 100644 --- a/gramps2/ChangeLog +++ b/gramps2/ChangeLog @@ -1,3 +1,9 @@ +2006-08-04 Alex Roitman + * src/DataViews/_MediaView.py (row_change): Work around older pygtk. + * src/Filters/Rules/Family/Makefile.am (pkgdata_PYTHON): Ship new + files. + * src/Filters/Rules/Makefile.am (pkgdata_PYTHON): Ship new file. + 2006-08-04 Zsolt Foldvari * src/DataViews/_PersonView.py (__init__): connection to "active- person-changed" signal moved to set_active() diff --git a/gramps2/po/ChangeLog b/gramps2/po/ChangeLog index 350dc4403..e7ed1cf25 100644 --- a/gramps2/po/ChangeLog +++ b/gramps2/po/ChangeLog @@ -1,3 +1,6 @@ +2006-08-04 Alex Roitman + * POTFILES.in: Unlist plugins that are not shipped. + 2006-08-03 Alex Roitman * POTFILES.in: Add new files. diff --git a/gramps2/po/POTFILES.in b/gramps2/po/POTFILES.in index 3903b636d..b8ac5ab5e 100644 --- a/gramps2/po/POTFILES.in +++ b/gramps2/po/POTFILES.in @@ -230,9 +230,7 @@ src/Selectors/_SelectorExceptions.py src/Selectors/_SelectorFactory.py src/Selectors/__init__.py src/plugins/AncestorChart2.py -src/plugins/AncestorChart.py src/plugins/AncestorReport.py -src/plugins/Ancestors.py src/plugins/BookReport.py src/plugins/Calendar.py src/plugins/ChangeNames.py @@ -244,7 +242,6 @@ src/plugins/CustomBookText.py src/plugins/Desbrowser.py src/plugins/DescendChart.py src/plugins/DescendReport.py -src/plugins/DesGraph.py src/plugins/DetAncestralReport.py src/plugins/DetDescendantReport.py src/plugins/Eval.py @@ -253,13 +250,10 @@ src/plugins/ExportVCalendar.py src/plugins/ExportVCard.py src/plugins/FamilyGroup.py src/plugins/FanChart.py -src/plugins/FtmStyleAncestors.py -src/plugins/FtmStyleDescendants.py src/plugins/GraphViz.py src/plugins/ImportGeneWeb.py src/plugins/ImportvCard.py src/plugins/IndivComplete.py -src/plugins/IndivSummary.py src/plugins/Leak.py src/plugins/FindDupes.py src/plugins/NarrativeWeb.py diff --git a/gramps2/src/DataViews/_MediaView.py b/gramps2/src/DataViews/_MediaView.py index 11b346e26..2ddcf6bfb 100644 --- a/gramps2/src/DataViews/_MediaView.py +++ b/gramps2/src/DataViews/_MediaView.py @@ -130,7 +130,12 @@ class MediaView(PageView.ListView): def row_change(self,obj): handle = self.first_selected() if not handle: - self.image.clear() + try: + self.image.clear() + except AttributeError: + # Working around the older pygtk + # that lacks clear() method for gtk.Image() + self.image.set_from_file(None) else: obj = self.dbstate.db.get_object_from_handle(handle) pix = ImgManip.get_thumbnail_image(obj.get_path()) diff --git a/gramps2/src/Filters/Rules/Family/Makefile.am b/gramps2/src/Filters/Rules/Family/Makefile.am index 663bbda99..95b5e2b8e 100644 --- a/gramps2/src/Filters/Rules/Family/Makefile.am +++ b/gramps2/src/Filters/Rules/Family/Makefile.am @@ -11,7 +11,15 @@ pkgdata_PYTHON = \ _HasNoteRegexp.py\ _HasRelType.py\ __init__.py\ - _RegExpIdOf.py + _RegExpIdOf.py\ + _MatchesFilter.py\ + _FatherHasNameOf.py\ + _FatherHasIdOf.py\ + _MotherHasNameOf.py\ + _MotherHasIdOf.py\ + _ChildHasNameOf.py\ + _ChildHasIdOf.py + pkgpyexecdir = @pkgpyexecdir@/Filters/Rules/Family pkgpythondir = @pkgpythondir@/Filters/Rules/Family diff --git a/gramps2/src/Filters/Rules/Makefile.am b/gramps2/src/Filters/Rules/Makefile.am index 6bd8f8edd..5ae1622db 100644 --- a/gramps2/src/Filters/Rules/Makefile.am +++ b/gramps2/src/Filters/Rules/Makefile.am @@ -16,7 +16,8 @@ pkgdata_PYTHON = \ _IsPrivate.py\ _RegExpIdBase.py\ _Rule.py\ - _RuleUtils.py + _RuleUtils.py\ + _MatchesFilterBase.py pkgpyexecdir = @pkgpyexecdir@/Filters/Rules pkgpythondir = @pkgpythondir@/Filters/Rules