From bf82cb6fb7731b0c14a42a01d0b20e9fb8a4bbf9 Mon Sep 17 00:00:00 2001 From: Alex Roitman Date: Wed, 11 Oct 2006 04:59:26 +0000 Subject: [PATCH] In .: 2006-10-10 Alex Roitman * NEWS: Update. * src/plugins/ExportVCalendar.py (get_option_box): Use custom filters. * src/plugins/ExportVCard.py (get_option_box): Use custom filters. * src/plugins/WriteFtree.py (get_option_box): Use custom filters. * src/plugins/WriteGeneWeb.py (get_option_box): Use custom filters. * src/Selectors/_BaseSelector.py: Import gettext. * src/ReportBase/_StyleEditor.py: Make style editor not modal * src/glade/gramps.glade: Make style editor not modal * src/GrampsLogger/_ErrorReportAssistant.py: Fix typo. * src/plugins/AncestorReport.py: Fix generation numbers. * src/GrampsLogger/_ErrorReportAssistant.py: Fix email client launch (#455) * src/plugins/Checkpoint.py: typo * src/docgen/RTFDoc.py: fix page breaks (#0000441) * src/plugins/Calendar.py: fix filter typo * src/plugins/WritePkg.py: don't set uid on Windows In po: 2006-10-10 Alex Roitman * POTFILES.in: Include all of Selectors package. * sk.po: Update translation. * lt.po: updated Lithuanian translation. svn: r7391 --- ChangeLog | 29 ++++++++++++++++++----------- NEWS | 11 +++++++---- po/ChangeLog | 7 +++++-- po/POTFILES.in | 10 ++++++---- src/Selectors/_BaseSelector.py | 8 +++++++- src/plugins/ExportVCalendar.py | 11 +++++++---- src/plugins/ExportVCard.py | 11 +++++++---- src/plugins/WriteFtree.py | 10 +++++++--- src/plugins/WriteGeneWeb.py | 10 +++++++--- 9 files changed, 71 insertions(+), 36 deletions(-) diff --git a/ChangeLog b/ChangeLog index ef5bac264..57da00d4b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2006-10-10 Alex Roitman + * NEWS: Update. + * src/plugins/ExportVCalendar.py (get_option_box): Use custom filters. + * src/plugins/ExportVCard.py (get_option_box): Use custom filters. + * src/plugins/WriteFtree.py (get_option_box): Use custom filters. + * src/plugins/WriteGeneWeb.py (get_option_box): Use custom filters. + * src/Selectors/_BaseSelector.py: Import gettext. + 2006-10-10 Don Allingham * src/gramps_main.py: use pngs for windows @@ -59,8 +67,6 @@ 2006-10-07 Alex Roitman * src/Editors/_EditSourceRef.py (_cleanup_on_exit): Factor out cleanup into its own method (as in the parent class). - FIXME: This needs to be fixed so that _cleanup_on_exit is not - run on OK, only on cancel. Maybe we need _clean_up_on_cancel() ? * src/DisplayTabs/_TextTab.py (cancel): Only reset text, not the whole source reference. * src/plugins/BookReport.py (BookList.parse): Catch ValueError @@ -136,11 +142,11 @@ * src/GrampsDb/_GrampsDbBase.py: add street column 2006-09-27 Brian Matherly - * src/ReportBase/_StyleEditor.py: Make style editor not modal - * src/glade/gramps.glade: Make style editor not modal + * src/ReportBase/_StyleEditor.py: Make style editor not modal + * src/glade/gramps.glade: Make style editor not modal 2006-09-26 Brian Matherly - * src/GrampsLogger/_ErrorReportAssistant.py: Fix typo. + * src/GrampsLogger/_ErrorReportAssistant.py: Fix typo. 2006-09-25 Don Allingham * src/ViewManager.py: fix message @@ -157,8 +163,9 @@ * src/QuestionDialog.py: Don't do internal check on value 2006-09-24 Brian Matherly - * src/plugins/AncestorReport.py: Fix generation numbers. - * src/GrampsLogger/_ErrorReportAssistant.py: Fix email client launch (#455) + * src/plugins/AncestorReport.py: Fix generation numbers. + * src/GrampsLogger/_ErrorReportAssistant.py: Fix email client + launch (#455) 2006-09-23 Don Allingham * src/images/sources.svg: new icon @@ -202,10 +209,10 @@ * src/glade/gramps.glade: place vs. address changes 2006-09-16 Brian Matherly - * src/plugins/Checkpoint.py: typo + * src/plugins/Checkpoint.py: typo 2006-09-12 Brian Matherly - * src/docgen/RTFDoc.py: fix page breaks (#0000441) + * src/docgen/RTFDoc.py: fix page breaks (#0000441) 2006-09-12 Don Allingham * src/DataViews/_RelationView.py: provide a waring if a broken @@ -261,8 +268,8 @@ * po/POTFILES.in: remove non-shipping modules 2006-09-01 Brian Matherly - * src/plugins/Calendar.py: fix filter typo - * src/plugins/WritePkg.py: don't set uid on Windows + * src/plugins/Calendar.py: fix filter typo + * src/plugins/WritePkg.py: don't set uid on Windows 2006-09-01 Alex Roitman * src/GrampsDb/_DbUtils.py: Use normal addition: this updates diff --git a/NEWS b/NEWS index c6dd02a9f..8005042a8 100644 --- a/NEWS +++ b/NEWS @@ -1,7 +1,10 @@ -Version 2.1.98 -- the "" release -* Czech relationship calculator (Zdenek Hatas) -* Bug fixes - +Version 2.2.0rc1 -- the "Help, Help! I'm being repressed!" release +* Address has county, Location has street now. +* Improved icons (James Leigh). +* DB transactions are adjusted by the user. +* Drag and Drop improvements. +* Czech relationship calculator (Zdenek Hatas). +* Bug fixes. Version 2.1.95 -- the "Listen! I can't give it to you now. It says, 'in the event of death'. Uh. Oh! Ah. Ah. Eh." release * Removal of StartupUp Dialog diff --git a/po/ChangeLog b/po/ChangeLog index 775aa75ac..ed502c413 100644 --- a/po/ChangeLog +++ b/po/ChangeLog @@ -1,14 +1,17 @@ +2006-10-10 Alex Roitman + * POTFILES.in: Include all of Selectors package. + 2006-10-09 Morten Bo Johansen * da.po: Translation update. 2006-10-04 Lubo Vasko - * po/sk.po: Update translation. + * sk.po: Update translation. 2006-10-03 Stefan Bjork * sv.po: Updated Swedish translation. 2006-09-30 Arturas Sleinius - * lt.po: updated Lithuanian translation. + * lt.po: updated Lithuanian translation. 2006-09-27 Stefan Bjork * sv.po: Updated Swedish translation (work in progess). diff --git a/po/POTFILES.in b/po/POTFILES.in index dd9bb6c5c..2068ed8ba 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -244,7 +244,9 @@ src/Mime/_PythonMime.py # src/ObjectSelector/_PersonTreeFrame.py # src/ObjectSelector/_PreviewFrameBase.py # src/ObjectSelector/_TreeFrameBase.py -# src/Selectors/_BaseSelector.py + +# Selectors package +src/Selectors/_BaseSelector.py src/Selectors/_SelectEvent.py src/Selectors/_SelectFamily.py src/Selectors/_SelectObject.py @@ -252,9 +254,9 @@ src/Selectors/_SelectPerson.py src/Selectors/_SelectPlace.py src/Selectors/_SelectRepository.py src/Selectors/_SelectSource.py -# src/Selectors/_SelectorExceptions.py -# src/Selectors/_SelectorFactory.py -# src/Selectors/__init__.py +src/Selectors/_SelectorExceptions.py +src/Selectors/_SelectorFactory.py +src/Selectors/__init__.py # plugins directory src/plugins/AncestorChart2.py diff --git a/src/Selectors/_BaseSelector.py b/src/Selectors/_BaseSelector.py index 7ccaaf250..dd81b5d61 100644 --- a/src/Selectors/_BaseSelector.py +++ b/src/Selectors/_BaseSelector.py @@ -20,11 +20,17 @@ # $Id$ +#------------------------------------------------------------------------- +# +# Python modules +# +#------------------------------------------------------------------------- +from gettext import gettext as _ try: set() except: from sets import Set as set - + #------------------------------------------------------------------------- # # GTK/Gnome modules diff --git a/src/plugins/ExportVCalendar.py b/src/plugins/ExportVCalendar.py index c61caed6b..442a5af6c 100644 --- a/src/plugins/ExportVCalendar.py +++ b/src/plugins/ExportVCalendar.py @@ -88,6 +88,8 @@ class CalendarWriterOptionBox: all.set_name(_("Entire Database")) all.add_rule(Rules.Person.Everyone([])) + the_filters = [all] + if self.person: des = GenericFilter() des.set_name(_("Descendants of %s") % @@ -107,10 +109,11 @@ class CalendarWriterOptionBox: com.add_rule(Rules.Person.HasCommonAncestorWith( [self.person.get_gramps_id()])) - self.filter_menu = build_filter_menu( - [all,des,ans,com]) - else: - self.filter_menu = build_filter_menu([all]) + the_filters += [all,des,ans,com] + + from Filters import CustomFilters + the_filters.extend(CustomFilters.get_filters('Person')) + self.filter_menu = build_filter_menu(the_filters) filter_obj.set_menu(self.filter_menu) the_box = self.topDialog.get_widget('vbox1') diff --git a/src/plugins/ExportVCard.py b/src/plugins/ExportVCard.py index a734a81d1..f339f3b06 100644 --- a/src/plugins/ExportVCard.py +++ b/src/plugins/ExportVCard.py @@ -86,6 +86,8 @@ class CardWriterOptionBox: all.set_name(_("Entire Database")) all.add_rule(Rules.Person.Everyone([])) + the_filters = [all] + if self.person: des = GenericFilter() des.set_name(_("Descendants of %s") % @@ -105,10 +107,11 @@ class CardWriterOptionBox: com.add_rule(Rules.Person.HasCommonAncestorWith( [self.person.get_gramps_id()])) - self.filter_menu = build_filter_menu( - [all,des,ans,com]) - else: - self.filter_menu = build_filter_menu([all]) + the_filers += [all,des,ans,com] + + from Filters import CustomFilters + the_filters.extend(CustomFilters.get_filters('Person')) + self.filter_menu = build_filter_menu(the_filters) filter_obj.set_menu(self.filter_menu) the_box = self.topDialog.get_widget('vbox1') diff --git a/src/plugins/WriteFtree.py b/src/plugins/WriteFtree.py index 3b01d1dc9..cfef2855a 100644 --- a/src/plugins/WriteFtree.py +++ b/src/plugins/WriteFtree.py @@ -89,6 +89,8 @@ class FtreeWriterOptionBox: all = GenericFilter() all.set_name(_("Entire Database")) all.add_rule(Rules.Person.Everyone([])) + + the_filters = [all] if self.person: des = GenericFilter() @@ -109,9 +111,11 @@ class FtreeWriterOptionBox: com.add_rule(Rules.Person.HasCommonAncestorWith( [self.person.get_gramps_id()])) - self.filter_menu = build_filter_menu([all,des,ans,com]) - else: - self.filter_menu = build_filter_menu([all]) + the_filters += [all,des,ans,com] + + from Filters import CustomFilters + the_filters.extend(CustomFilters.get_filters('Person')) + self.filter_menu = build_filter_menu(the_filters) filter_obj.set_menu(self.filter_menu) the_box = self.top.get_widget("vbox1") diff --git a/src/plugins/WriteGeneWeb.py b/src/plugins/WriteGeneWeb.py index d956d3035..b14961eaa 100644 --- a/src/plugins/WriteGeneWeb.py +++ b/src/plugins/WriteGeneWeb.py @@ -92,6 +92,8 @@ class GeneWebWriterOptionBox: all.set_name(_("Entire Database")) all.add_rule(Rules.Person.Everyone([])) + the_filters = [all] + if self.person: des = GenericFilter() des.set_name(_("Descendants of %s") % @@ -111,9 +113,11 @@ class GeneWebWriterOptionBox: com.add_rule(Rules.Person.HasCommonAncestorWith( [self.person.get_gramps_id()])) - self.filter_menu = build_filter_menu([all,des,ans,com]) - else: - self.filter_menu = build_filter_menu([all]) + the_filters += [all,des,ans,com] + + from Filters import CustomFilters + the_filters.extend(CustomFilters.get_filters('Person')) + self.filter_menu = build_filter_menu(the_filters) filter_obj.set_menu(self.filter_menu) the_box = self.topDialog.get_widget('vbox1')