From 2e98c52cd5d0c774abbc6607ad8c0869ab884f3b Mon Sep 17 00:00:00 2001 From: Nick Hall Date: Wed, 3 Oct 2012 15:55:24 +0000 Subject: [PATCH] Convert views to use relative imports svn: r20510 --- gramps/gui/views/bookmarks.py | 4 ++-- gramps/gui/views/listview.py | 22 +++++++++---------- gramps/gui/views/navigationview.py | 6 ++--- gramps/gui/views/pageview.py | 12 +++++----- gramps/gui/views/tags.py | 8 +++---- .../gui/views/treemodels/citationlistmodel.py | 4 ++-- .../gui/views/treemodels/citationtreemodel.py | 4 ++-- gramps/gui/views/treemodels/eventmodel.py | 2 +- gramps/gui/views/treemodels/familymodel.py | 2 +- gramps/gui/views/treemodels/mediamodel.py | 2 +- gramps/gui/views/treemodels/notemodel.py | 2 +- gramps/gui/views/treemodels/peoplemodel.py | 4 ++-- gramps/gui/views/treemodels/placemodel.py | 4 ++-- gramps/gui/views/treemodels/repomodel.py | 2 +- gramps/gui/views/treemodels/sourcemodel.py | 2 +- 15 files changed, 40 insertions(+), 40 deletions(-) diff --git a/gramps/gui/views/bookmarks.py b/gramps/gui/views/bookmarks.py index eb9facf97..da6d293b8 100644 --- a/gramps/gui/views/bookmarks.py +++ b/gramps/gui/views/bookmarks.py @@ -51,8 +51,8 @@ from gi.repository import Gtk # gramps modules # #------------------------------------------------------------------------- -from gramps.gui.display import display_help -from gramps.gui.listmodel import ListModel +from ..display import display_help +from ..listmodel import ListModel from gramps.gen.utils.db import navigation_label from gramps.gen.const import URL_MANUAL_PAGE from gramps.gen.ggettext import sgettext as _ diff --git a/gramps/gui/views/listview.py b/gramps/gui/views/listview.py index 67e35204e..a15067bb3 100644 --- a/gramps/gui/views/listview.py +++ b/gramps/gui/views/listview.py @@ -51,23 +51,23 @@ from gi.repository import Pango # GRAMPS # #---------------------------------------------------------------- -from gramps.gui.views.pageview import PageView -from gramps.gui.views.navigationview import NavigationView -from gramps.gui.columnorder import ColumnOrder +from .pageview import PageView +from .navigationview import NavigationView +from ..columnorder import ColumnOrder from gramps.gen.config import config from gramps.gen.errors import WindowActiveError -from gramps.gui.filters import SearchBar -from gramps.gui.widgets.menuitem import add_menuitem +from ..filters import SearchBar +from ..widgets.menuitem import add_menuitem from gramps.gen.const import CUSTOM_FILTERS, USE_TIPS from gramps.gen.utils.debug import profile from gramps.gen.utils.string import data_recover_msg from gramps.gen.utils.file import get_unicode_path_from_file_chooser -from gramps.gui.dialog import QuestionDialog, QuestionDialog2 -from gramps.gui.editors import FilterEditor +from ..dialog import QuestionDialog, QuestionDialog2 +from ..editors import FilterEditor from gramps.gen.ggettext import sgettext as _ -from gramps.gui.ddtargets import DdTargets -from gramps.gui.plug.quick import create_quickreport_menu, create_web_connect_menu -from gramps.gui.utils import is_right_click +from ..ddtargets import DdTargets +from ..plug.quick import create_quickreport_menu, create_web_connect_menu +from ..utils import is_right_click #---------------------------------------------------------------- # @@ -430,7 +430,7 @@ class ListView(NavigationView): if mlist: self.bookmarks.add(mlist[0]) else: - from gramps.gui.dialog import WarningDialog + from ..dialog import WarningDialog WarningDialog( _("Could Not Set a Bookmark"), _("A bookmark could not be set because " diff --git a/gramps/gui/views/navigationview.py b/gramps/gui/views/navigationview.py index 80d96ea90..2cfc2ec75 100644 --- a/gramps/gui/views/navigationview.py +++ b/gramps/gui/views/navigationview.py @@ -47,7 +47,7 @@ from gi.repository import Gtk # GRAMPS # #---------------------------------------------------------------- -from gramps.gui.views.pageview import PageView +from .pageview import PageView from gramps.gen.ggettext import sgettext as _ from gramps.gen.utils.db import navigation_label from gramps.gen.constfunc import mod_key @@ -251,7 +251,7 @@ class NavigationView(PageView): self.uistate.push_message(self.dbstate, _("%s has been bookmarked") % name) else: - from gramps.gui.dialog import WarningDialog + from ..dialog import WarningDialog WarningDialog( _("Could Not Set a Bookmark"), _("A bookmark could not be set because " @@ -332,7 +332,7 @@ class NavigationView(PageView): if defperson: self.change_active(defperson.get_handle()) else: - from gramps.gui.dialog import WarningDialog + from ..dialog import WarningDialog WarningDialog(_("No Home Person"), _("You need to set a 'default person' to go to.")) diff --git a/gramps/gui/views/pageview.py b/gramps/gui/views/pageview.py index 9429cfc08..3987a693a 100644 --- a/gramps/gui/views/pageview.py +++ b/gramps/gui/views/pageview.py @@ -48,10 +48,10 @@ from gramps.gen.ggettext import gettext as _ # #---------------------------------------------------------------- from gramps.gen.errors import WindowActiveError -from gramps.gui.dbguielement import DbGUIElement -from gramps.gui.widgets.menutoolbuttonaction import MenuToolButtonAction -from gramps.gui.grampsbar import GrampsBar -from gramps.gui.configure import ConfigureDialog +from ..dbguielement import DbGUIElement +from ..widgets.menutoolbuttonaction import MenuToolButtonAction +from ..grampsbar import GrampsBar +from ..configure import ConfigureDialog from gramps.gen.config import config #------------------------------------------------------------------------------ @@ -232,7 +232,7 @@ class PageView(DbGUIElement): system. """ import cPickle as pickle - from gramps.gui.clipboard import ClipboardWindow, obj2target + from ..clipboard import ClipboardWindow, obj2target handled = False for handle in handles: if handle is None: @@ -277,7 +277,7 @@ class PageView(DbGUIElement): The code creates the Clipboard if it does not already exist. """ - from gramps.gui.clipboard import ClipboardWindow + from ..clipboard import ClipboardWindow clipboard = None for widget in self.uistate.gwm.window_tree: if isinstance(widget, ClipboardWindow): diff --git a/gramps/gui/views/tags.py b/gramps/gui/views/tags.py index da24312f0..d2c3392fd 100644 --- a/gramps/gui/views/tags.py +++ b/gramps/gui/views/tags.py @@ -45,11 +45,11 @@ from gi.repository import Gdk from gramps.gen.ggettext import sgettext as _ from gramps.gen.lib import Tag from gramps.gen.db import DbTxn -from gramps.gui.dbguielement import DbGUIElement -from gramps.gui.listmodel import ListModel, NOSORT, COLOR, INTEGER +from ..dbguielement import DbGUIElement +from ..listmodel import ListModel, NOSORT, COLOR, INTEGER from gramps.gen.const import URL_MANUAL_PAGE -from gramps.gui.display import display_help -from gramps.gui.dialog import ErrorDialog, QuestionDialog2 +from ..display import display_help +from ..dialog import ErrorDialog, QuestionDialog2 import gramps.gui.widgets.progressdialog as progressdlg #------------------------------------------------------------------------- diff --git a/gramps/gui/views/treemodels/citationlistmodel.py b/gramps/gui/views/treemodels/citationlistmodel.py index ebd68bfb6..4bcf89d66 100644 --- a/gramps/gui/views/treemodels/citationlistmodel.py +++ b/gramps/gui/views/treemodels/citationlistmodel.py @@ -45,8 +45,8 @@ from gi.repository import Gtk # GRAMPS modules # #------------------------------------------------------------------------- -from gramps.gui.views.treemodels.flatbasemodel import FlatBaseModel -from gramps.gui.views.treemodels.citationbasemodel import CitationBaseModel +from .flatbasemodel import FlatBaseModel +from .citationbasemodel import CitationBaseModel #------------------------------------------------------------------------- # diff --git a/gramps/gui/views/treemodels/citationtreemodel.py b/gramps/gui/views/treemodels/citationtreemodel.py index 73f816a7d..92dee35a7 100644 --- a/gramps/gui/views/treemodels/citationtreemodel.py +++ b/gramps/gui/views/treemodels/citationtreemodel.py @@ -53,8 +53,8 @@ from gi.repository import Gtk # #------------------------------------------------------------------------- from gramps.gen.utils.db import get_source_referents -from gramps.gui.views.treemodels.treebasemodel import TreeBaseModel -from gramps.gui.views.treemodels.citationbasemodel import CitationBaseModel +from .treebasemodel import TreeBaseModel +from .citationbasemodel import CitationBaseModel #------------------------------------------------------------------------- # diff --git a/gramps/gui/views/treemodels/eventmodel.py b/gramps/gui/views/treemodels/eventmodel.py index b27576668..e53547f7a 100644 --- a/gramps/gui/views/treemodels/eventmodel.py +++ b/gramps/gui/views/treemodels/eventmodel.py @@ -44,7 +44,7 @@ from gramps.gen.datehandler import format_time, get_date, get_date_valid from gramps.gen.lib import Event, EventType from gramps.gen.utils.db import get_participant_from_event from gramps.gen.config import config -from gramps.gui.views.treemodels.flatbasemodel import FlatBaseModel +from .flatbasemodel import FlatBaseModel #------------------------------------------------------------------------- # diff --git a/gramps/gui/views/treemodels/familymodel.py b/gramps/gui/views/treemodels/familymodel.py index 0f4d90f0a..1d973de46 100644 --- a/gramps/gui/views/treemodels/familymodel.py +++ b/gramps/gui/views/treemodels/familymodel.py @@ -44,7 +44,7 @@ from gi.repository import Gtk from gramps.gen.datehandler import displayer, format_time, get_date_valid from gramps.gen.display.name import displayer as name_displayer from gramps.gen.lib import EventRoleType, FamilyRelType -from gramps.gui.views.treemodels.flatbasemodel import FlatBaseModel +from .flatbasemodel import FlatBaseModel from gramps.gen.utils.db import get_marriage_or_fallback from gramps.gen.config import config diff --git a/gramps/gui/views/treemodels/mediamodel.py b/gramps/gui/views/treemodels/mediamodel.py index bde19a8e3..05b0052b4 100644 --- a/gramps/gui/views/treemodels/mediamodel.py +++ b/gramps/gui/views/treemodels/mediamodel.py @@ -44,7 +44,7 @@ from gi.repository import Gtk #------------------------------------------------------------------------- from gramps.gen.datehandler import displayer, format_time from gramps.gen.lib import Date, MediaObject -from gramps.gui.views.treemodels.flatbasemodel import FlatBaseModel +from .flatbasemodel import FlatBaseModel #------------------------------------------------------------------------- # diff --git a/gramps/gui/views/treemodels/notemodel.py b/gramps/gui/views/treemodels/notemodel.py index d1b205c0b..818c9e2c4 100644 --- a/gramps/gui/views/treemodels/notemodel.py +++ b/gramps/gui/views/treemodels/notemodel.py @@ -42,7 +42,7 @@ from gi.repository import Gtk # #------------------------------------------------------------------------- from gramps.gen.datehandler import format_time -from gramps.gui.views.treemodels.flatbasemodel import FlatBaseModel +from .flatbasemodel import FlatBaseModel from gramps.gen.lib import (Note, NoteType, StyledText) #------------------------------------------------------------------------- diff --git a/gramps/gui/views/treemodels/peoplemodel.py b/gramps/gui/views/treemodels/peoplemodel.py index 20354085e..1dda8d178 100644 --- a/gramps/gui/views/treemodels/peoplemodel.py +++ b/gramps/gui/views/treemodels/peoplemodel.py @@ -60,8 +60,8 @@ from gramps.gen.lib import Name, EventRef, EventType, EventRoleType from gramps.gen.display.name import displayer as name_displayer from gramps.gen.datehandler import format_time, get_date, get_date_valid from lru import LRU -from gramps.gui.views.treemodels.flatbasemodel import FlatBaseModel -from gramps.gui.views.treemodels.treebasemodel import TreeBaseModel +from .flatbasemodel import FlatBaseModel +from .treebasemodel import TreeBaseModel from gramps.gen.config import config #------------------------------------------------------------------------- diff --git a/gramps/gui/views/treemodels/placemodel.py b/gramps/gui/views/treemodels/placemodel.py index eb6e58c7b..a5bc056f0 100644 --- a/gramps/gui/views/treemodels/placemodel.py +++ b/gramps/gui/views/treemodels/placemodel.py @@ -48,8 +48,8 @@ from gi.repository import Gtk #------------------------------------------------------------------------- from gramps.gen.datehandler import format_time from gramps.gen.utils.place import conv_lat_lon -from gramps.gui.views.treemodels.flatbasemodel import FlatBaseModel -from gramps.gui.views.treemodels.treebasemodel import TreeBaseModel +from .flatbasemodel import FlatBaseModel +from .treebasemodel import TreeBaseModel #------------------------------------------------------------------------- # diff --git a/gramps/gui/views/treemodels/repomodel.py b/gramps/gui/views/treemodels/repomodel.py index 18dfb8355..68a8a2987 100644 --- a/gramps/gui/views/treemodels/repomodel.py +++ b/gramps/gui/views/treemodels/repomodel.py @@ -41,7 +41,7 @@ from gi.repository import Gtk #------------------------------------------------------------------------- from gramps.gen.lib import Address, RepositoryType, Url, UrlType from gramps.gen.datehandler import format_time -from gramps.gui.views.treemodels.flatbasemodel import FlatBaseModel +from .flatbasemodel import FlatBaseModel #------------------------------------------------------------------------- # diff --git a/gramps/gui/views/treemodels/sourcemodel.py b/gramps/gui/views/treemodels/sourcemodel.py index ef7935f6e..11c1a464e 100644 --- a/gramps/gui/views/treemodels/sourcemodel.py +++ b/gramps/gui/views/treemodels/sourcemodel.py @@ -40,7 +40,7 @@ from gi.repository import Gtk # #------------------------------------------------------------------------- from gramps.gen.datehandler import format_time -from gramps.gui.views.treemodels.flatbasemodel import FlatBaseModel +from .flatbasemodel import FlatBaseModel #------------------------------------------------------------------------- #