diff --git a/configure.in b/configure.in index 6e783fbc6..a28c1d5b2 100644 --- a/configure.in +++ b/configure.in @@ -97,6 +97,17 @@ src/cli/plug/Makefile src/gen/Makefile src/gen/db/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/mime/Makefile src/gen/plug/Makefile @@ -109,6 +120,8 @@ src/gen/utils/Makefile src/gui/Makefile src/gui/editors/Makefile src/gui/editors/displaytabs/Makefile +src/gui/filters/Makefile +src/gui/filters/sidebar/Makefile src/gui/plug/Makefile src/gui/plug/report/Makefile src/gui/selectors/Makefile @@ -118,18 +131,6 @@ src/gui/widgets/Makefile src/GrampsLogger/Makefile src/Merge/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/GrampsLocale/Makefile src/plugins/Makefile diff --git a/po/POTFILES.in b/po/POTFILES.in index b2bcdf38b..4766a15e9 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -40,6 +40,241 @@ src/gen/db/upgrade.py # gen display API 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 src/gen/lib/attrtype.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/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) src/gui/plug/_dialogs.py src/gui/plug/_guioptions.py @@ -441,255 +692,6 @@ src/plugins/webstuff/webstuff.py # Simple API 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 # diff --git a/po/POTFILES.skip b/po/POTFILES.skip index 54d3b1061..d401ea59d 100644 --- a/po/POTFILES.skip +++ b/po/POTFILES.skip @@ -44,50 +44,6 @@ src/DateHandler/_Date_sv.py src/DateHandler/_Date_zh.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 src/gen/user.py @@ -104,6 +60,62 @@ src/gen/db/read.py src/gen/db/write.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 src/gen/lib/__init__.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/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 src/gui/selectors/__init__.py src/gui/selectors/baseselector.py diff --git a/src/ExportOptions.py b/src/ExportOptions.py index 65678394f..a0f3aa776 100644 --- a/src/ExportOptions.py +++ b/src/ExportOptions.py @@ -39,7 +39,7 @@ from gen.ggettext import gettext as _ from gen.ggettext import ngettext import config 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 class Progress(object): @@ -620,7 +620,7 @@ class WriterOptionBox(object): filter if called if none is selected. """ from gui.filtereditor import EditFilter - from Filters import FilterList, GenericFilterFactory + from gen.filters import FilterList, GenericFilterFactory import const the_filter = None filterdb = FilterList(const.CUSTOM_FILTERS) @@ -649,8 +649,8 @@ class WriterOptionBox(object): """ If a filter changed, save them all. Reloads, and also calls callback. """ - from Filters import CustomFilters - from Filters import reload_custom_filters + from gen.filters import CustomFilters + from gen.filters import reload_custom_filters filterdb.save() reload_custom_filters() if namespace == "Person": @@ -668,7 +668,7 @@ class WriterOptionBox(object): """ import gtk import gobject - from Filters import CustomFilters + from gen.filters import CustomFilters if namespace == "person": # Populate the Person Filter entire_db = GenericFilter() diff --git a/src/Makefile.am b/src/Makefile.am index 2a29e7d9f..8d02dacfc 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -6,7 +6,6 @@ SUBDIRS = \ data \ DateHandler \ docgen \ - Filters \ gen \ glade \ GrampsLocale \ diff --git a/src/gen/Makefile.am b/src/gen/Makefile.am index e14a02942..360d2ed51 100644 --- a/src/gen/Makefile.am +++ b/src/gen/Makefile.am @@ -7,6 +7,7 @@ SUBDIRS = \ db \ display \ + filters \ lib \ mime \ plug \ diff --git a/src/gen/__init__.py b/src/gen/__init__.py index ebdd5d79b..827183f2d 100644 --- a/src/gen/__init__.py +++ b/src/gen/__init__.py @@ -26,4 +26,5 @@ The gen module provides packages that are common to all gramps interfaces (gui, cli and web). """ -__all__ = [ "db", "display", "lib", "mime", "plug", "proxy", "utils" ] +__all__ = [ "db", "display", "filters", "lib", "mime", "plug", "proxy", + "utils" ] diff --git a/src/Filters/Makefile.am b/src/gen/filters/Makefile.am similarity index 53% rename from src/Filters/Makefile.am rename to src/gen/filters/Makefile.am index fef916f19..32a131c68 100644 --- a/src/Filters/Makefile.am +++ b/src/gen/filters/Makefile.am @@ -1,28 +1,24 @@ -# This is the src/Filters level Makefile for Gramps +# This is the src/gen/filters level Makefile for Gramps # $Id$ -SUBDIRS = Rules SideBar +SUBDIRS = rules -pkgpythondir = $(datadir)/@PACKAGE@/Filters +pkgpythondir = $(datadir)/@PACKAGE@/gen/filters pkgpython_PYTHON = \ - _FilterComboBox.py \ _FilterList.py \ - _FilterMenu.py \ _FilterParser.py \ - _FilterStore.py \ _GenericFilter.py \ _ParamFilter.py \ __init__.py \ - _SearchBar.py \ _SearchFilter.py -pkgpyexecdir = @pkgpyexecdir@/Filters +pkgpyexecdir = @pkgpyexecdir@/gen/filters # Clean up all the byte-compiled files MOSTLYCLEANFILES = *pyc *pyo -GRAMPS_PY_MODPATH = "../" +GRAMPS_PY_MODPATH = "../../" pycheck: (export PYTHONPATH=$(GRAMPS_PY_MODPATH); \ diff --git a/src/Filters/_FilterList.py b/src/gen/filters/_FilterList.py similarity index 99% rename from src/Filters/_FilterList.py rename to src/gen/filters/_FilterList.py index 224d85394..61e6870ef 100644 --- a/src/Filters/_FilterList.py +++ b/src/gen/filters/_FilterList.py @@ -34,7 +34,7 @@ import sys # GRAMPS modules # #------------------------------------------------------------------------- -from Filters._FilterParser import FilterParser +from gen.filters._FilterParser import FilterParser from gen.plug import BasePluginManager PLUGMAN = BasePluginManager.get_instance() diff --git a/src/Filters/_FilterParser.py b/src/gen/filters/_FilterParser.py similarity index 66% rename from src/Filters/_FilterParser.py rename to src/gen/filters/_FilterParser.py index a556ac954..de76f91a4 100644 --- a/src/Filters/_FilterParser.py +++ b/src/gen/filters/_FilterParser.py @@ -33,8 +33,8 @@ from gen.ggettext import gettext as _ # Gramps modules # #------------------------------------------------------------------------- -from Filters._GenericFilter import GenericFilterFactory -from Filters import Rules +from gen.filters._GenericFilter import GenericFilterFactory +from gen.filters import rules #------------------------------------------------------------------------- # @@ -60,8 +60,6 @@ class FilterParser(handler.ContentHandler): if tag == "object": if attrs.has_key('type'): self.namespace = attrs['type'] - if self.namespace == 'Media': - self.namespace = 'MediaObject' else: self.namespace = "generic" elif tag == "filter": @@ -90,12 +88,12 @@ class FilterParser(handler.ContentHandler): # First try to use fully qualified name exec 'self.r = %s' % save_name 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('.') last_name = mc_match[-1] try: - exec 'self.r = Rules.%s.%s' % ( - self.namespace,last_name) + exec 'self.r = rules.%s.%s' % ( + self.namespace.lower(), last_name) except (ImportError, NameError, AttributeError ): print "ERROR: Filter rule '%s' in "\ "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 # custom_filters.xml will continue working old_names_2_class = { - "Everyone" : Rules.Person.Everyone, - "Is default person" : Rules.Person.IsDefaultPerson, - "Is bookmarked person" : Rules.Person.IsBookmarked, - "Has the Id" : Rules.Person.HasIdOf, - "Has a name" : Rules.Person.HasNameOf, - "Has the relationships" : Rules.Person.HasRelationship, - "Has the death" : Rules.Person.HasDeath, - "Has the birth" : Rules.Person.HasBirth, - "Is a descendant of" : Rules.Person.IsDescendantOf, - "Is a descendant family member of" : Rules.Person.IsDescendantFamilyOf, - "Is a descendant of filter match": Rules.Person.IsDescendantOfFilterMatch, + "Everyone" : rules.person.Everyone, + "Is default person" : rules.person.IsDefaultPerson, + "Is bookmarked person" : rules.person.IsBookmarked, + "Has the Id" : rules.person.HasIdOf, + "Has a name" : rules.person.HasNameOf, + "Has the relationships" : rules.person.HasRelationship, + "Has the death" : rules.person.HasDeath, + "Has the birth" : rules.person.HasBirth, + "Is a descendant of" : rules.person.IsDescendantOf, + "Is a descendant family member of" : rules.person.IsDescendantFamilyOf, + "Is a descendant of filter match": rules.person.IsDescendantOfFilterMatch, "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": - Rules.Person.IsMoreThanNthGenerationDescendantOf, + rules.person.IsMoreThanNthGenerationDescendantOf, "Is an descendant of person at least N generations away" : - Rules.Person.IsMoreThanNthGenerationDescendantOf, - "Is a child of filter match" : Rules.Person.IsChildOfFilterMatch, - "Is an ancestor of" : Rules.Person.IsAncestorOf, - "Is an ancestor of filter match": Rules.Person.IsAncestorOfFilterMatch, + rules.person.IsMoreThanNthGenerationDescendantOf, + "Is a child of filter match" : rules.person.IsChildOfFilterMatch, + "Is an ancestor of" : rules.person.IsAncestorOf, + "Is an ancestor of filter match": rules.person.IsAncestorOfFilterMatch, "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": - Rules.Person.IsMoreThanNthGenerationAncestorOf, - "Is a parent of filter match" : Rules.Person.IsParentOfFilterMatch, - "Has a common ancestor with" : Rules.Person.HasCommonAncestorWith, + rules.person.IsMoreThanNthGenerationAncestorOf, + "Is a parent of filter match" : rules.person.IsParentOfFilterMatch, + "Has a common ancestor with" : rules.person.HasCommonAncestorWith, "Has a common ancestor with filter match" : - Rules.Person.HasCommonAncestorWithFilterMatch, - "Is a female" : Rules.Person.IsFemale, - "Is a male" : Rules.Person.IsMale, - "Has the personal event" : Rules.Person.HasEvent, - "Has the family event" : Rules.Person.HasFamilyEvent, - "Has the personal attribute" : Rules.Person.HasAttribute, - "Has the family attribute" : Rules.Person.HasFamilyAttribute, - "Has source of" : Rules.Person.HasSourceOf, - "Matches the filter named" : Rules.Person.HasSourceOf, - "Is spouse of filter match" : Rules.Person.IsSpouseOfFilterMatch, - "Is a sibling of filter match" : Rules.Person.IsSiblingOfFilterMatch, + rules.person.HasCommonAncestorWithFilterMatch, + "Is a female" : rules.person.IsFemale, + "Is a male" : rules.person.IsMale, + "Has the personal event" : rules.person.HasEvent, + "Has the family event" : rules.person.HasFamilyEvent, + "Has the personal attribute" : rules.person.HasAttribute, + "Has the family attribute" : rules.person.HasFamilyAttribute, + "Has source of" : rules.person.HasSourceOf, + "Matches the filter named" : rules.person.HasSourceOf, + "Is spouse of filter match" : rules.person.IsSpouseOfFilterMatch, + "Is a sibling of filter match" : rules.person.IsSiblingOfFilterMatch, "Relationship path between two people" : - Rules.Person.RelationshipPathBetween, + rules.person.RelationshipPathBetween, "Relationship paths between a person and a list of people" : - Rules.Person.DeepRelationshipPathBetween, - "People who were adopted" : Rules.Person.HaveAltFamilies, - "People who have images" : Rules.Person.HavePhotos, - "People with children" : Rules.Person.HaveChildren, - "People with incomplete names" : Rules.Person.IncompleteNames, - "People with no marriage records" : Rules.Person.NeverMarried, - "People with multiple marriage records": Rules.Person.MultipleMarriages, - "People without a birth date" : Rules.Person.NoBirthdate, - "People with incomplete events" : Rules.Person.PersonWithIncompleteEvent, - "Families with incomplete events" :Rules.Person.FamilyWithIncompleteEvent, - "People probably alive" : Rules.Person.ProbablyAlive, - "People marked private" : Rules.Person.PeoplePrivate, - "People marked public" : Rules.Person.PeoplePublic, - "Witnesses" : Rules.Person.IsWitness, - "Has text matching substring of": Rules.Person.HasTextMatchingSubstringOf, + rules.person.DeepRelationshipPathBetween, + "People who were adopted" : rules.person.HaveAltFamilies, + "People who have images" : rules.person.HavePhotos, + "People with children" : rules.person.HaveChildren, + "People with incomplete names" : rules.person.IncompleteNames, + "People with no marriage records" : rules.person.NeverMarried, + "People with multiple marriage records": rules.person.MultipleMarriages, + "People without a birth date" : rules.person.NoBirthdate, + "People with incomplete events" : rules.person.PersonWithIncompleteEvent, + "Families with incomplete events" :rules.person.FamilyWithIncompleteEvent, + "People probably alive" : rules.person.ProbablyAlive, + "People marked private" : rules.person.PeoplePrivate, + "People marked public" : rules.person.PeoplePublic, + "Witnesses" : rules.person.IsWitness, + "Has text matching substring of": rules.person.HasTextMatchingSubstringOf, } diff --git a/src/Filters/_GenericFilter.py b/src/gen/filters/_GenericFilter.py similarity index 99% rename from src/Filters/_GenericFilter.py rename to src/gen/filters/_GenericFilter.py index 0b839d73f..c91b78532 100644 --- a/src/Filters/_GenericFilter.py +++ b/src/gen/filters/_GenericFilter.py @@ -361,7 +361,7 @@ def GenericFilterFactory(namespace): return GenericCitationFilter elif namespace == 'Place': return GenericPlaceFilter - elif namespace == 'MediaObject': + elif namespace == 'Media': return GenericMediaFilter elif namespace == 'Repository': return GenericRepoFilter diff --git a/src/Filters/_ParamFilter.py b/src/gen/filters/_ParamFilter.py similarity index 97% rename from src/Filters/_ParamFilter.py rename to src/gen/filters/_ParamFilter.py index d08f2c549..d2350606d 100644 --- a/src/Filters/_ParamFilter.py +++ b/src/gen/filters/_ParamFilter.py @@ -29,7 +29,7 @@ Package providing filtering framework for GRAMPS. # GRAMPS modules # #------------------------------------------------------------------------- -from Filters._GenericFilter import GenericFilter +from gen.filters._GenericFilter import GenericFilter from Errors import FilterError #------------------------------------------------------------------------- diff --git a/src/Filters/_SearchFilter.py b/src/gen/filters/_SearchFilter.py similarity index 100% rename from src/Filters/_SearchFilter.py rename to src/gen/filters/_SearchFilter.py diff --git a/src/Filters/__init__.py b/src/gen/filters/__init__.py similarity index 86% rename from src/Filters/__init__.py rename to src/gen/filters/__init__.py index 809160764..c9af8d2e8 100644 --- a/src/Filters/__init__.py +++ b/src/gen/filters/__init__.py @@ -31,6 +31,7 @@ from const import CUSTOM_FILTERS from _FilterList import FilterList from _GenericFilter import GenericFilter, GenericFilterFactory from _ParamFilter import ParamFilter +from _SearchFilter import SearchFilter, ExactSearchFilter #def reload_system_filters(): #global SystemFilters @@ -47,12 +48,3 @@ def reload_custom_filters(): if not CustomFilters: 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 diff --git a/src/Filters/Rules/Makefile.am b/src/gen/filters/rules/Makefile.am similarity index 74% rename from src/Filters/Rules/Makefile.am rename to src/gen/filters/rules/Makefile.am index aabe78529..c0306e5f1 100644 --- a/src/Filters/Rules/Makefile.am +++ b/src/gen/filters/rules/Makefile.am @@ -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$ -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 = \ _ChangedSinceBase.py\ @@ -34,12 +34,12 @@ pkgpython_PYTHON = \ _HasCitationBase.py -pkgpyexecdir = @pkgpyexecdir@/Filters/Rules +pkgpyexecdir = @pkgpyexecdir@/gen/filters/rules # Clean up all the byte-compiled files MOSTLYCLEANFILES = *pyc *pyo -GRAMPS_PY_MODPATH = "../../" +GRAMPS_PY_MODPATH = "../../../" pycheck: (export PYTHONPATH=$(GRAMPS_PY_MODPATH); \ diff --git a/src/Filters/Rules/_ChangedSinceBase.py b/src/gen/filters/rules/_ChangedSinceBase.py similarity index 97% rename from src/Filters/Rules/_ChangedSinceBase.py rename to src/gen/filters/rules/_ChangedSinceBase.py index 18f05a50f..79921d774 100644 --- a/src/Filters/Rules/_ChangedSinceBase.py +++ b/src/gen/filters/rules/_ChangedSinceBase.py @@ -18,7 +18,7 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# Filters/Rules/_ChangedSinceBase.py +# gen.filters.rules/_ChangedSinceBase.py # $Id$ #------------------------------------------------------------------------- @@ -35,7 +35,7 @@ import time # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules import Rule +from gen.filters.rules import Rule #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/_Everything.py b/src/gen/filters/rules/_Everything.py similarity index 97% rename from src/Filters/Rules/_Everything.py rename to src/gen/filters/rules/_Everything.py index 11a0801f8..77f6a967b 100644 --- a/src/Filters/Rules/_Everything.py +++ b/src/gen/filters/rules/_Everything.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules import Rule +from gen.filters.rules import Rule #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/_HasAttributeBase.py b/src/gen/filters/rules/_HasAttributeBase.py similarity index 98% rename from src/Filters/Rules/_HasAttributeBase.py rename to src/gen/filters/rules/_HasAttributeBase.py index 4ec92a733..8b02626ec 100644 --- a/src/Filters/Rules/_HasAttributeBase.py +++ b/src/gen/filters/rules/_HasAttributeBase.py @@ -33,7 +33,7 @@ from gen.ggettext import gettext as _ # #------------------------------------------------------------------------- from gen.lib import AttributeType -from Filters.Rules import Rule +from gen.filters.rules import Rule #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/_HasCitationBase.py b/src/gen/filters/rules/_HasCitationBase.py similarity index 98% rename from src/Filters/Rules/_HasCitationBase.py rename to src/gen/filters/rules/_HasCitationBase.py index bb0855bdf..2f06aceda 100644 --- a/src/Filters/Rules/_HasCitationBase.py +++ b/src/gen/filters/rules/_HasCitationBase.py @@ -34,7 +34,7 @@ from gen.ggettext import gettext as _ # #------------------------------------------------------------------------- import DateHandler -from Filters.Rules._Rule import Rule +from gen.filters.rules._Rule import Rule #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/_HasEventBase.py b/src/gen/filters/rules/_HasEventBase.py similarity index 98% rename from src/Filters/Rules/_HasEventBase.py rename to src/gen/filters/rules/_HasEventBase.py index cec5f4db2..c9fb59073 100644 --- a/src/Filters/Rules/_HasEventBase.py +++ b/src/gen/filters/rules/_HasEventBase.py @@ -34,7 +34,7 @@ from gen.ggettext import gettext as _ #------------------------------------------------------------------------- import DateHandler from gen.lib import EventType -from Filters.Rules import Rule +from gen.filters.rules import Rule from Utils import get_participant_from_event #------------------------------------------------------------------------- diff --git a/src/Filters/Rules/_HasGalleryBase.py b/src/gen/filters/rules/_HasGalleryBase.py similarity index 97% rename from src/Filters/Rules/_HasGalleryBase.py rename to src/gen/filters/rules/_HasGalleryBase.py index caa7d4434..b46f6233e 100755 --- a/src/Filters/Rules/_HasGalleryBase.py +++ b/src/gen/filters/rules/_HasGalleryBase.py @@ -19,7 +19,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# Filters/Rules/_HasGalleryBase.py +# gen.filters.rules/_HasGalleryBase.py # $Id$ # @@ -35,7 +35,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules import Rule +from gen.filters.rules import Rule #------------------------------------------------------------------------- # "People who have images" diff --git a/src/Filters/Rules/_HasGrampsId.py b/src/gen/filters/rules/_HasGrampsId.py similarity index 98% rename from src/Filters/Rules/_HasGrampsId.py rename to src/gen/filters/rules/_HasGrampsId.py index e65d03b33..b420cac60 100644 --- a/src/Filters/Rules/_HasGrampsId.py +++ b/src/gen/filters/rules/_HasGrampsId.py @@ -33,7 +33,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules import Rule +from gen.filters.rules import Rule #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/_HasLDSBase.py b/src/gen/filters/rules/_HasLDSBase.py similarity index 97% rename from src/Filters/Rules/_HasLDSBase.py rename to src/gen/filters/rules/_HasLDSBase.py index cb3e2a311..8d2b8630a 100755 --- a/src/Filters/Rules/_HasLDSBase.py +++ b/src/gen/filters/rules/_HasLDSBase.py @@ -19,7 +19,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# Filters/Rules/_HasLDSBase.py +# gen.filters.rules/_HasLDSBase.py # $Id$ # @@ -36,7 +36,7 @@ from gen.ggettext import gettext as _ # #------------------------------------------------------------------------- -from Filters.Rules import Rule +from gen.filters.rules import Rule #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/_HasNoteBase.py b/src/gen/filters/rules/_HasNoteBase.py similarity index 97% rename from src/Filters/Rules/_HasNoteBase.py rename to src/gen/filters/rules/_HasNoteBase.py index 5be11ccd4..3f57cde34 100755 --- a/src/Filters/Rules/_HasNoteBase.py +++ b/src/gen/filters/rules/_HasNoteBase.py @@ -20,7 +20,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# Filters/Rules/_HasNoteBase.py +# gen.filters.rules/_HasNoteBase.py # $Id$ # @@ -36,7 +36,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._Rule import Rule +from gen.filters.rules._Rule import Rule #------------------------------------------------------------------------- # "Objects having notes" diff --git a/src/Filters/Rules/_HasNoteRegexBase.py b/src/gen/filters/rules/_HasNoteRegexBase.py similarity index 98% rename from src/Filters/Rules/_HasNoteRegexBase.py rename to src/gen/filters/rules/_HasNoteRegexBase.py index 1e62fdb9b..de45a9acf 100644 --- a/src/Filters/Rules/_HasNoteRegexBase.py +++ b/src/gen/filters/rules/_HasNoteRegexBase.py @@ -33,7 +33,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules import Rule +from gen.filters.rules import Rule #------------------------------------------------------------------------- # "People having notes that contain a substring" diff --git a/src/Filters/Rules/_HasNoteSubstrBase.py b/src/gen/filters/rules/_HasNoteSubstrBase.py similarity index 98% rename from src/Filters/Rules/_HasNoteSubstrBase.py rename to src/gen/filters/rules/_HasNoteSubstrBase.py index 737008d42..ef6cb2b94 100644 --- a/src/Filters/Rules/_HasNoteSubstrBase.py +++ b/src/gen/filters/rules/_HasNoteSubstrBase.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules import Rule +from gen.filters.rules import Rule #------------------------------------------------------------------------- # "People having notes that contain a substring" diff --git a/src/Filters/Rules/_HasReferenceCountBase.py b/src/gen/filters/rules/_HasReferenceCountBase.py similarity index 98% rename from src/Filters/Rules/_HasReferenceCountBase.py rename to src/gen/filters/rules/_HasReferenceCountBase.py index e2aa7dd68..cd4771df5 100644 --- a/src/Filters/Rules/_HasReferenceCountBase.py +++ b/src/gen/filters/rules/_HasReferenceCountBase.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules import Rule +from gen.filters.rules import Rule #------------------------------------------------------------------------- # "Objects with a certain reference count" diff --git a/src/Filters/Rules/_HasSourceBase.py b/src/gen/filters/rules/_HasSourceBase.py similarity index 98% rename from src/Filters/Rules/_HasSourceBase.py rename to src/gen/filters/rules/_HasSourceBase.py index 3b531ce29..e38dea877 100644 --- a/src/Filters/Rules/_HasSourceBase.py +++ b/src/gen/filters/rules/_HasSourceBase.py @@ -33,7 +33,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._Rule import Rule +from gen.filters.rules._Rule import Rule #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/_HasSourceCountBase.py b/src/gen/filters/rules/_HasSourceCountBase.py similarity index 98% rename from src/Filters/Rules/_HasSourceCountBase.py rename to src/gen/filters/rules/_HasSourceCountBase.py index b6dc75e33..a75a9e903 100755 --- a/src/Filters/Rules/_HasSourceCountBase.py +++ b/src/gen/filters/rules/_HasSourceCountBase.py @@ -35,7 +35,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._Rule import Rule +from gen.filters.rules._Rule import Rule #------------------------------------------------------------------------- # "Objects having sources" diff --git a/src/Filters/Rules/_HasTagBase.py b/src/gen/filters/rules/_HasTagBase.py similarity index 98% rename from src/Filters/Rules/_HasTagBase.py rename to src/gen/filters/rules/_HasTagBase.py index 6c6ab742c..613e81ae9 100644 --- a/src/Filters/Rules/_HasTagBase.py +++ b/src/gen/filters/rules/_HasTagBase.py @@ -34,7 +34,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules import Rule +from gen.filters.rules import Rule #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/_HasTextMatchingRegexpOf.py b/src/gen/filters/rules/_HasTextMatchingRegexpOf.py similarity index 96% rename from src/Filters/Rules/_HasTextMatchingRegexpOf.py rename to src/gen/filters/rules/_HasTextMatchingRegexpOf.py index 8b38b2ef5..acbe93916 100644 --- a/src/Filters/Rules/_HasTextMatchingRegexpOf.py +++ b/src/gen/filters/rules/_HasTextMatchingRegexpOf.py @@ -25,7 +25,7 @@ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules import HasTextMatchingSubstringOf +from gen.filters.rules import HasTextMatchingSubstringOf #------------------------------------------------------------------------- # "HasTextMatchingRegexOf" diff --git a/src/Filters/Rules/_HasTextMatchingSubstringOf.py b/src/gen/filters/rules/_HasTextMatchingSubstringOf.py similarity index 98% rename from src/Filters/Rules/_HasTextMatchingSubstringOf.py rename to src/gen/filters/rules/_HasTextMatchingSubstringOf.py index 51512e502..fb9650b6c 100644 --- a/src/Filters/Rules/_HasTextMatchingSubstringOf.py +++ b/src/gen/filters/rules/_HasTextMatchingSubstringOf.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules import Rule +from gen.filters.rules import Rule #------------------------------------------------------------------------- # "HasTextMatchingSubstringOf" diff --git a/src/Filters/Rules/_IsPrivate.py b/src/gen/filters/rules/_IsPrivate.py similarity index 97% rename from src/Filters/Rules/_IsPrivate.py rename to src/gen/filters/rules/_IsPrivate.py index a814b841b..2d1fec0f8 100644 --- a/src/Filters/Rules/_IsPrivate.py +++ b/src/gen/filters/rules/_IsPrivate.py @@ -30,7 +30,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules import Rule +from gen.filters.rules import Rule #------------------------------------------------------------------------- # "People marked private" diff --git a/src/Filters/Rules/_IsPublic.py b/src/gen/filters/rules/_IsPublic.py similarity index 97% rename from src/Filters/Rules/_IsPublic.py rename to src/gen/filters/rules/_IsPublic.py index 625704864..dfce8d8a8 100644 --- a/src/Filters/Rules/_IsPublic.py +++ b/src/gen/filters/rules/_IsPublic.py @@ -26,7 +26,7 @@ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules import Rule +from gen.filters.rules import Rule #------------------------------------------------------------------------- # "People marked public" diff --git a/src/Filters/Rules/_MatchesEventFilterBase.py b/src/gen/filters/rules/_MatchesEventFilterBase.py similarity index 98% rename from src/Filters/Rules/_MatchesEventFilterBase.py rename to src/gen/filters/rules/_MatchesEventFilterBase.py index bca9a1ba2..ab650af28 100644 --- a/src/Filters/Rules/_MatchesEventFilterBase.py +++ b/src/gen/filters/rules/_MatchesEventFilterBase.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules import MatchesFilterBase +from gen.filters.rules import MatchesFilterBase #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/_MatchesFilterBase.py b/src/gen/filters/rules/_MatchesFilterBase.py similarity index 82% rename from src/Filters/Rules/_MatchesFilterBase.py rename to src/gen/filters/rules/_MatchesFilterBase.py index 76040ebb2..a51637fc5 100644 --- a/src/Filters/Rules/_MatchesFilterBase.py +++ b/src/gen/filters/rules/_MatchesFilterBase.py @@ -32,8 +32,8 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -import Filters -from Filters.Rules import Rule +import gen.filters +from gen.filters.rules import Rule #------------------------------------------------------------------------- # @@ -55,25 +55,24 @@ class MatchesFilterBase(Rule): category = _('General filters') def prepare(self, db): - if Filters.CustomFilters: - filters = Filters.CustomFilters.get_filters_dict(self.namespace) + if gen.filters.CustomFilters: + filters = gen.filters.CustomFilters.get_filters_dict(self.namespace) if self.list[0] in filters: filt = filters[self.list[0]] for rule in filt.flist: rule.requestprepare(db) - def reset(self): - if Filters.CustomFilters: - filters = Filters.CustomFilters.get_filters_dict(self.namespace) + if gen.filters.CustomFilters: + filters = gen.filters.CustomFilters.get_filters_dict(self.namespace) if self.list[0] in filters: filt = filters[self.list[0]] for rule in filt.flist: rule.requestreset() def apply(self, db, obj): - if Filters.CustomFilters: - filters = Filters.CustomFilters.get_filters_dict(self.namespace) + if gen.filters.CustomFilters: + filters = gen.filters.CustomFilters.get_filters_dict(self.namespace) if self.list[0] in filters: filt = filters[self.list[0]] return filt.check(db, obj.handle) @@ -83,8 +82,8 @@ class MatchesFilterBase(Rule): """ Return the selected filter or None. """ - if Filters.CustomFilters: - filters = Filters.CustomFilters.get_filters_dict(self.namespace) + if gen.filters.CustomFilters: + filters = gen.filters.CustomFilters.get_filters_dict(self.namespace) if self.list[0] in filters: return filters[self.list[0]] return None diff --git a/src/Filters/Rules/_MatchesSourceConfidenceBase.py b/src/gen/filters/rules/_MatchesSourceConfidenceBase.py similarity index 95% rename from src/Filters/Rules/_MatchesSourceConfidenceBase.py rename to src/gen/filters/rules/_MatchesSourceConfidenceBase.py index 29385e8e6..61bcd401c 100644 --- a/src/Filters/Rules/_MatchesSourceConfidenceBase.py +++ b/src/gen/filters/rules/_MatchesSourceConfidenceBase.py @@ -20,7 +20,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# Filters/Rules/_MatchesSourceConfidenceBase.py +# gen.filters.rules/_MatchesSourceConfidenceBase.py # $Id$ # @@ -36,7 +36,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._Rule import Rule +from gen.filters.rules._Rule import Rule #------------------------------------------------------------------------- # "Confidence level" diff --git a/src/Filters/Rules/_MatchesSourceFilterBase.py b/src/gen/filters/rules/_MatchesSourceFilterBase.py similarity index 98% rename from src/Filters/Rules/_MatchesSourceFilterBase.py rename to src/gen/filters/rules/_MatchesSourceFilterBase.py index 0f5958241..29917db7f 100644 --- a/src/Filters/Rules/_MatchesSourceFilterBase.py +++ b/src/gen/filters/rules/_MatchesSourceFilterBase.py @@ -33,7 +33,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules import MatchesFilterBase +from gen.filters.rules import MatchesFilterBase #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/_RegExpIdBase.py b/src/gen/filters/rules/_RegExpIdBase.py similarity index 98% rename from src/Filters/Rules/_RegExpIdBase.py rename to src/gen/filters/rules/_RegExpIdBase.py index bb682078c..55f67d882 100644 --- a/src/Filters/Rules/_RegExpIdBase.py +++ b/src/gen/filters/rules/_RegExpIdBase.py @@ -33,7 +33,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules import Rule +from gen.filters.rules import Rule #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/_Rule.py b/src/gen/filters/rules/_Rule.py similarity index 100% rename from src/Filters/Rules/_Rule.py rename to src/gen/filters/rules/_Rule.py diff --git a/src/Filters/Rules/__init__.py b/src/gen/filters/rules/__init__.py similarity index 74% rename from src/Filters/Rules/__init__.py rename to src/gen/filters/rules/__init__.py index 7eddf2f68..10f98439e 100644 --- a/src/Filters/Rules/__init__.py +++ b/src/gen/filters/rules/__init__.py @@ -25,7 +25,7 @@ """ 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: _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: -# the plugins should say: from Filters.Rules import Rule -from Filters.Rules._Rule import Rule +# the plugins should say: from gen.filters.rules import Rule +from gen.filters.rules._Rule import Rule -from Filters.Rules._Everything import Everything -from Filters.Rules._HasGrampsId import HasGrampsId -from Filters.Rules._IsPrivate import IsPrivate -from Filters.Rules._IsPublic import IsPublic -from Filters.Rules._HasTextMatchingSubstringOf import HasTextMatchingSubstringOf -from Filters.Rules._HasTextMatchingRegexpOf import HasTextMatchingRegexpOf -from Filters.Rules._MatchesFilterBase import MatchesFilterBase -from Filters.Rules._MatchesEventFilterBase import MatchesEventFilterBase -from Filters.Rules._MatchesSourceConfidenceBase import MatchesSourceConfidenceBase -from Filters.Rules._MatchesSourceFilterBase import MatchesSourceFilterBase -from Filters.Rules._ChangedSinceBase import ChangedSinceBase +from gen.filters.rules._Everything import Everything +from gen.filters.rules._HasGrampsId import HasGrampsId +from gen.filters.rules._IsPrivate import IsPrivate +from gen.filters.rules._IsPublic import IsPublic +from gen.filters.rules._HasTextMatchingSubstringOf import HasTextMatchingSubstringOf +from gen.filters.rules._HasTextMatchingRegexpOf import HasTextMatchingRegexpOf +from gen.filters.rules._MatchesFilterBase import MatchesFilterBase +from gen.filters.rules._MatchesEventFilterBase import MatchesEventFilterBase +from gen.filters.rules._MatchesSourceConfidenceBase import MatchesSourceConfidenceBase +from gen.filters.rules._MatchesSourceFilterBase import MatchesSourceFilterBase +from gen.filters.rules._ChangedSinceBase import ChangedSinceBase -from Filters.Rules import (Person, Family, Event, Source, Citation, Place, - MediaObject, Repository, Note) +from gen.filters.rules import (person, family, event, source, citation, place, + media, repository, note) diff --git a/src/Filters/Rules/Citation/Makefile.am b/src/gen/filters/rules/citation/Makefile.am similarity index 79% rename from src/Filters/Rules/Citation/Makefile.am rename to src/gen/filters/rules/citation/Makefile.am index 19494733c..44a9a473d 100644 --- a/src/Filters/Rules/Citation/Makefile.am +++ b/src/gen/filters/rules/citation/Makefile.am @@ -1,7 +1,7 @@ # This is the src/Filters/Rules/Citation level Makefile for Gramps # $Id$ -pkgpythondir = $(datadir)/@PACKAGE@/Filters/Rules/Citation +pkgpythondir = $(datadir)/@PACKAGE@/gen/filters/rules/citation pkgpython_PYTHON = \ __init__.py \ @@ -21,12 +21,12 @@ pkgpython_PYTHON = \ _MatchesSourceFilter.py \ _RegExpIdOf.py -pkgpyexecdir = @pkgpyexecdir@/Filters/Rules/Citation +pkgpyexecdir = @pkgpyexecdir@/gen/filters/rules/citation # Clean up all the byte-compiled files MOSTLYCLEANFILES = *pyc *pyo -GRAMPS_PY_MODPATH = "../../../" +GRAMPS_PY_MODPATH = "../../../../" pycheck: (export PYTHONPATH=$(GRAMPS_PY_MODPATH); \ diff --git a/src/Filters/Rules/Citation/_AllCitations.py b/src/gen/filters/rules/citation/_AllCitations.py similarity index 96% rename from src/Filters/Rules/Citation/_AllCitations.py rename to src/gen/filters/rules/citation/_AllCitations.py index 4e5b72909..5a3995fe5 100644 --- a/src/Filters/Rules/Citation/_AllCitations.py +++ b/src/gen/filters/rules/citation/_AllCitations.py @@ -33,7 +33,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._Everything import Everything +from gen.filters.rules._Everything import Everything #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Citation/_ChangedSince.py b/src/gen/filters/rules/citation/_ChangedSince.py similarity index 96% rename from src/Filters/Rules/Citation/_ChangedSince.py rename to src/gen/filters/rules/citation/_ChangedSince.py index b96c75474..a88c03f9b 100644 --- a/src/Filters/Rules/Citation/_ChangedSince.py +++ b/src/gen/filters/rules/citation/_ChangedSince.py @@ -33,7 +33,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._ChangedSinceBase import ChangedSinceBase +from gen.filters.rules._ChangedSinceBase import ChangedSinceBase #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Citation/_CitationPrivate.py b/src/gen/filters/rules/citation/_CitationPrivate.py similarity index 96% rename from src/Filters/Rules/Citation/_CitationPrivate.py rename to src/gen/filters/rules/citation/_CitationPrivate.py index b4276fc3a..227aaa4fa 100644 --- a/src/Filters/Rules/Citation/_CitationPrivate.py +++ b/src/gen/filters/rules/citation/_CitationPrivate.py @@ -33,7 +33,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._IsPrivate import IsPrivate +from gen.filters.rules._IsPrivate import IsPrivate #------------------------------------------------------------------------- # "Family marked private" diff --git a/src/Filters/Rules/Citation/_HasGallery.py b/src/gen/filters/rules/citation/_HasGallery.py similarity index 96% rename from src/Filters/Rules/Citation/_HasGallery.py rename to src/gen/filters/rules/citation/_HasGallery.py index 48f3a1902..97e3618e4 100755 --- a/src/Filters/Rules/Citation/_HasGallery.py +++ b/src/gen/filters/rules/citation/_HasGallery.py @@ -35,7 +35,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._HasGalleryBase import HasGalleryBase +from gen.filters.rules._HasGalleryBase import HasGalleryBase #------------------------------------------------------------------------- # "Sources who have media object reference" diff --git a/src/Filters/Rules/Citation/_HasIdOf.py b/src/gen/filters/rules/citation/_HasIdOf.py similarity index 97% rename from src/Filters/Rules/Citation/_HasIdOf.py rename to src/gen/filters/rules/citation/_HasIdOf.py index 10bdf5f02..f480cab06 100644 --- a/src/Filters/Rules/Citation/_HasIdOf.py +++ b/src/gen/filters/rules/citation/_HasIdOf.py @@ -33,7 +33,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules import HasGrampsId +from gen.filters.rules import HasGrampsId #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Citation/_HasNote.py b/src/gen/filters/rules/citation/_HasNote.py similarity index 96% rename from src/Filters/Rules/Citation/_HasNote.py rename to src/gen/filters/rules/citation/_HasNote.py index 46324e3b2..68a315177 100755 --- a/src/Filters/Rules/Citation/_HasNote.py +++ b/src/gen/filters/rules/citation/_HasNote.py @@ -36,7 +36,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._HasNoteBase import HasNoteBase +from gen.filters.rules._HasNoteBase import HasNoteBase #------------------------------------------------------------------------- # "Sources having notes" diff --git a/src/Filters/Rules/Citation/_HasNoteMatchingSubstringOf.py b/src/gen/filters/rules/citation/_HasNoteMatchingSubstringOf.py similarity index 96% rename from src/Filters/Rules/Citation/_HasNoteMatchingSubstringOf.py rename to src/gen/filters/rules/citation/_HasNoteMatchingSubstringOf.py index 870d5fdae..544e65608 100644 --- a/src/Filters/Rules/Citation/_HasNoteMatchingSubstringOf.py +++ b/src/gen/filters/rules/citation/_HasNoteMatchingSubstringOf.py @@ -33,7 +33,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._HasNoteSubstrBase import HasNoteSubstrBase +from gen.filters.rules._HasNoteSubstrBase import HasNoteSubstrBase #------------------------------------------------------------------------- # "Events having notes that contain a substring" diff --git a/src/Filters/Rules/Citation/_HasNoteRegexp.py b/src/gen/filters/rules/citation/_HasNoteRegexp.py similarity index 96% rename from src/Filters/Rules/Citation/_HasNoteRegexp.py rename to src/gen/filters/rules/citation/_HasNoteRegexp.py index 727bca318..84746f6e0 100644 --- a/src/Filters/Rules/Citation/_HasNoteRegexp.py +++ b/src/gen/filters/rules/citation/_HasNoteRegexp.py @@ -33,7 +33,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._HasNoteRegexBase import HasNoteRegexBase +from gen.filters.rules._HasNoteRegexBase import HasNoteRegexBase #------------------------------------------------------------------------- # "Sources having notes that contain a substring" diff --git a/src/Filters/Rules/Citation/_HasReferenceCountOf.py b/src/gen/filters/rules/citation/_HasReferenceCountOf.py similarity index 95% rename from src/Filters/Rules/Citation/_HasReferenceCountOf.py rename to src/gen/filters/rules/citation/_HasReferenceCountOf.py index 88681cc6a..54d4fd0ad 100644 --- a/src/Filters/Rules/Citation/_HasReferenceCountOf.py +++ b/src/gen/filters/rules/citation/_HasReferenceCountOf.py @@ -33,7 +33,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._HasReferenceCountBase import HasReferenceCountBase +from gen.filters.rules._HasReferenceCountBase import HasReferenceCountBase #------------------------------------------------------------------------- # "Source objects with a certain reference count" diff --git a/src/Filters/Rules/Citation/_HasSource.py b/src/gen/filters/rules/citation/_HasSource.py similarity index 97% rename from src/Filters/Rules/Citation/_HasSource.py rename to src/gen/filters/rules/citation/_HasSource.py index ca6e68347..6a8a2d053 100644 --- a/src/Filters/Rules/Citation/_HasSource.py +++ b/src/gen/filters/rules/citation/_HasSource.py @@ -36,7 +36,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._HasSourceBase import HasSourceBase +from gen.filters.rules._HasSourceBase import HasSourceBase #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Citation/_MatchesFilter.py b/src/gen/filters/rules/citation/_MatchesFilter.py similarity index 96% rename from src/Filters/Rules/Citation/_MatchesFilter.py rename to src/gen/filters/rules/citation/_MatchesFilter.py index 50bf757a1..f7c024fe5 100644 --- a/src/Filters/Rules/Citation/_MatchesFilter.py +++ b/src/gen/filters/rules/citation/_MatchesFilter.py @@ -33,7 +33,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._MatchesFilterBase import MatchesFilterBase +from gen.filters.rules._MatchesFilterBase import MatchesFilterBase #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Citation/_MatchesPageSubstringOf.py b/src/gen/filters/rules/citation/_MatchesPageSubstringOf.py similarity index 98% rename from src/Filters/Rules/Citation/_MatchesPageSubstringOf.py rename to src/gen/filters/rules/citation/_MatchesPageSubstringOf.py index d58c2eec8..cc9bbd5e1 100644 --- a/src/Filters/Rules/Citation/_MatchesPageSubstringOf.py +++ b/src/gen/filters/rules/citation/_MatchesPageSubstringOf.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules import Rule +from gen.filters.rules import Rule #------------------------------------------------------------------------- # "Sources having a title that contain a substring" diff --git a/src/Filters/Rules/Citation/_MatchesRepositoryFilter.py b/src/gen/filters/rules/citation/_MatchesRepositoryFilter.py similarity index 98% rename from src/Filters/Rules/Citation/_MatchesRepositoryFilter.py rename to src/gen/filters/rules/citation/_MatchesRepositoryFilter.py index 17d315c47..8000b34d5 100644 --- a/src/Filters/Rules/Citation/_MatchesRepositoryFilter.py +++ b/src/gen/filters/rules/citation/_MatchesRepositoryFilter.py @@ -35,7 +35,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules import MatchesFilterBase +from gen.filters.rules import MatchesFilterBase #------------------------------------------------------------------------- # "Sources which reference a repository by selection" diff --git a/src/Filters/Rules/Citation/_MatchesSourceFilter.py b/src/gen/filters/rules/citation/_MatchesSourceFilter.py similarity index 97% rename from src/Filters/Rules/Citation/_MatchesSourceFilter.py rename to src/gen/filters/rules/citation/_MatchesSourceFilter.py index 3f6e99fa1..31a091efa 100644 --- a/src/Filters/Rules/Citation/_MatchesSourceFilter.py +++ b/src/gen/filters/rules/citation/_MatchesSourceFilter.py @@ -34,7 +34,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules import MatchesFilterBase +from gen.filters.rules import MatchesFilterBase #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Citation/_RegExpIdOf.py b/src/gen/filters/rules/citation/_RegExpIdOf.py similarity index 96% rename from src/Filters/Rules/Citation/_RegExpIdOf.py rename to src/gen/filters/rules/citation/_RegExpIdOf.py index d2fd256b0..a9e314da4 100644 --- a/src/Filters/Rules/Citation/_RegExpIdOf.py +++ b/src/gen/filters/rules/citation/_RegExpIdOf.py @@ -33,7 +33,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._RegExpIdBase import RegExpIdBase +from gen.filters.rules._RegExpIdBase import RegExpIdBase #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Citation/__init__.py b/src/gen/filters/rules/citation/__init__.py similarity index 96% rename from src/Filters/Rules/Citation/__init__.py rename to src/gen/filters/rules/citation/__init__.py index af897260d..f3ada19e1 100644 --- a/src/Filters/Rules/Citation/__init__.py +++ b/src/gen/filters/rules/citation/__init__.py @@ -26,7 +26,7 @@ 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 _ChangedSince import ChangedSince diff --git a/src/Filters/Rules/Event/Makefile.am b/src/gen/filters/rules/event/Makefile.am similarity index 81% rename from src/Filters/Rules/Event/Makefile.am rename to src/gen/filters/rules/event/Makefile.am index 6cc6d01cb..5231c69c2 100644 --- a/src/Filters/Rules/Event/Makefile.am +++ b/src/gen/filters/rules/event/Makefile.am @@ -1,7 +1,7 @@ # This is the src/Filters/Rules/Event level Makefile for Gramps # $Id$ -pkgpythondir = $(datadir)/@PACKAGE@/Filters/Rules/Event +pkgpythondir = $(datadir)/@PACKAGE@/gen/filters/rules/event pkgpython_PYTHON = \ _ChangedSince.py\ @@ -25,13 +25,13 @@ pkgpython_PYTHON = \ _HasAttribute.py\ __init__.py -pkgpyexecdir = @pkgpyexecdir@/Filters/Rules/Event +pkgpyexecdir = @pkgpyexecdir@/gen/filters/rules/event # Clean up all the byte-compiled files MOSTLYCLEANFILES = *pyc *pyo -GRAMPS_PY_MODPATH = "../../../" +GRAMPS_PY_MODPATH = "../../../../" pycheck: (export PYTHONPATH=$(GRAMPS_PY_MODPATH); \ diff --git a/src/Filters/Rules/Event/_AllEvents.py b/src/gen/filters/rules/event/_AllEvents.py similarity index 96% rename from src/Filters/Rules/Event/_AllEvents.py rename to src/gen/filters/rules/event/_AllEvents.py index 1b7198834..ac776c1d4 100644 --- a/src/Filters/Rules/Event/_AllEvents.py +++ b/src/gen/filters/rules/event/_AllEvents.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._Everything import Everything +from gen.filters.rules._Everything import Everything #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Event/_ChangedSince.py b/src/gen/filters/rules/event/_ChangedSince.py similarity index 94% rename from src/Filters/Rules/Event/_ChangedSince.py rename to src/gen/filters/rules/event/_ChangedSince.py index 4a3cb3a93..d795a45f4 100644 --- a/src/Filters/Rules/Event/_ChangedSince.py +++ b/src/gen/filters/rules/event/_ChangedSince.py @@ -18,7 +18,7 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# Filters/Rules/Event/_ChangedSince.py +# gen.filters.rules/Event/_ChangedSince.py # $Id$ #------------------------------------------------------------------------- @@ -33,7 +33,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._ChangedSinceBase import ChangedSinceBase +from gen.filters.rules._ChangedSinceBase import ChangedSinceBase #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Event/_EventPrivate.py b/src/gen/filters/rules/event/_EventPrivate.py similarity index 96% rename from src/Filters/Rules/Event/_EventPrivate.py rename to src/gen/filters/rules/event/_EventPrivate.py index a7ef4cecf..3e617c21f 100644 --- a/src/Filters/Rules/Event/_EventPrivate.py +++ b/src/gen/filters/rules/event/_EventPrivate.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._IsPrivate import IsPrivate +from gen.filters.rules._IsPrivate import IsPrivate #------------------------------------------------------------------------- # "Family marked private" diff --git a/src/Filters/Rules/Event/_HasAttribute.py b/src/gen/filters/rules/event/_HasAttribute.py similarity index 96% rename from src/Filters/Rules/Event/_HasAttribute.py rename to src/gen/filters/rules/event/_HasAttribute.py index c3066b256..12f63e629 100644 --- a/src/Filters/Rules/Event/_HasAttribute.py +++ b/src/gen/filters/rules/event/_HasAttribute.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._HasAttributeBase import HasAttributeBase +from gen.filters.rules._HasAttributeBase import HasAttributeBase #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Event/_HasCitation.py b/src/gen/filters/rules/event/_HasCitation.py similarity index 97% rename from src/Filters/Rules/Event/_HasCitation.py rename to src/gen/filters/rules/event/_HasCitation.py index 9381463d1..a0951e563 100644 --- a/src/Filters/Rules/Event/_HasCitation.py +++ b/src/gen/filters/rules/event/_HasCitation.py @@ -36,7 +36,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._HasCitationBase import HasCitationBase +from gen.filters.rules._HasCitationBase import HasCitationBase #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Event/_HasData.py b/src/gen/filters/rules/event/_HasData.py similarity index 98% rename from src/Filters/Rules/Event/_HasData.py rename to src/gen/filters/rules/event/_HasData.py index d83243950..310e71274 100644 --- a/src/Filters/Rules/Event/_HasData.py +++ b/src/gen/filters/rules/event/_HasData.py @@ -34,7 +34,7 @@ from gen.ggettext import gettext as _ #------------------------------------------------------------------------- import DateHandler from gen.lib import EventType -from Filters.Rules._Rule import Rule +from gen.filters.rules._Rule import Rule #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Event/_HasGallery.py b/src/gen/filters/rules/event/_HasGallery.py similarity index 94% rename from src/Filters/Rules/Event/_HasGallery.py rename to src/gen/filters/rules/event/_HasGallery.py index 303e9084c..07b583d41 100755 --- a/src/Filters/Rules/Event/_HasGallery.py +++ b/src/gen/filters/rules/event/_HasGallery.py @@ -19,7 +19,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# Filters/Rules/Event/_HasGallery.py +# gen.filters.rules/Event/_HasGallery.py # $Id$ # @@ -35,7 +35,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._HasGalleryBase import HasGalleryBase +from gen.filters.rules._HasGalleryBase import HasGalleryBase #------------------------------------------------------------------------- # "Events who have media object reference" diff --git a/src/Filters/Rules/Event/_HasIdOf.py b/src/gen/filters/rules/event/_HasIdOf.py similarity index 97% rename from src/Filters/Rules/Event/_HasIdOf.py rename to src/gen/filters/rules/event/_HasIdOf.py index 2cf9991ba..f95a380bc 100644 --- a/src/Filters/Rules/Event/_HasIdOf.py +++ b/src/gen/filters/rules/event/_HasIdOf.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules import HasGrampsId +from gen.filters.rules import HasGrampsId #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Event/_HasNote.py b/src/gen/filters/rules/event/_HasNote.py similarity index 96% rename from src/Filters/Rules/Event/_HasNote.py rename to src/gen/filters/rules/event/_HasNote.py index 80a58c069..db6729894 100755 --- a/src/Filters/Rules/Event/_HasNote.py +++ b/src/gen/filters/rules/event/_HasNote.py @@ -35,7 +35,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._HasNoteBase import HasNoteBase +from gen.filters.rules._HasNoteBase import HasNoteBase #------------------------------------------------------------------------- # "Events having notes" diff --git a/src/Filters/Rules/Event/_HasNoteMatchingSubstringOf.py b/src/gen/filters/rules/event/_HasNoteMatchingSubstringOf.py similarity index 96% rename from src/Filters/Rules/Event/_HasNoteMatchingSubstringOf.py rename to src/gen/filters/rules/event/_HasNoteMatchingSubstringOf.py index d0618e557..872379b4a 100644 --- a/src/Filters/Rules/Event/_HasNoteMatchingSubstringOf.py +++ b/src/gen/filters/rules/event/_HasNoteMatchingSubstringOf.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._HasNoteSubstrBase import HasNoteSubstrBase +from gen.filters.rules._HasNoteSubstrBase import HasNoteSubstrBase #------------------------------------------------------------------------- # "Events having notes that contain a substring" diff --git a/src/Filters/Rules/Event/_HasNoteRegexp.py b/src/gen/filters/rules/event/_HasNoteRegexp.py similarity index 96% rename from src/Filters/Rules/Event/_HasNoteRegexp.py rename to src/gen/filters/rules/event/_HasNoteRegexp.py index 9d5eada55..78bd488be 100644 --- a/src/Filters/Rules/Event/_HasNoteRegexp.py +++ b/src/gen/filters/rules/event/_HasNoteRegexp.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._HasNoteRegexBase import HasNoteRegexBase +from gen.filters.rules._HasNoteRegexBase import HasNoteRegexBase #------------------------------------------------------------------------- # "Events having notes that contain a substring" diff --git a/src/Filters/Rules/Event/_HasReferenceCountOf.py b/src/gen/filters/rules/event/_HasReferenceCountOf.py similarity index 95% rename from src/Filters/Rules/Event/_HasReferenceCountOf.py rename to src/gen/filters/rules/event/_HasReferenceCountOf.py index adc295e62..10933132e 100644 --- a/src/Filters/Rules/Event/_HasReferenceCountOf.py +++ b/src/gen/filters/rules/event/_HasReferenceCountOf.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._HasReferenceCountBase import HasReferenceCountBase +from gen.filters.rules._HasReferenceCountBase import HasReferenceCountBase #------------------------------------------------------------------------- # "Events with a certain reference count" diff --git a/src/Filters/Rules/Event/_HasSourceCount.py b/src/gen/filters/rules/event/_HasSourceCount.py similarity index 96% rename from src/Filters/Rules/Event/_HasSourceCount.py rename to src/gen/filters/rules/event/_HasSourceCount.py index cf1be9f34..ffd7c8978 100644 --- a/src/Filters/Rules/Event/_HasSourceCount.py +++ b/src/gen/filters/rules/event/_HasSourceCount.py @@ -34,7 +34,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._HasSourceCountBase import HasSourceCountBase +from gen.filters.rules._HasSourceCountBase import HasSourceCountBase #------------------------------------------------------------------------- # "People having sources" diff --git a/src/Filters/Rules/Event/_HasType.py b/src/gen/filters/rules/event/_HasType.py similarity index 98% rename from src/Filters/Rules/Event/_HasType.py rename to src/gen/filters/rules/event/_HasType.py index a4db16b20..8ea806beb 100644 --- a/src/Filters/Rules/Event/_HasType.py +++ b/src/gen/filters/rules/event/_HasType.py @@ -33,7 +33,7 @@ from gen.ggettext import gettext as _ # #------------------------------------------------------------------------- from gen.lib import EventType -from Filters.Rules import Rule +from gen.filters.rules import Rule #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Event/_MatchesFilter.py b/src/gen/filters/rules/event/_MatchesFilter.py similarity index 97% rename from src/Filters/Rules/Event/_MatchesFilter.py rename to src/gen/filters/rules/event/_MatchesFilter.py index ce41c203a..21624689f 100644 --- a/src/Filters/Rules/Event/_MatchesFilter.py +++ b/src/gen/filters/rules/event/_MatchesFilter.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules import MatchesFilterBase +from gen.filters.rules import MatchesFilterBase #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Event/_MatchesPersonFilter.py b/src/gen/filters/rules/event/_MatchesPersonFilter.py similarity index 98% rename from src/Filters/Rules/Event/_MatchesPersonFilter.py rename to src/gen/filters/rules/event/_MatchesPersonFilter.py index 55b424d36..a7c329ea4 100644 --- a/src/Filters/Rules/Event/_MatchesPersonFilter.py +++ b/src/gen/filters/rules/event/_MatchesPersonFilter.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules import MatchesFilterBase +from gen.filters.rules import MatchesFilterBase #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Event/_MatchesSourceConfidence.py b/src/gen/filters/rules/event/_MatchesSourceConfidence.py similarity index 92% rename from src/Filters/Rules/Event/_MatchesSourceConfidence.py rename to src/gen/filters/rules/event/_MatchesSourceConfidence.py index 4bd408de9..088960f8e 100644 --- a/src/Filters/Rules/Event/_MatchesSourceConfidence.py +++ b/src/gen/filters/rules/event/_MatchesSourceConfidence.py @@ -17,7 +17,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# Filters/Rules/Event/_MatchesSourceConfidence.py +# gen.filters.rules/Event/_MatchesSourceConfidence.py # $Id$ # @@ -33,7 +33,7 @@ from gen.ggettext import sgettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._MatchesSourceConfidenceBase import MatchesSourceConfidenceBase +from gen.filters.rules._MatchesSourceConfidenceBase import MatchesSourceConfidenceBase #------------------------------------------------------------------------- # "Confidence level" diff --git a/src/Filters/Rules/Event/_MatchesSourceFilter.py b/src/gen/filters/rules/event/_MatchesSourceFilter.py similarity index 97% rename from src/Filters/Rules/Event/_MatchesSourceFilter.py rename to src/gen/filters/rules/event/_MatchesSourceFilter.py index ba5eab4fc..c753cb78d 100644 --- a/src/Filters/Rules/Event/_MatchesSourceFilter.py +++ b/src/gen/filters/rules/event/_MatchesSourceFilter.py @@ -34,7 +34,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules import MatchesSourceFilterBase +from gen.filters.rules import MatchesSourceFilterBase #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Event/_RegExpIdOf.py b/src/gen/filters/rules/event/_RegExpIdOf.py similarity index 96% rename from src/Filters/Rules/Event/_RegExpIdOf.py rename to src/gen/filters/rules/event/_RegExpIdOf.py index 4aab823df..c8061703b 100644 --- a/src/Filters/Rules/Event/_RegExpIdOf.py +++ b/src/gen/filters/rules/event/_RegExpIdOf.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._RegExpIdBase import RegExpIdBase +from gen.filters.rules._RegExpIdBase import RegExpIdBase #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Event/__init__.py b/src/gen/filters/rules/event/__init__.py similarity index 96% rename from src/Filters/Rules/Event/__init__.py rename to src/gen/filters/rules/event/__init__.py index 0a81c8e9a..e986a1aaa 100644 --- a/src/Filters/Rules/Event/__init__.py +++ b/src/gen/filters/rules/event/__init__.py @@ -26,7 +26,7 @@ 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 _AllEvents import AllEvents diff --git a/src/Filters/Rules/Family/Makefile.am b/src/gen/filters/rules/family/Makefile.am similarity index 86% rename from src/Filters/Rules/Family/Makefile.am rename to src/gen/filters/rules/family/Makefile.am index 10504f44c..c3f9338fc 100644 --- a/src/Filters/Rules/Family/Makefile.am +++ b/src/gen/filters/rules/family/Makefile.am @@ -1,7 +1,7 @@ # This is the src/Filters/Rules/Family level Makefile for Gramps # $Id$ -pkgpythondir = $(datadir)/@PACKAGE@/Filters/Rules/Family +pkgpythondir = $(datadir)/@PACKAGE@/gen/filters/rules/family pkgpython_PYTHON = \ _AllFamilies.py\ @@ -40,12 +40,12 @@ pkgpython_PYTHON = \ _MemberBase.py -pkgpyexecdir = @pkgpyexecdir@/Filters/Rules/Family +pkgpyexecdir = @pkgpyexecdir@/gen/filters/rules/family # Clean up all the byte-compiled files MOSTLYCLEANFILES = *pyc *pyo -GRAMPS_PY_MODPATH = "../../../" +GRAMPS_PY_MODPATH = "../../../../" pycheck: (export PYTHONPATH=$(GRAMPS_PY_MODPATH); \ diff --git a/src/Filters/Rules/Family/_AllFamilies.py b/src/gen/filters/rules/family/_AllFamilies.py similarity index 96% rename from src/Filters/Rules/Family/_AllFamilies.py rename to src/gen/filters/rules/family/_AllFamilies.py index 3523139b2..6caa16893 100644 --- a/src/Filters/Rules/Family/_AllFamilies.py +++ b/src/gen/filters/rules/family/_AllFamilies.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._Everything import Everything +from gen.filters.rules._Everything import Everything #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Family/_ChangedSince.py b/src/gen/filters/rules/family/_ChangedSince.py similarity index 94% rename from src/Filters/Rules/Family/_ChangedSince.py rename to src/gen/filters/rules/family/_ChangedSince.py index 14a22c2e2..2a6198f99 100644 --- a/src/Filters/Rules/Family/_ChangedSince.py +++ b/src/gen/filters/rules/family/_ChangedSince.py @@ -18,7 +18,7 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# Filters/Rules/Family/_ChangedSince.py +# gen.filters.rules/Family/_ChangedSince.py # $Id$ #------------------------------------------------------------------------- @@ -33,7 +33,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._ChangedSinceBase import ChangedSinceBase +from gen.filters.rules._ChangedSinceBase import ChangedSinceBase #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Family/_ChildHasIdOf.py b/src/gen/filters/rules/family/_ChildHasIdOf.py similarity index 97% rename from src/Filters/Rules/Family/_ChildHasIdOf.py rename to src/gen/filters/rules/family/_ChildHasIdOf.py index 837ac8c2f..55d4af335 100644 --- a/src/Filters/Rules/Family/_ChildHasIdOf.py +++ b/src/gen/filters/rules/family/_ChildHasIdOf.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules import HasGrampsId +from gen.filters.rules import HasGrampsId from _MemberBase import child_base #------------------------------------------------------------------------- diff --git a/src/Filters/Rules/Family/_ChildHasNameOf.py b/src/gen/filters/rules/family/_ChildHasNameOf.py similarity index 97% rename from src/Filters/Rules/Family/_ChildHasNameOf.py rename to src/gen/filters/rules/family/_ChildHasNameOf.py index 39dc5e2af..b9aa44bfe 100644 --- a/src/Filters/Rules/Family/_ChildHasNameOf.py +++ b/src/gen/filters/rules/family/_ChildHasNameOf.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules.Person import HasNameOf +from gen.filters.rules.person import HasNameOf from _MemberBase import child_base #------------------------------------------------------------------------- diff --git a/src/Filters/Rules/Family/_FamilyPrivate.py b/src/gen/filters/rules/family/_FamilyPrivate.py similarity index 96% rename from src/Filters/Rules/Family/_FamilyPrivate.py rename to src/gen/filters/rules/family/_FamilyPrivate.py index d1ab07c15..2d1097164 100644 --- a/src/Filters/Rules/Family/_FamilyPrivate.py +++ b/src/gen/filters/rules/family/_FamilyPrivate.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._IsPrivate import IsPrivate +from gen.filters.rules._IsPrivate import IsPrivate #------------------------------------------------------------------------- # "Family marked private" diff --git a/src/Filters/Rules/Family/_FatherHasIdOf.py b/src/gen/filters/rules/family/_FatherHasIdOf.py similarity index 97% rename from src/Filters/Rules/Family/_FatherHasIdOf.py rename to src/gen/filters/rules/family/_FatherHasIdOf.py index e970edfdb..92417a04d 100644 --- a/src/Filters/Rules/Family/_FatherHasIdOf.py +++ b/src/gen/filters/rules/family/_FatherHasIdOf.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules import HasGrampsId +from gen.filters.rules import HasGrampsId from _MemberBase import father_base #------------------------------------------------------------------------- diff --git a/src/Filters/Rules/Family/_FatherHasNameOf.py b/src/gen/filters/rules/family/_FatherHasNameOf.py similarity index 97% rename from src/Filters/Rules/Family/_FatherHasNameOf.py rename to src/gen/filters/rules/family/_FatherHasNameOf.py index 66c2de14c..b217c0854 100644 --- a/src/Filters/Rules/Family/_FatherHasNameOf.py +++ b/src/gen/filters/rules/family/_FatherHasNameOf.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules.Person import HasNameOf +from gen.filters.rules.person import HasNameOf from _MemberBase import father_base #------------------------------------------------------------------------- diff --git a/src/Filters/Rules/Family/_HasAttribute.py b/src/gen/filters/rules/family/_HasAttribute.py similarity index 96% rename from src/Filters/Rules/Family/_HasAttribute.py rename to src/gen/filters/rules/family/_HasAttribute.py index 21e6f3603..7ccf7c96b 100644 --- a/src/Filters/Rules/Family/_HasAttribute.py +++ b/src/gen/filters/rules/family/_HasAttribute.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._HasAttributeBase import HasAttributeBase +from gen.filters.rules._HasAttributeBase import HasAttributeBase #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Family/_HasCitation.py b/src/gen/filters/rules/family/_HasCitation.py similarity index 97% rename from src/Filters/Rules/Family/_HasCitation.py rename to src/gen/filters/rules/family/_HasCitation.py index 79629c34c..125b3839f 100644 --- a/src/Filters/Rules/Family/_HasCitation.py +++ b/src/gen/filters/rules/family/_HasCitation.py @@ -36,7 +36,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._HasCitationBase import HasCitationBase +from gen.filters.rules._HasCitationBase import HasCitationBase #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Family/_HasEvent.py b/src/gen/filters/rules/family/_HasEvent.py similarity index 97% rename from src/Filters/Rules/Family/_HasEvent.py rename to src/gen/filters/rules/family/_HasEvent.py index 62a593560..7b6bfb4b1 100644 --- a/src/Filters/Rules/Family/_HasEvent.py +++ b/src/gen/filters/rules/family/_HasEvent.py @@ -35,7 +35,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._HasEventBase import HasEventBase +from gen.filters.rules._HasEventBase import HasEventBase #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Family/_HasGallery.py b/src/gen/filters/rules/family/_HasGallery.py similarity index 94% rename from src/Filters/Rules/Family/_HasGallery.py rename to src/gen/filters/rules/family/_HasGallery.py index 08e2bd300..c584651ee 100755 --- a/src/Filters/Rules/Family/_HasGallery.py +++ b/src/gen/filters/rules/family/_HasGallery.py @@ -19,7 +19,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# Filters/Rules/Family/_HasGallery.py +# gen.filters.rules/Family/_HasGallery.py # $Id$ # @@ -35,7 +35,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._HasGalleryBase import HasGalleryBase +from gen.filters.rules._HasGalleryBase import HasGalleryBase #------------------------------------------------------------------------- # "Families who have media object reference" diff --git a/src/Filters/Rules/Family/_HasIdOf.py b/src/gen/filters/rules/family/_HasIdOf.py similarity index 97% rename from src/Filters/Rules/Family/_HasIdOf.py rename to src/gen/filters/rules/family/_HasIdOf.py index 74d4fecd2..f147add98 100644 --- a/src/Filters/Rules/Family/_HasIdOf.py +++ b/src/gen/filters/rules/family/_HasIdOf.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules import HasGrampsId +from gen.filters.rules import HasGrampsId #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Family/_HasLDS.py b/src/gen/filters/rules/family/_HasLDS.py similarity index 94% rename from src/Filters/Rules/Family/_HasLDS.py rename to src/gen/filters/rules/family/_HasLDS.py index f523a9d93..2c5026132 100755 --- a/src/Filters/Rules/Family/_HasLDS.py +++ b/src/gen/filters/rules/family/_HasLDS.py @@ -19,7 +19,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# Filters/Rules/Family/_HasLDS.py +# gen.filters.rules/Family/_HasLDS.py # $Id$ # @@ -36,7 +36,7 @@ from gen.ggettext import gettext as _ # #------------------------------------------------------------------------- -from Filters.Rules._HasLDSBase import HasLDSBase +from gen.filters.rules._HasLDSBase import HasLDSBase #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Family/_HasNote.py b/src/gen/filters/rules/family/_HasNote.py similarity index 96% rename from src/Filters/Rules/Family/_HasNote.py rename to src/gen/filters/rules/family/_HasNote.py index 2c881dfdf..e07b01629 100755 --- a/src/Filters/Rules/Family/_HasNote.py +++ b/src/gen/filters/rules/family/_HasNote.py @@ -35,7 +35,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._HasNoteBase import HasNoteBase +from gen.filters.rules._HasNoteBase import HasNoteBase #------------------------------------------------------------------------- # "Families having notes" diff --git a/src/Filters/Rules/Family/_HasNoteMatchingSubstringOf.py b/src/gen/filters/rules/family/_HasNoteMatchingSubstringOf.py similarity index 96% rename from src/Filters/Rules/Family/_HasNoteMatchingSubstringOf.py rename to src/gen/filters/rules/family/_HasNoteMatchingSubstringOf.py index 56d4631ce..847c50813 100644 --- a/src/Filters/Rules/Family/_HasNoteMatchingSubstringOf.py +++ b/src/gen/filters/rules/family/_HasNoteMatchingSubstringOf.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._HasNoteSubstrBase import HasNoteSubstrBase +from gen.filters.rules._HasNoteSubstrBase import HasNoteSubstrBase #------------------------------------------------------------------------- # "People having notes that contain a substring" diff --git a/src/Filters/Rules/Family/_HasNoteRegexp.py b/src/gen/filters/rules/family/_HasNoteRegexp.py similarity index 96% rename from src/Filters/Rules/Family/_HasNoteRegexp.py rename to src/gen/filters/rules/family/_HasNoteRegexp.py index 338e445aa..56db4c8de 100644 --- a/src/Filters/Rules/Family/_HasNoteRegexp.py +++ b/src/gen/filters/rules/family/_HasNoteRegexp.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._HasNoteRegexBase import HasNoteRegexBase +from gen.filters.rules._HasNoteRegexBase import HasNoteRegexBase #------------------------------------------------------------------------- # "People having notes that contain a substring" diff --git a/src/Filters/Rules/Family/_HasReferenceCountOf.py b/src/gen/filters/rules/family/_HasReferenceCountOf.py similarity index 95% rename from src/Filters/Rules/Family/_HasReferenceCountOf.py rename to src/gen/filters/rules/family/_HasReferenceCountOf.py index be93ccaff..a2631aade 100644 --- a/src/Filters/Rules/Family/_HasReferenceCountOf.py +++ b/src/gen/filters/rules/family/_HasReferenceCountOf.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._HasReferenceCountBase import HasReferenceCountBase +from gen.filters.rules._HasReferenceCountBase import HasReferenceCountBase #------------------------------------------------------------------------- # "Family objects with a certain reference count" diff --git a/src/Filters/Rules/Family/_HasRelType.py b/src/gen/filters/rules/family/_HasRelType.py similarity index 98% rename from src/Filters/Rules/Family/_HasRelType.py rename to src/gen/filters/rules/family/_HasRelType.py index 68b870592..60dbc60e0 100644 --- a/src/Filters/Rules/Family/_HasRelType.py +++ b/src/gen/filters/rules/family/_HasRelType.py @@ -33,7 +33,7 @@ from gen.ggettext import gettext as _ # #------------------------------------------------------------------------- from gen.lib import FamilyRelType -from Filters.Rules._Rule import Rule +from gen.filters.rules._Rule import Rule #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Family/_HasSourceCount.py b/src/gen/filters/rules/family/_HasSourceCount.py similarity index 96% rename from src/Filters/Rules/Family/_HasSourceCount.py rename to src/gen/filters/rules/family/_HasSourceCount.py index cc2873242..539f51f4e 100755 --- a/src/Filters/Rules/Family/_HasSourceCount.py +++ b/src/gen/filters/rules/family/_HasSourceCount.py @@ -35,7 +35,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._HasSourceCountBase import HasSourceCountBase +from gen.filters.rules._HasSourceCountBase import HasSourceCountBase #------------------------------------------------------------------------- # "Families having sources" diff --git a/src/Filters/Rules/Family/_HasTag.py b/src/gen/filters/rules/family/_HasTag.py similarity index 96% rename from src/Filters/Rules/Family/_HasTag.py rename to src/gen/filters/rules/family/_HasTag.py index 3687712dc..12f871e2a 100644 --- a/src/Filters/Rules/Family/_HasTag.py +++ b/src/gen/filters/rules/family/_HasTag.py @@ -34,7 +34,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._HasTagBase import HasTagBase +from gen.filters.rules._HasTagBase import HasTagBase #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Family/_IsBookmarked.py b/src/gen/filters/rules/family/_IsBookmarked.py similarity index 97% rename from src/Filters/Rules/Family/_IsBookmarked.py rename to src/gen/filters/rules/family/_IsBookmarked.py index e8fb1654d..6380163ab 100644 --- a/src/Filters/Rules/Family/_IsBookmarked.py +++ b/src/gen/filters/rules/family/_IsBookmarked.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._Rule import Rule +from gen.filters.rules._Rule import Rule #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Family/_MatchesFilter.py b/src/gen/filters/rules/family/_MatchesFilter.py similarity index 97% rename from src/Filters/Rules/Family/_MatchesFilter.py rename to src/gen/filters/rules/family/_MatchesFilter.py index d22adfa11..83334b36d 100644 --- a/src/Filters/Rules/Family/_MatchesFilter.py +++ b/src/gen/filters/rules/family/_MatchesFilter.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules import MatchesFilterBase +from gen.filters.rules import MatchesFilterBase #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Family/_MatchesSourceConfidence.py b/src/gen/filters/rules/family/_MatchesSourceConfidence.py similarity index 92% rename from src/Filters/Rules/Family/_MatchesSourceConfidence.py rename to src/gen/filters/rules/family/_MatchesSourceConfidence.py index 5012c4db8..d24cdb75a 100644 --- a/src/Filters/Rules/Family/_MatchesSourceConfidence.py +++ b/src/gen/filters/rules/family/_MatchesSourceConfidence.py @@ -17,7 +17,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# Filters/Rules/Family/_MatchesSourceConfidence.py +# gen.filters.rules/Family/_MatchesSourceConfidence.py # $Id$ # @@ -33,7 +33,7 @@ from gen.ggettext import sgettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._MatchesSourceConfidenceBase import MatchesSourceConfidenceBase +from gen.filters.rules._MatchesSourceConfidenceBase import MatchesSourceConfidenceBase #------------------------------------------------------------------------- # "Confidence level" diff --git a/src/Filters/Rules/Family/_MemberBase.py b/src/gen/filters/rules/family/_MemberBase.py similarity index 100% rename from src/Filters/Rules/Family/_MemberBase.py rename to src/gen/filters/rules/family/_MemberBase.py diff --git a/src/Filters/Rules/Family/_MotherHasIdOf.py b/src/gen/filters/rules/family/_MotherHasIdOf.py similarity index 97% rename from src/Filters/Rules/Family/_MotherHasIdOf.py rename to src/gen/filters/rules/family/_MotherHasIdOf.py index 01292685e..2fbd7256b 100644 --- a/src/Filters/Rules/Family/_MotherHasIdOf.py +++ b/src/gen/filters/rules/family/_MotherHasIdOf.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules import HasGrampsId +from gen.filters.rules import HasGrampsId from _MemberBase import mother_base #------------------------------------------------------------------------- diff --git a/src/Filters/Rules/Family/_MotherHasNameOf.py b/src/gen/filters/rules/family/_MotherHasNameOf.py similarity index 97% rename from src/Filters/Rules/Family/_MotherHasNameOf.py rename to src/gen/filters/rules/family/_MotherHasNameOf.py index 23b2e5c30..5526ed7a1 100644 --- a/src/Filters/Rules/Family/_MotherHasNameOf.py +++ b/src/gen/filters/rules/family/_MotherHasNameOf.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules.Person import HasNameOf +from gen.filters.rules.person import HasNameOf from _MemberBase import mother_base #------------------------------------------------------------------------- diff --git a/src/Filters/Rules/Family/_RegExpChildName.py b/src/gen/filters/rules/family/_RegExpChildName.py similarity index 97% rename from src/Filters/Rules/Family/_RegExpChildName.py rename to src/gen/filters/rules/family/_RegExpChildName.py index 1e0c6b0d4..dec5802dc 100644 --- a/src/Filters/Rules/Family/_RegExpChildName.py +++ b/src/gen/filters/rules/family/_RegExpChildName.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules.Person import RegExpName +from gen.filters.rules.person import RegExpName from _MemberBase import child_base #------------------------------------------------------------------------- diff --git a/src/Filters/Rules/Family/_RegExpFatherName.py b/src/gen/filters/rules/family/_RegExpFatherName.py similarity index 97% rename from src/Filters/Rules/Family/_RegExpFatherName.py rename to src/gen/filters/rules/family/_RegExpFatherName.py index 3489c9e56..53eb61a32 100644 --- a/src/Filters/Rules/Family/_RegExpFatherName.py +++ b/src/gen/filters/rules/family/_RegExpFatherName.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules.Person import RegExpName +from gen.filters.rules.person import RegExpName from _MemberBase import father_base #------------------------------------------------------------------------- diff --git a/src/Filters/Rules/Family/_RegExpIdOf.py b/src/gen/filters/rules/family/_RegExpIdOf.py similarity index 96% rename from src/Filters/Rules/Family/_RegExpIdOf.py rename to src/gen/filters/rules/family/_RegExpIdOf.py index 8a37754bd..43457f6e6 100644 --- a/src/Filters/Rules/Family/_RegExpIdOf.py +++ b/src/gen/filters/rules/family/_RegExpIdOf.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._RegExpIdBase import RegExpIdBase +from gen.filters.rules._RegExpIdBase import RegExpIdBase #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Family/_RegExpMotherName.py b/src/gen/filters/rules/family/_RegExpMotherName.py similarity index 97% rename from src/Filters/Rules/Family/_RegExpMotherName.py rename to src/gen/filters/rules/family/_RegExpMotherName.py index 4e0dad2dd..007ff7282 100644 --- a/src/Filters/Rules/Family/_RegExpMotherName.py +++ b/src/gen/filters/rules/family/_RegExpMotherName.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules.Person import RegExpName +from gen.filters.rules.person import RegExpName from _MemberBase import mother_base #------------------------------------------------------------------------- diff --git a/src/Filters/Rules/Family/_SearchChildName.py b/src/gen/filters/rules/family/_SearchChildName.py similarity index 97% rename from src/Filters/Rules/Family/_SearchChildName.py rename to src/gen/filters/rules/family/_SearchChildName.py index 4603d3f2e..1499ce0a0 100644 --- a/src/Filters/Rules/Family/_SearchChildName.py +++ b/src/gen/filters/rules/family/_SearchChildName.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules.Person import SearchName +from gen.filters.rules.person import SearchName from _MemberBase import child_base #------------------------------------------------------------------------- diff --git a/src/Filters/Rules/Family/_SearchFatherName.py b/src/gen/filters/rules/family/_SearchFatherName.py similarity index 97% rename from src/Filters/Rules/Family/_SearchFatherName.py rename to src/gen/filters/rules/family/_SearchFatherName.py index 4260d44a1..0a6cd640e 100644 --- a/src/Filters/Rules/Family/_SearchFatherName.py +++ b/src/gen/filters/rules/family/_SearchFatherName.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules.Person import SearchName +from gen.filters.rules.person import SearchName from _MemberBase import father_base #------------------------------------------------------------------------- diff --git a/src/Filters/Rules/Family/_SearchMotherName.py b/src/gen/filters/rules/family/_SearchMotherName.py similarity index 97% rename from src/Filters/Rules/Family/_SearchMotherName.py rename to src/gen/filters/rules/family/_SearchMotherName.py index a90cfc404..c5c6cb25b 100644 --- a/src/Filters/Rules/Family/_SearchMotherName.py +++ b/src/gen/filters/rules/family/_SearchMotherName.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules.Person import SearchName +from gen.filters.rules.person import SearchName from _MemberBase import mother_base #------------------------------------------------------------------------- diff --git a/src/Filters/Rules/Family/__init__.py b/src/gen/filters/rules/family/__init__.py similarity index 100% rename from src/Filters/Rules/Family/__init__.py rename to src/gen/filters/rules/family/__init__.py diff --git a/src/Filters/Rules/MediaObject/Makefile.am b/src/gen/filters/rules/media/Makefile.am similarity index 77% rename from src/Filters/Rules/MediaObject/Makefile.am rename to src/gen/filters/rules/media/Makefile.am index 9f537172b..7bcb83861 100644 --- a/src/Filters/Rules/MediaObject/Makefile.am +++ b/src/gen/filters/rules/media/Makefile.am @@ -1,7 +1,7 @@ # This is the src/Filters/Rules/MediaObject level Makefile for Gramps # $Id$ -pkgpythondir = $(datadir)/@PACKAGE@/Filters/Rules/MediaObject +pkgpythondir = $(datadir)/@PACKAGE@/gen/filters/rules/media pkgpython_PYTHON = \ _AllMedia.py\ @@ -18,13 +18,13 @@ pkgpython_PYTHON = \ _RegExpIdOf.py\ __init__.py -pkgpyexecdir = @pkgpyexecdir@/Filters/Rules/MediaObject +pkgpyexecdir = @pkgpyexecdir@/gen/filters/rules/media # Clean up all the byte-compiled files MOSTLYCLEANFILES = *pyc *pyo -GRAMPS_PY_MODPATH = "../../../" +GRAMPS_PY_MODPATH = "../../../../" pycheck: (export PYTHONPATH=$(GRAMPS_PY_MODPATH); \ diff --git a/src/Filters/Rules/MediaObject/_AllMedia.py b/src/gen/filters/rules/media/_AllMedia.py similarity index 96% rename from src/Filters/Rules/MediaObject/_AllMedia.py rename to src/gen/filters/rules/media/_AllMedia.py index 7b0277495..127c2b3f5 100644 --- a/src/Filters/Rules/MediaObject/_AllMedia.py +++ b/src/gen/filters/rules/media/_AllMedia.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._Everything import Everything +from gen.filters.rules._Everything import Everything #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/MediaObject/_ChangedSince.py b/src/gen/filters/rules/media/_ChangedSince.py similarity index 94% rename from src/Filters/Rules/MediaObject/_ChangedSince.py rename to src/gen/filters/rules/media/_ChangedSince.py index 245bf8565..08e72f066 100644 --- a/src/Filters/Rules/MediaObject/_ChangedSince.py +++ b/src/gen/filters/rules/media/_ChangedSince.py @@ -18,7 +18,6 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# Filters/Rules/MediaObject/_ChangedSince.py # $Id$ #------------------------------------------------------------------------- @@ -33,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._ChangedSinceBase import ChangedSinceBase +from gen.filters.rules._ChangedSinceBase import ChangedSinceBase #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/MediaObject/_HasAttribute.py b/src/gen/filters/rules/media/_HasAttribute.py similarity index 96% rename from src/Filters/Rules/MediaObject/_HasAttribute.py rename to src/gen/filters/rules/media/_HasAttribute.py index 756c1b29e..fcbfa6625 100644 --- a/src/Filters/Rules/MediaObject/_HasAttribute.py +++ b/src/gen/filters/rules/media/_HasAttribute.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._HasAttributeBase import HasAttributeBase +from gen.filters.rules._HasAttributeBase import HasAttributeBase #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/MediaObject/_HasIdOf.py b/src/gen/filters/rules/media/_HasIdOf.py similarity index 97% rename from src/Filters/Rules/MediaObject/_HasIdOf.py rename to src/gen/filters/rules/media/_HasIdOf.py index 2a88492c2..cec978ff0 100644 --- a/src/Filters/Rules/MediaObject/_HasIdOf.py +++ b/src/gen/filters/rules/media/_HasIdOf.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules import HasGrampsId +from gen.filters.rules import HasGrampsId #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/MediaObject/_HasMedia.py b/src/gen/filters/rules/media/_HasMedia.py similarity index 98% rename from src/Filters/Rules/MediaObject/_HasMedia.py rename to src/gen/filters/rules/media/_HasMedia.py index f096abe73..8a93f7ac3 100644 --- a/src/Filters/Rules/MediaObject/_HasMedia.py +++ b/src/gen/filters/rules/media/_HasMedia.py @@ -33,7 +33,7 @@ from gen.ggettext import gettext as _ # #------------------------------------------------------------------------- import DateHandler -from Filters.Rules._Rule import Rule +from gen.filters.rules._Rule import Rule #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/MediaObject/_HasNoteMatchingSubstringOf.py b/src/gen/filters/rules/media/_HasNoteMatchingSubstringOf.py similarity index 96% rename from src/Filters/Rules/MediaObject/_HasNoteMatchingSubstringOf.py rename to src/gen/filters/rules/media/_HasNoteMatchingSubstringOf.py index 8bdb55215..749f4c210 100644 --- a/src/Filters/Rules/MediaObject/_HasNoteMatchingSubstringOf.py +++ b/src/gen/filters/rules/media/_HasNoteMatchingSubstringOf.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._HasNoteSubstrBase import HasNoteSubstrBase +from gen.filters.rules._HasNoteSubstrBase import HasNoteSubstrBase #------------------------------------------------------------------------- # "Media having notes that contain a substring" diff --git a/src/Filters/Rules/MediaObject/_HasNoteRegexp.py b/src/gen/filters/rules/media/_HasNoteRegexp.py similarity index 96% rename from src/Filters/Rules/MediaObject/_HasNoteRegexp.py rename to src/gen/filters/rules/media/_HasNoteRegexp.py index 85585453f..cce71a890 100644 --- a/src/Filters/Rules/MediaObject/_HasNoteRegexp.py +++ b/src/gen/filters/rules/media/_HasNoteRegexp.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._HasNoteRegexBase import HasNoteRegexBase +from gen.filters.rules._HasNoteRegexBase import HasNoteRegexBase #------------------------------------------------------------------------- # "Media having notes that contain a substring" diff --git a/src/Filters/Rules/MediaObject/_HasReferenceCountOf.py b/src/gen/filters/rules/media/_HasReferenceCountOf.py similarity index 95% rename from src/Filters/Rules/MediaObject/_HasReferenceCountOf.py rename to src/gen/filters/rules/media/_HasReferenceCountOf.py index 3fbb8339a..a975e46f5 100644 --- a/src/Filters/Rules/MediaObject/_HasReferenceCountOf.py +++ b/src/gen/filters/rules/media/_HasReferenceCountOf.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._HasReferenceCountBase import HasReferenceCountBase +from gen.filters.rules._HasReferenceCountBase import HasReferenceCountBase #------------------------------------------------------------------------- # "Media objects with a certain reference count" diff --git a/src/Filters/Rules/MediaObject/_HasTag.py b/src/gen/filters/rules/media/_HasTag.py similarity index 96% rename from src/Filters/Rules/MediaObject/_HasTag.py rename to src/gen/filters/rules/media/_HasTag.py index 6f7f7c5a2..cf52f4a2b 100644 --- a/src/Filters/Rules/MediaObject/_HasTag.py +++ b/src/gen/filters/rules/media/_HasTag.py @@ -34,7 +34,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._HasTagBase import HasTagBase +from gen.filters.rules._HasTagBase import HasTagBase #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/MediaObject/_MatchesFilter.py b/src/gen/filters/rules/media/_MatchesFilter.py similarity index 95% rename from src/Filters/Rules/MediaObject/_MatchesFilter.py rename to src/gen/filters/rules/media/_MatchesFilter.py index b43a8a221..5b6eeb578 100644 --- a/src/Filters/Rules/MediaObject/_MatchesFilter.py +++ b/src/gen/filters/rules/media/_MatchesFilter.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules import MatchesFilterBase +from gen.filters.rules import MatchesFilterBase #------------------------------------------------------------------------- # @@ -45,4 +45,4 @@ class MatchesFilter(MatchesFilterBase): name = _('Media objects matching the ') description = _("Matches media objects matched by the " "specified filter name") - namespace = 'MediaObject' + namespace = 'Media' diff --git a/src/Filters/Rules/MediaObject/_MediaPrivate.py b/src/gen/filters/rules/media/_MediaPrivate.py similarity index 96% rename from src/Filters/Rules/MediaObject/_MediaPrivate.py rename to src/gen/filters/rules/media/_MediaPrivate.py index 22eb996d9..0a4048515 100644 --- a/src/Filters/Rules/MediaObject/_MediaPrivate.py +++ b/src/gen/filters/rules/media/_MediaPrivate.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._IsPrivate import IsPrivate +from gen.filters.rules._IsPrivate import IsPrivate #------------------------------------------------------------------------- # "Media marked private" diff --git a/src/Filters/Rules/MediaObject/_RegExpIdOf.py b/src/gen/filters/rules/media/_RegExpIdOf.py similarity index 96% rename from src/Filters/Rules/MediaObject/_RegExpIdOf.py rename to src/gen/filters/rules/media/_RegExpIdOf.py index 18f69638e..8c199a18b 100644 --- a/src/Filters/Rules/MediaObject/_RegExpIdOf.py +++ b/src/gen/filters/rules/media/_RegExpIdOf.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._RegExpIdBase import RegExpIdBase +from gen.filters.rules._RegExpIdBase import RegExpIdBase #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/MediaObject/__init__.py b/src/gen/filters/rules/media/__init__.py similarity index 100% rename from src/Filters/Rules/MediaObject/__init__.py rename to src/gen/filters/rules/media/__init__.py diff --git a/src/Filters/Rules/Note/Makefile.am b/src/gen/filters/rules/note/Makefile.am similarity index 76% rename from src/Filters/Rules/Note/Makefile.am rename to src/gen/filters/rules/note/Makefile.am index dc885b12a..e3a57eb0a 100644 --- a/src/Filters/Rules/Note/Makefile.am +++ b/src/gen/filters/rules/note/Makefile.am @@ -1,7 +1,7 @@ # This is the src/Filters/Rules/Note level Makefile for Gramps # $Id$ -pkgpythondir = $(datadir)/@PACKAGE@/Filters/Rules/Note +pkgpythondir = $(datadir)/@PACKAGE@/gen/filters/rules/note pkgpython_PYTHON = \ _AllNotes.py\ @@ -17,12 +17,12 @@ pkgpython_PYTHON = \ _NotePrivate.py\ __init__.py -pkgpyexecdir = @pkgpyexecdir@/Filters/Rules/Note +pkgpyexecdir = @pkgpyexecdir@/gen/filters/rules/note # Clean up all the byte-compiled files MOSTLYCLEANFILES = *pyc *pyo -GRAMPS_PY_MODPATH = "../../../" +GRAMPS_PY_MODPATH = "../../../../" pycheck: (export PYTHONPATH=$(GRAMPS_PY_MODPATH); \ diff --git a/src/Filters/Rules/Note/_AllNotes.py b/src/gen/filters/rules/note/_AllNotes.py similarity index 96% rename from src/Filters/Rules/Note/_AllNotes.py rename to src/gen/filters/rules/note/_AllNotes.py index 2d6a8291e..916c7ce6b 100644 --- a/src/Filters/Rules/Note/_AllNotes.py +++ b/src/gen/filters/rules/note/_AllNotes.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._Everything import Everything +from gen.filters.rules._Everything import Everything #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Note/_ChangedSince.py b/src/gen/filters/rules/note/_ChangedSince.py similarity index 94% rename from src/Filters/Rules/Note/_ChangedSince.py rename to src/gen/filters/rules/note/_ChangedSince.py index 7b645105f..e81cf39a6 100644 --- a/src/Filters/Rules/Note/_ChangedSince.py +++ b/src/gen/filters/rules/note/_ChangedSince.py @@ -18,7 +18,7 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# Filters/Rules/Note/_ChangedSince.py +# gen.filters.rules/Note/_ChangedSince.py # $Id$ #------------------------------------------------------------------------- @@ -33,7 +33,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._ChangedSinceBase import ChangedSinceBase +from gen.filters.rules._ChangedSinceBase import ChangedSinceBase #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Note/_HasIdOf.py b/src/gen/filters/rules/note/_HasIdOf.py similarity index 97% rename from src/Filters/Rules/Note/_HasIdOf.py rename to src/gen/filters/rules/note/_HasIdOf.py index fd9e3f072..cd8f84925 100644 --- a/src/Filters/Rules/Note/_HasIdOf.py +++ b/src/gen/filters/rules/note/_HasIdOf.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules import HasGrampsId +from gen.filters.rules import HasGrampsId #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Note/_HasNote.py b/src/gen/filters/rules/note/_HasNote.py similarity index 98% rename from src/Filters/Rules/Note/_HasNote.py rename to src/gen/filters/rules/note/_HasNote.py index 1ff337934..95ba8e210 100644 --- a/src/Filters/Rules/Note/_HasNote.py +++ b/src/gen/filters/rules/note/_HasNote.py @@ -33,7 +33,7 @@ from gen.ggettext import gettext as _ # #------------------------------------------------------------------------- from gen.lib import NoteType -from Filters.Rules._Rule import Rule +from gen.filters.rules._Rule import Rule #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Note/_HasReferenceCountOf.py b/src/gen/filters/rules/note/_HasReferenceCountOf.py similarity index 95% rename from src/Filters/Rules/Note/_HasReferenceCountOf.py rename to src/gen/filters/rules/note/_HasReferenceCountOf.py index 3a5860546..14f2fb579 100644 --- a/src/Filters/Rules/Note/_HasReferenceCountOf.py +++ b/src/gen/filters/rules/note/_HasReferenceCountOf.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._HasReferenceCountBase import HasReferenceCountBase +from gen.filters.rules._HasReferenceCountBase import HasReferenceCountBase #------------------------------------------------------------------------- # "Notes with a certain reference count" diff --git a/src/Filters/Rules/Note/_HasTag.py b/src/gen/filters/rules/note/_HasTag.py similarity index 96% rename from src/Filters/Rules/Note/_HasTag.py rename to src/gen/filters/rules/note/_HasTag.py index b80673d76..b110a5880 100644 --- a/src/Filters/Rules/Note/_HasTag.py +++ b/src/gen/filters/rules/note/_HasTag.py @@ -34,7 +34,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._HasTagBase import HasTagBase +from gen.filters.rules._HasTagBase import HasTagBase #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Note/_MatchesFilter.py b/src/gen/filters/rules/note/_MatchesFilter.py similarity index 97% rename from src/Filters/Rules/Note/_MatchesFilter.py rename to src/gen/filters/rules/note/_MatchesFilter.py index 9825a9138..9ff4e7101 100644 --- a/src/Filters/Rules/Note/_MatchesFilter.py +++ b/src/gen/filters/rules/note/_MatchesFilter.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules import MatchesFilterBase +from gen.filters.rules import MatchesFilterBase #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Note/_MatchesRegexpOf.py b/src/gen/filters/rules/note/_MatchesRegexpOf.py similarity index 98% rename from src/Filters/Rules/Note/_MatchesRegexpOf.py rename to src/gen/filters/rules/note/_MatchesRegexpOf.py index 95911a00f..216a082a9 100644 --- a/src/Filters/Rules/Note/_MatchesRegexpOf.py +++ b/src/gen/filters/rules/note/_MatchesRegexpOf.py @@ -34,7 +34,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules import Rule +from gen.filters.rules import Rule #------------------------------------------------------------------------- # "Repos having notes that contain a substring" diff --git a/src/Filters/Rules/Note/_MatchesSubstringOf.py b/src/gen/filters/rules/note/_MatchesSubstringOf.py similarity index 98% rename from src/Filters/Rules/Note/_MatchesSubstringOf.py rename to src/gen/filters/rules/note/_MatchesSubstringOf.py index cb109194c..61ac7619b 100644 --- a/src/Filters/Rules/Note/_MatchesSubstringOf.py +++ b/src/gen/filters/rules/note/_MatchesSubstringOf.py @@ -33,7 +33,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules import Rule +from gen.filters.rules import Rule #------------------------------------------------------------------------- # "Events having notes that contain a substring" diff --git a/src/Filters/Rules/Note/_NotePrivate.py b/src/gen/filters/rules/note/_NotePrivate.py similarity index 96% rename from src/Filters/Rules/Note/_NotePrivate.py rename to src/gen/filters/rules/note/_NotePrivate.py index 9d5ff71d7..cc1df7e51 100644 --- a/src/Filters/Rules/Note/_NotePrivate.py +++ b/src/gen/filters/rules/note/_NotePrivate.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._IsPrivate import IsPrivate +from gen.filters.rules._IsPrivate import IsPrivate #------------------------------------------------------------------------- # "Repo marked private" diff --git a/src/Filters/Rules/Note/_RegExpIdOf.py b/src/gen/filters/rules/note/_RegExpIdOf.py similarity index 96% rename from src/Filters/Rules/Note/_RegExpIdOf.py rename to src/gen/filters/rules/note/_RegExpIdOf.py index 11f2d7374..0baed10db 100644 --- a/src/Filters/Rules/Note/_RegExpIdOf.py +++ b/src/gen/filters/rules/note/_RegExpIdOf.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._RegExpIdBase import RegExpIdBase +from gen.filters.rules._RegExpIdBase import RegExpIdBase #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Note/__init__.py b/src/gen/filters/rules/note/__init__.py similarity index 100% rename from src/Filters/Rules/Note/__init__.py rename to src/gen/filters/rules/note/__init__.py diff --git a/src/Filters/Rules/Person/Makefile.am b/src/gen/filters/rules/person/Makefile.am similarity index 93% rename from src/Filters/Rules/Person/Makefile.am rename to src/gen/filters/rules/person/Makefile.am index de5f985ee..eebb165c4 100644 --- a/src/Filters/Rules/Person/Makefile.am +++ b/src/gen/filters/rules/person/Makefile.am @@ -1,7 +1,7 @@ # This is the src/Filters/Rules/Person level Makefile for Gramps # $Id$ -pkgpythondir = $(datadir)/@PACKAGE@/Filters/Rules/Person +pkgpythondir = $(datadir)/@PACKAGE@/gen/filters/rules/person pkgpython_PYTHON = \ _ChangedSince.py\ @@ -84,12 +84,12 @@ pkgpython_PYTHON = \ _RegExpName.py \ __init__.py -pkgpyexecdir = @pkgpyexecdir@/Filters/Rules/Person +pkgpyexecdir = @pkgpyexecdir@/gen/filters/rules/person # Clean up all the byte-compiled files MOSTLYCLEANFILES = *pyc *pyo -GRAMPS_PY_MODPATH = "../../../" +GRAMPS_PY_MODPATH = "../../../../" pycheck: (export PYTHONPATH=$(GRAMPS_PY_MODPATH); \ diff --git a/src/Filters/Rules/Person/_ChangedSince.py b/src/gen/filters/rules/person/_ChangedSince.py similarity index 94% rename from src/Filters/Rules/Person/_ChangedSince.py rename to src/gen/filters/rules/person/_ChangedSince.py index 394c083d9..92cd13255 100644 --- a/src/Filters/Rules/Person/_ChangedSince.py +++ b/src/gen/filters/rules/person/_ChangedSince.py @@ -18,7 +18,7 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# Filters/Rules/Person/_ChangedSince.py +# gen.filters.rules/Person/_ChangedSince.py # $Id$ #------------------------------------------------------------------------- @@ -33,7 +33,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._ChangedSinceBase import ChangedSinceBase +from gen.filters.rules._ChangedSinceBase import ChangedSinceBase #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Person/_DeepRelationshipPathBetween.py b/src/gen/filters/rules/person/_DeepRelationshipPathBetween.py similarity index 98% rename from src/Filters/Rules/Person/_DeepRelationshipPathBetween.py rename to src/gen/filters/rules/person/_DeepRelationshipPathBetween.py index 70048a760..6ec8aa031 100644 --- a/src/Filters/Rules/Person/_DeepRelationshipPathBetween.py +++ b/src/gen/filters/rules/person/_DeepRelationshipPathBetween.py @@ -34,8 +34,8 @@ from gen.ggettext import gettext as _ # #------------------------------------------------------------------------- from gui.utils import ProgressMeter -from Filters.Rules._Rule import Rule -from Filters.Rules.Person._MatchesFilter import MatchesFilter +from gen.filters.rules import Rule +from gen.filters.rules.person import MatchesFilter #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Person/_Disconnected.py b/src/gen/filters/rules/person/_Disconnected.py similarity index 97% rename from src/Filters/Rules/Person/_Disconnected.py rename to src/gen/filters/rules/person/_Disconnected.py index 56d9e13ee..2d4bb0433 100644 --- a/src/Filters/Rules/Person/_Disconnected.py +++ b/src/gen/filters/rules/person/_Disconnected.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._Rule import Rule +from gen.filters.rules._Rule import Rule #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Person/_Everyone.py b/src/gen/filters/rules/person/_Everyone.py similarity index 97% rename from src/Filters/Rules/Person/_Everyone.py rename to src/gen/filters/rules/person/_Everyone.py index 401c49c89..426e7ad43 100644 --- a/src/Filters/Rules/Person/_Everyone.py +++ b/src/gen/filters/rules/person/_Everyone.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._Rule import Rule +from gen.filters.rules._Rule import Rule #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Person/_FamilyWithIncompleteEvent.py b/src/gen/filters/rules/person/_FamilyWithIncompleteEvent.py similarity index 98% rename from src/Filters/Rules/Person/_FamilyWithIncompleteEvent.py rename to src/gen/filters/rules/person/_FamilyWithIncompleteEvent.py index 259aa8762..cb37e8f05 100644 --- a/src/Filters/Rules/Person/_FamilyWithIncompleteEvent.py +++ b/src/gen/filters/rules/person/_FamilyWithIncompleteEvent.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._Rule import Rule +from gen.filters.rules._Rule import Rule #------------------------------------------------------------------------- # "Families with incomplete events" diff --git a/src/Filters/Rules/Person/_HasAddress.py b/src/gen/filters/rules/person/_HasAddress.py similarity index 97% rename from src/Filters/Rules/Person/_HasAddress.py rename to src/gen/filters/rules/person/_HasAddress.py index 9e2d5a5d5..2412359c3 100755 --- a/src/Filters/Rules/Person/_HasAddress.py +++ b/src/gen/filters/rules/person/_HasAddress.py @@ -19,7 +19,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# Filters/Rules/Person/_HasAddress.py +# gen.filters.rules/Person/_HasAddress.py # $Id$ # @@ -36,7 +36,7 @@ from gen.ggettext import gettext as _ # #------------------------------------------------------------------------- -from Filters.Rules import Rule +from gen.filters.rules import Rule #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Person/_HasAlternateName.py b/src/gen/filters/rules/person/_HasAlternateName.py similarity index 95% rename from src/Filters/Rules/Person/_HasAlternateName.py rename to src/gen/filters/rules/person/_HasAlternateName.py index 2914a37db..9f77cab80 100644 --- a/src/Filters/Rules/Person/_HasAlternateName.py +++ b/src/gen/filters/rules/person/_HasAlternateName.py @@ -17,7 +17,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# Filters/Rules/Person/_HasAlternateName.py +# gen.filters.rules/Person/_HasAlternateName.py # $Id$ # @@ -33,7 +33,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._Rule import Rule +from gen.filters.rules._Rule import Rule #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Person/_HasAssociation.py b/src/gen/filters/rules/person/_HasAssociation.py similarity index 96% rename from src/Filters/Rules/Person/_HasAssociation.py rename to src/gen/filters/rules/person/_HasAssociation.py index 054cadf1a..996bae0b1 100755 --- a/src/Filters/Rules/Person/_HasAssociation.py +++ b/src/gen/filters/rules/person/_HasAssociation.py @@ -19,7 +19,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# Filters/Rules/Person/_HasAssociation.py +# gen.filters.rules/Person/_HasAssociation.py # $Id$ # @@ -36,7 +36,7 @@ from gen.ggettext import gettext as _ # #------------------------------------------------------------------------- -from Filters.Rules import Rule +from gen.filters.rules import Rule #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Person/_HasAttribute.py b/src/gen/filters/rules/person/_HasAttribute.py similarity index 96% rename from src/Filters/Rules/Person/_HasAttribute.py rename to src/gen/filters/rules/person/_HasAttribute.py index b7f2b75a7..62bfa6775 100644 --- a/src/Filters/Rules/Person/_HasAttribute.py +++ b/src/gen/filters/rules/person/_HasAttribute.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._HasAttributeBase import HasAttributeBase +from gen.filters.rules._HasAttributeBase import HasAttributeBase #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Person/_HasBirth.py b/src/gen/filters/rules/person/_HasBirth.py similarity index 98% rename from src/Filters/Rules/Person/_HasBirth.py rename to src/gen/filters/rules/person/_HasBirth.py index aab112973..8eae4e8cb 100644 --- a/src/Filters/Rules/Person/_HasBirth.py +++ b/src/gen/filters/rules/person/_HasBirth.py @@ -34,7 +34,7 @@ from gen.ggettext import gettext as _ #------------------------------------------------------------------------- import DateHandler from gen.lib import EventType,EventRoleType -from Filters.Rules._Rule import Rule +from gen.filters.rules._Rule import Rule #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Person/_HasCitation.py b/src/gen/filters/rules/person/_HasCitation.py similarity index 97% rename from src/Filters/Rules/Person/_HasCitation.py rename to src/gen/filters/rules/person/_HasCitation.py index 558fe4cce..addc9ef77 100644 --- a/src/Filters/Rules/Person/_HasCitation.py +++ b/src/gen/filters/rules/person/_HasCitation.py @@ -35,7 +35,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._HasCitationBase import HasCitationBase +from gen.filters.rules._HasCitationBase import HasCitationBase #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Person/_HasCommonAncestorWith.py b/src/gen/filters/rules/person/_HasCommonAncestorWith.py similarity index 99% rename from src/Filters/Rules/Person/_HasCommonAncestorWith.py rename to src/gen/filters/rules/person/_HasCommonAncestorWith.py index 5fc2ee843..0e18d5850 100644 --- a/src/Filters/Rules/Person/_HasCommonAncestorWith.py +++ b/src/gen/filters/rules/person/_HasCommonAncestorWith.py @@ -33,7 +33,7 @@ from gen.ggettext import gettext as _ # #------------------------------------------------------------------------- from Utils import for_each_ancestor -from Filters.Rules._Rule import Rule +from gen.filters.rules._Rule import Rule #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Person/_HasCommonAncestorWithFilterMatch.py b/src/gen/filters/rules/person/_HasCommonAncestorWithFilterMatch.py similarity index 100% rename from src/Filters/Rules/Person/_HasCommonAncestorWithFilterMatch.py rename to src/gen/filters/rules/person/_HasCommonAncestorWithFilterMatch.py diff --git a/src/Filters/Rules/Person/_HasDeath.py b/src/gen/filters/rules/person/_HasDeath.py similarity index 98% rename from src/Filters/Rules/Person/_HasDeath.py rename to src/gen/filters/rules/person/_HasDeath.py index 36b19d270..d31933f02 100644 --- a/src/Filters/Rules/Person/_HasDeath.py +++ b/src/gen/filters/rules/person/_HasDeath.py @@ -34,7 +34,7 @@ from gen.ggettext import gettext as _ #------------------------------------------------------------------------- import DateHandler from gen.lib import EventType,EventRoleType -from Filters.Rules._Rule import Rule +from gen.filters.rules._Rule import Rule #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Person/_HasEvent.py b/src/gen/filters/rules/person/_HasEvent.py similarity index 97% rename from src/Filters/Rules/Person/_HasEvent.py rename to src/gen/filters/rules/person/_HasEvent.py index 4092bd53e..62c458ffe 100644 --- a/src/Filters/Rules/Person/_HasEvent.py +++ b/src/gen/filters/rules/person/_HasEvent.py @@ -36,7 +36,7 @@ from gen.ggettext import gettext as _ # #------------------------------------------------------------------------- from gen.lib import EventRoleType -from Filters.Rules._HasEventBase import HasEventBase +from gen.filters.rules._HasEventBase import HasEventBase #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Person/_HasFamilyAttribute.py b/src/gen/filters/rules/person/_HasFamilyAttribute.py similarity index 98% rename from src/Filters/Rules/Person/_HasFamilyAttribute.py rename to src/gen/filters/rules/person/_HasFamilyAttribute.py index 17de7b49c..a43d5f1c2 100644 --- a/src/Filters/Rules/Person/_HasFamilyAttribute.py +++ b/src/gen/filters/rules/person/_HasFamilyAttribute.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._Rule import Rule +from gen.filters.rules._Rule import Rule #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Person/_HasFamilyEvent.py b/src/gen/filters/rules/person/_HasFamilyEvent.py similarity index 98% rename from src/Filters/Rules/Person/_HasFamilyEvent.py rename to src/gen/filters/rules/person/_HasFamilyEvent.py index 393a1407d..9237d05a6 100644 --- a/src/Filters/Rules/Person/_HasFamilyEvent.py +++ b/src/gen/filters/rules/person/_HasFamilyEvent.py @@ -34,7 +34,7 @@ from gen.ggettext import gettext as _ #------------------------------------------------------------------------- import DateHandler from gen.lib import EventType -from Filters.Rules._Rule import Rule +from gen.filters.rules._Rule import Rule #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Person/_HasGallery.py b/src/gen/filters/rules/person/_HasGallery.py similarity index 96% rename from src/Filters/Rules/Person/_HasGallery.py rename to src/gen/filters/rules/person/_HasGallery.py index a2646eb55..1f11bb998 100644 --- a/src/Filters/Rules/Person/_HasGallery.py +++ b/src/gen/filters/rules/person/_HasGallery.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._HasGalleryBase import HasGalleryBase +from gen.filters.rules._HasGalleryBase import HasGalleryBase #------------------------------------------------------------------------- # "People with media object reference " diff --git a/src/Filters/Rules/Person/_HasIdOf.py b/src/gen/filters/rules/person/_HasIdOf.py similarity index 97% rename from src/Filters/Rules/Person/_HasIdOf.py rename to src/gen/filters/rules/person/_HasIdOf.py index 9b683ae92..900f6d60c 100644 --- a/src/Filters/Rules/Person/_HasIdOf.py +++ b/src/gen/filters/rules/person/_HasIdOf.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules import HasGrampsId +from gen.filters.rules import HasGrampsId #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Person/_HasLDS.py b/src/gen/filters/rules/person/_HasLDS.py similarity index 94% rename from src/Filters/Rules/Person/_HasLDS.py rename to src/gen/filters/rules/person/_HasLDS.py index a7a08cf66..66a9a143c 100755 --- a/src/Filters/Rules/Person/_HasLDS.py +++ b/src/gen/filters/rules/person/_HasLDS.py @@ -19,7 +19,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# Filters/Rules/Person/_HasLDS.py +# gen.filters.rules/Person/_HasLDS.py # $Id$ # @@ -36,7 +36,7 @@ from gen.ggettext import gettext as _ # #------------------------------------------------------------------------- -from Filters.Rules._HasLDSBase import HasLDSBase +from gen.filters.rules._HasLDSBase import HasLDSBase #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Person/_HasNameOf.py b/src/gen/filters/rules/person/_HasNameOf.py similarity index 99% rename from src/Filters/Rules/Person/_HasNameOf.py rename to src/gen/filters/rules/person/_HasNameOf.py index 5d0917203..9dbfee91d 100644 --- a/src/Filters/Rules/Person/_HasNameOf.py +++ b/src/gen/filters/rules/person/_HasNameOf.py @@ -34,7 +34,7 @@ import re # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._Rule import Rule +from gen.filters.rules import Rule from gen.lib import NameOriginType #------------------------------------------------------------------------- diff --git a/src/Filters/Rules/Person/_HasNameOriginType.py b/src/gen/filters/rules/person/_HasNameOriginType.py similarity index 95% rename from src/Filters/Rules/Person/_HasNameOriginType.py rename to src/gen/filters/rules/person/_HasNameOriginType.py index b59bdc260..6c171ea8e 100644 --- a/src/Filters/Rules/Person/_HasNameOriginType.py +++ b/src/gen/filters/rules/person/_HasNameOriginType.py @@ -17,7 +17,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# Filters/Rules/Person/_HasNameOriginType.py +# gen.filters.rules/Person/_HasNameOriginType.py # $Id$ # @@ -33,7 +33,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._Rule import Rule +from gen.filters.rules._Rule import Rule from gen.lib import NameOriginType #------------------------------------------------------------------------- diff --git a/src/Filters/Rules/Person/_HasNameType.py b/src/gen/filters/rules/person/_HasNameType.py similarity index 95% rename from src/Filters/Rules/Person/_HasNameType.py rename to src/gen/filters/rules/person/_HasNameType.py index dd3b49fc4..27d4c425c 100644 --- a/src/Filters/Rules/Person/_HasNameType.py +++ b/src/gen/filters/rules/person/_HasNameType.py @@ -17,7 +17,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# Filters/Rules/Person/_HasNameType.py +# gen.filters.rules/Person/_HasNameType.py # $Id$ # @@ -33,7 +33,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._Rule import Rule +from gen.filters.rules._Rule import Rule from gen.lib import NameType #------------------------------------------------------------------------- diff --git a/src/Filters/Rules/Person/_HasNickname.py b/src/gen/filters/rules/person/_HasNickname.py similarity index 95% rename from src/Filters/Rules/Person/_HasNickname.py rename to src/gen/filters/rules/person/_HasNickname.py index 2f30ab00e..aa1a8c1ac 100644 --- a/src/Filters/Rules/Person/_HasNickname.py +++ b/src/gen/filters/rules/person/_HasNickname.py @@ -17,7 +17,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# Filters/Rules/Person/_HasNickname.py +# gen.filters.rules/Person/_HasNickname.py # $Id$ # @@ -33,7 +33,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._Rule import Rule +from gen.filters.rules._Rule import Rule #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Person/_HasNote.py b/src/gen/filters/rules/person/_HasNote.py similarity index 96% rename from src/Filters/Rules/Person/_HasNote.py rename to src/gen/filters/rules/person/_HasNote.py index 859004272..4cdba3bbb 100644 --- a/src/Filters/Rules/Person/_HasNote.py +++ b/src/gen/filters/rules/person/_HasNote.py @@ -35,7 +35,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._HasNoteBase import HasNoteBase +from gen.filters.rules._HasNoteBase import HasNoteBase #------------------------------------------------------------------------- # "People having notes" diff --git a/src/Filters/Rules/Person/_HasNoteMatchingSubstringOf.py b/src/gen/filters/rules/person/_HasNoteMatchingSubstringOf.py similarity index 96% rename from src/Filters/Rules/Person/_HasNoteMatchingSubstringOf.py rename to src/gen/filters/rules/person/_HasNoteMatchingSubstringOf.py index 8f8fbd813..d91961514 100644 --- a/src/Filters/Rules/Person/_HasNoteMatchingSubstringOf.py +++ b/src/gen/filters/rules/person/_HasNoteMatchingSubstringOf.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._HasNoteSubstrBase import HasNoteSubstrBase +from gen.filters.rules._HasNoteSubstrBase import HasNoteSubstrBase #------------------------------------------------------------------------- # "People having notes that contain a substring" diff --git a/src/Filters/Rules/Person/_HasNoteRegexp.py b/src/gen/filters/rules/person/_HasNoteRegexp.py similarity index 96% rename from src/Filters/Rules/Person/_HasNoteRegexp.py rename to src/gen/filters/rules/person/_HasNoteRegexp.py index 56feaa5b1..a72cf0278 100644 --- a/src/Filters/Rules/Person/_HasNoteRegexp.py +++ b/src/gen/filters/rules/person/_HasNoteRegexp.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._HasNoteRegexBase import HasNoteRegexBase +from gen.filters.rules._HasNoteRegexBase import HasNoteRegexBase #------------------------------------------------------------------------- # "People having notes that contain a substring" diff --git a/src/Filters/Rules/Person/_HasRelationship.py b/src/gen/filters/rules/person/_HasRelationship.py similarity index 98% rename from src/Filters/Rules/Person/_HasRelationship.py rename to src/gen/filters/rules/person/_HasRelationship.py index 0d83b806e..234840d7f 100644 --- a/src/Filters/Rules/Person/_HasRelationship.py +++ b/src/gen/filters/rules/person/_HasRelationship.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._Rule import Rule +from gen.filters.rules._Rule import Rule from gen.lib import FamilyRelType #------------------------------------------------------------------------- diff --git a/src/Filters/Rules/Person/_HasSourceCount.py b/src/gen/filters/rules/person/_HasSourceCount.py similarity index 96% rename from src/Filters/Rules/Person/_HasSourceCount.py rename to src/gen/filters/rules/person/_HasSourceCount.py index 8abdc0f19..18feb1017 100755 --- a/src/Filters/Rules/Person/_HasSourceCount.py +++ b/src/gen/filters/rules/person/_HasSourceCount.py @@ -35,7 +35,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._HasSourceCountBase import HasSourceCountBase +from gen.filters.rules._HasSourceCountBase import HasSourceCountBase #------------------------------------------------------------------------- # "People having sources" diff --git a/src/Filters/Rules/Person/_HasSourceOf.py b/src/gen/filters/rules/person/_HasSourceOf.py similarity index 98% rename from src/Filters/Rules/Person/_HasSourceOf.py rename to src/gen/filters/rules/person/_HasSourceOf.py index 2330f7570..fe2963c3d 100644 --- a/src/Filters/Rules/Person/_HasSourceOf.py +++ b/src/gen/filters/rules/person/_HasSourceOf.py @@ -33,7 +33,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._Rule import Rule +from gen.filters.rules._Rule import Rule #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Person/_HasTag.py b/src/gen/filters/rules/person/_HasTag.py similarity index 96% rename from src/Filters/Rules/Person/_HasTag.py rename to src/gen/filters/rules/person/_HasTag.py index 58c2e627a..45dfbdf47 100644 --- a/src/Filters/Rules/Person/_HasTag.py +++ b/src/gen/filters/rules/person/_HasTag.py @@ -34,7 +34,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._HasTagBase import HasTagBase +from gen.filters.rules._HasTagBase import HasTagBase #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Person/_HasTextMatchingRegexpOf.py b/src/gen/filters/rules/person/_HasTextMatchingRegexpOf.py similarity index 100% rename from src/Filters/Rules/Person/_HasTextMatchingRegexpOf.py rename to src/gen/filters/rules/person/_HasTextMatchingRegexpOf.py diff --git a/src/Filters/Rules/Person/_HasTextMatchingSubstringOf.py b/src/gen/filters/rules/person/_HasTextMatchingSubstringOf.py similarity index 99% rename from src/Filters/Rules/Person/_HasTextMatchingSubstringOf.py rename to src/gen/filters/rules/person/_HasTextMatchingSubstringOf.py index ef0a4504d..f2fbf1947 100644 --- a/src/Filters/Rules/Person/_HasTextMatchingSubstringOf.py +++ b/src/gen/filters/rules/person/_HasTextMatchingSubstringOf.py @@ -36,7 +36,7 @@ LOG = logging.getLogger(".citationfilter") # #------------------------------------------------------------------------- from Utils import get_source_and_citation_referents -from Filters.Rules._Rule import Rule +from gen.filters.rules._Rule import Rule #------------------------------------------------------------------------- # "HasTextMatchingSubstringOf" diff --git a/src/Filters/Rules/Person/_HasUnknownGender.py b/src/gen/filters/rules/person/_HasUnknownGender.py similarity index 97% rename from src/Filters/Rules/Person/_HasUnknownGender.py rename to src/gen/filters/rules/person/_HasUnknownGender.py index 3c0ca47a2..40a6157c6 100644 --- a/src/Filters/Rules/Person/_HasUnknownGender.py +++ b/src/gen/filters/rules/person/_HasUnknownGender.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._Rule import Rule +from gen.filters.rules._Rule import Rule from gen.lib import Person #------------------------------------------------------------------------- diff --git a/src/Filters/Rules/Person/_HaveAltFamilies.py b/src/gen/filters/rules/person/_HaveAltFamilies.py similarity index 98% rename from src/Filters/Rules/Person/_HaveAltFamilies.py rename to src/gen/filters/rules/person/_HaveAltFamilies.py index 24bf8e016..e94761750 100644 --- a/src/Filters/Rules/Person/_HaveAltFamilies.py +++ b/src/gen/filters/rules/person/_HaveAltFamilies.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._Rule import Rule +from gen.filters.rules._Rule import Rule from gen.lib import ChildRefType #------------------------------------------------------------------------- diff --git a/src/Filters/Rules/Person/_HaveChildren.py b/src/gen/filters/rules/person/_HaveChildren.py similarity index 97% rename from src/Filters/Rules/Person/_HaveChildren.py rename to src/gen/filters/rules/person/_HaveChildren.py index ad2a3ed58..4198df706 100644 --- a/src/Filters/Rules/Person/_HaveChildren.py +++ b/src/gen/filters/rules/person/_HaveChildren.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._Rule import Rule +from gen.filters.rules._Rule import Rule #------------------------------------------------------------------------- # "People with children" diff --git a/src/Filters/Rules/Person/_IncompleteNames.py b/src/gen/filters/rules/person/_IncompleteNames.py similarity index 98% rename from src/Filters/Rules/Person/_IncompleteNames.py rename to src/gen/filters/rules/person/_IncompleteNames.py index 18ea4e6e7..ac0bc890e 100644 --- a/src/Filters/Rules/Person/_IncompleteNames.py +++ b/src/gen/filters/rules/person/_IncompleteNames.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._Rule import Rule +from gen.filters.rules._Rule import Rule #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Person/_IsAncestorOf.py b/src/gen/filters/rules/person/_IsAncestorOf.py similarity index 98% rename from src/Filters/Rules/Person/_IsAncestorOf.py rename to src/gen/filters/rules/person/_IsAncestorOf.py index 4caff6817..734a85a95 100644 --- a/src/Filters/Rules/Person/_IsAncestorOf.py +++ b/src/gen/filters/rules/person/_IsAncestorOf.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._Rule import Rule +from gen.filters.rules._Rule import Rule #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Person/_IsAncestorOfFilterMatch.py b/src/gen/filters/rules/person/_IsAncestorOfFilterMatch.py similarity index 100% rename from src/Filters/Rules/Person/_IsAncestorOfFilterMatch.py rename to src/gen/filters/rules/person/_IsAncestorOfFilterMatch.py diff --git a/src/Filters/Rules/Person/_IsBookmarked.py b/src/gen/filters/rules/person/_IsBookmarked.py similarity index 97% rename from src/Filters/Rules/Person/_IsBookmarked.py rename to src/gen/filters/rules/person/_IsBookmarked.py index dd5740e8a..e08df63db 100644 --- a/src/Filters/Rules/Person/_IsBookmarked.py +++ b/src/gen/filters/rules/person/_IsBookmarked.py @@ -33,7 +33,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._Rule import Rule +from gen.filters.rules._Rule import Rule #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Person/_IsChildOfFilterMatch.py b/src/gen/filters/rules/person/_IsChildOfFilterMatch.py similarity index 98% rename from src/Filters/Rules/Person/_IsChildOfFilterMatch.py rename to src/gen/filters/rules/person/_IsChildOfFilterMatch.py index 9433621e1..5b978e932 100644 --- a/src/Filters/Rules/Person/_IsChildOfFilterMatch.py +++ b/src/gen/filters/rules/person/_IsChildOfFilterMatch.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules import Rule +from gen.filters.rules import Rule from _MatchesFilter import MatchesFilter #------------------------------------------------------------------------- diff --git a/src/Filters/Rules/Person/_IsDefaultPerson.py b/src/gen/filters/rules/person/_IsDefaultPerson.py similarity index 97% rename from src/Filters/Rules/Person/_IsDefaultPerson.py rename to src/gen/filters/rules/person/_IsDefaultPerson.py index 3bb20ce71..e0d183b88 100644 --- a/src/Filters/Rules/Person/_IsDefaultPerson.py +++ b/src/gen/filters/rules/person/_IsDefaultPerson.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._Rule import Rule +from gen.filters.rules._Rule import Rule #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Person/_IsDescendantFamilyOf.py b/src/gen/filters/rules/person/_IsDescendantFamilyOf.py similarity index 98% rename from src/Filters/Rules/Person/_IsDescendantFamilyOf.py rename to src/gen/filters/rules/person/_IsDescendantFamilyOf.py index 424024e7b..8479679ae 100644 --- a/src/Filters/Rules/Person/_IsDescendantFamilyOf.py +++ b/src/gen/filters/rules/person/_IsDescendantFamilyOf.py @@ -36,7 +36,7 @@ except NameError: # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._Rule import Rule +from gen.filters.rules._Rule import Rule #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Person/_IsDescendantFamilyOfFilterMatch.py b/src/gen/filters/rules/person/_IsDescendantFamilyOfFilterMatch.py similarity index 100% rename from src/Filters/Rules/Person/_IsDescendantFamilyOfFilterMatch.py rename to src/gen/filters/rules/person/_IsDescendantFamilyOfFilterMatch.py diff --git a/src/Filters/Rules/Person/_IsDescendantOf.py b/src/gen/filters/rules/person/_IsDescendantOf.py similarity index 98% rename from src/Filters/Rules/Person/_IsDescendantOf.py rename to src/gen/filters/rules/person/_IsDescendantOf.py index a15608c02..237c75d0b 100644 --- a/src/Filters/Rules/Person/_IsDescendantOf.py +++ b/src/gen/filters/rules/person/_IsDescendantOf.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._Rule import Rule +from gen.filters.rules._Rule import Rule #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Person/_IsDescendantOfFilterMatch.py b/src/gen/filters/rules/person/_IsDescendantOfFilterMatch.py similarity index 100% rename from src/Filters/Rules/Person/_IsDescendantOfFilterMatch.py rename to src/gen/filters/rules/person/_IsDescendantOfFilterMatch.py diff --git a/src/Filters/Rules/Person/_IsDuplicatedAncestorOf.py b/src/gen/filters/rules/person/_IsDuplicatedAncestorOf.py similarity index 96% rename from src/Filters/Rules/Person/_IsDuplicatedAncestorOf.py rename to src/gen/filters/rules/person/_IsDuplicatedAncestorOf.py index 48dd2e29b..5781c6ea2 100644 --- a/src/Filters/Rules/Person/_IsDuplicatedAncestorOf.py +++ b/src/gen/filters/rules/person/_IsDuplicatedAncestorOf.py @@ -17,7 +17,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# Filters/Rules/Person/_IsDuplicatedAncestorOf.py +# gen.filters.rules/Person/_IsDuplicatedAncestorOf.py # $Id$ # @@ -33,7 +33,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._Rule import Rule +from gen.filters.rules._Rule import Rule #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Person/_IsFemale.py b/src/gen/filters/rules/person/_IsFemale.py similarity index 97% rename from src/Filters/Rules/Person/_IsFemale.py rename to src/gen/filters/rules/person/_IsFemale.py index b36f72eef..937cda298 100644 --- a/src/Filters/Rules/Person/_IsFemale.py +++ b/src/gen/filters/rules/person/_IsFemale.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._Rule import Rule +from gen.filters.rules._Rule import Rule from gen.lib import Person #------------------------------------------------------------------------- diff --git a/src/Filters/Rules/Person/_IsLessThanNthGenerationAncestorOf.py b/src/gen/filters/rules/person/_IsLessThanNthGenerationAncestorOf.py similarity index 98% rename from src/Filters/Rules/Person/_IsLessThanNthGenerationAncestorOf.py rename to src/gen/filters/rules/person/_IsLessThanNthGenerationAncestorOf.py index fdc1bf732..a4f4ae8df 100644 --- a/src/Filters/Rules/Person/_IsLessThanNthGenerationAncestorOf.py +++ b/src/gen/filters/rules/person/_IsLessThanNthGenerationAncestorOf.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._Rule import Rule +from gen.filters.rules._Rule import Rule #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Person/_IsLessThanNthGenerationAncestorOfBookmarked.py b/src/gen/filters/rules/person/_IsLessThanNthGenerationAncestorOfBookmarked.py similarity index 98% rename from src/Filters/Rules/Person/_IsLessThanNthGenerationAncestorOfBookmarked.py rename to src/gen/filters/rules/person/_IsLessThanNthGenerationAncestorOfBookmarked.py index 7220ceaa3..ccac20250 100644 --- a/src/Filters/Rules/Person/_IsLessThanNthGenerationAncestorOfBookmarked.py +++ b/src/gen/filters/rules/person/_IsLessThanNthGenerationAncestorOfBookmarked.py @@ -37,7 +37,7 @@ except: # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._Rule import Rule +from gen.filters.rules._Rule import Rule #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Person/_IsLessThanNthGenerationAncestorOfDefaultPerson.py b/src/gen/filters/rules/person/_IsLessThanNthGenerationAncestorOfDefaultPerson.py similarity index 98% rename from src/Filters/Rules/Person/_IsLessThanNthGenerationAncestorOfDefaultPerson.py rename to src/gen/filters/rules/person/_IsLessThanNthGenerationAncestorOfDefaultPerson.py index f90d97337..12886fa19 100644 --- a/src/Filters/Rules/Person/_IsLessThanNthGenerationAncestorOfDefaultPerson.py +++ b/src/gen/filters/rules/person/_IsLessThanNthGenerationAncestorOfDefaultPerson.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._Rule import Rule +from gen.filters.rules._Rule import Rule #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Person/_IsLessThanNthGenerationDescendantOf.py b/src/gen/filters/rules/person/_IsLessThanNthGenerationDescendantOf.py similarity index 98% rename from src/Filters/Rules/Person/_IsLessThanNthGenerationDescendantOf.py rename to src/gen/filters/rules/person/_IsLessThanNthGenerationDescendantOf.py index f3e51a4b7..85ad0101b 100644 --- a/src/Filters/Rules/Person/_IsLessThanNthGenerationDescendantOf.py +++ b/src/gen/filters/rules/person/_IsLessThanNthGenerationDescendantOf.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._Rule import Rule +from gen.filters.rules._Rule import Rule #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Person/_IsMale.py b/src/gen/filters/rules/person/_IsMale.py similarity index 97% rename from src/Filters/Rules/Person/_IsMale.py rename to src/gen/filters/rules/person/_IsMale.py index 83f4194c2..19291b8f2 100644 --- a/src/Filters/Rules/Person/_IsMale.py +++ b/src/gen/filters/rules/person/_IsMale.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._Rule import Rule +from gen.filters.rules._Rule import Rule from gen.lib import Person #------------------------------------------------------------------------- diff --git a/src/Filters/Rules/Person/_IsMoreThanNthGenerationAncestorOf.py b/src/gen/filters/rules/person/_IsMoreThanNthGenerationAncestorOf.py similarity index 98% rename from src/Filters/Rules/Person/_IsMoreThanNthGenerationAncestorOf.py rename to src/gen/filters/rules/person/_IsMoreThanNthGenerationAncestorOf.py index 68aa91522..cad37a702 100644 --- a/src/Filters/Rules/Person/_IsMoreThanNthGenerationAncestorOf.py +++ b/src/gen/filters/rules/person/_IsMoreThanNthGenerationAncestorOf.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._Rule import Rule +from gen.filters.rules._Rule import Rule #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Person/_IsMoreThanNthGenerationDescendantOf.py b/src/gen/filters/rules/person/_IsMoreThanNthGenerationDescendantOf.py similarity index 98% rename from src/Filters/Rules/Person/_IsMoreThanNthGenerationDescendantOf.py rename to src/gen/filters/rules/person/_IsMoreThanNthGenerationDescendantOf.py index d78372ab8..d3c8b1813 100644 --- a/src/Filters/Rules/Person/_IsMoreThanNthGenerationDescendantOf.py +++ b/src/gen/filters/rules/person/_IsMoreThanNthGenerationDescendantOf.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._Rule import Rule +from gen.filters.rules._Rule import Rule #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Person/_IsParentOfFilterMatch.py b/src/gen/filters/rules/person/_IsParentOfFilterMatch.py similarity index 98% rename from src/Filters/Rules/Person/_IsParentOfFilterMatch.py rename to src/gen/filters/rules/person/_IsParentOfFilterMatch.py index 2ef6970e2..ceafd715b 100644 --- a/src/Filters/Rules/Person/_IsParentOfFilterMatch.py +++ b/src/gen/filters/rules/person/_IsParentOfFilterMatch.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules import Rule +from gen.filters.rules import Rule from _MatchesFilter import MatchesFilter #------------------------------------------------------------------------- diff --git a/src/Filters/Rules/Person/_IsRelatedWith.py b/src/gen/filters/rules/person/_IsRelatedWith.py similarity index 98% rename from src/Filters/Rules/Person/_IsRelatedWith.py rename to src/gen/filters/rules/person/_IsRelatedWith.py index f870ca750..8531f62c4 100644 --- a/src/Filters/Rules/Person/_IsRelatedWith.py +++ b/src/gen/filters/rules/person/_IsRelatedWith.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._Rule import Rule +from gen.filters.rules._Rule import Rule #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Person/_IsSiblingOfFilterMatch.py b/src/gen/filters/rules/person/_IsSiblingOfFilterMatch.py similarity index 98% rename from src/Filters/Rules/Person/_IsSiblingOfFilterMatch.py rename to src/gen/filters/rules/person/_IsSiblingOfFilterMatch.py index 86a50dc4a..5007edca4 100644 --- a/src/Filters/Rules/Person/_IsSiblingOfFilterMatch.py +++ b/src/gen/filters/rules/person/_IsSiblingOfFilterMatch.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules import Rule +from gen.filters.rules import Rule from _MatchesFilter import MatchesFilter #------------------------------------------------------------------------- diff --git a/src/Filters/Rules/Person/_IsSpouseOfFilterMatch.py b/src/gen/filters/rules/person/_IsSpouseOfFilterMatch.py similarity index 98% rename from src/Filters/Rules/Person/_IsSpouseOfFilterMatch.py rename to src/gen/filters/rules/person/_IsSpouseOfFilterMatch.py index 1d2da9070..9cc9e168f 100644 --- a/src/Filters/Rules/Person/_IsSpouseOfFilterMatch.py +++ b/src/gen/filters/rules/person/_IsSpouseOfFilterMatch.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules import Rule +from gen.filters.rules import Rule from _MatchesFilter import MatchesFilter #------------------------------------------------------------------------- diff --git a/src/Filters/Rules/Person/_IsWitness.py b/src/gen/filters/rules/person/_IsWitness.py similarity index 98% rename from src/Filters/Rules/Person/_IsWitness.py rename to src/gen/filters/rules/person/_IsWitness.py index 7d505531d..be3503dea 100644 --- a/src/Filters/Rules/Person/_IsWitness.py +++ b/src/gen/filters/rules/person/_IsWitness.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._Rule import Rule +from gen.filters.rules._Rule import Rule from gen.lib import EventRoleType, EventType #------------------------------------------------------------------------- diff --git a/src/Filters/Rules/Person/_MatchIdOf.py b/src/gen/filters/rules/person/_MatchIdOf.py similarity index 97% rename from src/Filters/Rules/Person/_MatchIdOf.py rename to src/gen/filters/rules/person/_MatchIdOf.py index e70c0acb5..72672726f 100644 --- a/src/Filters/Rules/Person/_MatchIdOf.py +++ b/src/gen/filters/rules/person/_MatchIdOf.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._Rule import Rule +from gen.filters.rules._Rule import Rule #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Person/_MatchesEventFilter.py b/src/gen/filters/rules/person/_MatchesEventFilter.py similarity index 97% rename from src/Filters/Rules/Person/_MatchesEventFilter.py rename to src/gen/filters/rules/person/_MatchesEventFilter.py index 68563bd34..8e554f9b3 100644 --- a/src/Filters/Rules/Person/_MatchesEventFilter.py +++ b/src/gen/filters/rules/person/_MatchesEventFilter.py @@ -33,7 +33,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules import MatchesEventFilterBase +from gen.filters.rules import MatchesEventFilterBase #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Person/_MatchesFilter.py b/src/gen/filters/rules/person/_MatchesFilter.py similarity index 97% rename from src/Filters/Rules/Person/_MatchesFilter.py rename to src/gen/filters/rules/person/_MatchesFilter.py index 564ae745b..6b9692616 100644 --- a/src/Filters/Rules/Person/_MatchesFilter.py +++ b/src/gen/filters/rules/person/_MatchesFilter.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules import MatchesFilterBase +from gen.filters.rules import MatchesFilterBase #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Person/_MatchesSourceConfidence.py b/src/gen/filters/rules/person/_MatchesSourceConfidence.py similarity index 92% rename from src/Filters/Rules/Person/_MatchesSourceConfidence.py rename to src/gen/filters/rules/person/_MatchesSourceConfidence.py index 534d5a76a..eee022164 100644 --- a/src/Filters/Rules/Person/_MatchesSourceConfidence.py +++ b/src/gen/filters/rules/person/_MatchesSourceConfidence.py @@ -17,7 +17,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# Filters/Rules/Person/_MatchesSourceConfidence.py +# gen.filters.rules/Person/_MatchesSourceConfidence.py # $Id$ # @@ -33,7 +33,7 @@ from gen.ggettext import sgettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._MatchesSourceConfidenceBase import MatchesSourceConfidenceBase +from gen.filters.rules._MatchesSourceConfidenceBase import MatchesSourceConfidenceBase #------------------------------------------------------------------------- # "Confidence level" diff --git a/src/Filters/Rules/Person/_MissingParent.py b/src/gen/filters/rules/person/_MissingParent.py similarity index 98% rename from src/Filters/Rules/Person/_MissingParent.py rename to src/gen/filters/rules/person/_MissingParent.py index e2f25b9f8..292afd391 100644 --- a/src/Filters/Rules/Person/_MissingParent.py +++ b/src/gen/filters/rules/person/_MissingParent.py @@ -33,7 +33,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._Rule import Rule +from gen.filters.rules._Rule import Rule #------------------------------------------------------------------------- # "People with less than 2 parents" diff --git a/src/Filters/Rules/Person/_MultipleMarriages.py b/src/gen/filters/rules/person/_MultipleMarriages.py similarity index 97% rename from src/Filters/Rules/Person/_MultipleMarriages.py rename to src/gen/filters/rules/person/_MultipleMarriages.py index 2438b543c..c0f96ba5d 100644 --- a/src/Filters/Rules/Person/_MultipleMarriages.py +++ b/src/gen/filters/rules/person/_MultipleMarriages.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._Rule import Rule +from gen.filters.rules._Rule import Rule #------------------------------------------------------------------------- # "People with multiple marriage records" diff --git a/src/Filters/Rules/Person/_NeverMarried.py b/src/gen/filters/rules/person/_NeverMarried.py similarity index 97% rename from src/Filters/Rules/Person/_NeverMarried.py rename to src/gen/filters/rules/person/_NeverMarried.py index 156e2ee45..13620c195 100644 --- a/src/Filters/Rules/Person/_NeverMarried.py +++ b/src/gen/filters/rules/person/_NeverMarried.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._Rule import Rule +from gen.filters.rules._Rule import Rule #------------------------------------------------------------------------- # "People with no marriage records" diff --git a/src/Filters/Rules/Person/_NoBirthdate.py b/src/gen/filters/rules/person/_NoBirthdate.py similarity index 97% rename from src/Filters/Rules/Person/_NoBirthdate.py rename to src/gen/filters/rules/person/_NoBirthdate.py index 2a7058f90..46c068555 100644 --- a/src/Filters/Rules/Person/_NoBirthdate.py +++ b/src/gen/filters/rules/person/_NoBirthdate.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._Rule import Rule +from gen.filters.rules._Rule import Rule #------------------------------------------------------------------------- # "People without a birth date" diff --git a/src/Filters/Rules/Person/_NoDeathdate.py b/src/gen/filters/rules/person/_NoDeathdate.py similarity index 97% rename from src/Filters/Rules/Person/_NoDeathdate.py rename to src/gen/filters/rules/person/_NoDeathdate.py index 49f0ca1a3..a99b9ac2a 100644 --- a/src/Filters/Rules/Person/_NoDeathdate.py +++ b/src/gen/filters/rules/person/_NoDeathdate.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._Rule import Rule +from gen.filters.rules._Rule import Rule #------------------------------------------------------------------------- # "People without a death date" diff --git a/src/Filters/Rules/Person/_PeoplePrivate.py b/src/gen/filters/rules/person/_PeoplePrivate.py similarity index 96% rename from src/Filters/Rules/Person/_PeoplePrivate.py rename to src/gen/filters/rules/person/_PeoplePrivate.py index 94845fffe..6561ba59e 100644 --- a/src/Filters/Rules/Person/_PeoplePrivate.py +++ b/src/gen/filters/rules/person/_PeoplePrivate.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._IsPrivate import IsPrivate +from gen.filters.rules._IsPrivate import IsPrivate #------------------------------------------------------------------------- # "People marked private" diff --git a/src/Filters/Rules/Person/_PeoplePublic.py b/src/gen/filters/rules/person/_PeoplePublic.py similarity index 97% rename from src/Filters/Rules/Person/_PeoplePublic.py rename to src/gen/filters/rules/person/_PeoplePublic.py index 8ec2b0b39..be1bb6b68 100644 --- a/src/Filters/Rules/Person/_PeoplePublic.py +++ b/src/gen/filters/rules/person/_PeoplePublic.py @@ -33,7 +33,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._IsPublic import IsPublic +from gen.filters.rules._IsPublic import IsPublic #------------------------------------------------------------------------- # "People marked private" diff --git a/src/Filters/Rules/Person/_PersonWithIncompleteEvent.py b/src/gen/filters/rules/person/_PersonWithIncompleteEvent.py similarity index 97% rename from src/Filters/Rules/Person/_PersonWithIncompleteEvent.py rename to src/gen/filters/rules/person/_PersonWithIncompleteEvent.py index 9b261f478..88d7e1756 100644 --- a/src/Filters/Rules/Person/_PersonWithIncompleteEvent.py +++ b/src/gen/filters/rules/person/_PersonWithIncompleteEvent.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._Rule import Rule +from gen.filters.rules._Rule import Rule #------------------------------------------------------------------------- # "People with incomplete events" diff --git a/src/Filters/Rules/Person/_ProbablyAlive.py b/src/gen/filters/rules/person/_ProbablyAlive.py similarity index 97% rename from src/Filters/Rules/Person/_ProbablyAlive.py rename to src/gen/filters/rules/person/_ProbablyAlive.py index a75b0cf3a..a90181367 100644 --- a/src/Filters/Rules/Person/_ProbablyAlive.py +++ b/src/gen/filters/rules/person/_ProbablyAlive.py @@ -33,7 +33,7 @@ from gen.ggettext import gettext as _ # #------------------------------------------------------------------------- from Utils import probably_alive -from Filters.Rules._Rule import Rule +from gen.filters.rules._Rule import Rule import DateHandler #------------------------------------------------------------------------- diff --git a/src/Filters/Rules/Person/_RegExpIdOf.py b/src/gen/filters/rules/person/_RegExpIdOf.py similarity index 96% rename from src/Filters/Rules/Person/_RegExpIdOf.py rename to src/gen/filters/rules/person/_RegExpIdOf.py index a7a1ccdc3..244316322 100644 --- a/src/Filters/Rules/Person/_RegExpIdOf.py +++ b/src/gen/filters/rules/person/_RegExpIdOf.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._RegExpIdBase import RegExpIdBase +from gen.filters.rules._RegExpIdBase import RegExpIdBase #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Person/_RegExpName.py b/src/gen/filters/rules/person/_RegExpName.py similarity index 98% rename from src/Filters/Rules/Person/_RegExpName.py rename to src/gen/filters/rules/person/_RegExpName.py index 226c61e5b..c154bba06 100644 --- a/src/Filters/Rules/Person/_RegExpName.py +++ b/src/gen/filters/rules/person/_RegExpName.py @@ -33,7 +33,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._Rule import Rule +from gen.filters.rules._Rule import Rule import re #------------------------------------------------------------------------- diff --git a/src/Filters/Rules/Person/_RelationshipPathBetween.py b/src/gen/filters/rules/person/_RelationshipPathBetween.py similarity index 99% rename from src/Filters/Rules/Person/_RelationshipPathBetween.py rename to src/gen/filters/rules/person/_RelationshipPathBetween.py index 38bb7efe2..0703d45ee 100644 --- a/src/Filters/Rules/Person/_RelationshipPathBetween.py +++ b/src/gen/filters/rules/person/_RelationshipPathBetween.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._Rule import Rule +from gen.filters.rules._Rule import Rule #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Person/_RelationshipPathBetweenBookmarks.py b/src/gen/filters/rules/person/_RelationshipPathBetweenBookmarks.py similarity index 99% rename from src/Filters/Rules/Person/_RelationshipPathBetweenBookmarks.py rename to src/gen/filters/rules/person/_RelationshipPathBetweenBookmarks.py index cafead0d8..9838954b4 100644 --- a/src/Filters/Rules/Person/_RelationshipPathBetweenBookmarks.py +++ b/src/gen/filters/rules/person/_RelationshipPathBetweenBookmarks.py @@ -35,7 +35,7 @@ except NameError: # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._Rule import Rule +from gen.filters.rules._Rule import Rule #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Person/_SearchName.py b/src/gen/filters/rules/person/_SearchName.py similarity index 98% rename from src/Filters/Rules/Person/_SearchName.py rename to src/gen/filters/rules/person/_SearchName.py index 6d84a3186..304314692 100644 --- a/src/Filters/Rules/Person/_SearchName.py +++ b/src/gen/filters/rules/person/_SearchName.py @@ -33,7 +33,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._Rule import Rule +from gen.filters.rules._Rule import Rule #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Person/__init__.py b/src/gen/filters/rules/person/__init__.py similarity index 99% rename from src/Filters/Rules/Person/__init__.py rename to src/gen/filters/rules/person/__init__.py index 8a43d15a9..f9f79c76e 100644 --- a/src/Filters/Rules/Person/__init__.py +++ b/src/gen/filters/rules/person/__init__.py @@ -105,7 +105,6 @@ from _ProbablyAlive import ProbablyAlive from _RelationshipPathBetween import RelationshipPathBetween from _DeepRelationshipPathBetween import DeepRelationshipPathBetween from _RelationshipPathBetweenBookmarks import RelationshipPathBetweenBookmarks -from Filters.Rules._Rule import Rule from _SearchName import SearchName from _RegExpName import RegExpName from _MatchIdOf import MatchIdOf diff --git a/src/Filters/Rules/Place/Makefile.am b/src/gen/filters/rules/place/Makefile.am similarity index 79% rename from src/Filters/Rules/Place/Makefile.am rename to src/gen/filters/rules/place/Makefile.am index 2d3a6e6b4..fe9988c11 100644 --- a/src/Filters/Rules/Place/Makefile.am +++ b/src/gen/filters/rules/place/Makefile.am @@ -1,7 +1,7 @@ # This is the src/Filters/Rules/Place level Makefile for Gramps # $Id$ -pkgpythondir = $(datadir)/@PACKAGE@/Filters/Rules/Place +pkgpythondir = $(datadir)/@PACKAGE@/gen/filters/rules/place pkgpython_PYTHON = \ _AllPlaces.py\ @@ -21,12 +21,12 @@ pkgpython_PYTHON = \ _RegExpIdOf.py\ __init__.py -pkgpyexecdir = @pkgpyexecdir@/Filters/Rules/Place +pkgpyexecdir = @pkgpyexecdir@/gen/filters/rules/place # Clean up all the byte-compiled files MOSTLYCLEANFILES = *pyc *pyo -GRAMPS_PY_MODPATH = "../../../" +GRAMPS_PY_MODPATH = "../../../../" pycheck: (export PYTHONPATH=$(GRAMPS_PY_MODPATH); \ diff --git a/src/Filters/Rules/Place/_AllPlaces.py b/src/gen/filters/rules/place/_AllPlaces.py similarity index 96% rename from src/Filters/Rules/Place/_AllPlaces.py rename to src/gen/filters/rules/place/_AllPlaces.py index 649a5afb6..ae1690bf2 100644 --- a/src/Filters/Rules/Place/_AllPlaces.py +++ b/src/gen/filters/rules/place/_AllPlaces.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._Everything import Everything +from gen.filters.rules._Everything import Everything #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Place/_ChangedSince.py b/src/gen/filters/rules/place/_ChangedSince.py similarity index 94% rename from src/Filters/Rules/Place/_ChangedSince.py rename to src/gen/filters/rules/place/_ChangedSince.py index 1c1add72c..a03ae28a4 100644 --- a/src/Filters/Rules/Place/_ChangedSince.py +++ b/src/gen/filters/rules/place/_ChangedSince.py @@ -18,7 +18,7 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# Filters/Rules/Place/_ChangedSince.py +# gen.filters.rules/Place/_ChangedSince.py # $Id$ #------------------------------------------------------------------------- @@ -33,7 +33,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._ChangedSinceBase import ChangedSinceBase +from gen.filters.rules._ChangedSinceBase import ChangedSinceBase #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Place/_HasGallery.py b/src/gen/filters/rules/place/_HasGallery.py similarity index 94% rename from src/Filters/Rules/Place/_HasGallery.py rename to src/gen/filters/rules/place/_HasGallery.py index 8901e3788..859d10b3d 100755 --- a/src/Filters/Rules/Place/_HasGallery.py +++ b/src/gen/filters/rules/place/_HasGallery.py @@ -19,7 +19,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# Filters/Rules/Place/_HasGallery.py +# gen.filters.rules/Place/_HasGallery.py # $Id$ # @@ -35,7 +35,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._HasGalleryBase import HasGalleryBase +from gen.filters.rules._HasGalleryBase import HasGalleryBase #------------------------------------------------------------------------- # "Places who have media object reference" diff --git a/src/Filters/Rules/Place/_HasIdOf.py b/src/gen/filters/rules/place/_HasIdOf.py similarity index 97% rename from src/Filters/Rules/Place/_HasIdOf.py rename to src/gen/filters/rules/place/_HasIdOf.py index 0b29b1bd3..9a67fc82b 100644 --- a/src/Filters/Rules/Place/_HasIdOf.py +++ b/src/gen/filters/rules/place/_HasIdOf.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules import HasGrampsId +from gen.filters.rules import HasGrampsId #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Place/_HasNoLatOrLon.py b/src/gen/filters/rules/place/_HasNoLatOrLon.py similarity index 95% rename from src/Filters/Rules/Place/_HasNoLatOrLon.py rename to src/gen/filters/rules/place/_HasNoLatOrLon.py index 5373a7306..e7443f05a 100644 --- a/src/Filters/Rules/Place/_HasNoLatOrLon.py +++ b/src/gen/filters/rules/place/_HasNoLatOrLon.py @@ -17,7 +17,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# Filters/Rules/Place/_HasNoLatOrLon.py +# gen.filters.rules/Place/_HasNoLatOrLon.py # $Id$ # @@ -34,7 +34,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._Rule import Rule +from gen.filters.rules._Rule import Rule #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Place/_HasNote.py b/src/gen/filters/rules/place/_HasNote.py similarity index 96% rename from src/Filters/Rules/Place/_HasNote.py rename to src/gen/filters/rules/place/_HasNote.py index 214f9a594..b9b52aee6 100755 --- a/src/Filters/Rules/Place/_HasNote.py +++ b/src/gen/filters/rules/place/_HasNote.py @@ -35,7 +35,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._HasNoteBase import HasNoteBase +from gen.filters.rules._HasNoteBase import HasNoteBase #------------------------------------------------------------------------- # "Places having notes" diff --git a/src/Filters/Rules/Place/_HasNoteMatchingSubstringOf.py b/src/gen/filters/rules/place/_HasNoteMatchingSubstringOf.py similarity index 96% rename from src/Filters/Rules/Place/_HasNoteMatchingSubstringOf.py rename to src/gen/filters/rules/place/_HasNoteMatchingSubstringOf.py index c71a25ac3..1be7e3d76 100644 --- a/src/Filters/Rules/Place/_HasNoteMatchingSubstringOf.py +++ b/src/gen/filters/rules/place/_HasNoteMatchingSubstringOf.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._HasNoteSubstrBase import HasNoteSubstrBase +from gen.filters.rules._HasNoteSubstrBase import HasNoteSubstrBase #------------------------------------------------------------------------- # "Events having notes that contain a substring" diff --git a/src/Filters/Rules/Place/_HasNoteRegexp.py b/src/gen/filters/rules/place/_HasNoteRegexp.py similarity index 96% rename from src/Filters/Rules/Place/_HasNoteRegexp.py rename to src/gen/filters/rules/place/_HasNoteRegexp.py index 15205f60d..9e4d252b3 100644 --- a/src/Filters/Rules/Place/_HasNoteRegexp.py +++ b/src/gen/filters/rules/place/_HasNoteRegexp.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._HasNoteRegexBase import HasNoteRegexBase +from gen.filters.rules._HasNoteRegexBase import HasNoteRegexBase #------------------------------------------------------------------------- # "Places having notes that contain a substring" diff --git a/src/Filters/Rules/Place/_HasPlace.py b/src/gen/filters/rules/place/_HasPlace.py similarity index 98% rename from src/Filters/Rules/Place/_HasPlace.py rename to src/gen/filters/rules/place/_HasPlace.py index de043e15e..7901a267e 100644 --- a/src/Filters/Rules/Place/_HasPlace.py +++ b/src/gen/filters/rules/place/_HasPlace.py @@ -34,7 +34,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._Rule import Rule +from gen.filters.rules._Rule import Rule #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Place/_HasReferenceCountOf.py b/src/gen/filters/rules/place/_HasReferenceCountOf.py similarity index 95% rename from src/Filters/Rules/Place/_HasReferenceCountOf.py rename to src/gen/filters/rules/place/_HasReferenceCountOf.py index 77f2c2179..7623d572c 100644 --- a/src/Filters/Rules/Place/_HasReferenceCountOf.py +++ b/src/gen/filters/rules/place/_HasReferenceCountOf.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._HasReferenceCountBase import HasReferenceCountBase +from gen.filters.rules._HasReferenceCountBase import HasReferenceCountBase #------------------------------------------------------------------------- # "Place objects with a certain reference count" diff --git a/src/Filters/Rules/Place/_InLatLonNeighborhood.py b/src/gen/filters/rules/place/_InLatLonNeighborhood.py similarity index 98% rename from src/Filters/Rules/Place/_InLatLonNeighborhood.py rename to src/gen/filters/rules/place/_InLatLonNeighborhood.py index ce1b8e6e4..04edc09d5 100644 --- a/src/Filters/Rules/Place/_InLatLonNeighborhood.py +++ b/src/gen/filters/rules/place/_InLatLonNeighborhood.py @@ -17,7 +17,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# Filters/Rules/Place/_InLatLonNeighborhood.py +# gen.filters.rules/Place/_InLatLonNeighborhood.py # $Id$ # @@ -34,7 +34,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._Rule import Rule +from gen.filters.rules._Rule import Rule import PlaceUtils #------------------------------------------------------------------------- diff --git a/src/Filters/Rules/Place/_MatchesEventFilter.py b/src/gen/filters/rules/place/_MatchesEventFilter.py similarity index 97% rename from src/Filters/Rules/Place/_MatchesEventFilter.py rename to src/gen/filters/rules/place/_MatchesEventFilter.py index 653371b31..5e2068ff7 100644 --- a/src/Filters/Rules/Place/_MatchesEventFilter.py +++ b/src/gen/filters/rules/place/_MatchesEventFilter.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._MatchesFilterBase import MatchesFilterBase +from gen.filters.rules._MatchesFilterBase import MatchesFilterBase #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Place/_MatchesFilter.py b/src/gen/filters/rules/place/_MatchesFilter.py similarity index 96% rename from src/Filters/Rules/Place/_MatchesFilter.py rename to src/gen/filters/rules/place/_MatchesFilter.py index 689b59cf9..0adae7193 100644 --- a/src/Filters/Rules/Place/_MatchesFilter.py +++ b/src/gen/filters/rules/place/_MatchesFilter.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._MatchesFilterBase import MatchesFilterBase +from gen.filters.rules._MatchesFilterBase import MatchesFilterBase #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Place/_PlacePrivate.py b/src/gen/filters/rules/place/_PlacePrivate.py similarity index 96% rename from src/Filters/Rules/Place/_PlacePrivate.py rename to src/gen/filters/rules/place/_PlacePrivate.py index 032d6778d..9445750bc 100644 --- a/src/Filters/Rules/Place/_PlacePrivate.py +++ b/src/gen/filters/rules/place/_PlacePrivate.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._IsPrivate import IsPrivate +from gen.filters.rules._IsPrivate import IsPrivate #------------------------------------------------------------------------- # "Family marked private" diff --git a/src/Filters/Rules/Place/_RegExpIdOf.py b/src/gen/filters/rules/place/_RegExpIdOf.py similarity index 96% rename from src/Filters/Rules/Place/_RegExpIdOf.py rename to src/gen/filters/rules/place/_RegExpIdOf.py index cb2e99aec..d5be47ae8 100644 --- a/src/Filters/Rules/Place/_RegExpIdOf.py +++ b/src/gen/filters/rules/place/_RegExpIdOf.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._RegExpIdBase import RegExpIdBase +from gen.filters.rules._RegExpIdBase import RegExpIdBase #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Place/__init__.py b/src/gen/filters/rules/place/__init__.py similarity index 100% rename from src/Filters/Rules/Place/__init__.py rename to src/gen/filters/rules/place/__init__.py diff --git a/src/Filters/Rules/Repository/Makefile.am b/src/gen/filters/rules/repository/Makefile.am similarity index 75% rename from src/Filters/Rules/Repository/Makefile.am rename to src/gen/filters/rules/repository/Makefile.am index 7eeea6f89..2aca2b279 100644 --- a/src/Filters/Rules/Repository/Makefile.am +++ b/src/gen/filters/rules/repository/Makefile.am @@ -1,7 +1,7 @@ # This is the src/Filters/Rules/Media level Makefile for Gramps # $Id$ -pkgpythondir = $(datadir)/@PACKAGE@/Filters/Rules/Repository +pkgpythondir = $(datadir)/@PACKAGE@/gen/filters/rules/repository pkgpython_PYTHON = \ _AllRepos.py\ @@ -17,12 +17,12 @@ pkgpython_PYTHON = \ _RepoPrivate.py\ __init__.py -pkgpyexecdir = @pkgpyexecdir@/Filters/Rules/Repository +pkgpyexecdir = @pkgpyexecdir@/gen/filters/rules/repository # Clean up all the byte-compiled files MOSTLYCLEANFILES = *pyc *pyo -GRAMPS_PY_MODPATH = "../../../" +GRAMPS_PY_MODPATH = "../../../../" pycheck: (export PYTHONPATH=$(GRAMPS_PY_MODPATH); \ diff --git a/src/Filters/Rules/Repository/_AllRepos.py b/src/gen/filters/rules/repository/_AllRepos.py similarity index 96% rename from src/Filters/Rules/Repository/_AllRepos.py rename to src/gen/filters/rules/repository/_AllRepos.py index b8ad3b5c0..e6fef8c7e 100644 --- a/src/Filters/Rules/Repository/_AllRepos.py +++ b/src/gen/filters/rules/repository/_AllRepos.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._Everything import Everything +from gen.filters.rules._Everything import Everything #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Repository/_ChangedSince.py b/src/gen/filters/rules/repository/_ChangedSince.py similarity index 94% rename from src/Filters/Rules/Repository/_ChangedSince.py rename to src/gen/filters/rules/repository/_ChangedSince.py index 194f4567b..251162316 100644 --- a/src/Filters/Rules/Repository/_ChangedSince.py +++ b/src/gen/filters/rules/repository/_ChangedSince.py @@ -18,7 +18,7 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# Filters/Rules/Repository/_ChangedSince.py +# gen.filters.rules/Repository/_ChangedSince.py # $Id$ #------------------------------------------------------------------------- @@ -33,7 +33,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._ChangedSinceBase import ChangedSinceBase +from gen.filters.rules._ChangedSinceBase import ChangedSinceBase #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Repository/_HasIdOf.py b/src/gen/filters/rules/repository/_HasIdOf.py similarity index 97% rename from src/Filters/Rules/Repository/_HasIdOf.py rename to src/gen/filters/rules/repository/_HasIdOf.py index 25d2b8974..304664e22 100644 --- a/src/Filters/Rules/Repository/_HasIdOf.py +++ b/src/gen/filters/rules/repository/_HasIdOf.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules import HasGrampsId +from gen.filters.rules import HasGrampsId #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Repository/_HasNoteMatchingSubstringOf.py b/src/gen/filters/rules/repository/_HasNoteMatchingSubstringOf.py similarity index 96% rename from src/Filters/Rules/Repository/_HasNoteMatchingSubstringOf.py rename to src/gen/filters/rules/repository/_HasNoteMatchingSubstringOf.py index 42a95aea3..342f41ec0 100644 --- a/src/Filters/Rules/Repository/_HasNoteMatchingSubstringOf.py +++ b/src/gen/filters/rules/repository/_HasNoteMatchingSubstringOf.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._HasNoteSubstrBase import HasNoteSubstrBase +from gen.filters.rules._HasNoteSubstrBase import HasNoteSubstrBase #------------------------------------------------------------------------- # "Events having notes that contain a substring" diff --git a/src/Filters/Rules/Repository/_HasNoteRegexp.py b/src/gen/filters/rules/repository/_HasNoteRegexp.py similarity index 96% rename from src/Filters/Rules/Repository/_HasNoteRegexp.py rename to src/gen/filters/rules/repository/_HasNoteRegexp.py index a109e245a..6d2e0b91b 100644 --- a/src/Filters/Rules/Repository/_HasNoteRegexp.py +++ b/src/gen/filters/rules/repository/_HasNoteRegexp.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._HasNoteRegexBase import HasNoteRegexBase +from gen.filters.rules._HasNoteRegexBase import HasNoteRegexBase #------------------------------------------------------------------------- # "Repos having notes that contain a substring" diff --git a/src/Filters/Rules/Repository/_HasReferenceCountOf.py b/src/gen/filters/rules/repository/_HasReferenceCountOf.py similarity index 95% rename from src/Filters/Rules/Repository/_HasReferenceCountOf.py rename to src/gen/filters/rules/repository/_HasReferenceCountOf.py index 99c6aa6a5..f97c92c00 100644 --- a/src/Filters/Rules/Repository/_HasReferenceCountOf.py +++ b/src/gen/filters/rules/repository/_HasReferenceCountOf.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._HasReferenceCountBase import HasReferenceCountBase +from gen.filters.rules._HasReferenceCountBase import HasReferenceCountBase #------------------------------------------------------------------------- # "Repositories with a certain reference count" diff --git a/src/Filters/Rules/Repository/_HasRepo.py b/src/gen/filters/rules/repository/_HasRepo.py similarity index 98% rename from src/Filters/Rules/Repository/_HasRepo.py rename to src/gen/filters/rules/repository/_HasRepo.py index e9063f721..c59ccca4c 100644 --- a/src/Filters/Rules/Repository/_HasRepo.py +++ b/src/gen/filters/rules/repository/_HasRepo.py @@ -33,7 +33,7 @@ from gen.ggettext import gettext as _ # #------------------------------------------------------------------------- from gen.lib import RepositoryType -from Filters.Rules._Rule import Rule +from gen.filters.rules._Rule import Rule #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Repository/_MatchesFilter.py b/src/gen/filters/rules/repository/_MatchesFilter.py similarity index 96% rename from src/Filters/Rules/Repository/_MatchesFilter.py rename to src/gen/filters/rules/repository/_MatchesFilter.py index b444859f7..32f5fab05 100644 --- a/src/Filters/Rules/Repository/_MatchesFilter.py +++ b/src/gen/filters/rules/repository/_MatchesFilter.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._MatchesFilterBase import MatchesFilterBase +from gen.filters.rules._MatchesFilterBase import MatchesFilterBase #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Repository/_MatchesNameSubstringOf.py b/src/gen/filters/rules/repository/_MatchesNameSubstringOf.py similarity index 98% rename from src/Filters/Rules/Repository/_MatchesNameSubstringOf.py rename to src/gen/filters/rules/repository/_MatchesNameSubstringOf.py index 7a1fa21b1..674d49758 100644 --- a/src/Filters/Rules/Repository/_MatchesNameSubstringOf.py +++ b/src/gen/filters/rules/repository/_MatchesNameSubstringOf.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules import Rule +from gen.filters.rules import Rule #------------------------------------------------------------------------- # "Repositories having a name that contain a substring" diff --git a/src/Filters/Rules/Repository/_RegExpIdOf.py b/src/gen/filters/rules/repository/_RegExpIdOf.py similarity index 96% rename from src/Filters/Rules/Repository/_RegExpIdOf.py rename to src/gen/filters/rules/repository/_RegExpIdOf.py index b5463584c..a16ca1f97 100644 --- a/src/Filters/Rules/Repository/_RegExpIdOf.py +++ b/src/gen/filters/rules/repository/_RegExpIdOf.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._RegExpIdBase import RegExpIdBase +from gen.filters.rules._RegExpIdBase import RegExpIdBase #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Repository/_RepoPrivate.py b/src/gen/filters/rules/repository/_RepoPrivate.py similarity index 96% rename from src/Filters/Rules/Repository/_RepoPrivate.py rename to src/gen/filters/rules/repository/_RepoPrivate.py index bbf10607c..c694a25b4 100644 --- a/src/Filters/Rules/Repository/_RepoPrivate.py +++ b/src/gen/filters/rules/repository/_RepoPrivate.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._IsPrivate import IsPrivate +from gen.filters.rules._IsPrivate import IsPrivate #------------------------------------------------------------------------- # "Repo marked private" diff --git a/src/Filters/Rules/Repository/__init__.py b/src/gen/filters/rules/repository/__init__.py similarity index 100% rename from src/Filters/Rules/Repository/__init__.py rename to src/gen/filters/rules/repository/__init__.py diff --git a/src/Filters/Rules/Source/Makefile.am b/src/gen/filters/rules/source/Makefile.am similarity index 80% rename from src/Filters/Rules/Source/Makefile.am rename to src/gen/filters/rules/source/Makefile.am index 116e05e69..b4b0256b5 100644 --- a/src/Filters/Rules/Source/Makefile.am +++ b/src/gen/filters/rules/source/Makefile.am @@ -1,7 +1,7 @@ # This is the src/Filters/Rules/Source level Makefile for Gramps # $Id$ -pkgpythondir = $(datadir)/@PACKAGE@/Filters/Rules/Source +pkgpythondir = $(datadir)/@PACKAGE@/gen/filters/rules/source pkgpython_PYTHON = \ _ChangedSince.py\ @@ -21,12 +21,12 @@ pkgpython_PYTHON = \ _HasRepositoryCallNumberRef.py\ _MatchesRepositoryFilter.py -pkgpyexecdir = @pkgpyexecdir@/Filters/Rules/Source +pkgpyexecdir = @pkgpyexecdir@/gen/filters/rules/source # Clean up all the byte-compiled files MOSTLYCLEANFILES = *pyc *pyo -GRAMPS_PY_MODPATH = "../../../" +GRAMPS_PY_MODPATH = "../../../../" pycheck: (export PYTHONPATH=$(GRAMPS_PY_MODPATH); \ diff --git a/src/Filters/Rules/Source/_AllSources.py b/src/gen/filters/rules/source/_AllSources.py similarity index 96% rename from src/Filters/Rules/Source/_AllSources.py rename to src/gen/filters/rules/source/_AllSources.py index efed78682..23612e646 100644 --- a/src/Filters/Rules/Source/_AllSources.py +++ b/src/gen/filters/rules/source/_AllSources.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._Everything import Everything +from gen.filters.rules._Everything import Everything #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Source/_ChangedSince.py b/src/gen/filters/rules/source/_ChangedSince.py similarity index 94% rename from src/Filters/Rules/Source/_ChangedSince.py rename to src/gen/filters/rules/source/_ChangedSince.py index 4984ada5a..bafb35ff0 100644 --- a/src/Filters/Rules/Source/_ChangedSince.py +++ b/src/gen/filters/rules/source/_ChangedSince.py @@ -18,7 +18,7 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# Filters/Rules/Source/_ChangedSince.py +# gen.filters.rules/Source/_ChangedSince.py # $Id$ #------------------------------------------------------------------------- @@ -33,7 +33,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._ChangedSinceBase import ChangedSinceBase +from gen.filters.rules._ChangedSinceBase import ChangedSinceBase #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Source/_HasGallery.py b/src/gen/filters/rules/source/_HasGallery.py similarity index 94% rename from src/Filters/Rules/Source/_HasGallery.py rename to src/gen/filters/rules/source/_HasGallery.py index 0f7ec0828..719299e34 100755 --- a/src/Filters/Rules/Source/_HasGallery.py +++ b/src/gen/filters/rules/source/_HasGallery.py @@ -19,7 +19,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# Filters/Rules/Source/_HasGallery.py +# gen.filters.rules/Source/_HasGallery.py # $Id$ # @@ -35,7 +35,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._HasGalleryBase import HasGalleryBase +from gen.filters.rules._HasGalleryBase import HasGalleryBase #------------------------------------------------------------------------- # "Sources who have media object reference" diff --git a/src/Filters/Rules/Source/_HasIdOf.py b/src/gen/filters/rules/source/_HasIdOf.py similarity index 97% rename from src/Filters/Rules/Source/_HasIdOf.py rename to src/gen/filters/rules/source/_HasIdOf.py index 75823cf75..e7a411204 100644 --- a/src/Filters/Rules/Source/_HasIdOf.py +++ b/src/gen/filters/rules/source/_HasIdOf.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules import HasGrampsId +from gen.filters.rules import HasGrampsId #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Source/_HasNote.py b/src/gen/filters/rules/source/_HasNote.py similarity index 96% rename from src/Filters/Rules/Source/_HasNote.py rename to src/gen/filters/rules/source/_HasNote.py index e8a1f947e..3139a9ff5 100755 --- a/src/Filters/Rules/Source/_HasNote.py +++ b/src/gen/filters/rules/source/_HasNote.py @@ -35,7 +35,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._HasNoteBase import HasNoteBase +from gen.filters.rules._HasNoteBase import HasNoteBase #------------------------------------------------------------------------- # "Sources having notes" diff --git a/src/Filters/Rules/Source/_HasNoteMatchingSubstringOf.py b/src/gen/filters/rules/source/_HasNoteMatchingSubstringOf.py similarity index 96% rename from src/Filters/Rules/Source/_HasNoteMatchingSubstringOf.py rename to src/gen/filters/rules/source/_HasNoteMatchingSubstringOf.py index 510e5e5f6..6ab710127 100644 --- a/src/Filters/Rules/Source/_HasNoteMatchingSubstringOf.py +++ b/src/gen/filters/rules/source/_HasNoteMatchingSubstringOf.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._HasNoteSubstrBase import HasNoteSubstrBase +from gen.filters.rules._HasNoteSubstrBase import HasNoteSubstrBase #------------------------------------------------------------------------- # "Events having notes that contain a substring" diff --git a/src/Filters/Rules/Source/_HasNoteRegexp.py b/src/gen/filters/rules/source/_HasNoteRegexp.py similarity index 96% rename from src/Filters/Rules/Source/_HasNoteRegexp.py rename to src/gen/filters/rules/source/_HasNoteRegexp.py index 5a98372b9..4daf85a4a 100644 --- a/src/Filters/Rules/Source/_HasNoteRegexp.py +++ b/src/gen/filters/rules/source/_HasNoteRegexp.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._HasNoteRegexBase import HasNoteRegexBase +from gen.filters.rules._HasNoteRegexBase import HasNoteRegexBase #------------------------------------------------------------------------- # "Sources having notes that contain a substring" diff --git a/src/Filters/Rules/Source/_HasReferenceCountOf.py b/src/gen/filters/rules/source/_HasReferenceCountOf.py similarity index 95% rename from src/Filters/Rules/Source/_HasReferenceCountOf.py rename to src/gen/filters/rules/source/_HasReferenceCountOf.py index bdd907359..6baac36bc 100644 --- a/src/Filters/Rules/Source/_HasReferenceCountOf.py +++ b/src/gen/filters/rules/source/_HasReferenceCountOf.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._HasReferenceCountBase import HasReferenceCountBase +from gen.filters.rules._HasReferenceCountBase import HasReferenceCountBase #------------------------------------------------------------------------- # "Source objects with a certain reference count" diff --git a/src/Filters/Rules/Source/_HasRepository.py b/src/gen/filters/rules/source/_HasRepository.py similarity index 96% rename from src/Filters/Rules/Source/_HasRepository.py rename to src/gen/filters/rules/source/_HasRepository.py index 756c21c62..f6af099db 100644 --- a/src/Filters/Rules/Source/_HasRepository.py +++ b/src/gen/filters/rules/source/_HasRepository.py @@ -20,7 +20,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# Filters/Rules/Source/_HasRepository.py +# gen.filters.rules/Source/_HasRepository.py # $Id$ # @@ -36,7 +36,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules import Rule +from gen.filters.rules import Rule #------------------------------------------------------------------------- # "People who have images" diff --git a/src/Filters/Rules/Source/_HasRepositoryCallNumberRef.py b/src/gen/filters/rules/source/_HasRepositoryCallNumberRef.py similarity index 95% rename from src/Filters/Rules/Source/_HasRepositoryCallNumberRef.py rename to src/gen/filters/rules/source/_HasRepositoryCallNumberRef.py index 9f4c1f3c8..3d5f19012 100644 --- a/src/Filters/Rules/Source/_HasRepositoryCallNumberRef.py +++ b/src/gen/filters/rules/source/_HasRepositoryCallNumberRef.py @@ -17,7 +17,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# Filters/Rules/Source/_HasRepositoryCallNumberRef.py +# gen.filters.rules/Source/_HasRepositoryCallNumberRef.py # $Id$ # @@ -33,7 +33,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules import Rule +from gen.filters.rules import Rule #------------------------------------------------------------------------- # "Sources which reference repositories by a special Call Name" diff --git a/src/Filters/Rules/Source/_MatchesFilter.py b/src/gen/filters/rules/source/_MatchesFilter.py similarity index 96% rename from src/Filters/Rules/Source/_MatchesFilter.py rename to src/gen/filters/rules/source/_MatchesFilter.py index b07ee8233..830f7b6bc 100644 --- a/src/Filters/Rules/Source/_MatchesFilter.py +++ b/src/gen/filters/rules/source/_MatchesFilter.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._MatchesFilterBase import MatchesFilterBase +from gen.filters.rules._MatchesFilterBase import MatchesFilterBase #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Source/_MatchesRepositoryFilter.py b/src/gen/filters/rules/source/_MatchesRepositoryFilter.py similarity index 95% rename from src/Filters/Rules/Source/_MatchesRepositoryFilter.py rename to src/gen/filters/rules/source/_MatchesRepositoryFilter.py index 3eb5fddd8..bcea5ee28 100644 --- a/src/Filters/Rules/Source/_MatchesRepositoryFilter.py +++ b/src/gen/filters/rules/source/_MatchesRepositoryFilter.py @@ -17,7 +17,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# Filters/Rules/Source/_MatchesRepositoryFilter.py +# gen.filters.rules/Source/_MatchesRepositoryFilter.py # $Id$ # @@ -33,7 +33,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules import MatchesFilterBase +from gen.filters.rules import MatchesFilterBase #------------------------------------------------------------------------- # "Sources which reference a repository by selection" diff --git a/src/Filters/Rules/Source/_MatchesTitleSubstringOf.py b/src/gen/filters/rules/source/_MatchesTitleSubstringOf.py similarity index 98% rename from src/Filters/Rules/Source/_MatchesTitleSubstringOf.py rename to src/gen/filters/rules/source/_MatchesTitleSubstringOf.py index cd5039297..c5a2416c0 100644 --- a/src/Filters/Rules/Source/_MatchesTitleSubstringOf.py +++ b/src/gen/filters/rules/source/_MatchesTitleSubstringOf.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules import Rule +from gen.filters.rules import Rule #------------------------------------------------------------------------- # "Sources having a title that contain a substring" diff --git a/src/Filters/Rules/Source/_RegExpIdOf.py b/src/gen/filters/rules/source/_RegExpIdOf.py similarity index 96% rename from src/Filters/Rules/Source/_RegExpIdOf.py rename to src/gen/filters/rules/source/_RegExpIdOf.py index 22563d8ec..600f74e2e 100644 --- a/src/Filters/Rules/Source/_RegExpIdOf.py +++ b/src/gen/filters/rules/source/_RegExpIdOf.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._RegExpIdBase import RegExpIdBase +from gen.filters.rules._RegExpIdBase import RegExpIdBase #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Source/_SourcePrivate.py b/src/gen/filters/rules/source/_SourcePrivate.py similarity index 96% rename from src/Filters/Rules/Source/_SourcePrivate.py rename to src/gen/filters/rules/source/_SourcePrivate.py index 81ef0895f..da34b5d58 100644 --- a/src/Filters/Rules/Source/_SourcePrivate.py +++ b/src/gen/filters/rules/source/_SourcePrivate.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters.Rules._IsPrivate import IsPrivate +from gen.filters.rules._IsPrivate import IsPrivate #------------------------------------------------------------------------- # "Family marked private" diff --git a/src/Filters/Rules/Source/__init__.py b/src/gen/filters/rules/source/__init__.py similarity index 96% rename from src/Filters/Rules/Source/__init__.py rename to src/gen/filters/rules/source/__init__.py index 9eef81791..aeb343eff 100644 --- a/src/Filters/Rules/Source/__init__.py +++ b/src/gen/filters/rules/source/__init__.py @@ -26,7 +26,7 @@ Package providing filter rules for GRAMPS. """ -from Filters.Rules._HasSourceBase import HasSourceBase as HasSource +from gen.filters.rules._HasSourceBase import HasSourceBase as HasSource from _AllSources import AllSources from _HasGallery import HasGallery diff --git a/src/gen/plug/report/utils.py b/src/gen/plug/report/utils.py index 8135251b8..1e0fe619b 100644 --- a/src/gen/plug/report/utils.py +++ b/src/gen/plug/report/utils.py @@ -247,7 +247,7 @@ def get_person_filters(person, include_single=True): @param include_single: include a filter to include the single person @type person: boolean """ - from Filters import GenericFilter, Rules, CustomFilters + from gen.filters import GenericFilter, Rules, CustomFilters from gen.display.name import displayer as name_displayer if person: diff --git a/src/gui/Makefile.am b/src/gui/Makefile.am index fee8487c5..950c677ae 100644 --- a/src/gui/Makefile.am +++ b/src/gui/Makefile.am @@ -6,6 +6,7 @@ SUBDIRS = \ editors \ + filters \ plug \ selectors \ views \ diff --git a/src/gui/__init__.py b/src/gui/__init__.py index bbbcab505..7efae72da 100644 --- a/src/gui/__init__.py +++ b/src/gui/__init__.py @@ -26,4 +26,4 @@ Package init for the gui package. # DO NOT IMPORT METHODS/CLASSES FROM src/gui HERE ! Only __all__ -__all__ = [ "editors", "selectors", "views", "widgets" ] +__all__ = [ "editors", "filters", "selectors", "views", "widgets" ] diff --git a/src/gui/filtereditor.py b/src/gui/filtereditor.py index 31322a22c..d4768397f 100644 --- a/src/gui/filtereditor.py +++ b/src/gui/filtereditor.py @@ -53,8 +53,9 @@ import gobject # GRAMPS modules # #------------------------------------------------------------------------- -from Filters import (GenericFilterFactory, FilterList, reload_custom_filters) -from Filters.Rules._MatchesFilterBase import MatchesFilterBase +from gen.filters import (GenericFilterFactory, FilterList, + reload_custom_filters) +from gen.filters.rules._MatchesFilterBase import MatchesFilterBase import ListModel import ManagedWindow from QuestionDialog import QuestionDialog @@ -63,7 +64,7 @@ import GrampsDisplay import Errors from gen.ggettext import sgettext as _ import gen.lib -from Filters import Rules +from gen.filters import rules import AutoComp from gui.selectors import SelectorFactory from gen.display.name import displayer as _nd @@ -83,7 +84,7 @@ _TITLES = { 'Event' : _('Event Filters'), 'Place' : _('Place Filters'), 'Source' : _('Source Filters'), - 'MediaObject' : _('Media Object Filters'), + 'Media' : _('Media Filters'), 'Repository' : _('Repository Filters'), 'Note' : _('Note Filters'), 'Citation' : _('Citation Filters'), @@ -292,7 +293,7 @@ class MyID(gtk.HBox): 'Event' : _('Event'), 'Place' : _('Place'), 'Source' : _('Source'), - 'MediaObject' : _('Media Object'), + 'Media' : _('Media'), 'Repository' : _('Repository'), 'Note' : _('Note'), 'Citation' : _('Citation'), @@ -351,7 +352,7 @@ class MyID(gtk.HBox): elif self.namespace == 'Citation': citation = self.db.get_citation_from_gramps_id(gramps_id) name = citation.get_page() - elif self.namespace == 'MediaObject': + elif self.namespace == 'Media': obj = self.db.get_object_from_gramps_id(gramps_id) name = obj.get_path() elif self.namespace == 'Repository': @@ -460,23 +461,23 @@ class EditRule(ManagedWindow.ManagedWindow): the_map = {} if self.namespace == 'Person': - class_list = Rules.Person.editor_rule_list + class_list = rules.person.editor_rule_list elif self.namespace == 'Family': - class_list = Rules.Family.editor_rule_list + class_list = rules.family.editor_rule_list elif self.namespace == 'Event': - class_list = Rules.Event.editor_rule_list + class_list = rules.event.editor_rule_list elif self.namespace == 'Source': - class_list = Rules.Source.editor_rule_list + class_list = rules.source.editor_rule_list elif self.namespace == 'Citation': - class_list = Rules.Citation.editor_rule_list + class_list = rules.citation.editor_rule_list elif self.namespace == 'Place': - class_list = Rules.Place.editor_rule_list - elif self.namespace == 'MediaObject': - class_list = Rules.MediaObject.editor_rule_list + class_list = rules.place.editor_rule_list + elif self.namespace == 'Media': + class_list = rules.media.editor_rule_list elif self.namespace == 'Repository': - class_list = Rules.Repository.editor_rule_list + class_list = rules.repository.editor_rule_list elif self.namespace == 'Note': - class_list = Rules.Note.editor_rule_list + class_list = rules.note.editor_rule_list for class_obj in class_list: arglist = class_obj.labels @@ -935,7 +936,7 @@ class ShowResults(ManagedWindow.ManagedWindow): place = self.db.get_place_from_handle(handle) name = place.get_title() gid = place.get_gramps_id() - elif self.namespace == 'MediaObject': + elif self.namespace == 'Media': obj = self.db.get_object_from_handle(handle) name = obj.get_description() gid = obj.get_gramps_id() @@ -966,7 +967,7 @@ class ShowResults(ManagedWindow.ManagedWindow): sortname = self.db.get_citation_from_handle(handle).get_title() elif self.namespace == 'Place': sortname = self.db.get_place_from_handle(handle).get_title() - elif self.namespace == 'MediaObject': + elif self.namespace == 'Media': sortname = self.db.get_object_from_handle(handle).get_description() elif self.namespace == 'Repository': sortname = self.db.get_repository_from_handle(handle).get_name() @@ -1158,7 +1159,7 @@ class FilterEditor(ManagedWindow.ManagedWindow): return self.db.get_citation_handles() elif self.namespace == 'Place': return self.db.iter_place_handles() - elif self.namespace == 'MediaObject': + elif self.namespace == 'Media': return self.db.get_media_object_handles() elif self.namespace == 'Repository': return self.db.get_repository_handles() diff --git a/src/gui/filters/Makefile.am b/src/gui/filters/Makefile.am new file mode 100644 index 000000000..356f1c53e --- /dev/null +++ b/src/gui/filters/Makefile.am @@ -0,0 +1,24 @@ +# This is the src/gui/filters level Makefile for Gramps +# $Id$ + +SUBDIRS = sidebar + +pkgpythondir = $(datadir)/@PACKAGE@/gui/filters + +pkgpython_PYTHON = \ + _FilterComboBox.py \ + _FilterMenu.py \ + _FilterStore.py \ + __init__.py \ + _SearchBar.py + +pkgpyexecdir = @pkgpyexecdir@/gui/filters + +# Clean up all the byte-compiled files +MOSTLYCLEANFILES = *pyc *pyo + +GRAMPS_PY_MODPATH = "../../" + +pycheck: + (export PYTHONPATH=$(GRAMPS_PY_MODPATH); \ + pychecker $(pkgpython_PYTHON)); diff --git a/src/Filters/_FilterComboBox.py b/src/gui/filters/_FilterComboBox.py similarity index 98% rename from src/Filters/_FilterComboBox.py rename to src/gui/filters/_FilterComboBox.py index 8987ae6b6..1709d1e03 100644 --- a/src/Filters/_FilterComboBox.py +++ b/src/gui/filters/_FilterComboBox.py @@ -37,7 +37,7 @@ import gobject # GRAMPS modules # #------------------------------------------------------------------------- -from Filters import CustomFilters +from gen.filters import CustomFilters #------------------------------------------------------------------------- # diff --git a/src/Filters/_FilterMenu.py b/src/gui/filters/_FilterMenu.py similarity index 97% rename from src/Filters/_FilterMenu.py rename to src/gui/filters/_FilterMenu.py index 1d80c5945..3ad13a21a 100644 --- a/src/Filters/_FilterMenu.py +++ b/src/gui/filters/_FilterMenu.py @@ -34,7 +34,7 @@ import gobject # #------------------------------------------------------------------------- def build_filter_model(space, local = []): - from Filters import CustomFilters + from gen.filters import CustomFilters model = gtk.ListStore(gobject.TYPE_STRING, object) diff --git a/src/Filters/_FilterStore.py b/src/gui/filters/_FilterStore.py similarity index 98% rename from src/Filters/_FilterStore.py rename to src/gui/filters/_FilterStore.py index 80e05a52f..c1a896f6c 100644 --- a/src/Filters/_FilterStore.py +++ b/src/gui/filters/_FilterStore.py @@ -37,7 +37,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from Filters import CustomFilters +from gen.filters import CustomFilters #------------------------------------------------------------------------- # diff --git a/src/Filters/_SearchBar.py b/src/gui/filters/_SearchBar.py similarity index 100% rename from src/Filters/_SearchBar.py rename to src/gui/filters/_SearchBar.py diff --git a/src/gui/filters/__init__.py b/src/gui/filters/__init__.py new file mode 100644 index 000000000..fccd0111e --- /dev/null +++ b/src/gui/filters/__init__.py @@ -0,0 +1,30 @@ +# +# Gramps - a GTK+/GNOME based genealogy program +# +# Copyright (C) 2002-2006 Donald N. Allingham +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# + +# $Id$ + +""" +Package providing filtering framework for GRAMPS. +""" + +from _FilterComboBox import FilterComboBox +from _FilterMenu import build_filter_model +from _FilterStore import FilterStore +from _SearchBar import SearchBar diff --git a/src/Filters/SideBar/Makefile.am b/src/gui/filters/sidebar/Makefile.am similarity index 69% rename from src/Filters/SideBar/Makefile.am rename to src/gui/filters/sidebar/Makefile.am index d633a4d37..e5dbb6dfc 100644 --- a/src/Filters/SideBar/Makefile.am +++ b/src/gui/filters/sidebar/Makefile.am @@ -1,7 +1,7 @@ -# This is the src/Filters/SideBar level Makefile for Gramps +# This is the src/gui/filters/sidebar level Makefile for Gramps # $Id$ -pkgpythondir = $(datadir)/@PACKAGE@/Filters/SideBar +pkgpythondir = $(datadir)/@PACKAGE@/gui/filters/sidebar pkgpython_PYTHON = \ _EventSidebarFilter.py \ @@ -16,12 +16,12 @@ pkgpython_PYTHON = \ _RepoSidebarFilter.py\ _NoteSidebarFilter.py -pkgpyexecdir = @pkgpyexecdir@/Filters/SideBar +pkgpyexecdir = @pkgpyexecdir@/gui/filters/sidebar # Clean up all the byte-compiled files MOSTLYCLEANFILES = *pyc *pyo -GRAMPS_PY_MODPATH = "../" +GRAMPS_PY_MODPATH = "../../" pycheck: (export PYTHONPATH=$(GRAMPS_PY_MODPATH); \ diff --git a/src/Filters/SideBar/_CitationSidebarFilter.py b/src/gui/filters/sidebar/_CitationSidebarFilter.py similarity index 93% rename from src/Filters/SideBar/_CitationSidebarFilter.py rename to src/gui/filters/sidebar/_CitationSidebarFilter.py index 907894ea4..7ead4e2b9 100644 --- a/src/Filters/SideBar/_CitationSidebarFilter.py +++ b/src/gui/filters/sidebar/_CitationSidebarFilter.py @@ -42,11 +42,12 @@ import gtk #------------------------------------------------------------------------- from gui.widgets import MonitoredMenu import gen.lib -from Filters.SideBar import SidebarFilter -from Filters import GenericFilterFactory, build_filter_model, Rules -from Filters.Rules.Citation import (RegExpIdOf, HasIdOf, HasCitation, - HasNoteMatchingSubstringOf, HasNoteRegexp, - MatchesFilter) +from gui.filters import build_filter_model +from gui.filters.sidebar import SidebarFilter +from gen.filters import GenericFilterFactory, rules +from gen.filters.rules.citation import (RegExpIdOf, HasIdOf, HasCitation, + HasNoteMatchingSubstringOf, + HasNoteRegexp, MatchesFilter) from Utils import confidence GenericCitationFilter = GenericFilterFactory('Citation') #------------------------------------------------------------------------- @@ -159,6 +160,6 @@ class CitationSidebarFilter(SidebarFilter): if name_space == 'Citation': all_filter = GenericCitationFilter() all_filter.set_name(_("None")) - all_filter.add_rule(Rules.Citation.AllCitations([])) + all_filter.add_rule(rules.citation.AllCitations([])) self.generic.set_model(build_filter_model('Citation', [all_filter])) self.generic.set_active(0) diff --git a/src/Filters/SideBar/_EventSidebarFilter.py b/src/gui/filters/sidebar/_EventSidebarFilter.py similarity index 93% rename from src/Filters/SideBar/_EventSidebarFilter.py rename to src/gui/filters/sidebar/_EventSidebarFilter.py index 7ef252115..184b3aa30 100644 --- a/src/Filters/SideBar/_EventSidebarFilter.py +++ b/src/gui/filters/sidebar/_EventSidebarFilter.py @@ -41,12 +41,12 @@ import gtk #------------------------------------------------------------------------- from gui import widgets import gen.lib - -from Filters.SideBar import SidebarFilter -from Filters import GenericFilterFactory, build_filter_model, Rules -from Filters.Rules.Event import (RegExpIdOf, HasIdOf, HasNoteRegexp, - HasNoteMatchingSubstringOf, MatchesFilter, - HasEvent) +from gui.filters import build_filter_model +from gui.filters.sidebar import SidebarFilter +from gen.filters import GenericFilterFactory, rules +from gen.filters.rules.event import (RegExpIdOf, HasIdOf, HasNoteRegexp, + HasNoteMatchingSubstringOf, MatchesFilter, + HasEvent) GenericEventFilter = GenericFilterFactory('Event') #------------------------------------------------------------------------- @@ -158,6 +158,6 @@ class EventSidebarFilter(SidebarFilter): if name_space == 'Event': all_filter = GenericEventFilter() all_filter.set_name(_("None")) - all_filter.add_rule(Rules.Event.AllEvents([])) + all_filter.add_rule(rules.event.AllEvents([])) self.generic.set_model(build_filter_model('Event', [all_filter])) self.generic.set_active(0) diff --git a/src/Filters/SideBar/_FamilySidebarFilter.py b/src/gui/filters/sidebar/_FamilySidebarFilter.py similarity index 92% rename from src/Filters/SideBar/_FamilySidebarFilter.py rename to src/gui/filters/sidebar/_FamilySidebarFilter.py index 43837f42f..9d49f85d0 100644 --- a/src/Filters/SideBar/_FamilySidebarFilter.py +++ b/src/gui/filters/sidebar/_FamilySidebarFilter.py @@ -42,15 +42,15 @@ import gtk #------------------------------------------------------------------------- from gui import widgets import gen.lib - -from Filters.SideBar import SidebarFilter -from Filters import GenericFilterFactory, build_filter_model, Rules -from Filters.Rules.Family import (RegExpIdOf, HasIdOf, RegExpFatherName, - SearchFatherName, RegExpMotherName, - SearchMotherName, RegExpChildName, - SearchChildName, HasEvent, HasRelType, - HasTag, HasNoteRegexp, - HasNoteMatchingSubstringOf, MatchesFilter) +from gui.filters import build_filter_model +from gui.filters.sidebar import SidebarFilter +from gen.filters import GenericFilterFactory, rules +from gen.filters.rules.family import (RegExpIdOf, HasIdOf, RegExpFatherName, + SearchFatherName, RegExpMotherName, + SearchMotherName, RegExpChildName, + SearchChildName, HasEvent, HasRelType, + HasTag, HasNoteRegexp, + HasNoteMatchingSubstringOf, MatchesFilter) GenericFamilyFilter = GenericFilterFactory('Family') #------------------------------------------------------------------------- @@ -215,7 +215,7 @@ class FamilySidebarFilter(SidebarFilter): if name_space == 'Family': all_filter = GenericFamilyFilter() all_filter.set_name(_("None")) - all_filter.add_rule(Rules.Family.AllFamilies([])) + all_filter.add_rule(rules.family.AllFamilies([])) self.generic.set_model(build_filter_model('Family', [all_filter])) self.generic.set_active(0) diff --git a/src/Filters/SideBar/_MediaSidebarFilter.py b/src/gui/filters/sidebar/_MediaSidebarFilter.py similarity index 88% rename from src/Filters/SideBar/_MediaSidebarFilter.py rename to src/gui/filters/sidebar/_MediaSidebarFilter.py index 84af2cf9b..386480b38 100644 --- a/src/Filters/SideBar/_MediaSidebarFilter.py +++ b/src/gui/filters/sidebar/_MediaSidebarFilter.py @@ -41,13 +41,14 @@ import gtk # #------------------------------------------------------------------------- from gui import widgets -from Filters.SideBar import SidebarFilter -from Filters import GenericFilterFactory, build_filter_model, Rules -from Filters.Rules.MediaObject import (RegExpIdOf, HasIdOf, HasMedia, HasTag, - HasNoteRegexp, MatchesFilter, - HasNoteMatchingSubstringOf) +from gui.filters import build_filter_model +from gui.filters.sidebar import SidebarFilter +from gen.filters import GenericFilterFactory, rules +from gen.filters.rules.media import (RegExpIdOf, HasIdOf, HasMedia, HasTag, + HasNoteRegexp, MatchesFilter, + HasNoteMatchingSubstringOf) -GenericMediaFilter = GenericFilterFactory('MediaObject') +GenericMediaFilter = GenericFilterFactory('Media') #------------------------------------------------------------------------- # # MediaSidebarFilter class @@ -69,7 +70,7 @@ class MediaSidebarFilter(SidebarFilter): self.tag = gtk.ComboBox() self.generic = gtk.ComboBox() - SidebarFilter.__init__(self, dbstate, uistate, "MediaObject") + SidebarFilter.__init__(self, dbstate, uistate, "Media") def create_widget(self): cell = gtk.CellRendererText() @@ -77,7 +78,7 @@ class MediaSidebarFilter(SidebarFilter): cell.set_property('ellipsize', self._FILTER_ELLIPSIZE) self.generic.pack_start(cell, True) self.generic.add_attribute(cell, 'text', 0) - self.on_filters_changed('MediaObject') + self.on_filters_changed('Media') cell = gtk.CellRendererText() cell.set_property('width', self._FILTER_WIDTH) @@ -157,12 +158,11 @@ class MediaSidebarFilter(SidebarFilter): return generic_filter def on_filters_changed(self, name_space): - if name_space == 'MediaObject': + if name_space == 'Media': all_filter = GenericMediaFilter() all_filter.set_name(_("None")) - all_filter.add_rule(Rules.MediaObject.AllMedia([])) - self.generic.set_model(build_filter_model('MediaObject', - [all_filter])) + all_filter.add_rule(rules.media.AllMedia([])) + self.generic.set_model(build_filter_model('Media', [all_filter])) self.generic.set_active(0) def on_tags_changed(self, tag_list): diff --git a/src/Filters/SideBar/_NoteSidebarFilter.py b/src/gui/filters/sidebar/_NoteSidebarFilter.py similarity index 94% rename from src/Filters/SideBar/_NoteSidebarFilter.py rename to src/gui/filters/sidebar/_NoteSidebarFilter.py index 0619a7f9a..e0a7490cd 100644 --- a/src/Filters/SideBar/_NoteSidebarFilter.py +++ b/src/gui/filters/sidebar/_NoteSidebarFilter.py @@ -42,11 +42,11 @@ import gtk #------------------------------------------------------------------------- from gui import widgets from gen.lib import Note, NoteType - -from Filters.SideBar import SidebarFilter -from Filters import GenericFilterFactory, build_filter_model, Rules -from Filters.Rules.Note import (RegExpIdOf, HasIdOf, HasNote, MatchesFilter, - HasTag) +from gui.filters import build_filter_model +from gui.filters.sidebar import SidebarFilter +from gen.filters import GenericFilterFactory, rules +from gen.filters.rules.note import (RegExpIdOf, HasIdOf, HasNote, + MatchesFilter, HasTag) GenericNoteFilter = GenericFilterFactory('Note') #------------------------------------------------------------------------- @@ -150,7 +150,7 @@ class NoteSidebarFilter(SidebarFilter): if name_space == 'Note': all_filter = GenericNoteFilter() all_filter.set_name(_("None")) - all_filter.add_rule(Rules.Note.AllNotes([])) + all_filter.add_rule(rules.note.AllNotes([])) self.generic.set_model(build_filter_model('Note', [all_filter])) self.generic.set_active(0) diff --git a/src/Filters/SideBar/_PersonSidebarFilter.py b/src/gui/filters/sidebar/_PersonSidebarFilter.py similarity index 94% rename from src/Filters/SideBar/_PersonSidebarFilter.py rename to src/gui/filters/sidebar/_PersonSidebarFilter.py index 321806c3c..bf9359781 100644 --- a/src/Filters/SideBar/_PersonSidebarFilter.py +++ b/src/gui/filters/sidebar/_PersonSidebarFilter.py @@ -44,13 +44,14 @@ import gtk from gui import widgets import gen.lib import DateHandler - -from Filters.SideBar import SidebarFilter -from Filters.Rules.Person import (RegExpName, SearchName, RegExpIdOf, MatchIdOf, - IsMale, IsFemale, HasUnknownGender, HasEvent, - HasTag, HasBirth, HasDeath, HasNoteRegexp, - HasNoteMatchingSubstringOf, MatchesFilter) -from Filters import GenericFilter, build_filter_model, Rules +from gui.filters import build_filter_model +from gui.filters.sidebar import SidebarFilter +from gen.filters import GenericFilter, rules +from gen.filters.rules.person import (RegExpName, SearchName, RegExpIdOf, + MatchIdOf, IsMale, IsFemale, + HasUnknownGender, HasEvent, HasTag, + HasBirth, HasDeath, HasNoteRegexp, + HasNoteMatchingSubstringOf, MatchesFilter) def extract_text(entry_widget): """ @@ -253,7 +254,7 @@ class PersonSidebarFilter(SidebarFilter): if name_space == 'Person': all_filter = GenericFilter() all_filter.set_name(_("None")) - all_filter.add_rule(Rules.Person.Everyone([])) + all_filter.add_rule(rules.person.Everyone([])) self.generic.set_model(build_filter_model('Person', [all_filter])) self.generic.set_active(0) diff --git a/src/Filters/SideBar/_PlaceSidebarFilter.py b/src/gui/filters/sidebar/_PlaceSidebarFilter.py similarity index 94% rename from src/Filters/SideBar/_PlaceSidebarFilter.py rename to src/gui/filters/sidebar/_PlaceSidebarFilter.py index 9377d7a3d..edc37981c 100644 --- a/src/Filters/SideBar/_PlaceSidebarFilter.py +++ b/src/gui/filters/sidebar/_PlaceSidebarFilter.py @@ -42,10 +42,12 @@ import gtk # #------------------------------------------------------------------------- from gui import widgets -from Filters.SideBar import SidebarFilter -from Filters import GenericFilterFactory, build_filter_model, Rules -from Filters.Rules.Place import (RegExpIdOf, HasIdOf, HasPlace, HasNoteRegexp, - HasNoteMatchingSubstringOf, MatchesFilter) +from gui.filters import build_filter_model +from gui.filters.sidebar import SidebarFilter +from gen.filters import GenericFilterFactory, rules +from gen.filters.rules.place import (RegExpIdOf, HasIdOf, HasPlace, + HasNoteRegexp, HasNoteMatchingSubstringOf, + MatchesFilter) GenericPlaceFilter = GenericFilterFactory('Place') #------------------------------------------------------------------------- @@ -163,6 +165,6 @@ class PlaceSidebarFilter(SidebarFilter): if name_space == 'Place': all_filter = GenericPlaceFilter() all_filter.set_name(_("None")) - all_filter.add_rule(Rules.Place.AllPlaces([])) + all_filter.add_rule(rules.place.AllPlaces([])) self.generic.set_model(build_filter_model('Place', [all_filter])) self.generic.set_active(0) diff --git a/src/Filters/SideBar/_RepoSidebarFilter.py b/src/gui/filters/sidebar/_RepoSidebarFilter.py similarity index 92% rename from src/Filters/SideBar/_RepoSidebarFilter.py rename to src/gui/filters/sidebar/_RepoSidebarFilter.py index f972a9fcd..c12820146 100644 --- a/src/Filters/SideBar/_RepoSidebarFilter.py +++ b/src/gui/filters/sidebar/_RepoSidebarFilter.py @@ -41,12 +41,12 @@ import gtk #------------------------------------------------------------------------- from gui import widgets from gen.lib import Repository, RepositoryType - -from Filters.SideBar import SidebarFilter -from Filters import GenericFilterFactory, build_filter_model, Rules -from Filters.Rules.Repository import (RegExpIdOf, HasIdOf, HasRepo, - HasNoteRegexp, MatchesFilter, - HasNoteMatchingSubstringOf) +from gui.filters import build_filter_model +from gui.filters.sidebar import SidebarFilter +from gen.filters import GenericFilterFactory, rules +from gen.filters.rules.repository import (RegExpIdOf, HasIdOf, HasRepo, + HasNoteRegexp, MatchesFilter, + HasNoteMatchingSubstringOf) GenericRepoFilter = GenericFilterFactory('Repository') #------------------------------------------------------------------------- @@ -153,7 +153,7 @@ class RepoSidebarFilter(SidebarFilter): if name_space == 'Repository': all_filter = GenericRepoFilter() all_filter.set_name(_("None")) - all_filter.add_rule(Rules.Repository.AllRepos([])) + all_filter.add_rule(rules.repository.AllRepos([])) self.generic.set_model(build_filter_model('Repository', [all_filter])) self.generic.set_active(0) diff --git a/src/Filters/SideBar/_SidebarFilter.py b/src/gui/filters/sidebar/_SidebarFilter.py similarity index 98% rename from src/Filters/SideBar/_SidebarFilter.py rename to src/gui/filters/sidebar/_SidebarFilter.py index d0a45f1cb..01d86293d 100644 --- a/src/Filters/SideBar/_SidebarFilter.py +++ b/src/gui/filters/sidebar/_SidebarFilter.py @@ -227,7 +227,7 @@ class SidebarFilter(DbGUIElement): filter if called if none is selected. """ from gui.filtereditor import EditFilter - from Filters import FilterList, GenericFilterFactory + from gen.filters import FilterList, GenericFilterFactory import const the_filter = None filterdb = FilterList(const.CUSTOM_FILTERS) @@ -253,7 +253,7 @@ class SidebarFilter(DbGUIElement): If a filter changed, save them all. Reloads, and sets name. Takes the filter database, and the filter name edited. """ - from Filters import reload_custom_filters + from gen.filters import reload_custom_filters filterdb.save() reload_custom_filters() self.on_filters_changed(self.namespace) diff --git a/src/Filters/SideBar/_SourceSidebarFilter.py b/src/gui/filters/sidebar/_SourceSidebarFilter.py similarity index 92% rename from src/Filters/SideBar/_SourceSidebarFilter.py rename to src/gui/filters/sidebar/_SourceSidebarFilter.py index 09177a9d9..a4ca28af7 100644 --- a/src/Filters/SideBar/_SourceSidebarFilter.py +++ b/src/gui/filters/sidebar/_SourceSidebarFilter.py @@ -40,11 +40,12 @@ import gtk # #------------------------------------------------------------------------- from gui import widgets -from Filters.SideBar import SidebarFilter -from Filters import GenericFilterFactory, build_filter_model, Rules -from Filters.Rules.Source import (RegExpIdOf, HasIdOf, HasSource, - HasNoteMatchingSubstringOf, HasNoteRegexp, - MatchesFilter) +from gui.filters import build_filter_model +from gui.filters.sidebar import SidebarFilter +from gen.filters import GenericFilterFactory, rules +from gen.filters.rules.source import (RegExpIdOf, HasIdOf, HasSource, + HasNoteMatchingSubstringOf, + HasNoteRegexp, MatchesFilter) GenericSourceFilter = GenericFilterFactory('Source') #------------------------------------------------------------------------- @@ -141,6 +142,6 @@ class SourceSidebarFilter(SidebarFilter): if name_space == 'Source': all_filter = GenericSourceFilter() all_filter.set_name(_("None")) - all_filter.add_rule(Rules.Source.AllSources([])) + all_filter.add_rule(rules.source.AllSources([])) self.generic.set_model(build_filter_model('Source', [all_filter])) self.generic.set_active(0) diff --git a/src/Filters/SideBar/__init__.py b/src/gui/filters/sidebar/__init__.py similarity index 100% rename from src/Filters/SideBar/__init__.py rename to src/gui/filters/sidebar/__init__.py diff --git a/src/gui/makefilter.py b/src/gui/makefilter.py index a9965cfad..77edeae91 100644 --- a/src/gui/makefilter.py +++ b/src/gui/makefilter.py @@ -18,14 +18,13 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# gui/makefilter.py # $Id$ import time -import Filters +import gen.filters from gui.filtereditor import EditFilter import const -from Filters import reload_custom_filters +from gen.filters import reload_custom_filters from gen.ggettext import sgettext as _ def make_filter(dbstate, uistate, objclass, gramps_ids, title=None): @@ -35,10 +34,8 @@ def make_filter(dbstate, uistate, objclass, gramps_ids, title=None): >>> make_filter(dbstate, uistate, 'Person', ['I0003', ...]) """ - if objclass == "Media": - objclass = "MediaObject" - FilterClass = Filters.GenericFilterFactory(objclass) - rule = getattr(getattr(Filters.Rules, objclass),'RegExpIdOf') + FilterClass = gen.filters.GenericFilterFactory(objclass) + rule = getattr(getattr(gen.filters.rules, objclass),'RegExpIdOf') filter = FilterClass() if title is None: title = _("Filter %s from Clipboard") % objclass @@ -52,7 +49,7 @@ def make_filter(dbstate, uistate, objclass, gramps_ids, title=None): 'day': struct_time.tm_mday}) re = "|".join(["^%s$" % gid for gid in sorted(gramps_ids)]) filter.add_rule(rule([re])) - filterdb = Filters.FilterList(const.CUSTOM_FILTERS) + filterdb = gen.filters.FilterList(const.CUSTOM_FILTERS) filterdb.load() EditFilter(objclass, dbstate, uistate, [], filter, filterdb, diff --git a/src/gui/plug/_guioptions.py b/src/gui/plug/_guioptions.py index c426b952d..21247b987 100644 --- a/src/gui/plug/_guioptions.py +++ b/src/gui/plug/_guioptions.py @@ -58,7 +58,7 @@ import ManagedWindow from QuestionDialog import OptionDialog from gui.selectors import SelectorFactory from gen.display.name import displayer as _nd -from Filters import GenericFilterFactory, GenericFilter, Rules +from gen.filters import GenericFilterFactory, GenericFilter, rules import gen #------------------------------------------------------------------------ @@ -636,21 +636,21 @@ class GuiPersonOption(gtk.HBox): # Create a filter for the person selector. rfilter = GenericFilter() rfilter.set_logical_op('or') - rfilter.add_rule(Rules.Person.IsBookmarked([])) - rfilter.add_rule(Rules.Person.HasIdOf([self.__option.get_value()])) + rfilter.add_rule(rules.person.IsBookmarked([])) + rfilter.add_rule(rules.person.HasIdOf([self.__option.get_value()])) # Add the database home person if one exists. default_person = self.__db.get_default_person() if default_person: gid = default_person.get_gramps_id() - rfilter.add_rule(Rules.Person.HasIdOf([gid])) + rfilter.add_rule(rules.person.HasIdOf([gid])) # Add the selected person if one exists. person_handle = self.__uistate.get_active('Person') active_person = self.__dbstate.db.get_person_from_handle(person_handle) if active_person: gid = active_person.get_gramps_id() - rfilter.add_rule(Rules.Person.HasIdOf([gid])) + rfilter.add_rule(rules.person.HasIdOf([gid])) select_class = SelectorFactory('Person') sel = select_class(self.__dbstate, self.__uistate, self.__track, @@ -787,10 +787,10 @@ class GuiFamilyOption(gtk.HBox): rfilter.set_logical_op('or') # Add the current family - rfilter.add_rule(Rules.Family.HasIdOf([self.__option.get_value()])) + rfilter.add_rule(rules.family.HasIdOf([self.__option.get_value()])) # Add all bookmarked families - rfilter.add_rule(Rules.Family.IsBookmarked([])) + rfilter.add_rule(rules.family.IsBookmarked([])) # Add the families of the database home person if one exists. default_person = self.__db.get_default_person() @@ -799,7 +799,7 @@ class GuiFamilyOption(gtk.HBox): for family_handle in family_list: family = self.__db.get_family_from_handle(family_handle) gid = family.get_gramps_id() - rfilter.add_rule(Rules.Family.HasIdOf([gid])) + rfilter.add_rule(rules.family.HasIdOf([gid])) # Add the families of the selected person if one exists. # Same code as above one ! See bug #5032 feature request #5038 @@ -810,7 +810,7 @@ class GuiFamilyOption(gtk.HBox): #for family_handle in family_list: #family = self.__db.get_family_from_handle(family_handle) #gid = family.get_gramps_id() - #rfilter.add_rule(Rules.Family.HasIdOf([gid])) + #rfilter.add_rule(rules.family.HasIdOf([gid])) select_class = SelectorFactory('Family') sel = select_class(self.__dbstate, self.__uistate, self.__track, diff --git a/src/gui/selectors/baseselector.py b/src/gui/selectors/baseselector.py index d3e255846..daf58abea 100644 --- a/src/gui/selectors/baseselector.py +++ b/src/gui/selectors/baseselector.py @@ -35,7 +35,7 @@ import pango # #------------------------------------------------------------------------- import ManagedWindow -from Filters import SearchBar +from gui.filters import SearchBar from glade import Glade #------------------------------------------------------------------------- diff --git a/src/gui/views/listview.py b/src/gui/views/listview.py index 4a160c709..25efe912e 100644 --- a/src/gui/views/listview.py +++ b/src/gui/views/listview.py @@ -56,7 +56,7 @@ from gui.columnorder import ColumnOrder import config import TreeTips import Errors -from Filters import SearchBar +from gui.filters import SearchBar from gui.utils import add_menuitem import const import Utils diff --git a/src/gui/views/treemodels/flatbasemodel.py b/src/gui/views/treemodels/flatbasemodel.py index 77bde601c..8c9370200 100644 --- a/src/gui/views/treemodels/flatbasemodel.py +++ b/src/gui/views/treemodels/flatbasemodel.py @@ -72,8 +72,7 @@ import gtk # GRAMPS modules # #------------------------------------------------------------------------- -from Filters import SearchFilter -from Filters import ExactSearchFilter +from gen.filters import SearchFilter, ExactSearchFilter from Utils import conv_unicode_tosrtkey_ongtk #------------------------------------------------------------------------- diff --git a/src/gui/views/treemodels/treebasemodel.py b/src/gui/views/treemodels/treebasemodel.py index e070f8583..5457690a1 100644 --- a/src/gui/views/treemodels/treebasemodel.py +++ b/src/gui/views/treemodels/treebasemodel.py @@ -58,7 +58,7 @@ from Utils import conv_unicode_tosrtkey_ongtk import gui.widgets.progressdialog as progressdlg from Lru import LRU from bisect import bisect_right -from Filters import SearchFilter, ExactSearchFilter +from gen.filters import SearchFilter, ExactSearchFilter #------------------------------------------------------------------------- # diff --git a/src/plugins/export/ExportCsv.py b/src/plugins/export/ExportCsv.py index c61bc1020..5d43cc7c9 100644 --- a/src/plugins/export/ExportCsv.py +++ b/src/plugins/export/ExportCsv.py @@ -50,7 +50,6 @@ LOG = logging.getLogger(".ExportCSV") # #------------------------------------------------------------------------- import gen.lib -from Filters import GenericFilter, Rules, build_filter_model from gen.lib.eventroletype import EventRoleType from ExportOptions import WriterOptionBox import Utils diff --git a/src/plugins/export/ExportFtree.py b/src/plugins/export/ExportFtree.py index 8eec38e5d..73100d7bb 100644 --- a/src/plugins/export/ExportFtree.py +++ b/src/plugins/export/ExportFtree.py @@ -46,7 +46,6 @@ log = logging.getLogger(".WriteFtree") # #------------------------------------------------------------------------- import Utils -from Filters import GenericFilter, Rules, build_filter_model from ExportOptions import WriterOptionBox import Errors from glade import Glade diff --git a/src/plugins/export/ExportGeneWeb.py b/src/plugins/export/ExportGeneWeb.py index 0752eee3e..20d567ce8 100644 --- a/src/plugins/export/ExportGeneWeb.py +++ b/src/plugins/export/ExportGeneWeb.py @@ -47,7 +47,6 @@ log = logging.getLogger(".WriteGeneWeb") # #------------------------------------------------------------------------- import gen.lib -from Filters import GenericFilter, Rules, build_filter_model from ExportOptions import WriterOptionBox #import const import Utils diff --git a/src/plugins/export/ExportVCalendar.py b/src/plugins/export/ExportVCalendar.py index 10813face..1cc654ba0 100644 --- a/src/plugins/export/ExportVCalendar.py +++ b/src/plugins/export/ExportVCalendar.py @@ -48,7 +48,6 @@ log = logging.getLogger(".ExportVCal") # #------------------------------------------------------------------------- from ExportOptions import WriterOptionBox -from Filters import GenericFilter, Rules, build_filter_model import Utils from gen.lib import Date, EventType import Errors diff --git a/src/plugins/gramplet/Filter.py b/src/plugins/gramplet/Filter.py index f95b10c17..447a52462 100644 --- a/src/plugins/gramplet/Filter.py +++ b/src/plugins/gramplet/Filter.py @@ -27,11 +27,11 @@ # #------------------------------------------------------------------------- from gen.plug import Gramplet -from Filters.SideBar import (PersonSidebarFilter, FamilySidebarFilter, - EventSidebarFilter, SourceSidebarFilter, - CitationSidebarFilter, - PlaceSidebarFilter, MediaSidebarFilter, - RepoSidebarFilter, NoteSidebarFilter) +from gui.filters.sidebar import (PersonSidebarFilter, FamilySidebarFilter, + EventSidebarFilter, SourceSidebarFilter, + CitationSidebarFilter, + PlaceSidebarFilter, MediaSidebarFilter, + RepoSidebarFilter, NoteSidebarFilter) #------------------------------------------------------------------------- # diff --git a/src/plugins/lib/libpersonview.py b/src/plugins/lib/libpersonview.py index c4885dbb6..0df2b5dbe 100644 --- a/src/plugins/lib/libpersonview.py +++ b/src/plugins/lib/libpersonview.py @@ -58,7 +58,7 @@ import Bookmarks import config from DdTargets import DdTargets from gui.editors import EditPerson -from Filters.SideBar import PersonSidebarFilter +from gui.filters.sidebar import PersonSidebarFilter from gen.plug import CATEGORY_QR_PERSON #------------------------------------------------------------------------- diff --git a/src/plugins/lib/libplaceview.py b/src/plugins/lib/libplaceview.py index b17b7d591..c2cf7d644 100644 --- a/src/plugins/lib/libplaceview.py +++ b/src/plugins/lib/libplaceview.py @@ -55,7 +55,7 @@ from QuestionDialog import ErrorDialog from gui.pluginmanager import GuiPluginManager from DdTargets import DdTargets from gui.editors import EditPlace, DeletePlaceQuery -from Filters.SideBar import PlaceSidebarFilter +from gui.filters.sidebar import PlaceSidebarFilter from gen.plug import CATEGORY_QR_PLACE #------------------------------------------------------------------------- diff --git a/src/plugins/quickview/SameSurnames.py b/src/plugins/quickview/SameSurnames.py index 95aaecd12..394403a7f 100644 --- a/src/plugins/quickview/SameSurnames.py +++ b/src/plugins/quickview/SameSurnames.py @@ -31,8 +31,8 @@ from Simple import SimpleAccess, SimpleDoc, SimpleTable from gen.ggettext import gettext as _ from gen.ggettext import ngettext import gen.lib -from Filters.Rules import Rule -from Filters import GenericFilterFactory +from gen.filters.rules import Rule +from gen.filters import GenericFilterFactory class IncompleteSurname(Rule): """People with incomplete surnames""" diff --git a/src/plugins/textreport/PlaceReport.py b/src/plugins/textreport/PlaceReport.py index 7786064dc..8400eaf67 100644 --- a/src/plugins/textreport/PlaceReport.py +++ b/src/plugins/textreport/PlaceReport.py @@ -367,7 +367,7 @@ class PlaceOptions(MenuReportOptions): # Reload filters to pick any new ones CustomFilters = None - from Filters import CustomFilters, GenericFilter + from gen.filters import CustomFilters, GenericFilter opt = FilterOption(_("Select using filter"), 0) opt.set_help(_("Select places using a filter")) diff --git a/src/plugins/textreport/TagReport.py b/src/plugins/textreport/TagReport.py index 458cd9d9e..800f0490e 100644 --- a/src/plugins/textreport/TagReport.py +++ b/src/plugins/textreport/TagReport.py @@ -45,7 +45,7 @@ from gen.plug.docgen import (IndexMark, FontStyle, ParagraphStyle, TableStyle, TableCellStyle, FONT_SANS_SERIF, INDEX_TYPE_TOC, PARA_ALIGN_CENTER) from gen.lib import NoteType -from Filters import GenericFilterFactory, Rules +from gen.filters import GenericFilterFactory, rules from gen.display.name import displayer as name_displayer from Errors import ReportError import DateHandler @@ -97,7 +97,7 @@ class TagReport(Report): plist = self.database.iter_person_handles() FilterClass = GenericFilterFactory('Person') filter = FilterClass() - filter.add_rule(Rules.Person.HasTag([self.tag])) + filter.add_rule(rules.person.HasTag([self.tag])) ind_list = filter.apply(self.database, plist) if not ind_list: @@ -184,7 +184,7 @@ class TagReport(Report): flist = self.database.iter_family_handles() FilterClass = GenericFilterFactory('Family') filter = FilterClass() - filter.add_rule(Rules.Family.HasTag([self.tag])) + filter.add_rule(rules.family.HasTag([self.tag])) fam_list = filter.apply(self.database, flist) if not fam_list: @@ -274,7 +274,7 @@ class TagReport(Report): elist = self.database.get_event_handles() FilterClass = GenericFilterFactory('Event') filter = FilterClass() - filter.add_rule(Rules.Event.HasTag([self.tag])) + filter.add_rule(rules.event.HasTag([self.tag])) event_list = filter.apply(self.database, elist) if not event_list: @@ -360,7 +360,7 @@ class TagReport(Report): nlist = self.database.get_note_handles() FilterClass = GenericFilterFactory('Note') filter = FilterClass() - filter.add_rule(Rules.Note.HasTag([self.tag])) + filter.add_rule(rules.note.HasTag([self.tag])) note_list = filter.apply(self.database, nlist) if not note_list: @@ -428,9 +428,9 @@ class TagReport(Report): def write_media(self): mlist = self.database.get_media_object_handles(sort_handles=True) - FilterClass = GenericFilterFactory('MediaObject') + FilterClass = GenericFilterFactory('Media') filter = FilterClass() - filter.add_rule(Rules.MediaObject.HasTag([self.tag])) + filter.add_rule(rules.media.HasTag([self.tag])) media_list = filter.apply(self.database, mlist) if not media_list: diff --git a/src/plugins/tool/EventCmp.py b/src/plugins/tool/EventCmp.py index 2f8325e05..bc59b5fd0 100644 --- a/src/plugins/tool/EventCmp.py +++ b/src/plugins/tool/EventCmp.py @@ -44,7 +44,8 @@ import gtk # GRAMPS modules # #------------------------------------------------------------------------ -from Filters import GenericFilter, build_filter_model, Rules +from gen.filters import GenericFilter, rules +from gui.filters import build_filter_model import Sort import Utils from gui.utils import ProgressMeter @@ -154,7 +155,7 @@ class EventComparison(tool.Tool,ManagedWindow.ManagedWindow): if name_space == 'Person': all_filter = GenericFilter() all_filter.set_name(_("Entire Database")) - all_filter.add_rule(Rules.Person.Everyone([])) + all_filter.add_rule(rules.person.Everyone([])) self.filter_model = build_filter_model('Person', [all_filter]) self.filters.set_model(self.filter_model) self.filters.set_active(0) diff --git a/src/plugins/view/citationlistview.py b/src/plugins/view/citationlistview.py index 28dcce52c..adaef12bd 100644 --- a/src/plugins/view/citationlistview.py +++ b/src/plugins/view/citationlistview.py @@ -55,7 +55,7 @@ import Errors from DdTargets import DdTargets from QuestionDialog import ErrorDialog from gui.editors import EditCitation, DeleteCitationQuery -from Filters.SideBar import CitationSidebarFilter +from gui.filters.sidebar import CitationSidebarFilter #------------------------------------------------------------------------- # diff --git a/src/plugins/view/citationtreeview.py b/src/plugins/view/citationtreeview.py index b59cdd017..46ed29d5d 100644 --- a/src/plugins/view/citationtreeview.py +++ b/src/plugins/view/citationtreeview.py @@ -57,7 +57,7 @@ from DdTargets import DdTargets from QuestionDialog import ErrorDialog from gui.editors import EditCitation, DeleteCitationQuery, EditSource, \ DeleteSrcQuery -from Filters.SideBar import SourceSidebarFilter +from gui.filters.sidebar import SourceSidebarFilter #------------------------------------------------------------------------- # diff --git a/src/plugins/view/eventview.py b/src/plugins/view/eventview.py index fb9ef62ed..d3b4fb5a2 100644 --- a/src/plugins/view/eventview.py +++ b/src/plugins/view/eventview.py @@ -56,7 +56,7 @@ import config from DdTargets import DdTargets from QuestionDialog import ErrorDialog from gui.editors import EditEvent, DeleteEventQuery -from Filters.SideBar import EventSidebarFilter +from gui.filters.sidebar import EventSidebarFilter from gen.plug import CATEGORY_QR_EVENT #------------------------------------------------------------------------- diff --git a/src/plugins/view/familyview.py b/src/plugins/view/familyview.py index ec9fe2b70..6d2c2bf24 100644 --- a/src/plugins/view/familyview.py +++ b/src/plugins/view/familyview.py @@ -53,7 +53,7 @@ import Bookmarks import Errors import config from QuestionDialog import ErrorDialog -from Filters.SideBar import FamilySidebarFilter +from gui.filters.sidebar import FamilySidebarFilter from gen.plug import CATEGORY_QR_FAMILY from DdTargets import DdTargets diff --git a/src/plugins/view/geoevents.py b/src/plugins/view/geoevents.py index 2f11bb2e0..c26645c10 100644 --- a/src/plugins/view/geoevents.py +++ b/src/plugins/view/geoevents.py @@ -64,7 +64,7 @@ from PlaceUtils import conv_lat_lon from gui.views.pageview import PageView from gui.editors import EditPlace from gui.selectors.selectplace import SelectPlace -from Filters.SideBar import EventSidebarFilter +from gui.filters.sidebar import EventSidebarFilter from gui.views.navigationview import NavigationView import Bookmarks from Utils import navigation_label diff --git a/src/plugins/view/geofamily.py b/src/plugins/view/geofamily.py index 9248ce7bf..a5288db22 100644 --- a/src/plugins/view/geofamily.py +++ b/src/plugins/view/geofamily.py @@ -64,7 +64,7 @@ from PlaceUtils import conv_lat_lon from gui.views.pageview import PageView from gui.editors import EditPlace from gui.selectors.selectplace import SelectPlace -from Filters.SideBar import FamilySidebarFilter +from gui.filters.sidebar import FamilySidebarFilter from gui.views.navigationview import NavigationView import Bookmarks from Utils import navigation_label diff --git a/src/plugins/view/geoperson.py b/src/plugins/view/geoperson.py index 636b14d2d..0f4c49d1f 100644 --- a/src/plugins/view/geoperson.py +++ b/src/plugins/view/geoperson.py @@ -65,7 +65,7 @@ from PlaceUtils import conv_lat_lon from gui.views.pageview import PageView from gui.editors import EditPlace from gui.selectors.selectplace import SelectPlace -from Filters.SideBar import PersonSidebarFilter +from gui.filters.sidebar import PersonSidebarFilter from gui.views.navigationview import NavigationView import Bookmarks import constants diff --git a/src/plugins/view/geoplaces.py b/src/plugins/view/geoplaces.py index 631dd488c..833714f21 100644 --- a/src/plugins/view/geoplaces.py +++ b/src/plugins/view/geoplaces.py @@ -64,7 +64,7 @@ from PlaceUtils import conv_lat_lon from gui.views.pageview import PageView from gui.editors import EditPlace from gui.selectors.selectplace import SelectPlace -from Filters.SideBar import PlaceSidebarFilter +from gui.filters.sidebar import PlaceSidebarFilter from gui.views.navigationview import NavigationView import Bookmarks from Utils import navigation_label diff --git a/src/plugins/view/mediaview.py b/src/plugins/view/mediaview.py index f1fafcbb4..5babd17f1 100644 --- a/src/plugins/view/mediaview.py +++ b/src/plugins/view/mediaview.py @@ -63,7 +63,7 @@ import gen.lib from gen.db import DbTxn from gui.editors import EditMedia, DeleteMediaQuery import Errors -from Filters.SideBar import MediaSidebarFilter +from gui.filters.sidebar import MediaSidebarFilter from DdTargets import DdTargets from QuestionDialog import ErrorDialog from gen.plug import CATEGORY_QR_MEDIA @@ -111,7 +111,7 @@ class MediaView(ListView): EDIT_MSG = _("Edit the selected media object") DEL_MSG = _("Delete the selected media object") MERGE_MSG = _("Merge the selected media objects") - FILTER_TYPE = 'MediaObject' + FILTER_TYPE = 'Media' QR_CATEGORY = CATEGORY_QR_MEDIA def __init__(self, pdata, dbstate, uistate, nav_group=0): diff --git a/src/plugins/view/noteview.py b/src/plugins/view/noteview.py index 8eec4f3f4..206ab0128 100644 --- a/src/plugins/view/noteview.py +++ b/src/plugins/view/noteview.py @@ -54,7 +54,7 @@ import config from gen.lib import Note from DdTargets import DdTargets from QuestionDialog import ErrorDialog -from Filters.SideBar import NoteSidebarFilter +from gui.filters.sidebar import NoteSidebarFilter from gui.editors import EditNote, DeleteNoteQuery from gen.plug import CATEGORY_QR_NOTE diff --git a/src/plugins/view/repoview.py b/src/plugins/view/repoview.py index f4878469d..dc9fdbe30 100644 --- a/src/plugins/view/repoview.py +++ b/src/plugins/view/repoview.py @@ -45,7 +45,7 @@ import config from gui.editors import EditRepository, DeleteRepositoryQuery from DdTargets import DdTargets from QuestionDialog import ErrorDialog -from Filters.SideBar import RepoSidebarFilter +from gui.filters.sidebar import RepoSidebarFilter from gen.plug import CATEGORY_QR_REPOSITORY #------------------------------------------------------------------------- diff --git a/src/plugins/view/sourceview.py b/src/plugins/view/sourceview.py index 543bd58ca..b9268df82 100644 --- a/src/plugins/view/sourceview.py +++ b/src/plugins/view/sourceview.py @@ -49,7 +49,7 @@ import Errors from DdTargets import DdTargets from QuestionDialog import ErrorDialog from gui.editors import EditSource, DeleteSrcQuery -from Filters.SideBar import SourceSidebarFilter +from gui.filters.sidebar import SourceSidebarFilter from gen.plug import CATEGORY_QR_SOURCE #-------------------------------------------------------------------------