GEPS008: Re-structure filter files

svn: r19638
This commit is contained in:
Nick Hall
2012-05-24 17:24:47 +00:00
parent fe01467480
commit a2825098ec
319 changed files with 926 additions and 868 deletions

View File

@ -97,6 +97,17 @@ src/cli/plug/Makefile
src/gen/Makefile src/gen/Makefile
src/gen/db/Makefile src/gen/db/Makefile
src/gen/display/Makefile src/gen/display/Makefile
src/gen/filters/Makefile
src/gen/filters/rules/Makefile
src/gen/filters/rules/person/Makefile
src/gen/filters/rules/family/Makefile
src/gen/filters/rules/event/Makefile
src/gen/filters/rules/source/Makefile
src/gen/filters/rules/place/Makefile
src/gen/filters/rules/media/Makefile
src/gen/filters/rules/repository/Makefile
src/gen/filters/rules/note/Makefile
src/gen/filters/rules/citation/Makefile
src/gen/lib/Makefile src/gen/lib/Makefile
src/gen/mime/Makefile src/gen/mime/Makefile
src/gen/plug/Makefile src/gen/plug/Makefile
@ -109,6 +120,8 @@ src/gen/utils/Makefile
src/gui/Makefile src/gui/Makefile
src/gui/editors/Makefile src/gui/editors/Makefile
src/gui/editors/displaytabs/Makefile src/gui/editors/displaytabs/Makefile
src/gui/filters/Makefile
src/gui/filters/sidebar/Makefile
src/gui/plug/Makefile src/gui/plug/Makefile
src/gui/plug/report/Makefile src/gui/plug/report/Makefile
src/gui/selectors/Makefile src/gui/selectors/Makefile
@ -118,18 +131,6 @@ src/gui/widgets/Makefile
src/GrampsLogger/Makefile src/GrampsLogger/Makefile
src/Merge/Makefile src/Merge/Makefile
src/docgen/Makefile src/docgen/Makefile
src/Filters/Makefile
src/Filters/Rules/Makefile
src/Filters/Rules/Person/Makefile
src/Filters/Rules/Family/Makefile
src/Filters/Rules/Event/Makefile
src/Filters/Rules/Source/Makefile
src/Filters/Rules/Place/Makefile
src/Filters/Rules/MediaObject/Makefile
src/Filters/Rules/Repository/Makefile
src/Filters/Rules/Note/Makefile
src/Filters/Rules/Citation/Makefile
src/Filters/SideBar/Makefile
src/Simple/Makefile src/Simple/Makefile
src/GrampsLocale/Makefile src/GrampsLocale/Makefile
src/plugins/Makefile src/plugins/Makefile

View File

@ -40,6 +40,241 @@ src/gen/db/upgrade.py
# gen display API # gen display API
src/gen/display/name.py src/gen/display/name.py
# gen.filters package
src/gen/filters/_FilterParser.py
# gen.filters.rules package
src/gen/filters/rules/_Everything.py
src/gen/filters/rules/_HasGrampsId.py
src/gen/filters/rules/_HasTextMatchingSubstringOf.py
src/gen/filters/rules/_IsPrivate.py
src/gen/filters/rules/_Rule.py
# gen.filters.rules.person package
src/gen/filters/rules/person/_ChangedSince.py
src/gen/filters/rules/person/_DeepRelationshipPathBetween.py
src/gen/filters/rules/person/_Disconnected.py
src/gen/filters/rules/person/_Everyone.py
src/gen/filters/rules/person/_FamilyWithIncompleteEvent.py
src/gen/filters/rules/person/_HasAddress.py
src/gen/filters/rules/person/_HasAlternateName.py
src/gen/filters/rules/person/_HasAssociation.py
src/gen/filters/rules/person/_HasAttribute.py
src/gen/filters/rules/person/_HasBirth.py
src/gen/filters/rules/person/_HasCitation.py
src/gen/filters/rules/person/_HasCommonAncestorWithFilterMatch.py
src/gen/filters/rules/person/_HasCommonAncestorWith.py
src/gen/filters/rules/person/_HasDeath.py
src/gen/filters/rules/person/_HasEvent.py
src/gen/filters/rules/person/_HasFamilyAttribute.py
src/gen/filters/rules/person/_HasFamilyEvent.py
src/gen/filters/rules/person/_HasGallery.py
src/gen/filters/rules/person/_HasIdOf.py
src/gen/filters/rules/person/_HasLDS.py
src/gen/filters/rules/person/_HasNameOf.py
src/gen/filters/rules/person/_HasNameOriginType.py
src/gen/filters/rules/person/_HasNameType.py
src/gen/filters/rules/person/_HasNickname.py
src/gen/filters/rules/person/_HasNote.py
src/gen/filters/rules/person/_HasNoteMatchingSubstringOf.py
src/gen/filters/rules/person/_HasNoteRegexp.py
src/gen/filters/rules/person/_HasRelationship.py
src/gen/filters/rules/person/_HasSourceCount.py
src/gen/filters/rules/person/_HasSourceOf.py
src/gen/filters/rules/person/_HasTag.py
src/gen/filters/rules/person/_HasTextMatchingSubstringOf.py
src/gen/filters/rules/person/_HasUnknownGender.py
src/gen/filters/rules/person/_HaveAltFamilies.py
src/gen/filters/rules/person/_HaveChildren.py
src/gen/filters/rules/person/_IncompleteNames.py
src/gen/filters/rules/person/_IsAncestorOfFilterMatch.py
src/gen/filters/rules/person/_IsAncestorOf.py
src/gen/filters/rules/person/_IsBookmarked.py
src/gen/filters/rules/person/_IsChildOfFilterMatch.py
src/gen/filters/rules/person/_IsDescendantFamilyOfFilterMatch.py
src/gen/filters/rules/person/_IsDefaultPerson.py
src/gen/filters/rules/person/_IsDescendantFamilyOf.py
src/gen/filters/rules/person/_IsDescendantOfFilterMatch.py
src/gen/filters/rules/person/_IsDescendantOf.py
src/gen/filters/rules/person/_IsDuplicatedAncestorOf.py
src/gen/filters/rules/person/_IsFemale.py
src/gen/filters/rules/person/_IsLessThanNthGenerationAncestorOfBookmarked.py
src/gen/filters/rules/person/_IsLessThanNthGenerationAncestorOfDefaultPerson.py
src/gen/filters/rules/person/_IsLessThanNthGenerationAncestorOf.py
src/gen/filters/rules/person/_IsLessThanNthGenerationDescendantOf.py
src/gen/filters/rules/person/_IsMale.py
src/gen/filters/rules/person/_IsMoreThanNthGenerationAncestorOf.py
src/gen/filters/rules/person/_IsMoreThanNthGenerationDescendantOf.py
src/gen/filters/rules/person/_IsParentOfFilterMatch.py
src/gen/filters/rules/person/_PeoplePublic.py
src/gen/filters/rules/person/_IsRelatedWith.py
src/gen/filters/rules/person/_IsSiblingOfFilterMatch.py
src/gen/filters/rules/person/_IsSpouseOfFilterMatch.py
src/gen/filters/rules/person/_IsWitness.py
src/gen/filters/rules/person/_MatchesEventFilter.py
src/gen/filters/rules/person/_MatchesFilter.py
src/gen/filters/rules/person/_MatchesSourceConfidence.py
src/gen/filters/rules/person/_MatchIdOf.py
src/gen/filters/rules/person/_MissingParent.py
src/gen/filters/rules/person/_MultipleMarriages.py
src/gen/filters/rules/person/_NeverMarried.py
src/gen/filters/rules/person/_NoBirthdate.py
src/gen/filters/rules/person/_NoDeathdate.py
src/gen/filters/rules/person/_PeoplePrivate.py
src/gen/filters/rules/person/_PersonWithIncompleteEvent.py
src/gen/filters/rules/person/_ProbablyAlive.py
src/gen/filters/rules/person/_RegExpIdOf.py
src/gen/filters/rules/person/_RegExpName.py
src/gen/filters/rules/person/_RelationshipPathBetween.py
src/gen/filters/rules/person/_RelationshipPathBetweenBookmarks.py
src/gen/filters/rules/person/_SearchName.py
# gen.filters.rules.family package
src/gen/filters/rules/family/_AllFamilies.py
src/gen/filters/rules/family/_ChangedSince.py
src/gen/filters/rules/family/_ChildHasIdOf.py
src/gen/filters/rules/family/_ChildHasNameOf.py
src/gen/filters/rules/family/_FamilyPrivate.py
src/gen/filters/rules/family/_FatherHasIdOf.py
src/gen/filters/rules/family/_FatherHasNameOf.py
src/gen/filters/rules/family/_HasAttribute.py
src/gen/filters/rules/family/_HasCitation.py
src/gen/filters/rules/family/_HasEvent.py
src/gen/filters/rules/family/_HasGallery.py
src/gen/filters/rules/family/_HasIdOf.py
src/gen/filters/rules/family/_HasLDS.py
src/gen/filters/rules/family/_HasNote.py
src/gen/filters/rules/family/_HasNoteMatchingSubstringOf.py
src/gen/filters/rules/family/_HasNoteRegexp.py
src/gen/filters/rules/family/_HasReferenceCountOf.py
src/gen/filters/rules/family/_HasRelType.py
src/gen/filters/rules/family/_HasSourceCount.py
src/gen/filters/rules/family/_HasTag.py
src/gen/filters/rules/family/_IsBookmarked.py
src/gen/filters/rules/family/_MatchesFilter.py
src/gen/filters/rules/family/_MatchesSourceConfidence.py
src/gen/filters/rules/family/_MotherHasIdOf.py
src/gen/filters/rules/family/_MotherHasNameOf.py
src/gen/filters/rules/family/_SearchFatherName.py
src/gen/filters/rules/family/_SearchChildName.py
src/gen/filters/rules/family/_SearchMotherName.py
src/gen/filters/rules/family/_RegExpFatherName.py
src/gen/filters/rules/family/_RegExpMotherName.py
src/gen/filters/rules/family/_RegExpChildName.py
src/gen/filters/rules/family/_RegExpIdOf.py
# gen.filters.rules.event package
src/gen/filters/rules/event/_AllEvents.py
src/gen/filters/rules/event/_ChangedSince.py
src/gen/filters/rules/event/_EventPrivate.py
src/gen/filters/rules/event/_HasAttribute.py
src/gen/filters/rules/event/_HasCitation.py
src/gen/filters/rules/event/_HasData.py
src/gen/filters/rules/event/_HasGallery.py
src/gen/filters/rules/event/_HasIdOf.py
src/gen/filters/rules/event/_HasNote.py
src/gen/filters/rules/event/_HasNoteMatchingSubstringOf.py
src/gen/filters/rules/event/_HasNoteRegexp.py
src/gen/filters/rules/event/_HasReferenceCountOf.py
src/gen/filters/rules/event/_HasSourceCount.py
src/gen/filters/rules/event/_HasType.py
src/gen/filters/rules/event/_MatchesFilter.py
src/gen/filters/rules/event/_MatchesPersonFilter.py
src/gen/filters/rules/event/_MatchesSourceFilter.py
src/gen/filters/rules/event/_MatchesSourceConfidence.py
src/gen/filters/rules/event/_RegExpIdOf.py
# gen.filters.rules.place package
src/gen/filters/rules/place/_AllPlaces.py
src/gen/filters/rules/place/_ChangedSince.py
src/gen/filters/rules/place/_HasGallery.py
src/gen/filters/rules/place/_HasIdOf.py
src/gen/filters/rules/place/_HasNoLatOrLon.py
src/gen/filters/rules/place/_HasNote.py
src/gen/filters/rules/place/_HasNoteMatchingSubstringOf.py
src/gen/filters/rules/place/_HasNoteRegexp.py
src/gen/filters/rules/place/_HasPlace.py
src/gen/filters/rules/place/_HasReferenceCountOf.py
src/gen/filters/rules/place/_InLatLonNeighborhood.py
src/gen/filters/rules/place/_MatchesFilter.py
src/gen/filters/rules/place/_MatchesEventFilter.py
src/gen/filters/rules/place/_PlacePrivate.py
src/gen/filters/rules/place/_RegExpIdOf.py
# gen.filters.rules.source package
src/gen/filters/rules/source/_AllSources.py
src/gen/filters/rules/source/_ChangedSince.py
src/gen/filters/rules/source/_HasGallery.py
src/gen/filters/rules/source/_HasIdOf.py
src/gen/filters/rules/source/_HasNote.py
src/gen/filters/rules/source/_HasNoteRegexp.py
src/gen/filters/rules/source/_HasNoteMatchingSubstringOf.py
src/gen/filters/rules/source/_HasReferenceCountOf.py
src/gen/filters/rules/source/_HasRepository.py
src/gen/filters/rules/source/_HasRepositoryCallNumberRef.py
src/gen/filters/rules/source/_MatchesFilter.py
src/gen/filters/rules/source/_MatchesRepositoryFilter.py
src/gen/filters/rules/source/_MatchesTitleSubstringOf.py
src/gen/filters/rules/source/_SourcePrivate.py
src/gen/filters/rules/source/_RegExpIdOf.py
# gen.filters.rules.citation package
src/gen/filters/rules/citation/_AllCitations.py
src/gen/filters/rules/citation/_ChangedSince.py
src/gen/filters/rules/citation/_CitationPrivate.py
src/gen/filters/rules/citation/_HasGallery.py
src/gen/filters/rules/citation/_HasIdOf.py
src/gen/filters/rules/citation/_HasNote.py
src/gen/filters/rules/citation/_HasNoteMatchingSubstringOf.py
src/gen/filters/rules/citation/_HasNoteRegexp.py
src/gen/filters/rules/citation/_HasReferenceCountOf.py
src/gen/filters/rules/citation/_HasSource.py
src/gen/filters/rules/citation/_MatchesFilter.py
src/gen/filters/rules/citation/_MatchesPageSubstringOf.py
src/gen/filters/rules/citation/_RegExpIdOf.py
src/gen/filters/rules/citation/_MatchesRepositoryFilter.py
src/gen/filters/rules/citation/_MatchesSourceFilter.py
# gen.filters.rules.media package
src/gen/filters/rules/media/_AllMedia.py
src/gen/filters/rules/media/_ChangedSince.py
src/gen/filters/rules/media/_HasAttribute.py
src/gen/filters/rules/media/_HasIdOf.py
src/gen/filters/rules/media/_HasMedia.py
src/gen/filters/rules/media/_HasNoteMatchingSubstringOf.py
src/gen/filters/rules/media/_HasNoteRegexp.py
src/gen/filters/rules/media/_HasReferenceCountOf.py
src/gen/filters/rules/media/_HasTag.py
src/gen/filters/rules/media/_MatchesFilter.py
src/gen/filters/rules/media/_MediaPrivate.py
src/gen/filters/rules/media/_RegExpIdOf.py
# gen.filters.rules.repository package
src/gen/filters/rules/repository/_AllRepos.py
src/gen/filters/rules/repository/_ChangedSince.py
src/gen/filters/rules/repository/_HasIdOf.py
src/gen/filters/rules/repository/_HasNoteMatchingSubstringOf.py
src/gen/filters/rules/repository/_HasNoteRegexp.py
src/gen/filters/rules/repository/_HasReferenceCountOf.py
src/gen/filters/rules/repository/_HasRepo.py
src/gen/filters/rules/repository/_MatchesFilter.py
src/gen/filters/rules/repository/_MatchesNameSubstringOf.py
src/gen/filters/rules/repository/_RegExpIdOf.py
src/gen/filters/rules/repository/_RepoPrivate.py
# gen.filters.rules.note package
src/gen/filters/rules/note/_AllNotes.py
src/gen/filters/rules/note/_ChangedSince.py
src/gen/filters/rules/note/_HasIdOf.py
src/gen/filters/rules/note/_MatchesSubstringOf.py
src/gen/filters/rules/note/_MatchesRegexpOf.py
src/gen/filters/rules/note/_HasNote.py
src/gen/filters/rules/note/_HasTag.py
src/gen/filters/rules/note/_HasReferenceCountOf.py
src/gen/filters/rules/note/_MatchesFilter.py
src/gen/filters/rules/note/_RegExpIdOf.py
src/gen/filters/rules/note/_NotePrivate.py
# gen lib API # gen lib API
src/gen/lib/attrtype.py src/gen/lib/attrtype.py
src/gen/lib/childreftype.py src/gen/lib/childreftype.py
@ -145,6 +380,22 @@ src/gui/editors/displaytabs/repoembedlist.py
src/gui/editors/displaytabs/surnametab.py src/gui/editors/displaytabs/surnametab.py
src/gui/editors/displaytabs/webembedlist.py src/gui/editors/displaytabs/webembedlist.py
# gui.filters package
src/gui/filters/_FilterStore.py
src/gui/filters/_SearchBar.py
# gui.filters.sidebar package
src/gui/filters/sidebar/_CitationSidebarFilter.py
src/gui/filters/sidebar/_EventSidebarFilter.py
src/gui/filters/sidebar/_FamilySidebarFilter.py
src/gui/filters/sidebar/_PersonSidebarFilter.py
src/gui/filters/sidebar/_SidebarFilter.py
src/gui/filters/sidebar/_SourceSidebarFilter.py
src/gui/filters/sidebar/_PlaceSidebarFilter.py
src/gui/filters/sidebar/_MediaSidebarFilter.py
src/gui/filters/sidebar/_RepoSidebarFilter.py
src/gui/filters/sidebar/_NoteSidebarFilter.py
# gui plugin API (was PluginUtils and ReportBase) # gui plugin API (was PluginUtils and ReportBase)
src/gui/plug/_dialogs.py src/gui/plug/_dialogs.py
src/gui/plug/_guioptions.py src/gui/plug/_guioptions.py
@ -441,255 +692,6 @@ src/plugins/webstuff/webstuff.py
# Simple API # Simple API
src/Simple/_SimpleAccess.py src/Simple/_SimpleAccess.py
# Filters package
src/Filters/_FilterParser.py
src/Filters/_FilterStore.py
src/Filters/_SearchBar.py
# Filters.Rules package
src/Filters/Rules/_Everything.py
src/Filters/Rules/_HasGrampsId.py
src/Filters/Rules/_HasTextMatchingSubstringOf.py
src/Filters/Rules/_IsPrivate.py
src/Filters/Rules/_Rule.py
# Filters.Rules.Person package
src/Filters/Rules/Person/_ChangedSince.py
src/Filters/Rules/Person/_DeepRelationshipPathBetween.py
src/Filters/Rules/Person/_Disconnected.py
src/Filters/Rules/Person/_Everyone.py
src/Filters/Rules/Person/_FamilyWithIncompleteEvent.py
src/Filters/Rules/Person/_HasAddress.py
src/Filters/Rules/Person/_HasAlternateName.py
src/Filters/Rules/Person/_HasAssociation.py
src/Filters/Rules/Person/_HasAttribute.py
src/Filters/Rules/Person/_HasBirth.py
src/Filters/Rules/Person/_HasCitation.py
src/Filters/Rules/Person/_HasCommonAncestorWithFilterMatch.py
src/Filters/Rules/Person/_HasCommonAncestorWith.py
src/Filters/Rules/Person/_HasDeath.py
src/Filters/Rules/Person/_HasEvent.py
src/Filters/Rules/Person/_HasFamilyAttribute.py
src/Filters/Rules/Person/_HasFamilyEvent.py
src/Filters/Rules/Person/_HasGallery.py
src/Filters/Rules/Person/_HasIdOf.py
src/Filters/Rules/Person/_HasLDS.py
src/Filters/Rules/Person/_HasNameOf.py
src/Filters/Rules/Person/_HasNameOriginType.py
src/Filters/Rules/Person/_HasNameType.py
src/Filters/Rules/Person/_HasNickname.py
src/Filters/Rules/Person/_HasNote.py
src/Filters/Rules/Person/_HasNoteMatchingSubstringOf.py
src/Filters/Rules/Person/_HasNoteRegexp.py
src/Filters/Rules/Person/_HasRelationship.py
src/Filters/Rules/Person/_HasSourceCount.py
src/Filters/Rules/Person/_HasSourceOf.py
src/Filters/Rules/Person/_HasTag.py
src/Filters/Rules/Person/_HasTextMatchingSubstringOf.py
src/Filters/Rules/Person/_HasUnknownGender.py
src/Filters/Rules/Person/_HaveAltFamilies.py
src/Filters/Rules/Person/_HaveChildren.py
src/Filters/Rules/Person/_IncompleteNames.py
src/Filters/Rules/Person/_IsAncestorOfFilterMatch.py
src/Filters/Rules/Person/_IsAncestorOf.py
src/Filters/Rules/Person/_IsBookmarked.py
src/Filters/Rules/Person/_IsChildOfFilterMatch.py
src/Filters/Rules/Person/_IsDescendantFamilyOfFilterMatch.py
src/Filters/Rules/Person/_IsDefaultPerson.py
src/Filters/Rules/Person/_IsDescendantFamilyOf.py
src/Filters/Rules/Person/_IsDescendantOfFilterMatch.py
src/Filters/Rules/Person/_IsDescendantOf.py
src/Filters/Rules/Person/_IsDuplicatedAncestorOf.py
src/Filters/Rules/Person/_IsFemale.py
src/Filters/Rules/Person/_IsLessThanNthGenerationAncestorOfBookmarked.py
src/Filters/Rules/Person/_IsLessThanNthGenerationAncestorOfDefaultPerson.py
src/Filters/Rules/Person/_IsLessThanNthGenerationAncestorOf.py
src/Filters/Rules/Person/_IsLessThanNthGenerationDescendantOf.py
src/Filters/Rules/Person/_IsMale.py
src/Filters/Rules/Person/_IsMoreThanNthGenerationAncestorOf.py
src/Filters/Rules/Person/_IsMoreThanNthGenerationDescendantOf.py
src/Filters/Rules/Person/_IsParentOfFilterMatch.py
src/Filters/Rules/Person/_PeoplePublic.py
src/Filters/Rules/Person/_IsRelatedWith.py
src/Filters/Rules/Person/_IsSiblingOfFilterMatch.py
src/Filters/Rules/Person/_IsSpouseOfFilterMatch.py
src/Filters/Rules/Person/_IsWitness.py
src/Filters/Rules/Person/_MatchesEventFilter.py
src/Filters/Rules/Person/_MatchesFilter.py
src/Filters/Rules/Person/_MatchesSourceConfidence.py
src/Filters/Rules/Person/_MatchIdOf.py
src/Filters/Rules/Person/_MissingParent.py
src/Filters/Rules/Person/_MultipleMarriages.py
src/Filters/Rules/Person/_NeverMarried.py
src/Filters/Rules/Person/_NoBirthdate.py
src/Filters/Rules/Person/_NoDeathdate.py
src/Filters/Rules/Person/_PeoplePrivate.py
src/Filters/Rules/Person/_PersonWithIncompleteEvent.py
src/Filters/Rules/Person/_ProbablyAlive.py
src/Filters/Rules/Person/_RegExpIdOf.py
src/Filters/Rules/Person/_RegExpName.py
src/Filters/Rules/Person/_RelationshipPathBetween.py
src/Filters/Rules/Person/_RelationshipPathBetweenBookmarks.py
src/Filters/Rules/Person/_SearchName.py
# Filters.Rules.Family package
src/Filters/Rules/Family/_AllFamilies.py
src/Filters/Rules/Family/_ChangedSince.py
src/Filters/Rules/Family/_ChildHasIdOf.py
src/Filters/Rules/Family/_ChildHasNameOf.py
src/Filters/Rules/Family/_FamilyPrivate.py
src/Filters/Rules/Family/_FatherHasIdOf.py
src/Filters/Rules/Family/_FatherHasNameOf.py
src/Filters/Rules/Family/_HasAttribute.py
src/Filters/Rules/Family/_HasCitation.py
src/Filters/Rules/Family/_HasEvent.py
src/Filters/Rules/Family/_HasGallery.py
src/Filters/Rules/Family/_HasIdOf.py
src/Filters/Rules/Family/_HasLDS.py
src/Filters/Rules/Family/_HasNote.py
src/Filters/Rules/Family/_HasNoteMatchingSubstringOf.py
src/Filters/Rules/Family/_HasNoteRegexp.py
src/Filters/Rules/Family/_HasReferenceCountOf.py
src/Filters/Rules/Family/_HasRelType.py
src/Filters/Rules/Family/_HasSourceCount.py
src/Filters/Rules/Family/_HasTag.py
src/Filters/Rules/Family/_IsBookmarked.py
src/Filters/Rules/Family/_MatchesFilter.py
src/Filters/Rules/Family/_MatchesSourceConfidence.py
src/Filters/Rules/Family/_MotherHasIdOf.py
src/Filters/Rules/Family/_MotherHasNameOf.py
src/Filters/Rules/Family/_SearchFatherName.py
src/Filters/Rules/Family/_SearchChildName.py
src/Filters/Rules/Family/_SearchMotherName.py
src/Filters/Rules/Family/_RegExpFatherName.py
src/Filters/Rules/Family/_RegExpMotherName.py
src/Filters/Rules/Family/_RegExpChildName.py
src/Filters/Rules/Family/_RegExpIdOf.py
# Filters.Rules.Event package
src/Filters/Rules/Event/_AllEvents.py
src/Filters/Rules/Event/_ChangedSince.py
src/Filters/Rules/Event/_EventPrivate.py
src/Filters/Rules/Event/_HasAttribute.py
src/Filters/Rules/Event/_HasCitation.py
src/Filters/Rules/Event/_HasData.py
src/Filters/Rules/Event/_HasGallery.py
src/Filters/Rules/Event/_HasIdOf.py
src/Filters/Rules/Event/_HasNote.py
src/Filters/Rules/Event/_HasNoteMatchingSubstringOf.py
src/Filters/Rules/Event/_HasNoteRegexp.py
src/Filters/Rules/Event/_HasReferenceCountOf.py
src/Filters/Rules/Event/_HasSourceCount.py
src/Filters/Rules/Event/_HasType.py
src/Filters/Rules/Event/_MatchesFilter.py
src/Filters/Rules/Event/_MatchesPersonFilter.py
src/Filters/Rules/Event/_MatchesSourceFilter.py
src/Filters/Rules/Event/_MatchesSourceConfidence.py
src/Filters/Rules/Event/_RegExpIdOf.py
# Filters.Rules.Place package
src/Filters/Rules/Place/_AllPlaces.py
src/Filters/Rules/Place/_ChangedSince.py
src/Filters/Rules/Place/_HasGallery.py
src/Filters/Rules/Place/_HasIdOf.py
src/Filters/Rules/Place/_HasNoLatOrLon.py
src/Filters/Rules/Place/_HasNote.py
src/Filters/Rules/Place/_HasNoteMatchingSubstringOf.py
src/Filters/Rules/Place/_HasNoteRegexp.py
src/Filters/Rules/Place/_HasPlace.py
src/Filters/Rules/Place/_HasReferenceCountOf.py
src/Filters/Rules/Place/_InLatLonNeighborhood.py
src/Filters/Rules/Place/_MatchesFilter.py
src/Filters/Rules/Place/_MatchesEventFilter.py
src/Filters/Rules/Place/_PlacePrivate.py
src/Filters/Rules/Place/_RegExpIdOf.py
# Filters.Rules.Source package
src/Filters/Rules/Source/_AllSources.py
src/Filters/Rules/Source/_ChangedSince.py
src/Filters/Rules/Source/_HasGallery.py
src/Filters/Rules/Source/_HasIdOf.py
src/Filters/Rules/Source/_HasNote.py
src/Filters/Rules/Source/_HasNoteRegexp.py
src/Filters/Rules/Source/_HasNoteMatchingSubstringOf.py
src/Filters/Rules/Source/_HasReferenceCountOf.py
src/Filters/Rules/Source/_HasRepository.py
src/Filters/Rules/Source/_HasRepositoryCallNumberRef.py
src/Filters/Rules/Source/_MatchesFilter.py
src/Filters/Rules/Source/_MatchesRepositoryFilter.py
src/Filters/Rules/Source/_MatchesTitleSubstringOf.py
src/Filters/Rules/Source/_SourcePrivate.py
src/Filters/Rules/Source/_RegExpIdOf.py
# Filters.Rules.Citation package
src/Filters/Rules/Citation/_AllCitations.py
src/Filters/Rules/Citation/_ChangedSince.py
src/Filters/Rules/Citation/_CitationPrivate.py
src/Filters/Rules/Citation/_HasGallery.py
src/Filters/Rules/Citation/_HasIdOf.py
src/Filters/Rules/Citation/_HasNote.py
src/Filters/Rules/Citation/_HasNoteMatchingSubstringOf.py
src/Filters/Rules/Citation/_HasNoteRegexp.py
src/Filters/Rules/Citation/_HasReferenceCountOf.py
src/Filters/Rules/Citation/_HasSource.py
src/Filters/Rules/Citation/_MatchesFilter.py
src/Filters/Rules/Citation/_MatchesPageSubstringOf.py
src/Filters/Rules/Citation/_RegExpIdOf.py
src/Filters/Rules/Citation/_MatchesRepositoryFilter.py
src/Filters/Rules/Citation/_MatchesSourceFilter.py
# Filters.Rules.MediaObject package
src/Filters/Rules/MediaObject/_AllMedia.py
src/Filters/Rules/MediaObject/_ChangedSince.py
src/Filters/Rules/MediaObject/_HasAttribute.py
src/Filters/Rules/MediaObject/_HasIdOf.py
src/Filters/Rules/MediaObject/_HasMedia.py
src/Filters/Rules/MediaObject/_HasNoteMatchingSubstringOf.py
src/Filters/Rules/MediaObject/_HasNoteRegexp.py
src/Filters/Rules/MediaObject/_HasReferenceCountOf.py
src/Filters/Rules/MediaObject/_HasTag.py
src/Filters/Rules/MediaObject/_MatchesFilter.py
src/Filters/Rules/MediaObject/_MediaPrivate.py
src/Filters/Rules/MediaObject/_RegExpIdOf.py
# Filters.Rules.Repository package
src/Filters/Rules/Repository/_AllRepos.py
src/Filters/Rules/Repository/_ChangedSince.py
src/Filters/Rules/Repository/_HasIdOf.py
src/Filters/Rules/Repository/_HasNoteMatchingSubstringOf.py
src/Filters/Rules/Repository/_HasNoteRegexp.py
src/Filters/Rules/Repository/_HasReferenceCountOf.py
src/Filters/Rules/Repository/_HasRepo.py
src/Filters/Rules/Repository/_MatchesFilter.py
src/Filters/Rules/Repository/_MatchesNameSubstringOf.py
src/Filters/Rules/Repository/_RegExpIdOf.py
src/Filters/Rules/Repository/_RepoPrivate.py
# Filters.Rules.Note package
src/Filters/Rules/Note/_AllNotes.py
src/Filters/Rules/Note/_ChangedSince.py
src/Filters/Rules/Note/_HasIdOf.py
src/Filters/Rules/Note/_MatchesSubstringOf.py
src/Filters/Rules/Note/_MatchesRegexpOf.py
src/Filters/Rules/Note/_HasNote.py
src/Filters/Rules/Note/_HasTag.py
src/Filters/Rules/Note/_HasReferenceCountOf.py
src/Filters/Rules/Note/_MatchesFilter.py
src/Filters/Rules/Note/_RegExpIdOf.py
src/Filters/Rules/Note/_NotePrivate.py
# Filters.SideBar package
src/Filters/SideBar/_CitationSidebarFilter.py
src/Filters/SideBar/_EventSidebarFilter.py
src/Filters/SideBar/_FamilySidebarFilter.py
src/Filters/SideBar/_PersonSidebarFilter.py
src/Filters/SideBar/_SidebarFilter.py
src/Filters/SideBar/_SourceSidebarFilter.py
src/Filters/SideBar/_PlaceSidebarFilter.py
src/Filters/SideBar/_MediaSidebarFilter.py
src/Filters/SideBar/_RepoSidebarFilter.py
src/Filters/SideBar/_NoteSidebarFilter.py
# #
# Glade files # Glade files
# #

View File

@ -44,50 +44,6 @@ src/DateHandler/_Date_sv.py
src/DateHandler/_Date_zh.py src/DateHandler/_Date_zh.py
src/DateHandler/__init__.py src/DateHandler/__init__.py
# Filters package
src/Filters/_FilterComboBox.py
src/Filters/_FilterList.py
src/Filters/_FilterMenu.py
src/Filters/_GenericFilter.py
src/Filters/_ParamFilter.py
src/Filters/_SearchFilter.py
# Filters _init_ package
src/Filters/__init__.py
src/Filters/Rules/Person/__init__.py
src/Filters/Rules/Family/__init__.py
src/Filters/Rules/Event/__init__.py
src/Filters/Rules/Place/__init__.py
src/Filters/Rules/Source/__init__.py
src/Filters/Rules/MediaObject/__init__.py
src/Filters/Rules/Repository/__init__.py
src/Filters/Rules/Note/__init__.py
# Filters.Rules package
src/Filters/Rules/_ChangedSinceBase.py
src/Filters/Rules/_HasAttributeBase.py
src/Filters/Rules/_HasCitationBase.py
src/Filters/Rules/_HasEventBase.py
src/Filters/Rules/_HasGalleryBase.py
src/Filters/Rules/_HasLDSBase.py
src/Filters/Rules/_HasNoteBase.py
src/Filters/Rules/_HasNoteRegexBase.py
src/Filters/Rules/_HasNoteSubstrBase.py
src/Filters/Rules/_HasReferenceCountBase.py
src/Filters/Rules/_HasSourceBase.py
src/Filters/Rules/_HasSourceCountBase.py
src/Filters/Rules/_HasTagBase.py
src/Filters/Rules/_HasTextMatchingRegexpOf.py
src/Filters/Rules/__init__.py
src/Filters/Rules/_IsPublic.py
src/Filters/Rules/_MatchesEventFilterBase.py
src/Filters/Rules/_MatchesFilterBase.py
src/Filters/Rules/_MatchesSourceConfidenceBase.py
src/Filters/Rules/_MatchesSourceFilterBase.py
src/Filters/Rules/_RegExpIdBase.py
src/Filters/Rules/Person/_HasTextMatchingRegexpOf.py
src/Filters/Rules/Family/_MemberBase.py
# gen # gen
src/gen/user.py src/gen/user.py
@ -104,6 +60,62 @@ src/gen/db/read.py
src/gen/db/write.py src/gen/db/write.py
src/gen/ggettext.py src/gen/ggettext.py
# gen.filters package
src/gen/filters/_FilterList.py
src/gen/filters/_GenericFilter.py
src/gen/filters/__init__.py
src/gen/filters/_ParamFilter.py
src/gen/filters/_SearchFilter.py
# gen.filters.rules package
src/gen/filters/rules/_ChangedSinceBase.py
src/gen/filters/rules/_HasAttributeBase.py
src/gen/filters/rules/_HasCitationBase.py
src/gen/filters/rules/_HasEventBase.py
src/gen/filters/rules/_HasGalleryBase.py
src/gen/filters/rules/_HasLDSBase.py
src/gen/filters/rules/_HasNoteBase.py
src/gen/filters/rules/_HasNoteRegexBase.py
src/gen/filters/rules/_HasNoteSubstrBase.py
src/gen/filters/rules/_HasReferenceCountBase.py
src/gen/filters/rules/_HasSourceBase.py
src/gen/filters/rules/_HasSourceCountBase.py
src/gen/filters/rules/_HasTagBase.py
src/gen/filters/rules/_HasTextMatchingRegexpOf.py
src/gen/filters/rules/__init__.py
src/gen/filters/rules/_IsPublic.py
src/gen/filters/rules/_MatchesEventFilterBase.py
src/gen/filters/rules/_MatchesFilterBase.py
src/gen/filters/rules/_MatchesSourceConfidenceBase.py
src/gen/filters/rules/_MatchesSourceFilterBase.py
src/gen/filters/rules/_RegExpIdBase.py
# gen.filters.rules.person package
src/gen/filters/rules/person/__init__.py
src/gen/filters/rules/person/_HasTextMatchingRegexpOf.py
# gen.filters.rules.family package
src/gen/filters/rules/family/__init__.py
src/gen/filters/rules/family/_MemberBase.py
# gen.filters.rules.event package
src/gen/filters/rules/event/__init__.py
# gen.filters.rules.place package
src/gen/filters/rules/place/__init__.py
# gen.filters.rules.source package
src/gen/filters/rules/source/__init__.py
# gen.filters.rules.media package
src/gen/filters/rules/media/__init__.py
# gen.filters.rules.repository package
src/gen/filters/rules/repository/__init__.py
# gen.filters.rules.note package
src/gen/filters/rules/note/__init__.py
# gen lib API # gen lib API
src/gen/lib/__init__.py src/gen/lib/__init__.py
src/gen/lib/address.py src/gen/lib/address.py
@ -247,6 +259,11 @@ src/gui/editors/displaytabs/sourcerefmodel.py
src/gui/editors/displaytabs/surnamemodel.py src/gui/editors/displaytabs/surnamemodel.py
src/gui/editors/displaytabs/webmodel.py src/gui/editors/displaytabs/webmodel.py
# gui.filters package
src/gui/filters/_FilterComboBox.py
src/gui/filters/_FilterMenu.py
src/gui/filters/__init__.py
# gui/selectors - the GUI selectors package # gui/selectors - the GUI selectors package
src/gui/selectors/__init__.py src/gui/selectors/__init__.py
src/gui/selectors/baseselector.py src/gui/selectors/baseselector.py

View File

@ -39,7 +39,7 @@ from gen.ggettext import gettext as _
from gen.ggettext import ngettext from gen.ggettext import ngettext
import config import config
from gen.display.name import displayer as name_displayer from gen.display.name import displayer as name_displayer
from Filters import GenericFilter, Rules from gen.filters import GenericFilter, Rules
from gui.utils import ProgressMeter from gui.utils import ProgressMeter
class Progress(object): class Progress(object):
@ -620,7 +620,7 @@ class WriterOptionBox(object):
filter if called if none is selected. filter if called if none is selected.
""" """
from gui.filtereditor import EditFilter from gui.filtereditor import EditFilter
from Filters import FilterList, GenericFilterFactory from gen.filters import FilterList, GenericFilterFactory
import const import const
the_filter = None the_filter = None
filterdb = FilterList(const.CUSTOM_FILTERS) filterdb = FilterList(const.CUSTOM_FILTERS)
@ -649,8 +649,8 @@ class WriterOptionBox(object):
""" """
If a filter changed, save them all. Reloads, and also calls callback. If a filter changed, save them all. Reloads, and also calls callback.
""" """
from Filters import CustomFilters from gen.filters import CustomFilters
from Filters import reload_custom_filters from gen.filters import reload_custom_filters
filterdb.save() filterdb.save()
reload_custom_filters() reload_custom_filters()
if namespace == "Person": if namespace == "Person":
@ -668,7 +668,7 @@ class WriterOptionBox(object):
""" """
import gtk import gtk
import gobject import gobject
from Filters import CustomFilters from gen.filters import CustomFilters
if namespace == "person": if namespace == "person":
# Populate the Person Filter # Populate the Person Filter
entire_db = GenericFilter() entire_db = GenericFilter()

View File

@ -6,7 +6,6 @@ SUBDIRS = \
data \ data \
DateHandler \ DateHandler \
docgen \ docgen \
Filters \
gen \ gen \
glade \ glade \
GrampsLocale \ GrampsLocale \

View File

@ -7,6 +7,7 @@
SUBDIRS = \ SUBDIRS = \
db \ db \
display \ display \
filters \
lib \ lib \
mime \ mime \
plug \ plug \

View File

@ -26,4 +26,5 @@ The gen module provides packages that are common to all gramps
interfaces (gui, cli and web). interfaces (gui, cli and web).
""" """
__all__ = [ "db", "display", "lib", "mime", "plug", "proxy", "utils" ] __all__ = [ "db", "display", "filters", "lib", "mime", "plug", "proxy",
"utils" ]

View File

@ -1,28 +1,24 @@
# This is the src/Filters level Makefile for Gramps # This is the src/gen/filters level Makefile for Gramps
# $Id$ # $Id$
SUBDIRS = Rules SideBar SUBDIRS = rules
pkgpythondir = $(datadir)/@PACKAGE@/Filters pkgpythondir = $(datadir)/@PACKAGE@/gen/filters
pkgpython_PYTHON = \ pkgpython_PYTHON = \
_FilterComboBox.py \
_FilterList.py \ _FilterList.py \
_FilterMenu.py \
_FilterParser.py \ _FilterParser.py \
_FilterStore.py \
_GenericFilter.py \ _GenericFilter.py \
_ParamFilter.py \ _ParamFilter.py \
__init__.py \ __init__.py \
_SearchBar.py \
_SearchFilter.py _SearchFilter.py
pkgpyexecdir = @pkgpyexecdir@/Filters pkgpyexecdir = @pkgpyexecdir@/gen/filters
# Clean up all the byte-compiled files # Clean up all the byte-compiled files
MOSTLYCLEANFILES = *pyc *pyo MOSTLYCLEANFILES = *pyc *pyo
GRAMPS_PY_MODPATH = "../" GRAMPS_PY_MODPATH = "../../"
pycheck: pycheck:
(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \ (export PYTHONPATH=$(GRAMPS_PY_MODPATH); \

View File

@ -34,7 +34,7 @@ import sys
# GRAMPS modules # GRAMPS modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from Filters._FilterParser import FilterParser from gen.filters._FilterParser import FilterParser
from gen.plug import BasePluginManager from gen.plug import BasePluginManager
PLUGMAN = BasePluginManager.get_instance() PLUGMAN = BasePluginManager.get_instance()

View File

@ -33,8 +33,8 @@ from gen.ggettext import gettext as _
# Gramps modules # Gramps modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from Filters._GenericFilter import GenericFilterFactory from gen.filters._GenericFilter import GenericFilterFactory
from Filters import Rules from gen.filters import rules
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #
@ -60,8 +60,6 @@ class FilterParser(handler.ContentHandler):
if tag == "object": if tag == "object":
if attrs.has_key('type'): if attrs.has_key('type'):
self.namespace = attrs['type'] self.namespace = attrs['type']
if self.namespace == 'Media':
self.namespace = 'MediaObject'
else: else:
self.namespace = "generic" self.namespace = "generic"
elif tag == "filter": elif tag == "filter":
@ -90,12 +88,12 @@ class FilterParser(handler.ContentHandler):
# First try to use fully qualified name # First try to use fully qualified name
exec 'self.r = %s' % save_name exec 'self.r = %s' % save_name
except (ImportError, NameError, AttributeError ): except (ImportError, NameError, AttributeError ):
# Now try to use name from Rules.Namespace # Now try to use name from rules.namespace
mc_match = save_name.split('.') mc_match = save_name.split('.')
last_name = mc_match[-1] last_name = mc_match[-1]
try: try:
exec 'self.r = Rules.%s.%s' % ( exec 'self.r = rules.%s.%s' % (
self.namespace,last_name) self.namespace.lower(), last_name)
except (ImportError, NameError, AttributeError ): except (ImportError, NameError, AttributeError ):
print "ERROR: Filter rule '%s' in "\ print "ERROR: Filter rule '%s' in "\
"filter '%s' not found!"\ "filter '%s' not found!"\
@ -158,60 +156,60 @@ class FilterParser(handler.ContentHandler):
# This dict is mapping from old names to new names, so that the existing # This dict is mapping from old names to new names, so that the existing
# custom_filters.xml will continue working # custom_filters.xml will continue working
old_names_2_class = { old_names_2_class = {
"Everyone" : Rules.Person.Everyone, "Everyone" : rules.person.Everyone,
"Is default person" : Rules.Person.IsDefaultPerson, "Is default person" : rules.person.IsDefaultPerson,
"Is bookmarked person" : Rules.Person.IsBookmarked, "Is bookmarked person" : rules.person.IsBookmarked,
"Has the Id" : Rules.Person.HasIdOf, "Has the Id" : rules.person.HasIdOf,
"Has a name" : Rules.Person.HasNameOf, "Has a name" : rules.person.HasNameOf,
"Has the relationships" : Rules.Person.HasRelationship, "Has the relationships" : rules.person.HasRelationship,
"Has the death" : Rules.Person.HasDeath, "Has the death" : rules.person.HasDeath,
"Has the birth" : Rules.Person.HasBirth, "Has the birth" : rules.person.HasBirth,
"Is a descendant of" : Rules.Person.IsDescendantOf, "Is a descendant of" : rules.person.IsDescendantOf,
"Is a descendant family member of" : Rules.Person.IsDescendantFamilyOf, "Is a descendant family member of" : rules.person.IsDescendantFamilyOf,
"Is a descendant of filter match": Rules.Person.IsDescendantOfFilterMatch, "Is a descendant of filter match": rules.person.IsDescendantOfFilterMatch,
"Is a descendant of person not more than N generations away": "Is a descendant of person not more than N generations away":
Rules.Person.IsLessThanNthGenerationDescendantOf, rules.person.IsLessThanNthGenerationDescendantOf,
"Is a descendant of person at least N generations away": "Is a descendant of person at least N generations away":
Rules.Person.IsMoreThanNthGenerationDescendantOf, rules.person.IsMoreThanNthGenerationDescendantOf,
"Is an descendant of person at least N generations away" : "Is an descendant of person at least N generations away" :
Rules.Person.IsMoreThanNthGenerationDescendantOf, rules.person.IsMoreThanNthGenerationDescendantOf,
"Is a child of filter match" : Rules.Person.IsChildOfFilterMatch, "Is a child of filter match" : rules.person.IsChildOfFilterMatch,
"Is an ancestor of" : Rules.Person.IsAncestorOf, "Is an ancestor of" : rules.person.IsAncestorOf,
"Is an ancestor of filter match": Rules.Person.IsAncestorOfFilterMatch, "Is an ancestor of filter match": rules.person.IsAncestorOfFilterMatch,
"Is an ancestor of person not more than N generations away" : "Is an ancestor of person not more than N generations away" :
Rules.Person.IsLessThanNthGenerationAncestorOf, rules.person.IsLessThanNthGenerationAncestorOf,
"Is an ancestor of person at least N generations away": "Is an ancestor of person at least N generations away":
Rules.Person.IsMoreThanNthGenerationAncestorOf, rules.person.IsMoreThanNthGenerationAncestorOf,
"Is a parent of filter match" : Rules.Person.IsParentOfFilterMatch, "Is a parent of filter match" : rules.person.IsParentOfFilterMatch,
"Has a common ancestor with" : Rules.Person.HasCommonAncestorWith, "Has a common ancestor with" : rules.person.HasCommonAncestorWith,
"Has a common ancestor with filter match" : "Has a common ancestor with filter match" :
Rules.Person.HasCommonAncestorWithFilterMatch, rules.person.HasCommonAncestorWithFilterMatch,
"Is a female" : Rules.Person.IsFemale, "Is a female" : rules.person.IsFemale,
"Is a male" : Rules.Person.IsMale, "Is a male" : rules.person.IsMale,
"Has the personal event" : Rules.Person.HasEvent, "Has the personal event" : rules.person.HasEvent,
"Has the family event" : Rules.Person.HasFamilyEvent, "Has the family event" : rules.person.HasFamilyEvent,
"Has the personal attribute" : Rules.Person.HasAttribute, "Has the personal attribute" : rules.person.HasAttribute,
"Has the family attribute" : Rules.Person.HasFamilyAttribute, "Has the family attribute" : rules.person.HasFamilyAttribute,
"Has source of" : Rules.Person.HasSourceOf, "Has source of" : rules.person.HasSourceOf,
"Matches the filter named" : Rules.Person.HasSourceOf, "Matches the filter named" : rules.person.HasSourceOf,
"Is spouse of filter match" : Rules.Person.IsSpouseOfFilterMatch, "Is spouse of filter match" : rules.person.IsSpouseOfFilterMatch,
"Is a sibling of filter match" : Rules.Person.IsSiblingOfFilterMatch, "Is a sibling of filter match" : rules.person.IsSiblingOfFilterMatch,
"Relationship path between two people" : "Relationship path between two people" :
Rules.Person.RelationshipPathBetween, rules.person.RelationshipPathBetween,
"Relationship paths between a person and a list of people" : "Relationship paths between a person and a list of people" :
Rules.Person.DeepRelationshipPathBetween, rules.person.DeepRelationshipPathBetween,
"People who were adopted" : Rules.Person.HaveAltFamilies, "People who were adopted" : rules.person.HaveAltFamilies,
"People who have images" : Rules.Person.HavePhotos, "People who have images" : rules.person.HavePhotos,
"People with children" : Rules.Person.HaveChildren, "People with children" : rules.person.HaveChildren,
"People with incomplete names" : Rules.Person.IncompleteNames, "People with incomplete names" : rules.person.IncompleteNames,
"People with no marriage records" : Rules.Person.NeverMarried, "People with no marriage records" : rules.person.NeverMarried,
"People with multiple marriage records": Rules.Person.MultipleMarriages, "People with multiple marriage records": rules.person.MultipleMarriages,
"People without a birth date" : Rules.Person.NoBirthdate, "People without a birth date" : rules.person.NoBirthdate,
"People with incomplete events" : Rules.Person.PersonWithIncompleteEvent, "People with incomplete events" : rules.person.PersonWithIncompleteEvent,
"Families with incomplete events" :Rules.Person.FamilyWithIncompleteEvent, "Families with incomplete events" :rules.person.FamilyWithIncompleteEvent,
"People probably alive" : Rules.Person.ProbablyAlive, "People probably alive" : rules.person.ProbablyAlive,
"People marked private" : Rules.Person.PeoplePrivate, "People marked private" : rules.person.PeoplePrivate,
"People marked public" : Rules.Person.PeoplePublic, "People marked public" : rules.person.PeoplePublic,
"Witnesses" : Rules.Person.IsWitness, "Witnesses" : rules.person.IsWitness,
"Has text matching substring of": Rules.Person.HasTextMatchingSubstringOf, "Has text matching substring of": rules.person.HasTextMatchingSubstringOf,
} }

View File

@ -361,7 +361,7 @@ def GenericFilterFactory(namespace):
return GenericCitationFilter return GenericCitationFilter
elif namespace == 'Place': elif namespace == 'Place':
return GenericPlaceFilter return GenericPlaceFilter
elif namespace == 'MediaObject': elif namespace == 'Media':
return GenericMediaFilter return GenericMediaFilter
elif namespace == 'Repository': elif namespace == 'Repository':
return GenericRepoFilter return GenericRepoFilter

View File

@ -29,7 +29,7 @@ Package providing filtering framework for GRAMPS.
# GRAMPS modules # GRAMPS modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from Filters._GenericFilter import GenericFilter from gen.filters._GenericFilter import GenericFilter
from Errors import FilterError from Errors import FilterError
#------------------------------------------------------------------------- #-------------------------------------------------------------------------

View File

@ -31,6 +31,7 @@ from const import CUSTOM_FILTERS
from _FilterList import FilterList from _FilterList import FilterList
from _GenericFilter import GenericFilter, GenericFilterFactory from _GenericFilter import GenericFilter, GenericFilterFactory
from _ParamFilter import ParamFilter from _ParamFilter import ParamFilter
from _SearchFilter import SearchFilter, ExactSearchFilter
#def reload_system_filters(): #def reload_system_filters():
#global SystemFilters #global SystemFilters
@ -47,12 +48,3 @@ def reload_custom_filters():
if not CustomFilters: if not CustomFilters:
reload_custom_filters() reload_custom_filters()
try: # the Gramps-Connect server has no DISPLAY
from _FilterComboBox import FilterComboBox
from _FilterMenu import build_filter_model
from _FilterStore import FilterStore
from _SearchBar import SearchBar
except:
pass
from _SearchFilter import SearchFilter, ExactSearchFilter

View File

@ -1,9 +1,9 @@
# This is the src/Filters/Rules level Makefile for Gramps # This is the src/gen/filters/rules level Makefile for Gramps
# $Id$ # $Id$
SUBDIRS = Person Family Event Place Source MediaObject Repository Note Citation SUBDIRS = person family event place source media repository note citation
pkgpythondir = $(datadir)/@PACKAGE@/Filters/Rules pkgpythondir = $(datadir)/@PACKAGE@/gen/filters/rules
pkgpython_PYTHON = \ pkgpython_PYTHON = \
_ChangedSinceBase.py\ _ChangedSinceBase.py\
@ -34,12 +34,12 @@ pkgpython_PYTHON = \
_HasCitationBase.py _HasCitationBase.py
pkgpyexecdir = @pkgpyexecdir@/Filters/Rules pkgpyexecdir = @pkgpyexecdir@/gen/filters/rules
# Clean up all the byte-compiled files # Clean up all the byte-compiled files
MOSTLYCLEANFILES = *pyc *pyo MOSTLYCLEANFILES = *pyc *pyo
GRAMPS_PY_MODPATH = "../../" GRAMPS_PY_MODPATH = "../../../"
pycheck: pycheck:
(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \ (export PYTHONPATH=$(GRAMPS_PY_MODPATH); \

View File

@ -18,7 +18,7 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
# #
# Filters/Rules/_ChangedSinceBase.py # gen.filters.rules/_ChangedSinceBase.py
# $Id$ # $Id$
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
@ -35,7 +35,7 @@ import time
# GRAMPS modules # GRAMPS modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from Filters.Rules import Rule from gen.filters.rules import Rule
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #

View File

@ -32,7 +32,7 @@ from gen.ggettext import gettext as _
# GRAMPS modules # GRAMPS modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from Filters.Rules import Rule from gen.filters.rules import Rule
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #

View File

@ -33,7 +33,7 @@ from gen.ggettext import gettext as _
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from gen.lib import AttributeType from gen.lib import AttributeType
from Filters.Rules import Rule from gen.filters.rules import Rule
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #

View File

@ -34,7 +34,7 @@ from gen.ggettext import gettext as _
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
import DateHandler import DateHandler
from Filters.Rules._Rule import Rule from gen.filters.rules._Rule import Rule
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #

View File

@ -34,7 +34,7 @@ from gen.ggettext import gettext as _
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
import DateHandler import DateHandler
from gen.lib import EventType from gen.lib import EventType
from Filters.Rules import Rule from gen.filters.rules import Rule
from Utils import get_participant_from_event from Utils import get_participant_from_event
#------------------------------------------------------------------------- #-------------------------------------------------------------------------

View File

@ -19,7 +19,7 @@
# along with this program; if not, write to the Free Software # along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
# #
# Filters/Rules/_HasGalleryBase.py # gen.filters.rules/_HasGalleryBase.py
# $Id$ # $Id$
# #
@ -35,7 +35,7 @@ from gen.ggettext import gettext as _
# GRAMPS modules # GRAMPS modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from Filters.Rules import Rule from gen.filters.rules import Rule
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# "People who have images" # "People who have images"

View File

@ -33,7 +33,7 @@ from gen.ggettext import gettext as _
# GRAMPS modules # GRAMPS modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from Filters.Rules import Rule from gen.filters.rules import Rule
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #

View File

@ -19,7 +19,7 @@
# along with this program; if not, write to the Free Software # along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
# #
# Filters/Rules/_HasLDSBase.py # gen.filters.rules/_HasLDSBase.py
# $Id$ # $Id$
# #
@ -36,7 +36,7 @@ from gen.ggettext import gettext as _
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from Filters.Rules import Rule from gen.filters.rules import Rule
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #

View File

@ -20,7 +20,7 @@
# along with this program; if not, write to the Free Software # along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
# #
# Filters/Rules/_HasNoteBase.py # gen.filters.rules/_HasNoteBase.py
# $Id$ # $Id$
# #
@ -36,7 +36,7 @@ from gen.ggettext import gettext as _
# GRAMPS modules # GRAMPS modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from Filters.Rules._Rule import Rule from gen.filters.rules._Rule import Rule
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# "Objects having notes" # "Objects having notes"

View File

@ -33,7 +33,7 @@ from gen.ggettext import gettext as _
# GRAMPS modules # GRAMPS modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from Filters.Rules import Rule from gen.filters.rules import Rule
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# "People having notes that contain a substring" # "People having notes that contain a substring"

View File

@ -32,7 +32,7 @@ from gen.ggettext import gettext as _
# GRAMPS modules # GRAMPS modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from Filters.Rules import Rule from gen.filters.rules import Rule
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# "People having notes that contain a substring" # "People having notes that contain a substring"

View File

@ -32,7 +32,7 @@ from gen.ggettext import gettext as _
# GRAMPS modules # GRAMPS modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from Filters.Rules import Rule from gen.filters.rules import Rule
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# "Objects with a certain reference count" # "Objects with a certain reference count"

View File

@ -33,7 +33,7 @@ from gen.ggettext import gettext as _
# GRAMPS modules # GRAMPS modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from Filters.Rules._Rule import Rule from gen.filters.rules._Rule import Rule
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #

View File

@ -35,7 +35,7 @@ from gen.ggettext import gettext as _
# GRAMPS modules # GRAMPS modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from Filters.Rules._Rule import Rule from gen.filters.rules._Rule import Rule
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# "Objects having sources" # "Objects having sources"

View File

@ -34,7 +34,7 @@ from gen.ggettext import gettext as _
# GRAMPS modules # GRAMPS modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from Filters.Rules import Rule from gen.filters.rules import Rule
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #

View File

@ -25,7 +25,7 @@
# GRAMPS modules # GRAMPS modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from Filters.Rules import HasTextMatchingSubstringOf from gen.filters.rules import HasTextMatchingSubstringOf
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# "HasTextMatchingRegexOf" # "HasTextMatchingRegexOf"

View File

@ -32,7 +32,7 @@ from gen.ggettext import gettext as _
# GRAMPS modules # GRAMPS modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from Filters.Rules import Rule from gen.filters.rules import Rule
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# "HasTextMatchingSubstringOf" # "HasTextMatchingSubstringOf"

View File

@ -30,7 +30,7 @@ from gen.ggettext import gettext as _
# GRAMPS modules # GRAMPS modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from Filters.Rules import Rule from gen.filters.rules import Rule
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# "People marked private" # "People marked private"

View File

@ -26,7 +26,7 @@
# GRAMPS modules # GRAMPS modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from Filters.Rules import Rule from gen.filters.rules import Rule
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# "People marked public" # "People marked public"

View File

@ -32,7 +32,7 @@ from gen.ggettext import gettext as _
# GRAMPS modules # GRAMPS modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from Filters.Rules import MatchesFilterBase from gen.filters.rules import MatchesFilterBase
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #

View File

@ -32,8 +32,8 @@ from gen.ggettext import gettext as _
# GRAMPS modules # GRAMPS modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
import Filters import gen.filters
from Filters.Rules import Rule from gen.filters.rules import Rule
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #
@ -55,25 +55,24 @@ class MatchesFilterBase(Rule):
category = _('General filters') category = _('General filters')
def prepare(self, db): def prepare(self, db):
if Filters.CustomFilters: if gen.filters.CustomFilters:
filters = Filters.CustomFilters.get_filters_dict(self.namespace) filters = gen.filters.CustomFilters.get_filters_dict(self.namespace)
if self.list[0] in filters: if self.list[0] in filters:
filt = filters[self.list[0]] filt = filters[self.list[0]]
for rule in filt.flist: for rule in filt.flist:
rule.requestprepare(db) rule.requestprepare(db)
def reset(self): def reset(self):
if Filters.CustomFilters: if gen.filters.CustomFilters:
filters = Filters.CustomFilters.get_filters_dict(self.namespace) filters = gen.filters.CustomFilters.get_filters_dict(self.namespace)
if self.list[0] in filters: if self.list[0] in filters:
filt = filters[self.list[0]] filt = filters[self.list[0]]
for rule in filt.flist: for rule in filt.flist:
rule.requestreset() rule.requestreset()
def apply(self, db, obj): def apply(self, db, obj):
if Filters.CustomFilters: if gen.filters.CustomFilters:
filters = Filters.CustomFilters.get_filters_dict(self.namespace) filters = gen.filters.CustomFilters.get_filters_dict(self.namespace)
if self.list[0] in filters: if self.list[0] in filters:
filt = filters[self.list[0]] filt = filters[self.list[0]]
return filt.check(db, obj.handle) return filt.check(db, obj.handle)
@ -83,8 +82,8 @@ class MatchesFilterBase(Rule):
""" """
Return the selected filter or None. Return the selected filter or None.
""" """
if Filters.CustomFilters: if gen.filters.CustomFilters:
filters = Filters.CustomFilters.get_filters_dict(self.namespace) filters = gen.filters.CustomFilters.get_filters_dict(self.namespace)
if self.list[0] in filters: if self.list[0] in filters:
return filters[self.list[0]] return filters[self.list[0]]
return None return None

View File

@ -20,7 +20,7 @@
# along with this program; if not, write to the Free Software # along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
# #
# Filters/Rules/_MatchesSourceConfidenceBase.py # gen.filters.rules/_MatchesSourceConfidenceBase.py
# $Id$ # $Id$
# #
@ -36,7 +36,7 @@ from gen.ggettext import gettext as _
# GRAMPS modules # GRAMPS modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from Filters.Rules._Rule import Rule from gen.filters.rules._Rule import Rule
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# "Confidence level" # "Confidence level"

View File

@ -33,7 +33,7 @@ from gen.ggettext import gettext as _
# GRAMPS modules # GRAMPS modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from Filters.Rules import MatchesFilterBase from gen.filters.rules import MatchesFilterBase
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #

View File

@ -33,7 +33,7 @@ from gen.ggettext import gettext as _
# GRAMPS modules # GRAMPS modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from Filters.Rules import Rule from gen.filters.rules import Rule
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #

View File

@ -25,7 +25,7 @@
""" """
Package providing filter rules for GRAMPS. Package providing filter rules for GRAMPS.
The following filters are provided in Filters/Rules. The following filters are provided in gen.filters.rules.
Match given values: Match given values:
_HasCitationBase Citation with a particular value (HasCitation) _HasCitationBase Citation with a particular value (HasCitation)
@ -68,20 +68,20 @@ _Everything Match every object in the database
""" """
# Need to expose this to be available for filter plugins: # Need to expose this to be available for filter plugins:
# the plugins should say: from Filters.Rules import Rule # the plugins should say: from gen.filters.rules import Rule
from Filters.Rules._Rule import Rule from gen.filters.rules._Rule import Rule
from Filters.Rules._Everything import Everything from gen.filters.rules._Everything import Everything
from Filters.Rules._HasGrampsId import HasGrampsId from gen.filters.rules._HasGrampsId import HasGrampsId
from Filters.Rules._IsPrivate import IsPrivate from gen.filters.rules._IsPrivate import IsPrivate
from Filters.Rules._IsPublic import IsPublic from gen.filters.rules._IsPublic import IsPublic
from Filters.Rules._HasTextMatchingSubstringOf import HasTextMatchingSubstringOf from gen.filters.rules._HasTextMatchingSubstringOf import HasTextMatchingSubstringOf
from Filters.Rules._HasTextMatchingRegexpOf import HasTextMatchingRegexpOf from gen.filters.rules._HasTextMatchingRegexpOf import HasTextMatchingRegexpOf
from Filters.Rules._MatchesFilterBase import MatchesFilterBase from gen.filters.rules._MatchesFilterBase import MatchesFilterBase
from Filters.Rules._MatchesEventFilterBase import MatchesEventFilterBase from gen.filters.rules._MatchesEventFilterBase import MatchesEventFilterBase
from Filters.Rules._MatchesSourceConfidenceBase import MatchesSourceConfidenceBase from gen.filters.rules._MatchesSourceConfidenceBase import MatchesSourceConfidenceBase
from Filters.Rules._MatchesSourceFilterBase import MatchesSourceFilterBase from gen.filters.rules._MatchesSourceFilterBase import MatchesSourceFilterBase
from Filters.Rules._ChangedSinceBase import ChangedSinceBase from gen.filters.rules._ChangedSinceBase import ChangedSinceBase
from Filters.Rules import (Person, Family, Event, Source, Citation, Place, from gen.filters.rules import (person, family, event, source, citation, place,
MediaObject, Repository, Note) media, repository, note)

View File

@ -1,7 +1,7 @@
# This is the src/Filters/Rules/Citation level Makefile for Gramps # This is the src/Filters/Rules/Citation level Makefile for Gramps
# $Id$ # $Id$
pkgpythondir = $(datadir)/@PACKAGE@/Filters/Rules/Citation pkgpythondir = $(datadir)/@PACKAGE@/gen/filters/rules/citation
pkgpython_PYTHON = \ pkgpython_PYTHON = \
__init__.py \ __init__.py \
@ -21,12 +21,12 @@ pkgpython_PYTHON = \
_MatchesSourceFilter.py \ _MatchesSourceFilter.py \
_RegExpIdOf.py _RegExpIdOf.py
pkgpyexecdir = @pkgpyexecdir@/Filters/Rules/Citation pkgpyexecdir = @pkgpyexecdir@/gen/filters/rules/citation
# Clean up all the byte-compiled files # Clean up all the byte-compiled files
MOSTLYCLEANFILES = *pyc *pyo MOSTLYCLEANFILES = *pyc *pyo
GRAMPS_PY_MODPATH = "../../../" GRAMPS_PY_MODPATH = "../../../../"
pycheck: pycheck:
(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \ (export PYTHONPATH=$(GRAMPS_PY_MODPATH); \

View File

@ -33,7 +33,7 @@ from gen.ggettext import gettext as _
# GRAMPS modules # GRAMPS modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from Filters.Rules._Everything import Everything from gen.filters.rules._Everything import Everything
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #

View File

@ -33,7 +33,7 @@ from gen.ggettext import gettext as _
# GRAMPS modules # GRAMPS modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from Filters.Rules._ChangedSinceBase import ChangedSinceBase from gen.filters.rules._ChangedSinceBase import ChangedSinceBase
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #

View File

@ -33,7 +33,7 @@ from gen.ggettext import gettext as _
# GRAMPS modules # GRAMPS modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from Filters.Rules._IsPrivate import IsPrivate from gen.filters.rules._IsPrivate import IsPrivate
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# "Family marked private" # "Family marked private"

View File

@ -35,7 +35,7 @@ from gen.ggettext import gettext as _
# GRAMPS modules # GRAMPS modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from Filters.Rules._HasGalleryBase import HasGalleryBase from gen.filters.rules._HasGalleryBase import HasGalleryBase
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# "Sources who have media object reference" # "Sources who have media object reference"

View File

@ -33,7 +33,7 @@ from gen.ggettext import gettext as _
# GRAMPS modules # GRAMPS modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from Filters.Rules import HasGrampsId from gen.filters.rules import HasGrampsId
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #

View File

@ -36,7 +36,7 @@ from gen.ggettext import gettext as _
# GRAMPS modules # GRAMPS modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from Filters.Rules._HasNoteBase import HasNoteBase from gen.filters.rules._HasNoteBase import HasNoteBase
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# "Sources having notes" # "Sources having notes"

View File

@ -33,7 +33,7 @@ from gen.ggettext import gettext as _
# GRAMPS modules # GRAMPS modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from Filters.Rules._HasNoteSubstrBase import HasNoteSubstrBase from gen.filters.rules._HasNoteSubstrBase import HasNoteSubstrBase
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# "Events having notes that contain a substring" # "Events having notes that contain a substring"

View File

@ -33,7 +33,7 @@ from gen.ggettext import gettext as _
# GRAMPS modules # GRAMPS modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from Filters.Rules._HasNoteRegexBase import HasNoteRegexBase from gen.filters.rules._HasNoteRegexBase import HasNoteRegexBase
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# "Sources having notes that contain a substring" # "Sources having notes that contain a substring"

View File

@ -33,7 +33,7 @@ from gen.ggettext import gettext as _
# GRAMPS modules # GRAMPS modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from Filters.Rules._HasReferenceCountBase import HasReferenceCountBase from gen.filters.rules._HasReferenceCountBase import HasReferenceCountBase
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# "Source objects with a certain reference count" # "Source objects with a certain reference count"

View File

@ -36,7 +36,7 @@ from gen.ggettext import gettext as _
# GRAMPS modules # GRAMPS modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from Filters.Rules._HasSourceBase import HasSourceBase from gen.filters.rules._HasSourceBase import HasSourceBase
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #

View File

@ -33,7 +33,7 @@ from gen.ggettext import gettext as _
# GRAMPS modules # GRAMPS modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from Filters.Rules._MatchesFilterBase import MatchesFilterBase from gen.filters.rules._MatchesFilterBase import MatchesFilterBase
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #

View File

@ -32,7 +32,7 @@ from gen.ggettext import gettext as _
# GRAMPS modules # GRAMPS modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from Filters.Rules import Rule from gen.filters.rules import Rule
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# "Sources having a title that contain a substring" # "Sources having a title that contain a substring"

View File

@ -35,7 +35,7 @@ from gen.ggettext import gettext as _
# GRAMPS modules # GRAMPS modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from Filters.Rules import MatchesFilterBase from gen.filters.rules import MatchesFilterBase
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# "Sources which reference a repository by selection" # "Sources which reference a repository by selection"

View File

@ -34,7 +34,7 @@ from gen.ggettext import gettext as _
# GRAMPS modules # GRAMPS modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from Filters.Rules import MatchesFilterBase from gen.filters.rules import MatchesFilterBase
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #

View File

@ -33,7 +33,7 @@ from gen.ggettext import gettext as _
# GRAMPS modules # GRAMPS modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from Filters.Rules._RegExpIdBase import RegExpIdBase from gen.filters.rules._RegExpIdBase import RegExpIdBase
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #

View File

@ -26,7 +26,7 @@
Package providing filter rules for GRAMPS. Package providing filter rules for GRAMPS.
""" """
from Filters.Rules._HasCitationBase import HasCitationBase as HasCitation from gen.filters.rules._HasCitationBase import HasCitationBase as HasCitation
from _AllCitations import AllCitations from _AllCitations import AllCitations
from _ChangedSince import ChangedSince from _ChangedSince import ChangedSince

View File

@ -1,7 +1,7 @@
# This is the src/Filters/Rules/Event level Makefile for Gramps # This is the src/Filters/Rules/Event level Makefile for Gramps
# $Id$ # $Id$
pkgpythondir = $(datadir)/@PACKAGE@/Filters/Rules/Event pkgpythondir = $(datadir)/@PACKAGE@/gen/filters/rules/event
pkgpython_PYTHON = \ pkgpython_PYTHON = \
_ChangedSince.py\ _ChangedSince.py\
@ -25,13 +25,13 @@ pkgpython_PYTHON = \
_HasAttribute.py\ _HasAttribute.py\
__init__.py __init__.py
pkgpyexecdir = @pkgpyexecdir@/Filters/Rules/Event pkgpyexecdir = @pkgpyexecdir@/gen/filters/rules/event
# Clean up all the byte-compiled files # Clean up all the byte-compiled files
MOSTLYCLEANFILES = *pyc *pyo MOSTLYCLEANFILES = *pyc *pyo
GRAMPS_PY_MODPATH = "../../../" GRAMPS_PY_MODPATH = "../../../../"
pycheck: pycheck:
(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \ (export PYTHONPATH=$(GRAMPS_PY_MODPATH); \

View File

@ -32,7 +32,7 @@ from gen.ggettext import gettext as _
# GRAMPS modules # GRAMPS modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from Filters.Rules._Everything import Everything from gen.filters.rules._Everything import Everything
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #

View File

@ -18,7 +18,7 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
# #
# Filters/Rules/Event/_ChangedSince.py # gen.filters.rules/Event/_ChangedSince.py
# $Id$ # $Id$
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
@ -33,7 +33,7 @@ from gen.ggettext import gettext as _
# GRAMPS modules # GRAMPS modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from Filters.Rules._ChangedSinceBase import ChangedSinceBase from gen.filters.rules._ChangedSinceBase import ChangedSinceBase
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #

View File

@ -32,7 +32,7 @@ from gen.ggettext import gettext as _
# GRAMPS modules # GRAMPS modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from Filters.Rules._IsPrivate import IsPrivate from gen.filters.rules._IsPrivate import IsPrivate
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# "Family marked private" # "Family marked private"

View File

@ -32,7 +32,7 @@ from gen.ggettext import gettext as _
# GRAMPS modules # GRAMPS modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from Filters.Rules._HasAttributeBase import HasAttributeBase from gen.filters.rules._HasAttributeBase import HasAttributeBase
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #

View File

@ -36,7 +36,7 @@ from gen.ggettext import gettext as _
# GRAMPS modules # GRAMPS modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from Filters.Rules._HasCitationBase import HasCitationBase from gen.filters.rules._HasCitationBase import HasCitationBase
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #

View File

@ -34,7 +34,7 @@ from gen.ggettext import gettext as _
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
import DateHandler import DateHandler
from gen.lib import EventType from gen.lib import EventType
from Filters.Rules._Rule import Rule from gen.filters.rules._Rule import Rule
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #

View File

@ -19,7 +19,7 @@
# along with this program; if not, write to the Free Software # along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
# #
# Filters/Rules/Event/_HasGallery.py # gen.filters.rules/Event/_HasGallery.py
# $Id$ # $Id$
# #
@ -35,7 +35,7 @@ from gen.ggettext import gettext as _
# GRAMPS modules # GRAMPS modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from Filters.Rules._HasGalleryBase import HasGalleryBase from gen.filters.rules._HasGalleryBase import HasGalleryBase
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# "Events who have media object reference" # "Events who have media object reference"

View File

@ -32,7 +32,7 @@ from gen.ggettext import gettext as _
# GRAMPS modules # GRAMPS modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from Filters.Rules import HasGrampsId from gen.filters.rules import HasGrampsId
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #

View File

@ -35,7 +35,7 @@ from gen.ggettext import gettext as _
# GRAMPS modules # GRAMPS modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from Filters.Rules._HasNoteBase import HasNoteBase from gen.filters.rules._HasNoteBase import HasNoteBase
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# "Events having notes" # "Events having notes"

View File

@ -32,7 +32,7 @@ from gen.ggettext import gettext as _
# GRAMPS modules # GRAMPS modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from Filters.Rules._HasNoteSubstrBase import HasNoteSubstrBase from gen.filters.rules._HasNoteSubstrBase import HasNoteSubstrBase
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# "Events having notes that contain a substring" # "Events having notes that contain a substring"

View File

@ -32,7 +32,7 @@ from gen.ggettext import gettext as _
# GRAMPS modules # GRAMPS modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from Filters.Rules._HasNoteRegexBase import HasNoteRegexBase from gen.filters.rules._HasNoteRegexBase import HasNoteRegexBase
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# "Events having notes that contain a substring" # "Events having notes that contain a substring"

View File

@ -32,7 +32,7 @@ from gen.ggettext import gettext as _
# GRAMPS modules # GRAMPS modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from Filters.Rules._HasReferenceCountBase import HasReferenceCountBase from gen.filters.rules._HasReferenceCountBase import HasReferenceCountBase
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# "Events with a certain reference count" # "Events with a certain reference count"

View File

@ -34,7 +34,7 @@ from gen.ggettext import gettext as _
# GRAMPS modules # GRAMPS modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from Filters.Rules._HasSourceCountBase import HasSourceCountBase from gen.filters.rules._HasSourceCountBase import HasSourceCountBase
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# "People having sources" # "People having sources"

View File

@ -33,7 +33,7 @@ from gen.ggettext import gettext as _
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from gen.lib import EventType from gen.lib import EventType
from Filters.Rules import Rule from gen.filters.rules import Rule
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #

View File

@ -32,7 +32,7 @@ from gen.ggettext import gettext as _
# GRAMPS modules # GRAMPS modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from Filters.Rules import MatchesFilterBase from gen.filters.rules import MatchesFilterBase
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #

View File

@ -32,7 +32,7 @@ from gen.ggettext import gettext as _
# GRAMPS modules # GRAMPS modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from Filters.Rules import MatchesFilterBase from gen.filters.rules import MatchesFilterBase
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #

View File

@ -17,7 +17,7 @@
# along with this program; if not, write to the Free Software # along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
# #
# Filters/Rules/Event/_MatchesSourceConfidence.py # gen.filters.rules/Event/_MatchesSourceConfidence.py
# $Id$ # $Id$
# #
@ -33,7 +33,7 @@ from gen.ggettext import sgettext as _
# GRAMPS modules # GRAMPS modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from Filters.Rules._MatchesSourceConfidenceBase import MatchesSourceConfidenceBase from gen.filters.rules._MatchesSourceConfidenceBase import MatchesSourceConfidenceBase
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# "Confidence level" # "Confidence level"

View File

@ -34,7 +34,7 @@ from gen.ggettext import gettext as _
# GRAMPS modules # GRAMPS modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from Filters.Rules import MatchesSourceFilterBase from gen.filters.rules import MatchesSourceFilterBase
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #

View File

@ -32,7 +32,7 @@ from gen.ggettext import gettext as _
# GRAMPS modules # GRAMPS modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from Filters.Rules._RegExpIdBase import RegExpIdBase from gen.filters.rules._RegExpIdBase import RegExpIdBase
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #

View File

@ -26,7 +26,7 @@
Package providing filter rules for GRAMPS. Package providing filter rules for GRAMPS.
""" """
from Filters.Rules._HasEventBase import HasEventBase as HasEvent from gen.filters.rules._HasEventBase import HasEventBase as HasEvent
from _HasType import HasType from _HasType import HasType
from _AllEvents import AllEvents from _AllEvents import AllEvents

View File

@ -1,7 +1,7 @@
# This is the src/Filters/Rules/Family level Makefile for Gramps # This is the src/Filters/Rules/Family level Makefile for Gramps
# $Id$ # $Id$
pkgpythondir = $(datadir)/@PACKAGE@/Filters/Rules/Family pkgpythondir = $(datadir)/@PACKAGE@/gen/filters/rules/family
pkgpython_PYTHON = \ pkgpython_PYTHON = \
_AllFamilies.py\ _AllFamilies.py\
@ -40,12 +40,12 @@ pkgpython_PYTHON = \
_MemberBase.py _MemberBase.py
pkgpyexecdir = @pkgpyexecdir@/Filters/Rules/Family pkgpyexecdir = @pkgpyexecdir@/gen/filters/rules/family
# Clean up all the byte-compiled files # Clean up all the byte-compiled files
MOSTLYCLEANFILES = *pyc *pyo MOSTLYCLEANFILES = *pyc *pyo
GRAMPS_PY_MODPATH = "../../../" GRAMPS_PY_MODPATH = "../../../../"
pycheck: pycheck:
(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \ (export PYTHONPATH=$(GRAMPS_PY_MODPATH); \

View File

@ -32,7 +32,7 @@ from gen.ggettext import gettext as _
# GRAMPS modules # GRAMPS modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from Filters.Rules._Everything import Everything from gen.filters.rules._Everything import Everything
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #

View File

@ -18,7 +18,7 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
# #
# Filters/Rules/Family/_ChangedSince.py # gen.filters.rules/Family/_ChangedSince.py
# $Id$ # $Id$
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
@ -33,7 +33,7 @@ from gen.ggettext import gettext as _
# GRAMPS modules # GRAMPS modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from Filters.Rules._ChangedSinceBase import ChangedSinceBase from gen.filters.rules._ChangedSinceBase import ChangedSinceBase
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #

View File

@ -32,7 +32,7 @@ from gen.ggettext import gettext as _
# GRAMPS modules # GRAMPS modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from Filters.Rules import HasGrampsId from gen.filters.rules import HasGrampsId
from _MemberBase import child_base from _MemberBase import child_base
#------------------------------------------------------------------------- #-------------------------------------------------------------------------

View File

@ -32,7 +32,7 @@ from gen.ggettext import gettext as _
# GRAMPS modules # GRAMPS modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from Filters.Rules.Person import HasNameOf from gen.filters.rules.person import HasNameOf
from _MemberBase import child_base from _MemberBase import child_base
#------------------------------------------------------------------------- #-------------------------------------------------------------------------

View File

@ -32,7 +32,7 @@ from gen.ggettext import gettext as _
# GRAMPS modules # GRAMPS modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from Filters.Rules._IsPrivate import IsPrivate from gen.filters.rules._IsPrivate import IsPrivate
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# "Family marked private" # "Family marked private"

View File

@ -32,7 +32,7 @@ from gen.ggettext import gettext as _
# GRAMPS modules # GRAMPS modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from Filters.Rules import HasGrampsId from gen.filters.rules import HasGrampsId
from _MemberBase import father_base from _MemberBase import father_base
#------------------------------------------------------------------------- #-------------------------------------------------------------------------

View File

@ -32,7 +32,7 @@ from gen.ggettext import gettext as _
# GRAMPS modules # GRAMPS modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from Filters.Rules.Person import HasNameOf from gen.filters.rules.person import HasNameOf
from _MemberBase import father_base from _MemberBase import father_base
#------------------------------------------------------------------------- #-------------------------------------------------------------------------

View File

@ -32,7 +32,7 @@ from gen.ggettext import gettext as _
# GRAMPS modules # GRAMPS modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from Filters.Rules._HasAttributeBase import HasAttributeBase from gen.filters.rules._HasAttributeBase import HasAttributeBase
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #

View File

@ -36,7 +36,7 @@ from gen.ggettext import gettext as _
# GRAMPS modules # GRAMPS modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from Filters.Rules._HasCitationBase import HasCitationBase from gen.filters.rules._HasCitationBase import HasCitationBase
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #

View File

@ -35,7 +35,7 @@ from gen.ggettext import gettext as _
# GRAMPS modules # GRAMPS modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from Filters.Rules._HasEventBase import HasEventBase from gen.filters.rules._HasEventBase import HasEventBase
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #

View File

@ -19,7 +19,7 @@
# along with this program; if not, write to the Free Software # along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
# #
# Filters/Rules/Family/_HasGallery.py # gen.filters.rules/Family/_HasGallery.py
# $Id$ # $Id$
# #
@ -35,7 +35,7 @@ from gen.ggettext import gettext as _
# GRAMPS modules # GRAMPS modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from Filters.Rules._HasGalleryBase import HasGalleryBase from gen.filters.rules._HasGalleryBase import HasGalleryBase
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# "Families who have media object reference" # "Families who have media object reference"

View File

@ -32,7 +32,7 @@ from gen.ggettext import gettext as _
# GRAMPS modules # GRAMPS modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from Filters.Rules import HasGrampsId from gen.filters.rules import HasGrampsId
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #

View File

@ -19,7 +19,7 @@
# along with this program; if not, write to the Free Software # along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
# #
# Filters/Rules/Family/_HasLDS.py # gen.filters.rules/Family/_HasLDS.py
# $Id$ # $Id$
# #
@ -36,7 +36,7 @@ from gen.ggettext import gettext as _
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from Filters.Rules._HasLDSBase import HasLDSBase from gen.filters.rules._HasLDSBase import HasLDSBase
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #

View File

@ -35,7 +35,7 @@ from gen.ggettext import gettext as _
# GRAMPS modules # GRAMPS modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from Filters.Rules._HasNoteBase import HasNoteBase from gen.filters.rules._HasNoteBase import HasNoteBase
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# "Families having notes" # "Families having notes"

View File

@ -32,7 +32,7 @@ from gen.ggettext import gettext as _
# GRAMPS modules # GRAMPS modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from Filters.Rules._HasNoteSubstrBase import HasNoteSubstrBase from gen.filters.rules._HasNoteSubstrBase import HasNoteSubstrBase
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# "People having notes that contain a substring" # "People having notes that contain a substring"

View File

@ -32,7 +32,7 @@ from gen.ggettext import gettext as _
# GRAMPS modules # GRAMPS modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from Filters.Rules._HasNoteRegexBase import HasNoteRegexBase from gen.filters.rules._HasNoteRegexBase import HasNoteRegexBase
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# "People having notes that contain a substring" # "People having notes that contain a substring"

View File

@ -32,7 +32,7 @@ from gen.ggettext import gettext as _
# GRAMPS modules # GRAMPS modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from Filters.Rules._HasReferenceCountBase import HasReferenceCountBase from gen.filters.rules._HasReferenceCountBase import HasReferenceCountBase
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# "Family objects with a certain reference count" # "Family objects with a certain reference count"

View File

@ -33,7 +33,7 @@ from gen.ggettext import gettext as _
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from gen.lib import FamilyRelType from gen.lib import FamilyRelType
from Filters.Rules._Rule import Rule from gen.filters.rules._Rule import Rule
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #

View File

@ -35,7 +35,7 @@ from gen.ggettext import gettext as _
# GRAMPS modules # GRAMPS modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from Filters.Rules._HasSourceCountBase import HasSourceCountBase from gen.filters.rules._HasSourceCountBase import HasSourceCountBase
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# "Families having sources" # "Families having sources"

View File

@ -34,7 +34,7 @@ from gen.ggettext import gettext as _
# GRAMPS modules # GRAMPS modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from Filters.Rules._HasTagBase import HasTagBase from gen.filters.rules._HasTagBase import HasTagBase
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #

Some files were not shown because too many files have changed in this diff Show More