diff --git a/gramps/cli/arghandler.py b/gramps/cli/arghandler.py index ebafc3cb2..4375b7072 100644 --- a/gramps/cli/arghandler.py +++ b/gramps/cli/arghandler.py @@ -38,23 +38,23 @@ Module responsible for handling the command line arguments for GRAMPS. #------------------------------------------------------------------------- import os import sys -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ #------------------------------------------------------------------------- # # gramps modules # #------------------------------------------------------------------------- -from gen.recentfiles import recent_files -from gen.utils.file import (rm_tempdir, get_empty_tempdir, +from gramps.gen.recentfiles import recent_files +from gramps.gen.utils.file import (rm_tempdir, get_empty_tempdir, get_unicode_path_from_env_var) import gen from clidbman import CLIDbManager, NAME_FILE, find_locker_name -from gen.plug import BasePluginManager -from gen.plug.report import CATEGORY_BOOK, CATEGORY_CODE -from cli.plug import cl_report -from cli.user import User +from gramps.gen.plug import BasePluginManager +from gramps.gen.plug.report import CATEGORY_BOOK, CATEGORY_CODE +from gramps.cli.plug import cl_report +from gramps.cli.user import User #------------------------------------------------------------------------- # @@ -625,7 +625,7 @@ class ArgHandler(object): pdata.name.encode(sys.getfilesystemencoding())) elif action == "tool": - from gui.plug import tool + from gramps.gui.plug import tool try: options_str_dict = dict( [ tuple(chunk.split('=')) for chunk in options_str.split(',') ] ) diff --git a/gramps/cli/argparser.py b/gramps/cli/argparser.py index 6b73c5b16..ef08b6d33 100644 --- a/gramps/cli/argparser.py +++ b/gramps/cli/argparser.py @@ -38,7 +38,7 @@ Module responsible for handling the command line arguments for GRAMPS. #------------------------------------------------------------------------- import sys import getopt -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ import logging #------------------------------------------------------------------------- @@ -46,10 +46,10 @@ import logging # gramps modules # #------------------------------------------------------------------------- -from gen.const import LONGOPTS, SHORTOPTS -from gen.config import config -from gen.utils.configmanager import safe_eval -from gen.utils.file import get_unicode_path_from_env_var +from gramps.gen.const import LONGOPTS, SHORTOPTS +from gramps.gen.config import config +from gramps.gen.utils.configmanager import safe_eval +from gramps.gen.utils.file import get_unicode_path_from_env_var # Note: Make sure to edit const.py.in POPT_TABLE too! _HELP = _(""" diff --git a/gramps/cli/clidbman.py b/gramps/cli/clidbman.py index 31f7833ec..e75290390 100644 --- a/gramps/cli/clidbman.py +++ b/gramps/cli/clidbman.py @@ -38,7 +38,7 @@ import time import urllib2 import urlparse import tempfile -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ #------------------------------------------------------------------------- # # set up logging @@ -53,9 +53,9 @@ LOG = logging.getLogger(".clidbman") # #------------------------------------------------------------------------- from gramps.gen.db import DbBsddb -from gen.plug import BasePluginManager -from gen.config import config -from gen.constfunc import win +from gramps.gen.plug import BasePluginManager +from gramps.gen.config import config +from gramps.gen.constfunc import win #------------------------------------------------------------------------- # # constants @@ -138,7 +138,7 @@ class CLIDbManager(object): from bsddb3 import dbshelve, db else: from bsddb import dbshelve, db - from gen.db import META, PERSON_TBL + from gramps.gen.db import META, PERSON_TBL env = db.DBEnv() flags = db.DB_CREATE | db.DB_PRIVATE |\ db.DB_INIT_MPOOL | db.DB_INIT_LOCK |\ diff --git a/gramps/cli/grampscli.py b/gramps/cli/grampscli.py index 6152b8436..c26295054 100644 --- a/gramps/cli/grampscli.py +++ b/gramps/cli/grampscli.py @@ -33,7 +33,7 @@ Provides also two small base classes: CLIDbLoader, CLIManager # Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ import os import sys @@ -45,17 +45,17 @@ LOG = logging.getLogger(".grampscli") # GRAMPS modules # #------------------------------------------------------------------------- -from gen.display.name import displayer as name_displayer -from gen.config import config -from gen.const import PLUGINS_DIR, USER_PLUGINS -from gen.errors import DbError -from gen.dbstate import DbState -from gen.db import DbBsddb +from gramps.gen.display.name import displayer as name_displayer +from gramps.gen.config import config +from gramps.gen.const import PLUGINS_DIR, USER_PLUGINS +from gramps.gen.errors import DbError +from gramps.gen.dbstate import DbState +from gramps.gen.db import DbBsddb from gramps.gen.db.exceptions import (DbUpgradeRequiredError, DbVersionError) -from gen.plug import BasePluginManager -from gen.utils.config import get_researcher -from gen.recentfiles import recent_files +from gramps.gen.plug import BasePluginManager +from gramps.gen.utils.config import get_researcher +from gramps.gen.recentfiles import recent_files #------------------------------------------------------------------------- # diff --git a/gramps/cli/plug/__init__.py b/gramps/cli/plug/__init__.py index afd9b58c6..04879ff8c 100644 --- a/gramps/cli/plug/__init__.py +++ b/gramps/cli/plug/__init__.py @@ -33,7 +33,7 @@ # Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ import traceback import os import sys @@ -46,21 +46,21 @@ log = logging.getLogger(".") # Gramps modules # #------------------------------------------------------------------------- -from gen.plug import BasePluginManager -from gen.plug.docgen import (StyleSheet, StyleSheetList, PaperStyle, +from gramps.gen.plug import BasePluginManager +from gramps.gen.plug.docgen import (StyleSheet, StyleSheetList, PaperStyle, PAPER_PORTRAIT, PAPER_LANDSCAPE, graphdoc) -from gen.plug.menu import (FamilyOption, PersonOption, NoteOption, +from gramps.gen.plug.menu import (FamilyOption, PersonOption, NoteOption, MediaOption, PersonListOption, NumberOption, BooleanOption, DestinationOption, StringOption, TextOption, EnumeratedListOption, Option) -from gen.display.name import displayer as name_displayer -from gen.errors import ReportError -from gen.plug.report import (CATEGORY_TEXT, CATEGORY_DRAW, CATEGORY_BOOK, +from gramps.gen.display.name import displayer as name_displayer +from gramps.gen.errors import ReportError +from gramps.gen.plug.report import (CATEGORY_TEXT, CATEGORY_DRAW, CATEGORY_BOOK, CATEGORY_GRAPHVIZ, CATEGORY_CODE) -from gen.plug.report._paper import paper_sizes -from gen.const import USER_HOME -from gen.dbstate import DbState -from cli.grampscli import CLIManager +from gramps.gen.plug.report._paper import paper_sizes +from gramps.gen.const import USER_HOME +from gramps.gen.dbstate import DbState +from gramps.cli.grampscli import CLIManager import cli.user #------------------------------------------------------------------------ diff --git a/gramps/gui/aboutdialog.py b/gramps/gui/aboutdialog.py index 4785d9845..6e7ed13b9 100644 --- a/gramps/gui/aboutdialog.py +++ b/gramps/gui/aboutdialog.py @@ -27,7 +27,7 @@ # Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ import os import sys @@ -53,11 +53,11 @@ from gi.repository import GdkPixbuf # GRAMPS modules # #------------------------------------------------------------------------- -from gen.const import (AUTHORS, AUTHORS_FILE, COMMENTS, COPYRIGHT_MSG, +from gramps.gen.const import (AUTHORS, AUTHORS_FILE, COMMENTS, COPYRIGHT_MSG, DOCUMENTERS, LICENSE_FILE, PROGRAM_NAME, SPLASH, TRANSLATORS, URL_HOMEPAGE, VERSION) -from gui.display import display_url -from gen.config import config +from gramps.gui.display import display_url +from gramps.gen.config import config if config.get('preferences.use-bsddb3'): import bsddb3 as bsddb diff --git a/gramps/gui/clipboard.py b/gramps/gui/clipboard.py index dc4c81a02..0e400d0b2 100644 --- a/gramps/gui/clipboard.py +++ b/gramps/gui/clipboard.py @@ -46,18 +46,18 @@ from gi.repository import GdkPixbuf # gramps modules # #------------------------------------------------------------------------- -from gen.const import IMAGE_DIR, URL_MANUAL_PAGE -from gen.config import config +from gramps.gen.const import IMAGE_DIR, URL_MANUAL_PAGE +from gramps.gen.config import config from gramps.gen.lib import NoteType from gramps.gen.datehandler import get_date -from gui.display import display_help -from gui.managedwindow import ManagedWindow -from gen.ggettext import sgettext as _ -from gen.utils.trans import trans_objclass -from gen.constfunc import mac -from gui.glade import Glade -from gui.ddtargets import DdTargets -from gui.makefilter import make_filter +from gramps.gui.display import display_help +from gramps.gui.managedwindow import ManagedWindow +from gramps.gen.ggettext import sgettext as _ +from gramps.gen.utils.trans import trans_objclass +from gramps.gen.constfunc import mac +from gramps.gui.glade import Glade +from gramps.gui.ddtargets import DdTargets +from gramps.gui.makefilter import make_filter from gramps.gui.utils import is_right_click #------------------------------------------------------------------------- @@ -725,7 +725,7 @@ class ClipFamilyLink(ClipHandleWrapper): self.refresh() def refresh(self): - from gen.simple import SimpleAccess + from gramps.gen.simple import SimpleAccess if self._handle: family = self._db.get_family_from_handle(self._handle) if family: @@ -1517,7 +1517,7 @@ class MultiTreeView(Gtk.TreeView): self.defer_select=False def edit_obj(self, objclass, handle): - from gui.editors import (EditPerson, EditEvent, EditFamily, EditSource, + from gramps.gui.editors import (EditPerson, EditEvent, EditFamily, EditSource, EditPlace, EditRepository, EditNote, EditMedia) if objclass == 'Person': person = self.dbstate.db.get_person_from_handle(handle) diff --git a/gramps/gui/columnorder.py b/gramps/gui/columnorder.py index 2648dcf98..70e402f0a 100644 --- a/gramps/gui/columnorder.py +++ b/gramps/gui/columnorder.py @@ -32,7 +32,7 @@ Handle the column ordering # python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ import logging #------------------------------------------------------------------------- @@ -48,8 +48,8 @@ from gi.repository import GObject # GRAMPS modules # #------------------------------------------------------------------------- -from gui.managedwindow import ManagedWindow -from gui.glade import Glade +from gramps.gui.managedwindow import ManagedWindow +from gramps.gui.glade import Glade #------------------------------------------------------------------------- diff --git a/gramps/gui/configure.py b/gramps/gui/configure.py index a5a8b9cf8..a40020417 100644 --- a/gramps/gui/configure.py +++ b/gramps/gui/configure.py @@ -29,7 +29,7 @@ # #------------------------------------------------------------------------- import random -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ import os from xml.sax.saxutils import escape @@ -47,21 +47,21 @@ from gi.repository import Gtk # gramps modules # #------------------------------------------------------------------------- -from gen.config import config -from gen.const import HOME_DIR +from gramps.gen.config import config +from gramps.gen.const import HOME_DIR from gramps.gen.datehandler import get_date_formats -from gen.display.name import displayer as _nd -from gen.display.name import NameDisplayError -from gen.utils.file import get_unicode_path_from_file_chooser -from gen.utils.alive import update_constants -from gen.utils.keyword import (get_keywords, get_translation_from_keyword, +from gramps.gen.display.name import displayer as _nd +from gramps.gen.display.name import NameDisplayError +from gramps.gen.utils.file import get_unicode_path_from_file_chooser +from gramps.gen.utils.alive import update_constants +from gramps.gen.utils.keyword import (get_keywords, get_translation_from_keyword, get_translations, get_keyword_from_translation) from gramps.gen.lib import Date, FamilyRelType -from gen.lib import Name, Surname, NameOriginType -from gui.managedwindow import ManagedWindow -from gui.widgets import MarkupLabel, BasicLabel -from gui.dialog import ErrorDialog, QuestionDialog2, OkDialog -from gui.glade import Glade +from gramps.gen.lib import Name, Surname, NameOriginType +from gramps.gui.managedwindow import ManagedWindow +from gramps.gui.widgets import MarkupLabel, BasicLabel +from gramps.gui.dialog import ErrorDialog, QuestionDialog2, OkDialog +from gramps.gui.glade import Glade #------------------------------------------------------------------------- # diff --git a/gramps/gui/dbguielement.py b/gramps/gui/dbguielement.py index 9c0339f56..bb75180a9 100644 --- a/gramps/gui/dbguielement.py +++ b/gramps/gui/dbguielement.py @@ -32,7 +32,7 @@ Group common stuff GRAMPS GUI elements must be able to do when tracking a DB: # GRAMPS modules # #------------------------------------------------------------------------- -from gen.utils.callman import CallbackManager +from gramps.gen.utils.callman import CallbackManager #------------------------------------------------------------------------- # diff --git a/gramps/gui/dbloader.py b/gramps/gui/dbloader.py index 4d004a94f..21c80b193 100644 --- a/gramps/gui/dbloader.py +++ b/gramps/gui/dbloader.py @@ -31,7 +31,7 @@ Handling of loading new/existing databases. # #------------------------------------------------------------------------- import os -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ import logging #------------------------------------------------------------------------- @@ -54,19 +54,19 @@ from gi.repository import GObject # GRAMPS modules # #------------------------------------------------------------------------- -from cli.grampscli import CLIDbLoader -from gen.config import config +from gramps.cli.grampscli import CLIDbLoader +from gramps.gen.config import config from gramps.gen.db import DbBsddb from gramps.gen.db.exceptions import (DbUpgradeRequiredError, BsddbDowngradeError, DbVersionError, DbEnvironmentError) -from gen.utils.file import get_unicode_path_from_file_chooser -from gui.pluginmanager import GuiPluginManager -from gui.dialog import (DBErrorDialog, ErrorDialog, QuestionDialog2, +from gramps.gen.utils.file import get_unicode_path_from_file_chooser +from gramps.gui.pluginmanager import GuiPluginManager +from gramps.gui.dialog import (DBErrorDialog, ErrorDialog, QuestionDialog2, WarningDialog) -from gui.user import User -from gen.errors import DbError +from gramps.gui.user import User +from gramps.gen.errors import DbError #------------------------------------------------------------------------- # diff --git a/gramps/gui/dbman.py b/gramps/gui/dbman.py index 8a73675e3..5ce8766f8 100644 --- a/gramps/gui/dbman.py +++ b/gramps/gui/dbman.py @@ -46,7 +46,7 @@ import urlparse import logging LOG = logging.getLogger(".DbManager") -from gen.constfunc import win +from gramps.gen.constfunc import win if win(): _RCS_FOUND = os.system("rcs -V >nul 2>nul") == 0 if _RCS_FOUND and "TZ" not in os.environ: @@ -69,18 +69,18 @@ from gi.repository import Pango # gramps modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ -from gui.user import User -from gui.dialog import ErrorDialog, QuestionDialog, QuestionDialog2 -from gen.db import DbBsddb -from gui.pluginmanager import GuiPluginManager -from cli.clidbman import CLIDbManager, NAME_FILE, time_val -from gui.ddtargets import DdTargets -from gen.recentfiles import rename_filename, remove_filename -from gui.glade import Glade -from gen.db.backup import restore -from gen.db.exceptions import DbException -from gen.utils.file import get_unicode_path_from_env_var +from gramps.gen.ggettext import gettext as _ +from gramps.gui.user import User +from gramps.gui.dialog import ErrorDialog, QuestionDialog, QuestionDialog2 +from gramps.gen.db import DbBsddb +from gramps.gui.pluginmanager import GuiPluginManager +from gramps.cli.clidbman import CLIDbManager, NAME_FILE, time_val +from gramps.gui.ddtargets import DdTargets +from gramps.gen.recentfiles import rename_filename, remove_filename +from gramps.gui.glade import Glade +from gramps.gen.db.backup import restore +from gramps.gen.db.exceptions import DbException +from gramps.gen.utils.file import get_unicode_path_from_env_var _RETURN = Gdk.keyval_from_name("Return") diff --git a/gramps/gui/ddtargets.py b/gramps/gui/ddtargets.py index 1865895b7..d7d016f54 100644 --- a/gramps/gui/ddtargets.py +++ b/gramps/gui/ddtargets.py @@ -39,7 +39,7 @@ The module defines a singleton instance of _DdTargets called DdTargets. - from gui.ddtargets import DdTargets + from gramps.gui.ddtargets import DdTargets drag_dest_set(Gtk.DestDefaults.ALL, DdTargets.all_targets(), diff --git a/gramps/gui/dialog.py b/gramps/gui/dialog.py index 83a2072d6..22810a0d8 100644 --- a/gramps/gui/dialog.py +++ b/gramps/gui/dialog.py @@ -43,10 +43,10 @@ from gi.repository import GdkPixbuf # Gramps modules # #------------------------------------------------------------------------- -from gen.const import ICON -from gen.config import config -from gui.glade import Glade -from gen.ggettext import gettext as _ +from gramps.gen.const import ICON +from gramps.gen.config import config +from gramps.gui.glade import Glade +from gramps.gen.ggettext import gettext as _ try: ICON = GdkPixbuf.Pixbuf.new_from_file(ICON) diff --git a/gramps/gui/display.py b/gramps/gui/display.py index 1a76411ea..401f2f724 100644 --- a/gramps/gui/display.py +++ b/gramps/gui/display.py @@ -20,9 +20,9 @@ # $Id$ -from gen.const import URL_MANUAL_PAGE, URL_WIKISTRING -from gen.constfunc import is_quartz -from gen.config import config +from gramps.gen.const import URL_MANUAL_PAGE, URL_WIKISTRING +from gramps.gen.constfunc import is_quartz +from gramps.gen.config import config import locale import os diff --git a/gramps/gui/displaystate.py b/gramps/gui/displaystate.py index b7d2e7a20..95cef04e3 100644 --- a/gramps/gui/displaystate.py +++ b/gramps/gui/displaystate.py @@ -29,7 +29,7 @@ # #------------------------------------------------------------------------- from cStringIO import StringIO -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ import os #------------------------------------------------------------------------- @@ -54,15 +54,15 @@ from gi.repository import GObject # GRAMPS modules # #------------------------------------------------------------------------- -from gen.utils.callback import Callback -from gui.utils import process_pending_events -from gui.views.navigationview import NavigationView -from gen.config import config -from gen.display.name import displayer as name_displayer -from gui.managedwindow import GrampsWindowManager -from gen.relationship import get_relationship_calculator -from gui.glade import Glade -from gen.utils.db import navigation_label +from gramps.gen.utils.callback import Callback +from gramps.gui.utils import process_pending_events +from gramps.gui.views.navigationview import NavigationView +from gramps.gen.config import config +from gramps.gen.display.name import displayer as name_displayer +from gramps.gui.managedwindow import GrampsWindowManager +from gramps.gen.relationship import get_relationship_calculator +from gramps.gui.glade import Glade +from gramps.gen.utils.db import navigation_label DISABLED = -1 @@ -237,7 +237,7 @@ class History(Callback): _RCT_TOP = '' _RCT_BTM = '' -from gen.recentfiles import RecentFiles +from gramps.gen.recentfiles import RecentFiles import os class RecentDocsMenu(object): @@ -306,7 +306,7 @@ def by_time(first, second): return cmp(second.get_time(), first.get_time()) -from gui.logger import RotateHandler +from gramps.gui.logger import RotateHandler class WarnHandler(RotateHandler): diff --git a/gramps/gui/editors/__init__.py b/gramps/gui/editors/__init__.py index 8d5c3bfc6..93607499a 100644 --- a/gramps/gui/editors/__init__.py +++ b/gramps/gui/editors/__init__.py @@ -47,7 +47,7 @@ from editurl import EditUrl from editlink import EditLink from filtereditor import FilterEditor, EditFilter -# Map from gen.lib name to Editor: +# Map from gramps.gen.lib name to Editor: EDITORS = { 'Person': EditPerson, 'Event': EditEvent, diff --git a/gramps/gui/editors/addmedia.py b/gramps/gui/editors/addmedia.py index 3f51831b7..af196ecee 100644 --- a/gramps/gui/editors/addmedia.py +++ b/gramps/gui/editors/addmedia.py @@ -36,7 +36,7 @@ import os # internationalization # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ #------------------------------------------------------------------------- # @@ -50,16 +50,16 @@ from gi.repository import GdkPixbuf # gramps modules # #------------------------------------------------------------------------- -from gen.const import ICON, THUMBSCALE, USER_HOME -from gen.config import config -from gen.utils.file import (media_path_full, media_path, relative_path, +from gramps.gen.const import ICON, THUMBSCALE, USER_HOME +from gramps.gen.config import config +from gramps.gen.utils.file import (media_path_full, media_path, relative_path, find_file, get_unicode_path_from_file_chooser) from gramps.gen.mime import get_type -from gui.thumbnails import find_mime_type_pixbuf -from gui.display import display_help -from gui.managedwindow import ManagedWindow -from gui.dialog import ErrorDialog, WarningDialog -from gui.glade import Glade +from gramps.gui.thumbnails import find_mime_type_pixbuf +from gramps.gui.display import display_help +from gramps.gui.managedwindow import ManagedWindow +from gramps.gui.dialog import ErrorDialog, WarningDialog +from gramps.gui.glade import Glade #------------------------------------------------------------------------- # diff --git a/gramps/gui/editors/displaytabs/addrembedlist.py b/gramps/gui/editors/displaytabs/addrembedlist.py index 82a514f45..d2b43ce6d 100644 --- a/gramps/gui/editors/displaytabs/addrembedlist.py +++ b/gramps/gui/editors/displaytabs/addrembedlist.py @@ -29,7 +29,7 @@ Address List display tab. # Python classes # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ from gi.repository import GObject #------------------------------------------------------------------------- @@ -38,8 +38,8 @@ from gi.repository import GObject # #------------------------------------------------------------------------- from gramps.gen.lib import Address -from gen.errors import WindowActiveError -from gui.ddtargets import DdTargets +from gramps.gen.errors import WindowActiveError +from gramps.gui.ddtargets import DdTargets from addressmodel import AddressModel from embeddedlist import EmbeddedList @@ -109,7 +109,7 @@ class AddrEmbedList(EmbeddedList): """ addr = Address() try: - from gui.editors import EditAddress + from gramps.gui.editors import EditAddress EditAddress(self.dbstate, self.uistate, self.track, addr, self.add_callback) except WindowActiveError: @@ -134,7 +134,7 @@ class AddrEmbedList(EmbeddedList): addr = self.get_selected() if addr: try: - from gui.editors import EditAddress + from gramps.gui.editors import EditAddress EditAddress(self.dbstate, self.uistate, self.track, addr, self.edit_callback) except WindowActiveError: diff --git a/gramps/gui/editors/displaytabs/attrembedlist.py b/gramps/gui/editors/displaytabs/attrembedlist.py index 285403c4b..5812ded22 100644 --- a/gramps/gui/editors/displaytabs/attrembedlist.py +++ b/gramps/gui/editors/displaytabs/attrembedlist.py @@ -25,7 +25,7 @@ # Python classes # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ from gi.repository import GObject #------------------------------------------------------------------------- @@ -34,8 +34,8 @@ from gi.repository import GObject # #------------------------------------------------------------------------- from gramps.gen.lib import Attribute -from gen.errors import WindowActiveError -from gui.ddtargets import DdTargets +from gramps.gen.errors import WindowActiveError +from gramps.gui.ddtargets import DdTargets from attrmodel import AttrModel from embeddedlist import EmbeddedList @@ -70,7 +70,7 @@ class AttrEmbedList(EmbeddedList): AttrModel, move_buttons=True) def get_editor(self): - from gui.editors import EditAttribute + from gramps.gui.editors import EditAttribute return EditAttribute def get_user_values(self): diff --git a/gramps/gui/editors/displaytabs/backreflist.py b/gramps/gui/editors/displaytabs/backreflist.py index 9f20d17c7..604414873 100644 --- a/gramps/gui/editors/displaytabs/backreflist.py +++ b/gramps/gui/editors/displaytabs/backreflist.py @@ -27,7 +27,7 @@ # Python classes # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ #------------------------------------------------------------------------- # @@ -41,8 +41,8 @@ from gi.repository import Gtk # GRAMPS classes # #------------------------------------------------------------------------- -from gen.errors import WindowActiveError -from gui.widgets import SimpleButton +from gramps.gen.errors import WindowActiveError +from gramps.gui.widgets import SimpleButton from embeddedlist import EmbeddedList #------------------------------------------------------------------------- @@ -135,7 +135,7 @@ class BackRefList(EmbeddedList): def edit_button_clicked(self, obj): - from gui.editors import EditEvent, EditPerson, EditFamily, EditSource, \ + from gramps.gui.editors import EditEvent, EditPerson, EditFamily, EditSource, \ EditPlace, EditMedia, EditRepository, \ EditCitation diff --git a/gramps/gui/editors/displaytabs/backrefmodel.py b/gramps/gui/editors/displaytabs/backrefmodel.py index 8415464fb..bc4d87b5a 100644 --- a/gramps/gui/editors/displaytabs/backrefmodel.py +++ b/gramps/gui/editors/displaytabs/backrefmodel.py @@ -29,15 +29,15 @@ from gi.repository import GObject from gi.repository import Gtk -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS classes # #------------------------------------------------------------------------- -from gen.display.name import displayer as name_displayer -from gen.utils.db import family_name, get_participant_from_event +from gramps.gen.display.name import displayer as name_displayer +from gramps.gen.utils.db import family_name, get_participant_from_event #------------------------------------------------------------------------- # diff --git a/gramps/gui/editors/displaytabs/buttontab.py b/gramps/gui/editors/displaytabs/buttontab.py index 9c3d860d2..29861b712 100644 --- a/gramps/gui/editors/displaytabs/buttontab.py +++ b/gramps/gui/editors/displaytabs/buttontab.py @@ -26,7 +26,7 @@ # Python classes # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ #------------------------------------------------------------------------- # @@ -41,9 +41,9 @@ from gi.repository import Gdk # GRAMPS classes # #------------------------------------------------------------------------- -from gui.widgets import SimpleButton +from gramps.gui.widgets import SimpleButton from grampstab import GrampsTab -from gen.errors import WindowActiveError +from gramps.gen.errors import WindowActiveError _KP_ENTER = Gdk.keyval_from_name("KP_Enter") _RETURN = Gdk.keyval_from_name("Return") diff --git a/gramps/gui/editors/displaytabs/childmodel.py b/gramps/gui/editors/displaytabs/childmodel.py index 71b070251..b7f97ae2f 100644 --- a/gramps/gui/editors/displaytabs/childmodel.py +++ b/gramps/gui/editors/displaytabs/childmodel.py @@ -34,10 +34,10 @@ import cgi # #------------------------------------------------------------------------- from gramps.gen.datehandler import get_date -from gen.display.name import displayer as name_displayer -from gen.utils.string import gender as gender_map +from gramps.gen.display.name import displayer as name_displayer +from gramps.gen.utils.string import gender as gender_map from gramps.gen.lib import EventType -from gen.utils.db import get_birth_or_fallback, get_death_or_fallback +from gramps.gen.utils.db import get_birth_or_fallback, get_death_or_fallback #------------------------------------------------------------------------- # diff --git a/gramps/gui/editors/displaytabs/citationembedlist.py b/gramps/gui/editors/displaytabs/citationembedlist.py index 74b68e1f4..42831d9a3 100644 --- a/gramps/gui/editors/displaytabs/citationembedlist.py +++ b/gramps/gui/editors/displaytabs/citationembedlist.py @@ -26,7 +26,7 @@ # Python classes # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ import logging LOG = logging.getLogger(".citation") @@ -42,14 +42,14 @@ from gi.repository import GObject # GRAMPS classes # #------------------------------------------------------------------------- -from gen.errors import WindowActiveError +from gramps.gen.errors import WindowActiveError from gramps.gen.lib import Citation, Source -from gen.lib import Source, Citation -from gui.dbguielement import DbGUIElement -from gui.selectors import SelectorFactory +from gramps.gen.lib import Source, Citation +from gramps.gui.dbguielement import DbGUIElement +from gramps.gui.selectors import SelectorFactory from citationrefmodel import CitationRefModel from embeddedlist import EmbeddedList -from gui.ddtargets import DdTargets +from gramps.gui.ddtargets import DdTargets #------------------------------------------------------------------------- # @@ -134,7 +134,7 @@ class CitationEmbedList(EmbeddedList, DbGUIElement): This prevents the dialog from coming up twice on the same object. """ try: - from gui.editors import EditCitation + from gramps.gui.editors import EditCitation EditCitation(self.dbstate, self.uistate, self.track, Citation(), Source(), self.add_callback, self.callertitle) @@ -162,23 +162,23 @@ class CitationEmbedList(EmbeddedList, DbGUIElement): if object: if isinstance(object, Source): try: - from gui.editors import EditCitation + from gramps.gui.editors import EditCitation EditCitation(self.dbstate, self.uistate, self.track, Citation(), object, callback=self.add_callback, callertitle=self.callertitle) except WindowActiveError: - from gui.dialog import WarningDialog + from gramps.gui.dialog import WarningDialog WarningDialog(_("Cannot share this reference"), self.__blocked_text()) elif isinstance(object, Citation): try: - from gui.editors import EditCitation + from gramps.gui.editors import EditCitation EditCitation(self.dbstate, self.uistate, self.track, object, callback=self.add_callback, callertitle=self.callertitle) except WindowActiveError: - from gui.dialog import WarningDialog + from gramps.gui.dialog import WarningDialog WarningDialog(_("Cannot share this reference"), self.__blocked_text()) else: @@ -207,7 +207,7 @@ class CitationEmbedList(EmbeddedList, DbGUIElement): if handle: citation = self.dbstate.db.get_citation_from_handle(handle) try: - from gui.editors import EditCitation + from gramps.gui.editors import EditCitation EditCitation(self.dbstate, self.uistate, self.track, citation, callertitle = self.callertitle) except WindowActiveError: @@ -246,12 +246,12 @@ class CitationEmbedList(EmbeddedList, DbGUIElement): object = self.dbstate.db.get_citation_from_handle(handle) if isinstance(object, Citation): try: - from gui.editors import EditCitation + from gramps.gui.editors import EditCitation EditCitation(self.dbstate, self.uistate, self.track, object, callback=self.add_callback, callertitle=self.callertitle) except WindowActiveError: - from gui.dialog import WarningDialog + from gramps.gui.dialog import WarningDialog WarningDialog(_("Cannot share this reference"), self.__blocked_text()) else: @@ -265,13 +265,13 @@ class CitationEmbedList(EmbeddedList, DbGUIElement): object = self.dbstate.db.get_source_from_handle(handle) if isinstance(object, Source): try: - from gui.editors import EditCitation + from gramps.gui.editors import EditCitation EditCitation(self.dbstate, self.uistate, self.track, Citation(), object, callback=self.add_callback, callertitle=self.callertitle) except WindowActiveError: - from gui.dialog import WarningDialog + from gramps.gui.dialog import WarningDialog WarningDialog(_("Cannot share this reference"), self.__blocked_text()) else: diff --git a/gramps/gui/editors/displaytabs/dataembedlist.py b/gramps/gui/editors/displaytabs/dataembedlist.py index 7bb2201e0..5c36ae98c 100644 --- a/gramps/gui/editors/displaytabs/dataembedlist.py +++ b/gramps/gui/editors/displaytabs/dataembedlist.py @@ -25,7 +25,7 @@ # Python classes # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/gramps/gui/editors/displaytabs/embeddedlist.py b/gramps/gui/editors/displaytabs/embeddedlist.py index 0223dd7c3..ddc608397 100644 --- a/gramps/gui/editors/displaytabs/embeddedlist.py +++ b/gramps/gui/editors/displaytabs/embeddedlist.py @@ -26,7 +26,7 @@ # python # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ import cPickle as pickle #------------------------------------------------------------------------- @@ -496,7 +496,7 @@ class EmbeddedList(ButtonTab): try: self.model = self.construct_model() except AttributeError, msg: - from gui.dialog import RunDatabaseRepair + from gramps.gui.dialog import RunDatabaseRepair import traceback traceback.print_exc() RunDatabaseRepair(str(msg)) diff --git a/gramps/gui/editors/displaytabs/eventembedlist.py b/gramps/gui/editors/displaytabs/eventembedlist.py index 38a337a3b..c7c951877 100644 --- a/gramps/gui/editors/displaytabs/eventembedlist.py +++ b/gramps/gui/editors/displaytabs/eventembedlist.py @@ -26,7 +26,7 @@ # Python classes # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ from gi.repository import Gtk from gi.repository import GObject @@ -36,12 +36,12 @@ from gi.repository import GObject # #------------------------------------------------------------------------- from gramps.gen.lib import Event, EventRef, EventRoleType, EventType -from gen.errors import WindowActiveError -from gui.ddtargets import DdTargets +from gramps.gen.errors import WindowActiveError +from gramps.gui.ddtargets import DdTargets from groupembeddedlist import GroupEmbeddedList from eventrefmodel import EventRefModel -from gui.dbguielement import DbGUIElement -from gui.selectors import SelectorFactory +from gramps.gui.dbguielement import DbGUIElement +from gramps.gui.selectors import SelectorFactory #------------------------------------------------------------------------- # @@ -141,7 +141,7 @@ class EventEmbedList(DbGUIElement, GroupEmbeddedList): self.rebuild_callback() def get_ref_editor(self): - from gui.editors import EditFamilyEventRef + from gramps.gui.editors import EditFamilyEventRef return EditFamilyEventRef def get_icon_name(self): @@ -256,7 +256,7 @@ class EventEmbedList(DbGUIElement, GroupEmbeddedList): self.dbstate, self.uistate, self.track, event, ref, self.object_added) except WindowActiveError: - from gui.dialog import WarningDialog + from gramps.gui.dialog import WarningDialog WarningDialog(_("Cannot share this reference"), self.__blocked_text()) @@ -269,7 +269,7 @@ class EventEmbedList(DbGUIElement, GroupEmbeddedList): self.dbstate, self.uistate, self.track, event, ref[1], self.object_edited) except WindowActiveError: - from gui.dialog import WarningDialog + from gramps.gui.dialog import WarningDialog WarningDialog(_("Cannot edit this reference"), self.__blocked_text()) elif ref and ref[0] != self._WORKGROUP: @@ -310,7 +310,7 @@ class EventEmbedList(DbGUIElement, GroupEmbeddedList): """ handle change request of non native data """ - from gui.dialog import WarningDialog + from gramps.gui.dialog import WarningDialog WarningDialog( _("Cannot change Person"), _("You cannot change Person events in the Family Editor") @@ -323,7 +323,7 @@ class EventEmbedList(DbGUIElement, GroupEmbeddedList): it needs to be edited and confirmed """ if row[0] == self._WORKGROUP: - from gen.lib import EventRoleType + from gramps.gen.lib import EventRoleType obj.set_role((EventRoleType.UNKNOWN,'')) #add the event GroupEmbeddedList._handle_drag(self, row, obj) @@ -333,7 +333,7 @@ class EventEmbedList(DbGUIElement, GroupEmbeddedList): self.get_ref_editor()(self.dbstate, self.uistate, self.track, event, obj, self.object_edited) except WindowActiveError: - from gui.dialog import WarningDialog + from gramps.gui.dialog import WarningDialog WarningDialog( _("Cannot edit this reference"), _("This event reference cannot be edited at this time. " @@ -362,7 +362,7 @@ class EventEmbedList(DbGUIElement, GroupEmbeddedList): """ person = self.dbstate.db.get_person_from_handle(key) try: - from gui.editors import EditPerson + from gramps.gui.editors import EditPerson EditPerson(self.dbstate, self.uistate, [], person) except WindowActiveError: pass diff --git a/gramps/gui/editors/displaytabs/eventrefmodel.py b/gramps/gui/editors/displaytabs/eventrefmodel.py index 028e67759..5550fa2e5 100644 --- a/gramps/gui/editors/displaytabs/eventrefmodel.py +++ b/gramps/gui/editors/displaytabs/eventrefmodel.py @@ -26,7 +26,7 @@ # python # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ #------------------------------------------------------------------------- # @@ -46,9 +46,9 @@ import cgi # GRAMPS classes # #------------------------------------------------------------------------- -from gui.widgets.undoablebuffer import UndoableBuffer +from gramps.gui.widgets.undoablebuffer import UndoableBuffer from gramps.gen.datehandler import get_date, get_date_valid -from gen.config import config +from gramps.gen.config import config #------------------------------------------------------------------------- # diff --git a/gramps/gui/editors/displaytabs/familyattrembedlist.py b/gramps/gui/editors/displaytabs/familyattrembedlist.py index 69b027078..e7832a07f 100644 --- a/gramps/gui/editors/displaytabs/familyattrembedlist.py +++ b/gramps/gui/editors/displaytabs/familyattrembedlist.py @@ -38,7 +38,7 @@ class FamilyAttrEmbedList(AttrEmbedList): AttrEmbedList.__init__(self, dbstate, uistate, track, data) def get_editor(self): - from gui.editors import EditFamilyAttribute + from gramps.gui.editors import EditFamilyAttribute return EditFamilyAttribute def get_user_values(self): diff --git a/gramps/gui/editors/displaytabs/familyldsembedlist.py b/gramps/gui/editors/displaytabs/familyldsembedlist.py index 235bb6677..7d5089127 100644 --- a/gramps/gui/editors/displaytabs/familyldsembedlist.py +++ b/gramps/gui/editors/displaytabs/familyldsembedlist.py @@ -25,7 +25,7 @@ # Python classes # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ #------------------------------------------------------------------------- # @@ -59,7 +59,7 @@ class FamilyLdsEmbedList(LdsEmbedList): LdsEmbedList.__init__(self, dbstate, uistate, track, data) def get_editor(self): - from gui.editors import EditFamilyLdsOrd + from gramps.gui.editors import EditFamilyLdsOrd return EditFamilyLdsOrd def new_data(self): diff --git a/gramps/gui/editors/displaytabs/gallerytab.py b/gramps/gui/editors/displaytabs/gallerytab.py index 6a4632c4f..4b6983aa2 100644 --- a/gramps/gui/editors/displaytabs/gallerytab.py +++ b/gramps/gui/editors/displaytabs/gallerytab.py @@ -26,7 +26,7 @@ # Python classes # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ import cPickle as pickle import urlparse @@ -50,19 +50,19 @@ from gi.repository import GObject # #------------------------------------------------------------------------- from gramps.gui.utils import is_right_click, open_file_with_default_application -from gui.dbguielement import DbGUIElement -from gui.selectors import SelectorFactory +from gramps.gui.dbguielement import DbGUIElement +from gramps.gui.selectors import SelectorFactory from gramps.gen.lib import MediaObject, MediaRef -from gen.db import DbTxn -from gen.utils.file import (media_path_full, media_path, relative_path, +from gramps.gen.db import DbTxn +from gramps.gen.utils.file import (media_path_full, media_path, relative_path, fix_encoding) -from gui.thumbnails import get_thumbnail_image -from gen.errors import WindowActiveError +from gramps.gui.thumbnails import get_thumbnail_image +from gramps.gen.errors import WindowActiveError from gramps.gen.mime import get_type, is_valid_type -from gui.ddtargets import DdTargets +from gramps.gui.ddtargets import DdTargets from buttontab import ButtonTab -from gen.constfunc import win -from gen.const import THUMBSCALE +from gramps.gen.constfunc import win +from gramps.gen.const import THUMBSCALE #------------------------------------------------------------------------- # # @@ -250,7 +250,7 @@ class GalleryTab(ButtonTab, DbGUIElement): obj = self.dbstate.db.get_object_from_handle(handle) if obj is None : #notify user of error - from gui.dialog import RunDatabaseRepair + from gramps.gui.dialog import RunDatabaseRepair RunDatabaseRepair( _('Non existing media found in the Gallery')) else : @@ -275,7 +275,7 @@ class GalleryTab(ButtonTab, DbGUIElement): def add_button_clicked(self, obj): try: - from gui.editors import EditMediaRef + from gramps.gui.editors import EditMediaRef EditMediaRef(self.dbstate, self.uistate, self.track, MediaObject(), MediaRef(), self.add_callback) @@ -321,11 +321,11 @@ class GalleryTab(ButtonTab, DbGUIElement): if src: sref = MediaRef() try: - from gui.editors import EditMediaRef + from gramps.gui.editors import EditMediaRef EditMediaRef(self.dbstate, self.uistate, self.track, src, sref, self.add_callback) except WindowActiveError: - from gui.dialog import WarningDialog + from gramps.gui.dialog import WarningDialog WarningDialog(_("Cannot share this reference"), self.__blocked_text()) @@ -341,11 +341,11 @@ class GalleryTab(ButtonTab, DbGUIElement): obj = self.dbstate.db.get_object_from_handle( ref.get_reference_handle()) try: - from gui.editors import EditMediaRef + from gramps.gui.editors import EditMediaRef EditMediaRef(self.dbstate, self.uistate, self.track, obj, ref, self.edit_callback) except WindowActiveError: - from gui.dialog import WarningDialog + from gramps.gui.dialog import WarningDialog WarningDialog(_("Cannot edit this reference"), self.__blocked_text()) diff --git a/gramps/gui/editors/displaytabs/ldsembedlist.py b/gramps/gui/editors/displaytabs/ldsembedlist.py index 6f37ef03a..5c596dece 100644 --- a/gramps/gui/editors/displaytabs/ldsembedlist.py +++ b/gramps/gui/editors/displaytabs/ldsembedlist.py @@ -25,7 +25,7 @@ # Python classes # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ from gi.repository import GObject #------------------------------------------------------------------------- @@ -34,7 +34,7 @@ from gi.repository import GObject # #------------------------------------------------------------------------- from gramps.gen.lib import LdsOrd -from gen.errors import WindowActiveError +from gramps.gen.errors import WindowActiveError from ldsmodel import LdsModel from embeddedlist import EmbeddedList @@ -72,7 +72,7 @@ class LdsEmbedList(EmbeddedList): LdsModel, move_buttons=True) def get_editor(self): - from gui.editors import EditLdsOrd + from gramps.gui.editors import EditLdsOrd return EditLdsOrd def new_data(self): diff --git a/gramps/gui/editors/displaytabs/ldsmodel.py b/gramps/gui/editors/displaytabs/ldsmodel.py index 9198751c1..2c0e14587 100644 --- a/gramps/gui/editors/displaytabs/ldsmodel.py +++ b/gramps/gui/editors/displaytabs/ldsmodel.py @@ -39,7 +39,7 @@ from gi.repository import Gtk # #------------------------------------------------------------------------- from gramps.gen.datehandler import get_date -from gen.utils.lds import TEMPLES +from gramps.gen.utils.lds import TEMPLES #------------------------------------------------------------------------- # diff --git a/gramps/gui/editors/displaytabs/locationembedlist.py b/gramps/gui/editors/displaytabs/locationembedlist.py index 2093cbbcd..2555d579a 100644 --- a/gramps/gui/editors/displaytabs/locationembedlist.py +++ b/gramps/gui/editors/displaytabs/locationembedlist.py @@ -25,7 +25,7 @@ # Python classes # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ from gi.repository import GObject #------------------------------------------------------------------------- @@ -34,8 +34,8 @@ from gi.repository import GObject # #------------------------------------------------------------------------- from gramps.gen.lib import Location -from gen.errors import WindowActiveError -from gui.ddtargets import DdTargets +from gramps.gen.errors import WindowActiveError +from gramps.gui.ddtargets import DdTargets from locationmodel import LocationModel from embeddedlist import EmbeddedList @@ -75,7 +75,7 @@ class LocationEmbedList(EmbeddedList): def add_button_clicked(self, obj): loc = Location() try: - from gui.editors import EditLocation + from gramps.gui.editors import EditLocation EditLocation(self.dbstate, self.uistate, self.track, loc, self.add_callback) except WindowActiveError: @@ -91,7 +91,7 @@ class LocationEmbedList(EmbeddedList): loc = self.get_selected() if loc: try: - from gui.editors import EditLocation + from gramps.gui.editors import EditLocation EditLocation(self.dbstate, self.uistate, self.track, loc, self.edit_callback) except WindowActiveError: diff --git a/gramps/gui/editors/displaytabs/nameembedlist.py b/gramps/gui/editors/displaytabs/nameembedlist.py index 396cea713..c0821fe36 100644 --- a/gramps/gui/editors/displaytabs/nameembedlist.py +++ b/gramps/gui/editors/displaytabs/nameembedlist.py @@ -34,7 +34,7 @@ from gi.repository import GObject # Python classes # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ #------------------------------------------------------------------------- # @@ -42,8 +42,8 @@ from gen.ggettext import gettext as _ # #------------------------------------------------------------------------- from gramps.gen.lib import Name, Surname -from gen.errors import WindowActiveError -from gui.ddtargets import DdTargets +from gramps.gen.errors import WindowActiveError +from gramps.gui.ddtargets import DdTargets from namemodel import NameModel from groupembeddedlist import GroupEmbeddedList @@ -157,7 +157,7 @@ class NameEmbedList(GroupEmbeddedList): name.add_surname(Surname()) name.set_primary_surname(0) try: - from gui.editors import EditName + from gramps.gui.editors import EditName EditName(self.dbstate, self.uistate, self.track, name, self.add_callback) except WindowActiveError: @@ -174,7 +174,7 @@ class NameEmbedList(GroupEmbeddedList): name = self.get_selected() if name and name[1] is not None: try: - from gui.editors import EditName + from gramps.gui.editors import EditName if name[0] == NameModel.ALTINDEX: EditName(self.dbstate, self.uistate, self.track, name[1], self.edit_callback) diff --git a/gramps/gui/editors/displaytabs/namemodel.py b/gramps/gui/editors/displaytabs/namemodel.py index ffb509ff8..7eae6efb9 100644 --- a/gramps/gui/editors/displaytabs/namemodel.py +++ b/gramps/gui/editors/displaytabs/namemodel.py @@ -27,7 +27,7 @@ # python libraries # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ #------------------------------------------------------------------------- # @@ -45,8 +45,8 @@ WEIGHT_BOLD = Pango.Weight.BOLD # GRAMPS classes # #------------------------------------------------------------------------- -from gui.widgets.undoablebuffer import UndoableBuffer -from gen.display.name import displayer as name_displayer +from gramps.gui.widgets.undoablebuffer import UndoableBuffer +from gramps.gen.display.name import displayer as name_displayer #------------------------------------------------------------------------- # diff --git a/gramps/gui/editors/displaytabs/notetab.py b/gramps/gui/editors/displaytabs/notetab.py index bf7bddecd..9b5ca54fe 100644 --- a/gramps/gui/editors/displaytabs/notetab.py +++ b/gramps/gui/editors/displaytabs/notetab.py @@ -25,7 +25,7 @@ # Python classes # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ #------------------------------------------------------------------------- # @@ -39,13 +39,13 @@ from gi.repository import GObject # GRAMPS classes # #------------------------------------------------------------------------- -from gen.errors import WindowActiveError +from gramps.gen.errors import WindowActiveError from gramps.gen.lib import Note -from gui.dbguielement import DbGUIElement -from gui.selectors import SelectorFactory +from gramps.gui.dbguielement import DbGUIElement +from gramps.gui.selectors import SelectorFactory from notemodel import NoteModel from embeddedlist import EmbeddedList -from gui.ddtargets import DdTargets +from gramps.gui.ddtargets import DdTargets #------------------------------------------------------------------------- # @@ -131,7 +131,7 @@ class NoteTab(EmbeddedList, DbGUIElement): if self.notetype : note.set_type(self.notetype) try: - from gui.editors import EditNote + from gramps.gui.editors import EditNote EditNote(self.dbstate, self.uistate, self.track, note, self.add_callback, self.callertitle, extratype = [self.notetype]) @@ -162,7 +162,7 @@ class NoteTab(EmbeddedList, DbGUIElement): if handle: note = self.dbstate.db.get_note_from_handle(handle) try: - from gui.editors import EditNote + from gramps.gui.editors import EditNote EditNote(self.dbstate, self.uistate, self.track, note, callertitle = self.callertitle, extratype = [self.notetype] ) diff --git a/gramps/gui/editors/displaytabs/personeventembedlist.py b/gramps/gui/editors/displaytabs/personeventembedlist.py index b51ade0eb..2f02b3e83 100644 --- a/gramps/gui/editors/displaytabs/personeventembedlist.py +++ b/gramps/gui/editors/displaytabs/personeventembedlist.py @@ -26,7 +26,7 @@ # python # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ from gi.repository import GObject #------------------------------------------------------------------------- @@ -35,10 +35,10 @@ from gi.repository import GObject # #------------------------------------------------------------------------- from gramps.gen.lib import EventRoleType, EventType -from gen.display.name import displayer as name_displayer +from gramps.gen.display.name import displayer as name_displayer from eventembedlist import EventEmbedList from eventrefmodel import EventRefModel -from gen.errors import WindowActiveError +from gramps.gen.errors import WindowActiveError #------------------------------------------------------------------------- # @@ -106,7 +106,7 @@ class PersonEventEmbedList(EventEmbedList): ] def get_ref_editor(self): - from gui.editors import EditEventRef + from gramps.gui.editors import EditEventRef return EditEventRef def editnotworkgroup(self, key): @@ -115,7 +115,7 @@ class PersonEventEmbedList(EventEmbedList): """ family = self.dbstate.db.get_family_from_handle(key) try: - from gui.editors import EditFamily + from gramps.gui.editors import EditFamily EditFamily(self.dbstate, self.uistate, [], family) except WindowActiveError: pass @@ -124,7 +124,7 @@ class PersonEventEmbedList(EventEmbedList): """ handle change request of non native data """ - from gui.dialog import WarningDialog + from gramps.gui.dialog import WarningDialog WarningDialog( _("Cannot change Family"), _("You cannot change Family events in the Person Editor") diff --git a/gramps/gui/editors/displaytabs/personrefembedlist.py b/gramps/gui/editors/displaytabs/personrefembedlist.py index a70aa00af..27a0f6f9a 100644 --- a/gramps/gui/editors/displaytabs/personrefembedlist.py +++ b/gramps/gui/editors/displaytabs/personrefembedlist.py @@ -25,7 +25,7 @@ # Python classes # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ from gi.repository import GObject #------------------------------------------------------------------------- @@ -34,8 +34,8 @@ from gi.repository import GObject # #------------------------------------------------------------------------- from gramps.gen.lib import PersonRef -from gen.errors import WindowActiveError -from gui.ddtargets import DdTargets +from gramps.gen.errors import WindowActiveError +from gramps.gui.ddtargets import DdTargets from personrefmodel import PersonRefModel from embeddedlist import EmbeddedList @@ -72,7 +72,7 @@ class PersonRefEmbedList(EmbeddedList): move_buttons=True) def get_ref_editor(self): - from gui.editors import EditPersonRef + from gramps.gui.editors import EditPersonRef return EditPersonRef def get_data(self): @@ -82,7 +82,7 @@ class PersonRefEmbedList(EmbeddedList): return ((1, 0), (1, 1), (1, 2)) def add_button_clicked(self, obj): - from gui.editors import EditPersonRef + from gramps.gui.editors import EditPersonRef try: ref = PersonRef() ref.rel = _('Godfather') @@ -99,7 +99,7 @@ class PersonRefEmbedList(EmbeddedList): GObject.idle_add(self.tree.scroll_to_cell, len(data) - 1) def edit_button_clicked(self, obj): - from gui.editors import EditPersonRef + from gramps.gui.editors import EditPersonRef ref = self.get_selected() if ref: try: @@ -117,7 +117,7 @@ class PersonRefEmbedList(EmbeddedList): And event reference that is from a drag and drop has an unknown event reference type """ - from gui.editors import EditPersonRef + from gramps.gui.editors import EditPersonRef try: ref = PersonRef(obj) ref.rel = _('Unknown') diff --git a/gramps/gui/editors/displaytabs/personrefmodel.py b/gramps/gui/editors/displaytabs/personrefmodel.py index 99cc1b0ca..77c4fe7f0 100644 --- a/gramps/gui/editors/displaytabs/personrefmodel.py +++ b/gramps/gui/editors/displaytabs/personrefmodel.py @@ -32,7 +32,7 @@ from gi.repository import Gtk # GRAMPS classes # #------------------------------------------------------------------------- -from gen.display.name import displayer as name_displayer +from gramps.gen.display.name import displayer as name_displayer #------------------------------------------------------------------------- # diff --git a/gramps/gui/editors/displaytabs/repoembedlist.py b/gramps/gui/editors/displaytabs/repoembedlist.py index d17bec4cd..b5438181d 100644 --- a/gramps/gui/editors/displaytabs/repoembedlist.py +++ b/gramps/gui/editors/displaytabs/repoembedlist.py @@ -25,7 +25,7 @@ # Python classes # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ from gi.repository import GObject #------------------------------------------------------------------------- @@ -34,10 +34,10 @@ from gi.repository import GObject # #------------------------------------------------------------------------- from gramps.gen.lib import RepoRef, Repository -from gui.dbguielement import DbGUIElement -from gui.selectors import SelectorFactory -from gen.errors import WindowActiveError -from gui.ddtargets import DdTargets +from gramps.gui.dbguielement import DbGUIElement +from gramps.gui.selectors import SelectorFactory +from gramps.gen.errors import WindowActiveError +from gramps.gui.ddtargets import DdTargets from reporefmodel import RepoRefModel from embeddedlist import EmbeddedList @@ -100,7 +100,7 @@ class RepoEmbedList(EmbeddedList, DbGUIElement): return ((1, 0), (1, 1), (1, 2), (1, 3)) def handle_extra_type(self, objtype, obj): - from gui.editors import EditRepoRef + from gramps.gui.editors import EditRepoRef try: ref = RepoRef() repo = self.dbstate.db.get_repository_from_handle(obj) @@ -111,7 +111,7 @@ class RepoEmbedList(EmbeddedList, DbGUIElement): pass def add_button_clicked(self, obj): - from gui.editors import EditRepoRef + from gramps.gui.editors import EditRepoRef ref = RepoRef() repo = Repository() try: @@ -132,7 +132,7 @@ class RepoEmbedList(EmbeddedList, DbGUIElement): repo = sel.run() if repo: try: - from gui.editors import EditRepoRef + from gramps.gui.editors import EditRepoRef ref = RepoRef() EditRepoRef(self.dbstate, self.uistate, @@ -158,12 +158,12 @@ class RepoEmbedList(EmbeddedList, DbGUIElement): if ref: repo = self.dbstate.db.get_repository_from_handle(ref.ref) try: - from gui.editors import EditRepoRef + from gramps.gui.editors import EditRepoRef EditRepoRef( self.dbstate, self.uistate, self.track, repo, ref, self.edit_callback) except WindowActiveError: - from gui.dialog import WarningDialog + from gramps.gui.dialog import WarningDialog WarningDialog( _("Cannot edit this reference"), _("This repository reference cannot be edited at this " diff --git a/gramps/gui/editors/displaytabs/surnametab.py b/gramps/gui/editors/displaytabs/surnametab.py index 27f87e914..2b19b5fc3 100644 --- a/gramps/gui/editors/displaytabs/surnametab.py +++ b/gramps/gui/editors/displaytabs/surnametab.py @@ -26,7 +26,7 @@ # Python classes # #------------------------------------------------------------------------- -from gen.ggettext import sgettext as _ +from gramps.gen.ggettext import sgettext as _ import locale #------------------------------------------------------------------------- @@ -48,8 +48,8 @@ _ENTER = Gdk.keyval_from_name("Enter") #------------------------------------------------------------------------- from surnamemodel import SurnameModel from embeddedlist import EmbeddedList -from gui.ddtargets import DdTargets -from gen.lib import Surname, NameOriginType +from gramps.gui.ddtargets import DdTargets +from gramps.gen.lib import Surname, NameOriginType #------------------------------------------------------------------------- # diff --git a/gramps/gui/editors/displaytabs/webembedlist.py b/gramps/gui/editors/displaytabs/webembedlist.py index f3f9b4ece..450fd10e2 100644 --- a/gramps/gui/editors/displaytabs/webembedlist.py +++ b/gramps/gui/editors/displaytabs/webembedlist.py @@ -25,7 +25,7 @@ # Python classes # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ from gi.repository import Gtk from gi.repository import GObject @@ -35,8 +35,8 @@ from gi.repository import GObject # #------------------------------------------------------------------------- from gramps.gen.lib import Url -from gen.errors import WindowActiveError -from gui.ddtargets import DdTargets +from gramps.gen.errors import WindowActiveError +from gramps.gui.ddtargets import DdTargets from webmodel import WebModel from embeddedlist import EmbeddedList @@ -82,7 +82,7 @@ class WebEmbedList(EmbeddedList): return ((1, 0), (1, 1), (1, 2)) def add_button_clicked(self, obj): - from gui.editors import EditUrl + from gramps.gui.editors import EditUrl url = Url() try: EditUrl(self.dbstate, self.uistate, self.track, @@ -97,7 +97,7 @@ class WebEmbedList(EmbeddedList): GObject.idle_add(self.tree.scroll_to_cell, len(data) - 1) def edit_button_clicked(self, obj): - from gui.editors import EditUrl + from gramps.gui.editors import EditUrl url = self.get_selected() if url: try: @@ -118,7 +118,7 @@ class WebEmbedList(EmbeddedList): ] def jump_button_clicked(self, obj): - from gui.display import display_url + from gramps.gui.display import display_url url = self.get_selected() if url.get_path(): diff --git a/gramps/gui/editors/editaddress.py b/gramps/gui/editors/editaddress.py index fb2d73985..ca6fb1b00 100644 --- a/gramps/gui/editors/editaddress.py +++ b/gramps/gui/editors/editaddress.py @@ -33,7 +33,7 @@ mechanism for the user to edit address information. # Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ #------------------------------------------------------------------------- # @@ -48,10 +48,10 @@ from gi.repository import Gtk # #------------------------------------------------------------------------- from editsecondary import EditSecondary -from gen.lib import NoteType -from gui.glade import Glade +from gramps.gen.lib import NoteType +from gramps.gui.glade import Glade from displaytabs import CitationEmbedList, NoteTab -from gui.widgets import MonitoredDate, MonitoredEntry, PrivacyButton +from gramps.gui.widgets import MonitoredDate, MonitoredEntry, PrivacyButton #------------------------------------------------------------------------- # diff --git a/gramps/gui/editors/editattribute.py b/gramps/gui/editors/editattribute.py index 5254b1aa3..b000237d3 100644 --- a/gramps/gui/editors/editattribute.py +++ b/gramps/gui/editors/editattribute.py @@ -32,7 +32,7 @@ mechanism for the user to edit attribute information. # Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ #------------------------------------------------------------------------- # @@ -47,10 +47,10 @@ from gi.repository import Gtk # #------------------------------------------------------------------------- from editsecondary import EditSecondary -from gen.lib import NoteType -from gui.glade import Glade +from gramps.gen.lib import NoteType +from gramps.gui.glade import Glade from displaytabs import CitationEmbedList, NoteTab -from gui.widgets import MonitoredEntry, PrivacyButton, MonitoredDataType +from gramps.gui.widgets import MonitoredEntry, PrivacyButton, MonitoredDataType #------------------------------------------------------------------------- # @@ -143,7 +143,7 @@ class EditAttribute(EditSecondary): t = self.obj.get_type() if t.is_custom() and str(t) == '': - from gui.dialog import ErrorDialog + from gramps.gui.dialog import ErrorDialog ErrorDialog( _("Cannot save attribute"), _("The attribute type cannot be empty")) diff --git a/gramps/gui/editors/editchildref.py b/gramps/gui/editors/editchildref.py index 9e22dd1dc..4dd584821 100644 --- a/gramps/gui/editors/editchildref.py +++ b/gramps/gui/editors/editchildref.py @@ -32,7 +32,7 @@ mechanism for the user to edit address information. # Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ #------------------------------------------------------------------------- # @@ -48,12 +48,12 @@ from gi.repository import Gtk # #------------------------------------------------------------------------- from editsecondary import EditSecondary -from gen.lib import NoteType -from gen.errors import WindowActiveError -from gui.glade import Glade +from gramps.gen.lib import NoteType +from gramps.gen.errors import WindowActiveError +from gramps.gui.glade import Glade from displaytabs import CitationEmbedList, NoteTab -from gui.widgets import MonitoredDataType, PrivacyButton -from gen.display.name import displayer as name_displayer +from gramps.gui.widgets import MonitoredDataType, PrivacyButton +from gramps.gen.display.name import displayer as name_displayer #------------------------------------------------------------------------- # diff --git a/gramps/gui/editors/editcitation.py b/gramps/gui/editors/editcitation.py index 3487f03a2..930fc24ac 100644 --- a/gramps/gui/editors/editcitation.py +++ b/gramps/gui/editors/editcitation.py @@ -31,7 +31,7 @@ EditCitation class for GRAMPS. # Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ import logging LOG = logging.getLogger(".citation") @@ -41,16 +41,16 @@ LOG = logging.getLogger(".citation") # #------------------------------------------------------------------------- from gramps.gen.lib import Citation, NoteType, Source -from gen.db import DbTxn +from gramps.gen.db import DbTxn from editprimary import EditPrimary from displaytabs import (NoteTab, GalleryTab, DataEmbedList, SourceBackRefList, RepoEmbedList, CitationBackRefList) -from gui.widgets import (MonitoredEntry, PrivacyButton, MonitoredMenu, +from gramps.gui.widgets import (MonitoredEntry, PrivacyButton, MonitoredMenu, MonitoredDate) -from gui.dialog import ErrorDialog +from gramps.gui.dialog import ErrorDialog from editreference import RefTab -from gui.glade import Glade +from gramps.gui.glade import Glade #------------------------------------------------------------------------- # @@ -64,7 +64,7 @@ class EditCitation(EditPrimary): This class is called both to edit the Citation Primary object and to edit references from other objects to citations. - It is called from gui.editors.__init__ for editing the primary object + It is called from gramps.gui.editors.__init__ for editing the primary object and is called from CitationEmbedList for editing references @param callertitle: Text passed by calling object to add to title diff --git a/gramps/gui/editors/editdate.py b/gramps/gui/editors/editdate.py index 967e1ed7a..c78e84225 100644 --- a/gramps/gui/editors/editdate.py +++ b/gramps/gui/editors/editdate.py @@ -61,13 +61,13 @@ from gi.repository import Gtk # gramps modules # #------------------------------------------------------------------------- -from gen.ggettext import sgettext as _ -from gen.lib.date import Date +from gramps.gen.ggettext import sgettext as _ +from gramps.gen.lib.date import Date from gramps.gen.datehandler import displayer -from gen.const import URL_MANUAL_PAGE -from gui.display import display_help -from gui.managedwindow import ManagedWindow -from gui.glade import Glade +from gramps.gen.const import URL_MANUAL_PAGE +from gramps.gui.display import display_help +from gramps.gui.managedwindow import ManagedWindow +from gramps.gui.glade import Glade #------------------------------------------------------------------------- # diff --git a/gramps/gui/editors/editevent.py b/gramps/gui/editors/editevent.py index 9d8ba7feb..1a129093d 100644 --- a/gramps/gui/editors/editevent.py +++ b/gramps/gui/editors/editevent.py @@ -27,7 +27,7 @@ # Python modules # #------------------------------------------------------------------------- -from gen.ggettext import sgettext as _ +from gramps.gen.ggettext import sgettext as _ #------------------------------------------------------------------------- # @@ -41,19 +41,19 @@ from gi.repository import Gtk # gramps modules # #------------------------------------------------------------------------- -from gen.const import URL_MANUAL_PAGE +from gramps.gen.const import URL_MANUAL_PAGE from gramps.gen.lib import Event, NoteType -from gen.db import DbTxn -from gui.display import display_help +from gramps.gen.db import DbTxn +from gramps.gui.display import display_help from editprimary import EditPrimary from objectentries import PlaceEntry -from gui.glade import Glade -from gui.dialog import ErrorDialog +from gramps.gui.glade import Glade +from gramps.gui.dialog import ErrorDialog from displaytabs import (CitationEmbedList, NoteTab, GalleryTab, EventBackRefList, AttrEmbedList) -from gui.widgets import (MonitoredEntry, PrivacyButton, +from gramps.gui.widgets import (MonitoredEntry, PrivacyButton, MonitoredDataType, MonitoredDate) -from gen.utils.db import get_participant_from_event +from gramps.gen.utils.db import get_participant_from_event #------------------------------------------------------------------------- # diff --git a/gramps/gui/editors/editeventref.py b/gramps/gui/editors/editeventref.py index 7c47d3483..b93a86874 100644 --- a/gramps/gui/editors/editeventref.py +++ b/gramps/gui/editors/editeventref.py @@ -28,7 +28,7 @@ # Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ #------------------------------------------------------------------------- # @@ -36,11 +36,11 @@ from gen.ggettext import gettext as _ # #------------------------------------------------------------------------- from gramps.gen.lib import EventType, NoteType -from gen.db import DbTxn -from gui.glade import Glade +from gramps.gen.db import DbTxn +from gramps.gui.glade import Glade from displaytabs import (CitationEmbedList, NoteTab, GalleryTab, EventBackRefList, AttrEmbedList) -from gui.widgets import (PrivacyButton, MonitoredEntry, +from gramps.gui.widgets import (PrivacyButton, MonitoredEntry, MonitoredDate, MonitoredDataType) from editreference import RefTab, EditReference diff --git a/gramps/gui/editors/editfamily.py b/gramps/gui/editors/editfamily.py index 6bb090a1b..8aca2b77f 100644 --- a/gramps/gui/editors/editfamily.py +++ b/gramps/gui/editors/editfamily.py @@ -28,7 +28,7 @@ # python modules # #------------------------------------------------------------------------- -from gen.config import config +from gramps.gen.config import config if config.get('preferences.use-bsddb3'): from bsddb3 import db as bsddb_db else: @@ -48,8 +48,8 @@ log = logging.getLogger(".") # GTK/Gnome modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ -from gui.ddtargets import DdTargets +from gramps.gen.ggettext import gettext as _ +from gramps.gui.ddtargets import DdTargets from gi.repository import Gtk from gi.repository import Gdk from gi.repository import Pango @@ -60,13 +60,13 @@ from gi.repository import GObject # gramps modules # #------------------------------------------------------------------------- -from gen.config import config -from gen.display.name import displayer as name_displayer +from gramps.gen.config import config +from gramps.gen.display.name import displayer as name_displayer from gramps.gen.lib import ChildRef, Family, Name, NoteType, Person, Surname -from gen.db import DbTxn -from gen.errors import WindowActiveError +from gramps.gen.db import DbTxn +from gramps.gen.errors import WindowActiveError from gramps.gen.datehandler import displayer -from gui.glade import Glade +from gramps.gui.glade import Glade from editprimary import EditPrimary from editchildref import EditChildRef @@ -74,15 +74,15 @@ from editperson import EditPerson from displaytabs import (EmbeddedList, EventEmbedList, CitationEmbedList, FamilyAttrEmbedList, NoteTab, GalleryTab, FamilyLdsEmbedList, ChildModel) -from gui.widgets import (PrivacyButton, MonitoredEntry, MonitoredDataType, +from gramps.gui.widgets import (PrivacyButton, MonitoredEntry, MonitoredDataType, MonitoredTagList) -from gen.plug import CATEGORY_QR_FAMILY -from gui.dialog import (ErrorDialog, RunDatabaseRepair, WarningDialog, +from gramps.gen.plug import CATEGORY_QR_FAMILY +from gramps.gui.dialog import (ErrorDialog, RunDatabaseRepair, WarningDialog, MessageHideDialog) -from gen.utils.db import (get_birth_or_fallback, get_death_or_fallback, +from gramps.gen.utils.db import (get_birth_or_fallback, get_death_or_fallback, get_marriage_or_fallback, preset_name, family_name) -from gui.selectors import SelectorFactory -from gen.utils.id import create_id +from gramps.gui.selectors import SelectorFactory +from gramps.gen.utils.id import create_id SelectPerson = SelectorFactory('Person') diff --git a/gramps/gui/editors/editldsord.py b/gramps/gui/editors/editldsord.py index 17c158095..d12246c12 100644 --- a/gramps/gui/editors/editldsord.py +++ b/gramps/gui/editors/editldsord.py @@ -31,7 +31,7 @@ mechanism for the user to edit personal LDS information. # Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ #------------------------------------------------------------------------- # @@ -46,15 +46,15 @@ from gi.repository import Gtk # #------------------------------------------------------------------------- from gramps.gen.lib import LdsOrd, NoteType -from gen.display.name import displayer as name_displayer -from gen.utils.lds import TEMPLES -from gui.glade import Glade +from gramps.gen.display.name import displayer as name_displayer +from gramps.gen.utils.lds import TEMPLES +from gramps.gui.glade import Glade from editsecondary import EditSecondary from objectentries import PlaceEntry from displaytabs import CitationEmbedList,NoteTab -from gui.widgets import (PrivacyButton, MonitoredDate, +from gramps.gui.widgets import (PrivacyButton, MonitoredDate, MonitoredMenu, MonitoredStrMenu) -from gui.selectors import SelectorFactory +from gramps.gui.selectors import SelectorFactory _DATA_MAP = { LdsOrd.BAPTISM : [ diff --git a/gramps/gui/editors/editlink.py b/gramps/gui/editors/editlink.py index 6eac23434..3e395d555 100644 --- a/gramps/gui/editors/editlink.py +++ b/gramps/gui/editors/editlink.py @@ -33,11 +33,11 @@ import re # gramps modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ -from gui.managedwindow import ManagedWindow -from gui.display import display_help -from gui.glade import Glade -from gen.simple import SimpleAccess +from gramps.gen.ggettext import gettext as _ +from gramps.gui.managedwindow import ManagedWindow +from gramps.gui.display import display_help +from gramps.gui.glade import Glade +from gramps.gen.simple import SimpleAccess WEB, EVENT, FAMILY, MEDIA, NOTE, PERSON, PLACE, REPOSITORY, SOURCE = range(9) OBJECT_MAP = { @@ -146,7 +146,7 @@ class EditLink(ManagedWindow): (object_class, "handle", obj.handle)) def _on_new(self, widget): - from gui.editors import EditObject + from gramps.gui.editors import EditObject object_class = OBJECT_MAP[self.uri_list.get_active()] EditObject(self.dbstate, self.uistate, @@ -155,7 +155,7 @@ class EditLink(ManagedWindow): callback=self._on_new_callback) def _on_edit_one(self, widget): - from gui.editors import EditObject + from gramps.gui.editors import EditObject uri = self.url_link.get_text() if uri.startswith("gramps://"): obj_class, prop, value = uri[9:].split("/", 2) @@ -165,7 +165,7 @@ class EditLink(ManagedWindow): obj_class, prop, value) def _on_pick_one(self, widget): - from gui.selectors import SelectorFactory + from gramps.gui.selectors import SelectorFactory object_class = OBJECT_MAP[self.uri_list.get_active()] Select = SelectorFactory(object_class) uri = self.url_link.get_text() diff --git a/gramps/gui/editors/editlocation.py b/gramps/gui/editors/editlocation.py index 8d867e162..a1dc8f791 100644 --- a/gramps/gui/editors/editlocation.py +++ b/gramps/gui/editors/editlocation.py @@ -28,9 +28,9 @@ # #------------------------------------------------------------------------- from editsecondary import EditSecondary -from gui.glade import Glade -from gui.widgets import MonitoredEntry -from gen.ggettext import gettext as _ +from gramps.gui.glade import Glade +from gramps.gui.widgets import MonitoredEntry +from gramps.gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/gramps/gui/editors/editmedia.py b/gramps/gui/editors/editmedia.py index 9437978a9..53a4ad4c4 100644 --- a/gramps/gui/editors/editmedia.py +++ b/gramps/gui/editors/editmedia.py @@ -28,7 +28,7 @@ # Standard python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ #------------------------------------------------------------------------- # @@ -43,21 +43,21 @@ from gi.repository import Gdk # gramps modules # #------------------------------------------------------------------------- -from gui.utils import open_file_with_default_application +from gramps.gui.utils import open_file_with_default_application from gramps.gen.lib import MediaObject, NoteType -from gen.db import DbTxn +from gramps.gen.db import DbTxn from gramps.gen.mime import get_description, get_type -from gui.thumbnails import get_thumbnail_image, find_mime_type_pixbuf -from gen.utils.file import (media_path_full, find_file, +from gramps.gui.thumbnails import get_thumbnail_image, find_mime_type_pixbuf +from gramps.gen.utils.file import (media_path_full, find_file, get_unicode_path_from_file_chooser) from editprimary import EditPrimary -from gui.widgets import (MonitoredDate, MonitoredEntry, PrivacyButton, +from gramps.gui.widgets import (MonitoredDate, MonitoredEntry, PrivacyButton, MonitoredTagList) from displaytabs import (CitationEmbedList, AttrEmbedList, NoteTab, MediaBackRefList) from addmedia import AddMediaObject -from gui.dialog import ErrorDialog -from gui.glade import Glade +from gramps.gui.dialog import ErrorDialog +from gramps.gui.glade import Glade #------------------------------------------------------------------------- # diff --git a/gramps/gui/editors/editmediaref.py b/gramps/gui/editors/editmediaref.py index 90b009a74..dc37b12c2 100644 --- a/gramps/gui/editors/editmediaref.py +++ b/gramps/gui/editors/editmediaref.py @@ -29,7 +29,7 @@ # Standard python modules # #------------------------------------------------------------------------- -from gen.ggettext import sgettext as _ +from gramps.gen.ggettext import sgettext as _ #------------------------------------------------------------------------- # @@ -44,18 +44,18 @@ from gi.repository import Gdk # gramps modules # #------------------------------------------------------------------------- -from gui.utils import open_file_with_default_application -from gen.const import THUMBSCALE +from gramps.gui.utils import open_file_with_default_application +from gramps.gen.const import THUMBSCALE from gramps.gen.mime import get_description, get_type -from gui.thumbnails import get_thumbnail_image, find_mime_type_pixbuf -from gen.utils.file import (media_path_full, find_file, +from gramps.gui.thumbnails import get_thumbnail_image, find_mime_type_pixbuf +from gramps.gen.utils.file import (media_path_full, find_file, get_unicode_path_from_file_chooser) -from gen.lib import NoteType -from gen.db import DbTxn -from gui.glade import Glade +from gramps.gen.lib import NoteType +from gramps.gen.db import DbTxn +from gramps.gui.glade import Glade from displaytabs import (CitationEmbedList, AttrEmbedList, MediaBackRefList, NoteTab) -from gui.widgets import (MonitoredSpinButton, MonitoredEntry, PrivacyButton, +from gramps.gui.widgets import (MonitoredSpinButton, MonitoredEntry, PrivacyButton, MonitoredDate, MonitoredTagList) from editreference import RefTab, EditReference from addmedia import AddMediaObject diff --git a/gramps/gui/editors/editname.py b/gramps/gui/editors/editname.py index 8f033a681..3604e2242 100644 --- a/gramps/gui/editors/editname.py +++ b/gramps/gui/editors/editname.py @@ -30,7 +30,7 @@ # #------------------------------------------------------------------------- from gi.repository import GObject -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ from copy import copy #------------------------------------------------------------------------- @@ -45,15 +45,15 @@ from gi.repository import Gtk # gramps modules # #------------------------------------------------------------------------- -from gen.config import config -from gen.display.name import displayer as name_displayer +from gramps.gen.config import config +from gramps.gen.display.name import displayer as name_displayer from editsecondary import EditSecondary -from gen.lib import NoteType +from gramps.gen.lib import NoteType from displaytabs import GrampsTab, CitationEmbedList, NoteTab, SurnameTab -from gui.widgets import (MonitoredEntry, MonitoredMenu, MonitoredDate, +from gramps.gui.widgets import (MonitoredEntry, MonitoredMenu, MonitoredDate, MonitoredDataType, PrivacyButton) -from gui.glade import Glade -from gen.errors import ValidationError +from gramps.gui.glade import Glade +from gramps.gen.errors import ValidationError #------------------------------------------------------------------------- # @@ -370,7 +370,7 @@ class EditName(EditSecondary): #user wants to group with surname if self.global_group_set and not self.original_group_set : #warn that group will revert to surname - from gui.dialog import QuestionDialog2 + from gramps.gui.dialog import QuestionDialog2 q = QuestionDialog2( _("Break global name grouping?"), _("All people with the name of %(surname)s will no longer " @@ -400,7 +400,7 @@ class EditName(EditSecondary): #if changed, ask if this has to happen for the entire group, #this might be creation of group link, or change of group link if self.global_group_as != group_as: - from gui.dialog import QuestionDialog2 + from gramps.gui.dialog import QuestionDialog2 q = QuestionDialog2( _("Group all people with the same name?"), diff --git a/gramps/gui/editors/editnote.py b/gramps/gui/editors/editnote.py index 6fd091645..872390bd3 100644 --- a/gramps/gui/editors/editnote.py +++ b/gramps/gui/editors/editnote.py @@ -29,7 +29,7 @@ # Python classes # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ import logging _LOG = logging.getLogger(".gui.editors.EditNote") @@ -47,15 +47,15 @@ from gi.repository import Pango # GRAMPS modules # #------------------------------------------------------------------------- -from gen.config import config +from gramps.gen.config import config from editprimary import EditPrimary from displaytabs import GrampsTab, NoteBackRefList -from gui.widgets import (MonitoredDataType, MonitoredCheckbox, +from gramps.gui.widgets import (MonitoredDataType, MonitoredCheckbox, MonitoredEntry, PrivacyButton, MonitoredTagList) -from gen.lib import Note -from gen.db import DbTxn -from gui.dialog import ErrorDialog -from gui.glade import Glade +from gramps.gen.lib import Note +from gramps.gen.db import DbTxn +from gramps.gui.dialog import ErrorDialog +from gramps.gui.glade import Glade #------------------------------------------------------------------------- # diff --git a/gramps/gui/editors/editperson.py b/gramps/gui/editors/editperson.py index 9679ad5a4..c7cf60e14 100644 --- a/gramps/gui/editors/editperson.py +++ b/gramps/gui/editors/editperson.py @@ -34,7 +34,7 @@ to edit information about a particular Person. # #------------------------------------------------------------------------- from copy import copy -from gen.ggettext import sgettext as _ +from gramps.gen.ggettext import sgettext as _ #------------------------------------------------------------------------- # @@ -50,30 +50,30 @@ from gi.repository import Pango # gramps modules # #------------------------------------------------------------------------- -from gen.utils.file import media_path_full -from gui.thumbnails import get_thumbnail_image +from gramps.gen.utils.file import media_path_full +from gramps.gui.thumbnails import get_thumbnail_image from gramps.gui.utils import is_right_click, open_file_with_default_application -from gen.utils.db import get_birth_or_fallback +from gramps.gen.utils.db import get_birth_or_fallback from gramps.gen.lib import NoteType, Person, Surname -from gen.db import DbTxn +from gramps.gen.db import DbTxn from gui import widgets -from gen.display.name import displayer as name_displayer -from gen.errors import WindowActiveError -from gui.glade import Glade -from gui.widgets.menuitem import add_menuitem +from gramps.gen.display.name import displayer as name_displayer +from gramps.gen.errors import WindowActiveError +from gramps.gui.glade import Glade +from gramps.gui.widgets.menuitem import add_menuitem from editprimary import EditPrimary from editmediaref import EditMediaRef from editname import EditName -from gen.config import config -from gui.dialog import ErrorDialog, ICON -from gen.errors import ValidationError +from gramps.gen.config import config +from gramps.gui.dialog import ErrorDialog, ICON +from gramps.gen.errors import ValidationError from displaytabs import (PersonEventEmbedList, NameEmbedList, CitationEmbedList, AttrEmbedList, AddrEmbedList, NoteTab, GalleryTab, WebEmbedList, PersonRefEmbedList, LdsEmbedList, PersonBackRefList, SurnameTab) -from gen.plug import CATEGORY_QR_PERSON +from gramps.gen.plug import CATEGORY_QR_PERSON #------------------------------------------------------------------------- # @@ -928,7 +928,7 @@ class EditPerson(EditPrimary): obj = self.dbstate.db.get_object_from_handle(handle) if obj is None : #notify user of error - from gui.dialog import RunDatabaseRepair + from gramps.gui.dialog import RunDatabaseRepair RunDatabaseRepair( _('Non existing media found in the Gallery')) else : diff --git a/gramps/gui/editors/editpersonref.py b/gramps/gui/editors/editpersonref.py index 5478ad6f3..5ecfce764 100644 --- a/gramps/gui/editors/editpersonref.py +++ b/gramps/gui/editors/editpersonref.py @@ -32,7 +32,7 @@ mechanism for the user to edit address information. # Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ #------------------------------------------------------------------------- # @@ -46,13 +46,13 @@ from gi.repository import Gtk # gramps modules # #------------------------------------------------------------------------- -from gen.display.name import displayer as name_displayer +from gramps.gen.display.name import displayer as name_displayer from editsecondary import EditSecondary -from gen.lib import NoteType -from gui.widgets import MonitoredEntry, PrivacyButton -from gui.selectors import SelectorFactory +from gramps.gen.lib import NoteType +from gramps.gui.widgets import MonitoredEntry, PrivacyButton +from gramps.gui.selectors import SelectorFactory from displaytabs import CitationEmbedList, NoteTab -from gui.glade import Glade +from gramps.gui.glade import Glade #------------------------------------------------------------------------- # @@ -173,7 +173,7 @@ class EditPersonRef(EditSecondary): self.callback = None self.close() else: - from gui.dialog import ErrorDialog + from gramps.gui.dialog import ErrorDialog ErrorDialog( _('No person selected'), diff --git a/gramps/gui/editors/editplace.py b/gramps/gui/editors/editplace.py index 35221ffcc..79be35df0 100644 --- a/gramps/gui/editors/editplace.py +++ b/gramps/gui/editors/editplace.py @@ -28,7 +28,7 @@ # python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ import logging log = logging.getLogger(".") @@ -45,15 +45,15 @@ from gi.repository import Gtk # #------------------------------------------------------------------------- from gramps.gen.lib import NoteType, Place -from gen.db import DbTxn +from gramps.gen.db import DbTxn from editprimary import EditPrimary from displaytabs import (GrampsTab, LocationEmbedList, CitationEmbedList, GalleryTab, NoteTab, WebEmbedList, PlaceBackRefList) -from gui.widgets import MonitoredEntry, PrivacyButton -from gen.errors import ValidationError -from gen.utils.place import conv_lat_lon -from gui.dialog import ErrorDialog -from gui.glade import Glade +from gramps.gui.widgets import MonitoredEntry, PrivacyButton +from gramps.gen.errors import ValidationError +from gramps.gen.utils.place import conv_lat_lon +from gramps.gui.dialog import ErrorDialog +from gramps.gui.glade import Glade #------------------------------------------------------------------------- # diff --git a/gramps/gui/editors/editprimary.py b/gramps/gui/editors/editprimary.py index fb903fa01..7aceae420 100644 --- a/gramps/gui/editors/editprimary.py +++ b/gramps/gui/editors/editprimary.py @@ -26,7 +26,7 @@ # Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ #------------------------------------------------------------------------- # @@ -40,15 +40,15 @@ from gi.repository import Gtk # GRAMPS modules # #------------------------------------------------------------------------- -from gui.managedwindow import ManagedWindow +from gramps.gui.managedwindow import ManagedWindow from gramps.gen.datehandler import displayer, parser -from gen.display.name import displayer as name_displayer -from gen.config import config +from gramps.gen.display.name import displayer as name_displayer +from gramps.gen.config import config from gramps.gui.utils import is_right_click -from gui.display import display_help -from gui.dialog import SaveDialog +from gramps.gui.display import display_help +from gramps.gui.dialog import SaveDialog from gramps.gen.lib import PrimaryObject -from gui.dbguielement import DbGUIElement +from gramps.gui.dbguielement import DbGUIElement class EditPrimary(ManagedWindow, DbGUIElement): @@ -303,7 +303,7 @@ class EditPrimary(ManagedWindow, DbGUIElement): """ Create actions and ui of context menu """ - from gui.plug.quick import create_quickreport_menu + from gramps.gui.plug.quick import create_quickreport_menu self.popupmanager = Gtk.UIManager() #add custom actions diff --git a/gramps/gui/editors/editreference.py b/gramps/gui/editors/editreference.py index c5ff55249..aa7bd67fa 100644 --- a/gramps/gui/editors/editreference.py +++ b/gramps/gui/editors/editreference.py @@ -33,10 +33,10 @@ from gi.repository import Gtk # gramps modules # #------------------------------------------------------------------------- -from gui.managedwindow import ManagedWindow +from gramps.gui.managedwindow import ManagedWindow from displaytabs import GrampsTab -from gen.config import config -from gui.dbguielement import DbGUIElement +from gramps.gen.config import config +from gramps.gui.dbguielement import DbGUIElement #------------------------------------------------------------------------- # @@ -198,7 +198,7 @@ class EditReference(ManagedWindow, DbGUIElement): self.close() def define_help_button(self, button, webpage='', section=''): - from gui.display import display_help + from gramps.gui.display import display_help button.connect('clicked', lambda x: display_help(webpage, section)) button.set_sensitive(True) diff --git a/gramps/gui/editors/editreporef.py b/gramps/gui/editors/editreporef.py index f3624e0e5..e260280df 100644 --- a/gramps/gui/editors/editreporef.py +++ b/gramps/gui/editors/editreporef.py @@ -26,20 +26,20 @@ # Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ #------------------------------------------------------------------------- # # gramps modules # #------------------------------------------------------------------------- -from gen.lib import NoteType -from gen.db import DbTxn +from gramps.gen.lib import NoteType +from gramps.gen.db import DbTxn from displaytabs import NoteTab,AddrEmbedList,WebEmbedList,SourceBackRefList -from gui.widgets import MonitoredEntry, PrivacyButton, MonitoredDataType +from gramps.gui.widgets import MonitoredEntry, PrivacyButton, MonitoredDataType from editreference import RefTab, EditReference -from gui.glade import Glade +from gramps.gui.glade import Glade #------------------------------------------------------------------------- # diff --git a/gramps/gui/editors/editrepository.py b/gramps/gui/editors/editrepository.py index 40d98c021..52006d501 100644 --- a/gramps/gui/editors/editrepository.py +++ b/gramps/gui/editors/editrepository.py @@ -26,7 +26,7 @@ # Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ #------------------------------------------------------------------------- # @@ -41,13 +41,13 @@ from gi.repository import Gtk # #------------------------------------------------------------------------- from gramps.gen.lib import NoteType, Repository -from gen.db import DbTxn +from gramps.gen.db import DbTxn -from gui.widgets import MonitoredEntry, MonitoredDataType, PrivacyButton +from gramps.gui.widgets import MonitoredEntry, MonitoredDataType, PrivacyButton from displaytabs import AddrEmbedList, WebEmbedList, NoteTab, SourceBackRefList from editprimary import EditPrimary -from gui.dialog import ErrorDialog -from gui.glade import Glade +from gramps.gui.dialog import ErrorDialog +from gramps.gui.glade import Glade class EditRepository(EditPrimary): diff --git a/gramps/gui/editors/editsecondary.py b/gramps/gui/editors/editsecondary.py index e7310df07..8179a4fb1 100644 --- a/gramps/gui/editors/editsecondary.py +++ b/gramps/gui/editors/editsecondary.py @@ -21,10 +21,10 @@ # $Id$ -from gui.managedwindow import ManagedWindow -from gui.display import display_help -from gen.config import config -from gui.dbguielement import DbGUIElement +from gramps.gui.managedwindow import ManagedWindow +from gramps.gui.display import display_help +from gramps.gen.config import config +from gramps.gui.dbguielement import DbGUIElement class EditSecondary(ManagedWindow, DbGUIElement): diff --git a/gramps/gui/editors/editsource.py b/gramps/gui/editors/editsource.py index ab9aa22c6..8927ce44e 100644 --- a/gramps/gui/editors/editsource.py +++ b/gramps/gui/editors/editsource.py @@ -27,7 +27,7 @@ # Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ import logging log = logging.getLogger(".") LOG = logging.getLogger(".citation") @@ -45,14 +45,14 @@ from gi.repository import Gtk # #------------------------------------------------------------------------- from gramps.gen.lib import NoteType, Source -from gen.db import DbTxn +from gramps.gen.db import DbTxn from editprimary import EditPrimary from displaytabs import (NoteTab, GalleryTab, DataEmbedList, CitationBackRefList, RepoEmbedList) -from gui.widgets import MonitoredEntry, PrivacyButton -from gui.dialog import ErrorDialog -from gui.glade import Glade +from gramps.gui.widgets import MonitoredEntry, PrivacyButton +from gramps.gui.dialog import ErrorDialog +from gramps.gui.glade import Glade #------------------------------------------------------------------------- # diff --git a/gramps/gui/editors/edittaglist.py b/gramps/gui/editors/edittaglist.py index 9cab54248..48ffd8cef 100644 --- a/gramps/gui/editors/edittaglist.py +++ b/gramps/gui/editors/edittaglist.py @@ -33,11 +33,11 @@ from gi.repository import Gtk # Gramps modules # #------------------------------------------------------------------------- -from gen.ggettext import sgettext as _ -from gui.managedwindow import ManagedWindow -from gen.const import URL_MANUAL_PAGE -from gui.display import display_help -from gui.listmodel import ListModel, TOGGLE +from gramps.gen.ggettext import sgettext as _ +from gramps.gui.managedwindow import ManagedWindow +from gramps.gen.const import URL_MANUAL_PAGE +from gramps.gui.display import display_help +from gramps.gui.listmodel import ListModel, TOGGLE #------------------------------------------------------------------------- # diff --git a/gramps/gui/editors/editurl.py b/gramps/gui/editors/editurl.py index 7bb83eb8c..2aea6b7d3 100644 --- a/gramps/gui/editors/editurl.py +++ b/gramps/gui/editors/editurl.py @@ -26,7 +26,7 @@ # python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ #------------------------------------------------------------------------- # @@ -34,8 +34,8 @@ from gen.ggettext import gettext as _ # #------------------------------------------------------------------------- from editsecondary import EditSecondary -from gui.widgets import MonitoredEntry, PrivacyButton, MonitoredDataType -from gui.glade import Glade +from gramps.gui.widgets import MonitoredEntry, PrivacyButton, MonitoredDataType +from gramps.gui.glade import Glade #------------------------------------------------------------------------- # @@ -68,7 +68,7 @@ class EditUrl(EditSecondary): def jump_to(self, obj): if self.obj.get_path(): - from gui.display import display_url + from gramps.gui.display import display_url display_url(self.obj.get_path()) def _setup_fields(self): diff --git a/gramps/gui/editors/filtereditor.py b/gramps/gui/editors/filtereditor.py index 0544323d1..31370d0e5 100644 --- a/gramps/gui/editors/filtereditor.py +++ b/gramps/gui/editors/filtereditor.py @@ -54,23 +54,23 @@ from gi.repository import GObject # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters import (GenericFilterFactory, FilterList, +from gramps.gen.filters import (GenericFilterFactory, FilterList, reload_custom_filters) -from gen.filters.rules._matchesfilterbase import MatchesFilterBase -from gui.listmodel import ListModel -from gui.managedwindow import ManagedWindow -from gui.dialog import QuestionDialog -from gen.const import RULE_GLADE, URL_MANUAL_PAGE -from gui.display import display_help -from gen.errors import WindowActiveError -from gen.ggettext import sgettext as _ +from gramps.gen.filters.rules._matchesfilterbase import MatchesFilterBase +from gramps.gui.listmodel import ListModel +from gramps.gui.managedwindow import ManagedWindow +from gramps.gui.dialog import QuestionDialog +from gramps.gen.const import RULE_GLADE, URL_MANUAL_PAGE +from gramps.gui.display import display_help +from gramps.gen.errors import WindowActiveError +from gramps.gen.ggettext import sgettext as _ from gramps.gen.lib import AttributeType, EventType, FamilyRelType, NameOriginType, NameType, NoteType -from gen.filters import rules -from gui.autocomp import StandardCustomSelector, fill_entry -from gui.selectors import SelectorFactory -from gen.display.name import displayer as _nd -from gen.utils.db import family_name -from gen.utils.string import confidence +from gramps.gen.filters import rules +from gramps.gui.autocomp import StandardCustomSelector, fill_entry +from gramps.gui.selectors import SelectorFactory +from gramps.gen.display.name import displayer as _nd +from gramps.gen.utils.db import family_name +from gramps.gen.utils.string import confidence #------------------------------------------------------------------------- # diff --git a/gramps/gui/editors/objectentries.py b/gramps/gui/editors/objectentries.py index eb73270f4..d289e2549 100644 --- a/gramps/gui/editors/objectentries.py +++ b/gramps/gui/editors/objectentries.py @@ -25,7 +25,7 @@ # Standard python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ import cPickle as pickle import logging @@ -45,13 +45,13 @@ from gi.repository import Pango # Gramps modules # #------------------------------------------------------------------------- -from gen.lib import (Place, MediaObject, Note) +from gramps.gen.lib import (Place, MediaObject, Note) from editplace import EditPlace from editmedia import EditMedia from editnote import EditNote -from gui.selectors import SelectorFactory -from gui.ddtargets import DdTargets -from gen.errors import WindowActiveError +from gramps.gui.selectors import SelectorFactory +from gramps.gui.ddtargets import DdTargets +from gramps.gen.errors import WindowActiveError #------------------------------------------------------------------------- # diff --git a/gramps/gui/filters/_filtercombobox.py b/gramps/gui/filters/_filtercombobox.py index ef3e5134b..6aea43866 100644 --- a/gramps/gui/filters/_filtercombobox.py +++ b/gramps/gui/filters/_filtercombobox.py @@ -37,7 +37,7 @@ from gi.repository import GObject # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters import CustomFilters +from gramps.gen.filters import CustomFilters #------------------------------------------------------------------------- # diff --git a/gramps/gui/filters/_filtermenu.py b/gramps/gui/filters/_filtermenu.py index 3917253ba..77698cc45 100644 --- a/gramps/gui/filters/_filtermenu.py +++ b/gramps/gui/filters/_filtermenu.py @@ -34,7 +34,7 @@ from gi.repository import GObject # #------------------------------------------------------------------------- def build_filter_model(space, local = []): - from gen.filters import CustomFilters + from gramps.gen.filters import CustomFilters model = Gtk.ListStore(GObject.TYPE_STRING, object) diff --git a/gramps/gui/filters/_filterstore.py b/gramps/gui/filters/_filterstore.py index a903aaf69..ea7e0c193 100644 --- a/gramps/gui/filters/_filterstore.py +++ b/gramps/gui/filters/_filterstore.py @@ -30,14 +30,14 @@ Package providing filtering framework for GRAMPS. # #------------------------------------------------------------------------- from gi.repository import Gtk -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters import CustomFilters +from gramps.gen.filters import CustomFilters #------------------------------------------------------------------------- # diff --git a/gramps/gui/filters/_searchbar.py b/gramps/gui/filters/_searchbar.py index d61e767d2..d40471e2d 100644 --- a/gramps/gui/filters/_searchbar.py +++ b/gramps/gui/filters/_searchbar.py @@ -32,7 +32,7 @@ Package providing filtering framework for GRAMPS. #------------------------------------------------------------------------- from gi.repository import Gdk from gi.repository import Gtk -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ _RETURN = Gdk.keyval_from_name("Return") _KP_ENTER = Gdk.keyval_from_name("KP_Enter") diff --git a/gramps/gui/filters/sidebar/_citationsidebarfilter.py b/gramps/gui/filters/sidebar/_citationsidebarfilter.py index 20caa5ffa..0080242b1 100644 --- a/gramps/gui/filters/sidebar/_citationsidebarfilter.py +++ b/gramps/gui/filters/sidebar/_citationsidebarfilter.py @@ -26,7 +26,7 @@ # Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ #------------------------------------------------------------------------- # @@ -40,15 +40,15 @@ from gi.repository import Gtk # GRAMPS modules # #------------------------------------------------------------------------- -from gui.widgets import MonitoredMenu +from gramps.gui.widgets import MonitoredMenu from gramps.gen.lib import Citation -from gui.filters import build_filter_model -from gui.filters.sidebar import SidebarFilter -from gen.filters import GenericFilterFactory, rules -from gen.filters.rules.citation import (RegExpIdOf, HasIdOf, HasCitation, +from gramps.gui.filters import build_filter_model +from gramps.gui.filters.sidebar import SidebarFilter +from gramps.gen.filters import GenericFilterFactory, rules +from gramps.gen.filters.rules.citation import (RegExpIdOf, HasIdOf, HasCitation, HasNoteMatchingSubstringOf, HasNoteRegexp, MatchesFilter) -from gen.utils.string import confidence +from gramps.gen.utils.string import confidence GenericCitationFilter = GenericFilterFactory('Citation') #------------------------------------------------------------------------- # diff --git a/gramps/gui/filters/sidebar/_eventsidebarfilter.py b/gramps/gui/filters/sidebar/_eventsidebarfilter.py index 88108b292..8c58b9df3 100644 --- a/gramps/gui/filters/sidebar/_eventsidebarfilter.py +++ b/gramps/gui/filters/sidebar/_eventsidebarfilter.py @@ -25,7 +25,7 @@ # Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ #------------------------------------------------------------------------- # @@ -41,10 +41,10 @@ from gi.repository import Gtk #------------------------------------------------------------------------- from gui import widgets from gramps.gen.lib import Event, EventType -from gui.filters import build_filter_model -from gui.filters.sidebar import SidebarFilter -from gen.filters import GenericFilterFactory, rules -from gen.filters.rules.event import (RegExpIdOf, HasIdOf, HasNoteRegexp, +from gramps.gui.filters import build_filter_model +from gramps.gui.filters.sidebar import SidebarFilter +from gramps.gen.filters import GenericFilterFactory, rules +from gramps.gen.filters.rules.event import (RegExpIdOf, HasIdOf, HasNoteRegexp, HasNoteMatchingSubstringOf, MatchesFilter, HasEvent) diff --git a/gramps/gui/filters/sidebar/_familysidebarfilter.py b/gramps/gui/filters/sidebar/_familysidebarfilter.py index fcf4ec02f..40e8e8553 100644 --- a/gramps/gui/filters/sidebar/_familysidebarfilter.py +++ b/gramps/gui/filters/sidebar/_familysidebarfilter.py @@ -26,7 +26,7 @@ # Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ #------------------------------------------------------------------------- # @@ -42,10 +42,10 @@ from gi.repository import Gtk #------------------------------------------------------------------------- from gui import widgets from gramps.gen.lib import Event, EventType, Family, FamilyRelType -from gui.filters import build_filter_model -from gui.filters.sidebar import SidebarFilter -from gen.filters import GenericFilterFactory, rules -from gen.filters.rules.family import (RegExpIdOf, HasIdOf, RegExpFatherName, +from gramps.gui.filters import build_filter_model +from gramps.gui.filters.sidebar import SidebarFilter +from gramps.gen.filters import GenericFilterFactory, rules +from gramps.gen.filters.rules.family import (RegExpIdOf, HasIdOf, RegExpFatherName, SearchFatherName, RegExpMotherName, SearchMotherName, RegExpChildName, SearchChildName, HasEvent, HasRelType, diff --git a/gramps/gui/filters/sidebar/_mediasidebarfilter.py b/gramps/gui/filters/sidebar/_mediasidebarfilter.py index aa978fe48..331802348 100644 --- a/gramps/gui/filters/sidebar/_mediasidebarfilter.py +++ b/gramps/gui/filters/sidebar/_mediasidebarfilter.py @@ -26,7 +26,7 @@ # Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ #------------------------------------------------------------------------- # @@ -41,10 +41,10 @@ from gi.repository import Gtk # #------------------------------------------------------------------------- from gui import widgets -from gui.filters import build_filter_model -from gui.filters.sidebar import SidebarFilter -from gen.filters import GenericFilterFactory, rules -from gen.filters.rules.media import (RegExpIdOf, HasIdOf, HasMedia, HasTag, +from gramps.gui.filters import build_filter_model +from gramps.gui.filters.sidebar import SidebarFilter +from gramps.gen.filters import GenericFilterFactory, rules +from gramps.gen.filters.rules.media import (RegExpIdOf, HasIdOf, HasMedia, HasTag, HasNoteRegexp, MatchesFilter, HasNoteMatchingSubstringOf) diff --git a/gramps/gui/filters/sidebar/_notesidebarfilter.py b/gramps/gui/filters/sidebar/_notesidebarfilter.py index c0f8d7586..68276dff0 100644 --- a/gramps/gui/filters/sidebar/_notesidebarfilter.py +++ b/gramps/gui/filters/sidebar/_notesidebarfilter.py @@ -26,7 +26,7 @@ # Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ #------------------------------------------------------------------------- # @@ -41,11 +41,11 @@ from gi.repository import Gtk # #------------------------------------------------------------------------- from gui import widgets -from gen.lib import Note, NoteType -from gui.filters import build_filter_model -from gui.filters.sidebar import SidebarFilter -from gen.filters import GenericFilterFactory, rules -from gen.filters.rules.note import (RegExpIdOf, HasIdOf, HasNote, +from gramps.gen.lib import Note, NoteType +from gramps.gui.filters import build_filter_model +from gramps.gui.filters.sidebar import SidebarFilter +from gramps.gen.filters import GenericFilterFactory, rules +from gramps.gen.filters.rules.note import (RegExpIdOf, HasIdOf, HasNote, MatchesFilter, HasTag) GenericNoteFilter = GenericFilterFactory('Note') diff --git a/gramps/gui/filters/sidebar/_personsidebarfilter.py b/gramps/gui/filters/sidebar/_personsidebarfilter.py index da803ed6e..f62c6d8d8 100644 --- a/gramps/gui/filters/sidebar/_personsidebarfilter.py +++ b/gramps/gui/filters/sidebar/_personsidebarfilter.py @@ -26,7 +26,7 @@ # Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ import locale #------------------------------------------------------------------------- @@ -44,10 +44,10 @@ from gi.repository import Gtk from gui import widgets from gramps.gen.lib import Date, Event, EventType from gramps.gen.datehandler import displayer -from gui.filters import build_filter_model -from gui.filters.sidebar import SidebarFilter -from gen.filters import GenericFilter, rules -from gen.filters.rules.person import (RegExpName, SearchName, RegExpIdOf, +from gramps.gui.filters import build_filter_model +from gramps.gui.filters.sidebar import SidebarFilter +from gramps.gen.filters import GenericFilter, rules +from gramps.gen.filters.rules.person import (RegExpName, SearchName, RegExpIdOf, MatchIdOf, IsMale, IsFemale, HasUnknownGender, HasEvent, HasTag, HasBirth, HasDeath, HasNoteRegexp, diff --git a/gramps/gui/filters/sidebar/_placesidebarfilter.py b/gramps/gui/filters/sidebar/_placesidebarfilter.py index 1cb7aaf40..b801af306 100644 --- a/gramps/gui/filters/sidebar/_placesidebarfilter.py +++ b/gramps/gui/filters/sidebar/_placesidebarfilter.py @@ -27,7 +27,7 @@ # Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ #------------------------------------------------------------------------- # @@ -42,10 +42,10 @@ from gi.repository import Gtk # #------------------------------------------------------------------------- from gui import widgets -from gui.filters import build_filter_model -from gui.filters.sidebar import SidebarFilter -from gen.filters import GenericFilterFactory, rules -from gen.filters.rules.place import (RegExpIdOf, HasIdOf, HasPlace, +from gramps.gui.filters import build_filter_model +from gramps.gui.filters.sidebar import SidebarFilter +from gramps.gen.filters import GenericFilterFactory, rules +from gramps.gen.filters.rules.place import (RegExpIdOf, HasIdOf, HasPlace, HasNoteRegexp, HasNoteMatchingSubstringOf, MatchesFilter) diff --git a/gramps/gui/filters/sidebar/_reposidebarfilter.py b/gramps/gui/filters/sidebar/_reposidebarfilter.py index 7c6627891..fb69a0c66 100644 --- a/gramps/gui/filters/sidebar/_reposidebarfilter.py +++ b/gramps/gui/filters/sidebar/_reposidebarfilter.py @@ -25,7 +25,7 @@ # Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ #------------------------------------------------------------------------- # @@ -40,11 +40,11 @@ from gi.repository import Gtk # #------------------------------------------------------------------------- from gui import widgets -from gen.lib import Repository, RepositoryType -from gui.filters import build_filter_model -from gui.filters.sidebar import SidebarFilter -from gen.filters import GenericFilterFactory, rules -from gen.filters.rules.repository import (RegExpIdOf, HasIdOf, HasRepo, +from gramps.gen.lib import Repository, RepositoryType +from gramps.gui.filters import build_filter_model +from gramps.gui.filters.sidebar import SidebarFilter +from gramps.gen.filters import GenericFilterFactory, rules +from gramps.gen.filters.rules.repository import (RegExpIdOf, HasIdOf, HasRepo, HasNoteRegexp, MatchesFilter, HasNoteMatchingSubstringOf) diff --git a/gramps/gui/filters/sidebar/_sidebarfilter.py b/gramps/gui/filters/sidebar/_sidebarfilter.py index 5a57b3eab..35f3ebcc3 100644 --- a/gramps/gui/filters/sidebar/_sidebarfilter.py +++ b/gramps/gui/filters/sidebar/_sidebarfilter.py @@ -21,15 +21,15 @@ # $Id$ -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ from bisect import insort_left from gi.repository import Gdk from gi.repository import Gtk from gi.repository import Pango from gui import widgets -from gui.dbguielement import DbGUIElement -from gen.config import config +from gramps.gui.dbguielement import DbGUIElement +from gramps.gen.config import config _RETURN = Gdk.keyval_from_name("Return") _KP_ENTER = Gdk.keyval_from_name("KP_Enter") @@ -228,9 +228,9 @@ class SidebarFilter(DbGUIElement): Callback which invokes the EditFilter dialog. Will create new filter if called if none is selected. """ - from gui.editors import EditFilter - from gen.filters import FilterList, GenericFilterFactory - from gen.const import CUSTOM_FILTERS + from gramps.gui.editors import EditFilter + from gramps.gen.filters import FilterList, GenericFilterFactory + from gramps.gen.const import CUSTOM_FILTERS the_filter = None filterdb = FilterList(CUSTOM_FILTERS) filterdb.load() @@ -255,7 +255,7 @@ class SidebarFilter(DbGUIElement): If a filter changed, save them all. Reloads, and sets name. Takes the filter database, and the filter name edited. """ - from gen.filters import reload_custom_filters + from gramps.gen.filters import reload_custom_filters filterdb.save() reload_custom_filters() self.on_filters_changed(self.namespace) diff --git a/gramps/gui/filters/sidebar/_sourcesidebarfilter.py b/gramps/gui/filters/sidebar/_sourcesidebarfilter.py index 91383da1b..b8629d699 100644 --- a/gramps/gui/filters/sidebar/_sourcesidebarfilter.py +++ b/gramps/gui/filters/sidebar/_sourcesidebarfilter.py @@ -25,7 +25,7 @@ # Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ #------------------------------------------------------------------------- # @@ -40,10 +40,10 @@ from gi.repository import Gtk # #------------------------------------------------------------------------- from gui import widgets -from gui.filters import build_filter_model -from gui.filters.sidebar import SidebarFilter -from gen.filters import GenericFilterFactory, rules -from gen.filters.rules.source import (RegExpIdOf, HasIdOf, HasSource, +from gramps.gui.filters import build_filter_model +from gramps.gui.filters.sidebar import SidebarFilter +from gramps.gen.filters import GenericFilterFactory, rules +from gramps.gen.filters.rules.source import (RegExpIdOf, HasIdOf, HasSource, HasNoteMatchingSubstringOf, HasNoteRegexp, MatchesFilter) diff --git a/gramps/gui/glade.py b/gramps/gui/glade.py index a817125df..63f628275 100644 --- a/gramps/gui/glade.py +++ b/gramps/gui/glade.py @@ -48,8 +48,8 @@ from gi.repository import Gtk # gramps modules # #------------------------------------------------------------------------ -from gen.const import GLADE_DIR -from gen.utils.trans import LOCALEDOMAIN +from gramps.gen.const import GLADE_DIR +from gramps.gen.utils.trans import LOCALEDOMAIN #------------------------------------------------------------------------ # diff --git a/gramps/gui/grampsbar.py b/gramps/gui/grampsbar.py index 966941435..f8b07b9c1 100644 --- a/gramps/gui/grampsbar.py +++ b/gramps/gui/grampsbar.py @@ -29,7 +29,7 @@ Module that implements the sidebar and bottombar fuctionality. # Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ import time import os import ConfigParser @@ -47,19 +47,19 @@ from gi.repository import Gtk # Gramps modules # #------------------------------------------------------------------------- -from gen.const import URL_MANUAL_PAGE, VERSION_DIR -from gui.managedwindow import ManagedWindow -from gui.display import display_help, display_url -from gui.widgets.grampletpane import (AVAILABLE_GRAMPLETS, +from gramps.gen.const import URL_MANUAL_PAGE, VERSION_DIR +from gramps.gui.managedwindow import ManagedWindow +from gramps.gui.display import display_help, display_url +from gramps.gui.widgets.grampletpane import (AVAILABLE_GRAMPLETS, GET_AVAILABLE_GRAMPLETS, GET_GRAMPLET_LIST, get_gramplet_opts, get_gramplet_options_by_name, make_requested_gramplet, GuiGramplet) -from gui.widgets.undoablebuffer import UndoableBuffer +from gramps.gui.widgets.undoablebuffer import UndoableBuffer from gramps.gui.utils import is_right_click -from gui.dialog import QuestionDialog +from gramps.gui.dialog import QuestionDialog #------------------------------------------------------------------------- # diff --git a/gramps/gui/grampsgui.py b/gramps/gui/grampsgui.py index 994b863a3..98ca2387e 100644 --- a/gramps/gui/grampsgui.py +++ b/gramps/gui/grampsgui.py @@ -28,7 +28,7 @@ #------------------------------------------------------------------------- import sys import os -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ import logging LOG = logging.getLogger(".grampsgui") @@ -73,9 +73,9 @@ if not GObject.pygobject_version >= MIN_PYGOBJECT_VERSION : # GRAMPS Modules # #------------------------------------------------------------------------- -from gen.config import config -from gen.const import DATA_DIR, IMAGE_DIR -from gen.constfunc import has_display, win +from gramps.gen.config import config +from gramps.gen.const import DATA_DIR, IMAGE_DIR +from gramps.gen.constfunc import has_display, win #------------------------------------------------------------------------- # @@ -88,7 +88,7 @@ def register_stock_icons (): Add the gramps names for its icons (eg gramps-person) to the GTK icon factory. This allows all gramps modules to call up the icons by their name """ - from gui.pluginmanager import base_reg_stock_icons + from gramps.gui.pluginmanager import base_reg_stock_icons #iconpath to the base image. The front of the list has highest priority if win(): @@ -186,7 +186,7 @@ def _display_welcome_message(): Display a welcome message to the user. """ if not config.get('behavior.betawarn'): - from gui.dialog import WarningDialog + from gramps.gui.dialog import WarningDialog WarningDialog( _('Danger: This is unstable code!'), _("This Gramps 3.x-trunk is a development release. " @@ -222,11 +222,11 @@ class Gramps(object): """ def __init__(self, argparser): - from gen.dbstate import DbState + from gramps.gen.dbstate import DbState import viewmanager from viewmanager import ViewManager - from cli.arghandler import ArgHandler - from gui.tipofday import TipOfDay + from gramps.cli.arghandler import ArgHandler + from gramps.gui.tipofday import TipOfDay register_stock_icons() @@ -259,7 +259,7 @@ class Gramps(object): TipOfDay(self.vm.uistate) def argerrorfunc(self, string): - from gui.dialog import ErrorDialog + from gramps.gui.dialog import ErrorDialog """ Show basic errors in argument handling in GUI fashion""" ErrorDialog(_("Error parsing arguments"), string) @@ -274,7 +274,7 @@ def __startgramps(errors, argparser): Main startup function started via GObject.timeout_add First action inside the gtk loop """ - from gui.dialog import ErrorDialog + from gramps.gui.dialog import ErrorDialog #handle first existing errors in GUI fashion if errors: ErrorDialog(errors[0], errors[1]) @@ -287,7 +287,7 @@ def __startgramps(errors, argparser): sys.exit(1) # add gui logger - from gui.logger import RotateHandler, GtkHandler + from gramps.gui.logger import RotateHandler, GtkHandler form = logging.Formatter(fmt="%(relativeCreated)d: %(levelname)s: " "%(filename)s: line %(lineno)d: %(message)s") # Create the log handlers diff --git a/gramps/gui/listmodel.py b/gramps/gui/listmodel.py index f0fee70dc..41909724d 100644 --- a/gramps/gui/listmodel.py +++ b/gramps/gui/listmodel.py @@ -32,7 +32,7 @@ Provide the basic functionality for a list view from gi.repository import Gdk from gi.repository import Gtk from gi.repository import Pango -from gen.const import THUMBSCALE +from gramps.gen.const import THUMBSCALE #------------------------------------------------------------------------- # diff --git a/gramps/gui/logger/__init__.py b/gramps/gui/logger/__init__.py index 540e77d35..7a7be6b24 100644 --- a/gramps/gui/logger/__init__.py +++ b/gramps/gui/logger/__init__.py @@ -40,7 +40,7 @@ Usage: Simple example: - from gui.logger import GtkHandler, RotateHandler + from gramps.gui.logger import GtkHandler, RotateHandler rh = RotateHandler(capacity=20) rh.setLevel(logging.DEBUG) diff --git a/gramps/gui/logger/_errorreportassistant.py b/gramps/gui/logger/_errorreportassistant.py index 30ebedfc9..cfda877b5 100644 --- a/gramps/gui/logger/_errorreportassistant.py +++ b/gramps/gui/logger/_errorreportassistant.py @@ -26,7 +26,7 @@ # Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ from gi.repository import Gdk from gi.repository import Gtk from gi.repository import GdkPixbuf @@ -34,7 +34,7 @@ from gi.repository import GObject import cairo import sys, os -from gen.config import config +from gramps.gen.config import config if config.get('preferences.use-bsddb3'): import bsddb3 as bsddb else: @@ -45,8 +45,8 @@ else: # Gramps modules # #------------------------------------------------------------------------- -from gen.const import VERSION, ICON, SPLASH -from gui.display import display_help, display_url +from gramps.gen.const import VERSION, ICON, SPLASH +from gramps.gui.display import display_help, display_url #------------------------------------------------------------------------- # diff --git a/gramps/gui/logger/_errorview.py b/gramps/gui/logger/_errorview.py index 0c6554a1d..0e2dc61f3 100644 --- a/gramps/gui/logger/_errorview.py +++ b/gramps/gui/logger/_errorview.py @@ -32,10 +32,10 @@ from gi.repository import Gtk # gramps modules # #------------------------------------------------------------------------- -from gen.const import URL_MANUAL_PAGE -from gen.ggettext import sgettext as _ +from gramps.gen.const import URL_MANUAL_PAGE +from gramps.gen.ggettext import sgettext as _ from _errorreportassistant import ErrorReportAssistant -from gui.display import display_help +from gramps.gui.display import display_help #------------------------------------------------------------------------- # diff --git a/gramps/gui/makefilter.py b/gramps/gui/makefilter.py index 792e81adc..0ed179dc9 100644 --- a/gramps/gui/makefilter.py +++ b/gramps/gui/makefilter.py @@ -21,11 +21,11 @@ # $Id$ import time -from gui.editors import EditFilter -from gen.const import CUSTOM_FILTERS +from gramps.gui.editors import EditFilter +from gramps.gen.const import CUSTOM_FILTERS from gramps.gen.filters import (rules, FilterList, GenericFilterFactory, reload_custom_filters) -from gen.ggettext import sgettext as _ +from gramps.gen.ggettext import sgettext as _ def make_filter(dbstate, uistate, objclass, gramps_ids, title=None): """ diff --git a/gramps/gui/managedwindow.py b/gramps/gui/managedwindow.py index 9448715ff..6d88287d0 100644 --- a/gramps/gui/managedwindow.py +++ b/gramps/gui/managedwindow.py @@ -46,10 +46,10 @@ from gi.repository import Gtk # Gramps modules # #------------------------------------------------------------------------- -from gen.const import GLADE_FILE, ICON -from gen.errors import WindowActiveError -from gen.config import config -from gui.glade import Glade +from gramps.gen.const import GLADE_FILE, ICON +from gramps.gen.errors import WindowActiveError +from gramps.gen.config import config +from gramps.gui.glade import Glade #------------------------------------------------------------------------- # @@ -321,7 +321,7 @@ class ManagedWindow(object): The usage from derived classes is envisioned as follows: - from gui.managedwindow import ManagedWindow + from gramps.gui.managedwindow import ManagedWindow class SomeWindowClass(ManagedWindow): def __init__(self,uistate,dbstate,track): window_id = self # Or e.g. window_id = person.handle diff --git a/gramps/gui/merge/mergecitation.py b/gramps/gui/merge/mergecitation.py index 0bb17daf3..2506cfe4d 100644 --- a/gramps/gui/merge/mergecitation.py +++ b/gramps/gui/merge/mergecitation.py @@ -30,13 +30,13 @@ Provide merge capabilities for citations. # Gramps modules # #------------------------------------------------------------------------- -from gen.ggettext import sgettext as _ -from gen.const import URL_MANUAL_PAGE -from gui.display import display_help -from gui.managedwindow import ManagedWindow +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.gen.datehandler import get_date -from gen.utils.string import confidence -from gen.merge import MergeCitationQuery +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 27b454a1a..c4bafbf08 100644 --- a/gramps/gui/merge/mergeevent.py +++ b/gramps/gui/merge/mergeevent.py @@ -29,13 +29,13 @@ Provide merge capabilities for events. # Gramps modules # #------------------------------------------------------------------------- -from gen.ggettext import sgettext as _ -from gen.const import URL_MANUAL_PAGE -from gui.display import display_help -from gui.managedwindow import ManagedWindow +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.gen.datehandler import get_date -from gen.utils.db import get_participant_from_event -from gen.merge import MergeEventQuery +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 c8b9bda9c..4154d47a4 100644 --- a/gramps/gui/merge/mergefamily.py +++ b/gramps/gui/merge/mergefamily.py @@ -29,14 +29,14 @@ Provide merge capabilities for families. # Gramps modules # #------------------------------------------------------------------------- -from gen.ggettext import sgettext as _ -from gen.display.name import displayer as name_displayer -from gen.const import URL_MANUAL_PAGE -from gui.display import display_help -from gen.errors import MergeError -from gui.dialog import ErrorDialog -from gui.managedwindow import ManagedWindow -from gen.merge import MergePersonQuery, MergeFamilyQuery +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 gramps.gen.errors import MergeError +from gramps.gui.dialog import ErrorDialog +from gramps.gui.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 57a6461ee..09c981517 100644 --- a/gramps/gui/merge/mergemedia.py +++ b/gramps/gui/merge/mergemedia.py @@ -29,12 +29,12 @@ Provide merge capabilities for media objects. # Gramps modules # #------------------------------------------------------------------------- -from gen.ggettext import sgettext as _ -from gen.const import URL_MANUAL_PAGE -from gui.display import display_help -from gui.managedwindow import ManagedWindow +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.gen.datehandler import get_date -from gen.merge import MergeMediaQuery +from gramps.gen.merge import MergeMediaQuery #------------------------------------------------------------------------- # diff --git a/gramps/gui/merge/mergenote.py b/gramps/gui/merge/mergenote.py index e4c33209d..9c9ae9149 100644 --- a/gramps/gui/merge/mergenote.py +++ b/gramps/gui/merge/mergenote.py @@ -29,12 +29,12 @@ Provide merge capabilities for notes. # Gramps modules # #------------------------------------------------------------------------- -from gen.ggettext import sgettext as _ -from gen.const import URL_MANUAL_PAGE -from gui.display import display_help -from gui.managedwindow import ManagedWindow -from gui.widgets.styledtextbuffer import StyledTextBuffer -from gen.merge import MergeNoteQuery +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 gramps.gen.merge import MergeNoteQuery #------------------------------------------------------------------------- # diff --git a/gramps/gui/merge/mergeperson.py b/gramps/gui/merge/mergeperson.py index 54d52c327..7bc2a304a 100644 --- a/gramps/gui/merge/mergeperson.py +++ b/gramps/gui/merge/mergeperson.py @@ -38,16 +38,16 @@ from gi.repository import Pango # Gramps modules # #------------------------------------------------------------------------- -from gen.ggettext import sgettext as _ -from gen.plug.report import utils as ReportUtils -from gen.display.name import displayer as name_displayer -from gen.const import URL_MANUAL_PAGE -from gui.display import display_help +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 gramps.gen.datehandler import get_date -from gen.errors import MergeError -from gui.dialog import ErrorDialog -from gui.managedwindow import ManagedWindow -from gen.merge import MergePersonQuery +from gramps.gen.errors import MergeError +from gramps.gui.dialog import ErrorDialog +from gramps.gui.managedwindow import ManagedWindow +from gramps.gen.merge import MergePersonQuery #------------------------------------------------------------------------- # diff --git a/gramps/gui/merge/mergeplace.py b/gramps/gui/merge/mergeplace.py index b1cc3aa6e..77561ef5b 100644 --- a/gramps/gui/merge/mergeplace.py +++ b/gramps/gui/merge/mergeplace.py @@ -37,11 +37,11 @@ from gi.repository import Gtk # Gramps modules # #------------------------------------------------------------------------- -from gen.ggettext import sgettext as _ -from gen.const import URL_MANUAL_PAGE -from gui.display import display_help -from gui.managedwindow import ManagedWindow -from gen.merge import MergePlaceQuery +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.gen.merge import MergePlaceQuery #------------------------------------------------------------------------- # diff --git a/gramps/gui/merge/mergerepository.py b/gramps/gui/merge/mergerepository.py index 92310b2cb..c29ba9d45 100644 --- a/gramps/gui/merge/mergerepository.py +++ b/gramps/gui/merge/mergerepository.py @@ -29,11 +29,11 @@ Provide merge capabilities for repositories. # Gramps modules # #------------------------------------------------------------------------- -from gen.ggettext import sgettext as _ -from gen.const import URL_MANUAL_PAGE -from gui.display import display_help -from gui.managedwindow import ManagedWindow -from gen.merge import MergeRepositoryQuery +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.gen.merge import MergeRepositoryQuery #------------------------------------------------------------------------- # diff --git a/gramps/gui/merge/mergesource.py b/gramps/gui/merge/mergesource.py index 62b0d8d1d..f192a8519 100644 --- a/gramps/gui/merge/mergesource.py +++ b/gramps/gui/merge/mergesource.py @@ -31,11 +31,11 @@ Provide merge capabilities for sources. # Gramps modules # #------------------------------------------------------------------------- -from gen.ggettext import sgettext as _ -from gen.const import URL_MANUAL_PAGE -from gui.display import display_help -from gui.managedwindow import ManagedWindow -from gen.merge import MergeSourceQuery +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.gen.merge import MergeSourceQuery #------------------------------------------------------------------------- # diff --git a/gramps/gui/navigator.py b/gramps/gui/navigator.py index 52d5b1e26..96793b757 100644 --- a/gramps/gui/navigator.py +++ b/gramps/gui/navigator.py @@ -35,7 +35,7 @@ from gi.repository import Gtk # Gramps modules # #------------------------------------------------------------------------- -from gen.plug import (START, END) +from gramps.gen.plug import (START, END) #------------------------------------------------------------------------- # diff --git a/gramps/gui/plug/__init__.py b/gramps/gui/plug/__init__.py index 664b9e2d2..0c478888c 100644 --- a/gramps/gui/plug/__init__.py +++ b/gramps/gui/plug/__init__.py @@ -30,7 +30,7 @@ __date__ ="$Apr 20, 2010 3:13:24 PM$" import tool from _guioptions import make_gui_option, add_gui_options -from gen.plug import MenuOptions +from gramps.gen.plug import MenuOptions from _dialogs import ReportPluginDialog, ToolPluginDialog import _windows as PluginWindows diff --git a/gramps/gui/plug/_dialogs.py b/gramps/gui/plug/_dialogs.py index 1ae50b95e..1286afa2a 100644 --- a/gramps/gui/plug/_dialogs.py +++ b/gramps/gui/plug/_dialogs.py @@ -33,7 +33,7 @@ from gi.repository import Gtk # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ from collections import defaultdict #------------------------------------------------------------------------- @@ -41,13 +41,13 @@ from collections import defaultdict # GRAMPS modules # #------------------------------------------------------------------------- -from gen.const import PLUGINS_GLADE -from gen.plug.report._constants import standalone_categories -from gui.plug import tool -from gen.plug import REPORT -from gui.plug.report import report -from gui.pluginmanager import GuiPluginManager -from gui.managedwindow import ManagedWindow +from gramps.gen.const import PLUGINS_GLADE +from gramps.gen.plug.report._constants import standalone_categories +from gramps.gui.plug import tool +from gramps.gen.plug import REPORT +from gramps.gui.plug.report import report +from gramps.gui.pluginmanager import GuiPluginManager +from gramps.gui.managedwindow import ManagedWindow #------------------------------------------------------------------------- # diff --git a/gramps/gui/plug/_guioptions.py b/gramps/gui/plug/_guioptions.py index 90adf9bf2..3735f92cf 100644 --- a/gramps/gui/plug/_guioptions.py +++ b/gramps/gui/plug/_guioptions.py @@ -33,7 +33,7 @@ Specific option handling for a GUI. # python modules # #------------------------------------------------------------------------ -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ import os import sys @@ -51,15 +51,15 @@ from gi.repository import GObject # gramps modules # #------------------------------------------------------------------------- -from gen.utils.file import get_unicode_path_from_file_chooser -from gui.utils import ProgressMeter -from gui.pluginmanager import GuiPluginManager +from gramps.gen.utils.file import get_unicode_path_from_file_chooser +from gramps.gui.utils import ProgressMeter +from gramps.gui.pluginmanager import GuiPluginManager from gui import widgets -from gui.managedwindow import ManagedWindow -from gui.dialog import OptionDialog -from gui.selectors import SelectorFactory -from gen.display.name import displayer as _nd -from gen.filters import GenericFilterFactory, GenericFilter, rules +from gramps.gui.managedwindow import ManagedWindow +from gramps.gui.dialog import OptionDialog +from gramps.gui.selectors import SelectorFactory +from gramps.gen.display.name import displayer as _nd +from gramps.gen.filters import GenericFilterFactory, GenericFilter, rules import gen #------------------------------------------------------------------------ @@ -1760,8 +1760,8 @@ class GuiStyleOption(GuiEnumeratedListOption): """The user has clicked on the 'Edit Styles' button. Create a style sheet editor object and let them play. When they are done, update the displayed styles.""" - from gen.plug.docgen import StyleSheetList - from gui.plug.report._styleeditor import StyleListDisplay + from gramps.gen.plug.docgen import StyleSheetList + from gramps.gui.plug.report._styleeditor import StyleListDisplay style_list = StyleSheetList(self.__option.get_style_file(), self.__option.get_default_style()) StyleListDisplay(style_list, None, None) @@ -1866,7 +1866,7 @@ class GuiBooleanListOption(Gtk.HBox): # # #-----------------------------------------------------------------------------# -from gen.plug import menu as menu +from gramps.gen.plug import menu as menu _OPTIONS = ( (menu.BooleanListOption, True, GuiBooleanListOption), diff --git a/gramps/gui/plug/_windows.py b/gramps/gui/plug/_windows.py index 820a18ac3..b4543ee17 100644 --- a/gramps/gui/plug/_windows.py +++ b/gramps/gui/plug/_windows.py @@ -47,19 +47,19 @@ from gi.repository import GObject # GRAMPS modules # #------------------------------------------------------------------------- -from gui.managedwindow import ManagedWindow -from gen.errors import UnavailableError, WindowActiveError -from gen.plug import PluginRegister, PTYPE_STR, load_addon_file -from gen.ggettext import gettext as _ -from gui.utils import open_file_with_default_application -from gui.pluginmanager import GuiPluginManager +from gramps.gui.managedwindow import ManagedWindow +from gramps.gen.errors import UnavailableError, WindowActiveError +from gramps.gen.plug import PluginRegister, PTYPE_STR, load_addon_file +from gramps.gen.ggettext import gettext as _ +from gramps.gui.utils import open_file_with_default_application +from gramps.gui.pluginmanager import GuiPluginManager import tool from _guioptions import add_gui_options -from gui.dialog import InfoDialog -from gui.editors import EditPerson -from gen.utils.file import get_unicode_path_from_file_chooser -from gen.const import URL_WIKISTRING, USER_HOME, WIKI_EXTRAPLUGINS_RAWDATA -from gen.config import config +from gramps.gui.dialog import InfoDialog +from gramps.gui.editors import EditPerson +from gramps.gen.utils.file import get_unicode_path_from_file_chooser +from gramps.gen.const import URL_WIKISTRING, USER_HOME, WIKI_EXTRAPLUGINS_RAWDATA +from gramps.gen.config import config def display_message(message): """ @@ -291,7 +291,7 @@ class PluginStatus(ManagedWindow): Reloads the addons from the wiki into the list. """ import urllib - from gui.utils import ProgressMeter + from gramps.gui.utils import ProgressMeter URL = "%s%s" % (URL_WIKISTRING, WIKI_EXTRAPLUGINS_RAWDATA) try: fp = urllib.urlopen(URL) @@ -376,7 +376,7 @@ class PluginStatus(ManagedWindow): Get all addons from the wiki and install them. """ import urllib - from gui.utils import ProgressMeter + from gramps.gui.utils import ProgressMeter pm = ProgressMeter(_("Install all Addons"), _("Installing..."), message_area=True) pm.set_pass(total=len(self.addon_model)) for row in self.addon_model: @@ -393,7 +393,7 @@ class PluginStatus(ManagedWindow): """ Toplevel method to get an addon. """ - from gui.utils import ProgressMeter + from gramps.gui.utils import ProgressMeter pm = ProgressMeter(_("Installing Addon"), message_area=True) pm.set_pass(total=2, header=_("Reading gramps-project.org...")) pm.step() @@ -869,7 +869,7 @@ class ToolManagedWindowBase(ManagedWindow): buffer.set_text("") def pre_run(self): - from gui.utils import ProgressMeter + from gramps.gui.utils import ProgressMeter self.progress = ProgressMeter(self.get_title()) def run(self): diff --git a/gramps/gui/plug/export/_exportassistant.py b/gramps/gui/plug/export/_exportassistant.py index 91de127f7..376ead178 100644 --- a/gramps/gui/plug/export/_exportassistant.py +++ b/gramps/gui/plug/export/_exportassistant.py @@ -33,7 +33,7 @@ #------------------------------------------------------------------------- import os import sys -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ #------------------------------------------------------------------------- # @@ -58,14 +58,14 @@ from gi.repository import GdkPixbuf # #------------------------------------------------------------------------- -from gen.const import USER_HOME, ICON, SPLASH -from gen.config import config -from gui.pluginmanager import GuiPluginManager -from gen.utils.file import (find_folder, get_new_filename, +from gramps.gen.const import USER_HOME, ICON, SPLASH +from gramps.gen.config import config +from gramps.gui.pluginmanager import GuiPluginManager +from gramps.gen.utils.file import (find_folder, get_new_filename, get_unicode_path_from_file_chooser) -from gui.managedwindow import ManagedWindow -from gui.dialog import ErrorDialog -from gui.user import User +from gramps.gui.managedwindow import ManagedWindow +from gramps.gui.dialog import ErrorDialog +from gramps.gui.user import User #------------------------------------------------------------------------- # diff --git a/gramps/gui/plug/export/_exportoptions.py b/gramps/gui/plug/export/_exportoptions.py index 5521a615f..822f370ef 100644 --- a/gramps/gui/plug/export/_exportoptions.py +++ b/gramps/gui/plug/export/_exportoptions.py @@ -35,12 +35,12 @@ # GRAMPS modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ -from gen.ggettext import ngettext -from gen.config import config -from gen.display.name import displayer as name_displayer -from gen.filters import GenericFilter, rules -from gui.utils import ProgressMeter +from gramps.gen.ggettext import gettext as _ +from gramps.gen.ggettext import ngettext +from gramps.gen.config import config +from gramps.gen.display.name import displayer as name_displayer +from gramps.gen.filters import GenericFilter, rules +from gramps.gui.utils import ProgressMeter from gramps.gen.proxy import (PrivateProxyDb, LivingProxyDb, FilterProxyDb, @@ -220,8 +220,8 @@ class WriterOptionBox(object): return widget def show_preview_data(self, widget): - from gen.dbstate import DbState - from gui.plug.quick import run_quick_report_by_name + from gramps.gen.dbstate import DbState + from gramps.gui.plug.quick import run_quick_report_by_name if widget.proxy_name == "unfiltered": dbstate = self.dbstate else: @@ -622,9 +622,9 @@ class WriterOptionBox(object): Callback which invokes the EditFilter dialog. Will create new filter if called if none is selected. """ - from gui.editors import EditFilter - from gen.filters import FilterList, GenericFilterFactory - from gen.const import CUSTOM_FILTERS + from gramps.gui.editors import EditFilter + from gramps.gen.filters import FilterList, GenericFilterFactory + from gramps.gen.const import CUSTOM_FILTERS the_filter = None filterdb = FilterList(CUSTOM_FILTERS) filterdb.load() @@ -644,7 +644,7 @@ class WriterOptionBox(object): the_filter, filterdb, lambda : self.edit_filter_save(filterdb, namespace)) else: # can't edit this filter - from gui.dialog import ErrorDialog + from gramps.gui.dialog import ErrorDialog ErrorDialog(_("Cannot edit a system filter"), _("Please select a different filter to edit")) @@ -652,8 +652,8 @@ class WriterOptionBox(object): """ If a filter changed, save them all. Reloads, and also calls callback. """ - from gen.filters import CustomFilters - from gen.filters import reload_custom_filters + from gramps.gen.filters import CustomFilters + from gramps.gen.filters import reload_custom_filters filterdb.save() reload_custom_filters() if namespace == "Person": @@ -671,7 +671,7 @@ class WriterOptionBox(object): """ from gi.repository import Gtk from gi.repository import GObject - from gen.filters import CustomFilters + from gramps.gen.filters import CustomFilters if namespace == "person": # Populate the Person Filter entire_db = GenericFilter() diff --git a/gramps/gui/plug/quick/_quickreports.py b/gramps/gui/plug/quick/_quickreports.py index a958c2ff4..6bda392ad 100644 --- a/gramps/gui/plug/quick/_quickreports.py +++ b/gramps/gui/plug/quick/_quickreports.py @@ -31,7 +31,7 @@ This module provides the functions to build the quick report context menu's # python modules # #------------------------------------------------------------------------ -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ from cStringIO import StringIO #------------------------------------------------------------------------ @@ -54,14 +54,14 @@ from gi.repository import Gtk # GRAMPS modules # #------------------------------------------------------------------------- -from gui.pluginmanager import GuiPluginManager -from gen.plug import (CATEGORY_QR_PERSON, CATEGORY_QR_FAMILY, CATEGORY_QR_MEDIA, +from gramps.gui.pluginmanager import GuiPluginManager +from gramps.gen.plug import (CATEGORY_QR_PERSON, CATEGORY_QR_FAMILY, CATEGORY_QR_MEDIA, CATEGORY_QR_EVENT, CATEGORY_QR_SOURCE, CATEGORY_QR_MISC, CATEGORY_QR_PLACE, CATEGORY_QR_REPOSITORY, CATEGORY_QR_NOTE, CATEGORY_QR_CITATION, CATEGORY_QR_SOURCE_OR_CITATION) from _textbufdoc import TextBufDoc -from gen.simple import make_basic_stylesheet +from gramps.gen.simple import make_basic_stylesheet def flatten(L): """ diff --git a/gramps/gui/plug/quick/_quicktable.py b/gramps/gui/plug/quick/_quicktable.py index b55133730..92a05c061 100644 --- a/gramps/gui/plug/quick/_quicktable.py +++ b/gramps/gui/plug/quick/_quicktable.py @@ -46,14 +46,14 @@ from gi.repository import Gtk # Gramps modules # #------------------------------------------------------------------------- -from gen.ggettext import sgettext as _ -from gen.simple import SimpleTable -from gen.utils.trans import trans_objclass -from gen.errors import WindowActiveError -from gui.widgets.multitreeview import MultiTreeView -from gui.ddtargets import DdTargets -from gui.plug.quick import run_quick_report_by_name -from gui.editors import (EditPerson, EditEvent, EditFamily, EditCitation, +from gramps.gen.ggettext import sgettext as _ +from gramps.gen.simple import SimpleTable +from gramps.gen.utils.trans import trans_objclass +from gramps.gen.errors import WindowActiveError +from gramps.gui.widgets.multitreeview import MultiTreeView +from gramps.gui.ddtargets import DdTargets +from gramps.gui.plug.quick import run_quick_report_by_name +from gramps.gui.editors import (EditPerson, EditEvent, EditFamily, EditCitation, EditSource, EditPlace, EditRepository, EditNote, EditMedia) diff --git a/gramps/gui/plug/quick/_textbufdoc.py b/gramps/gui/plug/quick/_textbufdoc.py index d98841ea3..8ad0c99c8 100644 --- a/gramps/gui/plug/quick/_textbufdoc.py +++ b/gramps/gui/plug/quick/_textbufdoc.py @@ -26,7 +26,7 @@ # python modules # #------------------------------------------------------------------------ -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ from gi.repository import Gtk from gi.repository import Pango, PangoCairo @@ -35,10 +35,10 @@ from gi.repository import Pango, PangoCairo # Gramps modules # #------------------------------------------------------------------------ -from gen.plug.docgen import (BaseDoc, TextDoc, FONT_SERIF, PARA_ALIGN_RIGHT, +from gramps.gen.plug.docgen import (BaseDoc, TextDoc, FONT_SERIF, PARA_ALIGN_RIGHT, FONT_SANS_SERIF, FONT_MONOSPACE, PARA_ALIGN_CENTER, PARA_ALIGN_LEFT) -from gui.managedwindow import ManagedWindow +from gramps.gui.managedwindow import ManagedWindow RESOLUTION = PangoCairo.font_map_get_default().get_resolution() diff --git a/gramps/gui/plug/report/_docreportdialog.py b/gramps/gui/plug/report/_docreportdialog.py index 0d05fc046..f4868597e 100644 --- a/gramps/gui/plug/report/_docreportdialog.py +++ b/gramps/gui/plug/report/_docreportdialog.py @@ -28,7 +28,7 @@ # #------------------------------------------------------------------------- import os -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ #------------------------------------------------------------------------- # @@ -42,10 +42,10 @@ from gi.repository import Gtk # GRAMPS modules # #------------------------------------------------------------------------- -from gen.config import config +from gramps.gen.config import config from _reportdialog import ReportDialog from _papermenu import PaperFrame -from gui.pluginmanager import GuiPluginManager +from gramps.gui.pluginmanager import GuiPluginManager PLUGMAN = GuiPluginManager.get_instance() #------------------------------------------------------------------------- diff --git a/gramps/gui/plug/report/_drawreportdialog.py b/gramps/gui/plug/report/_drawreportdialog.py index 4dbcafdd8..f900d124e 100644 --- a/gramps/gui/plug/report/_drawreportdialog.py +++ b/gramps/gui/plug/report/_drawreportdialog.py @@ -34,9 +34,9 @@ from gi.repository import GObject # GRAMPS modules # #------------------------------------------------------------------------- -from gen.plug.report._constants import CATEGORY_DRAW +from gramps.gen.plug.report._constants import CATEGORY_DRAW from _docreportdialog import DocReportDialog -from gui.pluginmanager import GuiPluginManager +from gramps.gui.pluginmanager import GuiPluginManager #------------------------------------------------------------------------- # diff --git a/gramps/gui/plug/report/_fileentry.py b/gramps/gui/plug/report/_fileentry.py index cc3cc7ac5..9c85d1080 100644 --- a/gramps/gui/plug/report/_fileentry.py +++ b/gramps/gui/plug/report/_fileentry.py @@ -25,7 +25,7 @@ import os from gi.repository import Gtk from gi.repository import GObject -from gen.utils.file import get_unicode_path_from_file_chooser +from gramps.gen.utils.file import get_unicode_path_from_file_chooser class FileEntry(Gtk.HBox): """ A widget that allows the user to select a file from the file system """ diff --git a/gramps/gui/plug/report/_graphvizreportdialog.py b/gramps/gui/plug/report/_graphvizreportdialog.py index c7a88a5ba..c6d20b288 100644 --- a/gramps/gui/plug/report/_graphvizreportdialog.py +++ b/gramps/gui/plug/report/_graphvizreportdialog.py @@ -31,7 +31,7 @@ #------------------------------------------------------------------------ import os from types import ClassType -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ #------------------------------------------------------------------------------- # @@ -46,8 +46,8 @@ from gi.repository import GObject # GRAMPS modules # #------------------------------------------------------------------------------- -from gen.config import config -from gen.plug.report import CATEGORY_GRAPHVIZ +from gramps.gen.config import config +from gramps.gen.plug.report import CATEGORY_GRAPHVIZ from _reportdialog import ReportDialog from _papermenu import PaperFrame import gramps.gen.plug.docgen.graphdoc as graphdoc diff --git a/gramps/gui/plug/report/_papermenu.py b/gramps/gui/plug/report/_papermenu.py index bac0c45ba..c6dba6419 100644 --- a/gramps/gui/plug/report/_papermenu.py +++ b/gramps/gui/plug/report/_papermenu.py @@ -26,7 +26,7 @@ # Python modules # #------------------------------------------------------------------------- -from gen.ggettext import sgettext as _ +from gramps.gen.ggettext import sgettext as _ #------------------------------------------------------------------------- # @@ -41,9 +41,9 @@ from gi.repository import GObject # GRAMPS modules # #------------------------------------------------------------------------- -from gen.plug.docgen import PaperStyle, PAPER_PORTRAIT, PAPER_LANDSCAPE -from gen.plug.report._paper import paper_sizes -from gui.glade import Glade +from gramps.gen.plug.docgen import PaperStyle, PAPER_PORTRAIT, PAPER_LANDSCAPE +from gramps.gen.plug.report._paper import paper_sizes +from gramps.gui.glade import Glade #------------------------------------------------------------------------- # diff --git a/gramps/gui/plug/report/_reportdialog.py b/gramps/gui/plug/report/_reportdialog.py index 43e0256b3..6f499c16a 100644 --- a/gramps/gui/plug/report/_reportdialog.py +++ b/gramps/gui/plug/report/_reportdialog.py @@ -48,23 +48,23 @@ from gi.repository import Gtk # GRAMPS modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ -from gen.config import config -from gen.errors import DatabaseError, FilterError, ReportError, WindowActiveError -from gui.utils import open_file_with_default_application -from gui.plug import add_gui_options -from gui.user import User -from gui.dialog import ErrorDialog, OptionDialog -from gen.plug.report import (CATEGORY_TEXT, CATEGORY_DRAW, CATEGORY_BOOK, +from gramps.gen.ggettext import gettext as _ +from gramps.gen.config import config +from gramps.gen.errors import DatabaseError, FilterError, ReportError, WindowActiveError +from gramps.gui.utils import open_file_with_default_application +from gramps.gui.plug import add_gui_options +from gramps.gui.user import User +from gramps.gui.dialog import ErrorDialog, OptionDialog +from gramps.gen.plug.report import (CATEGORY_TEXT, CATEGORY_DRAW, CATEGORY_BOOK, CATEGORY_CODE, CATEGORY_WEB, CATEGORY_GRAPHVIZ, standalone_categories) -from gen.plug.docgen import StyleSheet, StyleSheetList -from gui.managedwindow import ManagedWindow +from gramps.gen.plug.docgen import StyleSheet, StyleSheetList +from gramps.gui.managedwindow import ManagedWindow from _stylecombobox import StyleComboBox from _styleeditor import StyleListDisplay from _fileentry import FileEntry -from gen.const import URL_MANUAL_PAGE -from gen.utils.file import get_unicode_path_from_file_chooser +from gramps.gen.const import URL_MANUAL_PAGE +from gramps.gen.utils.file import get_unicode_path_from_file_chooser #------------------------------------------------------------------------- # # Private Constants @@ -562,7 +562,7 @@ class ReportDialog(ManagedWindow): pass def on_help_clicked(self, *obj): - from gui.display import display_help + from gramps.gui.display import display_help display_help(URL_REPORT_PAGE, self.report_name.replace(" ", "_")) def on_style_edit_clicked(self, *obj): diff --git a/gramps/gui/plug/report/_stylecombobox.py b/gramps/gui/plug/report/_stylecombobox.py index d02f7b103..c590c7ebd 100644 --- a/gramps/gui/plug/report/_stylecombobox.py +++ b/gramps/gui/plug/report/_stylecombobox.py @@ -21,7 +21,7 @@ # $Id$ -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ from gi.repository import Gtk from gi.repository import GObject diff --git a/gramps/gui/plug/report/_styleeditor.py b/gramps/gui/plug/report/_styleeditor.py index 773220ece..092e49390 100644 --- a/gramps/gui/plug/report/_styleeditor.py +++ b/gramps/gui/plug/report/_styleeditor.py @@ -33,7 +33,7 @@ Paragraph/Font style editor # Python modules # #------------------------------------------------------------------------ -from gen.ggettext import sgettext as _ +from gramps.gen.ggettext import sgettext as _ import logging log = logging.getLogger(".") import re @@ -50,12 +50,12 @@ from gi.repository import Gdk # GRAMPS modules # #------------------------------------------------------------------------ -from gen.plug.docgen import (StyleSheet, FONT_SERIF, FONT_SANS_SERIF, +from gramps.gen.plug.docgen import (StyleSheet, FONT_SERIF, FONT_SANS_SERIF, PARA_ALIGN_RIGHT, PARA_ALIGN_CENTER, PARA_ALIGN_LEFT, PARA_ALIGN_JUSTIFY) -from gui.listmodel import ListModel -from gui.managedwindow import set_titles -from gui.glade import Glade +from gramps.gui.listmodel import ListModel +from gramps.gui.managedwindow import set_titles +from gramps.gui.glade import Glade #------------------------------------------------------------------------ # @@ -134,7 +134,7 @@ class StyleListDisplay(object): try: self.sheetlist.save() except IOError, msg: - from gui.dialog import ErrorDialog + from gramps.gui.dialog import ErrorDialog ErrorDialog(_("Error saving stylesheet"), str(msg)) except: log.error("Failed to save stylesheet", exc_info=True) diff --git a/gramps/gui/plug/report/_textreportdialog.py b/gramps/gui/plug/report/_textreportdialog.py index 7b35b4771..ce461cd33 100644 --- a/gramps/gui/plug/report/_textreportdialog.py +++ b/gramps/gui/plug/report/_textreportdialog.py @@ -35,8 +35,8 @@ from gi.repository import GObject # GRAMPS modules # #------------------------------------------------------------------------- -from gui.pluginmanager import GuiPluginManager -from gen.plug.report._constants import CATEGORY_TEXT +from gramps.gui.pluginmanager import GuiPluginManager +from gramps.gen.plug.report._constants import CATEGORY_TEXT from _docreportdialog import DocReportDialog #------------------------------------------------------------------------- diff --git a/gramps/gui/plug/report/_webreportdialog.py b/gramps/gui/plug/report/_webreportdialog.py index 0c0db36bd..9f36a12ea 100644 --- a/gramps/gui/plug/report/_webreportdialog.py +++ b/gramps/gui/plug/report/_webreportdialog.py @@ -27,7 +27,7 @@ # #------------------------------------------------------------------------- from _reportdialog import ReportDialog -from gen.plug.report import CATEGORY_WEB +from gramps.gen.plug.report import CATEGORY_WEB #------------------------------------------------------------------------- # diff --git a/gramps/gui/plug/tool.py b/gramps/gui/plug/tool.py index d067310c4..540b385e6 100644 --- a/gramps/gui/plug/tool.py +++ b/gramps/gui/plug/tool.py @@ -29,7 +29,7 @@ # Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ import logging log = logging.getLogger(".") @@ -38,12 +38,12 @@ log = logging.getLogger(".") # GRAMPS modules # #------------------------------------------------------------------------- -from gen.const import TOOL_OPTIONS -from gen.display.name import displayer as name_displayer -from gen.errors import WindowActiveError -from gen.plug._options import (Options, OptionHandler, OptionList, +from gramps.gen.const import TOOL_OPTIONS +from gramps.gen.display.name import displayer as name_displayer +from gramps.gen.errors import WindowActiveError +from gramps.gen.plug._options import (Options, OptionHandler, OptionList, OptionListCollection) -from gen.plug import (TOOL_DEBUG, TOOL_ANAL, TOOL_DBPROC, TOOL_DBFIX, +from gramps.gen.plug import (TOOL_DEBUG, TOOL_ANAL, TOOL_DBPROC, TOOL_DBFIX, TOOL_REVCTL, TOOL_UTILS) #------------------------------------------------------------------------- @@ -74,7 +74,7 @@ class Tool(object): """ def __init__(self, dbstate, options_class, name): - from gui.plug import MenuToolOptions + from gramps.gui.plug import MenuToolOptions self.db = dbstate.db try: if issubclass(options_class, MenuToolOptions): @@ -105,7 +105,7 @@ class BatchTool(Tool): def __init__(self, dbstate, options_class, name): # TODO: should we replace this with a callback? - from gui.dialog import QuestionDialog2 + from gramps.gui.dialog import QuestionDialog2 warn_dialog = QuestionDialog2( _('Undo history warning'), _('Proceeding with this tool will erase the undo history ' @@ -134,7 +134,7 @@ class ActivePersonTool(Tool): if not uistate.get_active('Person'): # TODO: should we replace this with a callback? - from gui.dialog import ErrorDialog + from gramps.gui.dialog import ErrorDialog ErrorDialog(_('Active person has not been set'), _('You must select an active person for this ' @@ -186,7 +186,7 @@ class CommandLineTool(object): self.options_help[key] = self.option_class.options_help[key] def parse_option_str(self): - from cli.plug import _convert_str_to_match_type + from gramps.cli.plug import _convert_str_to_match_type for opt in self.options_str_dict: if opt in self.options_dict: self.options_dict[opt] = \ diff --git a/gramps/gui/pluginmanager.py b/gramps/gui/pluginmanager.py index 9cb1aac27..ff094bd92 100644 --- a/gramps/gui/pluginmanager.py +++ b/gramps/gui/pluginmanager.py @@ -43,11 +43,11 @@ from gi.repository import GdkPixbuf # GRAMPS modules # #------------------------------------------------------------------------- -from gen.utils.callback import Callback -from gen.plug import BasePluginManager, PluginRegister -from gen.constfunc import win -from gen.config import config -from gen.const import ICON +from gramps.gen.utils.callback import Callback +from gramps.gen.plug import BasePluginManager, PluginRegister +from gramps.gen.constfunc import win +from gramps.gen.config import config +from gramps.gen.const import ICON #------------------------------------------------------------------------- # diff --git a/gramps/gui/selectors/baseselector.py b/gramps/gui/selectors/baseselector.py index 5b699f382..af823c8db 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 gui.managedwindow import ManagedWindow -from gui.filters import SearchBar -from gui.glade import Glade +from gramps.gui.managedwindow import ManagedWindow +from gramps.gui.filters import SearchBar +from gramps.gui.glade import Glade #------------------------------------------------------------------------- # diff --git a/gramps/gui/selectors/selectcitation.py b/gramps/gui/selectors/selectcitation.py index f7146806c..20697245e 100644 --- a/gramps/gui/selectors/selectcitation.py +++ b/gramps/gui/selectors/selectcitation.py @@ -31,14 +31,14 @@ SelectCitation class for GRAMPS. # internationalization # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ #------------------------------------------------------------------------- # # gramps modules # #------------------------------------------------------------------------- -from gui.views.treemodels import CitationTreeModel +from gramps.gui.views.treemodels import CitationTreeModel from baseselector import BaseSelector #------------------------------------------------------------------------- diff --git a/gramps/gui/selectors/selectevent.py b/gramps/gui/selectors/selectevent.py index 4674ed181..508c40b17 100644 --- a/gramps/gui/selectors/selectevent.py +++ b/gramps/gui/selectors/selectevent.py @@ -26,14 +26,14 @@ # internationalization # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ #------------------------------------------------------------------------- # # gramps modules # #------------------------------------------------------------------------- -from gui.views.treemodels import EventModel +from gramps.gui.views.treemodels import EventModel from baseselector import BaseSelector #------------------------------------------------------------------------- diff --git a/gramps/gui/selectors/selectfamily.py b/gramps/gui/selectors/selectfamily.py index 423bdb53d..664d38175 100644 --- a/gramps/gui/selectors/selectfamily.py +++ b/gramps/gui/selectors/selectfamily.py @@ -26,14 +26,14 @@ # internationalization # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ #------------------------------------------------------------------------- # # gramps modules # #------------------------------------------------------------------------- -from gui.views.treemodels import FamilyModel +from gramps.gui.views.treemodels import FamilyModel from baseselector import BaseSelector #------------------------------------------------------------------------- diff --git a/gramps/gui/selectors/selectnote.py b/gramps/gui/selectors/selectnote.py index 552f5cee3..9f7aa5d8e 100644 --- a/gramps/gui/selectors/selectnote.py +++ b/gramps/gui/selectors/selectnote.py @@ -29,14 +29,14 @@ # Python Modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS Modules # #------------------------------------------------------------------------- -from gui.views.treemodels import NoteModel +from gramps.gui.views.treemodels import NoteModel from baseselector import BaseSelector #------------------------------------------------------------------------- diff --git a/gramps/gui/selectors/selectobject.py b/gramps/gui/selectors/selectobject.py index 6b279c0c5..4fc505a7c 100644 --- a/gramps/gui/selectors/selectobject.py +++ b/gramps/gui/selectors/selectobject.py @@ -30,7 +30,7 @@ # #------------------------------------------------------------------------- import gc -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ #------------------------------------------------------------------------- # @@ -44,10 +44,10 @@ from gi.repository import Gtk # gramps modules # #------------------------------------------------------------------------- -from gen.const import THUMBSCALE -from gen.utils.file import media_path_full -from gui.thumbnails import get_thumbnail_image -from gui.views.treemodels import MediaModel +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 baseselector import BaseSelector #------------------------------------------------------------------------- diff --git a/gramps/gui/selectors/selectperson.py b/gramps/gui/selectors/selectperson.py index 0213c0ef4..59c7add34 100644 --- a/gramps/gui/selectors/selectperson.py +++ b/gramps/gui/selectors/selectperson.py @@ -26,7 +26,7 @@ # internationalization # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ from gi.repository import Gdk from gi.repository import Gtk @@ -35,7 +35,7 @@ from gi.repository import Gtk # gramps modules # #------------------------------------------------------------------------- -from gui.views.treemodels import PeopleBaseModel, PersonTreeModel +from gramps.gui.views.treemodels import PeopleBaseModel, PersonTreeModel from baseselector import BaseSelector #------------------------------------------------------------------------- diff --git a/gramps/gui/selectors/selectplace.py b/gramps/gui/selectors/selectplace.py index 1be1b8096..c3fb1f665 100644 --- a/gramps/gui/selectors/selectplace.py +++ b/gramps/gui/selectors/selectplace.py @@ -27,14 +27,14 @@ # internationalization # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ #------------------------------------------------------------------------- # # gramps modules # #------------------------------------------------------------------------- -from gui.views.treemodels.placemodel import PlaceListModel +from gramps.gui.views.treemodels.placemodel import PlaceListModel from baseselector import BaseSelector #------------------------------------------------------------------------- diff --git a/gramps/gui/selectors/selectrepository.py b/gramps/gui/selectors/selectrepository.py index 90b994193..7b8e7465e 100644 --- a/gramps/gui/selectors/selectrepository.py +++ b/gramps/gui/selectors/selectrepository.py @@ -26,14 +26,14 @@ # internationalization # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ #------------------------------------------------------------------------- # # gramps modules # #------------------------------------------------------------------------- -from gui.views.treemodels import RepositoryModel +from gramps.gui.views.treemodels import RepositoryModel from baseselector import BaseSelector #------------------------------------------------------------------------- diff --git a/gramps/gui/selectors/selectsource.py b/gramps/gui/selectors/selectsource.py index 0d39738d7..c11f3ac54 100644 --- a/gramps/gui/selectors/selectsource.py +++ b/gramps/gui/selectors/selectsource.py @@ -26,14 +26,14 @@ # internationalization # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ #------------------------------------------------------------------------- # # gramps modules # #------------------------------------------------------------------------- -from gui.views.treemodels import SourceModel +from gramps.gui.views.treemodels import SourceModel from baseselector import BaseSelector #------------------------------------------------------------------------- diff --git a/gramps/gui/spell.py b/gramps/gui/spell.py index ab93acce4..8b62e0bec 100644 --- a/gramps/gui/spell.py +++ b/gramps/gui/spell.py @@ -32,7 +32,7 @@ present, we default to no spell checking. # Python classes # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ import locale #------------------------------------------------------------------------- @@ -71,7 +71,7 @@ if not HAVE_GTKSPELL: # GRAMPS classes # #------------------------------------------------------------------------- -from gen.config import config +from gramps.gen.config import config #------------------------------------------------------------------------- # diff --git a/gramps/gui/thumbnails.py b/gramps/gui/thumbnails.py index 7c6fb4c91..682e280a6 100644 --- a/gramps/gui/thumbnails.py +++ b/gramps/gui/thumbnails.py @@ -50,7 +50,7 @@ from gi.repository import GdkPixbuf # gramps modules # #------------------------------------------------------------------------- -from gen.const import (ICON, IMAGE_DIR, THUMB_LARGE, THUMB_NORMAL, THUMBSCALE, +from gramps.gen.const import (ICON, IMAGE_DIR, THUMB_LARGE, THUMB_NORMAL, THUMBSCALE, THUMBSCALE_LARGE, USE_THUMBNAILER) #------------------------------------------------------------------------- diff --git a/gramps/gui/tipofday.py b/gramps/gui/tipofday.py index f4abd0f8a..b79eb38a5 100644 --- a/gramps/gui/tipofday.py +++ b/gramps/gui/tipofday.py @@ -31,7 +31,7 @@ Handles the Tip of the Day dialog #------------------------------------------------------------------------- from xml.parsers.expat import ParserCreate,ExpatError from random import Random -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ import os #------------------------------------------------------------------------- @@ -45,11 +45,11 @@ import os # GRAMPS modules # #------------------------------------------------------------------------- -from gen.const import IMAGE_DIR, TIP_DATA -from gen.config import config -from gui.managedwindow import ManagedWindow -from gui.dialog import ErrorDialog -from gui.glade import Glade +from gramps.gen.const import IMAGE_DIR, TIP_DATA +from gramps.gen.config import config +from gramps.gui.managedwindow import ManagedWindow +from gramps.gui.dialog import ErrorDialog +from gramps.gui.glade import Glade #------------------------------------------------------------------------- # diff --git a/gramps/gui/undohistory.py b/gramps/gui/undohistory.py index 9ce408259..14c780e11 100644 --- a/gramps/gui/undohistory.py +++ b/gramps/gui/undohistory.py @@ -28,7 +28,7 @@ # #------------------------------------------------------------------------ import time -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ from itertools import chain #------------------------------------------------------------------------- @@ -44,8 +44,8 @@ from gi.repository import GObject # GRAMPS modules # #------------------------------------------------------------------------- -from gui.dialog import QuestionDialog -from gui.managedwindow import ManagedWindow +from gramps.gui.dialog import QuestionDialog +from gramps.gui.managedwindow import ManagedWindow #------------------------------------------------------------------------- # diff --git a/gramps/gui/user.py b/gramps/gui/user.py index b082ec95f..7dffd9fd1 100644 --- a/gramps/gui/user.py +++ b/gramps/gui/user.py @@ -37,8 +37,8 @@ import sys # #------------------------------------------------------------------------- import gramps.gen.user -from gui.utils import ProgressMeter -from gui.dialog import (WarningDialog, ErrorDialog, DBErrorDialog, +from gramps.gui.utils import ProgressMeter +from gramps.gui.dialog import (WarningDialog, ErrorDialog, DBErrorDialog, InfoDialog) #------------------------------------------------------------------------- # diff --git a/gramps/gui/utils.py b/gramps/gui/utils.py index 7563cae2e..0e961f281 100644 --- a/gramps/gui/utils.py +++ b/gramps/gui/utils.py @@ -285,7 +285,7 @@ class ProgressMeter(object): """ Don't let the user close the progress dialog. """ - from gui.dialog import WarningDialog + from gramps.gui.dialog import WarningDialog WarningDialog( _("Attempt to force closing the dialog"), _("Please do not force closing this important dialog."), @@ -355,7 +355,7 @@ def open_file_with_default_application( file_path ): @type file_path: string @return: nothing """ - from gui.dialog import ErrorDialog + from gramps.gui.dialog import ErrorDialog norm_path = os.path.normpath( file_path ) if not os.path.exists(norm_path): diff --git a/gramps/gui/viewmanager.py b/gramps/gui/viewmanager.py index b4e1012f2..0cddef363 100644 --- a/gramps/gui/viewmanager.py +++ b/gramps/gui/viewmanager.py @@ -39,8 +39,8 @@ from collections import defaultdict import os import time import datetime -from gen.ggettext import sgettext as _ -from gen.ggettext import ngettext +from gramps.gen.ggettext import sgettext as _ +from gramps.gen.ggettext import ngettext from cStringIO import StringIO import sys import posixpath @@ -65,40 +65,40 @@ from gi.repository import Gtk # GRAMPS modules # #------------------------------------------------------------------------- -from cli.grampscli import CLIManager -from gui.user import User -from gui.plug import tool -from gen.plug import (START, END) -from gen.plug import REPORT -from gen.plug.report._constants import standalone_categories -from gui.plug import (PluginWindows, ReportPluginDialog, ToolPluginDialog) -from gui.plug.report import report -from gen.plug.utils import version_str_to_tup, load_addon_file -from gui.pluginmanager import GuiPluginManager -from gen.relationship import get_relationship_calculator -from gui.displaystate import DisplayState, RecentDocsMenu -from gen.const import (HOME_DIR, ICON, URL_BUGTRACKER, URL_HOMEPAGE, +from gramps.cli.grampscli import CLIManager +from gramps.gui.user import User +from gramps.gui.plug import tool +from gramps.gen.plug import (START, END) +from gramps.gen.plug import REPORT +from gramps.gen.plug.report._constants import standalone_categories +from gramps.gui.plug import (PluginWindows, ReportPluginDialog, ToolPluginDialog) +from gramps.gui.plug.report import report +from gramps.gen.plug.utils import version_str_to_tup, load_addon_file +from gramps.gui.pluginmanager import GuiPluginManager +from gramps.gen.relationship import get_relationship_calculator +from gramps.gui.displaystate import DisplayState, RecentDocsMenu +from gramps.gen.const import (HOME_DIR, ICON, URL_BUGTRACKER, URL_HOMEPAGE, URL_MAILINGLIST, URL_MANUAL_PAGE, URL_WIKISTRING, WIKI_EXTRAPLUGINS) -from gen.constfunc import is_quartz -from gen.config import config -from gen.errors import WindowActiveError -from gui.dialog import (ErrorDialog, WarningDialog, QuestionDialog2, +from gramps.gen.constfunc import is_quartz +from gramps.gen.config import config +from gramps.gen.errors import WindowActiveError +from gramps.gui.dialog import (ErrorDialog, WarningDialog, QuestionDialog2, InfoDialog) from gui import widgets -from gui.undohistory import UndoHistory -from gen.utils.file import (media_path_full, get_unicode_path_from_env_var, +from gramps.gui.undohistory import UndoHistory +from gramps.gen.utils.file import (media_path_full, get_unicode_path_from_env_var, get_unicode_path_from_file_chooser) -from gui.dbloader import DbLoader -from gui.display import display_help, display_url -from gui.widgets.progressdialog import ProgressMonitor, GtkProgressDialog -from gui.configure import GrampsPreferences -from gen.db.backup import backup -from gen.db.exceptions import DbException -from gui.aboutdialog import GrampsAboutDialog -from gui.navigator import Navigator -from gui.views.tags import Tags -from gen.utils.configmanager import safe_eval +from gramps.gui.dbloader import DbLoader +from gramps.gui.display import display_help, display_url +from gramps.gui.widgets.progressdialog import ProgressMonitor, GtkProgressDialog +from gramps.gui.configure import GrampsPreferences +from gramps.gen.db.backup import backup +from gramps.gen.db.exceptions import DbException +from gramps.gui.aboutdialog import GrampsAboutDialog +from gramps.gui.navigator import Navigator +from gramps.gui.views.tags import Tags +from gramps.gen.utils.configmanager import safe_eval #------------------------------------------------------------------------- # @@ -435,16 +435,16 @@ class ViewManager(CLIManager): if addon_update_list: self.update_addons(addon_update_list) elif force: - from gui.dialog import OkDialog + from gramps.gui.dialog import OkDialog OkDialog(_("There are no available addons of this type"), _("Checked for '%s'") % _("' and '").join([_(t) for t in config.get('behavior.check-for-update-types')]), self.window) def update_addons(self, addon_update_list): - from gui.glade import Glade - from gui.managedwindow import set_titles - from gui.listmodel import ListModel, NOSORT, TOGGLE + from gramps.gui.glade import Glade + from gramps.gui.managedwindow import set_titles + from gramps.gui.listmodel import ListModel, NOSORT, TOGGLE glade = Glade("updateaddons.glade") self.update_dialog = glade.toplevel set_titles(self.update_dialog, glade.get_object('title'), @@ -521,8 +521,8 @@ class ViewManager(CLIManager): """ Process all of the selected addons. """ - from gui.dialog import OkDialog - from gui.widgets.progressdialog import LongOpStatus + from gramps.gui.dialog import OkDialog + from gramps.gui.widgets.progressdialog import LongOpStatus self.update_dialog.hide() model = self.list.model @@ -1112,7 +1112,7 @@ class ViewManager(CLIManager): """ Display Tip of the day """ - from gui.tipofday import TipOfDay + from gramps.gui.tipofday import TipOfDay TipOfDay(self.uistate) def __plugin_status(self, obj=None, data=None): @@ -1200,7 +1200,7 @@ class ViewManager(CLIManager): return None def __create_dummy_page(self, pdata, error): - from gui.views.pageview import DummyPage + from gramps.gui.views.pageview import DummyPage return DummyPage(pdata.name, pdata, self.dbstate, self.uistate, _("View failed to load. Check error output."), error) @@ -1472,7 +1472,7 @@ class ViewManager(CLIManager): """ Make a quick XML back with or without media. """ - from gui.dialog import QuestionDialog2 + from gramps.gui.dialog import QuestionDialog2 window = Gtk.Dialog(_("Gramps XML Backup"), self.uistate.window, Gtk.DialogFlags.DESTROY_WITH_PARENT, None) @@ -1663,7 +1663,7 @@ class ViewManager(CLIManager): """ Displays the Clipboard """ - from gui.clipboard import ClipboardWindow + from gramps.gui.clipboard import ClipboardWindow try: ClipboardWindow(self.dbstate, self.uistate) except WindowActiveError: @@ -1705,7 +1705,7 @@ class ViewManager(CLIManager): Calls the ExportAssistant to export data """ if self.dbstate.db.db_is_open: - from gui.plug.export import ExportAssistant + from gramps.gui.plug.export import ExportAssistant try: ExportAssistant(self.dbstate, self.uistate) except WindowActiveError: diff --git a/gramps/gui/views/bookmarks.py b/gramps/gui/views/bookmarks.py index ec620f27d..eb9facf97 100644 --- a/gramps/gui/views/bookmarks.py +++ b/gramps/gui/views/bookmarks.py @@ -51,11 +51,11 @@ from gi.repository import Gtk # gramps modules # #------------------------------------------------------------------------- -from gui.display import display_help -from gui.listmodel import ListModel -from gen.utils.db import navigation_label -from gen.const import URL_MANUAL_PAGE -from gen.ggettext import sgettext as _ +from gramps.gui.display import display_help +from gramps.gui.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 7845c39ad..67e35204e 100644 --- a/gramps/gui/views/listview.py +++ b/gramps/gui/views/listview.py @@ -51,22 +51,22 @@ from gi.repository import Pango # GRAMPS # #---------------------------------------------------------------- -from gui.views.pageview import PageView -from gui.views.navigationview import NavigationView -from gui.columnorder import ColumnOrder -from gen.config import config -from gen.errors import WindowActiveError -from gui.filters import SearchBar -from gui.widgets.menuitem import add_menuitem -from gen.const import CUSTOM_FILTERS, USE_TIPS -from gen.utils.debug import profile -from gen.utils.string import data_recover_msg -from gen.utils.file import get_unicode_path_from_file_chooser -from gui.dialog import QuestionDialog, QuestionDialog2 -from gui.editors import FilterEditor -from gen.ggettext import sgettext as _ -from gui.ddtargets import DdTargets -from gui.plug.quick import create_quickreport_menu, create_web_connect_menu +from gramps.gui.views.pageview import PageView +from gramps.gui.views.navigationview import NavigationView +from gramps.gui.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 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 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 #---------------------------------------------------------------- @@ -430,7 +430,7 @@ class ListView(NavigationView): if mlist: self.bookmarks.add(mlist[0]) else: - from gui.dialog import WarningDialog + from gramps.gui.dialog import WarningDialog WarningDialog( _("Could Not Set a Bookmark"), _("A bookmark could not be set because " @@ -1006,7 +1006,7 @@ class ListView(NavigationView): The output file type is determined by the type variable. """ - from gen.utils.docgen import CSVTab, ODSTab + from gramps.gen.utils.docgen import CSVTab, ODSTab ofile = None data_cols = [pair[1] for pair in self.column_order() if pair[0]] diff --git a/gramps/gui/views/navigationview.py b/gramps/gui/views/navigationview.py index 12cdb8d63..80d96ea90 100644 --- a/gramps/gui/views/navigationview.py +++ b/gramps/gui/views/navigationview.py @@ -47,10 +47,10 @@ from gi.repository import Gtk # GRAMPS # #---------------------------------------------------------------- -from gui.views.pageview import PageView -from gen.ggettext import sgettext as _ -from gen.utils.db import navigation_label -from gen.constfunc import mod_key +from gramps.gui.views.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 DISABLED = -1 MRU_SIZE = 10 @@ -241,7 +241,7 @@ class NavigationView(PageView): """ Add a bookmark to the list. """ - from gen.display.name import displayer as name_displayer + from gramps.gen.display.name import displayer as name_displayer active_handle = self.uistate.get_active('Person') active_person = self.dbstate.db.get_person_from_handle(active_handle) @@ -251,7 +251,7 @@ class NavigationView(PageView): self.uistate.push_message(self.dbstate, _("%s has been bookmarked") % name) else: - from gui.dialog import WarningDialog + from gramps.gui.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 gui.dialog import WarningDialog + from gramps.gui.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 7fb930881..9429cfc08 100644 --- a/gramps/gui/views/pageview.py +++ b/gramps/gui/views/pageview.py @@ -40,19 +40,19 @@ _LOG = logging.getLogger('.pageview') #---------------------------------------------------------------- from gi.repository import Gtk from gi.repository import Gdk -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ #---------------------------------------------------------------- # # GRAMPS # #---------------------------------------------------------------- -from gen.errors import WindowActiveError -from gui.dbguielement import DbGUIElement -from gui.widgets.menutoolbuttonaction import MenuToolButtonAction -from gui.grampsbar import GrampsBar -from gui.configure import ConfigureDialog -from gen.config import config +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 gramps.gen.config import config #------------------------------------------------------------------------------ # @@ -232,7 +232,7 @@ class PageView(DbGUIElement): system. """ import cPickle as pickle - from gui.clipboard import ClipboardWindow, obj2target + from gramps.gui.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 gui.clipboard import ClipboardWindow + from gramps.gui.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 7df9e40eb..da24312f0 100644 --- a/gramps/gui/views/tags.py +++ b/gramps/gui/views/tags.py @@ -42,14 +42,14 @@ from gi.repository import Gdk # Gramps modules # #------------------------------------------------------------------------- -from gen.ggettext import sgettext as _ -from gen.lib import Tag -from gen.db import DbTxn -from gui.dbguielement import DbGUIElement -from gui.listmodel import ListModel, NOSORT, COLOR, INTEGER -from gen.const import URL_MANUAL_PAGE -from gui.display import display_help -from gui.dialog import ErrorDialog, QuestionDialog2 +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 gramps.gen.const import URL_MANUAL_PAGE +from gramps.gui.display import display_help +from gramps.gui.dialog import ErrorDialog, QuestionDialog2 import gramps.gui.widgets.progressdialog as progressdlg #------------------------------------------------------------------------- diff --git a/gramps/gui/views/treemodels/citationbasemodel.py b/gramps/gui/views/treemodels/citationbasemodel.py index 2e58fa062..0b114177a 100644 --- a/gramps/gui/views/treemodels/citationbasemodel.py +++ b/gramps/gui/views/treemodels/citationbasemodel.py @@ -41,8 +41,8 @@ LOG = logging.getLogger(".citation") #------------------------------------------------------------------------- from gramps.gen.datehandler import format_time, get_date, get_date_valid from gramps.gen.lib import Citation -from gen.utils.string import confidence -from gen.config import config +from gramps.gen.utils.string import confidence +from gramps.gen.config import config #------------------------------------------------------------------------- # diff --git a/gramps/gui/views/treemodels/citationlistmodel.py b/gramps/gui/views/treemodels/citationlistmodel.py index 353f6f5b4..ebd68bfb6 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 gui.views.treemodels.flatbasemodel import FlatBaseModel -from gui.views.treemodels.citationbasemodel import CitationBaseModel +from gramps.gui.views.treemodels.flatbasemodel import FlatBaseModel +from gramps.gui.views.treemodels.citationbasemodel import CitationBaseModel #------------------------------------------------------------------------- # diff --git a/gramps/gui/views/treemodels/citationtreemodel.py b/gramps/gui/views/treemodels/citationtreemodel.py index 08e2bab57..73f816a7d 100644 --- a/gramps/gui/views/treemodels/citationtreemodel.py +++ b/gramps/gui/views/treemodels/citationtreemodel.py @@ -38,7 +38,7 @@ LOG = logging.getLogger(".citation") # internationalization # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ #------------------------------------------------------------------------- # @@ -52,9 +52,9 @@ from gi.repository import Gtk # GRAMPS modules # #------------------------------------------------------------------------- -from gen.utils.db import get_source_referents -from gui.views.treemodels.treebasemodel import TreeBaseModel -from gui.views.treemodels.citationbasemodel import CitationBaseModel +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 #------------------------------------------------------------------------- # diff --git a/gramps/gui/views/treemodels/eventmodel.py b/gramps/gui/views/treemodels/eventmodel.py index afd878941..b27576668 100644 --- a/gramps/gui/views/treemodels/eventmodel.py +++ b/gramps/gui/views/treemodels/eventmodel.py @@ -42,9 +42,9 @@ from gi.repository import Gtk #------------------------------------------------------------------------- from gramps.gen.datehandler import format_time, get_date, get_date_valid from gramps.gen.lib import Event, EventType -from gen.utils.db import get_participant_from_event -from gen.config import config -from gui.views.treemodels.flatbasemodel import FlatBaseModel +from gramps.gen.utils.db import get_participant_from_event +from gramps.gen.config import config +from gramps.gui.views.treemodels.flatbasemodel import FlatBaseModel #------------------------------------------------------------------------- # diff --git a/gramps/gui/views/treemodels/familymodel.py b/gramps/gui/views/treemodels/familymodel.py index 23335d32d..0f4d90f0a 100644 --- a/gramps/gui/views/treemodels/familymodel.py +++ b/gramps/gui/views/treemodels/familymodel.py @@ -42,11 +42,11 @@ from gi.repository import Gtk # #------------------------------------------------------------------------- from gramps.gen.datehandler import displayer, format_time, get_date_valid -from gen.display.name import displayer as name_displayer -from gen.lib import EventRoleType, FamilyRelType -from gui.views.treemodels.flatbasemodel import FlatBaseModel -from gen.utils.db import get_marriage_or_fallback -from gen.config import config +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 gramps.gen.utils.db import get_marriage_or_fallback +from gramps.gen.config import config invalid_date_format = config.get('preferences.invalid-date-format') diff --git a/gramps/gui/views/treemodels/flatbasemodel.py b/gramps/gui/views/treemodels/flatbasemodel.py index 977430555..232292920 100644 --- a/gramps/gui/views/treemodels/flatbasemodel.py +++ b/gramps/gui/views/treemodels/flatbasemodel.py @@ -73,8 +73,8 @@ from gi.repository import Gtk # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters import SearchFilter, ExactSearchFilter -from gen.utils.cast import conv_unicode_tosrtkey, conv_tosrtkey +from gramps.gen.filters import SearchFilter, ExactSearchFilter +from gramps.gen.utils.cast import conv_unicode_tosrtkey, conv_tosrtkey #------------------------------------------------------------------------- # diff --git a/gramps/gui/views/treemodels/mediamodel.py b/gramps/gui/views/treemodels/mediamodel.py index 04daba9e8..bde19a8e3 100644 --- a/gramps/gui/views/treemodels/mediamodel.py +++ b/gramps/gui/views/treemodels/mediamodel.py @@ -25,7 +25,7 @@ # python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ import logging log = logging.getLogger(".") import locale @@ -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 gui.views.treemodels.flatbasemodel import FlatBaseModel +from gramps.gui.views.treemodels.flatbasemodel import FlatBaseModel #------------------------------------------------------------------------- # diff --git a/gramps/gui/views/treemodels/notemodel.py b/gramps/gui/views/treemodels/notemodel.py index 0f9e0d171..d1b205c0b 100644 --- a/gramps/gui/views/treemodels/notemodel.py +++ b/gramps/gui/views/treemodels/notemodel.py @@ -42,8 +42,8 @@ from gi.repository import Gtk # #------------------------------------------------------------------------- from gramps.gen.datehandler import format_time -from gui.views.treemodels.flatbasemodel import FlatBaseModel -from gen.lib import (Note, NoteType, StyledText) +from gramps.gui.views.treemodels.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 ce5c9e044..20354085e 100644 --- a/gramps/gui/views/treemodels/peoplemodel.py +++ b/gramps/gui/views/treemodels/peoplemodel.py @@ -32,7 +32,7 @@ TreeModel for the GRAMPS Person tree. # Standard python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ import cgi import locale @@ -56,13 +56,13 @@ _LOG = logging.getLogger(".") # GRAMPS modules # #------------------------------------------------------------------------- -from gen.lib import Name, EventRef, EventType, EventRoleType -from gen.display.name import displayer as name_displayer +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 gui.views.treemodels.flatbasemodel import FlatBaseModel -from gui.views.treemodels.treebasemodel import TreeBaseModel -from gen.config import config +from gramps.gui.views.treemodels.flatbasemodel import FlatBaseModel +from gramps.gui.views.treemodels.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 5b4f25102..eb6e58c7b 100644 --- a/gramps/gui/views/treemodels/placemodel.py +++ b/gramps/gui/views/treemodels/placemodel.py @@ -47,16 +47,16 @@ from gi.repository import Gtk # #------------------------------------------------------------------------- from gramps.gen.datehandler import format_time -from gen.utils.place import conv_lat_lon -from gui.views.treemodels.flatbasemodel import FlatBaseModel -from gui.views.treemodels.treebasemodel import TreeBaseModel +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 #------------------------------------------------------------------------- # # internationalization # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/gramps/gui/views/treemodels/repomodel.py b/gramps/gui/views/treemodels/repomodel.py index 86d0cce29..18dfb8355 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 gui.views.treemodels.flatbasemodel import FlatBaseModel +from gramps.gui.views.treemodels.flatbasemodel import FlatBaseModel #------------------------------------------------------------------------- # diff --git a/gramps/gui/views/treemodels/sourcemodel.py b/gramps/gui/views/treemodels/sourcemodel.py index 66fc26d7c..ef7935f6e 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 gui.views.treemodels.flatbasemodel import FlatBaseModel +from gramps.gui.views.treemodels.flatbasemodel import FlatBaseModel #------------------------------------------------------------------------- # diff --git a/gramps/gui/views/treemodels/treebasemodel.py b/gramps/gui/views/treemodels/treebasemodel.py index 03473a252..3cc07ba74 100644 --- a/gramps/gui/views/treemodels/treebasemodel.py +++ b/gramps/gui/views/treemodels/treebasemodel.py @@ -37,7 +37,7 @@ This module provides the model that is used for all hierarchical treeviews. from __future__ import with_statement, print_function import time import locale -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ import logging _LOG = logging.getLogger(".gui.treebasemodel") @@ -55,11 +55,11 @@ from gi.repository import Gtk # GRAMPS modules # #------------------------------------------------------------------------- -from gen.utils.cast import conv_str_tosrtkey, conv_unicode_tosrtkey +from gramps.gen.utils.cast import conv_str_tosrtkey, conv_unicode_tosrtkey import gramps.gui.widgets.progressdialog as progressdlg from lru import LRU from bisect import bisect_right -from gen.filters import SearchFilter, ExactSearchFilter +from gramps.gen.filters import SearchFilter, ExactSearchFilter #------------------------------------------------------------------------- # diff --git a/gramps/gui/widgets/buttons.py b/gramps/gui/widgets/buttons.py index 97d88883f..ce1aea243 100644 --- a/gramps/gui/widgets/buttons.py +++ b/gramps/gui/widgets/buttons.py @@ -27,7 +27,7 @@ __all__ = ["IconButton", "WarnButton", "SimpleButton", "PrivacyButton"] # Standard python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ import logging _LOG = logging.getLogger(".widgets.buttons") diff --git a/gramps/gui/widgets/expandcollapsearrow.py b/gramps/gui/widgets/expandcollapsearrow.py index 0f9838ed7..c856767aa 100644 --- a/gramps/gui/widgets/expandcollapsearrow.py +++ b/gramps/gui/widgets/expandcollapsearrow.py @@ -27,7 +27,7 @@ __all__ = ["ExpandCollapseArrow"] # Standard python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ import logging _LOG = logging.getLogger(".widgets.expandcollapsearrow") @@ -40,7 +40,7 @@ _LOG = logging.getLogger(".widgets.expandcollapsearrow") from gi.repository import GObject from gi.repository import Gtk from gi.repository import Gdk -from gen.constfunc import has_display +from gramps.gen.constfunc import has_display #------------------------------------------------------------------------- # diff --git a/gramps/gui/widgets/fanchart.py b/gramps/gui/widgets/fanchart.py index 6ed8d59bb..b8c402f9e 100644 --- a/gramps/gui/widgets/fanchart.py +++ b/gramps/gui/widgets/fanchart.py @@ -53,17 +53,17 @@ from cgi import escape # GRAMPS modules # #------------------------------------------------------------------------- -from gen.db import DbTxn -from gen.display.name import displayer as name_displayer -from gen.errors import WindowActiveError -from gui.editors import EditPerson, EditFamily -from gui.widgets.reorderfam import Reorder +from gramps.gen.db import DbTxn +from gramps.gen.display.name import displayer as name_displayer +from gramps.gen.errors import WindowActiveError +from gramps.gui.editors import EditPerson, EditFamily +from gramps.gui.widgets.reorderfam import Reorder from gramps.gen.lib import ChildRef, Family, Name, Person, Surname from gramps.gui.utils import color_graph_box, hex_to_rgb, is_right_click -from gui.ddtargets import DdTargets -from gen.utils.alive import probably_alive -from gen.utils.libformatting import FormattingHelper -from gen.utils.db import (find_children, find_parents, find_witnessed_people, +from gramps.gui.ddtargets import DdTargets +from gramps.gen.utils.alive import probably_alive +from gramps.gen.utils.libformatting import FormattingHelper +from gramps.gen.utils.db import (find_children, find_parents, find_witnessed_people, get_age, get_timeperiod, preset_name) #------------------------------------------------------------------------- diff --git a/gramps/gui/widgets/fanchartdesc.py b/gramps/gui/widgets/fanchartdesc.py index fb14a4e34..352876ca0 100644 --- a/gramps/gui/widgets/fanchartdesc.py +++ b/gramps/gui/widgets/fanchartdesc.py @@ -53,17 +53,17 @@ from cgi import escape # GRAMPS modules # #------------------------------------------------------------------------- -from gen.display.name import displayer as name_displayer -from gen.errors import WindowActiveError -from gui.editors import EditPerson, EditFamily +from gramps.gen.display.name import displayer as name_displayer +from gramps.gen.errors import WindowActiveError +from gramps.gui.editors import EditPerson, EditFamily from gramps.gui.utils import hex_to_rgb -from gui.ddtargets import DdTargets -from gen.utils.alive import probably_alive -from gen.utils.libformatting import FormattingHelper -from gen.utils.db import (find_children, find_parents, find_witnessed_people, +from gramps.gui.ddtargets import DdTargets +from gramps.gen.utils.alive import probably_alive +from gramps.gen.utils.libformatting import FormattingHelper +from gramps.gen.utils.db import (find_children, find_parents, find_witnessed_people, get_age, get_timeperiod) -from gen.plug.report.utils import find_spouse -from gui.widgets.fanchart import * +from gramps.gen.plug.report.utils import find_spouse +from gramps.gui.widgets.fanchart import * #------------------------------------------------------------------------- # diff --git a/gramps/gui/widgets/grampletpane.py b/gramps/gui/widgets/grampletpane.py index 1ba28eaa1..5f3b3dffe 100644 --- a/gramps/gui/widgets/grampletpane.py +++ b/gramps/gui/widgets/grampletpane.py @@ -36,7 +36,7 @@ from gi.repository import Gtk from gi.repository import Pango import time import os -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ import ConfigParser #------------------------------------------------------------------------- @@ -44,17 +44,17 @@ import ConfigParser # GRAMPS modules # #------------------------------------------------------------------------- -from gen.errors import WindowActiveError -from gen.const import URL_MANUAL_PAGE, VERSION_DIR -from gui.editors import EditPerson, EditFamily -from gui.managedwindow import ManagedWindow +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 gui.widgets.menuitem import add_menuitem -from gui.plug.quick import run_quick_report_by_name -from gui.display import display_help, display_url -from gui.glade import Glade -from gui.pluginmanager import GuiPluginManager -from gui.widgets.undoablebuffer import UndoableBuffer +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 #------------------------------------------------------------------------- # diff --git a/gramps/gui/widgets/labels.py b/gramps/gui/widgets/labels.py index 7c342323c..929405b0a 100644 --- a/gramps/gui/widgets/labels.py +++ b/gramps/gui/widgets/labels.py @@ -30,7 +30,7 @@ __all__ = ["LinkLabel", "EditLabel", "BasicLabel", "GenderLabel", #------------------------------------------------------------------------- import os import cgi -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ import logging _LOG = logging.getLogger(".widgets.labels") @@ -49,8 +49,8 @@ from gi.repository import Pango # Gramps modules # #------------------------------------------------------------------------- -from gen.constfunc import has_display, win -from gui.utils import rgb_to_hex +from gramps.gen.constfunc import has_display, win +from gramps.gui.utils import rgb_to_hex #------------------------------------------------------------------------- # diff --git a/gramps/gui/widgets/monitoredwidgets.py b/gramps/gui/widgets/monitoredwidgets.py index d45cb3586..155f10de1 100644 --- a/gramps/gui/widgets/monitoredwidgets.py +++ b/gramps/gui/widgets/monitoredwidgets.py @@ -51,11 +51,11 @@ from gi.repository import Pango # Gramps modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ -from gui.autocomp import StandardCustomSelector, fill_entry +from gramps.gen.ggettext import gettext as _ +from gramps.gui.autocomp import StandardCustomSelector, fill_entry from gramps.gen.datehandler import displayer, parser -from gen.lib.date import Date, NextYear -from gen.errors import ValidationError +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 gui.editors import EditDate + from gramps.gui.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 gui.editors import EditTagList + from gramps.gui.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 281a0efe0..29cf3008a 100644 --- a/gramps/gui/widgets/photo.py +++ b/gramps/gui/widgets/photo.py @@ -33,9 +33,9 @@ from gi.repository import Gtk # Gramps modules # #------------------------------------------------------------------------- -from gui.thumbnails import get_thumbnail_image, SIZE_NORMAL, SIZE_LARGE -from gui.utils import open_file_with_default_application -from gen.ggettext import gettext as _ +from gramps.gui.thumbnails import get_thumbnail_image, SIZE_NORMAL, SIZE_LARGE +from gramps.gui.utils import open_file_with_default_application +from gramps.gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/gramps/gui/widgets/progressdialog.py b/gramps/gui/widgets/progressdialog.py index cc4622d98..23c1656da 100644 --- a/gramps/gui/widgets/progressdialog.py +++ b/gramps/gui/widgets/progressdialog.py @@ -30,7 +30,7 @@ long running operations. # #------------------------------------------------------------------------- import time -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ import logging log = logging.getLogger("gen.progressdialog") @@ -47,7 +47,7 @@ from gi.repository import Gtk # Gramps modules # #------------------------------------------------------------------------- -from gen.utils.callback import Callback +from gramps.gen.utils.callback import Callback #------------------------------------------------------------------------- # diff --git a/gramps/gui/widgets/reorderfam.py b/gramps/gui/widgets/reorderfam.py index 8cf7ff919..7d74edeef 100644 --- a/gramps/gui/widgets/reorderfam.py +++ b/gramps/gui/widgets/reorderfam.py @@ -25,7 +25,7 @@ # Python modules # #------------------------------------------------------------------------- -from gen.ggettext import sgettext as _ +from gramps.gen.ggettext import sgettext as _ #------------------------------------------------------------------------- # @@ -46,11 +46,11 @@ _LOG = logging.getLogger("gui.widgets.reorderfam") # Gramps Modules # #------------------------------------------------------------------------- -from gen.db import DbTxn -from gui.listmodel import ListModel -from gui.managedwindow import ManagedWindow -from gui.glade import Glade -from gen.display.name import displayer as name_displayer +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 gramps.gen.display.name import displayer as name_displayer #------------------------------------------------------------------------- # diff --git a/gramps/gui/widgets/shortlistcomboentry.py b/gramps/gui/widgets/shortlistcomboentry.py index f12f8dd8b..e18162f7c 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 gui.widgets.validatedcomboentry import ValidatedComboEntry +from gramps.gui.widgets.validatedcomboentry import ValidatedComboEntry #------------------------------------------------------------------------- # diff --git a/gramps/gui/widgets/styledtextbuffer.py b/gramps/gui/widgets/styledtextbuffer.py index 3803439c1..df3d5ea63 100644 --- a/gramps/gui/widgets/styledtextbuffer.py +++ b/gramps/gui/widgets/styledtextbuffer.py @@ -30,7 +30,7 @@ __all__ = ["ALLOWED_STYLES", "MATCH_START", "MATCH_END", "MATCH_FLAVOR", # Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ import re import logging @@ -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 gui.widgets.undoablebuffer import UndoableBuffer +from gramps.gui.widgets.undoablebuffer import UndoableBuffer WEIGHT_BOLD = Pango.Weight.BOLD STYLE_ITALIC = Pango.Style.ITALIC UNDERLINE_SINGLE = Pango.Underline.SINGLE @@ -54,7 +54,7 @@ UNDERLINE_SINGLE = Pango.Underline.SINGLE # GRAMPS modules # #------------------------------------------------------------------------- -from gen.lib import (StyledText, StyledTextTag, StyledTextTagType) +from gramps.gen.lib import (StyledText, StyledTextTag, StyledTextTagType) #------------------------------------------------------------------------- # diff --git a/gramps/gui/widgets/styledtexteditor.py b/gramps/gui/widgets/styledtexteditor.py index 252c11306..097e12d7c 100644 --- a/gramps/gui/widgets/styledtexteditor.py +++ b/gramps/gui/widgets/styledtexteditor.py @@ -30,7 +30,7 @@ __all__ = ["StyledTextEditor"] # Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ import logging _LOG = logging.getLogger(".widgets.styledtexteditor") @@ -50,20 +50,20 @@ from gi.repository import Pango # GRAMPS modules # #------------------------------------------------------------------------- -from gen.lib import StyledTextTagType -from gui.widgets.styledtextbuffer import (ALLOWED_STYLES, +from gramps.gen.lib import StyledTextTagType +from gramps.gui.widgets.styledtextbuffer import (ALLOWED_STYLES, MATCH_START, MATCH_END, MATCH_FLAVOR, MATCH_STRING, LinkTag) -from gui.widgets.undoablestyledbuffer import UndoableStyledBuffer -from gui.widgets.valueaction import ValueAction -from gui.widgets.toolcomboentry import ToolComboEntry -from gui.widgets.springseparator import SpringSeparatorAction -from gui.spell import Spell -from gui.display import display_url -from gui.utils import SystemFonts, rgb_to_hex, hex_to_color, color_to_hex -from gen.config import config -from gen.constfunc import has_display +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 gramps.gen.config import config +from gramps.gen.constfunc import has_display #------------------------------------------------------------------------- # @@ -322,7 +322,7 @@ class StyledTextEditor(Gtk.TextView): """ Return a string useful for a tooltip given a LinkTag object. """ - from gen.simple import SimpleAccess + from gramps.gen.simple import SimpleAccess win_obj = find_parent_with_attr(self, attr="dbstate") display = link_tag.data if win_obj: @@ -752,7 +752,7 @@ class StyledTextEditor(Gtk.TextView): if win_obj: # Edit the object: obj_class, prop, value = url[9:].split("/") - from gui.editors import EditObject + from gramps.gui.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 gui.editors.editlink import EditLink + from gramps.gui.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 99766702d..f8e8b94c4 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 gui.widgets.valuetoolitem import ValueToolItem -from gui.widgets.shortlistcomboentry import ShortlistComboEntry +from gramps.gui.widgets.valuetoolitem import ValueToolItem +from gramps.gui.widgets.shortlistcomboentry import ShortlistComboEntry #------------------------------------------------------------------------- # diff --git a/gramps/gui/widgets/undoableentry.py b/gramps/gui/widgets/undoableentry.py index 92e8fdd82..334815c54 100644 --- a/gramps/gui/widgets/undoableentry.py +++ b/gramps/gui/widgets/undoableentry.py @@ -29,7 +29,7 @@ __all__ = ["UndoableEntry"] # Standard python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ import logging _LOG = logging.getLogger(".widgets.undoableentry") diff --git a/gramps/gui/widgets/undoablestyledbuffer.py b/gramps/gui/widgets/undoablestyledbuffer.py index f6779c02d..6982a49fc 100644 --- a/gramps/gui/widgets/undoablestyledbuffer.py +++ b/gramps/gui/widgets/undoablestyledbuffer.py @@ -30,9 +30,9 @@ __all__ = ["UndoableStyledBuffer"] from gi.repository import Gtk -from gen.lib.styledtext import StyledText -from gui.widgets.undoablebuffer import UndoableInsert, UndoableDelete -from gui.widgets.styledtextbuffer import StyledTextBuffer +from gramps.gen.lib.styledtext import StyledText +from gramps.gui.widgets.undoablebuffer import UndoableInsert, UndoableDelete +from gramps.gui.widgets.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 076ba0e6c..2dbc89c3b 100644 --- a/gramps/gui/widgets/validatedmaskedentry.py +++ b/gramps/gui/widgets/validatedmaskedentry.py @@ -27,7 +27,7 @@ __all__ = ["MaskedEntry", "ValidatableMaskedEntry"] # Standard python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ import string import logging @@ -49,8 +49,8 @@ from gi.repository import Pango # Gramps modules # #------------------------------------------------------------------------- -from gen.errors import MaskError, ValidationError, WindowActiveError -from gui.widgets.undoableentry import UndoableEntry +from gramps.gen.errors import MaskError, ValidationError, WindowActiveError +from gramps.gui.widgets.undoableentry import UndoableEntry #------------------------------------------------------------------------- # @@ -1781,7 +1781,7 @@ class ValidatableMaskedEntry(MaskedEntry): def main(args): - from gen.datehandler import parser + from gramps.gen.datehandler import parser def on_validate(widget, text): myDate = parser.parse(text) diff --git a/gramps/gui/widgets/valueaction.py b/gramps/gui/widgets/valueaction.py index 802556e31..8ad6cc202 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 gui.widgets.valuetoolitem import ValueToolItem +from gramps.gui.widgets.valuetoolitem import ValueToolItem #------------------------------------------------------------------------- # diff --git a/gramps/guiQML/grampsqml.py b/gramps/guiQML/grampsqml.py index 5ff084392..8f1c0dfb4 100644 --- a/gramps/guiQML/grampsqml.py +++ b/gramps/guiQML/grampsqml.py @@ -43,8 +43,8 @@ LOG = logging.getLogger(".grampsqml") # GRAMPS modules # #------------------------------------------------------------------------- -from gen.constfunc import has_display -from gen.config import config +from gramps.gen.constfunc import has_display +from gramps.gen.config import config #------------------------------------------------------------------------- # @@ -60,9 +60,9 @@ class GrampsQML(object): """ def __init__(self, argparser): - from gen.dbstate import DbState + from gramps.gen.dbstate import DbState from guiQML.viewmanager import ViewManager - from cli.arghandler import ArgHandler + from gramps.cli.arghandler import ArgHandler from PySide import QtGui self.app = QtGui.QApplication(sys.argv) diff --git a/gramps/guiQML/viewmanager.py b/gramps/guiQML/viewmanager.py index 036de24cf..4193c15fc 100644 --- a/gramps/guiQML/viewmanager.py +++ b/gramps/guiQML/viewmanager.py @@ -61,9 +61,9 @@ from PySide import QtOpenGL # GRAMPS modules # #------------------------------------------------------------------------- -from gen.const import ROOT_DIR -from cli.grampscli import CLIManager, CLIDbLoader -from gen.ggettext import gettext as _ +from gramps.gen.const import ROOT_DIR +from gramps.cli.grampscli import CLIManager, CLIDbLoader +from gramps.gen.ggettext import gettext as _ from guiQML.views.dbman import DbManager from guiQML.questiondialog import ErrorDialog diff --git a/gramps/guiQML/views/centralview.py b/gramps/guiQML/views/centralview.py index b63b5eade..a16b5d95f 100644 --- a/gramps/guiQML/views/centralview.py +++ b/gramps/guiQML/views/centralview.py @@ -61,8 +61,8 @@ from PySide import QtOpenGL # GRAMPS modules # #------------------------------------------------------------------------- -from gen.const import ROOT_DIR -from gen.ggettext import gettext as _ +from gramps.gen.const import ROOT_DIR +from gramps.gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/gramps/guiQML/views/dbman.py b/gramps/guiQML/views/dbman.py index e965b29d1..24ddb0fef 100644 --- a/gramps/guiQML/views/dbman.py +++ b/gramps/guiQML/views/dbman.py @@ -61,9 +61,9 @@ from PySide import QtOpenGL # GRAMPS modules # #------------------------------------------------------------------------- -from gen.const import IMAGE_DIR, ROOT_DIR -from cli.clidbman import CLIDbManager, NAME_FILE, time_val -from gen.ggettext import gettext as _ +from gramps.gen.const import IMAGE_DIR, ROOT_DIR +from gramps.cli.clidbman import CLIDbManager, NAME_FILE, time_val +from gramps.gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/gramps/guiQML/views/personview.py b/gramps/guiQML/views/personview.py index 4adaae929..22f3b5604 100644 --- a/gramps/guiQML/views/personview.py +++ b/gramps/guiQML/views/personview.py @@ -54,11 +54,11 @@ from PySide import QtOpenGL # GRAMPS modules # #------------------------------------------------------------------------- -from gen.const import ROOT_DIR +from gramps.gen.const import ROOT_DIR from gui.views.treemodels import conv_unicode_tosrtkey -from gen.ggettext import gettext as _ -from gen.display.name import displayer as name_displayer -from gen.lib import Name +from gramps.gen.ggettext import gettext as _ +from gramps.gen.display.name import displayer as name_displayer +from gramps.gen.lib import Name ##TODO: follow must be refractored so as not to require GTK from gui.views.treemodels.flatbasemodel import FlatNodeMap diff --git a/gramps/plugins/bookreport.py b/gramps/plugins/bookreport.py index db8ce11a5..2e2c711d4 100644 --- a/gramps/plugins/bookreport.py +++ b/gramps/plugins/bookreport.py @@ -31,7 +31,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ #------------------------------------------------------------------------ # @@ -68,30 +68,30 @@ from gi.repository import GObject # gramps modules # #------------------------------------------------------------------------- -from gen.const import HOME_DIR -from gen.utils.cast import get_type_converter_by_name, type_name -from gui.listmodel import ListModel -from gen.errors import FilterError, ReportError -from gui.pluginmanager import GuiPluginManager -from gen.plug.docgen import StyleSheet, StyleSheetList, PaperStyle -from gui.dialog import WarningDialog, ErrorDialog -from gen.plug.menu import PersonOption, FilterOption, FamilyOption -from gui.managedwindow import ManagedWindow, set_titles -from gui.glade import Glade +from gramps.gen.const import HOME_DIR +from gramps.gen.utils.cast import get_type_converter_by_name, type_name +from gramps.gui.listmodel import ListModel +from gramps.gen.errors import FilterError, ReportError +from gramps.gui.pluginmanager import GuiPluginManager +from gramps.gen.plug.docgen import StyleSheet, StyleSheetList, PaperStyle +from gramps.gui.dialog import WarningDialog, ErrorDialog +from gramps.gen.plug.menu import PersonOption, FilterOption, FamilyOption +from gramps.gui.managedwindow import ManagedWindow, set_titles +from gramps.gui.glade import Glade from gramps.gui.utils import is_right_click, open_file_with_default_application from gramps.gui.user import User -from gui.plug import make_gui_option +from gramps.gui.plug import make_gui_option from types import ClassType # Import from specific modules in ReportBase -from gen.plug.report import CATEGORY_BOOK, book_categories -from gui.plug.report._reportdialog import ReportDialog -from gui.plug.report._docreportdialog import DocReportDialog -from gen.plug.report._options import ReportOptions -from cli.plug import CommandLineReport +from gramps.gen.plug.report import CATEGORY_BOOK, book_categories +from gramps.gui.plug.report._reportdialog import ReportDialog +from gramps.gui.plug.report._docreportdialog import DocReportDialog +from gramps.gen.plug.report._options import ReportOptions +from gramps.cli.plug import CommandLineReport import cli.user -from gen.display.name import displayer as _nd +from gramps.gen.display.name import displayer as _nd #------------------------------------------------------------------------ # @@ -666,7 +666,7 @@ class BookListDisplay(object): def on_booklist_cancel_clicked(self, obj): if self.unsaved_changes: - from gui.dialog import QuestionDialog2 + from gramps.gui.dialog import QuestionDialog2 q = QuestionDialog2( _('Discard Unsaved Changes'), _('You have made changes which have not been saved.'), @@ -1064,7 +1064,7 @@ class BookReportSelector(ManagedWindow): ) return if name in self.book_list.get_book_names(): - from gui.dialog import QuestionDialog2 + from gramps.gui.dialog import QuestionDialog2 q = QuestionDialog2( _('Book name already exists'), _('You are about to save away a ' diff --git a/gramps/plugins/docgen/asciidoc.py b/gramps/plugins/docgen/asciidoc.py index 14201585e..132db4f5d 100644 --- a/gramps/plugins/docgen/asciidoc.py +++ b/gramps/plugins/docgen/asciidoc.py @@ -29,16 +29,16 @@ # python modules # #------------------------------------------------------------------------ -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ #------------------------------------------------------------------------ # # Gramps modules # #------------------------------------------------------------------------ -from gen.plug.docgen import (BaseDoc, TextDoc, +from gramps.gen.plug.docgen import (BaseDoc, TextDoc, PARA_ALIGN_RIGHT, PARA_ALIGN_CENTER) -from gen.errors import ReportError +from gramps.gen.errors import ReportError #------------------------------------------------------------------------ # diff --git a/gramps/plugins/docgen/gtkprint.py b/gramps/plugins/docgen/gtkprint.py index 828b00996..115894b25 100644 --- a/gramps/plugins/docgen/gtkprint.py +++ b/gramps/plugins/docgen/gtkprint.py @@ -29,7 +29,7 @@ # Python modules # #------------------------------------------------------------------------ -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ from math import radians ##try: @@ -42,9 +42,9 @@ from math import radians # Gramps modules # #------------------------------------------------------------------------ -from gen.plug.docgen import PAPER_PORTRAIT +from gramps.gen.plug.docgen import PAPER_PORTRAIT import gramps.plugins.lib.libcairodoc as libcairodoc -from gen.errors import UnavailableError +from gramps.gen.errors import UnavailableError #import constfunc #------------------------------------------------------------------------ @@ -201,7 +201,7 @@ class PrintPreview(object): def __build_window(self): """Build the window from Glade. """ - from gui.glade import Glade + from gramps.gui.glade import Glade glade_xml = Glade() self._window = glade_xml.toplevel #self._window.set_transient_for(parent) diff --git a/gramps/plugins/docgen/htmldoc.py b/gramps/plugins/docgen/htmldoc.py index 9763c6c00..d1bdbe459 100644 --- a/gramps/plugins/docgen/htmldoc.py +++ b/gramps/plugins/docgen/htmldoc.py @@ -39,16 +39,16 @@ Report output generator for html documents, based on Html and HtmlBackend import os import shutil import time -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ #------------------------------------------------------------------------ # # GRAMPS modules # #------------------------------------------------------------------------ -from gen.utils.image import resize_to_jpeg -from gen.const import DATA_DIR, WEBSTUFF_IMAGE_DIR, PROGRAM_NAME, URL_HOMEPAGE, VERSION -from gen.plug.docgen import BaseDoc, TextDoc, FONT_SANS_SERIF, URL_PATTERN +from gramps.gen.utils.image import resize_to_jpeg +from gramps.gen.const import DATA_DIR, WEBSTUFF_IMAGE_DIR, PROGRAM_NAME, URL_HOMEPAGE, VERSION +from gramps.gen.plug.docgen import BaseDoc, TextDoc, FONT_SANS_SERIF, URL_PATTERN from gramps.plugins.lib.libhtmlbackend import HtmlBackend, process_spaces from gramps.plugins.lib.libhtml import Html @@ -269,7 +269,7 @@ class HtmlDoc(BaseDoc, TextDoc): if from_fname != dest: shutil.copyfile(from_fname, dest) elif self.warn_dir: - from gui.dialog import WarningDialog + from gramps.gui.dialog import WarningDialog WarningDialog( _("Possible destination error") + "\n" + _("You appear to have set your target directory " diff --git a/gramps/plugins/docgen/latexdoc.py b/gramps/plugins/docgen/latexdoc.py index 244003cb2..c0f7f2b75 100644 --- a/gramps/plugins/docgen/latexdoc.py +++ b/gramps/plugins/docgen/latexdoc.py @@ -37,7 +37,7 @@ # python modules # #------------------------------------------------------------------------ -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ from bisect import bisect import re, os, sys @@ -46,8 +46,8 @@ import re, os, sys # gramps modules # #------------------------------------------------------------------------ -from gen.plug.docgen import BaseDoc, TextDoc, PAPER_LANDSCAPE, FONT_SANS_SERIF, URL_PATTERN -from gen.plug.docbackend import DocBackend +from gramps.gen.plug.docgen import BaseDoc, TextDoc, PAPER_LANDSCAPE, FONT_SANS_SERIF, URL_PATTERN +from gramps.gen.plug.docbackend import DocBackend import Image _CLICKABLE = r'''\url{\1}''' diff --git a/gramps/plugins/docgen/odfdoc.py b/gramps/plugins/docgen/odfdoc.py index 8813b8b99..41351253a 100644 --- a/gramps/plugins/docgen/odfdoc.py +++ b/gramps/plugins/docgen/odfdoc.py @@ -80,24 +80,24 @@ from xml.sax.saxutils import escape # Gramps modules # #------------------------------------------------------------------------- -from gen.plug.docgen import (BaseDoc, TextDoc, DrawDoc, graphicstyle, +from gramps.gen.plug.docgen import (BaseDoc, TextDoc, DrawDoc, graphicstyle, FONT_SANS_SERIF, SOLID, PAPER_PORTRAIT, INDEX_TYPE_TOC, PARA_ALIGN_CENTER, PARA_ALIGN_LEFT, INDEX_TYPE_ALP, PARA_ALIGN_RIGHT, URL_PATTERN, LOCAL_HYPERLINK, LOCAL_TARGET) -from gen.plug.docgen.fontscale import string_width +from gramps.gen.plug.docgen.fontscale import string_width from gramps.plugins.lib.libodfbackend import OdfBackend -from gen.const import PROGRAM_NAME, VERSION -from gen.plug.report import utils as ReportUtils -from gen.utils.image import image_size, image_dpi, image_actual_size -from gen.errors import ReportError +from gramps.gen.const import PROGRAM_NAME, VERSION +from gramps.gen.plug.report import utils as ReportUtils +from gramps.gen.utils.image import image_size, image_dpi, image_actual_size +from gramps.gen.errors import ReportError #------------------------------------------------------------------------- # # internationalization # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ _apptype = 'application/vnd.oasis.opendocument.text' diff --git a/gramps/plugins/docgen/pdfdoc.py b/gramps/plugins/docgen/pdfdoc.py index 50eb35580..284feef99 100644 --- a/gramps/plugins/docgen/pdfdoc.py +++ b/gramps/plugins/docgen/pdfdoc.py @@ -29,7 +29,7 @@ # Python modules # #------------------------------------------------------------------------ -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ import sys #------------------------------------------------------------------------ @@ -38,8 +38,8 @@ import sys # #------------------------------------------------------------------------ import gramps.plugins.lib.libcairodoc as libcairodoc -from gen.plug.docgen import INDEX_TYPE_ALP, INDEX_TYPE_TOC -from gen.errors import ReportError +from gramps.gen.plug.docgen import INDEX_TYPE_ALP, INDEX_TYPE_TOC +from gramps.gen.errors import ReportError #------------------------------------------------------------------------ # diff --git a/gramps/plugins/docgen/psdrawdoc.py b/gramps/plugins/docgen/psdrawdoc.py index dfcb395b2..ef34a03d0 100644 --- a/gramps/plugins/docgen/psdrawdoc.py +++ b/gramps/plugins/docgen/psdrawdoc.py @@ -32,15 +32,15 @@ PostScript document generator. # python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ #------------------------------------------------------------------------- #Gramps modules #------------------------------------------------------------------------- -from gen.plug.report import utils as ReportUtils -from gen.plug.docgen import BaseDoc, DrawDoc, FONT_SERIF, PAPER_PORTRAIT, SOLID -from gen.plug.utils import gformat -from gen.errors import ReportError +from gramps.gen.plug.report import utils as ReportUtils +from gramps.gen.plug.docgen import BaseDoc, DrawDoc, FONT_SERIF, PAPER_PORTRAIT, SOLID +from gramps.gen.plug.utils import gformat +from gramps.gen.errors import ReportError def lrgb(grp): grp = ReportUtils.rgb_color(grp) diff --git a/gramps/plugins/docgen/rtfdoc.py b/gramps/plugins/docgen/rtfdoc.py index e1b673dc5..450cc7d7a 100644 --- a/gramps/plugins/docgen/rtfdoc.py +++ b/gramps/plugins/docgen/rtfdoc.py @@ -29,7 +29,7 @@ # python modules # #------------------------------------------------------------------------ -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ import logging LOG = logging.getLogger(".rtfdoc") @@ -38,11 +38,11 @@ LOG = logging.getLogger(".rtfdoc") # Load the base BaseDoc class # #------------------------------------------------------------------------ -from gen.plug.docgen import (BaseDoc, TextDoc, FONT_SERIF, PARA_ALIGN_RIGHT, +from gramps.gen.plug.docgen import (BaseDoc, TextDoc, FONT_SERIF, PARA_ALIGN_RIGHT, PARA_ALIGN_CENTER, PARA_ALIGN_JUSTIFY, URL_PATTERN) -from gen.utils.image import image_size, image_actual_size, resize_to_jpeg_buffer -from gen.errors import ReportError +from gramps.gen.utils.image import image_size, image_actual_size, resize_to_jpeg_buffer +from gramps.gen.errors import ReportError #------------------------------------------------------------------------ # diff --git a/gramps/plugins/docgen/svgdrawdoc.py b/gramps/plugins/docgen/svgdrawdoc.py index f3b279261..5b5f0384a 100644 --- a/gramps/plugins/docgen/svgdrawdoc.py +++ b/gramps/plugins/docgen/svgdrawdoc.py @@ -31,7 +31,7 @@ SVG document generator. # python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ import StringIO #------------------------------------------------------------------------- @@ -39,8 +39,8 @@ import StringIO # Gramps modules # #------------------------------------------------------------------------- -from gen.plug.docgen import BaseDoc, DrawDoc, SOLID, FONT_SANS_SERIF -from gen.errors import ReportError +from gramps.gen.plug.docgen import BaseDoc, DrawDoc, SOLID, FONT_SANS_SERIF +from gramps.gen.errors import ReportError #------------------------------------------------------------------------- # diff --git a/gramps/plugins/drawreport/ancestortree.py b/gramps/plugins/drawreport/ancestortree.py index fb67473ab..04172b459 100644 --- a/gramps/plugins/drawreport/ancestortree.py +++ b/gramps/plugins/drawreport/ancestortree.py @@ -38,7 +38,7 @@ def log2(val): X_INDEX = log2 -from gen.ggettext import sgettext as _ +from gramps.gen.ggettext import sgettext as _ #------------------------------------------------------------------------ # @@ -46,20 +46,20 @@ from gen.ggettext import sgettext as _ # #------------------------------------------------------------------------ -#from gen.errors import ReportError +#from gramps.gen.errors import ReportError -from gen.plug.menu import BooleanOption -from gen.plug.menu import NumberOption -from gen.plug.menu import StringOption -from gen.plug.menu import EnumeratedListOption -from gen.plug.menu import TextOption -from gen.plug.menu import PersonOption +from gramps.gen.plug.menu import BooleanOption +from gramps.gen.plug.menu import NumberOption +from gramps.gen.plug.menu import StringOption +from gramps.gen.plug.menu import EnumeratedListOption +from gramps.gen.plug.menu import TextOption +from gramps.gen.plug.menu import PersonOption -from gen.plug.report import Report -from gen.plug.report import utils as ReportUtils -from gen.plug.report import MenuReportOptions +from gramps.gen.plug.report import Report +from gramps.gen.plug.report import utils as ReportUtils +from gramps.gen.plug.report import MenuReportOptions -from gen.display.name import displayer as name_displayer +from gramps.gen.display.name import displayer as name_displayer PT2CM = ReportUtils.pt2cm #cm2pt = ReportUtils.cm2pt @@ -820,7 +820,7 @@ class AncestorTree(Report): """ style_sheet = self.doc.get_style_sheet() - from gen.plug.docgen import GraphicsStyle + from gramps.gen.plug.docgen import GraphicsStyle graph_style = style_sheet.get_draw_style("AC2-box") graph_style.set_shadow(graph_style.get_shadow(), @@ -1089,7 +1089,7 @@ class AncestorTreeOptions(MenuReportOptions): def make_default_style(self, default_style): """Make the default output style for the Ancestor Tree.""" - from gen.plug.docgen import (FontStyle, ParagraphStyle, GraphicsStyle, + from gramps.gen.plug.docgen import (FontStyle, ParagraphStyle, GraphicsStyle, FONT_SANS_SERIF, PARA_ALIGN_CENTER) ## Paragraph Styles: diff --git a/gramps/plugins/drawreport/calendarreport.py b/gramps/plugins/drawreport/calendarreport.py index c4d71872a..3145ae36a 100644 --- a/gramps/plugins/drawreport/calendarreport.py +++ b/gramps/plugins/drawreport/calendarreport.py @@ -26,8 +26,8 @@ # python modules # #------------------------------------------------------------------------ -from gen.ggettext import gettext as _ -from gen.ggettext import ngettext +from gramps.gen.ggettext import gettext as _ +from gramps.gen.ggettext import ngettext from functools import partial import datetime import time @@ -37,21 +37,21 @@ import time # GRAMPS modules # #------------------------------------------------------------------------ -from gen.display.name import displayer as _nd -from gen.errors import ReportError -from gen.relationship import get_relationship_calculator -from gen.plug.docgen import (FontStyle, ParagraphStyle, GraphicsStyle, +from gramps.gen.display.name import displayer as _nd +from gramps.gen.errors import ReportError +from gramps.gen.relationship import get_relationship_calculator +from gramps.gen.plug.docgen import (FontStyle, ParagraphStyle, GraphicsStyle, FONT_SERIF, PARA_ALIGN_CENTER, PARA_ALIGN_LEFT, PARA_ALIGN_RIGHT, IndexMark, INDEX_TYPE_TOC) -from gen.plug.docgen.fontscale import string_trim -from gen.plug.menu import (BooleanOption, StringOption, NumberOption, +from gramps.gen.plug.docgen.fontscale import string_trim +from gramps.gen.plug.menu import (BooleanOption, StringOption, NumberOption, EnumeratedListOption, FilterOption, PersonOption) -from gen.plug.report import Report -from gen.plug.report import utils as ReportUtils -from gen.plug.report import MenuReportOptions -from gen.utils.alive import probably_alive -from gen.datehandler import displayer as _dd, long_days +from gramps.gen.plug.report import Report +from gramps.gen.plug.report import utils as ReportUtils +from gramps.gen.plug.report import MenuReportOptions +from gramps.gen.utils.alive import probably_alive +from gramps.gen.datehandler import displayer as _dd, long_days from gramps.gen.lib import Date, EventRoleType, EventType, Name, NameType, Person, Surname import gramps.plugins.lib.libholiday as libholiday diff --git a/gramps/plugins/drawreport/descendtree.py b/gramps/plugins/drawreport/descendtree.py index 8fb49df63..12e6246cb 100644 --- a/gramps/plugins/drawreport/descendtree.py +++ b/gramps/plugins/drawreport/descendtree.py @@ -33,21 +33,21 @@ Reports/Graphical Reports/Personal Tree # GRAMPS modules # #------------------------------------------------------------------------ -from gen.ggettext import sgettext as _ +from gramps.gen.ggettext import sgettext as _ -from gen.errors import ReportError +from gramps.gen.errors import ReportError -from gen.plug.menu import TextOption -from gen.plug.menu import NumberOption -from gen.plug.menu import EnumeratedListOption -from gen.plug.menu import StringOption -from gen.plug.menu import BooleanOption -from gen.plug.menu import PersonOption -from gen.plug.menu import FamilyOption +from gramps.gen.plug.menu import TextOption +from gramps.gen.plug.menu import NumberOption +from gramps.gen.plug.menu import EnumeratedListOption +from gramps.gen.plug.menu import StringOption +from gramps.gen.plug.menu import BooleanOption +from gramps.gen.plug.menu import PersonOption +from gramps.gen.plug.menu import FamilyOption -from gen.plug.report import Report -from gen.plug.report import utils as ReportUtils -from gen.plug.report import MenuReportOptions +from gramps.gen.plug.report import Report +from gramps.gen.plug.report import utils as ReportUtils +from gramps.gen.plug.report import MenuReportOptions PT2CM = ReportUtils.pt2cm @@ -1676,7 +1676,7 @@ class DescendTreeOptions(MenuReportOptions): def make_default_style(self, default_style): """Make the default output style for the Descendant Tree.""" - from gen.plug.docgen import (FontStyle, ParagraphStyle, GraphicsStyle, + from gramps.gen.plug.docgen import (FontStyle, ParagraphStyle, GraphicsStyle, FONT_SANS_SERIF, PARA_ALIGN_CENTER) ## Paragraph Styles: diff --git a/gramps/plugins/drawreport/fanchart.py b/gramps/plugins/drawreport/fanchart.py index 879443709..61de2ec32 100644 --- a/gramps/plugins/drawreport/fanchart.py +++ b/gramps/plugins/drawreport/fanchart.py @@ -28,7 +28,7 @@ # python modules # #------------------------------------------------------------------------ -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ from math import pi, cos, sin, log10, acos def log2(val): @@ -42,17 +42,17 @@ def log2(val): # gramps modules # #------------------------------------------------------------------------ -from gen.errors import ReportError -from gen.plug.docgen import (FontStyle, ParagraphStyle, GraphicsStyle, +from gramps.gen.errors import ReportError +from gramps.gen.plug.docgen import (FontStyle, ParagraphStyle, GraphicsStyle, FONT_SANS_SERIF, PARA_ALIGN_CENTER, IndexMark, INDEX_TYPE_TOC) -from gen.plug.menu import (EnumeratedListOption, NumberOption, PersonOption, +from gramps.gen.plug.menu import (EnumeratedListOption, NumberOption, PersonOption, BooleanOption) -from gen.plug.report import Report -from gen.plug.report import utils -from gen.plug.report import MenuReportOptions -from gen.config import config -from gen.utils.db import get_birth_or_fallback, get_death_or_fallback +from gramps.gen.plug.report import Report +from gramps.gen.plug.report import utils +from gramps.gen.plug.report import MenuReportOptions +from gramps.gen.config import config +from gramps.gen.utils.db import get_birth_or_fallback, get_death_or_fallback from gramps.gen.lib import EventType #------------------------------------------------------------------------ diff --git a/gramps/plugins/drawreport/statisticschart.py b/gramps/plugins/drawreport/statisticschart.py index 2b7eb478e..da2643bc0 100644 --- a/gramps/plugins/drawreport/statisticschart.py +++ b/gramps/plugins/drawreport/statisticschart.py @@ -33,7 +33,7 @@ # #------------------------------------------------------------------------ import time -from gen.ggettext import sgettext as _ +from gramps.gen.ggettext import sgettext as _ from functools import partial #------------------------------------------------------------------------ @@ -43,18 +43,18 @@ from functools import partial #------------------------------------------------------------------------ # Person and relation types -from gen.lib import Person, FamilyRelType, EventType, EventRoleType -from gen.lib.date import Date +from gramps.gen.lib import Person, FamilyRelType, EventType, EventRoleType +from gramps.gen.lib.date import Date # gender and report type names -from gen.plug.docgen import (FontStyle, ParagraphStyle, GraphicsStyle, +from gramps.gen.plug.docgen import (FontStyle, ParagraphStyle, GraphicsStyle, FONT_SANS_SERIF, FONT_SERIF, PARA_ALIGN_CENTER, PARA_ALIGN_LEFT, IndexMark, INDEX_TYPE_TOC) -from gen.plug.menu import (BooleanOption, NumberOption, EnumeratedListOption, +from gramps.gen.plug.menu import (BooleanOption, NumberOption, EnumeratedListOption, FilterOption, PersonOption) -from gen.plug.report import Report -from gen.plug.report import utils as ReportUtils -from gen.plug.report import MenuReportOptions +from gramps.gen.plug.report import Report +from gramps.gen.plug.report import utils as ReportUtils +from gramps.gen.plug.report import MenuReportOptions from gramps.gen.datehandler import displayer, parser #------------------------------------------------------------------------ diff --git a/gramps/plugins/drawreport/timeline.py b/gramps/plugins/drawreport/timeline.py index 9ddc12fa6..0d11a96af 100644 --- a/gramps/plugins/drawreport/timeline.py +++ b/gramps/plugins/drawreport/timeline.py @@ -32,25 +32,25 @@ Timeline Chart # python modules # #------------------------------------------------------------------------ -from gen.ggettext import sgettext as _ +from gramps.gen.ggettext import sgettext as _ #------------------------------------------------------------------------ # # GRAMPS modules # #------------------------------------------------------------------------ -from gen.plug.menu import PersonOption, FilterOption, EnumeratedListOption -from gen.plug.report import Report -from gen.plug.report import utils as ReportUtils -from gen.plug.report import MenuReportOptions +from gramps.gen.plug.menu import PersonOption, FilterOption, EnumeratedListOption +from gramps.gen.plug.report import Report +from gramps.gen.plug.report import utils as ReportUtils +from gramps.gen.plug.report import MenuReportOptions pt2cm = ReportUtils.pt2cm -from gen.plug.docgen import (FontStyle, ParagraphStyle, GraphicsStyle, +from gramps.gen.plug.docgen import (FontStyle, ParagraphStyle, GraphicsStyle, FONT_SANS_SERIF, DASHED, PARA_ALIGN_CENTER, IndexMark, INDEX_TYPE_TOC) -from gen.sort import Sort -from gen.display.name import displayer as name_displayer -from gen.config import config -from gen.utils.db import get_birth_or_fallback, get_death_or_fallback +from gramps.gen.sort import Sort +from gramps.gen.display.name import displayer as name_displayer +from gramps.gen.config import config +from gramps.gen.utils.db import get_birth_or_fallback, get_death_or_fallback #------------------------------------------------------------------------ # diff --git a/gramps/plugins/export/exportcsv.py b/gramps/plugins/export/exportcsv.py index e3f49d637..ab562811c 100644 --- a/gramps/plugins/export/exportcsv.py +++ b/gramps/plugins/export/exportcsv.py @@ -31,7 +31,7 @@ # #------------------------------------------------------------------------- import os -from gen.ggettext import sgettext as _ +from gramps.gen.ggettext import sgettext as _ import csv import cStringIO import codecs @@ -50,11 +50,11 @@ LOG = logging.getLogger(".ExportCSV") # #------------------------------------------------------------------------- from gramps.gen.lib import EventType, Person -from gen.lib.eventroletype import EventRoleType -from gui.plug.export import WriterOptionBox -from gen.utils.string import gender as gender_map +from gramps.gen.lib.eventroletype import EventRoleType +from gramps.gui.plug.export import WriterOptionBox +from gramps.gen.utils.string import gender as gender_map from gramps.gen.datehandler import get_date -from gui.glade import Glade +from gramps.gui.glade import Glade #------------------------------------------------------------------------- # diff --git a/gramps/plugins/export/exportftree.py b/gramps/plugins/export/exportftree.py index bc6819e1f..0b5693cc7 100644 --- a/gramps/plugins/export/exportftree.py +++ b/gramps/plugins/export/exportftree.py @@ -30,7 +30,7 @@ # #------------------------------------------------------------------------- import os -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ #------------------------------------------------------------------------ # @@ -45,9 +45,9 @@ log = logging.getLogger(".WriteFtree") # GRAMPS modules # #------------------------------------------------------------------------- -from gen.utils.alive import probably_alive -from gui.plug.export import WriterOptionBox -from gui.glade import Glade +from gramps.gen.utils.alive import probably_alive +from gramps.gui.plug.export import WriterOptionBox +from gramps.gui.glade import Glade #------------------------------------------------------------------------- # diff --git a/gramps/plugins/export/exportgedcom.py b/gramps/plugins/export/exportgedcom.py index 9e93b8dc8..8fe2b2c1d 100644 --- a/gramps/plugins/export/exportgedcom.py +++ b/gramps/plugins/export/exportgedcom.py @@ -33,7 +33,7 @@ # Standard Python Modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ import os import time @@ -43,13 +43,13 @@ import time # #------------------------------------------------------------------------- from gramps.gen.lib import AttributeType, ChildRefType, Citation, Date, EventRoleType, EventType, LdsOrd, NameType, NoteType, Person, UrlType -from gen.const import VERSION +from gramps.gen.const import VERSION import gramps.plugins.lib.libgedcom as libgedcom -from gen.errors import DatabaseError -from gui.plug.export import WriterOptionBox -from gen.updatecallback import UpdateCallback -from gen.utils.file import media_path_full -from gen.utils.place import conv_lat_lon +from gramps.gen.errors import DatabaseError +from gramps.gui.plug.export import WriterOptionBox +from gramps.gen.updatecallback import UpdateCallback +from gramps.gen.utils.file import media_path_full +from gramps.gen.utils.place import conv_lat_lon #------------------------------------------------------------------------- # diff --git a/gramps/plugins/export/exportgeneweb.py b/gramps/plugins/export/exportgeneweb.py index 69c4f1b23..27aac308a 100644 --- a/gramps/plugins/export/exportgeneweb.py +++ b/gramps/plugins/export/exportgeneweb.py @@ -31,7 +31,7 @@ # #------------------------------------------------------------------------- import os -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ #------------------------------------------------------------------------ # @@ -47,10 +47,10 @@ log = logging.getLogger(".WriteGeneWeb") # #------------------------------------------------------------------------- from gramps.gen.lib import Date, Event, EventType, FamilyRelType, Person -from gui.plug.export import WriterOptionBox -from gen.utils.alive import probably_alive -from gui.glade import Glade -from gen.config import config +from gramps.gui.plug.export import WriterOptionBox +from gramps.gen.utils.alive import probably_alive +from gramps.gui.glade import Glade +from gramps.gen.config import config class GeneWebWriter(object): def __init__(self, database, filename, user, option_box=None): diff --git a/gramps/plugins/export/exportpkg.py b/gramps/plugins/export/exportpkg.py index da5787bf6..db045f025 100644 --- a/gramps/plugins/export/exportpkg.py +++ b/gramps/plugins/export/exportpkg.py @@ -37,7 +37,7 @@ import os import sys import tarfile from cStringIO import StringIO -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ #------------------------------------------------------------------------ # @@ -59,10 +59,10 @@ from gi.repository import Gtk # GRAMPS modules # #------------------------------------------------------------------------- -from gui.plug.export import WriterOptionBox +from gramps.gui.plug.export import WriterOptionBox from exportxml import XmlWriter -from gen.utils.file import media_path_full, get_unicode_path_from_file_chooser -from gen.constfunc import win +from gramps.gen.utils.file import media_path_full, get_unicode_path_from_file_chooser +from gramps.gen.constfunc import win #------------------------------------------------------------------------- # diff --git a/gramps/plugins/export/exportvcalendar.py b/gramps/plugins/export/exportvcalendar.py index ed4fcc8c6..a815ba9cd 100644 --- a/gramps/plugins/export/exportvcalendar.py +++ b/gramps/plugins/export/exportvcalendar.py @@ -32,7 +32,7 @@ import os import sys from time import localtime -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ #------------------------------------------------------------------------ # @@ -47,10 +47,10 @@ log = logging.getLogger(".ExportVCal") # GRAMPS modules # #------------------------------------------------------------------------- -from gui.plug.export import WriterOptionBox -from gen.utils.db import family_name -from gen.lib import Date, EventType -from gui.glade import Glade +from gramps.gui.plug.export import WriterOptionBox +from gramps.gen.utils.db import family_name +from gramps.gen.lib import Date, EventType +from gramps.gui.glade import Glade class CalendarWriter(object): def __init__(self, database, filename, user, option_box=None): diff --git a/gramps/plugins/export/exportvcard.py b/gramps/plugins/export/exportvcard.py index 70c457c6e..7d17f64e4 100644 --- a/gramps/plugins/export/exportvcard.py +++ b/gramps/plugins/export/exportvcard.py @@ -46,14 +46,14 @@ log = logging.getLogger(".ExportVCard") # GRAMPS modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ -from gui.plug.export import WriterOptionBox -from gen.const import PROGRAM_NAME, VERSION -from gen.lib import Date -from gen.lib.urltype import UrlType -from gen.lib.eventtype import EventType -from gen.display.name import displayer as _nd -from gen.plug.utils import OpenFileOrStdout +from gramps.gen.ggettext import gettext as _ +from gramps.gui.plug.export import WriterOptionBox +from gramps.gen.const import PROGRAM_NAME, VERSION +from gramps.gen.lib import Date +from gramps.gen.lib.urltype import UrlType +from gramps.gen.lib.eventtype import EventType +from gramps.gen.display.name import displayer as _nd +from gramps.gen.plug.utils import OpenFileOrStdout #------------------------------------------------------------------------- diff --git a/gramps/plugins/export/exportxml.py b/gramps/plugins/export/exportxml.py index c48e530e1..c358d5ec6 100644 --- a/gramps/plugins/export/exportxml.py +++ b/gramps/plugins/export/exportxml.py @@ -41,7 +41,7 @@ import shutil import os import codecs from xml.sax.saxutils import escape -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ #------------------------------------------------------------------------ @@ -58,11 +58,11 @@ LOG = logging.getLogger(".WriteXML") # #------------------------------------------------------------------------- from gramps.gen.lib import Date, Person -from gen.updatecallback import UpdateCallback -from gen.db.exceptions import DbWriteFailure -from gen.const import VERSION -from gen.constfunc import win -from gui.plug.export import WriterOptionBox +from gramps.gen.updatecallback import UpdateCallback +from gramps.gen.db.exceptions import DbWriteFailure +from gramps.gen.const import VERSION +from gramps.gen.constfunc import win +from gramps.gui.plug.export import WriterOptionBox import gramps.plugins.lib.libgrampsxml as libgrampsxml #------------------------------------------------------------------------- diff --git a/gramps/plugins/gramplet/ageondategramplet.py b/gramps/plugins/gramplet/ageondategramplet.py index 4b089fea4..c34145af4 100644 --- a/gramps/plugins/gramplet/ageondategramplet.py +++ b/gramps/plugins/gramplet/ageondategramplet.py @@ -34,10 +34,10 @@ on a particular date. # GRAMPS modules # #------------------------------------------------------------------------ -from gen.plug import Gramplet -from gen.ggettext import sgettext as _ +from gramps.gen.plug import Gramplet +from gramps.gen.ggettext import sgettext as _ from gramps.gen.datehandler import parser -from gui.plug.quick import run_quick_report_by_name +from gramps.gui.plug.quick import run_quick_report_by_name #------------------------------------------------------------------------ # diff --git a/gramps/plugins/gramplet/agestats.py b/gramps/plugins/gramplet/agestats.py index 642330838..c84801094 100644 --- a/gramps/plugins/gramplet/agestats.py +++ b/gramps/plugins/gramplet/agestats.py @@ -27,8 +27,8 @@ This Gramplet shows textual distributions of age breakdowns of various types. import locale from collections import defaultdict -from gen.plug import Gramplet -from gen.ggettext import gettext as _ +from gramps.gen.plug import Gramplet +from gramps.gen.ggettext import gettext as _ from gramps.gen.lib import ChildRefType class AgeStatsGramplet(Gramplet): @@ -43,7 +43,7 @@ class AgeStatsGramplet(Gramplet): self.disconnect("active-changed") def build_options(self): - from gen.plug.menu import NumberOption + from gramps.gen.plug.menu import NumberOption self.add_option(NumberOption(_("Max age"), self.max_age, 1, 150)) self.add_option(NumberOption(_("Max age of Mother at birth"), diff --git a/gramps/plugins/gramplet/attributes.py b/gramps/plugins/gramplet/attributes.py index 14107ebdc..69e6f6e95 100644 --- a/gramps/plugins/gramplet/attributes.py +++ b/gramps/plugins/gramplet/attributes.py @@ -19,10 +19,10 @@ # $Id$ # -from gui.listmodel import ListModel, NOSORT -from gui.plug.quick import run_quick_report_by_name -from gen.plug import Gramplet -from gen.ggettext import gettext as _ +from gramps.gui.listmodel import ListModel, NOSORT +from gramps.gui.plug.quick import run_quick_report_by_name +from gramps.gen.plug import Gramplet +from gramps.gen.ggettext import gettext as _ from gi.repository import Gtk class Attributes(Gramplet): diff --git a/gramps/plugins/gramplet/attributesgramplet.py b/gramps/plugins/gramplet/attributesgramplet.py index 6be4b6954..51876bac0 100644 --- a/gramps/plugins/gramplet/attributesgramplet.py +++ b/gramps/plugins/gramplet/attributesgramplet.py @@ -19,9 +19,9 @@ # $Id$ # -from gen.plug import Gramplet -from gen.display.name import displayer as name_displayer -from gen.ggettext import gettext as _ +from gramps.gen.plug import Gramplet +from gramps.gen.display.name import displayer as name_displayer +from gramps.gen.ggettext import gettext as _ class AttributesGramplet(Gramplet): """ diff --git a/gramps/plugins/gramplet/backlinks.py b/gramps/plugins/gramplet/backlinks.py index fc961949c..dc90974d5 100644 --- a/gramps/plugins/gramplet/backlinks.py +++ b/gramps/plugins/gramplet/backlinks.py @@ -20,10 +20,10 @@ # $Id$ # -from gui.listmodel import ListModel, NOSORT -from gen.utils.db import navigation_label -from gen.plug import Gramplet -from gen.ggettext import gettext as _ +from gramps.gui.listmodel import ListModel, NOSORT +from gramps.gen.utils.db import navigation_label +from gramps.gen.plug import Gramplet +from gramps.gen.ggettext import gettext as _ from gi.repository import Gtk class Backlinks(Gramplet): diff --git a/gramps/plugins/gramplet/calendargramplet.py b/gramps/plugins/gramplet/calendargramplet.py index 594ed11e8..bfb3f4c2b 100644 --- a/gramps/plugins/gramplet/calendargramplet.py +++ b/gramps/plugins/gramplet/calendargramplet.py @@ -23,9 +23,9 @@ # GRAMPS modules # #------------------------------------------------------------------------ -from gen.plug import Gramplet -from gen.ggettext import sgettext as _ -from gui.plug.quick import run_quick_report_by_name +from gramps.gen.plug import Gramplet +from gramps.gen.ggettext import sgettext as _ +from gramps.gui.plug.quick import run_quick_report_by_name from gramps.gen.lib import Date #------------------------------------------------------------------------ diff --git a/gramps/plugins/gramplet/children.py b/gramps/plugins/gramplet/children.py index 876bab7e6..434f64992 100644 --- a/gramps/plugins/gramplet/children.py +++ b/gramps/plugins/gramplet/children.py @@ -19,14 +19,14 @@ # $Id$ # -from gui.editors import EditPerson -from gui.listmodel import ListModel, NOSORT -from gen.plug import Gramplet -from gen.ggettext import gettext as _ -from gen.display.name import displayer as name_displayer -from gen.utils.db import get_birth_or_fallback, get_death_or_fallback +from gramps.gui.editors import EditPerson +from gramps.gui.listmodel import ListModel, NOSORT +from gramps.gen.plug import Gramplet +from gramps.gen.ggettext import gettext as _ +from gramps.gen.display.name import displayer as name_displayer +from gramps.gen.utils.db import get_birth_or_fallback, get_death_or_fallback from gramps.gen.datehandler import get_date -from gen.errors import WindowActiveError +from gramps.gen.errors import WindowActiveError from gi.repository import Gtk class Children(Gramplet): diff --git a/gramps/plugins/gramplet/citations.py b/gramps/plugins/gramplet/citations.py index 969510699..10b5ddb7f 100644 --- a/gramps/plugins/gramplet/citations.py +++ b/gramps/plugins/gramplet/citations.py @@ -20,11 +20,11 @@ # $Id$ # -from gui.editors import EditSource, EditCitation -from gui.listmodel import ListModel, NOSORT -from gen.plug import Gramplet -from gen.ggettext import gettext as _ -from gen.errors import WindowActiveError +from gramps.gui.editors import EditSource, EditCitation +from gramps.gui.listmodel import ListModel, NOSORT +from gramps.gen.plug import Gramplet +from gramps.gen.ggettext import gettext as _ +from gramps.gen.errors import WindowActiveError from gi.repository import Gtk class Citations(Gramplet): diff --git a/gramps/plugins/gramplet/descendgramplet.py b/gramps/plugins/gramplet/descendgramplet.py index 7f64084ec..19519009d 100644 --- a/gramps/plugins/gramplet/descendgramplet.py +++ b/gramps/plugins/gramplet/descendgramplet.py @@ -30,18 +30,18 @@ # standard python modules # #------------------------------------------------------------------------ -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ #------------------------------------------------------------------------ # # GRAMPS modules # #------------------------------------------------------------------------ -from gen.plug import Gramplet -from gen.plug.report import utils as ReportUtils -from gen.display.name import displayer as name_displayer +from gramps.gen.plug import Gramplet +from gramps.gen.plug.report import utils as ReportUtils +from gramps.gen.display.name import displayer as name_displayer from gramps.gen.datehandler import get_date -from gen.utils.db import get_birth_or_fallback, get_death_or_fallback +from gramps.gen.utils.db import get_birth_or_fallback, get_death_or_fallback class DescendantGramplet(Gramplet): def init(self): diff --git a/gramps/plugins/gramplet/editexifmetadata.py b/gramps/plugins/gramplet/editexifmetadata.py index df54d4da0..72445f657 100644 --- a/gramps/plugins/gramplet/editexifmetadata.py +++ b/gramps/plugins/gramplet/editexifmetadata.py @@ -47,27 +47,27 @@ from gi.repository import Gtk # ----------------------------------------------------------------------------- # GRAMPS modules # ----------------------------------------------------------------------------- -from gui.display import display_help +from gramps.gui.display import display_help -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ -from gen.datehandler import displayer as _dd -from gen.datehandler import parser as _dp +from gramps.gen.datehandler import displayer as _dd +from gramps.gen.datehandler import parser as _dp -from gen.plug import Gramplet +from gramps.gen.plug import Gramplet from gramps.plugins.lib.libmetadata import MetadataView, format_datetime -from gui.widgets import ValidatableMaskedEntry -from gen.errors import ValidationError -from gui.dialog import QuestionDialog, OptionDialog +from gramps.gui.widgets import ValidatableMaskedEntry +from gramps.gen.errors import ValidationError +from gramps.gui.dialog import QuestionDialog, OptionDialog -from gen.lib import Date +from gramps.gen.lib import Date from gramps.gen.mime import get_description -from gen.utils.file import search_for, media_path_full -from gen.utils.place import conv_lat_lon +from gramps.gen.utils.file import search_for, media_path_full +from gramps.gen.utils.place import conv_lat_lon -from gen.db import DbTxn +from gramps.gen.db import DbTxn # validate that pyexiv2 is installed and its version... import pyexiv2 diff --git a/gramps/plugins/gramplet/events.py b/gramps/plugins/gramplet/events.py index 07715fef3..9d991d214 100644 --- a/gramps/plugins/gramplet/events.py +++ b/gramps/plugins/gramplet/events.py @@ -19,16 +19,16 @@ # $Id$ # -from gui.editors import EditEvent -from gui.listmodel import ListModel, NOSORT -from gen.plug import Gramplet -from gen.ggettext import gettext as _ -from gen.display.name import displayer as name_displayer +from gramps.gui.editors import EditEvent +from gramps.gui.listmodel import ListModel, NOSORT +from gramps.gen.plug import Gramplet +from gramps.gen.ggettext import gettext as _ +from gramps.gen.display.name import displayer as name_displayer from gramps.gen.datehandler import get_date -from gen.utils.db import get_birth_or_fallback, get_marriage_or_fallback -from gen.errors import WindowActiveError +from gramps.gen.utils.db import get_birth_or_fallback, get_marriage_or_fallback +from gramps.gen.errors import WindowActiveError from gi.repository import Gtk -from gen.config import config +from gramps.gen.config import config age_precision = config.get('preferences.age-display-precision') diff --git a/gramps/plugins/gramplet/fanchartdescgramplet.py b/gramps/plugins/gramplet/fanchartdescgramplet.py index a7702e9da..0f58202ec 100644 --- a/gramps/plugins/gramplet/fanchartdescgramplet.py +++ b/gramps/plugins/gramplet/fanchartdescgramplet.py @@ -42,13 +42,13 @@ except ImportError: # GRAMPS modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ -from gen.plug import Gramplet -from gen.errors import WindowActiveError -from gui.editors import EditPerson -from gui.widgets.fanchartdesc import (FanChartDescWidget, FanChartDescGrampsGUI, +from gramps.gen.ggettext import gettext as _ +from gramps.gen.plug import Gramplet +from gramps.gen.errors import WindowActiveError +from gramps.gui.editors import EditPerson +from gramps.gui.widgets.fanchartdesc import (FanChartDescWidget, FanChartDescGrampsGUI, ANGLE_WEIGHT) -from gui.widgets.fanchart import FORM_HALFCIRCLE, BACKGROUND_SCHEME1 +from gramps.gui.widgets.fanchart import FORM_HALFCIRCLE, BACKGROUND_SCHEME1 class FanChartDescGramplet(FanChartDescGrampsGUI, Gramplet): """ diff --git a/gramps/plugins/gramplet/fanchartgramplet.py b/gramps/plugins/gramplet/fanchartgramplet.py index e7ab533e7..b37a0e926 100644 --- a/gramps/plugins/gramplet/fanchartgramplet.py +++ b/gramps/plugins/gramplet/fanchartgramplet.py @@ -48,11 +48,11 @@ except ImportError: # GRAMPS modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ -from gen.plug import Gramplet -from gen.errors import WindowActiveError -from gui.editors import EditPerson -from gui.widgets.fanchart import (FanChartWidget, FanChartGrampsGUI, +from gramps.gen.ggettext import gettext as _ +from gramps.gen.plug import Gramplet +from gramps.gen.errors import WindowActiveError +from gramps.gui.editors import EditPerson +from gramps.gui.widgets.fanchart import (FanChartWidget, FanChartGrampsGUI, FORM_HALFCIRCLE, BACKGROUND_SCHEME1) class FanChartGramplet(FanChartGrampsGUI, Gramplet): diff --git a/gramps/plugins/gramplet/faqgramplet.py b/gramps/plugins/gramplet/faqgramplet.py index 6c685a3ba..eb68fad07 100644 --- a/gramps/plugins/gramplet/faqgramplet.py +++ b/gramps/plugins/gramplet/faqgramplet.py @@ -23,9 +23,9 @@ # GRAMPS modules # #------------------------------------------------------------------------ -from gen.plug import Gramplet -from gen.ggettext import sgettext as _ -from gen.const import URL_MANUAL_PAGE +from gramps.gen.plug import Gramplet +from gramps.gen.ggettext import sgettext as _ +from gramps.gen.const import URL_MANUAL_PAGE #------------------------------------------------------------------------ # diff --git a/gramps/plugins/gramplet/filter.py b/gramps/plugins/gramplet/filter.py index 447a52462..bfdeecfeb 100644 --- a/gramps/plugins/gramplet/filter.py +++ b/gramps/plugins/gramplet/filter.py @@ -26,8 +26,8 @@ # Gramps modules # #------------------------------------------------------------------------- -from gen.plug import Gramplet -from gui.filters.sidebar import (PersonSidebarFilter, FamilySidebarFilter, +from gramps.gen.plug import Gramplet +from gramps.gui.filters.sidebar import (PersonSidebarFilter, FamilySidebarFilter, EventSidebarFilter, SourceSidebarFilter, CitationSidebarFilter, PlaceSidebarFilter, MediaSidebarFilter, diff --git a/gramps/plugins/gramplet/gallery.py b/gramps/plugins/gramplet/gallery.py index 0b0213873..270df9a87 100644 --- a/gramps/plugins/gramplet/gallery.py +++ b/gramps/plugins/gramplet/gallery.py @@ -20,9 +20,9 @@ # $Id$ # -from gen.plug import Gramplet -from gui.widgets import Photo -from gen.utils.file import media_path_full +from gramps.gen.plug import Gramplet +from gramps.gui.widgets import Photo +from gramps.gen.utils.file import media_path_full from gi.repository import Gtk class Gallery(Gramplet): diff --git a/gramps/plugins/gramplet/givennamegramplet.py b/gramps/plugins/gramplet/givennamegramplet.py index 5c1a1f188..3c3eb26a3 100644 --- a/gramps/plugins/gramplet/givennamegramplet.py +++ b/gramps/plugins/gramplet/givennamegramplet.py @@ -21,10 +21,10 @@ # # from collections import defaultdict -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ -from gen.plug import Gramplet -from gen.config import config +from gramps.gen.plug import Gramplet +from gramps.gen.config import config _YIELD_INTERVAL = 350 diff --git a/gramps/plugins/gramplet/mediapreview.py b/gramps/plugins/gramplet/mediapreview.py index 749f738cf..1ad0f55a9 100644 --- a/gramps/plugins/gramplet/mediapreview.py +++ b/gramps/plugins/gramplet/mediapreview.py @@ -19,9 +19,9 @@ # $Id$ # -from gen.plug import Gramplet -from gui.widgets import Photo -from gen.utils.file import media_path_full +from gramps.gen.plug import Gramplet +from gramps.gui.widgets import Photo +from gramps.gen.utils.file import media_path_full from gi.repository import Gtk class MediaPreview(Gramplet): diff --git a/gramps/plugins/gramplet/metadataviewer.py b/gramps/plugins/gramplet/metadataviewer.py index 5c6d2f2ec..54d187e4c 100644 --- a/gramps/plugins/gramplet/metadataviewer.py +++ b/gramps/plugins/gramplet/metadataviewer.py @@ -23,8 +23,8 @@ # from gramps.plugins.lib.libmetadata import MetadataView -from gen.plug import Gramplet -from gen.utils.file import media_path_full +from gramps.gen.plug import Gramplet +from gramps.gen.utils.file import media_path_full class MetadataViewer(Gramplet): """ diff --git a/gramps/plugins/gramplet/notes.py b/gramps/plugins/gramplet/notes.py index 0522f6ddf..3b147c0ff 100644 --- a/gramps/plugins/gramplet/notes.py +++ b/gramps/plugins/gramplet/notes.py @@ -20,11 +20,11 @@ # $Id$ # -from gen.plug import Gramplet -from gui.widgets.styledtexteditor import StyledTextEditor -from gui.widgets import SimpleButton -from gen.lib import StyledText -from gen.ggettext import gettext as _ +from gramps.gen.plug import Gramplet +from gramps.gui.widgets.styledtexteditor import StyledTextEditor +from gramps.gui.widgets import SimpleButton +from gramps.gen.lib import StyledText +from gramps.gen.ggettext import gettext as _ from gi.repository import Gtk class Notes(Gramplet): diff --git a/gramps/plugins/gramplet/pedigreegramplet.py b/gramps/plugins/gramplet/pedigreegramplet.py index 929293c6b..5b73a6836 100644 --- a/gramps/plugins/gramplet/pedigreegramplet.py +++ b/gramps/plugins/gramplet/pedigreegramplet.py @@ -32,13 +32,13 @@ import locale # GRAMPS modules # #------------------------------------------------------------------------ -from gen.plug import Gramplet -from gen.ggettext import sgettext as _ -from gen.ggettext import ngettext -from gen.display.name import displayer as name_displayer +from gramps.gen.plug import Gramplet +from gramps.gen.ggettext import sgettext as _ +from gramps.gen.ggettext import ngettext +from gramps.gen.display.name import displayer as name_displayer from gramps.gen.datehandler import get_date import gen -from gen.utils.db import get_birth_or_fallback, get_death_or_fallback +from gramps.gen.utils.db import get_birth_or_fallback, get_death_or_fallback #------------------------------------------------------------------------ # @@ -55,7 +55,7 @@ class PedigreeGramplet(Gramplet): self.box_mode = "UTF" def build_options(self): - from gen.plug.menu import NumberOption, BooleanOption, EnumeratedListOption + from gramps.gen.plug.menu import NumberOption, BooleanOption, EnumeratedListOption self.add_option(NumberOption(_("Max generations"), self.max_generations, 1, 100)) self.add_option(BooleanOption(_("Show dates"), bool(self.show_dates))) diff --git a/gramps/plugins/gramplet/persondetails.py b/gramps/plugins/gramplet/persondetails.py index 96ec64f7f..1aee6c517 100644 --- a/gramps/plugins/gramplet/persondetails.py +++ b/gramps/plugins/gramplet/persondetails.py @@ -19,13 +19,13 @@ # $Id$ # -from gen.lib import EventType, EventRoleType -from gen.plug import Gramplet -from gui.widgets import Photo -from gen.display.name import displayer as name_displayer -from gen.ggettext import gettext as _ +from gramps.gen.lib import EventType, EventRoleType +from gramps.gen.plug import Gramplet +from gramps.gui.widgets import Photo +from gramps.gen.display.name import displayer as name_displayer +from gramps.gen.ggettext import gettext as _ from gramps.gen.datehandler import get_date -from gen.utils.file import media_path_full +from gramps.gen.utils.file import media_path_full from gi.repository import Gtk from gi.repository import Pango diff --git a/gramps/plugins/gramplet/personresidence.py b/gramps/plugins/gramplet/personresidence.py index 0af14b19e..42a657fb8 100644 --- a/gramps/plugins/gramplet/personresidence.py +++ b/gramps/plugins/gramplet/personresidence.py @@ -19,13 +19,13 @@ # $Id$ # -from gen.lib import EventType, EventRoleType -from gui.editors import EditEvent -from gui.listmodel import ListModel, NOSORT -from gen.plug import Gramplet -from gen.ggettext import gettext as _ +from gramps.gen.lib import EventType, EventRoleType +from gramps.gui.editors import EditEvent +from gramps.gui.listmodel import ListModel, NOSORT +from gramps.gen.plug import Gramplet +from gramps.gen.ggettext import gettext as _ from gramps.gen.datehandler import get_date -from gen.errors import WindowActiveError +from gramps.gen.errors import WindowActiveError from gi.repository import Gtk class PersonResidence(Gramplet): diff --git a/gramps/plugins/gramplet/placedetails.py b/gramps/plugins/gramplet/placedetails.py index ada846542..89ca79da0 100644 --- a/gramps/plugins/gramplet/placedetails.py +++ b/gramps/plugins/gramplet/placedetails.py @@ -19,11 +19,11 @@ # $Id$ # -from gen.plug import Gramplet -from gui.widgets import Photo -from gen.ggettext import gettext as _ -from gen.utils.place import conv_lat_lon -from gen.utils.file import media_path_full +from gramps.gen.plug import Gramplet +from gramps.gui.widgets import Photo +from gramps.gen.ggettext import gettext as _ +from gramps.gen.utils.place import conv_lat_lon +from gramps.gen.utils.file import media_path_full from gi.repository import Gtk from gi.repository import Pango diff --git a/gramps/plugins/gramplet/quickviewgramplet.py b/gramps/plugins/gramplet/quickviewgramplet.py index e5a87a6f4..7e5f63112 100644 --- a/gramps/plugins/gramplet/quickviewgramplet.py +++ b/gramps/plugins/gramplet/quickviewgramplet.py @@ -31,10 +31,10 @@ # GRAMPS modules # #------------------------------------------------------------------------ -from gen.plug import Gramplet -from gen.ggettext import sgettext as _ -from gui.plug.quick import run_quick_report_by_name, get_quick_report_list -from gen.plug import (CATEGORY_QR_PERSON, CATEGORY_QR_FAMILY, +from gramps.gen.plug import Gramplet +from gramps.gen.ggettext import sgettext as _ +from gramps.gui.plug.quick import run_quick_report_by_name, get_quick_report_list +from gramps.gen.plug import (CATEGORY_QR_PERSON, CATEGORY_QR_FAMILY, CATEGORY_QR_EVENT, CATEGORY_QR_SOURCE, CATEGORY_QR_NOTE, CATEGORY_QR_MISC, CATEGORY_QR_PLACE, CATEGORY_QR_MEDIA, CATEGORY_QR_REPOSITORY, CATEGORY_QR_CITATION, @@ -101,7 +101,7 @@ class QuickViewGramplet(Gramplet): self.main() def build_options(self): - from gen.plug.menu import EnumeratedListOption + from gramps.gen.plug.menu import EnumeratedListOption # Add types: type_list = EnumeratedListOption(_("View Type"), self.gui.data[0]) for item in [("Person", _("Person")), diff --git a/gramps/plugins/gramplet/relativegramplet.py b/gramps/plugins/gramplet/relativegramplet.py index dda1ac991..e0b9dbeaf 100644 --- a/gramps/plugins/gramplet/relativegramplet.py +++ b/gramps/plugins/gramplet/relativegramplet.py @@ -23,9 +23,9 @@ # GRAMPS modules # #------------------------------------------------------------------------ -from gen.plug import Gramplet -from gen.ggettext import sgettext as _ -from gen.display.name import displayer as name_displayer +from gramps.gen.plug import Gramplet +from gramps.gen.ggettext import sgettext as _ +from gramps.gen.display.name import displayer as name_displayer #------------------------------------------------------------------------ # diff --git a/gramps/plugins/gramplet/repositorydetails.py b/gramps/plugins/gramplet/repositorydetails.py index 041db363f..3b939d48d 100644 --- a/gramps/plugins/gramplet/repositorydetails.py +++ b/gramps/plugins/gramplet/repositorydetails.py @@ -19,9 +19,9 @@ # $Id$ # -from gen.lib import UrlType -from gen.plug import Gramplet -from gen.ggettext import gettext as _ +from gramps.gen.lib import UrlType +from gramps.gen.plug import Gramplet +from gramps.gen.ggettext import gettext as _ from gi.repository import Gtk from gi.repository import Pango diff --git a/gramps/plugins/gramplet/sessionloggramplet.py b/gramps/plugins/gramplet/sessionloggramplet.py index 8834905ec..3e7e41e31 100644 --- a/gramps/plugins/gramplet/sessionloggramplet.py +++ b/gramps/plugins/gramplet/sessionloggramplet.py @@ -25,12 +25,12 @@ #------------------------------------------------------------------------ import time -from gen.lib import Person, Family -from gen.db import PERSON_KEY, FAMILY_KEY, TXNDEL -from gen.plug import Gramplet -from gen.ggettext import sgettext as _ -from gen.display.name import displayer as name_displayer -from gen.utils.db import family_name +from gramps.gen.lib import Person, Family +from gramps.gen.db import PERSON_KEY, FAMILY_KEY, TXNDEL +from gramps.gen.plug import Gramplet +from gramps.gen.ggettext import sgettext as _ +from gramps.gen.display.name import displayer as name_displayer +from gramps.gen.utils.db import family_name #------------------------------------------------------------------------ # diff --git a/gramps/plugins/gramplet/statsgramplet.py b/gramps/plugins/gramplet/statsgramplet.py index 8f20f9dda..faf8d3a3b 100644 --- a/gramps/plugins/gramplet/statsgramplet.py +++ b/gramps/plugins/gramplet/statsgramplet.py @@ -30,9 +30,9 @@ import posixpath # GRAMPS modules # #------------------------------------------------------------------------ -from gen.plug import Gramplet -from gen.ggettext import sgettext as _ -from gen.utils.file import media_path_full +from gramps.gen.plug import Gramplet +from gramps.gen.ggettext import sgettext as _ +from gramps.gen.utils.file import media_path_full from gramps.gen.datehandler import get_date import gen diff --git a/gramps/plugins/gramplet/surnamecloudgramplet.py b/gramps/plugins/gramplet/surnamecloudgramplet.py index f8c71a82f..02893dbd8 100644 --- a/gramps/plugins/gramplet/surnamecloudgramplet.py +++ b/gramps/plugins/gramplet/surnamecloudgramplet.py @@ -25,9 +25,9 @@ from collections import defaultdict # GRAMPS modules # #------------------------------------------------------------------------ -from gen.plug import Gramplet -from gen.ggettext import sgettext as _ -from gen.config import config +from gramps.gen.plug import Gramplet +from gramps.gen.ggettext import sgettext as _ +from gramps.gen.config import config #------------------------------------------------------------------------ # @@ -168,7 +168,7 @@ class SurnameCloudGramplet(Gramplet): self.append_text((_("Total people") + ": %d") % total_people, "begin") def build_options(self): - from gen.plug.menu import NumberOption + from gramps.gen.plug.menu import NumberOption self.top_size_option = NumberOption(_("Number of surnames"), self.top_size, 1, 150) self.add_option(self.top_size_option) self.min_option = NumberOption(_("Min font size"), self.min_font, 1, 50) diff --git a/gramps/plugins/gramplet/todogramplet.py b/gramps/plugins/gramplet/todogramplet.py index 0f28491dd..8028acb17 100644 --- a/gramps/plugins/gramplet/todogramplet.py +++ b/gramps/plugins/gramplet/todogramplet.py @@ -23,8 +23,8 @@ # GRAMPS modules # #------------------------------------------------------------------------ -from gen.plug import Gramplet -from gen.ggettext import sgettext as _ +from gramps.gen.plug import Gramplet +from gramps.gen.ggettext import sgettext as _ #------------------------------------------------------------------------ # diff --git a/gramps/plugins/gramplet/topsurnamesgramplet.py b/gramps/plugins/gramplet/topsurnamesgramplet.py index eca3b6823..4fd7afadf 100644 --- a/gramps/plugins/gramplet/topsurnamesgramplet.py +++ b/gramps/plugins/gramplet/topsurnamesgramplet.py @@ -25,9 +25,9 @@ from collections import defaultdict # GRAMPS modules # #------------------------------------------------------------------------ -from gen.plug import Gramplet -from gen.ggettext import sgettext as _ -from gen.config import config +from gramps.gen.plug import Gramplet +from gramps.gen.ggettext import sgettext as _ +from gramps.gen.config import config #------------------------------------------------------------------------ # diff --git a/gramps/plugins/gramplet/welcomegramplet.py b/gramps/plugins/gramplet/welcomegramplet.py index 7b7b182c1..232ced628 100644 --- a/gramps/plugins/gramplet/welcomegramplet.py +++ b/gramps/plugins/gramplet/welcomegramplet.py @@ -31,11 +31,11 @@ from gi.repository import Gtk # GRAMPS modules # #------------------------------------------------------------------------ -from gen.plug import Gramplet -from gui.widgets.styledtexteditor import StyledTextEditor -from gui.widgets import SimpleButton -from gen.lib import StyledText, StyledTextTag, StyledTextTagType -from gen.ggettext import sgettext as _ +from gramps.gen.plug import Gramplet +from gramps.gui.widgets.styledtexteditor import StyledTextEditor +from gramps.gui.widgets import SimpleButton +from gramps.gen.lib import StyledText, StyledTextTag, StyledTextTagType +from gramps.gen.ggettext import sgettext as _ #------------------------------------------------------------------------ # diff --git a/gramps/plugins/gramplet/whatsnext.py b/gramps/plugins/gramplet/whatsnext.py index 65928ec9a..7097b74a6 100644 --- a/gramps/plugins/gramplet/whatsnext.py +++ b/gramps/plugins/gramplet/whatsnext.py @@ -27,11 +27,11 @@ # GRAMPS modules # #------------------------------------------------------------------------ -from gen.lib import EventType, FamilyRelType -from gen.plug import Gramplet -from gen.display.name import displayer as name_displayer -from gen.plug.report import utils as ReportUtils -from gen.ggettext import sgettext as _ +from gramps.gen.lib import EventType, FamilyRelType +from gramps.gen.plug import Gramplet +from gramps.gen.display.name import displayer as name_displayer +from gramps.gen.plug.report import utils as ReportUtils +from gramps.gen.ggettext import sgettext as _ #------------------------------------------------------------------------ # @@ -49,7 +49,7 @@ class WhatNextGramplet(Gramplet): """ Build the configuration options. """ - from gen.plug.menu import NumberOption, EnumeratedListOption + from gramps.gen.plug.menu import NumberOption, EnumeratedListOption self.opts = [] diff --git a/gramps/plugins/graph/gvfamilylines.py b/gramps/plugins/graph/gvfamilylines.py index 101e427b4..2316adb25 100644 --- a/gramps/plugins/graph/gvfamilylines.py +++ b/gramps/plugins/graph/gvfamilylines.py @@ -34,7 +34,7 @@ Family Lines, a GraphViz-based plugin for Gramps. # python modules # #------------------------------------------------------------------------ -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ from functools import partial #------------------------------------------------------------------------ @@ -51,17 +51,17 @@ log = logging.getLogger(".FamilyLines") # #------------------------------------------------------------------------ from gramps.gen.lib import EventRoleType, EventType, Person -from gen.utils.file import media_path_full -from gui.thumbnails import get_thumbnail_path -from gen.datehandler import displayer as _dd -from gen.plug.report import Report -from gen.plug.report import utils as ReportUtils -from gen.plug.report import MenuReportOptions -from gen.plug.menu import (NumberOption, ColorOption, BooleanOption, +from gramps.gen.utils.file import media_path_full +from gramps.gui.thumbnails import get_thumbnail_path +from gramps.gen.datehandler import displayer as _dd +from gramps.gen.plug.report import Report +from gramps.gen.plug.report import utils as ReportUtils +from gramps.gen.plug.report import MenuReportOptions +from gramps.gen.plug.menu import (NumberOption, ColorOption, BooleanOption, EnumeratedListOption, PersonListOption, SurnameColorOption) -from gen.utils.db import get_birth_or_fallback, get_death_or_fallback -from gen.display.name import displayer as name_displayer +from gramps.gen.utils.db import get_birth_or_fallback, get_death_or_fallback +from gramps.gen.display.name import displayer as name_displayer #------------------------------------------------------------------------ # diff --git a/gramps/plugins/graph/gvhourglass.py b/gramps/plugins/graph/gvhourglass.py index 072d0af81..18f54f6e8 100644 --- a/gramps/plugins/graph/gvhourglass.py +++ b/gramps/plugins/graph/gvhourglass.py @@ -31,22 +31,22 @@ Generate an hourglass graph using the GraphViz generator. # python modules # #------------------------------------------------------------------------ -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ #------------------------------------------------------------------------ # # GRAMPS modules # #------------------------------------------------------------------------ -from gen.display.name import displayer as name_displayer -from gen.errors import ReportError -from gen.plug.menu import (PersonOption, BooleanOption, NumberOption, +from gramps.gen.display.name import displayer as name_displayer +from gramps.gen.errors import ReportError +from gramps.gen.plug.menu import (PersonOption, BooleanOption, NumberOption, EnumeratedListOption) -from gen.plug.report import Report -from gen.plug.report import utils as ReportUtils -from gen.plug.report import MenuReportOptions +from gramps.gen.plug.report import Report +from gramps.gen.plug.report import utils as ReportUtils +from gramps.gen.plug.report import MenuReportOptions from gramps.gen.datehandler import get_date -from gen.utils.db import get_birth_or_fallback, get_death_or_fallback +from gramps.gen.utils.db import get_birth_or_fallback, get_death_or_fallback #------------------------------------------------------------------------ # diff --git a/gramps/plugins/graph/gvrelgraph.py b/gramps/plugins/graph/gvrelgraph.py index 1e63813a2..fb1f280d5 100644 --- a/gramps/plugins/graph/gvrelgraph.py +++ b/gramps/plugins/graph/gvrelgraph.py @@ -39,7 +39,7 @@ Create a relationship graph using Graphviz # python modules # #------------------------------------------------------------------------ -from gen.ggettext import sgettext as _ +from gramps.gen.ggettext import sgettext as _ from functools import partial #------------------------------------------------------------------------ @@ -47,17 +47,17 @@ from functools import partial # GRAMPS modules # #------------------------------------------------------------------------ -from gen.plug.menu import (BooleanOption, EnumeratedListOption, FilterOption, +from gramps.gen.plug.menu import (BooleanOption, EnumeratedListOption, FilterOption, PersonOption, ColorOption) -from gen.plug.report import Report -from gen.plug.report import utils as ReportUtils -from gen.plug.report import MenuReportOptions -from gen.display.name import displayer as name_displayer +from gramps.gen.plug.report import Report +from gramps.gen.plug.report import utils as ReportUtils +from gramps.gen.plug.report import MenuReportOptions +from gramps.gen.display.name import displayer as name_displayer from gramps.gen.datehandler import get_date from gramps.gen.lib import ChildRefType, EventRoleType, EventType -from gen.utils.file import media_path_full, find_file -from gui.thumbnails import get_thumbnail_path -from gen.utils.db import get_birth_or_fallback, get_death_or_fallback +from gramps.gen.utils.file import media_path_full, find_file +from gramps.gui.thumbnails import get_thumbnail_path +from gramps.gen.utils.db import get_birth_or_fallback, get_death_or_fallback #------------------------------------------------------------------------ # diff --git a/gramps/plugins/import/importcsv.py b/gramps/plugins/import/importcsv.py index a1b6d484a..16feaca5f 100644 --- a/gramps/plugins/import/importcsv.py +++ b/gramps/plugins/import/importcsv.py @@ -47,16 +47,16 @@ LOG = logging.getLogger(".ImportCSV") # GRAMPS modules # #------------------------------------------------------------------------- -from gen.ggettext import sgettext as _ -from gen.ggettext import ngettext +from gramps.gen.ggettext import sgettext as _ +from gramps.gen.ggettext import ngettext from gramps.gen.lib import ChildRef, Citation, Event, EventRef, EventType, Family, FamilyRelType, Name, NameType, Note, NoteType, Person, Place, Source, Surname -from gen.db import DbTxn -from gen.plug.utils import OpenFileOrStdin -from gen.datehandler import parser as _dp -from gen.utils.string import gender as gender_map -from gen.utils.id import create_id -from gui.utils import ProgressMeter -from gen.lib.eventroletype import EventRoleType +from gramps.gen.db import DbTxn +from gramps.gen.plug.utils import OpenFileOrStdin +from gramps.gen.datehandler import parser as _dp +from gramps.gen.utils.string import gender as gender_map +from gramps.gen.utils.id import create_id +from gramps.gui.utils import ProgressMeter +from gramps.gen.lib.eventroletype import EventRoleType #------------------------------------------------------------------------- # diff --git a/gramps/plugins/import/importgedcom.py b/gramps/plugins/import/importgedcom.py index acd17dcb1..b971f6a24 100644 --- a/gramps/plugins/import/importgedcom.py +++ b/gramps/plugins/import/importgedcom.py @@ -28,7 +28,7 @@ # python modules # #------------------------------------------------------------------------ -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ #------------------------------------------------------------------------ # @@ -43,14 +43,14 @@ LOG = logging.getLogger(".GedcomImport") # GRAMPS modules # #------------------------------------------------------------------------ -from gen.errors import DbError, GedcomError -from gui.glade import Glade +from gramps.gen.errors import DbError, GedcomError +from gramps.gui.glade import Glade from gramps.plugins.lib.libmixin import DbMixin import gramps.plugins.lib.libgedcom as libgedcom module = __import__("libgedcom") reload (module) -from gen.config import config +from gramps.gen.config import config #------------------------------------------------------------------------- # diff --git a/gramps/plugins/import/importgeneweb.py b/gramps/plugins/import/importgeneweb.py index f036e56fd..94465fa11 100644 --- a/gramps/plugins/import/importgeneweb.py +++ b/gramps/plugins/import/importgeneweb.py @@ -30,8 +30,8 @@ #------------------------------------------------------------------------- import re import time -from gen.ggettext import gettext as _ -from gen.ggettext import ngettext +from gramps.gen.ggettext import gettext as _ +from gramps.gen.ggettext import ngettext #------------------------------------------------------------------------ # @@ -46,9 +46,9 @@ LOG = logging.getLogger(".ImportGeneWeb") # GRAMPS modules # #------------------------------------------------------------------------- -from gen.errors import GedcomError +from gramps.gen.errors import GedcomError from gramps.gen.lib import Attribute, AttributeType, ChildRef, Citation, Date, Event, EventRef, EventRoleType, EventType, Family, FamilyRelType, Name, NameType, Note, Person, PersonRef, Place, Source -from gen.db import DbTxn +from gramps.gen.db import DbTxn from htmlentitydefs import name2codepoint _date_parse = re.compile('([kmes~?<>]+)?([0-9/]+)([J|H|F])?(\.\.)?([0-9/]+)?([J|H|F])?') diff --git a/gramps/plugins/import/importgpkg.py b/gramps/plugins/import/importgpkg.py index e0ee86650..a7ba4feb3 100644 --- a/gramps/plugins/import/importgpkg.py +++ b/gramps/plugins/import/importgpkg.py @@ -31,7 +31,7 @@ #------------------------------------------------------------------------- import os import tarfile -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ #------------------------------------------------------------------------ # @@ -46,9 +46,9 @@ log = logging.getLogger(".ReadPkg") # GRAMPS modules # #------------------------------------------------------------------------- -from gen.const import XMLFILE +from gramps.gen.const import XMLFILE import importxml -from gen.utils.file import media_path +from gramps.gen.utils.file import media_path #------------------------------------------------------------------------- # diff --git a/gramps/plugins/import/importprogen.py b/gramps/plugins/import/importprogen.py index 2a991714e..6abb3158b 100644 --- a/gramps/plugins/import/importprogen.py +++ b/gramps/plugins/import/importprogen.py @@ -30,7 +30,7 @@ # #------------------------------------------------------------------------- import re -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ import os import struct @@ -47,10 +47,10 @@ log = logging.getLogger('.ImportProGen') # GRAMPS modules # #------------------------------------------------------------------------- -from gen.utils.id import create_id -from gui.utils import ProgressMeter +from gramps.gen.utils.id import create_id +from gramps.gui.utils import ProgressMeter from gramps.gen.lib import Attribute, AttributeType, ChildRef, Date, Event, EventRef, EventType, Family, FamilyRelType, Name, NameType, Note, NoteType, Person, Place, Source, SourceRef, Surname -from gen.db import DbTxn +from gramps.gen.db import DbTxn class ProgenError(Exception): """Error used to report Progen errors.""" diff --git a/gramps/plugins/import/importvcard.py b/gramps/plugins/import/importvcard.py index 826db2aa0..0bd923d44 100644 --- a/gramps/plugins/import/importvcard.py +++ b/gramps/plugins/import/importvcard.py @@ -32,8 +32,8 @@ import sys import re import time -from gen.ggettext import gettext as _ -from gen.ggettext import ngettext +from gramps.gen.ggettext import gettext as _ +from gramps.gen.ggettext import ngettext #------------------------------------------------------------------------ # @@ -48,10 +48,10 @@ LOG = logging.getLogger(".ImportVCard") # GRAMPS modules # #------------------------------------------------------------------------- -from gen.errors import GrampsImportError +from gramps.gen.errors import GrampsImportError from gramps.gen.lib import Address, Date, Event, EventRef, EventType, Name, NameType, Person, Surname, Url, UrlType -from gen.db import DbTxn -from gen.plug.utils import OpenFileOrStdin +from gramps.gen.db import DbTxn +from gramps.gen.plug.utils import OpenFileOrStdin #------------------------------------------------------------------------- # diff --git a/gramps/plugins/import/importxml.py b/gramps/plugins/import/importxml.py index 2a0bbc92d..5dea6f4a2 100644 --- a/gramps/plugins/import/importxml.py +++ b/gramps/plugins/import/importxml.py @@ -33,7 +33,7 @@ import os import sys import time from xml.parsers.expat import ExpatError, ParserCreate -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ import re import logging LOG = logging.getLogger(".ImportXML") @@ -45,19 +45,19 @@ LOG = logging.getLogger(".ImportXML") #------------------------------------------------------------------------- from gramps.gen.mime import get_type from gramps.gen.lib import Address, Attribute, AttributeType, ChildRef, ChildRefType, Citation, Date, Event, EventRef, EventRoleType, EventType, Family, LdsOrd, Location, MediaObject, MediaRef, Name, NameOriginType, NameType, Note, NoteType, Person, PersonRef, Place, RepoRef, Repository, Researcher, Source, StyledText, StyledTextTag, StyledTextTagType, Surname, Tag, Url -from gen.db import DbTxn -from gen.db.write import CLASS_TO_KEY_MAP -from gen.errors import GrampsImportError -from gen.utils.id import create_id -from gen.utils.db import family_name -from gen.utils.unknown import make_unknown, create_explanation_note +from gramps.gen.db import DbTxn +from gramps.gen.db.write import CLASS_TO_KEY_MAP +from gramps.gen.errors import GrampsImportError +from gramps.gen.utils.id import create_id +from gramps.gen.utils.db import family_name +from gramps.gen.utils.unknown import make_unknown, create_explanation_note from gramps.gen.datehandler import parser, set_date -from gen.display.name import displayer as name_displayer -from gen.db.dbconst import (PERSON_KEY, FAMILY_KEY, SOURCE_KEY, EVENT_KEY, +from gramps.gen.display.name import displayer as name_displayer +from gramps.gen.db.dbconst import (PERSON_KEY, FAMILY_KEY, SOURCE_KEY, EVENT_KEY, MEDIA_KEY, PLACE_KEY, REPOSITORY_KEY, NOTE_KEY, TAG_KEY, CITATION_KEY) -from gen.updatecallback import UpdateCallback -from gen.const import VERSION +from gramps.gen.updatecallback import UpdateCallback +from gramps.gen.const import VERSION import gramps.plugins.lib.libgrampsxml #------------------------------------------------------------------------- diff --git a/gramps/plugins/import/test/importVCard_test.py b/gramps/plugins/import/test/importVCard_test.py index 5dc9b05ae..cf338cfc3 100644 --- a/gramps/plugins/import/test/importVCard_test.py +++ b/gramps/plugins/import/test/importVCard_test.py @@ -41,7 +41,7 @@ import libxslt from gramps.plugins.lib.libgrampsxml import GRAMPS_XML_VERSION -from gen.const import ROOT_DIR, VERSION +from gramps.gen.const import ROOT_DIR, VERSION import importvcard from importvcard import VCardParser diff --git a/gramps/plugins/lib/libcairodoc.py b/gramps/plugins/lib/libcairodoc.py index bf7d76630..81d6f3cc9 100644 --- a/gramps/plugins/lib/libcairodoc.py +++ b/gramps/plugins/lib/libcairodoc.py @@ -35,7 +35,7 @@ # Python modules # #------------------------------------------------------------------------ -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ from math import radians import re @@ -44,14 +44,14 @@ import re # Gramps modules # #------------------------------------------------------------------------ -from gen.plug.docgen import (BaseDoc, TextDoc, DrawDoc, ParagraphStyle, +from gramps.gen.plug.docgen import (BaseDoc, TextDoc, DrawDoc, ParagraphStyle, TableCellStyle, SOLID, FONT_SANS_SERIF, FONT_SERIF, FONT_MONOSPACE, PARA_ALIGN_CENTER, PARA_ALIGN_LEFT) -from gen.plug.report import utils as ReportUtils -from gen.errors import PluginError -from gen.plug.docbackend import CairoBackend -from gen.utils.image import resize_to_buffer -from gui.utils import SystemFonts +from gramps.gen.plug.report import utils as ReportUtils +from gramps.gen.errors import PluginError +from gramps.gen.plug.docbackend import CairoBackend +from gramps.gen.utils.image import resize_to_buffer +from gramps.gui.utils import SystemFonts #------------------------------------------------------------------------ # diff --git a/gramps/plugins/lib/libgedcom.py b/gramps/plugins/lib/libgedcom.py index 97854c4fb..b811e7f83 100644 --- a/gramps/plugins/lib/libgedcom.py +++ b/gramps/plugins/lib/libgedcom.py @@ -93,7 +93,7 @@ import os import re import time import codecs -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ from xml.parsers.expat import ParserCreate from collections import defaultdict import cStringIO @@ -112,20 +112,20 @@ LOG = logging.getLogger(".libgedcom") # GRAMPS modules # #------------------------------------------------------------------------- -from gen.errors import GedcomError -from gen.const import DATA_DIR +from gramps.gen.errors import GedcomError +from gramps.gen.const import DATA_DIR from gramps.gen.lib import Address, Attribute, AttributeType, ChildRef, ChildRefType, Citation, Date, Event, EventRef, EventRoleType, EventType, Family, FamilyRelType, LdsOrd, Location, MediaObject, MediaRef, Name, NameType, Note, NoteType, Person, PersonRef, Place, RepoRef, Repository, RepositoryType, Researcher, Source, SourceMediaType, Surname, Url, UrlType -from gen.db import DbTxn -from gen.updatecallback import UpdateCallback +from gramps.gen.db import DbTxn +from gramps.gen.updatecallback import UpdateCallback from gramps.gen.mime import get_type -from gen.utils.id import create_id -from gen.utils.lds import TEMPLES -from gen.utils.unknown import make_unknown, create_explanation_note -from gen.datehandler._dateparser import DateParser -from gen.db.dbconst import EVENT_KEY -from gui.dialog import WarningDialog -from gen.lib.const import IDENTICAL, DIFFERENT -from gen.lib import (StyledText, StyledTextTag, StyledTextTagType) +from gramps.gen.utils.id import create_id +from gramps.gen.utils.lds import TEMPLES +from gramps.gen.utils.unknown import make_unknown, create_explanation_note +from gramps.gen.datehandler._dateparser import DateParser +from gramps.gen.db.dbconst import EVENT_KEY +from gramps.gui.dialog import WarningDialog +from gramps.gen.lib.const import IDENTICAL, DIFFERENT +from gramps.gen.lib import (StyledText, StyledTextTag, StyledTextTagType) #------------------------------------------------------------------------- # diff --git a/gramps/plugins/lib/libgrdb.py b/gramps/plugins/lib/libgrdb.py index b112fb950..e4aaa4aa5 100644 --- a/gramps/plugins/lib/libgrdb.py +++ b/gramps/plugins/lib/libgrdb.py @@ -36,12 +36,12 @@ import random import locale import os from sys import maxint -from gen.config import config +from gramps.gen.config import config if config.get('preferences.use-bsddb3'): from bsddb3 import db else: from bsddb import db -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ import logging LOG = logging.getLogger(".Db") @@ -51,16 +51,16 @@ LOG = logging.getLogger(".Db") # GRAMPS libraries # #------------------------------------------------------------------------- -from gen.lib import (MediaObject, Person, Family, Source, Event, Place, +from gramps.gen.lib import (MediaObject, Person, Family, Source, Event, Place, Repository, Note, GenderStats, Researcher) -from gen.utils.callback import Callback +from gramps.gen.utils.callback import Callback #------------------------------------------------------------------------- # # constants # #------------------------------------------------------------------------- -from gen.db.dbconst import (PERSON_KEY, FAMILY_KEY, SOURCE_KEY, EVENT_KEY, +from gramps.gen.db.dbconst import (PERSON_KEY, FAMILY_KEY, SOURCE_KEY, EVENT_KEY, MEDIA_KEY, PLACE_KEY, REPOSITORY_KEY, NOTE_KEY, REFERENCE_KEY) diff --git a/gramps/plugins/lib/libholiday.py b/gramps/plugins/lib/libholiday.py index 439433025..df1f88499 100644 --- a/gramps/plugins/lib/libholiday.py +++ b/gramps/plugins/lib/libholiday.py @@ -25,12 +25,12 @@ # python modules # #------------------------------------------------------------------------ -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ from xml.parsers import expat -from gen.lib.calendar import (gregorian_ymd, hebrew_sdn) +from gramps.gen.lib.calendar import (gregorian_ymd, hebrew_sdn) import datetime import math -from gen.const import PLUGINS_DIR, USER_PLUGINS +from gramps.gen.const import PLUGINS_DIR, USER_PLUGINS import os #------------------------------------------------------------------------ diff --git a/gramps/plugins/lib/libhtmlbackend.py b/gramps/plugins/lib/libhtmlbackend.py index 3b3163dde..8866b732a 100644 --- a/gramps/plugins/lib/libhtmlbackend.py +++ b/gramps/plugins/lib/libhtmlbackend.py @@ -42,9 +42,9 @@ import os.path # Gramps modules # #------------------------------------------------------------------------ -from gen.plug.docbackend import DocBackend +from gramps.gen.plug.docbackend import DocBackend from gramps.plugins.lib.libhtml import Html, xml_lang -from gen.errors import ReportError +from gramps.gen.errors import ReportError #------------------------------------------------------------------------ diff --git a/gramps/plugins/lib/libhtmlconst.py b/gramps/plugins/lib/libhtmlconst.py index 0e06598a4..bd303b2bf 100644 --- a/gramps/plugins/lib/libhtmlconst.py +++ b/gramps/plugins/lib/libhtmlconst.py @@ -32,7 +32,7 @@ General constants used in different html enabled plugins """ -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ #------------------------------------------------------------------------ # diff --git a/gramps/plugins/lib/libmapservice.py b/gramps/plugins/lib/libmapservice.py index 8f74a95fb..db258e855 100644 --- a/gramps/plugins/lib/libmapservice.py +++ b/gramps/plugins/lib/libmapservice.py @@ -35,8 +35,8 @@ Base class for map services. Example: open place in openstreetmap.org # GRAMPS modules # #------------------------------------------------------------------------- -from gen.utils.place import conv_lat_lon -from gui.display import display_url +from gramps.gen.utils.place import conv_lat_lon +from gramps.gui.display import display_url class MapService(): """Generic base class for map services diff --git a/gramps/plugins/lib/libmetadata.py b/gramps/plugins/lib/libmetadata.py index 1fc08b66b..5179897bb 100644 --- a/gramps/plugins/lib/libmetadata.py +++ b/gramps/plugins/lib/libmetadata.py @@ -35,9 +35,9 @@ from gi.repository import Gtk # #------------------------------------------------------------------------- -from gui.listmodel import ListModel -from gen.ggettext import gettext as _ -from gen.utils.place import conv_lat_lon +from gramps.gui.listmodel import ListModel +from gramps.gen.ggettext import gettext as _ +from gramps.gen.utils.place import conv_lat_lon from fractions import Fraction from gramps.gen.lib import Date from gramps.gen.datehandler import displayer diff --git a/gramps/plugins/lib/libmixin.py b/gramps/plugins/lib/libmixin.py index bbd8556ea..c1f83ec41 100644 --- a/gramps/plugins/lib/libmixin.py +++ b/gramps/plugins/lib/libmixin.py @@ -29,7 +29,7 @@ Mixin for DbDir to enable find_from_handle and check_from_handle methods. # Gramps Modules # #------------------------------------------------------------------------------ -from gen.lib import (Person, Family, Event, Place, Source, +from gramps.gen.lib import (Person, Family, Event, Place, Source, MediaObject, Repository, Note, Tag) #------------------------------------------------------------------------------ diff --git a/gramps/plugins/lib/libnarrate.py b/gramps/plugins/lib/libnarrate.py index e76f34acd..f41117f0a 100644 --- a/gramps/plugins/lib/libnarrate.py +++ b/gramps/plugins/lib/libnarrate.py @@ -34,14 +34,14 @@ Narrator class for use by plugins. # GRAMPS modules # #------------------------------------------------------------------------ -from gen.lib.date import Date -from gen.lib.person import Person -from gen.lib.eventroletype import EventRoleType -from gen.lib.eventtype import EventType -from gen.lib.familyreltype import FamilyRelType -from gen.display.name import displayer as _nd -from gen.utils.alive import probably_alive -from gen.plug.report import utils as ReportUtils +from gramps.gen.lib.date import Date +from gramps.gen.lib.person import Person +from gramps.gen.lib.eventroletype import EventRoleType +from gramps.gen.lib.eventtype import EventType +from gramps.gen.lib.familyreltype import FamilyRelType +from gramps.gen.display.name import displayer as _nd +from gramps.gen.utils.alive import probably_alive +from gramps.gen.plug.report import utils as ReportUtils from gramps.plugins.lib.libtranslate import Translator #------------------------------------------------------------------------- diff --git a/gramps/plugins/lib/libodfbackend.py b/gramps/plugins/lib/libodfbackend.py index 61567a2e6..c12af230d 100644 --- a/gramps/plugins/lib/libodfbackend.py +++ b/gramps/plugins/lib/libodfbackend.py @@ -43,7 +43,7 @@ import os.path # Gramps modules # #------------------------------------------------------------------------ -from gen.plug.docbackend import DocBackend +from gramps.gen.plug.docbackend import DocBackend #------------------------------------------------------------------------ # diff --git a/gramps/plugins/lib/libpersonview.py b/gramps/plugins/lib/libpersonview.py index c476cde47..de5dbe23e 100644 --- a/gramps/plugins/lib/libpersonview.py +++ b/gramps/plugins/lib/libpersonview.py @@ -48,26 +48,26 @@ _LOG = logging.getLogger(".gui.personview") # #------------------------------------------------------------------------- from gramps.gen.lib import Person, Surname -from gen.db import DbTxn -from gui.views.listview import ListView -from gen.utils.string import data_recover_msg -from gen.display.name import displayer as name_displayer -from gui.dialog import ErrorDialog, QuestionDialog -from gen.errors import WindowActiveError -from gui.views.bookmarks import PersonBookmarks -from gen.config import config -from gui.ddtargets import DdTargets -from gui.editors import EditPerson -from gui.filters.sidebar import PersonSidebarFilter -from gui.merge import MergePerson -from gen.plug import CATEGORY_QR_PERSON +from gramps.gen.db import DbTxn +from gramps.gui.views.listview import ListView +from gramps.gen.utils.string import data_recover_msg +from gramps.gen.display.name import displayer as name_displayer +from gramps.gui.dialog import ErrorDialog, QuestionDialog +from gramps.gen.errors import WindowActiveError +from gramps.gui.views.bookmarks import PersonBookmarks +from gramps.gen.config import config +from gramps.gui.ddtargets import DdTargets +from gramps.gui.editors import EditPerson +from gramps.gui.filters.sidebar import PersonSidebarFilter +from gramps.gui.merge import MergePerson +from gramps.gen.plug import CATEGORY_QR_PERSON #------------------------------------------------------------------------- # # Python modules # #------------------------------------------------------------------------- -from gen.ggettext import sgettext as _ +from gramps.gen.ggettext import sgettext as _ #------------------------------------------------------------------------- # diff --git a/gramps/plugins/lib/libplaceview.py b/gramps/plugins/lib/libplaceview.py index 0d496c318..4dafa3abe 100644 --- a/gramps/plugins/lib/libplaceview.py +++ b/gramps/plugins/lib/libplaceview.py @@ -47,25 +47,25 @@ from gi.repository import Gtk # #------------------------------------------------------------------------- from gramps.gen.lib import Place -from gui.views.listview import ListView -from gui.widgets.menuitem import add_menuitem -from gen.errors import WindowActiveError -from gui.views.bookmarks import PlaceBookmarks -from gen.config import config -from gui.dialog import ErrorDialog -from gui.pluginmanager import GuiPluginManager -from gui.ddtargets import DdTargets -from gui.editors import EditPlace, DeletePlaceQuery -from gui.filters.sidebar import PlaceSidebarFilter -from gui.merge import MergePlace -from gen.plug import CATEGORY_QR_PLACE +from gramps.gui.views.listview import ListView +from gramps.gui.widgets.menuitem import add_menuitem +from gramps.gen.errors import WindowActiveError +from gramps.gui.views.bookmarks import PlaceBookmarks +from gramps.gen.config import config +from gramps.gui.dialog import ErrorDialog +from gramps.gui.pluginmanager import GuiPluginManager +from gramps.gui.ddtargets import DdTargets +from gramps.gui.editors import EditPlace, DeletePlaceQuery +from gramps.gui.filters.sidebar import PlaceSidebarFilter +from gramps.gui.merge import MergePlace +from gramps.gen.plug import CATEGORY_QR_PLACE #------------------------------------------------------------------------- # # internationalization # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ #------------------------------------------------------------------------- diff --git a/gramps/plugins/lib/libsubstkeyword.py b/gramps/plugins/lib/libsubstkeyword.py index 74d343d0f..56fa9a6fc 100644 --- a/gramps/plugins/lib/libsubstkeyword.py +++ b/gramps/plugins/lib/libsubstkeyword.py @@ -37,10 +37,10 @@ Mary Smith was born on 3/28/1923. # Gramps modules # #------------------------------------------------------------------------ -from gen.display.name import displayer as name_displayer +from gramps.gen.display.name import displayer as name_displayer from gramps.gen.datehandler import displayer from gramps.gen.lib import EventType -from gen.utils.db import get_birth_or_fallback, get_death_or_fallback +from gramps.gen.utils.db import get_birth_or_fallback, get_death_or_fallback #------------------------------------------------------------------------ # @@ -879,7 +879,7 @@ class VariableParse(object): elif next_char == "T": #Todays date date_f = DateFormat(self._in) - from gen.lib.date import Today + from gramps.gen.lib.date import Today date = Today() if self.empty_item(date): return @@ -1178,7 +1178,7 @@ if __name__ == '__main__': return line - from gen.lib.date import Date + from gramps.gen.lib.date import Date y_or_n = () date_to_test = Date() def date_set(): @@ -1253,7 +1253,7 @@ if __name__ == '__main__': print "=============" print "=============" - from gen.lib.name import Name + from gramps.gen.lib.name import Name y_or_n = () name_to_test = Name() def name_set(): @@ -1324,7 +1324,7 @@ if __name__ == '__main__': print "=============" print "=============" - from gen.lib.place import Place + from gramps.gen.lib.place import Place y_or_n = () place_to_test = Place() def place_set(): diff --git a/gramps/plugins/lib/libtranslate.py b/gramps/plugins/lib/libtranslate.py index 5d0411f52..050eeab16 100644 --- a/gramps/plugins/lib/libtranslate.py +++ b/gramps/plugins/lib/libtranslate.py @@ -37,10 +37,10 @@ _ = gettext.gettext # GRAMPS modules # #------------------------------------------------------------------------ -from gen.utils.trans import get_localedomain +from gramps.gen.utils.trans import get_localedomain from gramps.gen.datehandler import displayer, LANG_TO_DISPLAY -from gen.config import config -from gen.lib.grampstype import GrampsType +from gramps.gen.config import config +from gramps.gen.lib.grampstype import GrampsType #------------------------------------------------------------------------ # diff --git a/gramps/plugins/lib/libtreebase.py b/gramps/plugins/lib/libtreebase.py index 59e7bd50d..5fb09b777 100644 --- a/gramps/plugins/lib/libtreebase.py +++ b/gramps/plugins/lib/libtreebase.py @@ -27,11 +27,11 @@ # python modules # #------------------------------------------------------------------------ -from gen.ggettext import sgettext as _ +from gramps.gen.ggettext import sgettext as _ -from gen.plug.report import utils as ReportUtils +from gramps.gen.plug.report import utils as ReportUtils -from gen.display.name import displayer as name_displayer +from gramps.gen.display.name import displayer as name_displayer from gramps.plugins.lib.libsubstkeyword import SubstKeywords @@ -636,7 +636,7 @@ class TitleNoDisplay(BoxBase): """ display the title box. """ #Set up the Table of Contents here - from gen.plug.docgen import (IndexMark, INDEX_TYPE_TOC) # interim, here + from gramps.gen.plug.docgen import (IndexMark, INDEX_TYPE_TOC) # interim, here mark = IndexMark(self.text, INDEX_TYPE_TOC, 1) self.doc.center_text(self.boxstr, '', 0, -100, mark) @@ -676,7 +676,7 @@ class TitleBox(BoxBase): return #Set up the Table of Contents here - from gen.plug.docgen import (IndexMark, INDEX_TYPE_TOC) # interim, here + from gramps.gen.plug.docgen import (IndexMark, INDEX_TYPE_TOC) # interim, here mark = IndexMark(self.text, INDEX_TYPE_TOC, 1) if self.text: diff --git a/gramps/plugins/lib/maps/constants.py b/gramps/plugins/lib/maps/constants.py index 0c95e8a9b..825edccb5 100644 --- a/gramps/plugins/lib/maps/constants.py +++ b/gramps/plugins/lib/maps/constants.py @@ -29,7 +29,7 @@ #------------------------------------------------------------------------- from gramps.gen.lib import EventType import os -from gen.const import HOME_DIR +from gramps.gen.const import HOME_DIR from gi.repository import OsmGpsMap as osmgpsmap #------------------------------------------------------------------------- diff --git a/gramps/plugins/lib/maps/geography.py b/gramps/plugins/lib/maps/geography.py index 8900becb1..fdf37a3f7 100644 --- a/gramps/plugins/lib/maps/geography.py +++ b/gramps/plugins/lib/maps/geography.py @@ -27,7 +27,7 @@ # Python modules # #------------------------------------------------------------------------- -from gen.ggettext import sgettext as _ +from gramps.gen.ggettext import sgettext as _ import os import sys import re @@ -50,15 +50,15 @@ import cairo # #------------------------------------------------------------------------- from gramps.gen.lib import EventType, Place -from gen.display.name import displayer as _nd -from gui.views.navigationview import NavigationView -from gen.utils.libformatting import FormattingHelper -from gen.errors import WindowActiveError -from gen.const import HOME_DIR, ROOT_DIR -from gui.managedwindow import ManagedWindow -from gen.config import config -from gui.editors import EditPlace, EditEvent, EditFamily, EditPerson -from gui.selectors.selectplace import SelectPlace +from gramps.gen.display.name import displayer as _nd +from gramps.gui.views.navigationview import NavigationView +from gramps.gen.utils.libformatting import FormattingHelper +from gramps.gen.errors import WindowActiveError +from gramps.gen.const import HOME_DIR, ROOT_DIR +from gramps.gui.managedwindow import ManagedWindow +from gramps.gen.config import config +from gramps.gui.editors import EditPlace, EditEvent, EditFamily, EditPerson +from gramps.gui.selectors.selectplace import SelectPlace from gi.repository import OsmGpsMap as osmgpsmap import constants diff --git a/gramps/plugins/lib/maps/osmGps.py b/gramps/plugins/lib/maps/osmGps.py index db1afe411..09e6abf1a 100644 --- a/gramps/plugins/lib/maps/osmGps.py +++ b/gramps/plugins/lib/maps/osmGps.py @@ -60,9 +60,9 @@ from lifewaylayer import LifeWayLayer from markerlayer import MarkerLayer from datelayer import DateLayer from messagelayer import MessageLayer -from gen.ggettext import sgettext as _ -from gen.config import config -from gui.dialog import ErrorDialog +from gramps.gen.ggettext import sgettext as _ +from gramps.gen.config import config +from gramps.gui.dialog import ErrorDialog #------------------------------------------------------------------------- # diff --git a/gramps/plugins/lib/maps/placeselection.py b/gramps/plugins/lib/maps/placeselection.py index 5753cf837..9b26bd3d9 100644 --- a/gramps/plugins/lib/maps/placeselection.py +++ b/gramps/plugins/lib/maps/placeselection.py @@ -27,7 +27,7 @@ # Python modules # #------------------------------------------------------------------------- -from gen.ggettext import sgettext as _ +from gramps.gen.ggettext import sgettext as _ import re from gi.repository import GObject import math @@ -52,8 +52,8 @@ from gi.repository import Gtk # Gramps Modules # #------------------------------------------------------------------------- -from gen.errors import WindowActiveError -from gui.managedwindow import ManagedWindow +from gramps.gen.errors import WindowActiveError +from gramps.gui.managedwindow import ManagedWindow from osmGps import OsmGps #------------------------------------------------------------------------- diff --git a/gramps/plugins/mapservices/eniroswedenmap.py b/gramps/plugins/mapservices/eniroswedenmap.py index 0238c3ca6..902fbbbd9 100644 --- a/gramps/plugins/mapservices/eniroswedenmap.py +++ b/gramps/plugins/mapservices/eniroswedenmap.py @@ -31,7 +31,7 @@ Eniro Sweden (Denmark) map service plugin. Opens place in kartor.eniro.se # python modules # #------------------------------------------------------------------------ -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ #------------------------------------------------------------------------ # @@ -39,7 +39,7 @@ from gen.ggettext import gettext as _ # #------------------------------------------------------------------------ from gramps.plugins.lib.libmapservice import MapService -from gui.dialog import WarningDialog +from gramps.gui.dialog import WarningDialog # Make upper case of translaed country so string search works later MAP_NAMES_SWEDEN = [_("Sweden").upper(), diff --git a/gramps/plugins/mapservices/googlemap.py b/gramps/plugins/mapservices/googlemap.py index 3f31a7e16..1810669fa 100644 --- a/gramps/plugins/mapservices/googlemap.py +++ b/gramps/plugins/mapservices/googlemap.py @@ -28,7 +28,7 @@ Google Maps map service plugin. Open place in maps.google.com # python modules # #------------------------------------------------------------------------ -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ #------------------------------------------------------------------------ # diff --git a/gramps/plugins/mapservices/openstreetmap.py b/gramps/plugins/mapservices/openstreetmap.py index d30f46c61..cf19d00f0 100644 --- a/gramps/plugins/mapservices/openstreetmap.py +++ b/gramps/plugins/mapservices/openstreetmap.py @@ -28,7 +28,7 @@ OpenStreetMap map service plugin. Open place in openstreetmap.org # python modules # #------------------------------------------------------------------------ -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ #------------------------------------------------------------------------ # diff --git a/gramps/plugins/quickview/ageondate.py b/gramps/plugins/quickview/ageondate.py index 5874c0b69..90e319a5e 100644 --- a/gramps/plugins/quickview/ageondate.py +++ b/gramps/plugins/quickview/ageondate.py @@ -27,12 +27,12 @@ Display references for any object """ -from gen.simple import SimpleAccess, SimpleDoc -from gui.plug.quick import QuickTable -from gen.utils.alive import probably_alive -from gen.ggettext import gettext as _ +from gramps.gen.simple import SimpleAccess, SimpleDoc +from gramps.gui.plug.quick import QuickTable +from gramps.gen.utils.alive import probably_alive +from gramps.gen.ggettext import gettext as _ from gramps.gen.datehandler import displayer -from gen.config import config +from gramps.gen.config import config def run(database, document, date): """ diff --git a/gramps/plugins/quickview/all_events.py b/gramps/plugins/quickview/all_events.py index 6e2086071..66ebf8e70 100644 --- a/gramps/plugins/quickview/all_events.py +++ b/gramps/plugins/quickview/all_events.py @@ -26,9 +26,9 @@ Display a person's events, both personal and family """ -from gen.simple import SimpleAccess, by_date, SimpleDoc -from gui.plug.quick import QuickTable -from gen.ggettext import gettext as _ +from gramps.gen.simple import SimpleAccess, by_date, SimpleDoc +from gramps.gui.plug.quick import QuickTable +from gramps.gen.ggettext import gettext as _ def run(database, document, person): """ diff --git a/gramps/plugins/quickview/all_relations.py b/gramps/plugins/quickview/all_relations.py index 83821cee5..2f76d26ca 100644 --- a/gramps/plugins/quickview/all_relations.py +++ b/gramps/plugins/quickview/all_relations.py @@ -31,9 +31,9 @@ Display a person's relations to the home person # #------------------------------------------------------------------------- -from gen.simple import SimpleAccess, SimpleDoc -from gen.ggettext import gettext as _ -from gen.relationship import get_relationship_calculator +from gramps.gen.simple import SimpleAccess, SimpleDoc +from gramps.gen.ggettext import gettext as _ +from gramps.gen.relationship import get_relationship_calculator # define the formatting string once as a constant. Since this is reused diff --git a/gramps/plugins/quickview/attributematch.py b/gramps/plugins/quickview/attributematch.py index 8e8b3952c..dbe94c6d9 100644 --- a/gramps/plugins/quickview/attributematch.py +++ b/gramps/plugins/quickview/attributematch.py @@ -22,9 +22,9 @@ # # -from gen.simple import SimpleAccess, SimpleDoc -from gui.plug.quick import QuickTable -from gen.ggettext import gettext as _ +from gramps.gen.simple import SimpleAccess, SimpleDoc +from gramps.gui.plug.quick import QuickTable +from gramps.gen.ggettext import gettext as _ def run(database, document, attribute, value=None): sdb = SimpleAccess(database) diff --git a/gramps/plugins/quickview/filterbyname.py b/gramps/plugins/quickview/filterbyname.py index ce6ff7abb..ab28f41dc 100644 --- a/gramps/plugins/quickview/filterbyname.py +++ b/gramps/plugins/quickview/filterbyname.py @@ -27,17 +27,17 @@ Display filtered data """ -from gen.simple import SimpleAccess, SimpleDoc -from gui.plug.quick import QuickTable -from gen.utils.file import media_path_full -from gui.plug.quick import run_quick_report_by_name_direct -from gen.lib import Person +from gramps.gen.simple import SimpleAccess, SimpleDoc +from gramps.gui.plug.quick import QuickTable +from gramps.gen.utils.file import media_path_full +from gramps.gui.plug.quick import run_quick_report_by_name_direct +from gramps.gen.lib import Person from gramps.gen.datehandler import get_date import posixpath from collections import defaultdict -from gen.ggettext import sgettext as _ -from gen.ggettext import ngettext +from gramps.gen.ggettext import sgettext as _ +from gramps.gen.ggettext import ngettext fname_map = {'all': _('Filtering_on|all'), 'Inverse Person': _('Filtering_on|Inverse Person'), diff --git a/gramps/plugins/quickview/lineage.py b/gramps/plugins/quickview/lineage.py index 879270d5b..ef79c7c4e 100644 --- a/gramps/plugins/quickview/lineage.py +++ b/gramps/plugins/quickview/lineage.py @@ -33,9 +33,9 @@ Display a person's father or mother lineage #------------------------------------------------------------------------- from gramps.gen.lib import ChildRefType, Person -from gen.simple import SimpleAccess, SimpleDoc -from gui.plug.quick import QuickTable -from gen.ggettext import gettext as _ +from gramps.gen.simple import SimpleAccess, SimpleDoc +from gramps.gui.plug.quick import QuickTable +from gramps.gen.ggettext import gettext as _ __FMT = "%-30s\t%-12s\t%-12s" __FMT_REM = " %s: %s" diff --git a/gramps/plugins/quickview/linkreferences.py b/gramps/plugins/quickview/linkreferences.py index 1ae96bf77..16ba8d4e9 100644 --- a/gramps/plugins/quickview/linkreferences.py +++ b/gramps/plugins/quickview/linkreferences.py @@ -25,10 +25,10 @@ Display link references for a note """ -from gen.simple import SimpleAccess, SimpleDoc -from gui.plug.quick import QuickTable -from gen.lib import StyledTextTagType -from gen.ggettext import gettext as _ +from gramps.gen.simple import SimpleAccess, SimpleDoc +from gramps.gui.plug.quick import QuickTable +from gramps.gen.lib import StyledTextTagType +from gramps.gen.ggettext import gettext as _ def run(database, document, obj): """ diff --git a/gramps/plugins/quickview/onthisday.py b/gramps/plugins/quickview/onthisday.py index cf9563719..7780401cb 100644 --- a/gramps/plugins/quickview/onthisday.py +++ b/gramps/plugins/quickview/onthisday.py @@ -26,9 +26,9 @@ Display all events on a particular day. """ -from gen.simple import SimpleAccess, SimpleDoc, SimpleTable -from gui.plug.quick import QuickTable -from gen.ggettext import gettext as _ +from gramps.gen.simple import SimpleAccess, SimpleDoc, SimpleTable +from gramps.gui.plug.quick import QuickTable +from gramps.gen.ggettext import gettext as _ from gramps.gen.lib import Date def get_ref(db, objclass, handle): diff --git a/gramps/plugins/quickview/references.py b/gramps/plugins/quickview/references.py index 6e81736b3..092636dd2 100644 --- a/gramps/plugins/quickview/references.py +++ b/gramps/plugins/quickview/references.py @@ -27,9 +27,9 @@ Display references for any object """ -from gen.simple import SimpleAccess, SimpleDoc -from gui.plug.quick import QuickTable -from gen.ggettext import gettext as _ +from gramps.gen.simple import SimpleAccess, SimpleDoc +from gramps.gui.plug.quick import QuickTable +from gramps.gen.ggettext import gettext as _ def get_ref(db, objclass, handle): """ diff --git a/gramps/plugins/quickview/reporef.py b/gramps/plugins/quickview/reporef.py index db6935a3d..12a57c2f0 100755 --- a/gramps/plugins/quickview/reporef.py +++ b/gramps/plugins/quickview/reporef.py @@ -34,9 +34,9 @@ Display RepoRef for sources related to active repository """ -from gen.simple import SimpleAccess, SimpleDoc -from gui.plug.quick import QuickTable -from gen.ggettext import gettext as _ +from gramps.gen.simple import SimpleAccess, SimpleDoc +from gramps.gui.plug.quick import QuickTable +from gramps.gen.ggettext import gettext as _ def run(database, document, repo): """ diff --git a/gramps/plugins/quickview/samesurnames.py b/gramps/plugins/quickview/samesurnames.py index 4f5c6c91d..881215ee6 100644 --- a/gramps/plugins/quickview/samesurnames.py +++ b/gramps/plugins/quickview/samesurnames.py @@ -27,13 +27,13 @@ Display a people who have a person's same surname or given name. """ -from gen.simple import SimpleAccess, SimpleDoc -from gui.plug.quick import QuickTable -from gen.ggettext import gettext as _ -from gen.ggettext import ngettext +from gramps.gen.simple import SimpleAccess, SimpleDoc +from gramps.gui.plug.quick import QuickTable +from gramps.gen.ggettext import gettext as _ +from gramps.gen.ggettext import ngettext from gramps.gen.lib import Person -from gen.filters.rules import Rule -from gen.filters import GenericFilterFactory +from gramps.gen.filters.rules import Rule +from gramps.gen.filters import GenericFilterFactory class IncompleteSurname(Rule): """People with incomplete surnames""" diff --git a/gramps/plugins/quickview/siblings.py b/gramps/plugins/quickview/siblings.py index c8b9a073c..d1c1094b0 100644 --- a/gramps/plugins/quickview/siblings.py +++ b/gramps/plugins/quickview/siblings.py @@ -26,10 +26,10 @@ Display a person's siblings in a report window """ -from gen.simple import SimpleAccess, SimpleDoc -from gui.plug.quick import QuickTable -from gen.relationship import get_relationship_calculator -from gen.ggettext import gettext as _ +from gramps.gen.simple import SimpleAccess, SimpleDoc +from gramps.gui.plug.quick import QuickTable +from gramps.gen.relationship import get_relationship_calculator +from gramps.gen.ggettext import gettext as _ def run(database, document, person): """ diff --git a/gramps/plugins/records.py b/gramps/plugins/records.py index 2df56a21c..f595941e2 100644 --- a/gramps/plugins/records.py +++ b/gramps/plugins/records.py @@ -28,25 +28,25 @@ # #------------------------------------------------------------------------ import datetime -from gen.ggettext import sgettext as _ +from gramps.gen.ggettext import sgettext as _ #------------------------------------------------------------------------ # # GRAMPS modules # #------------------------------------------------------------------------ -from gen.lib import (ChildRefType, Date, Span, EventType, Name, +from gramps.gen.lib import (ChildRefType, Date, Span, EventType, Name, StyledText, StyledTextTag, StyledTextTagType) -from gen.plug.docgen import (FontStyle, ParagraphStyle, FONT_SANS_SERIF, +from gramps.gen.plug.docgen import (FontStyle, ParagraphStyle, FONT_SANS_SERIF, PARA_ALIGN_CENTER) -from gen.display.name import displayer as name_displayer -from gen.plug import Gramplet -from gen.plug.menu import (BooleanOption, EnumeratedListOption, +from gramps.gen.display.name import displayer as name_displayer +from gramps.gen.plug import Gramplet +from gramps.gen.plug.menu import (BooleanOption, EnumeratedListOption, FilterOption, NumberOption, PersonOption, StringOption) -from gen.plug.report import Report -from gen.plug.report import utils as ReportUtils -from gen.plug.report import MenuReportOptions -from gen.utils.alive import probably_alive +from gramps.gen.plug.report import Report +from gramps.gen.plug.report import utils as ReportUtils +from gramps.gen.plug.report import MenuReportOptions +from gramps.gen.utils.alive import probably_alive #------------------------------------------------------------------------ # diff --git a/gramps/plugins/sidebar/categorysidebar.py b/gramps/plugins/sidebar/categorysidebar.py index e93174d07..356227de1 100644 --- a/gramps/plugins/sidebar/categorysidebar.py +++ b/gramps/plugins/sidebar/categorysidebar.py @@ -35,9 +35,9 @@ from gi.repository import Gtk # GRAMPS modules # #------------------------------------------------------------------------- -from gen.config import config -from gui.basesidebar import BaseSidebar -from gui.viewmanager import get_available_views, views_to_show +from gramps.gen.config import config +from gramps.gui.basesidebar import BaseSidebar +from gramps.gui.viewmanager import get_available_views, views_to_show #------------------------------------------------------------------------- # diff --git a/gramps/plugins/textreport/alphabeticalindex.py b/gramps/plugins/textreport/alphabeticalindex.py index bf66c885a..557e57b1d 100644 --- a/gramps/plugins/textreport/alphabeticalindex.py +++ b/gramps/plugins/textreport/alphabeticalindex.py @@ -24,16 +24,16 @@ # Python modules # #------------------------------------------------------------------------ -from gen.ggettext import sgettext as _ +from gramps.gen.ggettext import sgettext as _ #------------------------------------------------------------------------ # # Gramps modules # #------------------------------------------------------------------------ -from gen.plug.report import Report -from gen.plug.report import MenuReportOptions -from gen.plug.docgen import (FontStyle, ParagraphStyle, TableStyle, +from gramps.gen.plug.report import Report +from gramps.gen.plug.report import MenuReportOptions +from gramps.gen.plug.docgen import (FontStyle, ParagraphStyle, TableStyle, TableCellStyle, FONT_SANS_SERIF, IndexMark, INDEX_TYPE_TOC) diff --git a/gramps/plugins/textreport/ancestorreport.py b/gramps/plugins/textreport/ancestorreport.py index 45c8031c0..151f83e33 100644 --- a/gramps/plugins/textreport/ancestorreport.py +++ b/gramps/plugins/textreport/ancestorreport.py @@ -32,25 +32,25 @@ #------------------------------------------------------------------------ import math import copy -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ #------------------------------------------------------------------------ # # gramps modules # #------------------------------------------------------------------------ -from gen.display.name import displayer as global_name_display -from gen.errors import ReportError -from gen.lib import ChildRefType -from gen.plug.menu import (BooleanOption, NumberOption, PersonOption, +from gramps.gen.display.name import displayer as global_name_display +from gramps.gen.errors import ReportError +from gramps.gen.lib import ChildRefType +from gramps.gen.plug.menu import (BooleanOption, NumberOption, PersonOption, EnumeratedListOption) -from gen.plug.docgen import (IndexMark, FontStyle, ParagraphStyle, +from gramps.gen.plug.docgen import (IndexMark, FontStyle, ParagraphStyle, FONT_SANS_SERIF, INDEX_TYPE_TOC, PARA_ALIGN_CENTER) -from gen.plug.report import Report -from gen.plug.report import utils as ReportUtils -from gen.plug.report import MenuReportOptions -from gen.utils.trans import get_available_translations +from gramps.gen.plug.report import Report +from gramps.gen.plug.report import utils as ReportUtils +from gramps.gen.plug.report import MenuReportOptions +from gramps.gen.utils.trans import get_available_translations from gramps.plugins.lib.libnarrate import Narrator from gramps.plugins.lib.libtranslate import Translator, get_language_string diff --git a/gramps/plugins/textreport/birthdayreport.py b/gramps/plugins/textreport/birthdayreport.py index 11ecac083..07c04fc2d 100644 --- a/gramps/plugins/textreport/birthdayreport.py +++ b/gramps/plugins/textreport/birthdayreport.py @@ -29,8 +29,8 @@ # #------------------------------------------------------------------------ import copy -from gen.ggettext import gettext as _ -from gen.ggettext import ngettext +from gramps.gen.ggettext import gettext as _ +from gramps.gen.ggettext import ngettext import datetime, time #------------------------------------------------------------------------ @@ -38,20 +38,20 @@ import datetime, time # GRAMPS modules # #------------------------------------------------------------------------ -from gen.display.name import displayer as global_name_display -from gen.errors import ReportError -from gen.lib import NameType, EventType, Name, Date, Person, Surname -from gen.relationship import get_relationship_calculator -from gen.plug.docgen import (FontStyle, ParagraphStyle, GraphicsStyle, +from gramps.gen.display.name import displayer as global_name_display +from gramps.gen.errors import ReportError +from gramps.gen.lib import NameType, EventType, Name, Date, Person, Surname +from gramps.gen.relationship import get_relationship_calculator +from gramps.gen.plug.docgen import (FontStyle, ParagraphStyle, GraphicsStyle, FONT_SERIF, PARA_ALIGN_RIGHT, PARA_ALIGN_LEFT, PARA_ALIGN_CENTER) -from gen.plug.menu import (BooleanOption, StringOption, NumberOption, +from gramps.gen.plug.menu import (BooleanOption, StringOption, NumberOption, EnumeratedListOption, FilterOption, PersonOption) -from gen.plug.report import Report -from gen.plug.report import utils as ReportUtils -from gen.plug.report import MenuReportOptions -from gen.utils.alive import probably_alive -from gen.datehandler import displayer as _dd, long_days +from gramps.gen.plug.report import Report +from gramps.gen.plug.report import utils as ReportUtils +from gramps.gen.plug.report import MenuReportOptions +from gramps.gen.utils.alive import probably_alive +from gramps.gen.datehandler import displayer as _dd, long_days import gramps.plugins.lib.libholiday as libholiday diff --git a/gramps/plugins/textreport/custombooktext.py b/gramps/plugins/textreport/custombooktext.py index 90f0accab..60a43ee34 100644 --- a/gramps/plugins/textreport/custombooktext.py +++ b/gramps/plugins/textreport/custombooktext.py @@ -30,7 +30,7 @@ # python modules # #------------------------------------------------------------------------ -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ #------------------------------------------------------------------------ # @@ -43,10 +43,10 @@ from gen.ggettext import gettext as _ # gramps modules # #------------------------------------------------------------------------ -from gen.plug.menu import TextOption -from gen.plug.report import Report -from gen.plug.report import MenuReportOptions -from gen.plug.docgen import (FontStyle, ParagraphStyle, FONT_SANS_SERIF, +from gramps.gen.plug.menu import TextOption +from gramps.gen.plug.report import Report +from gramps.gen.plug.report import MenuReportOptions +from gramps.gen.plug.docgen import (FontStyle, ParagraphStyle, FONT_SANS_SERIF, PARA_ALIGN_CENTER, IndexMark, INDEX_TYPE_TOC) #------------------------------------------------------------------------ diff --git a/gramps/plugins/textreport/descendreport.py b/gramps/plugins/textreport/descendreport.py index e18ce3c1b..b91e854e4 100644 --- a/gramps/plugins/textreport/descendreport.py +++ b/gramps/plugins/textreport/descendreport.py @@ -35,25 +35,25 @@ Reports/Text Reports/Descendant Report. # #------------------------------------------------------------------------ import copy -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ #------------------------------------------------------------------------ # # GRAMPS modules # #------------------------------------------------------------------------ -from gen.plug.docgen import (IndexMark, FontStyle, ParagraphStyle, +from gramps.gen.plug.docgen import (IndexMark, FontStyle, ParagraphStyle, FONT_SANS_SERIF, INDEX_TYPE_TOC, PARA_ALIGN_CENTER) -from gen.plug.menu import (NumberOption, PersonOption, BooleanOption, +from gramps.gen.plug.menu import (NumberOption, PersonOption, BooleanOption, EnumeratedListOption) -from gen.display.name import displayer as global_name_display -from gen.errors import ReportError -from gen.plug.report import Report -from gen.plug.report import utils as ReportUtils -from gen.plug.report import MenuReportOptions +from gramps.gen.display.name import displayer as global_name_display +from gramps.gen.errors import ReportError +from gramps.gen.plug.report import Report +from gramps.gen.plug.report import utils as ReportUtils +from gramps.gen.plug.report import MenuReportOptions from gramps.gen.datehandler import get_date -from gen.sort import Sort -from gen.utils.db import (get_birth_or_fallback, get_death_or_fallback, +from gramps.gen.sort import Sort +from gramps.gen.utils.db import (get_birth_or_fallback, get_death_or_fallback, get_marriage_or_fallback, get_divorce_or_fallback) diff --git a/gramps/plugins/textreport/detancestralreport.py b/gramps/plugins/textreport/detancestralreport.py index 8dcdc0f8e..0c0a9a5f3 100644 --- a/gramps/plugins/textreport/detancestralreport.py +++ b/gramps/plugins/textreport/detancestralreport.py @@ -35,26 +35,26 @@ # #------------------------------------------------------------------------ import copy -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ #------------------------------------------------------------------------ # # GRAMPS modules # #------------------------------------------------------------------------ -from gen.display.name import displayer as global_name_display -from gen.errors import ReportError -from gen.lib import EventType, FamilyRelType, Person, NoteType -from gen.plug.docgen import (IndexMark, FontStyle, ParagraphStyle, +from gramps.gen.display.name import displayer as global_name_display +from gramps.gen.errors import ReportError +from gramps.gen.lib import EventType, FamilyRelType, Person, NoteType +from gramps.gen.plug.docgen import (IndexMark, FontStyle, ParagraphStyle, FONT_SANS_SERIF, FONT_SERIF, INDEX_TYPE_TOC, PARA_ALIGN_CENTER) -from gen.plug.menu import BooleanOption, NumberOption, PersonOption, EnumeratedListOption -from gen.plug.report import ( Report, Bibliography ) -from gen.plug.report import endnotes -from gen.plug.report import utils as ReportUtils -from gen.plug.report import MenuReportOptions +from gramps.gen.plug.menu import BooleanOption, NumberOption, PersonOption, EnumeratedListOption +from gramps.gen.plug.report import ( Report, Bibliography ) +from gramps.gen.plug.report import endnotes +from gramps.gen.plug.report import utils as ReportUtils +from gramps.gen.plug.report import MenuReportOptions from gramps.plugins.lib.libnarrate import Narrator -from gen.utils.trans import get_available_translations +from gramps.gen.utils.trans import get_available_translations from gramps.plugins.lib.libtranslate import Translator, get_language_string #------------------------------------------------------------------------ diff --git a/gramps/plugins/textreport/detdescendantreport.py b/gramps/plugins/textreport/detdescendantreport.py index 4baf00fae..817d3ea86 100644 --- a/gramps/plugins/textreport/detdescendantreport.py +++ b/gramps/plugins/textreport/detdescendantreport.py @@ -37,7 +37,7 @@ # #------------------------------------------------------------------------ import copy -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ from functools import partial #------------------------------------------------------------------------ @@ -45,20 +45,20 @@ from functools import partial # GRAMPS modules # #------------------------------------------------------------------------ -from gen.display.name import displayer as global_name_display -from gen.errors import ReportError -from gen.lib import FamilyRelType, Person, NoteType -from gen.plug.menu import (BooleanOption, NumberOption, PersonOption, +from gramps.gen.display.name import displayer as global_name_display +from gramps.gen.errors import ReportError +from gramps.gen.lib import FamilyRelType, Person, NoteType +from gramps.gen.plug.menu import (BooleanOption, NumberOption, PersonOption, EnumeratedListOption) -from gen.plug.docgen import (IndexMark, FontStyle, ParagraphStyle, +from gramps.gen.plug.docgen import (IndexMark, FontStyle, ParagraphStyle, FONT_SANS_SERIF, FONT_SERIF, INDEX_TYPE_TOC, PARA_ALIGN_CENTER) -from gen.plug.report import (Report, Bibliography) -from gen.plug.report import endnotes -from gen.plug.report import utils as ReportUtils -from gen.plug.report import MenuReportOptions +from gramps.gen.plug.report import (Report, Bibliography) +from gramps.gen.plug.report import endnotes +from gramps.gen.plug.report import utils as ReportUtils +from gramps.gen.plug.report import MenuReportOptions from gramps.plugins.lib.libnarrate import Narrator -from gen.utils.trans import get_available_translations +from gramps.gen.utils.trans import get_available_translations from gramps.plugins.lib.libtranslate import Translator, get_language_string #------------------------------------------------------------------------ diff --git a/gramps/plugins/textreport/endoflinereport.py b/gramps/plugins/textreport/endoflinereport.py index 37ae16c1c..338dba35c 100644 --- a/gramps/plugins/textreport/endoflinereport.py +++ b/gramps/plugins/textreport/endoflinereport.py @@ -29,22 +29,22 @@ # #------------------------------------------------------------------------ import copy -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ #------------------------------------------------------------------------ # # gramps modules # #------------------------------------------------------------------------ -from gen.display.name import displayer as global_name_display -from gen.errors import ReportError -from gen.plug.docgen import (IndexMark, FontStyle, ParagraphStyle, TableStyle, +from gramps.gen.display.name import displayer as global_name_display +from gramps.gen.errors import ReportError +from gramps.gen.plug.docgen import (IndexMark, FontStyle, ParagraphStyle, TableStyle, TableCellStyle, FONT_SANS_SERIF, INDEX_TYPE_TOC, PARA_ALIGN_CENTER) -from gen.plug.menu import (PersonOption, EnumeratedListOption) -from gen.plug.report import Report -from gen.plug.report import utils as ReportUtils -from gen.plug.report import MenuReportOptions +from gramps.gen.plug.menu import (PersonOption, EnumeratedListOption) +from gramps.gen.plug.report import Report +from gramps.gen.plug.report import utils as ReportUtils +from gramps.gen.plug.report import MenuReportOptions from gramps.gen.datehandler import get_date #------------------------------------------------------------------------ diff --git a/gramps/plugins/textreport/familygroup.py b/gramps/plugins/textreport/familygroup.py index 1439f0cbb..fbe24e70a 100644 --- a/gramps/plugins/textreport/familygroup.py +++ b/gramps/plugins/textreport/familygroup.py @@ -38,16 +38,16 @@ from functools import partial # #------------------------------------------------------------------------ from gramps.gen.lib import EventRoleType, EventType, NoteType, Person -from gen.plug.menu import (BooleanOption, FamilyOption, EnumeratedListOption) -from gen.plug.report import Report -from gen.plug.report import utils as ReportUtils -from gen.plug.report import MenuReportOptions -from gen.plug.docgen import (IndexMark, FontStyle, ParagraphStyle, TableStyle, +from gramps.gen.plug.menu import (BooleanOption, FamilyOption, EnumeratedListOption) +from gramps.gen.plug.report import Report +from gramps.gen.plug.report import utils as ReportUtils +from gramps.gen.plug.report import MenuReportOptions +from gramps.gen.plug.docgen import (IndexMark, FontStyle, ParagraphStyle, TableStyle, TableCellStyle, FONT_SANS_SERIF, FONT_SERIF, INDEX_TYPE_TOC, PARA_ALIGN_CENTER) from gramps.gen.datehandler import get_date -from gen.ggettext import sgettext as _ -from gen.display.name import displayer as global_name_display +from gramps.gen.ggettext import sgettext as _ +from gramps.gen.display.name import displayer as global_name_display #------------------------------------------------------------------------ # diff --git a/gramps/plugins/textreport/indivcomplete.py b/gramps/plugins/textreport/indivcomplete.py index 1785f5cc3..a4f417b9d 100644 --- a/gramps/plugins/textreport/indivcomplete.py +++ b/gramps/plugins/textreport/indivcomplete.py @@ -32,7 +32,7 @@ #------------------------------------------------------------------------ import os import copy -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ from collections import defaultdict #------------------------------------------------------------------------ @@ -40,20 +40,20 @@ from collections import defaultdict # GRAMPS modules # #------------------------------------------------------------------------ -from gen.lib import EventRoleType, EventType, Person, NoteType -from gen.plug.docgen import (IndexMark, FontStyle, ParagraphStyle, TableStyle, +from gramps.gen.lib import EventRoleType, EventType, Person, NoteType +from gramps.gen.plug.docgen import (IndexMark, FontStyle, ParagraphStyle, TableStyle, TableCellStyle, FONT_SANS_SERIF, INDEX_TYPE_TOC, PARA_ALIGN_CENTER) from gramps.gen.datehandler import get_date -from gen.plug.menu import (BooleanOption, FilterOption, PersonOption, +from gramps.gen.plug.menu import (BooleanOption, FilterOption, PersonOption, BooleanListOption, EnumeratedListOption) -from gen.plug.report import Report -from gen.plug.report import utils as ReportUtils -from gen.plug.report import MenuReportOptions -from gen.plug.report import Bibliography -from gen.plug.report import endnotes as Endnotes -from gen.display.name import displayer as global_name_display -from gen.utils.file import media_path_full +from gramps.gen.plug.report import Report +from gramps.gen.plug.report import utils as ReportUtils +from gramps.gen.plug.report import MenuReportOptions +from gramps.gen.plug.report import Bibliography +from gramps.gen.plug.report import endnotes as Endnotes +from gramps.gen.display.name import displayer as global_name_display +from gramps.gen.utils.file import media_path_full #------------------------------------------------------------------------ # diff --git a/gramps/plugins/textreport/kinshipreport.py b/gramps/plugins/textreport/kinshipreport.py index b27d9af3f..450838a68 100644 --- a/gramps/plugins/textreport/kinshipreport.py +++ b/gramps/plugins/textreport/kinshipreport.py @@ -31,25 +31,25 @@ # #------------------------------------------------------------------------ import copy -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ #------------------------------------------------------------------------ # # gramps modules # #------------------------------------------------------------------------ -from gen.display.name import displayer as global_name_display -from gen.errors import ReportError -from gen.relationship import get_relationship_calculator -from gen.plug.docgen import (IndexMark, FontStyle, ParagraphStyle, +from gramps.gen.display.name import displayer as global_name_display +from gramps.gen.errors import ReportError +from gramps.gen.relationship import get_relationship_calculator +from gramps.gen.plug.docgen import (IndexMark, FontStyle, ParagraphStyle, FONT_SANS_SERIF, INDEX_TYPE_TOC, PARA_ALIGN_CENTER) -from gen.plug.menu import (NumberOption, BooleanOption, PersonOption, +from gramps.gen.plug.menu import (NumberOption, BooleanOption, PersonOption, EnumeratedListOption) -from gen.plug.report import Report -from gen.plug.report import utils as ReportUtils -from gen.plug.report import MenuReportOptions +from gramps.gen.plug.report import Report +from gramps.gen.plug.report import utils as ReportUtils +from gramps.gen.plug.report import MenuReportOptions from gramps.gen.datehandler import get_date -from gen.utils.db import get_birth_or_fallback, get_death_or_fallback +from gramps.gen.utils.db import get_birth_or_fallback, get_death_or_fallback #------------------------------------------------------------------------ # diff --git a/gramps/plugins/textreport/numberofancestorsreport.py b/gramps/plugins/textreport/numberofancestorsreport.py index 3a22c3a2d..eb5a4ae19 100644 --- a/gramps/plugins/textreport/numberofancestorsreport.py +++ b/gramps/plugins/textreport/numberofancestorsreport.py @@ -32,8 +32,8 @@ # #------------------------------------------------------------------------ import copy -from gen.ggettext import gettext as _ -from gen.ggettext import ngettext +from gramps.gen.ggettext import gettext as _ +from gramps.gen.ggettext import ngettext import locale import math @@ -42,15 +42,15 @@ import math # GRAMPS modules # #------------------------------------------------------------------------ -from gen.display.name import displayer as global_name_display -from gen.errors import ReportError -from gen.plug.menu import PersonOption, EnumeratedListOption -from gen.plug.docgen import (IndexMark, FontStyle, ParagraphStyle, +from gramps.gen.display.name import displayer as global_name_display +from gramps.gen.errors import ReportError +from gramps.gen.plug.menu import PersonOption, EnumeratedListOption +from gramps.gen.plug.docgen import (IndexMark, FontStyle, ParagraphStyle, FONT_SANS_SERIF, PARA_ALIGN_CENTER, INDEX_TYPE_TOC) -from gen.plug.report import Report -from gen.plug.report import utils as ReportUtils -from gen.plug.report import MenuReportOptions +from gramps.gen.plug.report import Report +from gramps.gen.plug.report import utils as ReportUtils +from gramps.gen.plug.report import MenuReportOptions #------------------------------------------------------------------------ # diff --git a/gramps/plugins/textreport/placereport.py b/gramps/plugins/textreport/placereport.py index 6978d9236..4fee8ddee 100644 --- a/gramps/plugins/textreport/placereport.py +++ b/gramps/plugins/textreport/placereport.py @@ -29,24 +29,24 @@ # python modules # #------------------------------------------------------------------------ -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ #------------------------------------------------------------------------ # # gramps modules # #------------------------------------------------------------------------ -from gen.plug.menu import FilterOption, PlaceListOption, EnumeratedListOption, \ +from gramps.gen.plug.menu import FilterOption, PlaceListOption, EnumeratedListOption, \ BooleanOption -from gen.plug.report import Report -from gen.plug.report import MenuReportOptions -from gen.plug.docgen import (IndexMark, FontStyle, ParagraphStyle, TableStyle, +from gramps.gen.plug.report import Report +from gramps.gen.plug.report import MenuReportOptions +from gramps.gen.plug.docgen import (IndexMark, FontStyle, ParagraphStyle, TableStyle, TableCellStyle, FONT_SANS_SERIF, FONT_SERIF, INDEX_TYPE_TOC, PARA_ALIGN_CENTER) -from gen.proxy import PrivateProxyDb +from gramps.gen.proxy import PrivateProxyDb from gramps.gen.datehandler import get_date -from gen.sort import Sort -from gen.display.name import displayer as _nd +from gramps.gen.sort import Sort +from gramps.gen.display.name import displayer as _nd class PlaceReport(Report): """ @@ -367,7 +367,7 @@ class PlaceOptions(MenuReportOptions): # Reload filters to pick any new ones CustomFilters = None - from gen.filters import CustomFilters, GenericFilter + from gramps.gen.filters import CustomFilters, GenericFilter opt = FilterOption(_("Select using filter"), 0) opt.set_help(_("Select places using a filter")) diff --git a/gramps/plugins/textreport/simplebooktitle.py b/gramps/plugins/textreport/simplebooktitle.py index 9b7a81210..c0a8a38c0 100644 --- a/gramps/plugins/textreport/simplebooktitle.py +++ b/gramps/plugins/textreport/simplebooktitle.py @@ -28,7 +28,7 @@ # #------------------------------------------------------------------------ import time -from gen.ggettext import sgettext as _ +from gramps.gen.ggettext import sgettext as _ import os #------------------------------------------------------------------------ @@ -36,11 +36,11 @@ import os # gramps modules # #------------------------------------------------------------------------ -from gen.plug.menu import StringOption, MediaOption, NumberOption -from gen.utils.file import media_path_full -from gen.plug.report import Report -from gen.plug.report import MenuReportOptions -from gen.plug.docgen import (FontStyle, ParagraphStyle, +from gramps.gen.plug.menu import StringOption, MediaOption, NumberOption +from gramps.gen.utils.file import media_path_full +from gramps.gen.plug.report import Report +from gramps.gen.plug.report import MenuReportOptions +from gramps.gen.plug.docgen import (FontStyle, ParagraphStyle, FONT_SANS_SERIF, PARA_ALIGN_CENTER) #------------------------------------------------------------------------ diff --git a/gramps/plugins/textreport/summary.py b/gramps/plugins/textreport/summary.py index 899b23a3c..0b0be4613 100644 --- a/gramps/plugins/textreport/summary.py +++ b/gramps/plugins/textreport/summary.py @@ -32,7 +32,7 @@ Reports/Text Reports/Database Summary Report. # #------------------------------------------------------------------------ import posixpath -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ #------------------------------------------------------------------------ # @@ -40,12 +40,12 @@ from gen.ggettext import gettext as _ # #------------------------------------------------------------------------ from gramps.gen.lib import Person -from gen.plug.report import Report -from gen.plug.report import utils as ReportUtils -from gen.plug.report import MenuReportOptions -from gen.plug.docgen import (IndexMark, FontStyle, ParagraphStyle, +from gramps.gen.plug.report import Report +from gramps.gen.plug.report import utils as ReportUtils +from gramps.gen.plug.report import MenuReportOptions +from gramps.gen.plug.docgen import (IndexMark, FontStyle, ParagraphStyle, FONT_SANS_SERIF, INDEX_TYPE_TOC, PARA_ALIGN_CENTER) -from gen.utils.file import media_path_full +from gramps.gen.utils.file import media_path_full from gramps.gen.datehandler import get_date diff --git a/gramps/plugins/textreport/tableofcontents.py b/gramps/plugins/textreport/tableofcontents.py index cac702826..f70562ab9 100644 --- a/gramps/plugins/textreport/tableofcontents.py +++ b/gramps/plugins/textreport/tableofcontents.py @@ -24,16 +24,16 @@ # Python modules # #------------------------------------------------------------------------ -from gen.ggettext import sgettext as _ +from gramps.gen.ggettext import sgettext as _ #------------------------------------------------------------------------ # # Gramps modules # #------------------------------------------------------------------------ -from gen.plug.report import Report -from gen.plug.report import MenuReportOptions -from gen.plug.docgen import (FontStyle, ParagraphStyle, TableStyle, +from gramps.gen.plug.report import Report +from gramps.gen.plug.report import MenuReportOptions +from gramps.gen.plug.docgen import (FontStyle, ParagraphStyle, TableStyle, TableCellStyle, FONT_SANS_SERIF, IndexMark, INDEX_TYPE_TOC) diff --git a/gramps/plugins/textreport/tagreport.py b/gramps/plugins/textreport/tagreport.py index 8c45fa8f2..9561cafd8 100644 --- a/gramps/plugins/textreport/tagreport.py +++ b/gramps/plugins/textreport/tagreport.py @@ -30,24 +30,24 @@ # standard python modules # #------------------------------------------------------------------------ -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ #------------------------------------------------------------------------ # # GRAMPS modules # #------------------------------------------------------------------------ -from gen.plug.menu import EnumeratedListOption -from gen.plug.report import Report -from gen.plug.report import utils as ReportUtils -from gen.plug.report import MenuReportOptions -from gen.plug.docgen import (IndexMark, FontStyle, ParagraphStyle, +from gramps.gen.plug.menu import EnumeratedListOption +from gramps.gen.plug.report import Report +from gramps.gen.plug.report import utils as ReportUtils +from gramps.gen.plug.report import MenuReportOptions +from gramps.gen.plug.docgen import (IndexMark, FontStyle, ParagraphStyle, TableStyle, TableCellStyle, FONT_SANS_SERIF, INDEX_TYPE_TOC, PARA_ALIGN_CENTER) -from gen.lib import NoteType -from gen.filters import GenericFilterFactory, rules -from gen.display.name import displayer as name_displayer -from gen.errors import ReportError +from gramps.gen.lib import NoteType +from gramps.gen.filters import GenericFilterFactory, rules +from gramps.gen.display.name import displayer as name_displayer +from gramps.gen.errors import ReportError from gramps.gen.datehandler import get_date #------------------------------------------------------------------------ diff --git a/gramps/plugins/tool/changenames.py b/gramps/plugins/tool/changenames.py index d1edb4ac3..456aa6e08 100644 --- a/gramps/plugins/tool/changenames.py +++ b/gramps/plugins/tool/changenames.py @@ -37,16 +37,16 @@ from gi.repository import Gtk # gramps modules # #------------------------------------------------------------------------- -from gen.db import find_surname_name, DbTxn -from gen.const import URL_MANUAL_PAGE -from gui.utils import ProgressMeter -from gui.display import display_help -from gui.managedwindow import ManagedWindow +from gramps.gen.db import find_surname_name, DbTxn +from gramps.gen.const import URL_MANUAL_PAGE +from gramps.gui.utils import ProgressMeter +from gramps.gui.display import display_help +from gramps.gui.managedwindow import ManagedWindow -from gui.dialog import OkDialog -from gui.plug import tool -from gen.ggettext import sgettext as _ -from gui.glade import Glade +from gramps.gui.dialog import OkDialog +from gramps.gui.plug import tool +from gramps.gen.ggettext import sgettext as _ +from gramps.gui.glade import Glade #------------------------------------------------------------------------- # diff --git a/gramps/plugins/tool/changetypes.py b/gramps/plugins/tool/changetypes.py index 8697cee56..4259bf028 100644 --- a/gramps/plugins/tool/changetypes.py +++ b/gramps/plugins/tool/changetypes.py @@ -29,23 +29,23 @@ # standard python modules # #------------------------------------------------------------------------ -from gen.ggettext import gettext as _ -from gen.ggettext import ngettext +from gramps.gen.ggettext import gettext as _ +from gramps.gen.ggettext import ngettext #------------------------------------------------------------------------ # # GRAMPS modules # #------------------------------------------------------------------------ -from gui.utils import ProgressMeter +from gramps.gui.utils import ProgressMeter import locale -from gui.managedwindow import ManagedWindow -from gui.autocomp import fill_combo -from gen.lib import EventType -from gen.db import DbTxn -from gui.dialog import OkDialog -from gui.plug import tool -from gui.glade import Glade +from gramps.gui.managedwindow import ManagedWindow +from gramps.gui.autocomp import fill_combo +from gramps.gen.lib import EventType +from gramps.gen.db import DbTxn +from gramps.gui.dialog import OkDialog +from gramps.gui.plug import tool +from gramps.gui.glade import Glade #------------------------------------------------------------------------- # diff --git a/gramps/plugins/tool/check.py b/gramps/plugins/tool/check.py index 939b7c6c0..191d3689b 100644 --- a/gramps/plugins/tool/check.py +++ b/gramps/plugins/tool/check.py @@ -38,8 +38,8 @@ import sys import cStringIO import time -from gen.ggettext import gettext as _ -from gen.ggettext import ngettext +from gramps.gen.ggettext import gettext as _ +from gramps.gen.ggettext import ngettext from collections import defaultdict #------------------------------------------------------------------------ @@ -62,20 +62,20 @@ from gi.repository import Gtk # #------------------------------------------------------------------------- from gramps.gen.lib import Citation, Event, EventType, Family, MediaObject, Name, Note, Person, Place, Repository, Source, StyledText, Tag -from gen.db import DbTxn -from gen.config import config -from gen.utils.id import create_id -from gen.utils.db import family_name -from gen.utils.unknown import make_unknown -from gen.utils.file import (media_path_full, find_file, fix_encoding, +from gramps.gen.db import DbTxn +from gramps.gen.config import config +from gramps.gen.utils.id import create_id +from gramps.gen.utils.db import family_name +from gramps.gen.utils.unknown import make_unknown +from gramps.gen.utils.file import (media_path_full, find_file, fix_encoding, get_unicode_path_from_file_chooser) -from gui.utils import ProgressMeter -from gui.managedwindow import ManagedWindow +from gramps.gui.utils import ProgressMeter +from gramps.gui.managedwindow import ManagedWindow -from gui.plug import tool -from gui.dialog import OkDialog, MissingMediaDialog -from gen.display.name import displayer as _nd -from gui.glade import Glade +from gramps.gui.plug import tool +from gramps.gui.dialog import OkDialog, MissingMediaDialog +from gramps.gen.display.name import displayer as _nd +from gramps.gui.glade import Glade # table for handling control chars in notes. # All except 09, 0A, 0D are replaced with space. diff --git a/gramps/plugins/tool/dateparserdisplaytest.py b/gramps/plugins/tool/dateparserdisplaytest.py index 13a259021..af4b29e66 100644 --- a/gramps/plugins/tool/dateparserdisplaytest.py +++ b/gramps/plugins/tool/dateparserdisplaytest.py @@ -36,7 +36,7 @@ Tools/Debug/Check Localized Date Parser and Displayer #------------------------------------------------------------------------- import traceback import sys -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ #------------------------------------------------------------------------- # @@ -44,12 +44,12 @@ from gen.ggettext import gettext as _ # #------------------------------------------------------------------------- from gramps.gen.lib import Date, Event, EventRef, EventType, Name, Person, Surname, Tag -from gen.db import DbTxn -from gui.plug import tool -from gui.utils import ProgressMeter -from gui.dialog import QuestionDialog -from gen.datehandler import parser as _dp -from gen.datehandler import displayer as _dd +from gramps.gen.db import DbTxn +from gramps.gui.plug import tool +from gramps.gui.utils import ProgressMeter +from gramps.gui.dialog import QuestionDialog +from gramps.gen.datehandler import parser as _dp +from gramps.gen.datehandler import displayer as _dd #------------------------------------------------------------------------- # diff --git a/gramps/plugins/tool/desbrowser.py b/gramps/plugins/tool/desbrowser.py index bcd9ae310..c56a271aa 100644 --- a/gramps/plugins/tool/desbrowser.py +++ b/gramps/plugins/tool/desbrowser.py @@ -37,14 +37,14 @@ from gi.repository import Gtk # GRAMPS modules # #------------------------------------------------------------------------ -from gen.const import URL_MANUAL_PAGE -from gen.display.name import displayer as name_displayer -from gui.plug import tool -from gui.display import display_help -from gui.managedwindow import ManagedWindow -from gen.ggettext import sgettext as _ -from gui.glade import Glade -from gui.editors import EditPerson +from gramps.gen.const import URL_MANUAL_PAGE +from gramps.gen.display.name import displayer as name_displayer +from gramps.gui.plug import tool +from gramps.gui.display import display_help +from gramps.gui.managedwindow import ManagedWindow +from gramps.gen.ggettext import sgettext as _ +from gramps.gui.glade import Glade +from gramps.gui.editors import EditPerson #------------------------------------------------------------------------ # diff --git a/gramps/plugins/tool/dumpgenderstats.py b/gramps/plugins/tool/dumpgenderstats.py index 87e74d465..25f2db8c4 100644 --- a/gramps/plugins/tool/dumpgenderstats.py +++ b/gramps/plugins/tool/dumpgenderstats.py @@ -26,12 +26,12 @@ Tools/Debug/Dump Gender Statistics """ -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ from gi.repository import Gtk -from gui.listmodel import ListModel, INTEGER -from gui.managedwindow import ManagedWindow +from gramps.gui.listmodel import ListModel, INTEGER +from gramps.gui.managedwindow import ManagedWindow -from gui.plug import tool +from gramps.gui.plug import tool _GENDER = [ _(u'female'), _(u'male'), _(u'unknown') ] diff --git a/gramps/plugins/tool/eval.py b/gramps/plugins/tool/eval.py index ae06012d5..e8465f6ab 100644 --- a/gramps/plugins/tool/eval.py +++ b/gramps/plugins/tool/eval.py @@ -32,7 +32,7 @@ Provide a python evaluation window #------------------------------------------------------------------------ import cStringIO import sys -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ import traceback #------------------------------------------------------------------------ @@ -40,9 +40,9 @@ import traceback # GRAMPS modules # #------------------------------------------------------------------------ -from gui.plug import tool -from gui.managedwindow import ManagedWindow -from gui.glade import Glade +from gramps.gui.plug import tool +from gramps.gui.managedwindow import ManagedWindow +from gramps.gui.glade import Glade #------------------------------------------------------------------------- # diff --git a/gramps/plugins/tool/eventcmp.py b/gramps/plugins/tool/eventcmp.py index 7f29e2657..aea3ccf85 100644 --- a/gramps/plugins/tool/eventcmp.py +++ b/gramps/plugins/tool/eventcmp.py @@ -44,23 +44,23 @@ from gi.repository import Gtk # GRAMPS modules # #------------------------------------------------------------------------ -from gen.filters import GenericFilter, rules -from gui.filters import build_filter_model -from gen.sort import Sort -from gen.utils.file import get_unicode_path_from_file_chooser -from gui.utils import ProgressMeter -from gen.utils.docgen import ODSTab -from gen.const import CUSTOM_FILTERS, URL_MANUAL_PAGE -from gen.errors import WindowActiveError +from gramps.gen.filters import GenericFilter, rules +from gramps.gui.filters import build_filter_model +from gramps.gen.sort import Sort +from gramps.gen.utils.file import get_unicode_path_from_file_chooser +from gramps.gui.utils import ProgressMeter +from gramps.gen.utils.docgen import ODSTab +from gramps.gen.const import CUSTOM_FILTERS, URL_MANUAL_PAGE +from gramps.gen.errors import WindowActiveError from gramps.gen.datehandler import get_date -from gui.dialog import WarningDialog -from gui.plug import tool -from gen.plug.report import utils as ReportUtils -from gui.display import display_help -from gui.managedwindow import ManagedWindow -from gen.ggettext import sgettext as _ -from gui.glade import Glade -from gui.editors import FilterEditor +from gramps.gui.dialog import WarningDialog +from gramps.gui.plug import tool +from gramps.gen.plug.report import utils as ReportUtils +from gramps.gui.display import display_help +from gramps.gui.managedwindow import ManagedWindow +from gramps.gen.ggettext import sgettext as _ +from gramps.gui.glade import Glade +from gramps.gui.editors import FilterEditor #------------------------------------------------------------------------- # diff --git a/gramps/plugins/tool/eventnames.py b/gramps/plugins/tool/eventnames.py index 8590db5bc..fcba3eb2b 100644 --- a/gramps/plugins/tool/eventnames.py +++ b/gramps/plugins/tool/eventnames.py @@ -29,8 +29,8 @@ # python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ -from gen.ggettext import ngettext +from gramps.gen.ggettext import gettext as _ +from gramps.gen.ggettext import ngettext #------------------------------------------------------------------------- # @@ -43,14 +43,14 @@ from gen.ggettext import ngettext # gramps modules # #------------------------------------------------------------------------- -from gui.managedwindow import ManagedWindow +from gramps.gui.managedwindow import ManagedWindow from gramps.gen.lib import EventRoleType -from gen.db import DbTxn -from gen.utils.db import family_name +from gramps.gen.db import DbTxn +from gramps.gen.utils.db import family_name -from gui.plug import tool -from gen.display.name import displayer as name_displayer -from gui.dialog import OkDialog +from gramps.gui.plug import tool +from gramps.gen.display.name import displayer as name_displayer +from gramps.gui.dialog import OkDialog #------------------------------------------------------------------------- # diff --git a/gramps/plugins/tool/extractcity.py b/gramps/plugins/tool/extractcity.py index 14c344815..044211f60 100644 --- a/gramps/plugins/tool/extractcity.py +++ b/gramps/plugins/tool/extractcity.py @@ -31,7 +31,7 @@ # #------------------------------------------------------------------------- import re -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ #------------------------------------------------------------------------- # @@ -46,13 +46,13 @@ from gi.repository import GObject # gramps modules # #------------------------------------------------------------------------- -from gen.db import DbTxn -from gui.managedwindow import ManagedWindow -from gui.display import display_help +from gramps.gen.db import DbTxn +from gramps.gui.managedwindow import ManagedWindow +from gramps.gui.display import display_help -from gui.plug import tool -from gui.utils import ProgressMeter -from gui.glade import Glade +from gramps.gui.plug import tool +from gramps.gui.utils import ProgressMeter +from gramps.gui.glade import Glade CITY_STATE_ZIP = re.compile("((\w|\s)+)\s*,\s*((\w|\s)+)\s*(,\s*((\d|-)+))", re.UNICODE) CITY_STATE = re.compile("((?:\w|\s)+(?:-(?:\w|\s)+)*),((?:\w|\s)+)", re.UNICODE) @@ -506,7 +506,7 @@ class ExtractCity(tool.BatchTool, ManagedWindow): self.display() else: self.close() - from gui.dialog import OkDialog + from gramps.gui.dialog import OkDialog OkDialog(_('No modifications made'), _("No place information could be extracted.")) diff --git a/gramps/plugins/tool/finddupes.py b/gramps/plugins/tool/finddupes.py index 6fb94193f..faeed031d 100644 --- a/gramps/plugins/tool/finddupes.py +++ b/gramps/plugins/tool/finddupes.py @@ -36,21 +36,21 @@ from gi.repository import Gtk # GRAMPS modules # #------------------------------------------------------------------------- -from gen.const import URL_MANUAL_PAGE +from gramps.gen.const import URL_MANUAL_PAGE from gramps.gen.lib import Event, Person -from gui.utils import ProgressMeter -from gui.plug import tool -from gen.soundex import soundex, compare -from gen.display.name import displayer as name_displayer -from gui.dialog import OkDialog -from gui.listmodel import ListModel -from gen.errors import WindowActiveError -from gui.merge import MergePerson -from gui.display import display_help -from gui.managedwindow import ManagedWindow -from gui.dialog import RunDatabaseRepair -from gen.ggettext import sgettext as _ -from gui.glade import Glade +from gramps.gui.utils import ProgressMeter +from gramps.gui.plug import tool +from gramps.gen.soundex import soundex, compare +from gramps.gen.display.name import displayer as name_displayer +from gramps.gui.dialog import OkDialog +from gramps.gui.listmodel import ListModel +from gramps.gen.errors import WindowActiveError +from gramps.gui.merge import MergePerson +from gramps.gui.display import display_help +from gramps.gui.managedwindow import ManagedWindow +from gramps.gui.dialog import RunDatabaseRepair +from gramps.gen.ggettext import sgettext as _ +from gramps.gui.glade import Glade #------------------------------------------------------------------------- # diff --git a/gramps/plugins/tool/leak.py b/gramps/plugins/tool/leak.py index ec7c8c131..7860c43fa 100644 --- a/gramps/plugins/tool/leak.py +++ b/gramps/plugins/tool/leak.py @@ -31,8 +31,8 @@ Show uncollected objects in a window. # standard python modules # #------------------------------------------------------------------------ -from gen.ggettext import gettext as _ -from gen.config import config +from gramps.gen.ggettext import gettext as _ +from gramps.gen.config import config if config.get('preferences.use-bsddb3'): from bsddb3.db import DBError else: @@ -53,10 +53,10 @@ import gc # GRAMPS modules # #------------------------------------------------------------------------ -from gui.plug import tool -from gui.managedwindow import ManagedWindow -from gui.dialog import InfoDialog -from gui.glade import Glade +from gramps.gui.plug import tool +from gramps.gui.managedwindow import ManagedWindow +from gramps.gui.dialog import InfoDialog +from gramps.gui.glade import Glade from gramps.gui.utils import is_right_click #------------------------------------------------------------------------- diff --git a/gramps/plugins/tool/mediamanager.py b/gramps/plugins/tool/mediamanager.py index 861b238fa..b8eecb285 100644 --- a/gramps/plugins/tool/mediamanager.py +++ b/gramps/plugins/tool/mediamanager.py @@ -50,14 +50,14 @@ from gi.repository import GdkPixbuf # GRAMPS modules # #------------------------------------------------------------------------ -from gen.const import URL_MANUAL_PAGE, ICON, SPLASH -from gui.display import display_help -from gen.lib import MediaObject -from gen.db import DbTxn -from gen.updatecallback import UpdateCallback -from gui.plug import tool -from gen.utils.file import media_path_full, relative_path, media_path -from gen.ggettext import sgettext as _ +from gramps.gen.const import URL_MANUAL_PAGE, ICON, SPLASH +from gramps.gui.display import display_help +from gramps.gen.lib import MediaObject +from gramps.gen.db import DbTxn +from gramps.gen.updatecallback import UpdateCallback +from gramps.gui.plug import tool +from gramps.gen.utils.file import media_path_full, relative_path, media_path +from gramps.gen.ggettext import sgettext as _ from gramps.gen.mime import get_type, is_image_type #------------------------------------------------------------------------- diff --git a/gramps/plugins/tool/mergecitations.py b/gramps/plugins/tool/mergecitations.py index 3ea7b787a..0b8a15b2c 100644 --- a/gramps/plugins/tool/mergecitations.py +++ b/gramps/plugins/tool/mergecitations.py @@ -45,21 +45,21 @@ from gi.repository import Gtk # GRAMPS modules # #------------------------------------------------------------------------- -from gen.utils.string import confidence -from gen.const import URL_MANUAL_PAGE -from gui.utils import ProgressMeter -from gui.plug import tool -from gui.dialog import OkDialog -from gui.display import display_help +from gramps.gen.utils.string import confidence +from gramps.gen.const import URL_MANUAL_PAGE +from gramps.gui.utils import ProgressMeter +from gramps.gui.plug import tool +from gramps.gui.dialog import OkDialog +from gramps.gui.display import display_help from gramps.gen.datehandler import get_date -from gui.managedwindow import ManagedWindow -from gen.ggettext import sgettext as _ -from gen.ggettext import ngettext -from gui.glade import Glade -from gen.db import DbTxn -from gen.lib import (Person, Family, Event, Place, MediaObject, Citation, +from gramps.gui.managedwindow import ManagedWindow +from gramps.gen.ggettext import sgettext as _ +from gramps.gen.ggettext import ngettext +from gramps.gui.glade import Glade +from gramps.gen.db import DbTxn +from gramps.gen.lib import (Person, Family, Event, Place, MediaObject, Citation, Repository) -from gen.errors import MergeError +from gramps.gen.errors import MergeError #------------------------------------------------------------------------- # diff --git a/gramps/plugins/tool/notrelated.py b/gramps/plugins/tool/notrelated.py index 5237467fe..ac14e090d 100644 --- a/gramps/plugins/tool/notrelated.py +++ b/gramps/plugins/tool/notrelated.py @@ -45,18 +45,18 @@ from gi.repository import GObject # GRAMPS modules # #------------------------------------------------------------------------ -from gen.const import URL_MANUAL_PAGE -from gen.ggettext import ngettext -from gui.plug import tool -from gen.plug.report import utils as ReportUtils -from gui.editors import EditPerson, EditFamily -from gui.managedwindow import ManagedWindow -from gui.utils import ProgressMeter -from gui.display import display_help -from gen.ggettext import sgettext as _ -from gui.glade import Glade -from gen.lib import Tag -from gen.db import DbTxn +from gramps.gen.const import URL_MANUAL_PAGE +from gramps.gen.ggettext import ngettext +from gramps.gui.plug import tool +from gramps.gen.plug.report import utils as ReportUtils +from gramps.gui.editors import EditPerson, EditFamily +from gramps.gui.managedwindow import ManagedWindow +from gramps.gui.utils import ProgressMeter +from gramps.gui.display import display_help +from gramps.gen.ggettext import sgettext as _ +from gramps.gui.glade import Glade +from gramps.gen.lib import Tag +from gramps.gen.db import DbTxn #------------------------------------------------------------------------- # diff --git a/gramps/plugins/tool/ownereditor.py b/gramps/plugins/tool/ownereditor.py index ae1d2acea..3468f711f 100644 --- a/gramps/plugins/tool/ownereditor.py +++ b/gramps/plugins/tool/ownereditor.py @@ -37,15 +37,15 @@ from gi.repository import Gtk # gramps modules # #------------------------------------------------------------------------- -from gen.const import URL_MANUAL_PAGE -from gen.config import config -from gen.utils.config import get_researcher -from gui.display import display_help -from gui.widgets import MonitoredEntry -from gui.managedwindow import ManagedWindow -from gui.plug import tool -from gen.ggettext import sgettext as _ -from gui.glade import Glade +from gramps.gen.const import URL_MANUAL_PAGE +from gramps.gen.config import config +from gramps.gen.utils.config import get_researcher +from gramps.gui.display import display_help +from gramps.gui.widgets import MonitoredEntry +from gramps.gui.managedwindow import ManagedWindow +from gramps.gui.plug import tool +from gramps.gen.ggettext import sgettext as _ +from gramps.gui.glade import Glade from gramps.gui.utils import is_right_click #------------------------------------------------------------------------- diff --git a/gramps/plugins/tool/patchnames.py b/gramps/plugins/tool/patchnames.py index 49963f510..016ac7904 100644 --- a/gramps/plugins/tool/patchnames.py +++ b/gramps/plugins/tool/patchnames.py @@ -44,16 +44,16 @@ from gi.repository import GObject # gramps modules # #------------------------------------------------------------------------- -from gen.const import URL_MANUAL_PAGE -from gui.utils import ProgressMeter -from gui.plug import tool -from gui.dialog import OkDialog -from gui.managedwindow import ManagedWindow -from gui.display import display_help +from gramps.gen.const import URL_MANUAL_PAGE +from gramps.gui.utils import ProgressMeter +from gramps.gui.plug import tool +from gramps.gui.dialog import OkDialog +from gramps.gui.managedwindow import ManagedWindow +from gramps.gui.display import display_help from gramps.gen.lib import NameOriginType, Surname -from gen.db import DbTxn -from gen.ggettext import sgettext as _ -from gui.glade import Glade +from gramps.gen.db import DbTxn +from gramps.gen.ggettext import sgettext as _ +from gramps.gui.glade import Glade #------------------------------------------------------------------------- # diff --git a/gramps/plugins/tool/phpgedviewconnector.py b/gramps/plugins/tool/phpgedviewconnector.py index d1d9e1305..c7e9fc075 100644 --- a/gramps/plugins/tool/phpgedviewconnector.py +++ b/gramps/plugins/tool/phpgedviewconnector.py @@ -28,8 +28,8 @@ import urllib2 from gi.repository import Gtk import os from tempfile import mkstemp -from gen.ggettext import gettext as _ -from gui.glade import Glade +from gramps.gen.ggettext import gettext as _ +from gramps.gui.glade import Glade import gramps.plugins.lib.libgedcom as libgedcom # diff --git a/gramps/plugins/tool/populatesources.py b/gramps/plugins/tool/populatesources.py index 8d4137f68..2a95a30fd 100644 --- a/gramps/plugins/tool/populatesources.py +++ b/gramps/plugins/tool/populatesources.py @@ -42,12 +42,12 @@ from gi.repository import Gtk # gramps modules # #------------------------------------------------------------------------- -from gui.utils import ProgressMeter -from gui.plug import tool -from gui.dialog import OkDialog -from gui.managedwindow import ManagedWindow +from gramps.gui.utils import ProgressMeter +from gramps.gui.plug import tool +from gramps.gui.dialog import OkDialog +from gramps.gui.managedwindow import ManagedWindow from gramps.gen.lib import Citation, Source -from gen.db import DbTxn +from gramps.gen.db import DbTxn class PopulateSources(tool.Tool, ManagedWindow): """ diff --git a/gramps/plugins/tool/rebuild.py b/gramps/plugins/tool/rebuild.py index 0714ff977..b5b6d675a 100644 --- a/gramps/plugins/tool/rebuild.py +++ b/gramps/plugins/tool/rebuild.py @@ -29,7 +29,7 @@ # python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ #------------------------------------------------------------------------ # @@ -50,9 +50,9 @@ log = logging.getLogger(".Rebuild") # GRAMPS modules # #------------------------------------------------------------------------- -from gui.plug import tool -from gui.dialog import OkDialog -from gen.updatecallback import UpdateCallback +from gramps.gui.plug import tool +from gramps.gui.dialog import OkDialog +from gramps.gen.updatecallback import UpdateCallback #------------------------------------------------------------------------- # diff --git a/gramps/plugins/tool/rebuildgenderstat.py b/gramps/plugins/tool/rebuildgenderstat.py index 3ee75abbd..e218c1cb7 100644 --- a/gramps/plugins/tool/rebuildgenderstat.py +++ b/gramps/plugins/tool/rebuildgenderstat.py @@ -29,7 +29,7 @@ # python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ #------------------------------------------------------------------------ # @@ -50,10 +50,10 @@ log = logging.getLogger(".RebuildGenderStat") # GRAMPS modules # #------------------------------------------------------------------------- -from gui.plug import tool -from gui.dialog import OkDialog -from gen.updatecallback import UpdateCallback -from gen.lib import Name +from gramps.gui.plug import tool +from gramps.gui.dialog import OkDialog +from gramps.gen.updatecallback import UpdateCallback +from gramps.gen.lib import Name #------------------------------------------------------------------------- # diff --git a/gramps/plugins/tool/rebuildrefmap.py b/gramps/plugins/tool/rebuildrefmap.py index 5e5cd26b1..e518d8671 100644 --- a/gramps/plugins/tool/rebuildrefmap.py +++ b/gramps/plugins/tool/rebuildrefmap.py @@ -31,7 +31,7 @@ # python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ #------------------------------------------------------------------------ # @@ -52,9 +52,9 @@ log = logging.getLogger(".RebuildRefMap") # GRAMPS modules # #------------------------------------------------------------------------- -from gui.plug import tool -from gui.dialog import OkDialog -from gen.updatecallback import UpdateCallback +from gramps.gui.plug import tool +from gramps.gui.dialog import OkDialog +from gramps.gen.updatecallback import UpdateCallback #------------------------------------------------------------------------- # diff --git a/gramps/plugins/tool/relcalc.py b/gramps/plugins/tool/relcalc.py index 98ec11531..f7a899b9e 100644 --- a/gramps/plugins/tool/relcalc.py +++ b/gramps/plugins/tool/relcalc.py @@ -30,7 +30,7 @@ # Standard python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ #------------------------------------------------------------------------- # @@ -45,15 +45,15 @@ from gi.repository import Gtk # GRAMPS modules # #------------------------------------------------------------------------- -from gen.display.name import displayer as name_displayer -from gui.managedwindow import ManagedWindow -from gui.views.treemodels import PeopleBaseModel, PersonTreeModel +from gramps.gen.display.name import displayer as name_displayer +from gramps.gui.managedwindow import ManagedWindow +from gramps.gui.views.treemodels import PeopleBaseModel, PersonTreeModel from gramps.plugins.lib.libpersonview import BasePersonView -from gen.relationship import get_relationship_calculator +from gramps.gen.relationship import get_relationship_calculator -from gui.dialog import ErrorDialog -from gui.plug import tool -from gui.glade import Glade +from gramps.gui.dialog import ErrorDialog +from gramps.gui.plug import tool +from gramps.gui.glade import Glade #------------------------------------------------------------------------- # diff --git a/gramps/plugins/tool/removeunused.py b/gramps/plugins/tool/removeunused.py index 827f46736..30b7111d2 100644 --- a/gramps/plugins/tool/removeunused.py +++ b/gramps/plugins/tool/removeunused.py @@ -31,7 +31,7 @@ # #------------------------------------------------------------------------- from __future__ import with_statement -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ #------------------------------------------------------------------------ # @@ -55,13 +55,13 @@ from gi.repository import GObject # GRAMPS modules # #------------------------------------------------------------------------- -from gen.db import DbTxn -from gen.errors import WindowActiveError -from gui.managedwindow import ManagedWindow -from gen.datehandler import displayer as _dd -from gen.updatecallback import UpdateCallback -from gui.plug import tool -from gui.glade import Glade +from gramps.gen.db import DbTxn +from gramps.gen.errors import WindowActiveError +from gramps.gui.managedwindow import ManagedWindow +from gramps.gen.datehandler import displayer as _dd +from gramps.gen.updatecallback import UpdateCallback +from gramps.gui.plug import tool +from gramps.gui.glade import Glade #------------------------------------------------------------------------- # @@ -340,7 +340,7 @@ class RemoveUnused(tool.Tool, ManagedWindow, UpdateCallback): def call_editor(self, the_type, handle): try: obj = self.tables[the_type]['get_func'](handle) - editor_str = 'from gui.editors import %s as editor' % ( + editor_str = 'from gramps.gui.editors import %s as editor' % ( self.tables[the_type]['editor'] ) exec(editor_str) diff --git a/gramps/plugins/tool/reorderids.py b/gramps/plugins/tool/reorderids.py index d624d6ec9..9b4e6f1ae 100644 --- a/gramps/plugins/tool/reorderids.py +++ b/gramps/plugins/tool/reorderids.py @@ -33,17 +33,17 @@ scheme specified in the database's prefix ids # #------------------------------------------------------------------------ import re -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ #------------------------------------------------------------------------ # # GRAMPS modules # #------------------------------------------------------------------------ -from gui.utils import ProgressMeter +from gramps.gui.utils import ProgressMeter from gramps.gen.lib import Event, Family, MediaObject, Note, Person, Place, Repository, Source -from gen.db import DbTxn -from gui.plug import tool +from gramps.gen.db import DbTxn +from gramps.gui.plug import tool _findint = re.compile('^[^\d]*(\d+)[^\d]*') diff --git a/gramps/plugins/tool/sortevents.py b/gramps/plugins/tool/sortevents.py index a99f40027..d9252ee9d 100644 --- a/gramps/plugins/tool/sortevents.py +++ b/gramps/plugins/tool/sortevents.py @@ -28,18 +28,18 @@ # python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ #------------------------------------------------------------------------- # # gramps modules # #------------------------------------------------------------------------- -from gen.sort import Sort -from gen.db import DbTxn -from gui.plug import MenuToolOptions, PluginWindows -from gen.plug.report import utils as ReportUtils -from gen.plug.menu import FilterOption, PersonOption, \ +from gramps.gen.sort import Sort +from gramps.gen.db import DbTxn +from gramps.gui.plug import MenuToolOptions, PluginWindows +from gramps.gen.plug.report import utils as ReportUtils +from gramps.gen.plug.menu import FilterOption, PersonOption, \ EnumeratedListOption, BooleanOption #------------------------------------------------------------------------ diff --git a/gramps/plugins/tool/soundgen.py b/gramps/plugins/tool/soundgen.py index d96e3c8b4..e6042b8d2 100644 --- a/gramps/plugins/tool/soundgen.py +++ b/gramps/plugins/tool/soundgen.py @@ -29,14 +29,14 @@ # GRAMPS modules # #------------------------------------------------------------------------ -from gen.const import URL_MANUAL_PAGE -from gen.soundex import soundex -from gui.display import display_help -from gui.managedwindow import ManagedWindow -from gui.autocomp import fill_combo -from gen.ggettext import sgettext as _ -from gui.plug import tool -from gui.glade import Glade +from gramps.gen.const import URL_MANUAL_PAGE +from gramps.gen.soundex import soundex +from gramps.gui.display import display_help +from gramps.gui.managedwindow import ManagedWindow +from gramps.gui.autocomp import fill_combo +from gramps.gen.ggettext import sgettext as _ +from gramps.gui.plug import tool +from gramps.gui.glade import Glade #------------------------------------------------------------------------- # diff --git a/gramps/plugins/tool/testcasegenerator.py b/gramps/plugins/tool/testcasegenerator.py index 9f126214c..bcbf9ce52 100644 --- a/gramps/plugins/tool/testcasegenerator.py +++ b/gramps/plugins/tool/testcasegenerator.py @@ -32,7 +32,7 @@ # #------------------------------------------------------------------------- from random import randint,choice,random -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ import time #------------------------------------------------------------------------- @@ -48,15 +48,15 @@ from gi.repository import Gtk # #------------------------------------------------------------------------- from gramps.gen.lib import Address, Attribute, AttributeType, ChildRef, ChildRefType, Citation, Date, Event, EventRef, EventRoleType, EventType, Family, FamilyRelType, GrampsType, LdsOrd, Location, MediaObject, MediaRef, Name, NameOriginType, NameType, Note, NoteType, Person, PersonRef, Place, RepoRef, Repository, RepositoryType, Source, SourceMediaType, Surname, Tag, Url, UrlType -from gen.lib import StyledText, StyledTextTag, StyledTextTagType -from gen.db import DbTxn +from gramps.gen.lib import StyledText, StyledTextTag, StyledTextTagType +from gramps.gen.db import DbTxn from gramps.gen.mime import get_type -from gui.plug import tool -from gen.utils.string import confidence -from gui.utils import ProgressMeter -from gen.utils.lds import TEMPLES -from gen.db.dbconst import * -from gen.const import ICON, LOGO, SPLASH +from gramps.gui.plug import tool +from gramps.gen.utils.string import confidence +from gramps.gui.utils import ProgressMeter +from gramps.gen.utils.lds import TEMPLES +from gramps.gen.db.dbconst import * +from gramps.gen.const import ICON, LOGO, SPLASH #------------------------------------------------------------------------- # diff --git a/gramps/plugins/tool/verify.py b/gramps/plugins/tool/verify.py index d336398a8..4a4fd90a7 100644 --- a/gramps/plugins/tool/verify.py +++ b/gramps/plugins/tool/verify.py @@ -39,7 +39,7 @@ try: from hashlib import md5 except ImportError: from md5 import md5 -from gen.errors import WindowActiveError +from gramps.gen.errors import WindowActiveError #------------------------------------------------------------------------ # @@ -55,16 +55,16 @@ from gi.repository import GObject # GRAMPS modules # #------------------------------------------------------------------------ -from gen.const import URL_MANUAL_PAGE, VERSION_DIR +from gramps.gen.const import URL_MANUAL_PAGE, VERSION_DIR from gramps.gen.lib import ChildRefType, EventRoleType, EventType, FamilyRelType, NameType, Person -from gui.editors import EditPerson, EditFamily -from gen.utils.db import family_name -from gui.display import display_help -from gui.managedwindow import ManagedWindow -from gen.updatecallback import UpdateCallback -from gui.plug import tool -from gen.ggettext import sgettext as _ -from gui.glade import Glade +from gramps.gui.editors import EditPerson, EditFamily +from gramps.gen.utils.db import family_name +from gramps.gui.display import display_help +from gramps.gui.managedwindow import ManagedWindow +from gramps.gen.updatecallback import UpdateCallback +from gramps.gui.plug import tool +from gramps.gen.ggettext import sgettext as _ +from gramps.gui.glade import Glade #------------------------------------------------------------------------- # diff --git a/gramps/plugins/view/citationlistview.py b/gramps/plugins/view/citationlistview.py index 53549f352..e22fd7ff3 100644 --- a/gramps/plugins/view/citationlistview.py +++ b/gramps/plugins/view/citationlistview.py @@ -45,25 +45,25 @@ from gi.repository import Gtk # gramps modules # #------------------------------------------------------------------------- -from gui.views.treemodels.citationlistmodel import CitationListModel -from gen.plug import CATEGORY_QR_CITATION +from gramps.gui.views.treemodels.citationlistmodel import CitationListModel +from gramps.gen.plug import CATEGORY_QR_CITATION from gramps.gen.lib import Citation, Source -from gui.views.listview import ListView -from gen.utils.db import get_citation_referents -from gui.views.bookmarks import CitationBookmarks -from gen.errors import WindowActiveError -from gui.ddtargets import DdTargets -from gui.dialog import ErrorDialog -from gui.editors import EditCitation, DeleteCitationQuery -from gui.filters.sidebar import CitationSidebarFilter -from gui.merge import MergeCitation +from gramps.gui.views.listview import ListView +from gramps.gen.utils.db import get_citation_referents +from gramps.gui.views.bookmarks import CitationBookmarks +from gramps.gen.errors import WindowActiveError +from gramps.gui.ddtargets import DdTargets +from gramps.gui.dialog import ErrorDialog +from gramps.gui.editors import EditCitation, DeleteCitationQuery +from gramps.gui.filters.sidebar import CitationSidebarFilter +from gramps.gui.merge import MergeCitation #------------------------------------------------------------------------- # # internationalization # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ #------------------------------------------------------------------------- diff --git a/gramps/plugins/view/citationtreeview.py b/gramps/plugins/view/citationtreeview.py index 101d589ea..b87e4293b 100644 --- a/gramps/plugins/view/citationtreeview.py +++ b/gramps/plugins/view/citationtreeview.py @@ -45,28 +45,28 @@ from gi.repository import Gtk # Gramps modules # #------------------------------------------------------------------------- -from gui.views.listview import LISTTREE -from gui.views.treemodels.citationtreemodel import CitationTreeModel -from gen.plug import CATEGORY_QR_SOURCE_OR_CITATION +from gramps.gui.views.listview import LISTTREE +from gramps.gui.views.treemodels.citationtreemodel import CitationTreeModel +from gramps.gen.plug import CATEGORY_QR_SOURCE_OR_CITATION from gramps.gen.lib import Citation, Source -from gui.views.listview import ListView -from gen.utils.db import (get_source_and_citation_referents, +from gramps.gui.views.listview import ListView +from gramps.gen.utils.db import (get_source_and_citation_referents, get_citation_referents) -from gui.views.bookmarks import CitationBookmarks -from gen.errors import WindowActiveError -from gui.ddtargets import DdTargets -from gui.dialog import ErrorDialog -from gui.editors import EditCitation, DeleteCitationQuery, EditSource, \ +from gramps.gui.views.bookmarks import CitationBookmarks +from gramps.gen.errors import WindowActiveError +from gramps.gui.ddtargets import DdTargets +from gramps.gui.dialog import ErrorDialog +from gramps.gui.editors import EditCitation, DeleteCitationQuery, EditSource, \ DeleteSrcQuery -from gui.filters.sidebar import SourceSidebarFilter -from gui.merge import MergeCitation, MergeSource +from gramps.gui.filters.sidebar import SourceSidebarFilter +from gramps.gui.merge import MergeCitation, MergeSource #------------------------------------------------------------------------- # # Internationalization # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ #------------------------------------------------------------------------- # @@ -430,7 +430,7 @@ class CitationTreeView(ListView): EditCitation(self.dbstate, self.uistate, [], Citation(), source) except WindowActiveError: - from gui.dialog import WarningDialog + from gramps.gui.dialog import WarningDialog WarningDialog(_("Cannot share this reference"), self.__blocked_text()) else: @@ -485,7 +485,7 @@ class CitationTreeView(ListView): try: EditSource(self.dbstate, self.uistate, [], source) except WindowActiveError: - from gui.dialog import WarningDialog + from gramps.gui.dialog import WarningDialog WarningDialog(_("Cannot share this reference"), self.__blocked_text2()) diff --git a/gramps/plugins/view/eventview.py b/gramps/plugins/view/eventview.py index 2133c8845..777430680 100644 --- a/gramps/plugins/view/eventview.py +++ b/gramps/plugins/view/eventview.py @@ -30,7 +30,7 @@ Provide the event view. # Standard python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ import logging _LOG = logging.getLogger(".plugins.eventview") @@ -47,17 +47,17 @@ from gi.repository import Gtk # #------------------------------------------------------------------------- from gramps.gen.lib import Event -from gui.views.listview import ListView -from gui.views.treemodels import EventModel -from gen.errors import WindowActiveError -from gui.views.bookmarks import EventBookmarks -from gen.config import config -from gui.ddtargets import DdTargets -from gui.dialog import ErrorDialog -from gui.editors import EditEvent, DeleteEventQuery -from gui.filters.sidebar import EventSidebarFilter -from gui.merge import MergeEvent -from gen.plug import CATEGORY_QR_EVENT +from gramps.gui.views.listview import ListView +from gramps.gui.views.treemodels import EventModel +from gramps.gen.errors import WindowActiveError +from gramps.gui.views.bookmarks import EventBookmarks +from gramps.gen.config import config +from gramps.gui.ddtargets import DdTargets +from gramps.gui.dialog import ErrorDialog +from gramps.gui.editors import EditEvent, DeleteEventQuery +from gramps.gui.filters.sidebar import EventSidebarFilter +from gramps.gui.merge import MergeEvent +from gramps.gen.plug import CATEGORY_QR_EVENT #------------------------------------------------------------------------- # diff --git a/gramps/plugins/view/familyview.py b/gramps/plugins/view/familyview.py index c412a1e38..d94f88497 100644 --- a/gramps/plugins/view/familyview.py +++ b/gramps/plugins/view/familyview.py @@ -30,7 +30,7 @@ Family View. # Standard python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ import logging _LOG = logging.getLogger(".plugins.eventview") #------------------------------------------------------------------------- @@ -46,17 +46,17 @@ from gi.repository import Gtk # #------------------------------------------------------------------------- from gramps.gen.lib import Family -from gui.views.listview import ListView -from gui.views.treemodels import FamilyModel -from gui.editors import EditFamily -from gui.views.bookmarks import FamilyBookmarks -from gen.errors import WindowActiveError -from gen.config import config -from gui.dialog import ErrorDialog -from gui.filters.sidebar import FamilySidebarFilter -from gui.merge import MergeFamily -from gen.plug import CATEGORY_QR_FAMILY -from gui.ddtargets import DdTargets +from gramps.gui.views.listview import ListView +from gramps.gui.views.treemodels import FamilyModel +from gramps.gui.editors import EditFamily +from gramps.gui.views.bookmarks import FamilyBookmarks +from gramps.gen.errors import WindowActiveError +from gramps.gen.config import config +from gramps.gui.dialog import ErrorDialog +from gramps.gui.filters.sidebar import FamilySidebarFilter +from gramps.gui.merge import MergeFamily +from gramps.gen.plug import CATEGORY_QR_FAMILY +from gramps.gui.ddtargets import DdTargets #------------------------------------------------------------------------- # @@ -235,7 +235,7 @@ class FamilyView(ListView): if mlist: self.bookmarks.add(mlist[0]) else: - from gui.dialog import WarningDialog + from gramps.gui.dialog import WarningDialog WarningDialog( _("Could Not Set a Bookmark"), _("A bookmark could not be set because " @@ -249,8 +249,8 @@ class FamilyView(ListView): pass def remove(self, obj): - from gui.dialog import QuestionDialog2 - from gen.utils.string import data_recover_msg + from gramps.gui.dialog import QuestionDialog2 + from gramps.gen.utils.string import data_recover_msg msg = _('Deleting item will remove it from the database.') msg = msg + '\n' + data_recover_msg q = QuestionDialog2(_('Delete %s?') % _('family'), msg, diff --git a/gramps/plugins/view/fanchartdescview.py b/gramps/plugins/view/fanchartdescview.py index 8b1d631f1..70f9f73db 100644 --- a/gramps/plugins/view/fanchartdescview.py +++ b/gramps/plugins/view/fanchartdescview.py @@ -35,7 +35,7 @@ from gi.repository import Gdk from gi.repository import Gtk import cairo -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ #------------------------------------------------------------------------- # @@ -44,9 +44,9 @@ from gen.ggettext import gettext as _ #------------------------------------------------------------------------- import gramps.gui.widgets.fanchart as fanchart import gramps.gui.widgets.fanchartdesc as fanchartdesc -from gui.views.navigationview import NavigationView -from gui.views.bookmarks import PersonBookmarks -from gui.utils import SystemFonts +from gramps.gui.views.navigationview import NavigationView +from gramps.gui.views.bookmarks import PersonBookmarks +from gramps.gui.utils import SystemFonts # the print settings to remember between print sessions PRINT_SETTINGS = None diff --git a/gramps/plugins/view/fanchartview.py b/gramps/plugins/view/fanchartview.py index 159287ba4..063c88a68 100644 --- a/gramps/plugins/view/fanchartview.py +++ b/gramps/plugins/view/fanchartview.py @@ -35,7 +35,7 @@ from gi.repository import Gdk from gi.repository import Gtk import cairo -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ #------------------------------------------------------------------------- # @@ -43,9 +43,9 @@ from gen.ggettext import gettext as _ # #------------------------------------------------------------------------- import gramps.gui.widgets.fanchart as fanchart -from gui.views.navigationview import NavigationView -from gui.views.bookmarks import PersonBookmarks -from gui.utils import SystemFonts +from gramps.gui.views.navigationview import NavigationView +from gramps.gui.views.bookmarks import PersonBookmarks +from gramps.gui.utils import SystemFonts # the print settings to remember between print sessions PRINT_SETTINGS = None diff --git a/gramps/plugins/view/geoclose.py b/gramps/plugins/view/geoclose.py index ee23292ab..e6b73cc62 100644 --- a/gramps/plugins/view/geoclose.py +++ b/gramps/plugins/view/geoclose.py @@ -30,7 +30,7 @@ Geography for two persons # Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ import operator from gi.repository import Gtk from math import * @@ -49,15 +49,15 @@ _LOG = logging.getLogger("GeoGraphy.geoclose") # #------------------------------------------------------------------------- from gramps.gen.lib import EventRoleType, EventType -from gen.config import config +from gramps.gen.config import config from gramps.gen.datehandler import displayer -from gen.display.name import displayer as _nd -from gen.utils.place import conv_lat_lon -from gui.views.navigationview import NavigationView -from gui.views.bookmarks import PersonBookmarks +from gramps.gen.display.name import displayer as _nd +from gramps.gen.utils.place import conv_lat_lon +from gramps.gui.views.navigationview import NavigationView +from gramps.gui.views.bookmarks import PersonBookmarks from gramps.plugins.lib.maps import constants from gramps.plugins.lib.maps.geography import GeoGraphyView -from gui.selectors import SelectorFactory +from gramps.gui.selectors import SelectorFactory #------------------------------------------------------------------------- # diff --git a/gramps/plugins/view/geoevents.py b/gramps/plugins/view/geoevents.py index 32021dc6d..a9ffa0c23 100644 --- a/gramps/plugins/view/geoevents.py +++ b/gramps/plugins/view/geoevents.py @@ -30,7 +30,7 @@ Geography for events # Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ import os import sys import urlparse @@ -55,16 +55,16 @@ _LOG = logging.getLogger("GeoGraphy.geoevents") # #------------------------------------------------------------------------- from gramps.gen.lib import EventType -from gen.config import config +from gramps.gen.config import config from gramps.gen.datehandler import displayer -from gen.display.name import displayer as _nd -from gen.utils.place import conv_lat_lon -from gui.views.pageview import PageView -from gui.editors import EditPlace -from gui.selectors.selectplace import SelectPlace -from gui.filters.sidebar import EventSidebarFilter -from gui.views.navigationview import NavigationView -from gui.views.bookmarks import EventBookmarks +from gramps.gen.display.name import displayer as _nd +from gramps.gen.utils.place import conv_lat_lon +from gramps.gui.views.pageview import PageView +from gramps.gui.editors import EditPlace +from gramps.gui.selectors.selectplace import SelectPlace +from gramps.gui.filters.sidebar import EventSidebarFilter +from gramps.gui.views.navigationview import NavigationView +from gramps.gui.views.bookmarks import EventBookmarks from gramps.plugins.lib.maps.geography import GeoGraphyView #------------------------------------------------------------------------- diff --git a/gramps/plugins/view/geofamclose.py b/gramps/plugins/view/geofamclose.py index 33f93f4f7..74d7de90f 100644 --- a/gramps/plugins/view/geofamclose.py +++ b/gramps/plugins/view/geofamclose.py @@ -30,7 +30,7 @@ Geography for two families # Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ import operator from gi.repository import Gtk from math import * @@ -49,15 +49,15 @@ _LOG = logging.getLogger("GeoGraphy.geofamilyclose") # #------------------------------------------------------------------------- from gramps.gen.lib import EventRoleType, EventType -from gen.config import config +from gramps.gen.config import config from gramps.gen.datehandler import displayer -from gen.display.name import displayer as _nd -from gen.utils.place import conv_lat_lon -from gui.views.navigationview import NavigationView -from gui.views.bookmarks import FamilyBookmarks +from gramps.gen.display.name import displayer as _nd +from gramps.gen.utils.place import conv_lat_lon +from gramps.gui.views.navigationview import NavigationView +from gramps.gui.views.bookmarks import FamilyBookmarks from gramps.plugins.lib.maps import constants from gramps.plugins.lib.maps.geography import GeoGraphyView -from gui.selectors import SelectorFactory +from gramps.gui.selectors import SelectorFactory #------------------------------------------------------------------------- # diff --git a/gramps/plugins/view/geofamily.py b/gramps/plugins/view/geofamily.py index cdaa6ca6b..1a8f85962 100644 --- a/gramps/plugins/view/geofamily.py +++ b/gramps/plugins/view/geofamily.py @@ -30,7 +30,7 @@ Geography for one family # Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ import os import sys import urlparse @@ -55,16 +55,16 @@ _LOG = logging.getLogger("GeoGraphy.geofamily") # #------------------------------------------------------------------------- from gramps.gen.lib import EventRoleType, EventType -from gen.config import config +from gramps.gen.config import config from gramps.gen.datehandler import displayer -from gen.display.name import displayer as _nd -from gen.utils.place import conv_lat_lon -from gui.views.pageview import PageView -from gui.editors import EditPlace -from gui.selectors.selectplace import SelectPlace -from gui.filters.sidebar import FamilySidebarFilter -from gui.views.navigationview import NavigationView -from gui.views.bookmarks import FamilyBookmarks +from gramps.gen.display.name import displayer as _nd +from gramps.gen.utils.place import conv_lat_lon +from gramps.gui.views.pageview import PageView +from gramps.gui.editors import EditPlace +from gramps.gui.selectors.selectplace import SelectPlace +from gramps.gui.filters.sidebar import FamilySidebarFilter +from gramps.gui.views.navigationview import NavigationView +from gramps.gui.views.bookmarks import FamilyBookmarks from gramps.plugins.lib.maps.geography import GeoGraphyView #------------------------------------------------------------------------- diff --git a/gramps/plugins/view/geomoves.py b/gramps/plugins/view/geomoves.py index 81a512944..2dc432a54 100644 --- a/gramps/plugins/view/geomoves.py +++ b/gramps/plugins/view/geomoves.py @@ -30,7 +30,7 @@ Geography for one person and all his descendant # Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ import operator from gi.repository import Gtk from gi.repository import Gdk @@ -53,15 +53,15 @@ _LOG = logging.getLogger("GeoGraphy.geomoves") # #------------------------------------------------------------------------- from gramps.gen.lib import EventRoleType, EventType -from gen.config import config +from gramps.gen.config import config from gramps.gen.datehandler import displayer -from gen.display.name import displayer as _nd -from gen.utils.place import conv_lat_lon -from gui.views.navigationview import NavigationView -from gui.views.bookmarks import PersonBookmarks +from gramps.gen.display.name import displayer as _nd +from gramps.gen.utils.place import conv_lat_lon +from gramps.gui.views.navigationview import NavigationView +from gramps.gui.views.bookmarks import PersonBookmarks from gramps.plugins.lib.maps import constants from gramps.plugins.lib.maps.geography import GeoGraphyView -from gui.selectors import SelectorFactory +from gramps.gui.selectors import SelectorFactory #------------------------------------------------------------------------- # diff --git a/gramps/plugins/view/geoperson.py b/gramps/plugins/view/geoperson.py index 1db8a472c..cfb77255f 100644 --- a/gramps/plugins/view/geoperson.py +++ b/gramps/plugins/view/geoperson.py @@ -30,7 +30,7 @@ Geography for one person # Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ import os import sys import urlparse @@ -56,16 +56,16 @@ _LOG = logging.getLogger("GeoGraphy.geoperson") # #------------------------------------------------------------------------- from gramps.gen.lib import EventRoleType, EventType -from gen.config import config +from gramps.gen.config import config from gramps.gen.datehandler import displayer -from gen.display.name import displayer as _nd -from gen.utils.place import conv_lat_lon -from gui.views.pageview import PageView -from gui.editors import EditPlace -from gui.selectors.selectplace import SelectPlace -from gui.filters.sidebar import PersonSidebarFilter -from gui.views.navigationview import NavigationView -from gui.views.bookmarks import PersonBookmarks +from gramps.gen.display.name import displayer as _nd +from gramps.gen.utils.place import conv_lat_lon +from gramps.gui.views.pageview import PageView +from gramps.gui.editors import EditPlace +from gramps.gui.selectors.selectplace import SelectPlace +from gramps.gui.filters.sidebar import PersonSidebarFilter +from gramps.gui.views.navigationview import NavigationView +from gramps.gui.views.bookmarks import PersonBookmarks from gramps.plugins.lib.maps import constants from gramps.plugins.lib.maps.geography import GeoGraphyView diff --git a/gramps/plugins/view/geoplaces.py b/gramps/plugins/view/geoplaces.py index 795c25fbf..90dc94bc2 100644 --- a/gramps/plugins/view/geoplaces.py +++ b/gramps/plugins/view/geoplaces.py @@ -30,7 +30,7 @@ Geography for places # Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ import os import sys import time @@ -56,15 +56,15 @@ _LOG = logging.getLogger("GeoGraphy.geoplaces") # #------------------------------------------------------------------------- from gramps.gen.lib import EventType -from gen.config import config -from gen.display.name import displayer as _nd -from gen.utils.place import conv_lat_lon -from gui.views.pageview import PageView -from gui.editors import EditPlace -from gui.selectors.selectplace import SelectPlace -from gui.filters.sidebar import PlaceSidebarFilter -from gui.views.navigationview import NavigationView -from gui.views.bookmarks import PlaceBookmarks +from gramps.gen.config import config +from gramps.gen.display.name import displayer as _nd +from gramps.gen.utils.place import conv_lat_lon +from gramps.gui.views.pageview import PageView +from gramps.gui.editors import EditPlace +from gramps.gui.selectors.selectplace import SelectPlace +from gramps.gui.filters.sidebar import PlaceSidebarFilter +from gramps.gui.views.navigationview import NavigationView +from gramps.gui.views.bookmarks import PlaceBookmarks from gramps.plugins.lib.maps.geography import GeoGraphyView #------------------------------------------------------------------------- diff --git a/gramps/plugins/view/grampletview.py b/gramps/plugins/view/grampletview.py index 869102e21..3de9344c5 100644 --- a/gramps/plugins/view/grampletview.py +++ b/gramps/plugins/view/grampletview.py @@ -36,9 +36,9 @@ from gi.repository import Gtk # GRAMPS modules # #------------------------------------------------------------------------- -from gui.views.pageview import PageView -from gen.ggettext import gettext as _ -from gui.widgets.grampletpane import GrampletPane +from gramps.gui.views.pageview import PageView +from gramps.gen.ggettext import gettext as _ +from gramps.gui.widgets.grampletpane import GrampletPane class GrampletView(PageView): """ diff --git a/gramps/plugins/view/htmlrenderer.py b/gramps/plugins/view/htmlrenderer.py index 6dad1957f..50f50b001 100644 --- a/gramps/plugins/view/htmlrenderer.py +++ b/gramps/plugins/view/htmlrenderer.py @@ -32,7 +32,7 @@ Can use the Webkit or Gecko ( Mozilla ) library # Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ import os import locale import urlparse @@ -57,12 +57,12 @@ from gi.repository import Gtk # Gramps Modules # #------------------------------------------------------------------------- -from gui.views.navigationview import NavigationView -from gui.views.bookmarks import PersonBookmarks -from gen.utils.file import get_empty_tempdir -from gen.constfunc import lin, mac, win -from gen.config import config -from gen.const import TEMP_DIR +from gramps.gui.views.navigationview import NavigationView +from gramps.gui.views.bookmarks import PersonBookmarks +from gramps.gen.utils.file import get_empty_tempdir +from gramps.gen.constfunc import lin, mac, win +from gramps.gen.config import config +from gramps.gen.const import TEMP_DIR #------------------------------------------------------------------------- # diff --git a/gramps/plugins/view/mediaview.py b/gramps/plugins/view/mediaview.py index 81387aec1..12de0842a 100644 --- a/gramps/plugins/view/mediaview.py +++ b/gramps/plugins/view/mediaview.py @@ -31,7 +31,7 @@ Media View. # Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ import urlparse import os import sys @@ -49,25 +49,25 @@ from gi.repository import Gtk # gramps modules # #------------------------------------------------------------------------- -from gui.utils import open_file_with_default_application -from gui.views.listview import ListView -from gui.views.treemodels import MediaModel -from gen.constfunc import win -from gen.config import config -from gen.utils.file import (media_path, relative_path, media_path_full, +from gramps.gui.utils import open_file_with_default_application +from gramps.gui.views.listview import ListView +from gramps.gui.views.treemodels import MediaModel +from gramps.gen.constfunc import win +from gramps.gen.config import config +from gramps.gen.utils.file import (media_path, relative_path, media_path_full, fix_encoding) -from gen.utils.db import get_media_referents -from gui.views.bookmarks import MediaBookmarks +from gramps.gen.utils.db import get_media_referents +from gramps.gui.views.bookmarks import MediaBookmarks from gramps.gen.mime import get_type, is_valid_type from gramps.gen.lib import MediaObject -from gen.db import DbTxn -from gui.editors import EditMedia, DeleteMediaQuery -from gen.errors import WindowActiveError -from gui.filters.sidebar import MediaSidebarFilter -from gui.merge import MergeMedia -from gui.ddtargets import DdTargets -from gui.dialog import ErrorDialog -from gen.plug import CATEGORY_QR_MEDIA +from gramps.gen.db import DbTxn +from gramps.gui.editors import EditMedia, DeleteMediaQuery +from gramps.gen.errors import WindowActiveError +from gramps.gui.filters.sidebar import MediaSidebarFilter +from gramps.gui.merge import MergeMedia +from gramps.gui.ddtargets import DdTargets +from gramps.gui.dialog import ErrorDialog +from gramps.gen.plug import CATEGORY_QR_MEDIA #------------------------------------------------------------------------- # diff --git a/gramps/plugins/view/noteview.py b/gramps/plugins/view/noteview.py index 6cc20311f..fad9d16b6 100644 --- a/gramps/plugins/view/noteview.py +++ b/gramps/plugins/view/noteview.py @@ -29,7 +29,7 @@ Note View. # python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ import logging _LOG = logging.getLogger(".plugins.noteview") @@ -45,19 +45,19 @@ from gi.repository import Gtk # gramps modules # #------------------------------------------------------------------------- -from gui.views.listview import ListView -from gui.views.treemodels import NoteModel -from gen.utils.db import get_note_referents -from gen.errors import WindowActiveError -from gui.views.bookmarks import NoteBookmarks -from gen.config import config -from gen.lib import Note -from gui.ddtargets import DdTargets -from gui.dialog import ErrorDialog -from gui.filters.sidebar import NoteSidebarFilter -from gui.editors import EditNote, DeleteNoteQuery -from gui.merge import MergeNote -from gen.plug import CATEGORY_QR_NOTE +from gramps.gui.views.listview import ListView +from gramps.gui.views.treemodels import NoteModel +from gramps.gen.utils.db import get_note_referents +from gramps.gen.errors import WindowActiveError +from gramps.gui.views.bookmarks import NoteBookmarks +from gramps.gen.config import config +from gramps.gen.lib import Note +from gramps.gui.ddtargets import DdTargets +from gramps.gui.dialog import ErrorDialog +from gramps.gui.filters.sidebar import NoteSidebarFilter +from gramps.gui.editors import EditNote, DeleteNoteQuery +from gramps.gui.merge import MergeNote +from gramps.gen.plug import CATEGORY_QR_NOTE #------------------------------------------------------------------------- # diff --git a/gramps/plugins/view/pedigreeview.py b/gramps/plugins/view/pedigreeview.py index 3170ae6e6..71fcefdb4 100644 --- a/gramps/plugins/view/pedigreeview.py +++ b/gramps/plugins/view/pedigreeview.py @@ -29,8 +29,8 @@ # Python modules # #------------------------------------------------------------------------- -from gen.ggettext import sgettext as _ -from gen.ggettext import ngettext +from gramps.gen.ggettext import sgettext as _ +from gramps.gen.ggettext import ngettext from cgi import escape import math import sys @@ -54,23 +54,23 @@ import cairo # #------------------------------------------------------------------------- from gramps.gen.lib import ChildRef, ChildRefType, Family -from gui.views.navigationview import NavigationView -from gui.editors import FilterEditor -from gen.display.name import displayer as name_displayer -from gen.utils.alive import probably_alive -from gen.utils.file import media_path_full -from gen.utils.db import find_children, find_parents, find_witnessed_people -from gen.utils.libformatting import FormattingHelper -from gui.thumbnails import get_thumbnail_path -from gen.errors import WindowActiveError -from gui.editors import EditPerson, EditFamily -from gui.ddtargets import DdTargets +from gramps.gui.views.navigationview import NavigationView +from gramps.gui.editors import FilterEditor +from gramps.gen.display.name import displayer as name_displayer +from gramps.gen.utils.alive import probably_alive +from gramps.gen.utils.file import media_path_full +from gramps.gen.utils.db import find_children, find_parents, find_witnessed_people +from gramps.gen.utils.libformatting import FormattingHelper +from gramps.gui.thumbnails import get_thumbnail_path +from gramps.gen.errors import WindowActiveError +from gramps.gui.editors import EditPerson, EditFamily +from gramps.gui.ddtargets import DdTargets import cPickle as pickle -from gen.config import config -from gui.views.bookmarks import PersonBookmarks -from gen.const import CUSTOM_FILTERS -from gen.constfunc import is_quartz, win -from gui.dialog import RunDatabaseRepair, ErrorDialog +from gramps.gen.config import config +from gramps.gui.views.bookmarks import PersonBookmarks +from gramps.gen.const import CUSTOM_FILTERS +from gramps.gen.constfunc import is_quartz, win +from gramps.gui.dialog import RunDatabaseRepair, ErrorDialog from gramps.gui.utils import color_graph_box, hex_to_rgb_float, is_right_click #------------------------------------------------------------------------- diff --git a/gramps/plugins/view/personlistview.py b/gramps/plugins/view/personlistview.py index ce34e28c6..3478ae679 100644 --- a/gramps/plugins/view/personlistview.py +++ b/gramps/plugins/view/personlistview.py @@ -31,16 +31,16 @@ Person list View # Gramps modules # #------------------------------------------------------------------------- -from gui.views.listview import LISTTREE +from gramps.gui.views.listview import LISTTREE from gramps.plugins.lib.libpersonview import BasePersonView -from gui.views.treemodels.peoplemodel import PersonListModel +from gramps.gui.views.treemodels.peoplemodel import PersonListModel #------------------------------------------------------------------------- # # Internationalization # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/gramps/plugins/view/persontreeview.py b/gramps/plugins/view/persontreeview.py index e56d0196a..05b26a016 100644 --- a/gramps/plugins/view/persontreeview.py +++ b/gramps/plugins/view/persontreeview.py @@ -38,20 +38,20 @@ from gi.repository import Gtk # Gramps modules # #------------------------------------------------------------------------- -from gui.views.listview import LISTTREE +from gramps.gui.views.listview import LISTTREE from gramps.plugins.lib.libpersonview import BasePersonView -from gui.views.treemodels.peoplemodel import PersonTreeModel +from gramps.gui.views.treemodels.peoplemodel import PersonTreeModel from gramps.gen.lib import Name, Person, Surname -from gen.errors import WindowActiveError -from gui.editors import EditPerson -from gen.utils.db import preset_name +from gramps.gen.errors import WindowActiveError +from gramps.gui.editors import EditPerson +from gramps.gen.utils.db import preset_name #------------------------------------------------------------------------- # # Internationalization # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/gramps/plugins/view/placelistview.py b/gramps/plugins/view/placelistview.py index 84d373017..ba8c8232c 100644 --- a/gramps/plugins/view/placelistview.py +++ b/gramps/plugins/view/placelistview.py @@ -29,14 +29,14 @@ Place List View # #------------------------------------------------------------------------- from gramps.plugins.lib.libplaceview import PlaceBaseView -from gui.views.treemodels.placemodel import PlaceListModel +from gramps.gui.views.treemodels.placemodel import PlaceListModel #------------------------------------------------------------------------- # # Internationalization # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/gramps/plugins/view/placetreeview.py b/gramps/plugins/view/placetreeview.py index b914f1089..bc8737e69 100644 --- a/gramps/plugins/view/placetreeview.py +++ b/gramps/plugins/view/placetreeview.py @@ -28,19 +28,19 @@ Place Tree View # Gramps modules # #------------------------------------------------------------------------- -from gui.views.listview import LISTTREE +from gramps.gui.views.listview import LISTTREE from gramps.plugins.lib.libplaceview import PlaceBaseView -from gui.views.treemodels.placemodel import PlaceTreeModel, COUNTRYLEVELS +from gramps.gui.views.treemodels.placemodel import PlaceTreeModel, COUNTRYLEVELS from gramps.gen.lib import Place -from gen.errors import WindowActiveError -from gui.editors import EditPlace +from gramps.gen.errors import WindowActiveError +from gramps.gui.editors import EditPlace #------------------------------------------------------------------------- # # Internationalization # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/gramps/plugins/view/relview.py b/gramps/plugins/view/relview.py index 35e44e582..cb65fa4eb 100644 --- a/gramps/plugins/view/relview.py +++ b/gramps/plugins/view/relview.py @@ -29,8 +29,8 @@ Relationship View # Python modules # #------------------------------------------------------------------------- -from gen.ggettext import sgettext as _ -from gen.ggettext import ngettext +from gramps.gen.ggettext import sgettext as _ +from gramps.gen.ggettext import ngettext import cgi #------------------------------------------------------------------------- @@ -56,24 +56,24 @@ from gi.repository import Pango # #------------------------------------------------------------------------- from gramps.gen.lib import ChildRef, EventRoleType, EventType, Family, FamilyRelType, Name, Person, Surname -from gen.db import DbTxn -from gui.views.navigationview import NavigationView -from gui.editors import EditPerson, EditFamily -from gui.editors import FilterEditor -from gen.display.name import displayer as name_displayer -from gen.utils.file import media_path_full -from gen.utils.alive import probably_alive -from gui.utils import open_file_with_default_application +from gramps.gen.db import DbTxn +from gramps.gui.views.navigationview import NavigationView +from gramps.gui.editors import EditPerson, EditFamily +from gramps.gui.editors import FilterEditor +from gramps.gen.display.name import displayer as name_displayer +from gramps.gen.utils.file import media_path_full +from gramps.gen.utils.alive import probably_alive +from gramps.gui.utils import open_file_with_default_application from gramps.gen.datehandler import displayer, get_date -from gui.thumbnails import get_thumbnail_image -from gen.config import config +from gramps.gui.thumbnails import get_thumbnail_image +from gramps.gen.config import config from gui import widgets -from gui.widgets.reorderfam import Reorder -from gui.selectors import SelectorFactory -from gen.errors import WindowActiveError -from gui.views.bookmarks import PersonBookmarks -from gen.const import CUSTOM_FILTERS -from gen.utils.db import (get_birth_or_fallback, get_death_or_fallback, +from gramps.gui.widgets.reorderfam import Reorder +from gramps.gui.selectors import SelectorFactory +from gramps.gen.errors import WindowActiveError +from gramps.gui.views.bookmarks import PersonBookmarks +from gramps.gen.const import CUSTOM_FILTERS +from gramps.gen.utils.db import (get_birth_or_fallback, get_death_or_fallback, preset_name) _GenderCode = { @@ -483,7 +483,7 @@ class RelationshipView(NavigationView): import traceback exc = traceback.format_exc() _LOG.error(str(msg) +"\n" + exc) - from gui.dialog import RunDatabaseRepair + from gramps.gui.dialog import RunDatabaseRepair RunDatabaseRepair(str(msg)) self.redrawing = False return True @@ -1321,7 +1321,7 @@ class RelationshipView(NavigationView): def write_family(self, family_handle, person = None): family = self.dbstate.db.get_family_from_handle(family_handle) if family is None: - from gui.dialog import WarningDialog + from gramps.gui.dialog import WarningDialog WarningDialog( _('Broken family detected'), _('Please run the Check and Repair Database tool')) diff --git a/gramps/plugins/view/repoview.py b/gramps/plugins/view/repoview.py index e4050512b..85ef9d4dc 100644 --- a/gramps/plugins/view/repoview.py +++ b/gramps/plugins/view/repoview.py @@ -37,24 +37,24 @@ from gi.repository import Gtk # #------------------------------------------------------------------------- from gramps.gen.lib import Repository -from gui.views.listview import ListView -from gui.views.treemodels import RepositoryModel -from gui.views.bookmarks import RepoBookmarks -from gen.errors import WindowActiveError -from gen.config import config -from gui.editors import EditRepository, DeleteRepositoryQuery -from gui.ddtargets import DdTargets -from gui.dialog import ErrorDialog -from gui.filters.sidebar import RepoSidebarFilter -from gui.merge import MergeRepository -from gen.plug import CATEGORY_QR_REPOSITORY +from gramps.gui.views.listview import ListView +from gramps.gui.views.treemodels import RepositoryModel +from gramps.gui.views.bookmarks import RepoBookmarks +from gramps.gen.errors import WindowActiveError +from gramps.gen.config import config +from gramps.gui.editors import EditRepository, DeleteRepositoryQuery +from gramps.gui.ddtargets import DdTargets +from gramps.gui.dialog import ErrorDialog +from gramps.gui.filters.sidebar import RepoSidebarFilter +from gramps.gui.merge import MergeRepository +from gramps.gen.plug import CATEGORY_QR_REPOSITORY #------------------------------------------------------------------------- # # internationalization # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ #------------------------------------------------------------------------- diff --git a/gramps/plugins/view/sourceview.py b/gramps/plugins/view/sourceview.py index 7083bdd56..21cadd6a5 100644 --- a/gramps/plugins/view/sourceview.py +++ b/gramps/plugins/view/sourceview.py @@ -40,25 +40,25 @@ LOG = logging.getLogger(".citation") # #------------------------------------------------------------------------- from gramps.gen.lib import Source -from gen.config import config -from gui.views.listview import ListView -from gui.views.treemodels import SourceModel -from gen.utils.db import get_source_and_citation_referents -from gui.views.bookmarks import SourceBookmarks -from gen.errors import WindowActiveError -from gui.ddtargets import DdTargets -from gui.dialog import ErrorDialog -from gui.editors import EditSource, DeleteSrcQuery -from gui.filters.sidebar import SourceSidebarFilter -from gui.merge import MergeSource -from gen.plug import CATEGORY_QR_SOURCE +from gramps.gen.config import config +from gramps.gui.views.listview import ListView +from gramps.gui.views.treemodels import SourceModel +from gramps.gen.utils.db import get_source_and_citation_referents +from gramps.gui.views.bookmarks import SourceBookmarks +from gramps.gen.errors import WindowActiveError +from gramps.gui.ddtargets import DdTargets +from gramps.gui.dialog import ErrorDialog +from gramps.gui.editors import EditSource, DeleteSrcQuery +from gramps.gui.filters.sidebar import SourceSidebarFilter +from gramps.gui.merge import MergeSource +from gramps.gen.plug import CATEGORY_QR_SOURCE #------------------------------------------------------------------------- # # internationalization # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ #------------------------------------------------------------------------- diff --git a/gramps/plugins/webreport/narrativeweb.py b/gramps/plugins/webreport/narrativeweb.py index 2b865c611..4195e9277 100644 --- a/gramps/plugins/webreport/narrativeweb.py +++ b/gramps/plugins/webreport/narrativeweb.py @@ -76,29 +76,29 @@ log = logging.getLogger(".NarrativeWeb") #------------------------------------------------ # GRAMPS module #------------------------------------------------ -from gen.ggettext import sgettext as _ +from gramps.gen.ggettext import sgettext as _ from gramps.gen.lib import ChildRefType, Date, EventType, FamilyRelType, Name, NameType, Person -from gen.lib import UrlType, date, NoteType, EventRoleType -from gen.const import PROGRAM_NAME, URL_HOMEPAGE, USER_HOME, VERSION -from gen.sort import Sort -from gen.plug.menu import PersonOption, NumberOption, StringOption, \ +from gramps.gen.lib import UrlType, date, NoteType, EventRoleType +from gramps.gen.const import PROGRAM_NAME, URL_HOMEPAGE, USER_HOME, VERSION +from gramps.gen.sort import Sort +from gramps.gen.plug.menu import PersonOption, NumberOption, StringOption, \ BooleanOption, EnumeratedListOption, FilterOption, \ NoteOption, MediaOption, DestinationOption -from gen.plug.report import ( Report, Bibliography) -from gen.plug.report import utils as ReportUtils -from gen.plug.report import MenuReportOptions +from gramps.gen.plug.report import ( Report, Bibliography) +from gramps.gen.plug.report import utils as ReportUtils +from gramps.gen.plug.report import MenuReportOptions -from gen.utils.config import get_researcher -from gen.utils.string import confidence -from gen.utils.file import media_path_full -from gen.utils.db import get_source_and_citation_referents -from gen.constfunc import win -from gui.thumbnails import get_thumbnail_path, run_thumbnailer -from gen.utils.image import image_size, resize_to_jpeg_buffer +from gramps.gen.utils.config import get_researcher +from gramps.gen.utils.string import confidence +from gramps.gen.utils.file import media_path_full +from gramps.gen.utils.db import get_source_and_citation_referents +from gramps.gen.constfunc import win +from gramps.gui.thumbnails import get_thumbnail_path, run_thumbnailer +from gramps.gen.utils.image import image_size, resize_to_jpeg_buffer from gramps.gen.mime import get_description -from gen.display.name import displayer as _nd -from gen.datehandler import displayer as _dd -from gen.proxy import PrivateProxyDb, LivingProxyDb +from gramps.gen.display.name import displayer as _nd +from gramps.gen.datehandler import displayer as _dd +from gramps.gen.proxy import PrivateProxyDb, LivingProxyDb from gramps.plugins.lib.libhtmlconst import _CHARACTER_SETS, _CC, _COPY_OPTIONS # import HTML Class from src/plugins/lib/libhtml.py @@ -109,10 +109,10 @@ from gramps.plugins.lib.libhtmlbackend import HtmlBackend, process_spaces from gramps.plugins.lib.libgedcom import make_gedcom_date from gramps.gen.utils.alive import probably_alive -from gen.utils.place import conv_lat_lon -from gui.pluginmanager import GuiPluginManager +from gramps.gen.utils.place import conv_lat_lon +from gramps.gui.pluginmanager import GuiPluginManager -from gen.relationship import get_relationship_calculator +from gramps.gen.relationship import get_relationship_calculator #------------------------------------------------ # constants #------------------------------------------------ diff --git a/gramps/plugins/webreport/webcal.py b/gramps/plugins/webreport/webcal.py index d8d8fced0..0349d50bd 100644 --- a/gramps/plugins/webreport/webcal.py +++ b/gramps/plugins/webreport/webcal.py @@ -36,8 +36,8 @@ Web Calendar generator. from functools import partial import os, codecs, shutil, re import datetime, calendar -from gen.ggettext import sgettext as _ -from gen.ggettext import ngettext +from gramps.gen.ggettext import sgettext as _ +from gramps.gen.ggettext import ngettext from itertools import imap #------------------------------------------------------------------------ @@ -50,24 +50,24 @@ log = logging.getLogger(".WebPage") # GRAMPS module #------------------------------------------------------------------------ from gramps.gen.lib import Date, Name, NameType, Person -from gen.const import PROGRAM_NAME, URL_HOMEPAGE, USER_HOME, VERSION -from gen.constfunc import win -from gen.plug.report import Report -from gen.plug.report import utils as ReportUtils -from gen.plug.report import MenuReportOptions -from gen.plug.menu import BooleanOption, NumberOption, StringOption, \ +from gramps.gen.const import PROGRAM_NAME, URL_HOMEPAGE, USER_HOME, VERSION +from gramps.gen.constfunc import win +from gramps.gen.plug.report import Report +from gramps.gen.plug.report import utils as ReportUtils +from gramps.gen.plug.report import MenuReportOptions +from gramps.gen.plug.menu import BooleanOption, NumberOption, StringOption, \ EnumeratedListOption, FilterOption, PersonOption, \ DestinationOption, NoteOption -from gen.utils.config import get_researcher -from gen.utils.alive import probably_alive -from gen.datehandler import displayer as _dd, long_days +from gramps.gen.utils.config import get_researcher +from gramps.gen.utils.alive import probably_alive +from gramps.gen.datehandler import displayer as _dd, long_days -from gen.display.name import displayer as _nd +from gramps.gen.display.name import displayer as _nd import gramps.plugins.lib.libholiday as libholiday from gramps.plugins.lib.libhtml import Html, xml_lang from gramps.plugins.lib.libhtmlconst import _CHARACTER_SETS, _CC, _COPY_OPTIONS -from gui.pluginmanager import GuiPluginManager +from gramps.gui.pluginmanager import GuiPluginManager # import styled notes from # src/plugins/lib/libhtmlbackend.py diff --git a/gramps/plugins/webstuff/webstuff.py b/gramps/plugins/webstuff/webstuff.py index c02ddd6eb..3220e367b 100644 --- a/gramps/plugins/webstuff/webstuff.py +++ b/gramps/plugins/webstuff/webstuff.py @@ -25,8 +25,8 @@ # python modules #------------------------------------------------ import os -from gen.const import VERSION_DIR -from gen.ggettext import sgettext as _ +from gramps.gen.const import VERSION_DIR +from gramps.gen.ggettext import sgettext as _ def make_css_dict(tup): """ diff --git a/gramps/test/gramps_cli_test.py b/gramps/test/gramps_cli_test.py index c05a5c5b4..80ee7c826 100644 --- a/gramps/test/gramps_cli_test.py +++ b/gramps/test/gramps_cli_test.py @@ -78,7 +78,7 @@ class Test(unittest.TestCase): # get cleaned before (and after) running a CLI # (eg cleanout stale files from prior crash-runs) def test3_files_in_import_dir(self): - from gen.const import TEMP_DIR + from gramps.gen.const import TEMP_DIR ddir = os.path.join(TEMP_DIR,"import_dbdir") os.makedirs(ddir) bogofiles = [os.path.join(ddir,fn) diff --git a/gramps/test/utils_test.py b/gramps/test/utils_test.py index a97ce4482..639f48807 100644 --- a/gramps/test/utils_test.py +++ b/gramps/test/utils_test.py @@ -25,7 +25,7 @@ import unittest from test import test_util test_util.path_append_parent() -from gen.utils.keyword import (KEYWORDS, get_translation_from_keyword, +from gramps.gen.utils.keyword import (KEYWORDS, get_translation_from_keyword, get_keyword_from_translation) class TestCase(unittest.TestCase): diff --git a/gramps/webapp/dbdjango.py b/gramps/webapp/dbdjango.py index 2ebbe1dd9..3901ae217 100644 --- a/gramps/webapp/dbdjango.py +++ b/gramps/webapp/dbdjango.py @@ -31,8 +31,8 @@ import base64 import time import gen import re -from gen.db import DbReadBase, DbWriteBase, DbTxn -from gen.db import (PERSON_KEY, +from gramps.gen.db import DbReadBase, DbWriteBase, DbTxn +from gramps.gen.db import (PERSON_KEY, FAMILY_KEY, CITATION_KEY, SOURCE_KEY, @@ -41,7 +41,7 @@ from gen.db import (PERSON_KEY, PLACE_KEY, REPOSITORY_KEY, NOTE_KEY) -from gen.utils.id import create_id +from gramps.gen.utils.id import create_id from webapp.libdjango import DjangoInterface from django.db import transaction diff --git a/gramps/webapp/grampsdb/models.py b/gramps/webapp/grampsdb/models.py index 4eb226f40..fe22e588e 100644 --- a/gramps/webapp/grampsdb/models.py +++ b/gramps/webapp/grampsdb/models.py @@ -31,8 +31,8 @@ from django.db import models from django.contrib.contenttypes.models import ContentType from django.contrib.contenttypes import generic -from gen.lib.date import Date as GDate, Today -from gen.utils.id import create_id, create_uid +from gramps.gen.lib.date import Date as GDate, Today +from gramps.gen.utils.id import create_id, create_uid from webapp.grampsdb.profile import Profile @@ -125,35 +125,35 @@ class mGrampsType(models.Model): raise IndexError("type index is out of range (use 0 or 1)") class NameType(mGrampsType): - from gen.lib.nametype import NameType + from gramps.gen.lib.nametype import NameType _DATAMAP = get_datamap(NameType) _CUSTOM = NameType._CUSTOM _DEFAULT = get_default_type_value(NameType) val = models.IntegerField('name type', choices=_DATAMAP, blank=False) class NameOriginType(mGrampsType): - from gen.lib.nameorigintype import NameOriginType + from gramps.gen.lib.nameorigintype import NameOriginType _DATAMAP = get_datamap(NameOriginType) _CUSTOM = NameOriginType._CUSTOM _DEFAULT = get_default_type_value(NameOriginType) val = models.IntegerField('name origin type', choices=_DATAMAP, blank=False) class AttributeType(mGrampsType): - from gen.lib.attrtype import AttributeType + from gramps.gen.lib.attrtype import AttributeType _DATAMAP = get_datamap(AttributeType) _CUSTOM = AttributeType._CUSTOM _DEFAULT = get_default_type_value(AttributeType) val = models.IntegerField('attribute type', choices=_DATAMAP, blank=False) class UrlType(mGrampsType): - from gen.lib.urltype import UrlType + from gramps.gen.lib.urltype import UrlType _DATAMAP = get_datamap(UrlType) _CUSTOM = UrlType._CUSTOM _DEFAULT = get_default_type_value(UrlType) val = models.IntegerField('url type', choices=_DATAMAP, blank=False) class ChildRefType(mGrampsType): - from gen.lib.childreftype import ChildRefType + from gramps.gen.lib.childreftype import ChildRefType _DATAMAP = get_datamap(ChildRefType) _CUSTOM = ChildRefType._CUSTOM _DEFAULT = get_default_type_value(ChildRefType) @@ -161,14 +161,14 @@ class ChildRefType(mGrampsType): blank=False) class RepositoryType(mGrampsType): - from gen.lib.repotype import RepositoryType + from gramps.gen.lib.repotype import RepositoryType _DATAMAP = get_datamap(RepositoryType) _CUSTOM = RepositoryType._CUSTOM _DEFAULT = get_default_type_value(RepositoryType) val = models.IntegerField('repository type', choices=_DATAMAP, blank=False) class EventType(mGrampsType): - from gen.lib.eventtype import EventType + from gramps.gen.lib.eventtype import EventType _DATAMAP = get_datamap(EventType) _CUSTOM = EventType._CUSTOM _DEFAULT = get_default_type_value(EventType) @@ -184,7 +184,7 @@ class EventType(mGrampsType): class FamilyRelType(mGrampsType): - from gen.lib.familyreltype import FamilyRelType + from gramps.gen.lib.familyreltype import FamilyRelType _DATAMAP = get_datamap(FamilyRelType) _CUSTOM = FamilyRelType._CUSTOM _DEFAULT = get_default_type_value(FamilyRelType) @@ -192,7 +192,7 @@ class FamilyRelType(mGrampsType): blank=False) class SourceMediaType(mGrampsType): - from gen.lib.srcmediatype import SourceMediaType + from gramps.gen.lib.srcmediatype import SourceMediaType _DATAMAP = get_datamap(SourceMediaType) _CUSTOM = SourceMediaType._CUSTOM _DEFAULT = get_default_type_value(SourceMediaType) @@ -200,21 +200,21 @@ class SourceMediaType(mGrampsType): blank=False) class EventRoleType(mGrampsType): - from gen.lib.eventroletype import EventRoleType + from gramps.gen.lib.eventroletype import EventRoleType _DATAMAP = get_datamap(EventRoleType) _CUSTOM = EventRoleType._CUSTOM _DEFAULT = get_default_type_value(EventRoleType) val = models.IntegerField('event role type', choices=_DATAMAP, blank=False) class NoteType(mGrampsType): - from gen.lib.notetype import NoteType + from gramps.gen.lib.notetype import NoteType _DATAMAP = get_datamap(NoteType) _CUSTOM = NoteType._CUSTOM _DEFAULT = get_default_type_value(NoteType) val = models.IntegerField('note type', choices=_DATAMAP, blank=False) class StyledTextTagType(mGrampsType): - from gen.lib.styledtexttagtype import StyledTextTagType + from gramps.gen.lib.styledtexttagtype import StyledTextTagType _DATAMAP = get_datamap(StyledTextTagType) _CUSTOM = None _DEFAULT = None diff --git a/gramps/webapp/grampsdb/view/event.py b/gramps/webapp/grampsdb/view/event.py index 6c76fe522..1fbb0e743 100644 --- a/gramps/webapp/grampsdb/view/event.py +++ b/gramps/webapp/grampsdb/view/event.py @@ -27,7 +27,7 @@ from webapp.grampsdb.models import Event, EventType, EventRef, EventRoleType, Pe from webapp.grampsdb.forms import * from webapp.libdjango import DjangoInterface, lookup_role_index from webapp.dbdjango import DbDjango -from gen.datehandler import displayer, parser +from gramps.gen.datehandler import displayer, parser ## Django Modules from django.shortcuts import get_object_or_404, render_to_response, redirect diff --git a/gramps/webapp/grampsdb/view/family.py b/gramps/webapp/grampsdb/view/family.py index 377894ac1..2500d952f 100644 --- a/gramps/webapp/grampsdb/view/family.py +++ b/gramps/webapp/grampsdb/view/family.py @@ -26,7 +26,7 @@ from webapp.utils import _, boolean, update_last_changed, build_search from webapp.grampsdb.models import Family from webapp.grampsdb.forms import * from webapp.libdjango import DjangoInterface -from gen.utils.id import create_id +from gramps.gen.utils.id import create_id ## Django Modules from django.shortcuts import get_object_or_404, render_to_response, redirect diff --git a/gramps/webapp/grampsdb/view/media.py b/gramps/webapp/grampsdb/view/media.py index 946e74b1a..4157a1052 100644 --- a/gramps/webapp/grampsdb/view/media.py +++ b/gramps/webapp/grampsdb/view/media.py @@ -26,7 +26,7 @@ from webapp.utils import _, boolean, update_last_changed, build_search from webapp.grampsdb.models import Media from webapp.grampsdb.forms import * from webapp.libdjango import DjangoInterface -from gen.config import config +from gramps.gen.config import config ## Django Modules from django.shortcuts import get_object_or_404, render_to_response, redirect diff --git a/gramps/webapp/grampsdb/views.py b/gramps/webapp/grampsdb/views.py index b3f6440ea..a81e5de91 100644 --- a/gramps/webapp/grampsdb/views.py +++ b/gramps/webapp/grampsdb/views.py @@ -60,8 +60,8 @@ from webapp.grampsdb.models import * from webapp.grampsdb.view import * from webapp.dbdjango import DbDjango from gramps.cli.user import User -from gen.const import VERSION_TUPLE -from gen.utils.svn import get_svn_revision +from gramps.gen.const import VERSION_TUPLE +from gramps.gen.utils.svn import get_svn_revision # Menu: (, //, | None, Need authentication ) MENU = [ @@ -185,7 +185,7 @@ def process_report_run(request, handle): Run a report or export. """ from webapp.reports import import_file, export_file, download - from cli.plug import run_report + from gramps.cli.plug import run_report import traceback db = DbDjango() if request.user.is_authenticated(): diff --git a/gramps/webapp/init.py b/gramps/webapp/init.py index 6ecc306f9..93e32cada 100644 --- a/gramps/webapp/init.py +++ b/gramps/webapp/init.py @@ -31,19 +31,19 @@ import os os.environ["DJANGO_SETTINGS_MODULE"] = "settings" import settings -from gen.config import config -from gen.lib.nametype import NameType -from gen.lib.nameorigintype import NameOriginType -from gen.lib.attrtype import AttributeType -from gen.lib.urltype import UrlType -from gen.lib.childreftype import ChildRefType -from gen.lib.repotype import RepositoryType -from gen.lib.eventtype import EventType -from gen.lib.familyreltype import FamilyRelType -from gen.lib.srcmediatype import SourceMediaType -from gen.lib.eventroletype import EventRoleType -from gen.lib.notetype import NoteType -from gen.lib.styledtexttagtype import StyledTextTagType +from gramps.gen.config import config +from gramps.gen.lib.nametype import NameType +from gramps.gen.lib.nameorigintype import NameOriginType +from gramps.gen.lib.attrtype import AttributeType +from gramps.gen.lib.urltype import UrlType +from gramps.gen.lib.childreftype import ChildRefType +from gramps.gen.lib.repotype import RepositoryType +from gramps.gen.lib.eventtype import EventType +from gramps.gen.lib.familyreltype import FamilyRelType +from gramps.gen.lib.srcmediatype import SourceMediaType +from gramps.gen.lib.eventroletype import EventRoleType +from gramps.gen.lib.notetype import NoteType +from gramps.gen.lib.styledtexttagtype import StyledTextTagType from grampsdb.models import (GenderType, LdsType, LdsStatus, NameFormatType, NameOriginType, ThemeType) diff --git a/gramps/webapp/libdjango.py b/gramps/webapp/libdjango.py index e04a5f5e7..0c2710a2b 100644 --- a/gramps/webapp/libdjango.py +++ b/gramps/webapp/libdjango.py @@ -47,7 +47,7 @@ from django.db import transaction import webapp.grampsdb.models as models import webapp import gen -from gen.utils.id import create_id +from gramps.gen.utils.id import create_id # To get a django person from a django database: # djperson = dji.Person.get(handle='djhgsdh324hjg234hj24') diff --git a/gramps/webapp/reports.py b/gramps/webapp/reports.py index e8020ba04..e3d84d69f 100644 --- a/gramps/webapp/reports.py +++ b/gramps/webapp/reports.py @@ -23,14 +23,14 @@ # imports for import/export: -from gen.dbstate import DbState -from cli.grampscli import CLIManager -from gen.plug import BasePluginManager +from gramps.gen.dbstate import DbState +from gramps.cli.grampscli import CLIManager +from gramps.gen.plug import BasePluginManager import os # Example for running a report: # ------------------------------ -# from cli.plug import run_report +# from gramps.cli.plug import run_report # from django.conf import settings # import webapp.settings as default_settings # try: diff --git a/gramps/webapp/settings.py b/gramps/webapp/settings.py index 90d78e777..b10b5b929 100644 --- a/gramps/webapp/settings.py +++ b/gramps/webapp/settings.py @@ -23,7 +23,7 @@ # Need to be able to import Gramps files from here. -from gen.const import DATA_DIR, WEB_DIR +from gramps.gen.const import DATA_DIR, WEB_DIR import os DEBUG = True diff --git a/gramps/webapp/shell.py b/gramps/webapp/shell.py index 69d07d8bf..3e409c019 100644 --- a/gramps/webapp/shell.py +++ b/gramps/webapp/shell.py @@ -17,7 +17,7 @@ from webapp.grampsdb.forms import * from webapp.dbdjango import DbDjango from webapp.reports import import_file from webapp.libdjango import DjangoInterface, totime, todate -from gen.datehandler import displayer, parser +from gramps.gen.datehandler import displayer, parser from webapp.utils import StyledNoteFormatter, parse_styled_text from gramps.gen.lib import StyledText import cli.user diff --git a/gramps/webapp/urls.py b/gramps/webapp/urls.py index f2e8bdfbe..ae4c9a073 100644 --- a/gramps/webapp/urls.py +++ b/gramps/webapp/urls.py @@ -33,7 +33,7 @@ import os # Django and Gramps Modules # #------------------------------------------------------------------------ -from gen.const import IMAGE_DIR, ROOT_DIR +from gramps.gen.const import IMAGE_DIR, ROOT_DIR from django.conf.urls.defaults import * from django.contrib import admin admin.autodiscover() diff --git a/gramps/webapp/utils.py b/gramps/webapp/utils.py index 9cc163666..7cd320a6c 100644 --- a/gramps/webapp/utils.py +++ b/gramps/webapp/utils.py @@ -56,15 +56,15 @@ from webapp.dbdjango import DbDjango # Gramps Modules # #------------------------------------------------------------------------ -from gen.simple import SimpleTable, SimpleAccess, make_basic_stylesheet -from gen.utils.alive import probably_alive as alive -from gen.dbstate import DbState -from gen.datehandler import displayer, parser -from gen.lib.date import Date as GDate, Today +from gramps.gen.simple import SimpleTable, SimpleAccess, make_basic_stylesheet +from gramps.gen.utils.alive import probably_alive as alive +from gramps.gen.dbstate import DbState +from gramps.gen.datehandler import displayer, parser +from gramps.gen.lib.date import Date as GDate, Today from gramps.gen.lib import Person -from gen.utils.db import get_birth_or_fallback, get_death_or_fallback -from gen.plug import BasePluginManager -from cli.grampscli import CLIManager +from gramps.gen.utils.db import get_birth_or_fallback, get_death_or_fallback +from gramps.gen.plug import BasePluginManager +from gramps.cli.grampscli import CLIManager _ = lambda msg: msg