Convert selectors and merge to use relative imports

svn: r20504

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 ..display import display_help
-from gramps.gui.managedwindow import ManagedWindow
+from ..managedwindow import ManagedWindow
 from gramps.gen.datehandler import get_date
 from gramps.gen.utils.string import confidence
 from gramps.gen.merge import MergeCitationQuery

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 ..display import display_help
-from gramps.gui.managedwindow import ManagedWindow
+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

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 ..dialog import ErrorDialog
-from gramps.gui.managedwindow import ManagedWindow
+from ..managedwindow import ManagedWindow
 from gramps.gen.merge import MergePersonQuery, MergeFamilyQuery
 
 #-------------------------------------------------------------------------

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 ..display import display_help
-from gramps.gui.managedwindow import ManagedWindow
+from ..managedwindow import ManagedWindow
 from gramps.gen.datehandler import get_date
 from gramps.gen.merge import MergeMediaQuery
 

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 ..display import display_help
-from gramps.gui.managedwindow import ManagedWindow
+from ..managedwindow import ManagedWindow
-from gramps.gui.widgets.styledtextbuffer import StyledTextBuffer
+from ..widgets.styledtextbuffer import StyledTextBuffer
 from gramps.gen.merge import MergeNoteQuery
 
 #-------------------------------------------------------------------------

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 ..dialog import ErrorDialog
-from gramps.gui.managedwindow import ManagedWindow
+from ..managedwindow import ManagedWindow
 from gramps.gen.merge import MergePersonQuery
 
 #-------------------------------------------------------------------------

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 ..display import display_help
-from gramps.gui.managedwindow import ManagedWindow
+from ..managedwindow import ManagedWindow
 from gramps.gen.merge import MergePlaceQuery
 
 #-------------------------------------------------------------------------

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 ..display import display_help
-from gramps.gui.managedwindow import ManagedWindow
+from ..managedwindow import ManagedWindow
 from gramps.gen.merge import MergeRepositoryQuery
 
 #-------------------------------------------------------------------------

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 ..display import display_help
-from gramps.gui.managedwindow import ManagedWindow
+from ..managedwindow import ManagedWindow
 from gramps.gen.merge import MergeSourceQuery
 
 #-------------------------------------------------------------------------

gramps/gui/selectors/baseselector.py

@@ -34,9 +34,9 @@ from gi.repository import Pango
 # gramps modules
 #
 #-------------------------------------------------------------------------
-from gramps.gui.managedwindow import ManagedWindow
+from ..managedwindow import ManagedWindow
-from gramps.gui.filters import SearchBar
+from ..filters import SearchBar
-from gramps.gui.glade import Glade
+from ..glade import Glade
 
 #-------------------------------------------------------------------------
 #

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
 
 #-------------------------------------------------------------------------

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
 
 #-------------------------------------------------------------------------

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
 
 #-------------------------------------------------------------------------

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
 
 #-------------------------------------------------------------------------

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 ..thumbnails import get_thumbnail_image
-from gramps.gui.views.treemodels import MediaModel
+from ..views.treemodels import MediaModel
 from baseselector import BaseSelector
 
 #-------------------------------------------------------------------------

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
 
 #-------------------------------------------------------------------------

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
 
 #-------------------------------------------------------------------------

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
 
 #-------------------------------------------------------------------------

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
 
 #-------------------------------------------------------------------------