From 251aff61a09617dd0544e6eb937f5383a8162734 Mon Sep 17 00:00:00 2001 From: Nick Hall Date: Wed, 3 Oct 2012 16:03:49 +0000 Subject: [PATCH] Convert widgets to use relative imports svn: r20512 --- gramps/gui/widgets/grampletpane.py | 18 +++++++++--------- gramps/gui/widgets/labels.py | 2 +- gramps/gui/widgets/monitoredwidgets.py | 6 +++--- gramps/gui/widgets/photo.py | 4 ++-- gramps/gui/widgets/reorderfam.py | 6 +++--- gramps/gui/widgets/shortlistcomboentry.py | 2 +- gramps/gui/widgets/styledtextbuffer.py | 2 +- gramps/gui/widgets/styledtexteditor.py | 20 ++++++++++---------- gramps/gui/widgets/toolcomboentry.py | 4 ++-- gramps/gui/widgets/undoablestyledbuffer.py | 4 ++-- gramps/gui/widgets/validatedmaskedentry.py | 2 +- gramps/gui/widgets/valueaction.py | 2 +- 12 files changed, 36 insertions(+), 36 deletions(-) diff --git a/gramps/gui/widgets/grampletpane.py b/gramps/gui/widgets/grampletpane.py index 5f3b3dffe..99ff5d660 100644 --- a/gramps/gui/widgets/grampletpane.py +++ b/gramps/gui/widgets/grampletpane.py @@ -46,15 +46,15 @@ import ConfigParser #------------------------------------------------------------------------- from gramps.gen.errors import WindowActiveError from gramps.gen.const import URL_MANUAL_PAGE, VERSION_DIR -from gramps.gui.editors import EditPerson, EditFamily -from gramps.gui.managedwindow import ManagedWindow -from gramps.gui.utils import is_right_click, rgb_to_hex -from gramps.gui.widgets.menuitem import add_menuitem -from gramps.gui.plug.quick import run_quick_report_by_name -from gramps.gui.display import display_help, display_url -from gramps.gui.glade import Glade -from gramps.gui.pluginmanager import GuiPluginManager -from gramps.gui.widgets.undoablebuffer import UndoableBuffer +from ..editors import EditPerson, EditFamily +from ..managedwindow import ManagedWindow +from ..utils import is_right_click, rgb_to_hex +from .menuitem import add_menuitem +from ..plug.quick import run_quick_report_by_name +from ..display import display_help, display_url +from ..glade import Glade +from ..pluginmanager import GuiPluginManager +from .undoablebuffer import UndoableBuffer #------------------------------------------------------------------------- # diff --git a/gramps/gui/widgets/labels.py b/gramps/gui/widgets/labels.py index 929405b0a..d5500fac6 100644 --- a/gramps/gui/widgets/labels.py +++ b/gramps/gui/widgets/labels.py @@ -50,7 +50,7 @@ from gi.repository import Pango # #------------------------------------------------------------------------- from gramps.gen.constfunc import has_display, win -from gramps.gui.utils import rgb_to_hex +from ..utils import rgb_to_hex #------------------------------------------------------------------------- # diff --git a/gramps/gui/widgets/monitoredwidgets.py b/gramps/gui/widgets/monitoredwidgets.py index 155f10de1..7b5699e82 100644 --- a/gramps/gui/widgets/monitoredwidgets.py +++ b/gramps/gui/widgets/monitoredwidgets.py @@ -52,7 +52,7 @@ from gi.repository import Pango # #------------------------------------------------------------------------- from gramps.gen.ggettext import gettext as _ -from gramps.gui.autocomp import StandardCustomSelector, fill_entry +from ..autocomp import StandardCustomSelector, fill_entry from gramps.gen.datehandler import displayer, parser from gramps.gen.lib.date import Date, NextYear from gramps.gen.errors import ValidationError @@ -651,7 +651,7 @@ class MonitoredDate(object): If date was in fact built, sets the date_obj to the newly built date. """ - from gramps.gui.editors import EditDate + from ..editors import EditDate date_dialog = EditDate(self.date_obj, self.uistate, self.track) the_date = date_dialog.return_date self.update_after_editor(the_date) @@ -860,7 +860,7 @@ class MonitoredTagList(object): if (event.type == Gdk.EventType.BUTTON_PRESS or (event.type == Gdk.EventType.KEY_PRESS and event.keyval in (_RETURN, _KP_ENTER))): - from gramps.gui.editors import EditTagList + from ..editors import EditTagList editor = EditTagList(self.tag_list, self.all_tags, self.uistate, self.track) if editor.return_list is not None: diff --git a/gramps/gui/widgets/photo.py b/gramps/gui/widgets/photo.py index 29cf3008a..9002ddbea 100644 --- a/gramps/gui/widgets/photo.py +++ b/gramps/gui/widgets/photo.py @@ -33,8 +33,8 @@ from gi.repository import Gtk # Gramps modules # #------------------------------------------------------------------------- -from gramps.gui.thumbnails import get_thumbnail_image, SIZE_NORMAL, SIZE_LARGE -from gramps.gui.utils import open_file_with_default_application +from ..thumbnails import get_thumbnail_image, SIZE_NORMAL, SIZE_LARGE +from ..utils import open_file_with_default_application from gramps.gen.ggettext import gettext as _ #------------------------------------------------------------------------- diff --git a/gramps/gui/widgets/reorderfam.py b/gramps/gui/widgets/reorderfam.py index 7d74edeef..b0eaf66d7 100644 --- a/gramps/gui/widgets/reorderfam.py +++ b/gramps/gui/widgets/reorderfam.py @@ -47,9 +47,9 @@ _LOG = logging.getLogger("gui.widgets.reorderfam") # #------------------------------------------------------------------------- from gramps.gen.db import DbTxn -from gramps.gui.listmodel import ListModel -from gramps.gui.managedwindow import ManagedWindow -from gramps.gui.glade import Glade +from ..listmodel import ListModel +from ..managedwindow import ManagedWindow +from ..glade import Glade from gramps.gen.display.name import displayer as name_displayer #------------------------------------------------------------------------- diff --git a/gramps/gui/widgets/shortlistcomboentry.py b/gramps/gui/widgets/shortlistcomboentry.py index e18162f7c..f4c972eb9 100644 --- a/gramps/gui/widgets/shortlistcomboentry.py +++ b/gramps/gui/widgets/shortlistcomboentry.py @@ -45,7 +45,7 @@ from gi.repository import Gtk # GRAMPS modules # #------------------------------------------------------------------------- -from gramps.gui.widgets.validatedcomboentry import ValidatedComboEntry +from .validatedcomboentry import ValidatedComboEntry #------------------------------------------------------------------------- # diff --git a/gramps/gui/widgets/styledtextbuffer.py b/gramps/gui/widgets/styledtextbuffer.py index df3d5ea63..51d68c0b6 100644 --- a/gramps/gui/widgets/styledtextbuffer.py +++ b/gramps/gui/widgets/styledtextbuffer.py @@ -44,7 +44,7 @@ _LOG = logging.getLogger(".widgets.styledtextbuffer") from gi.repository import GObject from gi.repository import Gtk from gi.repository import Pango -from gramps.gui.widgets.undoablebuffer import UndoableBuffer +from .undoablebuffer import UndoableBuffer WEIGHT_BOLD = Pango.Weight.BOLD STYLE_ITALIC = Pango.Style.ITALIC UNDERLINE_SINGLE = Pango.Underline.SINGLE diff --git a/gramps/gui/widgets/styledtexteditor.py b/gramps/gui/widgets/styledtexteditor.py index 097e12d7c..3a7db2e9a 100644 --- a/gramps/gui/widgets/styledtexteditor.py +++ b/gramps/gui/widgets/styledtexteditor.py @@ -51,17 +51,17 @@ from gi.repository import Pango # #------------------------------------------------------------------------- from gramps.gen.lib import StyledTextTagType -from gramps.gui.widgets.styledtextbuffer import (ALLOWED_STYLES, +from .styledtextbuffer import (ALLOWED_STYLES, MATCH_START, MATCH_END, MATCH_FLAVOR, MATCH_STRING, LinkTag) -from gramps.gui.widgets.undoablestyledbuffer import UndoableStyledBuffer -from gramps.gui.widgets.valueaction import ValueAction -from gramps.gui.widgets.toolcomboentry import ToolComboEntry -from gramps.gui.widgets.springseparator import SpringSeparatorAction -from gramps.gui.spell import Spell -from gramps.gui.display import display_url -from gramps.gui.utils import SystemFonts, rgb_to_hex, hex_to_color, color_to_hex +from .undoablestyledbuffer import UndoableStyledBuffer +from .valueaction import ValueAction +from .toolcomboentry import ToolComboEntry +from .springseparator import SpringSeparatorAction +from ..spell import Spell +from ..display import display_url +from ..utils import SystemFonts, rgb_to_hex, hex_to_color, color_to_hex from gramps.gen.config import config from gramps.gen.constfunc import has_display @@ -752,7 +752,7 @@ class StyledTextEditor(Gtk.TextView): if win_obj: # Edit the object: obj_class, prop, value = url[9:].split("/") - from gramps.gui.editors import EditObject + from ..editors import EditObject EditObject(win_obj.dbstate, win_obj.uistate, win_obj.track, @@ -833,7 +833,7 @@ def uri_dialog(self, uri, callback): """ Function to spawn the link editor. """ - from gramps.gui.editors.editlink import EditLink + from ..editors.editlink import EditLink obj = find_parent_with_attr(self, attr="dbstate") if obj: if uri is None: diff --git a/gramps/gui/widgets/toolcomboentry.py b/gramps/gui/widgets/toolcomboentry.py index f8e8b94c4..0b5820b60 100644 --- a/gramps/gui/widgets/toolcomboentry.py +++ b/gramps/gui/widgets/toolcomboentry.py @@ -45,8 +45,8 @@ from gi.repository import Gtk # GRAMPS modules # #------------------------------------------------------------------------- -from gramps.gui.widgets.valuetoolitem import ValueToolItem -from gramps.gui.widgets.shortlistcomboentry import ShortlistComboEntry +from .valuetoolitem import ValueToolItem +from .shortlistcomboentry import ShortlistComboEntry #------------------------------------------------------------------------- # diff --git a/gramps/gui/widgets/undoablestyledbuffer.py b/gramps/gui/widgets/undoablestyledbuffer.py index 6982a49fc..c6ca1ac99 100644 --- a/gramps/gui/widgets/undoablestyledbuffer.py +++ b/gramps/gui/widgets/undoablestyledbuffer.py @@ -31,8 +31,8 @@ __all__ = ["UndoableStyledBuffer"] from gi.repository import Gtk from gramps.gen.lib.styledtext import StyledText -from gramps.gui.widgets.undoablebuffer import UndoableInsert, UndoableDelete -from gramps.gui.widgets.styledtextbuffer import StyledTextBuffer +from .undoablebuffer import UndoableInsert, UndoableDelete +from .styledtextbuffer import StyledTextBuffer class UndoableInsertStyled(UndoableInsert): """something that has been inserted into our styledtextbuffer""" diff --git a/gramps/gui/widgets/validatedmaskedentry.py b/gramps/gui/widgets/validatedmaskedentry.py index 2dbc89c3b..40ae1f29a 100644 --- a/gramps/gui/widgets/validatedmaskedentry.py +++ b/gramps/gui/widgets/validatedmaskedentry.py @@ -50,7 +50,7 @@ from gi.repository import Pango # #------------------------------------------------------------------------- from gramps.gen.errors import MaskError, ValidationError, WindowActiveError -from gramps.gui.widgets.undoableentry import UndoableEntry +from .undoableentry import UndoableEntry #------------------------------------------------------------------------- # diff --git a/gramps/gui/widgets/valueaction.py b/gramps/gui/widgets/valueaction.py index 8ad6cc202..5c4bfd846 100644 --- a/gramps/gui/widgets/valueaction.py +++ b/gramps/gui/widgets/valueaction.py @@ -45,7 +45,7 @@ from gi.repository import Gtk # GRAMPS modules # #------------------------------------------------------------------------- -from gramps.gui.widgets.valuetoolitem import ValueToolItem +from .valuetoolitem import ValueToolItem #------------------------------------------------------------------------- #