diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog index 96c4cb8eb..6beeb775f 100644 --- a/gramps2/ChangeLog +++ b/gramps2/ChangeLog @@ -2,7 +2,8 @@ * src/DbPrompter.py: add callback for progressbar * src/GrampsXMLDB.py: pass callback task * src/ReadXML.py: handle progress callback, fix placeobj error - * src/gramps_main.py: define progress bar callback + * src/gramps_main.py: define progress bar callback, remove problem + filters 2005-05-10 Eero Tamminen * src/plugins/StatisticsChart.po: add gettext _() to three strings diff --git a/gramps2/configure.in b/gramps2/configure.in index 04b3d6d0e..ebfffa9f1 100644 --- a/gramps2/configure.in +++ b/gramps2/configure.in @@ -4,11 +4,11 @@ dnl Process this file with autoconf to produce a configure script. dnl May need to run automake && aclocal first AC_PREREQ(2.57) -AC_INIT(gramps, 1.1.99pre2, gramps-bugs@lists.sourceforge.net) +AC_INIT(gramps, 2.0.0, gramps-bugs@lists.sourceforge.net) AC_CONFIG_SRCDIR(src/gramps.py) AM_INIT_AUTOMAKE(1.6.3) -RELEASE=0.CVS$(head -c 10 ${srcdir}/ChangeLog | tr -d '-') -dnl RELEASE=1 +dnl RELEASE=0.CVS$(head -c 10 ${srcdir}/ChangeLog | tr -d '-') +RELEASE=1 VERSIONSTRING=$VERSION if test x"$RELEASE" != "x" diff --git a/gramps2/src/gramps_main.py b/gramps2/src/gramps_main.py index e1d0a3c26..ce45f960d 100755 --- a/gramps2/src/gramps_main.py +++ b/gramps2/src/gramps_main.py @@ -1033,15 +1033,15 @@ class Gramps(GrampsDBCallback.GrampsDBCallback): all.add_rule(GenericFilter.IsWitness([])) filter_list.append(all) - all = GenericFilter.ParamFilter() - all.set_name(_("Any textual record contains...")) - all.add_rule(GenericFilter.HasTextMatchingSubstringOf([])) - filter_list.append(all) +# all = GenericFilter.ParamFilter() +# all.set_name(_("Any textual record contains...")) +# all.add_rule(GenericFilter.HasTextMatchingSubstringOf([])) +# filter_list.append(all) - all = GenericFilter.ParamFilter() - all.set_name(_("Any textual record matches regular expression...")) - all.add_rule(GenericFilter.HasTextMatchingRegexpOf([])) - filter_list.append(all) +# all = GenericFilter.ParamFilter() +# all.set_name(_("Any textual record matches regular expression...")) +# all.add_rule(GenericFilter.HasTextMatchingRegexpOf([])) +# filter_list.append(all) self.filter_model = GenericFilter.FilterStore(filter_list) self.filter_list.set_model(self.filter_model)