Changes to imports - part 7

svn: r20492

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 gramps.gen.recentfiles import recent_files
-from gen.utils.file import (rm_tempdir, get_empty_tempdir, 
+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 gramps.gen.plug import BasePluginManager
-from gen.plug.report import CATEGORY_BOOK, CATEGORY_CODE
+from gramps.gen.plug.report import CATEGORY_BOOK, CATEGORY_CODE
-from cli.plug import cl_report
+from gramps.cli.plug import cl_report
-from cli.user import User
+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(',') ] )

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 gramps.gen.const import LONGOPTS, SHORTOPTS
-from gen.config import config
+from gramps.gen.config import config
-from gen.utils.configmanager import safe_eval
+from gramps.gen.utils.configmanager import safe_eval
-from gen.utils.file import get_unicode_path_from_env_var
+from gramps.gen.utils.file import get_unicode_path_from_env_var
 
 # Note: Make sure to edit const.py.in POPT_TABLE too!
 _HELP = _("""

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 gramps.gen.plug import BasePluginManager
-from gen.config import config
+from gramps.gen.config import config
-from gen.constfunc import win
+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 |\

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 gramps.gen.display.name import displayer as name_displayer
-from gen.config import config
+from gramps.gen.config import config
-from gen.const import PLUGINS_DIR, USER_PLUGINS
+from gramps.gen.const import PLUGINS_DIR, USER_PLUGINS
-from gen.errors import DbError
+from gramps.gen.errors import DbError
-from gen.dbstate import DbState
+from gramps.gen.dbstate import DbState
-from gen.db import DbBsddb
+from gramps.gen.db import DbBsddb
 from gramps.gen.db.exceptions import (DbUpgradeRequiredError, 
                                       DbVersionError)
-from gen.plug import BasePluginManager
+from gramps.gen.plug import BasePluginManager
-from gen.utils.config import get_researcher
+from gramps.gen.utils.config import get_researcher
-from gen.recentfiles import recent_files
+from gramps.gen.recentfiles import recent_files
 
 #-------------------------------------------------------------------------
 #

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 gramps.gen.plug import BasePluginManager
-from gen.plug.docgen import (StyleSheet, StyleSheetList, PaperStyle,
+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 gramps.gen.display.name import displayer as name_displayer
-from gen.errors import ReportError
+from gramps.gen.errors import ReportError
-from gen.plug.report import (CATEGORY_TEXT, CATEGORY_DRAW, CATEGORY_BOOK,
+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 gramps.gen.plug.report._paper import paper_sizes
-from gen.const import USER_HOME
+from gramps.gen.const import USER_HOME
-from gen.dbstate import DbState
+from gramps.gen.dbstate import DbState
-from cli.grampscli import CLIManager
+from gramps.cli.grampscli import CLIManager
 import cli.user
 
 #------------------------------------------------------------------------

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 gramps.gui.display import display_url
-from gen.config import config
+from gramps.gen.config import config
 
 if config.get('preferences.use-bsddb3'):
     import bsddb3 as bsddb

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 gramps.gen.const import IMAGE_DIR, URL_MANUAL_PAGE
-from gen.config import config
+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 gramps.gui.display import display_help
-from gui.managedwindow import ManagedWindow
+from gramps.gui.managedwindow import ManagedWindow
-from gen.ggettext import sgettext as _
+from gramps.gen.ggettext import sgettext as _
-from gen.utils.trans import trans_objclass
+from gramps.gen.utils.trans import trans_objclass
-from gen.constfunc import mac
+from gramps.gen.constfunc import mac
-from gui.glade import Glade
+from gramps.gui.glade import Glade
-from gui.ddtargets import DdTargets
+from gramps.gui.ddtargets import DdTargets
-from gui.makefilter import make_filter
+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)

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 gramps.gui.managedwindow import ManagedWindow
-from gui.glade import Glade
+from gramps.gui.glade import Glade
 
 
 #-------------------------------------------------------------------------

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 gramps.gen.config import config
-from gen.const import HOME_DIR
+from gramps.gen.const import HOME_DIR
 from gramps.gen.datehandler import get_date_formats
-from gen.display.name import displayer as _nd
+from gramps.gen.display.name import displayer as _nd
-from gen.display.name import NameDisplayError
+from gramps.gen.display.name import NameDisplayError
-from gen.utils.file import get_unicode_path_from_file_chooser
+from gramps.gen.utils.file import get_unicode_path_from_file_chooser
-from gen.utils.alive import update_constants
+from gramps.gen.utils.alive import update_constants
-from gen.utils.keyword import (get_keywords, get_translation_from_keyword, 
+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 gramps.gen.lib import Name, Surname, NameOriginType
-from gui.managedwindow import ManagedWindow
+from gramps.gui.managedwindow import ManagedWindow
-from gui.widgets import MarkupLabel, BasicLabel
+from gramps.gui.widgets import MarkupLabel, BasicLabel
-from gui.dialog import ErrorDialog, QuestionDialog2, OkDialog
+from gramps.gui.dialog import ErrorDialog, QuestionDialog2, OkDialog
-from gui.glade import Glade
+from gramps.gui.glade import Glade
 
 #-------------------------------------------------------------------------
 #

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

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 gramps.cli.grampscli import CLIDbLoader
-from gen.config import config
+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 gramps.gen.utils.file import get_unicode_path_from_file_chooser
-from gui.pluginmanager import GuiPluginManager
+from gramps.gui.pluginmanager import GuiPluginManager
-from gui.dialog import (DBErrorDialog, ErrorDialog, QuestionDialog2, 
+from gramps.gui.dialog import (DBErrorDialog, ErrorDialog, QuestionDialog2, 
                             WarningDialog)
-from gui.user import User
+from gramps.gui.user import User
-from gen.errors import DbError
+from gramps.gen.errors import DbError
 
 #-------------------------------------------------------------------------
 #

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 gramps.gen.ggettext import gettext as _
-from gui.user import User
+from gramps.gui.user import User
-from gui.dialog import ErrorDialog, QuestionDialog, QuestionDialog2
+from gramps.gui.dialog import ErrorDialog, QuestionDialog, QuestionDialog2
-from gen.db import DbBsddb
+from gramps.gen.db import DbBsddb
-from gui.pluginmanager import GuiPluginManager
+from gramps.gui.pluginmanager import GuiPluginManager
-from cli.clidbman import CLIDbManager, NAME_FILE, time_val
+from gramps.cli.clidbman import CLIDbManager, NAME_FILE, time_val
-from gui.ddtargets import DdTargets
+from gramps.gui.ddtargets import DdTargets
-from gen.recentfiles import rename_filename, remove_filename
+from gramps.gen.recentfiles import rename_filename, remove_filename
-from gui.glade import Glade
+from gramps.gui.glade import Glade
-from gen.db.backup import restore
+from gramps.gen.db.backup import restore
-from gen.db.exceptions import DbException
+from gramps.gen.db.exceptions import DbException
-from gen.utils.file import get_unicode_path_from_env_var
+from gramps.gen.utils.file import get_unicode_path_from_env_var
 
 
 _RETURN = Gdk.keyval_from_name("Return")

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(),

gramps/gui/dialog.py

@@ -43,10 +43,10 @@ from gi.repository import GdkPixbuf
 # Gramps modules
 #
 #-------------------------------------------------------------------------
-from gen.const import ICON
+from gramps.gen.const import ICON
-from gen.config import config
+from gramps.gen.config import config
-from gui.glade import Glade
+from gramps.gui.glade import Glade
-from gen.ggettext import gettext as _
+from gramps.gen.ggettext import gettext as _
 
 try:
     ICON = GdkPixbuf.Pixbuf.new_from_file(ICON)

gramps/gui/display.py

@@ -20,9 +20,9 @@
 
 # $Id$
 
-from gen.const import URL_MANUAL_PAGE, URL_WIKISTRING
+from gramps.gen.const import URL_MANUAL_PAGE, URL_WIKISTRING
-from gen.constfunc import is_quartz
+from gramps.gen.constfunc import is_quartz
-from gen.config import config
+from gramps.gen.config import config
 import locale
 import os
 

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 gramps.gen.utils.callback import Callback
-from gui.utils import process_pending_events
+from gramps.gui.utils import process_pending_events
-from gui.views.navigationview import NavigationView
+from gramps.gui.views.navigationview import NavigationView
-from gen.config import config
+from gramps.gen.config import config
-from gen.display.name import displayer as name_displayer
+from gramps.gen.display.name import displayer as name_displayer
-from gui.managedwindow import GrampsWindowManager
+from gramps.gui.managedwindow import GrampsWindowManager
-from gen.relationship import get_relationship_calculator
+from gramps.gen.relationship import get_relationship_calculator
-from gui.glade import Glade
+from gramps.gui.glade import Glade
-from gen.utils.db import navigation_label
+from gramps.gen.utils.db import navigation_label
 
 DISABLED = -1
 
@@ -237,7 +237,7 @@ class History(Callback):
 _RCT_TOP = '<ui><menubar name="MenuBar"><menu action="FileMenu"><menu action="OpenRecent">'
 _RCT_BTM = '</menu></menu></menubar></ui>'
 
-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):
 

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,

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 gramps.gen.const import ICON, THUMBSCALE, USER_HOME
-from gen.config import config
+from gramps.gen.config import config
-from gen.utils.file import (media_path_full, media_path, relative_path, 
+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 gramps.gui.thumbnails import find_mime_type_pixbuf
-from gui.display import display_help
+from gramps.gui.display import display_help
-from gui.managedwindow import ManagedWindow
+from gramps.gui.managedwindow import ManagedWindow
-from gui.dialog import ErrorDialog, WarningDialog
+from gramps.gui.dialog import ErrorDialog, WarningDialog
-from gui.glade import Glade
+from gramps.gui.glade import Glade
 
 #-------------------------------------------------------------------------
 #

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 gramps.gen.errors import WindowActiveError
-from gui.ddtargets import DdTargets
+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:

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 gramps.gen.errors import WindowActiveError
-from gui.ddtargets import DdTargets
+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):

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 gramps.gen.errors import WindowActiveError
-from gui.widgets import SimpleButton
+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
 

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 gramps.gen.display.name import displayer as name_displayer
-from gen.utils.db import family_name, get_participant_from_event
+from gramps.gen.utils.db import family_name, get_participant_from_event
 
 #-------------------------------------------------------------------------
 #

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")

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 gramps.gen.display.name import displayer as name_displayer
-from gen.utils.string import gender as gender_map
+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
 
 #-------------------------------------------------------------------------
 #

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 gramps.gen.lib import Source, Citation
-from gui.dbguielement import DbGUIElement
+from gramps.gui.dbguielement import DbGUIElement
-from gui.selectors import SelectorFactory
+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:

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

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

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 gramps.gen.errors import WindowActiveError
-from gui.ddtargets import DdTargets
+from gramps.gui.ddtargets import DdTargets
 from groupembeddedlist import GroupEmbeddedList
 from eventrefmodel import EventRefModel
-from gui.dbguielement import DbGUIElement
+from gramps.gui.dbguielement import DbGUIElement
-from gui.selectors import SelectorFactory
+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

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

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):

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):

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 gramps.gui.dbguielement import DbGUIElement
-from gui.selectors import SelectorFactory
+from gramps.gui.selectors import SelectorFactory
 from gramps.gen.lib import MediaObject, MediaRef
-from gen.db import DbTxn
+from gramps.gen.db import DbTxn
-from gen.utils.file import (media_path_full, media_path, relative_path,
+from gramps.gen.utils.file import (media_path_full, media_path, relative_path,
                             fix_encoding)
-from gui.thumbnails import get_thumbnail_image
+from gramps.gui.thumbnails import get_thumbnail_image
-from gen.errors import WindowActiveError
+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 gramps.gen.constfunc import win
-from gen.const import THUMBSCALE
+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())
 

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):

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

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 gramps.gen.errors import WindowActiveError
-from gui.ddtargets import DdTargets
+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:

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 gramps.gen.errors import WindowActiveError
-from gui.ddtargets import DdTargets
+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)

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 gramps.gui.widgets.undoablebuffer import UndoableBuffer
-from gen.display.name import displayer as name_displayer
+from gramps.gen.display.name import displayer as name_displayer
 
 #-------------------------------------------------------------------------
 #

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 gramps.gui.dbguielement import DbGUIElement
-from gui.selectors import SelectorFactory
+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] )

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")

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 gramps.gen.errors import WindowActiveError
-from gui.ddtargets import DdTargets
+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')

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

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 gramps.gui.dbguielement import DbGUIElement
-from gui.selectors import SelectorFactory
+from gramps.gui.selectors import SelectorFactory
-from gen.errors import WindowActiveError
+from gramps.gen.errors import WindowActiveError
-from gui.ddtargets import DdTargets
+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 "

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 gramps.gui.ddtargets import DdTargets
-from gen.lib import Surname, NameOriginType
+from gramps.gen.lib import Surname, NameOriginType
 
 #-------------------------------------------------------------------------
 #

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 gramps.gen.errors import WindowActiveError
-from gui.ddtargets import DdTargets
+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():

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 gramps.gen.lib import NoteType
-from gui.glade import Glade
+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
 
 #-------------------------------------------------------------------------
 #

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 gramps.gen.lib import NoteType
-from gui.glade import Glade
+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"))

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 gramps.gen.lib import NoteType
-from gen.errors import WindowActiveError
+from gramps.gen.errors import WindowActiveError
-from gui.glade import Glade
+from gramps.gui.glade import Glade
 from displaytabs import CitationEmbedList, NoteTab
-from gui.widgets import MonitoredDataType, PrivacyButton
+from gramps.gui.widgets import MonitoredDataType, PrivacyButton
-from gen.display.name import displayer as name_displayer
+from gramps.gen.display.name import displayer as name_displayer
 
 #-------------------------------------------------------------------------
 #

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 

gramps/gui/editors/editdate.py

@@ -61,13 +61,13 @@ from gi.repository import Gtk
 # gramps modules
 #
 #-------------------------------------------------------------------------
-from gen.ggettext import sgettext as _
+from gramps.gen.ggettext import sgettext as _
-from gen.lib.date import Date
+from gramps.gen.lib.date import Date
 from gramps.gen.datehandler import displayer
-from gen.const import URL_MANUAL_PAGE
+from gramps.gen.const import URL_MANUAL_PAGE
-from gui.display import display_help
+from gramps.gui.display import display_help
-from gui.managedwindow import ManagedWindow
+from gramps.gui.managedwindow import ManagedWindow
-from gui.glade import Glade
+from gramps.gui.glade import Glade
 
 #-------------------------------------------------------------------------
 #

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 gramps.gen.db import DbTxn
-from gui.display import display_help
+from gramps.gui.display import display_help
 from editprimary import EditPrimary
 from objectentries import PlaceEntry
-from gui.glade import Glade
+from gramps.gui.glade import Glade
-from gui.dialog import ErrorDialog
+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
 
 #-------------------------------------------------------------------------
 #

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 gramps.gen.db import DbTxn
-from gui.glade import Glade
+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
 

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 gramps.gen.ggettext import gettext as _
-from gui.ddtargets import DdTargets
+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 gramps.gen.config import config
-from gen.display.name import displayer as name_displayer
+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 gramps.gen.db import DbTxn
-from gen.errors import WindowActiveError
+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 gramps.gen.plug import CATEGORY_QR_FAMILY
-from gui.dialog import (ErrorDialog, RunDatabaseRepair, WarningDialog,
+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 gramps.gui.selectors import SelectorFactory
-from gen.utils.id import create_id
+from gramps.gen.utils.id import create_id
 
 SelectPerson = SelectorFactory('Person')
 

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 gramps.gen.display.name import displayer as name_displayer
-from gen.utils.lds import TEMPLES
+from gramps.gen.utils.lds import TEMPLES
-from gui.glade import Glade
+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 : [

gramps/gui/editors/editlink.py

@@ -33,11 +33,11 @@ import re
 # gramps modules
 #
 #-------------------------------------------------------------------------
-from gen.ggettext import gettext as _
+from gramps.gen.ggettext import gettext as _
-from gui.managedwindow import ManagedWindow
+from gramps.gui.managedwindow import ManagedWindow
-from gui.display import display_help
+from gramps.gui.display import display_help
-from gui.glade import Glade
+from gramps.gui.glade import Glade
-from gen.simple import SimpleAccess
+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()

gramps/gui/editors/editlocation.py

@@ -28,9 +28,9 @@
 #
 #-------------------------------------------------------------------------
 from editsecondary import EditSecondary
-from gui.glade import Glade
+from gramps.gui.glade import Glade
-from gui.widgets import MonitoredEntry
+from gramps.gui.widgets import MonitoredEntry
-from gen.ggettext import gettext as _
+from gramps.gen.ggettext import gettext as _
 
 #-------------------------------------------------------------------------
 #

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 gramps.gui.thumbnails import get_thumbnail_image, find_mime_type_pixbuf
-from gen.utils.file import (media_path_full, find_file, 
+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 gramps.gui.dialog import ErrorDialog
-from gui.glade import Glade
+from gramps.gui.glade import Glade
 
 #-------------------------------------------------------------------------
 #

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 gramps.gui.utils import open_file_with_default_application
-from gen.const import THUMBSCALE
+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 gramps.gui.thumbnails import get_thumbnail_image, find_mime_type_pixbuf
-from gen.utils.file import (media_path_full, find_file, 
+from gramps.gen.utils.file import (media_path_full, find_file, 
                             get_unicode_path_from_file_chooser)
-from gen.lib import NoteType
+from gramps.gen.lib import NoteType
-from gen.db import DbTxn
+from gramps.gen.db import DbTxn
-from gui.glade import Glade
+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

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 gramps.gen.config import config
-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 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 gramps.gui.glade import Glade                     
-from gen.errors import ValidationError
+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?"),

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 gramps.gen.lib import Note
-from gen.db import DbTxn
+from gramps.gen.db import DbTxn
-from gui.dialog import ErrorDialog
+from gramps.gui.dialog import ErrorDialog
-from gui.glade import Glade
+from gramps.gui.glade import Glade
 
 #-------------------------------------------------------------------------
 #

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 gramps.gen.utils.file import media_path_full
-from gui.thumbnails import get_thumbnail_image
+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 gramps.gen.display.name import displayer as name_displayer
-from gen.errors import WindowActiveError
+from gramps.gen.errors import WindowActiveError
-from gui.glade import Glade
+from gramps.gui.glade import Glade
-from gui.widgets.menuitem import add_menuitem
+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 gramps.gen.config import config
-from gui.dialog import ErrorDialog, ICON
+from gramps.gui.dialog import ErrorDialog, ICON
-from gen.errors import ValidationError
+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 :

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 gramps.gen.lib import NoteType
-from gui.widgets import MonitoredEntry, PrivacyButton
+from gramps.gui.widgets import MonitoredEntry, PrivacyButton
-from gui.selectors import SelectorFactory
+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'),

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 gramps.gui.widgets import MonitoredEntry, PrivacyButton
-from gen.errors import ValidationError
+from gramps.gen.errors import ValidationError
-from gen.utils.place import conv_lat_lon
+from gramps.gen.utils.place import conv_lat_lon
-from gui.dialog import ErrorDialog
+from gramps.gui.dialog import ErrorDialog
-from gui.glade import Glade
+from gramps.gui.glade import Glade
 
 #-------------------------------------------------------------------------
 #

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 gramps.gen.display.name import displayer as name_displayer
-from gen.config import config
+from gramps.gen.config import config
 from gramps.gui.utils import is_right_click
-from gui.display import display_help
+from gramps.gui.display import display_help
-from gui.dialog import SaveDialog
+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

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 gramps.gen.config import config
-from gui.dbguielement import DbGUIElement
+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)

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 gramps.gen.lib import NoteType
-from gen.db import DbTxn
+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
 
 #-------------------------------------------------------------------------
 #

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 gramps.gui.dialog import ErrorDialog
-from gui.glade import Glade
+from gramps.gui.glade import Glade
 
 class EditRepository(EditPrimary):
 

gramps/gui/editors/editsecondary.py

@@ -21,10 +21,10 @@
 
 # $Id$
 
-from gui.managedwindow import ManagedWindow
+from gramps.gui.managedwindow import ManagedWindow
-from gui.display import display_help
+from gramps.gui.display import display_help
-from gen.config import config
+from gramps.gen.config import config
-from gui.dbguielement import DbGUIElement
+from gramps.gui.dbguielement import DbGUIElement
 
 class EditSecondary(ManagedWindow, DbGUIElement):
 

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 gramps.gui.widgets import MonitoredEntry, PrivacyButton
-from gui.dialog import ErrorDialog
+from gramps.gui.dialog import ErrorDialog
-from gui.glade import Glade
+from gramps.gui.glade import Glade
 
 #-------------------------------------------------------------------------
 #

gramps/gui/editors/edittaglist.py

@@ -33,11 +33,11 @@ from gi.repository import Gtk
 # Gramps modules
 #
 #-------------------------------------------------------------------------
-from gen.ggettext import sgettext as _
+from gramps.gen.ggettext import sgettext as _
-from gui.managedwindow import ManagedWindow
+from gramps.gui.managedwindow import ManagedWindow
-from gen.const import URL_MANUAL_PAGE
+from gramps.gen.const import URL_MANUAL_PAGE
-from gui.display import display_help
+from gramps.gui.display import display_help
-from gui.listmodel import ListModel, TOGGLE
+from gramps.gui.listmodel import ListModel, TOGGLE
 
 #-------------------------------------------------------------------------
 #

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 gramps.gui.widgets import MonitoredEntry, PrivacyButton, MonitoredDataType
-from gui.glade import Glade
+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):

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 gramps.gen.filters.rules._matchesfilterbase import MatchesFilterBase
-from gui.listmodel import ListModel
+from gramps.gui.listmodel import ListModel
-from gui.managedwindow import ManagedWindow
+from gramps.gui.managedwindow import ManagedWindow
-from gui.dialog import QuestionDialog
+from gramps.gui.dialog import QuestionDialog
-from gen.const import RULE_GLADE, URL_MANUAL_PAGE
+from gramps.gen.const import RULE_GLADE, URL_MANUAL_PAGE
-from gui.display import display_help
+from gramps.gui.display import display_help
-from gen.errors import WindowActiveError
+from gramps.gen.errors import WindowActiveError
-from gen.ggettext import sgettext as _
+from gramps.gen.ggettext import sgettext as _
 from gramps.gen.lib import AttributeType, EventType, FamilyRelType, NameOriginType, NameType, NoteType
-from gen.filters import rules
+from gramps.gen.filters import rules
-from gui.autocomp import StandardCustomSelector, fill_entry
+from gramps.gui.autocomp import StandardCustomSelector, fill_entry
-from gui.selectors import SelectorFactory
+from gramps.gui.selectors import SelectorFactory
-from gen.display.name import displayer as _nd
+from gramps.gen.display.name import displayer as _nd
-from gen.utils.db import family_name
+from gramps.gen.utils.db import family_name
-from gen.utils.string import confidence
+from gramps.gen.utils.string import confidence
 
 #-------------------------------------------------------------------------
 #

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 gramps.gui.selectors import SelectorFactory
-from gui.ddtargets import DdTargets
+from gramps.gui.ddtargets import DdTargets
-from gen.errors import WindowActiveError
+from gramps.gen.errors import WindowActiveError
 
 #-------------------------------------------------------------------------
 #

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

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)
 

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

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")

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 gramps.gui.filters import build_filter_model
-from gui.filters.sidebar import SidebarFilter
+from gramps.gui.filters.sidebar import SidebarFilter
-from gen.filters import GenericFilterFactory, rules
+from gramps.gen.filters import GenericFilterFactory, rules
-from gen.filters.rules.citation import (RegExpIdOf, HasIdOf, HasCitation, 
+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')
 #-------------------------------------------------------------------------
 #

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 gramps.gui.filters import build_filter_model
-from gui.filters.sidebar import SidebarFilter
+from gramps.gui.filters.sidebar import SidebarFilter
-from gen.filters import GenericFilterFactory, rules
+from gramps.gen.filters import GenericFilterFactory, rules
-from gen.filters.rules.event import (RegExpIdOf, HasIdOf, HasNoteRegexp, 
+from gramps.gen.filters.rules.event import (RegExpIdOf, HasIdOf, HasNoteRegexp, 
                                      HasNoteMatchingSubstringOf, MatchesFilter, 
                                      HasEvent)
 

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 gramps.gui.filters import build_filter_model
-from gui.filters.sidebar import SidebarFilter
+from gramps.gui.filters.sidebar import SidebarFilter
-from gen.filters import GenericFilterFactory, rules
+from gramps.gen.filters import GenericFilterFactory, rules
-from gen.filters.rules.family import (RegExpIdOf, HasIdOf, RegExpFatherName, 
+from gramps.gen.filters.rules.family import (RegExpIdOf, HasIdOf, RegExpFatherName, 
                                       SearchFatherName, RegExpMotherName, 
                                       SearchMotherName, RegExpChildName, 
                                       SearchChildName, HasEvent, HasRelType, 

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 gramps.gui.filters import build_filter_model
-from gui.filters.sidebar import SidebarFilter
+from gramps.gui.filters.sidebar import SidebarFilter
-from gen.filters import GenericFilterFactory, rules
+from gramps.gen.filters import GenericFilterFactory, rules
-from gen.filters.rules.media import (RegExpIdOf, HasIdOf, HasMedia, HasTag, 
+from gramps.gen.filters.rules.media import (RegExpIdOf, HasIdOf, HasMedia, HasTag, 
                                      HasNoteRegexp, MatchesFilter, 
                                      HasNoteMatchingSubstringOf)
 

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 gramps.gen.lib import Note, NoteType
-from gui.filters import build_filter_model
+from gramps.gui.filters import build_filter_model
-from gui.filters.sidebar import SidebarFilter
+from gramps.gui.filters.sidebar import SidebarFilter
-from gen.filters import GenericFilterFactory, rules
+from gramps.gen.filters import GenericFilterFactory, rules
-from gen.filters.rules.note import (RegExpIdOf, HasIdOf, HasNote, 
+from gramps.gen.filters.rules.note import (RegExpIdOf, HasIdOf, HasNote, 
                                     MatchesFilter, HasTag)
 
 GenericNoteFilter = GenericFilterFactory('Note')

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 gramps.gui.filters import build_filter_model
-from gui.filters.sidebar import SidebarFilter
+from gramps.gui.filters.sidebar import SidebarFilter
-from gen.filters import GenericFilter, rules
+from gramps.gen.filters import GenericFilter, rules
-from gen.filters.rules.person import (RegExpName, SearchName, RegExpIdOf, 
+from gramps.gen.filters.rules.person import (RegExpName, SearchName, RegExpIdOf, 
                                       MatchIdOf, IsMale, IsFemale, 
                                       HasUnknownGender, HasEvent, HasTag, 
                                       HasBirth, HasDeath, HasNoteRegexp, 

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 gramps.gui.filters import build_filter_model
-from gui.filters.sidebar import SidebarFilter
+from gramps.gui.filters.sidebar import SidebarFilter
-from gen.filters import GenericFilterFactory, rules
+from gramps.gen.filters import GenericFilterFactory, rules
-from gen.filters.rules.place import (RegExpIdOf, HasIdOf, HasPlace, 
+from gramps.gen.filters.rules.place import (RegExpIdOf, HasIdOf, HasPlace, 
                                      HasNoteRegexp, HasNoteMatchingSubstringOf, 
                                      MatchesFilter)
 

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 gramps.gen.lib import Repository, RepositoryType
-from gui.filters import build_filter_model
+from gramps.gui.filters import build_filter_model
-from gui.filters.sidebar import SidebarFilter
+from gramps.gui.filters.sidebar import SidebarFilter
-from gen.filters import GenericFilterFactory, rules
+from gramps.gen.filters import GenericFilterFactory, rules
-from gen.filters.rules.repository import (RegExpIdOf, HasIdOf, HasRepo, 
+from gramps.gen.filters.rules.repository import (RegExpIdOf, HasIdOf, HasRepo, 
                                           HasNoteRegexp, MatchesFilter, 
                                           HasNoteMatchingSubstringOf)
 

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 gramps.gui.dbguielement import DbGUIElement
-from gen.config import config
+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 gramps.gui.editors import EditFilter
-        from gen.filters import FilterList, GenericFilterFactory
+        from gramps.gen.filters import FilterList, GenericFilterFactory
-        from gen.const import CUSTOM_FILTERS
+        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)

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 gramps.gui.filters import build_filter_model
-from gui.filters.sidebar import SidebarFilter
+from gramps.gui.filters.sidebar import SidebarFilter
-from gen.filters import GenericFilterFactory, rules
+from gramps.gen.filters import GenericFilterFactory, rules
-from gen.filters.rules.source import (RegExpIdOf, HasIdOf, HasSource, 
+from gramps.gen.filters.rules.source import (RegExpIdOf, HasIdOf, HasSource, 
                                       HasNoteMatchingSubstringOf, 
                                       HasNoteRegexp, MatchesFilter)
 

gramps/gui/glade.py

@@ -48,8 +48,8 @@ from gi.repository import Gtk
 # gramps modules
 #
 #------------------------------------------------------------------------
-from gen.const import GLADE_DIR
+from gramps.gen.const import GLADE_DIR
-from gen.utils.trans import LOCALEDOMAIN
+from gramps.gen.utils.trans import LOCALEDOMAIN
 
 #------------------------------------------------------------------------
 #

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 gramps.gen.const import URL_MANUAL_PAGE, VERSION_DIR
-from gui.managedwindow import ManagedWindow
+from gramps.gui.managedwindow import ManagedWindow
-from gui.display import display_help, display_url
+from gramps.gui.display import display_help, display_url
-from gui.widgets.grampletpane import (AVAILABLE_GRAMPLETS,
+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
 
 #-------------------------------------------------------------------------
 #

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 gramps.gen.config import config
-from gen.const import DATA_DIR, IMAGE_DIR
+from gramps.gen.const import DATA_DIR, IMAGE_DIR
-from gen.constfunc import has_display, win
+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 gramps.cli.arghandler import ArgHandler
-        from gui.tipofday import TipOfDay
+        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

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

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)

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 gramps.gen.const import VERSION, ICON, SPLASH
-from gui.display import display_help, display_url
+from gramps.gui.display import display_help, display_url
 
 #-------------------------------------------------------------------------
 #

gramps/gui/logger/_errorview.py

@@ -32,10 +32,10 @@ from gi.repository import Gtk
 # gramps modules
 #
 #-------------------------------------------------------------------------
-from gen.const import URL_MANUAL_PAGE
+from gramps.gen.const import URL_MANUAL_PAGE
-from gen.ggettext import sgettext as _
+from gramps.gen.ggettext import sgettext as _
 from _errorreportassistant import ErrorReportAssistant
-from gui.display import display_help
+from gramps.gui.display import display_help
 
 #-------------------------------------------------------------------------
 #

gramps/gui/makefilter.py

@@ -21,11 +21,11 @@
 # $Id$
 
 import time
-from gui.editors import EditFilter
+from gramps.gui.editors import EditFilter
-from gen.const import CUSTOM_FILTERS
+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):
     """

gramps/gui/managedwindow.py

@@ -46,10 +46,10 @@ from gi.repository import Gtk
 # Gramps modules
 #
 #-------------------------------------------------------------------------
-from gen.const import GLADE_FILE, ICON
+from gramps.gen.const import GLADE_FILE, ICON
-from gen.errors import WindowActiveError
+from gramps.gen.errors import WindowActiveError
-from gen.config import config
+from gramps.gen.config import config
-from gui.glade import Glade
+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

gramps/gui/merge/mergecitation.py

@@ -30,13 +30,13 @@ Provide merge capabilities for citations.
 # Gramps modules
 #
 #-------------------------------------------------------------------------
-from gen.ggettext import sgettext as _
+from gramps.gen.ggettext import sgettext as _
-from gen.const import URL_MANUAL_PAGE
+from gramps.gen.const import URL_MANUAL_PAGE
-from gui.display import display_help
+from gramps.gui.display import display_help
-from gui.managedwindow import ManagedWindow
+from gramps.gui.managedwindow import ManagedWindow
 from gramps.gen.datehandler import get_date
-from gen.utils.string import confidence
+from gramps.gen.utils.string import confidence
-from gen.merge import MergeCitationQuery
+from gramps.gen.merge import MergeCitationQuery
 
 #-------------------------------------------------------------------------
 #

gramps/gui/merge/mergeevent.py

@@ -29,13 +29,13 @@ Provide merge capabilities for events.
 # Gramps modules
 #
 #-------------------------------------------------------------------------
-from gen.ggettext import sgettext as _
+from gramps.gen.ggettext import sgettext as _
-from gen.const import URL_MANUAL_PAGE
+from gramps.gen.const import URL_MANUAL_PAGE
-from gui.display import display_help
+from gramps.gui.display import display_help
-from gui.managedwindow import ManagedWindow
+from gramps.gui.managedwindow import ManagedWindow
 from gramps.gen.datehandler import get_date
-from gen.utils.db import get_participant_from_event
+from gramps.gen.utils.db import get_participant_from_event
-from gen.merge import MergeEventQuery
+from gramps.gen.merge import MergeEventQuery
 
 #-------------------------------------------------------------------------
 #

gramps/gui/merge/mergefamily.py

@@ -29,14 +29,14 @@ Provide merge capabilities for families.
 # Gramps modules
 #
 #-------------------------------------------------------------------------
-from gen.ggettext import sgettext as _
+from gramps.gen.ggettext import sgettext as _
-from gen.display.name import displayer as name_displayer
+from gramps.gen.display.name import displayer as name_displayer
-from gen.const import URL_MANUAL_PAGE
+from gramps.gen.const import URL_MANUAL_PAGE
-from gui.display import display_help
+from gramps.gui.display import display_help
-from gen.errors import MergeError
+from gramps.gen.errors import MergeError
-from gui.dialog import ErrorDialog
+from gramps.gui.dialog import ErrorDialog
-from gui.managedwindow import ManagedWindow
+from gramps.gui.managedwindow import ManagedWindow
-from gen.merge import MergePersonQuery, MergeFamilyQuery
+from gramps.gen.merge import MergePersonQuery, MergeFamilyQuery
 
 #-------------------------------------------------------------------------
 #

gramps/gui/merge/mergemedia.py

@@ -29,12 +29,12 @@ Provide merge capabilities for media objects.
 # Gramps modules
 #
 #-------------------------------------------------------------------------
-from gen.ggettext import sgettext as _
+from gramps.gen.ggettext import sgettext as _
-from gen.const import URL_MANUAL_PAGE
+from gramps.gen.const import URL_MANUAL_PAGE
-from gui.display import display_help
+from gramps.gui.display import display_help
-from gui.managedwindow import ManagedWindow
+from gramps.gui.managedwindow import ManagedWindow
 from gramps.gen.datehandler import get_date
-from gen.merge import MergeMediaQuery
+from gramps.gen.merge import MergeMediaQuery
 
 #-------------------------------------------------------------------------
 #

gramps/gui/merge/mergenote.py

@@ -29,12 +29,12 @@ Provide merge capabilities for notes.
 # Gramps modules
 #
 #-------------------------------------------------------------------------
-from gen.ggettext import sgettext as _
+from gramps.gen.ggettext import sgettext as _
-from gen.const import URL_MANUAL_PAGE
+from gramps.gen.const import URL_MANUAL_PAGE
-from gui.display import display_help
+from gramps.gui.display import display_help
-from gui.managedwindow import ManagedWindow
+from gramps.gui.managedwindow import ManagedWindow
-from gui.widgets.styledtextbuffer import StyledTextBuffer
+from gramps.gui.widgets.styledtextbuffer import StyledTextBuffer
-from gen.merge import MergeNoteQuery
+from gramps.gen.merge import MergeNoteQuery
 
 #-------------------------------------------------------------------------
 #