Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
* 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: r8560
This commit is contained in:
Alex Roitman
2007-06-16 20:03:59 +00:00
parent e9860079c3
commit 5c5921d9ea
9 changed files with 32 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
ChangeLog
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-15 Don Allingham <don@gramps-project.org> 2007-06-15 Don Allingham <don@gramps-project.org>
* src/GrampsDbUtils/_Backup.py: Optimization and documentation. * src/GrampsDbUtils/_Backup.py: Optimization and documentation.

3
src/FilterEditor/_FilterEditor.py
View File

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

4
src/Filters/Rules/Person/_HasCommonAncestorWithFilterMatch.py
View File

@@ -1,7 +1,7 @@
# #
# Gramps - a GTK+/GNOME based genealogy program # 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 # 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 # it under the terms of the GNU General Public License as published by
@@ -41,7 +41,7 @@ from _MatchesFilter import MatchesFilter
# HasCommonAncestorWithFilterMatch # HasCommonAncestorWithFilterMatch
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
class HasCommonAncestorWithFilterMatch(HasCommonAncestorWith): class HasCommonAncestorWithFilterMatch(HasCommonAncestorWith,MatchesFilter):
"""Rule that checks for a person that has a common ancestor with """Rule that checks for a person that has a common ancestor with
someone matching a filter""" someone matching a filter"""

4
src/Filters/Rules/Person/_IsAncestorOfFilterMatch.py
View File

@@ -1,7 +1,7 @@
# #
# Gramps - a GTK+/GNOME based genealogy program # 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 # 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 # it under the terms of the GNU General Public License as published by
@@ -40,7 +40,7 @@ from _MatchesFilter import MatchesFilter
# IsAncestorOfFilterMatch # IsAncestorOfFilterMatch
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
class IsAncestorOfFilterMatch(IsAncestorOf): class IsAncestorOfFilterMatch(IsAncestorOf,MatchesFilter):
"""Rule that checks for a person that is an ancestor of """Rule that checks for a person that is an ancestor of
someone matched by a filter""" someone matched by a filter"""

5
src/Filters/Rules/Person/_IsChildOfFilterMatch.py
View File

@@ -1,7 +1,7 @@
# #
# Gramps - a GTK+/GNOME based genealogy program # 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 # 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 # it under the terms of the GNU General Public License as published by
@@ -32,7 +32,6 @@ from gettext import gettext as _
# GRAMPS modules # GRAMPS modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from Filters.Rules._Rule import Rule
from _MatchesFilter import MatchesFilter from _MatchesFilter import MatchesFilter
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
@@ -40,7 +39,7 @@ from _MatchesFilter import MatchesFilter
# IsChildOfFilterMatch # IsChildOfFilterMatch
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
class IsChildOfFilterMatch(Rule): class IsChildOfFilterMatch(MatchesFilter):
"""Rule that checks for a person that is a child """Rule that checks for a person that is a child
of someone matched by a filter""" of someone matched by a filter"""

4
src/Filters/Rules/Person/_IsDescendantOfFilterMatch.py
View File

@@ -1,7 +1,7 @@
# #
# Gramps - a GTK+/GNOME based genealogy program # 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 # 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 # it under the terms of the GNU General Public License as published by
@@ -40,7 +40,7 @@ from _MatchesFilter import MatchesFilter
# IsDescendantOfFilterMatch # IsDescendantOfFilterMatch
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
class IsDescendantOfFilterMatch(IsDescendantOf): class IsDescendantOfFilterMatch(IsDescendantOf,MatchesFilter):
"""Rule that checks for a person that is a descendant """Rule that checks for a person that is a descendant
of someone matched by a filter""" of someone matched by a filter"""

5
src/Filters/Rules/Person/_IsParentOfFilterMatch.py
View File

@@ -1,7 +1,7 @@
# #
# Gramps - a GTK+/GNOME based genealogy program # 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 # 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 # it under the terms of the GNU General Public License as published by
@@ -32,7 +32,6 @@ from gettext import gettext as _
# GRAMPS modules # GRAMPS modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from Filters.Rules._Rule import Rule
from _MatchesFilter import MatchesFilter from _MatchesFilter import MatchesFilter
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
@@ -40,7 +39,7 @@ from _MatchesFilter import MatchesFilter
# IsParentOfFilterMatch # IsParentOfFilterMatch
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
class IsParentOfFilterMatch(Rule): class IsParentOfFilterMatch(MatchesFilter):
"""Rule that checks for a person that is a parent """Rule that checks for a person that is a parent
of someone matched by a filter""" of someone matched by a filter"""

5
src/Filters/Rules/Person/_IsSiblingOfFilterMatch.py
View File

@@ -1,7 +1,7 @@
# #
# Gramps - a GTK+/GNOME based genealogy program # 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 # 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 # it under the terms of the GNU General Public License as published by
@@ -32,7 +32,6 @@ from gettext import gettext as _
# GRAMPS modules # GRAMPS modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from Filters.Rules._Rule import Rule
from _MatchesFilter import MatchesFilter from _MatchesFilter import MatchesFilter
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
@@ -40,7 +39,7 @@ from _MatchesFilter import MatchesFilter
# IsSiblingOfFilterMatch # IsSiblingOfFilterMatch
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
class IsSiblingOfFilterMatch(Rule): class IsSiblingOfFilterMatch(MatchesFilter):
"""Rule that checks for siblings of someone matched by a filter""" """Rule that checks for siblings of someone matched by a filter"""
labels = [ _('Filter name:') ] labels = [ _('Filter name:') ]

5
src/Filters/Rules/Person/_IsSpouseOfFilterMatch.py
View File

@@ -1,7 +1,7 @@
# #
# Gramps - a GTK+/GNOME based genealogy program # 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 # 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 # it under the terms of the GNU General Public License as published by
@@ -32,7 +32,6 @@ from gettext import gettext as _
# GRAMPS modules # GRAMPS modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from Filters.Rules._Rule import Rule
from _MatchesFilter import MatchesFilter from _MatchesFilter import MatchesFilter
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
@@ -40,7 +39,7 @@ from _MatchesFilter import MatchesFilter
# IsSpouseOfFilterMatch # IsSpouseOfFilterMatch
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
class IsSpouseOfFilterMatch(Rule): class IsSpouseOfFilterMatch(MatchesFilter):
"""Rule that checks for a person married to someone matching """Rule that checks for a person married to someone matching
a filter""" a filter"""