diff --git a/gramps/gui/merge/mergecitation.py b/gramps/gui/merge/mergecitation.py index 2506cfe4d..b57323123 100644 --- a/gramps/gui/merge/mergecitation.py +++ b/gramps/gui/merge/mergecitation.py @@ -32,8 +32,8 @@ Provide merge capabilities for citations. #------------------------------------------------------------------------- from gramps.gen.ggettext import sgettext as _ from gramps.gen.const import URL_MANUAL_PAGE -from gramps.gui.display import display_help -from gramps.gui.managedwindow import ManagedWindow +from ..display import display_help +from ..managedwindow import ManagedWindow from gramps.gen.datehandler import get_date from gramps.gen.utils.string import confidence from gramps.gen.merge import MergeCitationQuery diff --git a/gramps/gui/merge/mergeevent.py b/gramps/gui/merge/mergeevent.py index c4bafbf08..8b357a6fe 100644 --- a/gramps/gui/merge/mergeevent.py +++ b/gramps/gui/merge/mergeevent.py @@ -31,8 +31,8 @@ Provide merge capabilities for events. #------------------------------------------------------------------------- from gramps.gen.ggettext import sgettext as _ from gramps.gen.const import URL_MANUAL_PAGE -from gramps.gui.display import display_help -from gramps.gui.managedwindow import ManagedWindow +from ..display import display_help +from ..managedwindow import ManagedWindow from gramps.gen.datehandler import get_date from gramps.gen.utils.db import get_participant_from_event from gramps.gen.merge import MergeEventQuery diff --git a/gramps/gui/merge/mergefamily.py b/gramps/gui/merge/mergefamily.py index 4154d47a4..effabcf9c 100644 --- a/gramps/gui/merge/mergefamily.py +++ b/gramps/gui/merge/mergefamily.py @@ -32,10 +32,10 @@ Provide merge capabilities for families. from gramps.gen.ggettext import sgettext as _ from gramps.gen.display.name import displayer as name_displayer from gramps.gen.const import URL_MANUAL_PAGE -from gramps.gui.display import display_help +from ..display import display_help from gramps.gen.errors import MergeError -from gramps.gui.dialog import ErrorDialog -from gramps.gui.managedwindow import ManagedWindow +from ..dialog import ErrorDialog +from ..managedwindow import ManagedWindow from gramps.gen.merge import MergePersonQuery, MergeFamilyQuery #------------------------------------------------------------------------- diff --git a/gramps/gui/merge/mergemedia.py b/gramps/gui/merge/mergemedia.py index 09c981517..15f7c18f4 100644 --- a/gramps/gui/merge/mergemedia.py +++ b/gramps/gui/merge/mergemedia.py @@ -31,8 +31,8 @@ Provide merge capabilities for media objects. #------------------------------------------------------------------------- from gramps.gen.ggettext import sgettext as _ from gramps.gen.const import URL_MANUAL_PAGE -from gramps.gui.display import display_help -from gramps.gui.managedwindow import ManagedWindow +from ..display import display_help +from ..managedwindow import ManagedWindow from gramps.gen.datehandler import get_date from gramps.gen.merge import MergeMediaQuery diff --git a/gramps/gui/merge/mergenote.py b/gramps/gui/merge/mergenote.py index 9c9ae9149..f18087244 100644 --- a/gramps/gui/merge/mergenote.py +++ b/gramps/gui/merge/mergenote.py @@ -31,9 +31,9 @@ Provide merge capabilities for notes. #------------------------------------------------------------------------- from gramps.gen.ggettext import sgettext as _ from gramps.gen.const import URL_MANUAL_PAGE -from gramps.gui.display import display_help -from gramps.gui.managedwindow import ManagedWindow -from gramps.gui.widgets.styledtextbuffer import StyledTextBuffer +from ..display import display_help +from ..managedwindow import ManagedWindow +from ..widgets.styledtextbuffer import StyledTextBuffer from gramps.gen.merge import MergeNoteQuery #------------------------------------------------------------------------- diff --git a/gramps/gui/merge/mergeperson.py b/gramps/gui/merge/mergeperson.py index 7bc2a304a..24cf653b4 100644 --- a/gramps/gui/merge/mergeperson.py +++ b/gramps/gui/merge/mergeperson.py @@ -42,11 +42,11 @@ from gramps.gen.ggettext import sgettext as _ from gramps.gen.plug.report import utils as ReportUtils from gramps.gen.display.name import displayer as name_displayer from gramps.gen.const import URL_MANUAL_PAGE -from gramps.gui.display import display_help +from ..display import display_help from gramps.gen.datehandler import get_date from gramps.gen.errors import MergeError -from gramps.gui.dialog import ErrorDialog -from gramps.gui.managedwindow import ManagedWindow +from ..dialog import ErrorDialog +from ..managedwindow import ManagedWindow from gramps.gen.merge import MergePersonQuery #------------------------------------------------------------------------- diff --git a/gramps/gui/merge/mergeplace.py b/gramps/gui/merge/mergeplace.py index 77561ef5b..d19fab358 100644 --- a/gramps/gui/merge/mergeplace.py +++ b/gramps/gui/merge/mergeplace.py @@ -39,8 +39,8 @@ from gi.repository import Gtk #------------------------------------------------------------------------- from gramps.gen.ggettext import sgettext as _ from gramps.gen.const import URL_MANUAL_PAGE -from gramps.gui.display import display_help -from gramps.gui.managedwindow import ManagedWindow +from ..display import display_help +from ..managedwindow import ManagedWindow from gramps.gen.merge import MergePlaceQuery #------------------------------------------------------------------------- diff --git a/gramps/gui/merge/mergerepository.py b/gramps/gui/merge/mergerepository.py index c29ba9d45..ffc76d070 100644 --- a/gramps/gui/merge/mergerepository.py +++ b/gramps/gui/merge/mergerepository.py @@ -31,8 +31,8 @@ Provide merge capabilities for repositories. #------------------------------------------------------------------------- from gramps.gen.ggettext import sgettext as _ from gramps.gen.const import URL_MANUAL_PAGE -from gramps.gui.display import display_help -from gramps.gui.managedwindow import ManagedWindow +from ..display import display_help +from ..managedwindow import ManagedWindow from gramps.gen.merge import MergeRepositoryQuery #------------------------------------------------------------------------- diff --git a/gramps/gui/merge/mergesource.py b/gramps/gui/merge/mergesource.py index f192a8519..e909d93a9 100644 --- a/gramps/gui/merge/mergesource.py +++ b/gramps/gui/merge/mergesource.py @@ -33,8 +33,8 @@ Provide merge capabilities for sources. #------------------------------------------------------------------------- from gramps.gen.ggettext import sgettext as _ from gramps.gen.const import URL_MANUAL_PAGE -from gramps.gui.display import display_help -from gramps.gui.managedwindow import ManagedWindow +from ..display import display_help +from ..managedwindow import ManagedWindow from gramps.gen.merge import MergeSourceQuery #------------------------------------------------------------------------- diff --git a/gramps/gui/selectors/baseselector.py b/gramps/gui/selectors/baseselector.py index af823c8db..6f25fd8cb 100644 --- a/gramps/gui/selectors/baseselector.py +++ b/gramps/gui/selectors/baseselector.py @@ -34,9 +34,9 @@ from gi.repository import Pango # gramps modules # #------------------------------------------------------------------------- -from gramps.gui.managedwindow import ManagedWindow -from gramps.gui.filters import SearchBar -from gramps.gui.glade import Glade +from ..managedwindow import ManagedWindow +from ..filters import SearchBar +from ..glade import Glade #------------------------------------------------------------------------- # diff --git a/gramps/gui/selectors/selectcitation.py b/gramps/gui/selectors/selectcitation.py index 20697245e..16e57ceed 100644 --- a/gramps/gui/selectors/selectcitation.py +++ b/gramps/gui/selectors/selectcitation.py @@ -38,7 +38,7 @@ from gramps.gen.ggettext import gettext as _ # gramps modules # #------------------------------------------------------------------------- -from gramps.gui.views.treemodels import CitationTreeModel +from ..views.treemodels import CitationTreeModel from baseselector import BaseSelector #------------------------------------------------------------------------- diff --git a/gramps/gui/selectors/selectevent.py b/gramps/gui/selectors/selectevent.py index 508c40b17..a7df244d7 100644 --- a/gramps/gui/selectors/selectevent.py +++ b/gramps/gui/selectors/selectevent.py @@ -33,7 +33,7 @@ from gramps.gen.ggettext import gettext as _ # gramps modules # #------------------------------------------------------------------------- -from gramps.gui.views.treemodels import EventModel +from ..views.treemodels import EventModel from baseselector import BaseSelector #------------------------------------------------------------------------- diff --git a/gramps/gui/selectors/selectfamily.py b/gramps/gui/selectors/selectfamily.py index 664d38175..d7b9f0785 100644 --- a/gramps/gui/selectors/selectfamily.py +++ b/gramps/gui/selectors/selectfamily.py @@ -33,7 +33,7 @@ from gramps.gen.ggettext import gettext as _ # gramps modules # #------------------------------------------------------------------------- -from gramps.gui.views.treemodels import FamilyModel +from ..views.treemodels import FamilyModel from baseselector import BaseSelector #------------------------------------------------------------------------- diff --git a/gramps/gui/selectors/selectnote.py b/gramps/gui/selectors/selectnote.py index 9f7aa5d8e..b16801b6a 100644 --- a/gramps/gui/selectors/selectnote.py +++ b/gramps/gui/selectors/selectnote.py @@ -36,7 +36,7 @@ from gramps.gen.ggettext import gettext as _ # GRAMPS Modules # #------------------------------------------------------------------------- -from gramps.gui.views.treemodels import NoteModel +from ..views.treemodels import NoteModel from baseselector import BaseSelector #------------------------------------------------------------------------- diff --git a/gramps/gui/selectors/selectobject.py b/gramps/gui/selectors/selectobject.py index 4fc505a7c..5cc1dccf3 100644 --- a/gramps/gui/selectors/selectobject.py +++ b/gramps/gui/selectors/selectobject.py @@ -46,8 +46,8 @@ from gi.repository import Gtk #------------------------------------------------------------------------- from gramps.gen.const import THUMBSCALE from gramps.gen.utils.file import media_path_full -from gramps.gui.thumbnails import get_thumbnail_image -from gramps.gui.views.treemodels import MediaModel +from ..thumbnails import get_thumbnail_image +from ..views.treemodels import MediaModel from baseselector import BaseSelector #------------------------------------------------------------------------- diff --git a/gramps/gui/selectors/selectperson.py b/gramps/gui/selectors/selectperson.py index 59c7add34..72c95fed9 100644 --- a/gramps/gui/selectors/selectperson.py +++ b/gramps/gui/selectors/selectperson.py @@ -35,7 +35,7 @@ from gi.repository import Gtk # gramps modules # #------------------------------------------------------------------------- -from gramps.gui.views.treemodels import PeopleBaseModel, PersonTreeModel +from ..views.treemodels import PeopleBaseModel, PersonTreeModel from baseselector import BaseSelector #------------------------------------------------------------------------- diff --git a/gramps/gui/selectors/selectplace.py b/gramps/gui/selectors/selectplace.py index c3fb1f665..a71e7118a 100644 --- a/gramps/gui/selectors/selectplace.py +++ b/gramps/gui/selectors/selectplace.py @@ -34,7 +34,7 @@ from gramps.gen.ggettext import gettext as _ # gramps modules # #------------------------------------------------------------------------- -from gramps.gui.views.treemodels.placemodel import PlaceListModel +from ..views.treemodels.placemodel import PlaceListModel from baseselector import BaseSelector #------------------------------------------------------------------------- diff --git a/gramps/gui/selectors/selectrepository.py b/gramps/gui/selectors/selectrepository.py index 7b8e7465e..638374db7 100644 --- a/gramps/gui/selectors/selectrepository.py +++ b/gramps/gui/selectors/selectrepository.py @@ -33,7 +33,7 @@ from gramps.gen.ggettext import gettext as _ # gramps modules # #------------------------------------------------------------------------- -from gramps.gui.views.treemodels import RepositoryModel +from ..views.treemodels import RepositoryModel from baseselector import BaseSelector #------------------------------------------------------------------------- diff --git a/gramps/gui/selectors/selectsource.py b/gramps/gui/selectors/selectsource.py index c11f3ac54..5154b26ef 100644 --- a/gramps/gui/selectors/selectsource.py +++ b/gramps/gui/selectors/selectsource.py @@ -33,7 +33,7 @@ from gramps.gen.ggettext import gettext as _ # gramps modules # #------------------------------------------------------------------------- -from gramps.gui.views.treemodels import SourceModel +from ..views.treemodels import SourceModel from baseselector import BaseSelector #-------------------------------------------------------------------------