diff --git a/gramps/gui/filters/sidebar/_citationsidebarfilter.py b/gramps/gui/filters/sidebar/_citationsidebarfilter.py index 0080242b1..b780483f5 100644 --- a/gramps/gui/filters/sidebar/_citationsidebarfilter.py +++ b/gramps/gui/filters/sidebar/_citationsidebarfilter.py @@ -40,10 +40,10 @@ from gi.repository import Gtk # GRAMPS modules # #------------------------------------------------------------------------- -from gramps.gui.widgets import MonitoredMenu +from ...widgets import MonitoredMenu from gramps.gen.lib import Citation -from gramps.gui.filters import build_filter_model -from gramps.gui.filters.sidebar import SidebarFilter +from .. import build_filter_model +from . import SidebarFilter from gramps.gen.filters import GenericFilterFactory, rules from gramps.gen.filters.rules.citation import (RegExpIdOf, HasIdOf, HasCitation, HasNoteMatchingSubstringOf, diff --git a/gramps/gui/filters/sidebar/_eventsidebarfilter.py b/gramps/gui/filters/sidebar/_eventsidebarfilter.py index ac46edbad..4293188e8 100644 --- a/gramps/gui/filters/sidebar/_eventsidebarfilter.py +++ b/gramps/gui/filters/sidebar/_eventsidebarfilter.py @@ -39,10 +39,10 @@ from gi.repository import Gtk # GRAMPS modules # #------------------------------------------------------------------------- -from gramps.gui import widgets +from ... import widgets from gramps.gen.lib import Event, EventType -from gramps.gui.filters import build_filter_model -from gramps.gui.filters.sidebar import SidebarFilter +from .. import build_filter_model +from . import SidebarFilter from gramps.gen.filters import GenericFilterFactory, rules from gramps.gen.filters.rules.event import (RegExpIdOf, HasIdOf, HasNoteRegexp, HasNoteMatchingSubstringOf, MatchesFilter, diff --git a/gramps/gui/filters/sidebar/_familysidebarfilter.py b/gramps/gui/filters/sidebar/_familysidebarfilter.py index 491801063..82927154f 100644 --- a/gramps/gui/filters/sidebar/_familysidebarfilter.py +++ b/gramps/gui/filters/sidebar/_familysidebarfilter.py @@ -40,10 +40,10 @@ from gi.repository import Gtk # GRAMPS modules # #------------------------------------------------------------------------- -from gramps.gui import widgets +from ... import widgets from gramps.gen.lib import Event, EventType, Family, FamilyRelType -from gramps.gui.filters import build_filter_model -from gramps.gui.filters.sidebar import SidebarFilter +from .. import build_filter_model +from . import SidebarFilter from gramps.gen.filters import GenericFilterFactory, rules from gramps.gen.filters.rules.family import (RegExpIdOf, HasIdOf, RegExpFatherName, SearchFatherName, RegExpMotherName, diff --git a/gramps/gui/filters/sidebar/_mediasidebarfilter.py b/gramps/gui/filters/sidebar/_mediasidebarfilter.py index bedaee48c..fba99e7e1 100644 --- a/gramps/gui/filters/sidebar/_mediasidebarfilter.py +++ b/gramps/gui/filters/sidebar/_mediasidebarfilter.py @@ -40,9 +40,9 @@ from gi.repository import Gtk # GRAMPS modules # #------------------------------------------------------------------------- -from gramps.gui import widgets -from gramps.gui.filters import build_filter_model -from gramps.gui.filters.sidebar import SidebarFilter +from ... import widgets +from .. import build_filter_model +from . import SidebarFilter from gramps.gen.filters import GenericFilterFactory, rules from gramps.gen.filters.rules.media import (RegExpIdOf, HasIdOf, HasMedia, HasTag, HasNoteRegexp, MatchesFilter, diff --git a/gramps/gui/filters/sidebar/_notesidebarfilter.py b/gramps/gui/filters/sidebar/_notesidebarfilter.py index bd9946fcf..edef41353 100644 --- a/gramps/gui/filters/sidebar/_notesidebarfilter.py +++ b/gramps/gui/filters/sidebar/_notesidebarfilter.py @@ -40,10 +40,10 @@ from gi.repository import Gtk # GRAMPS modules # #------------------------------------------------------------------------- -from gramps.gui import widgets +from ... import widgets from gramps.gen.lib import Note, NoteType -from gramps.gui.filters import build_filter_model -from gramps.gui.filters.sidebar import SidebarFilter +from .. import build_filter_model +from . import SidebarFilter from gramps.gen.filters import GenericFilterFactory, rules from gramps.gen.filters.rules.note import (RegExpIdOf, HasIdOf, HasNote, MatchesFilter, HasTag) diff --git a/gramps/gui/filters/sidebar/_personsidebarfilter.py b/gramps/gui/filters/sidebar/_personsidebarfilter.py index cce69d87e..87329278a 100644 --- a/gramps/gui/filters/sidebar/_personsidebarfilter.py +++ b/gramps/gui/filters/sidebar/_personsidebarfilter.py @@ -41,11 +41,11 @@ from gi.repository import Gtk # GRAMPS modules # #------------------------------------------------------------------------- -from gramps.gui import widgets +from ... import widgets from gramps.gen.lib import Date, Event, EventType from gramps.gen.datehandler import displayer -from gramps.gui.filters import build_filter_model -from gramps.gui.filters.sidebar import SidebarFilter +from .. import build_filter_model +from . import SidebarFilter from gramps.gen.filters import GenericFilter, rules from gramps.gen.filters.rules.person import (RegExpName, SearchName, RegExpIdOf, MatchIdOf, IsMale, IsFemale, diff --git a/gramps/gui/filters/sidebar/_placesidebarfilter.py b/gramps/gui/filters/sidebar/_placesidebarfilter.py index 03cd234f3..589dfc22a 100644 --- a/gramps/gui/filters/sidebar/_placesidebarfilter.py +++ b/gramps/gui/filters/sidebar/_placesidebarfilter.py @@ -41,9 +41,9 @@ from gi.repository import Gtk # GRAMPS modules # #------------------------------------------------------------------------- -from gramps.gui import widgets -from gramps.gui.filters import build_filter_model -from gramps.gui.filters.sidebar import SidebarFilter +from ... import widgets +from .. import build_filter_model +from . import SidebarFilter from gramps.gen.filters import GenericFilterFactory, rules from gramps.gen.filters.rules.place import (RegExpIdOf, HasIdOf, HasPlace, HasNoteRegexp, HasNoteMatchingSubstringOf, diff --git a/gramps/gui/filters/sidebar/_reposidebarfilter.py b/gramps/gui/filters/sidebar/_reposidebarfilter.py index a677fddd3..79a49d3e1 100644 --- a/gramps/gui/filters/sidebar/_reposidebarfilter.py +++ b/gramps/gui/filters/sidebar/_reposidebarfilter.py @@ -39,10 +39,10 @@ from gi.repository import Gtk # GRAMPS modules # #------------------------------------------------------------------------- -from gramps.gui import widgets +from ... import widgets from gramps.gen.lib import Repository, RepositoryType -from gramps.gui.filters import build_filter_model -from gramps.gui.filters.sidebar import SidebarFilter +from .. import build_filter_model +from . import SidebarFilter from gramps.gen.filters import GenericFilterFactory, rules from gramps.gen.filters.rules.repository import (RegExpIdOf, HasIdOf, HasRepo, HasNoteRegexp, MatchesFilter, diff --git a/gramps/gui/filters/sidebar/_sidebarfilter.py b/gramps/gui/filters/sidebar/_sidebarfilter.py index 0bc1cd254..c016f4f6d 100644 --- a/gramps/gui/filters/sidebar/_sidebarfilter.py +++ b/gramps/gui/filters/sidebar/_sidebarfilter.py @@ -27,8 +27,8 @@ from gi.repository import Gdk from gi.repository import Gtk from gi.repository import Pango -from gramps.gui import widgets -from gramps.gui.dbguielement import DbGUIElement +from ... import widgets +from ...dbguielement import DbGUIElement from gramps.gen.config import config _RETURN = Gdk.keyval_from_name("Return") @@ -228,7 +228,7 @@ class SidebarFilter(DbGUIElement): Callback which invokes the EditFilter dialog. Will create new filter if called if none is selected. """ - from gramps.gui.editors import EditFilter + from ...editors import EditFilter from gramps.gen.filters import FilterList, GenericFilterFactory from gramps.gen.const import CUSTOM_FILTERS the_filter = None diff --git a/gramps/gui/filters/sidebar/_sourcesidebarfilter.py b/gramps/gui/filters/sidebar/_sourcesidebarfilter.py index c416c1fd4..5c1f80140 100644 --- a/gramps/gui/filters/sidebar/_sourcesidebarfilter.py +++ b/gramps/gui/filters/sidebar/_sourcesidebarfilter.py @@ -39,9 +39,9 @@ from gi.repository import Gtk # GRAMPS modules # #------------------------------------------------------------------------- -from gramps.gui import widgets -from gramps.gui.filters import build_filter_model -from gramps.gui.filters.sidebar import SidebarFilter +from ... import widgets +from .. import build_filter_model +from . import SidebarFilter from gramps.gen.filters import GenericFilterFactory, rules from gramps.gen.filters.rules.source import (RegExpIdOf, HasIdOf, HasSource, HasNoteMatchingSubstringOf,