2007-06-16 Alex Roitman <shura@gramps-project.org>

* src/Filters/Rules/Person/_IsChildOfFilterMatch.py
	(IsChildOfFilterMatch): Subclass MatchesFilter.
	* src/Filters/Rules/Person/_IsAncestorOfFilterMatch.py
	(IsAncestorOfFilterMatch): Subclass MatchesFilter.
	* src/Filters/Rules/Person/_IsDescendantOfFilterMatch.py
	(IsDescendantOfFilterMatch): Subclass MatchesFilter.
	* src/Filters/Rules/Person/_HasCommonAncestorWithFilterMatch.py
	(HasCommonAncestorWithFilterMatch): Subclass MatchesFilter.
	* src/Filters/Rules/Person/_IsParentOfFilterMatch.py
	(IsParentOfFilterMatch): Subclass MatchesFilter.
	* src/Filters/Rules/Person/_IsSiblingOfFilterMatch.py
	(IsSiblingOfFilterMatch): Subclass MatchesFilter.
	* src/Filters/Rules/Person/_IsSpouseOfFilterMatch.py
	(IsSpouseOfFilterMatch): Subclass MatchesFilter.



svn: r8559
This commit is contained in:
Alex Roitman 2007-06-16 19:52:58 +00:00
parent 95c6802e89
commit b7b163a0a7
9 changed files with 32 additions and 19 deletions

View File

@ -1,3 +1,19 @@
2007-06-16 Alex Roitman <shura@gramps-project.org>
* src/Filters/Rules/Person/_IsChildOfFilterMatch.py
(IsChildOfFilterMatch): Subclass MatchesFilter.
* src/Filters/Rules/Person/_IsAncestorOfFilterMatch.py
(IsAncestorOfFilterMatch): Subclass MatchesFilter.
* src/Filters/Rules/Person/_IsDescendantOfFilterMatch.py
(IsDescendantOfFilterMatch): Subclass MatchesFilter.
* src/Filters/Rules/Person/_HasCommonAncestorWithFilterMatch.py
(HasCommonAncestorWithFilterMatch): Subclass MatchesFilter.
* src/Filters/Rules/Person/_IsParentOfFilterMatch.py
(IsParentOfFilterMatch): Subclass MatchesFilter.
* src/Filters/Rules/Person/_IsSiblingOfFilterMatch.py
(IsSiblingOfFilterMatch): Subclass MatchesFilter.
* src/Filters/Rules/Person/_IsSpouseOfFilterMatch.py
(IsSpouseOfFilterMatch): Subclass MatchesFilter.
2007-06-14 Brian Matherly <brian@gramps-project.org>
* src/docgen/SvgDrawDoc.py: improve text rendering (#0001072)

View File

@ -209,7 +209,7 @@ class FilterEditor(ManagedWindow.ManagedWindow):
"""
This method recursively calls itself to delete all dependent filters
before removing this filter. Otherwise when A is 'matches B'
and C is 'matches D' the removal of A leads to two broken filter
and C is 'matches D' the removal of D leads to two broken filter
being left behind.
"""
filters = self.filterdb.get_filters(space)
@ -220,6 +220,7 @@ class FilterEditor(ManagedWindow.ManagedWindow):
if issubclass(rule.__class__,MatchesFilterBase) \
and (name in values):
self._do_delete_filter(space,the_filter)
break
filters.remove(gfilter)
def get_all_handles(self):

View File

@ -1,7 +1,7 @@
#
# Gramps - a GTK+/GNOME based genealogy program
#
# Copyright (C) 2002-2006 Donald N. Allingham
# Copyright (C) 2002-2007 Donald N. Allingham
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@ -41,7 +41,7 @@ from _MatchesFilter import MatchesFilter
# HasCommonAncestorWithFilterMatch
#
#-------------------------------------------------------------------------
class HasCommonAncestorWithFilterMatch(HasCommonAncestorWith):
class HasCommonAncestorWithFilterMatch(HasCommonAncestorWith,MatchesFilter):
"""Rule that checks for a person that has a common ancestor with
someone matching a filter"""

View File

@ -1,7 +1,7 @@
#
# Gramps - a GTK+/GNOME based genealogy program
#
# Copyright (C) 2002-2006 Donald N. Allingham
# Copyright (C) 2002-2007 Donald N. Allingham
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@ -40,7 +40,7 @@ from _MatchesFilter import MatchesFilter
# IsAncestorOfFilterMatch
#
#-------------------------------------------------------------------------
class IsAncestorOfFilterMatch(IsAncestorOf):
class IsAncestorOfFilterMatch(IsAncestorOf,MatchesFilter):
"""Rule that checks for a person that is an ancestor of
someone matched by a filter"""

View File

@ -1,7 +1,7 @@
#
# Gramps - a GTK+/GNOME based genealogy program
#
# Copyright (C) 2002-2006 Donald N. Allingham
# Copyright (C) 2002-2007 Donald N. Allingham
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@ -32,7 +32,6 @@ from gettext import gettext as _
# GRAMPS modules
#
#-------------------------------------------------------------------------
from Filters.Rules._Rule import Rule
from _MatchesFilter import MatchesFilter
#-------------------------------------------------------------------------
@ -40,7 +39,7 @@ from _MatchesFilter import MatchesFilter
# IsChildOfFilterMatch
#
#-------------------------------------------------------------------------
class IsChildOfFilterMatch(Rule):
class IsChildOfFilterMatch(MatchesFilter):
"""Rule that checks for a person that is a child
of someone matched by a filter"""

View File

@ -1,7 +1,7 @@
#
# Gramps - a GTK+/GNOME based genealogy program
#
# Copyright (C) 2002-2006 Donald N. Allingham
# Copyright (C) 2002-2007 Donald N. Allingham
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@ -40,7 +40,7 @@ from _MatchesFilter import MatchesFilter
# IsDescendantOfFilterMatch
#
#-------------------------------------------------------------------------
class IsDescendantOfFilterMatch(IsDescendantOf):
class IsDescendantOfFilterMatch(IsDescendantOf,MatchesFilter):
"""Rule that checks for a person that is a descendant
of someone matched by a filter"""

View File

@ -1,7 +1,7 @@
#
# Gramps - a GTK+/GNOME based genealogy program
#
# Copyright (C) 2002-2006 Donald N. Allingham
# Copyright (C) 2002-2007 Donald N. Allingham
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@ -32,7 +32,6 @@ from gettext import gettext as _
# GRAMPS modules
#
#-------------------------------------------------------------------------
from Filters.Rules._Rule import Rule
from _MatchesFilter import MatchesFilter
#-------------------------------------------------------------------------
@ -40,7 +39,7 @@ from _MatchesFilter import MatchesFilter
# IsParentOfFilterMatch
#
#-------------------------------------------------------------------------
class IsParentOfFilterMatch(Rule):
class IsParentOfFilterMatch(MatchesFilter):
"""Rule that checks for a person that is a parent
of someone matched by a filter"""

View File

@ -1,7 +1,7 @@
#
# Gramps - a GTK+/GNOME based genealogy program
#
# Copyright (C) 2002-2006 Donald N. Allingham
# Copyright (C) 2002-2007 Donald N. Allingham
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@ -32,7 +32,6 @@ from gettext import gettext as _
# GRAMPS modules
#
#-------------------------------------------------------------------------
from Filters.Rules._Rule import Rule
from _MatchesFilter import MatchesFilter
#-------------------------------------------------------------------------
@ -40,7 +39,7 @@ from _MatchesFilter import MatchesFilter
# IsSiblingOfFilterMatch
#
#-------------------------------------------------------------------------
class IsSiblingOfFilterMatch(Rule):
class IsSiblingOfFilterMatch(MatchesFilter):
"""Rule that checks for siblings of someone matched by a filter"""
labels = [ _('Filter name:') ]

View File

@ -1,7 +1,7 @@
#
# Gramps - a GTK+/GNOME based genealogy program
#
# Copyright (C) 2002-2006 Donald N. Allingham
# Copyright (C) 2002-2007 Donald N. Allingham
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@ -32,7 +32,6 @@ from gettext import gettext as _
# GRAMPS modules
#
#-------------------------------------------------------------------------
from Filters.Rules._Rule import Rule
from _MatchesFilter import MatchesFilter
#-------------------------------------------------------------------------
@ -40,7 +39,7 @@ from _MatchesFilter import MatchesFilter
# IsSpouseOfFilterMatch
#
#-------------------------------------------------------------------------
class IsSpouseOfFilterMatch(Rule):
class IsSpouseOfFilterMatch(MatchesFilter):
"""Rule that checks for a person married to someone matching
a filter"""