diff --git a/src/NameDisplay.py b/src/BasicUtils/NameDisplay.py similarity index 97% rename from src/NameDisplay.py rename to src/BasicUtils/NameDisplay.py index 5c42a11fd..ee65eb7e2 100644 --- a/src/NameDisplay.py +++ b/src/BasicUtils/NameDisplay.py @@ -38,7 +38,13 @@ import re # #------------------------------------------------------------------------- from RelLib import Name -import Config + +try: + import Config + WITH_GRAMPS_CONFIG=True +except ImportError: + WITH_GRAMPS_CONFIG=False + #------------------------------------------------------------------------- # @@ -93,13 +99,17 @@ class NameDisplay: ] def __init__(self): + global WITH_GRAMP_CONFIG self.name_formats = {} self.set_name_format(self.STANDARD_FORMATS) - self.default_format = Config.get(Config.NAME_FORMAT) - if self.default_format == 0: - self.default_format = Name.LNFN - Config.set(Config.NAME_FORMAT,self.default_format) + if WITH_GRAMPS_CONFIG: + self.default_format = Config.get(Config.NAME_FORMAT) + if self.default_format == 0: + self.default_format = Name.LNFN + Config.set(Config.NAME_FORMAT,self.default_format) + else: + self.default_format = 1 self.set_default_format(self.default_format) diff --git a/src/Bookmarks.py b/src/Bookmarks.py index 18712dfb7..cd9adcf5f 100644 --- a/src/Bookmarks.py +++ b/src/Bookmarks.py @@ -54,7 +54,7 @@ import gtk # #------------------------------------------------------------------------- import GrampsDisplay -import NameDisplay +from BasicUtils import NameDisplay import ListModel import Utils diff --git a/src/DataViews/_PedigreeView.py b/src/DataViews/_PedigreeView.py index bbfb4a38e..29083f12b 100644 --- a/src/DataViews/_PedigreeView.py +++ b/src/DataViews/_PedigreeView.py @@ -51,7 +51,7 @@ except: #------------------------------------------------------------------------- import RelLib import PageView -import NameDisplay +from BasicUtils import NameDisplay import Utils import DateHandler import ImgManip @@ -949,7 +949,7 @@ class PedigreeView(PageView.PersonNavView): # Add navigation arrows if lst[0]: - #l = gtk.Button("◀") + #l = gtk.Button("‚óÄ") l=gtk.Button() l.add(gtk.Arrow(gtk.ARROW_LEFT, gtk.SHADOW_IN)) childlist = find_children(self.dbstate.db,lst[0][0]) @@ -960,7 +960,7 @@ class PedigreeView(PageView.PersonNavView): l.set_sensitive(False) ymid = int(math.floor(ymax/2)) table_widget.attach(l,0,1,ymid,ymid+1,0,0,0,0) - #l = gtk.Button("▶") + #l = gtk.Button("‚ñ∂") l = gtk.Button() l.add(gtk.Arrow(gtk.ARROW_RIGHT, gtk.SHADOW_IN)) if lst[1]: diff --git a/src/DataViews/_PersonView.py b/src/DataViews/_PersonView.py index c19dcc646..12a57ecb2 100644 --- a/src/DataViews/_PersonView.py +++ b/src/DataViews/_PersonView.py @@ -53,7 +53,7 @@ from gtk.gdk import ACTION_COPY, BUTTON1_MASK import RelLib from DisplayModels import PeopleModel import PageView -import NameDisplay +from BasicUtils import NameDisplay import Utils import QuestionDialog import TreeTips diff --git a/src/DataViews/_RelationView.py b/src/DataViews/_RelationView.py index ebd7552d1..2e7c0c865 100644 --- a/src/DataViews/_RelationView.py +++ b/src/DataViews/_RelationView.py @@ -48,7 +48,7 @@ import gtk #------------------------------------------------------------------------- import RelLib import PageView -import NameDisplay +from BasicUtils import NameDisplay import DateHandler import ImgManip import Config diff --git a/src/DisplayModels/_FamilyModel.py b/src/DisplayModels/_FamilyModel.py index 043db32fc..164488f81 100644 --- a/src/DisplayModels/_FamilyModel.py +++ b/src/DisplayModels/_FamilyModel.py @@ -43,7 +43,7 @@ import gtk import const import ToolTips import GrampsLocale -import NameDisplay +from BasicUtils import NameDisplay import RelLib from _BaseModel import BaseModel diff --git a/src/DisplayModels/_PeopleModel.py b/src/DisplayModels/_PeopleModel.py index f180ef55f..bf2d2cc95 100644 --- a/src/DisplayModels/_PeopleModel.py +++ b/src/DisplayModels/_PeopleModel.py @@ -60,7 +60,7 @@ import gtk #------------------------------------------------------------------------- import const from RelLib import * -import NameDisplay +from BasicUtils import NameDisplay import DateHandler import ToolTips import GrampsLocale diff --git a/src/DisplayState.py b/src/DisplayState.py index 576667f04..db27cf6c1 100644 --- a/src/DisplayState.py +++ b/src/DisplayState.py @@ -51,7 +51,7 @@ import gtk #------------------------------------------------------------------------- import GrampsDb import Config -import NameDisplay +from BasicUtils import NameDisplay import const import ManagedWindow diff --git a/src/DisplayTabs/_BackRefModel.py b/src/DisplayTabs/_BackRefModel.py index 9aed86bc4..6088ade58 100644 --- a/src/DisplayTabs/_BackRefModel.py +++ b/src/DisplayTabs/_BackRefModel.py @@ -35,7 +35,7 @@ from gettext import gettext as _ # GRAMPS classes # #------------------------------------------------------------------------- -import NameDisplay +from BasicUtils import NameDisplay import Utils #------------------------------------------------------------------------- diff --git a/src/DisplayTabs/_ChildModel.py b/src/DisplayTabs/_ChildModel.py index e46d5cd43..307a80e7c 100644 --- a/src/DisplayTabs/_ChildModel.py +++ b/src/DisplayTabs/_ChildModel.py @@ -33,7 +33,7 @@ import gtk # #------------------------------------------------------------------------- import DateHandler -import NameDisplay +from BasicUtils import NameDisplay import Utils #------------------------------------------------------------------------- diff --git a/src/DisplayTabs/_NameModel.py b/src/DisplayTabs/_NameModel.py index ce2256e41..066a5e535 100644 --- a/src/DisplayTabs/_NameModel.py +++ b/src/DisplayTabs/_NameModel.py @@ -32,7 +32,7 @@ import gtk # GRAMPS classes # #------------------------------------------------------------------------- -import NameDisplay +from BasicUtils import NameDisplay #------------------------------------------------------------------------- # diff --git a/src/DisplayTabs/_PersonRefModel.py b/src/DisplayTabs/_PersonRefModel.py index a127994d2..953fd770a 100644 --- a/src/DisplayTabs/_PersonRefModel.py +++ b/src/DisplayTabs/_PersonRefModel.py @@ -32,7 +32,7 @@ import gtk # GRAMPS classes # #------------------------------------------------------------------------- -import NameDisplay +from BasicUtils import NameDisplay #------------------------------------------------------------------------- # diff --git a/src/Editors/_EditFamily.py b/src/Editors/_EditFamily.py index cf5112bb7..a302b86e8 100644 --- a/src/Editors/_EditFamily.py +++ b/src/Editors/_EditFamily.py @@ -50,7 +50,7 @@ import gtk #------------------------------------------------------------------------- import const import Utils -import NameDisplay +from BasicUtils import NameDisplay import RelLib import Config import Errors diff --git a/src/Editors/_EditLdsOrd.py b/src/Editors/_EditLdsOrd.py index a2b24f3a7..0f019c88a 100644 --- a/src/Editors/_EditLdsOrd.py +++ b/src/Editors/_EditLdsOrd.py @@ -50,7 +50,7 @@ import gtk.glade import const import Config import RelLib -import NameDisplay +from BasicUtils import NameDisplay import LdsUtils from _EditSecondary import EditSecondary diff --git a/src/Editors/_EditName.py b/src/Editors/_EditName.py index 324ef06ed..47676d703 100644 --- a/src/Editors/_EditName.py +++ b/src/Editors/_EditName.py @@ -42,7 +42,7 @@ import gtk.glade import const import Config import Utils -import NameDisplay +from BasicUtils import NameDisplay from _EditSecondary import EditSecondary from DisplayTabs import SourceEmbedList,NoteTab diff --git a/src/Editors/_EditPerson.py b/src/Editors/_EditPerson.py index e9fd7750e..c7234abf7 100644 --- a/src/Editors/_EditPerson.py +++ b/src/Editors/_EditPerson.py @@ -53,7 +53,7 @@ import Utils import Mime import RelLib import GrampsWidgets -import NameDisplay +from BasicUtils import NameDisplay import Errors from GrampsDb import set_birth_death_index diff --git a/src/Editors/_EditPersonRef.py b/src/Editors/_EditPersonRef.py index cd0fb8a8a..3eef81591 100644 --- a/src/Editors/_EditPersonRef.py +++ b/src/Editors/_EditPersonRef.py @@ -46,7 +46,7 @@ import gtk.glade #------------------------------------------------------------------------- import const import Config -import NameDisplay +from BasicUtils import NameDisplay from _EditSecondary import EditSecondary from DisplayTabs import SourceEmbedList, NoteTab diff --git a/src/Editors/_EditPrimary.py b/src/Editors/_EditPrimary.py index 32fc07a41..218d330fb 100644 --- a/src/Editors/_EditPrimary.py +++ b/src/Editors/_EditPrimary.py @@ -24,7 +24,7 @@ from gettext import gettext as _ import ManagedWindow import DateHandler -import NameDisplay +from BasicUtils import NameDisplay import Config import GrampsDisplay from QuestionDialog import SaveDialog diff --git a/src/FilterEditor/_EditRule.py b/src/FilterEditor/_EditRule.py index 9f943de24..89775bbcb 100644 --- a/src/FilterEditor/_EditRule.py +++ b/src/FilterEditor/_EditRule.py @@ -60,7 +60,7 @@ import RelLib from Filters import Rules import AutoComp from Selectors import selector_factory -from NameDisplay import displayer as _nd +from BasicUtils.NameDisplay import displayer as _nd import Utils import ManagedWindow diff --git a/src/FilterEditor/_ShowResults.py b/src/FilterEditor/_ShowResults.py index 52bad6010..d6b7573c6 100644 --- a/src/FilterEditor/_ShowResults.py +++ b/src/FilterEditor/_ShowResults.py @@ -56,7 +56,7 @@ import gtk #------------------------------------------------------------------------- import const import ManagedWindow -from NameDisplay import displayer as _nd +from BasicUtils.NameDisplay import displayer as _nd import Utils #------------------------------------------------------------------------- diff --git a/src/GrampsCfg.py b/src/GrampsCfg.py index 1c5bdbfe9..df8e739e3 100644 --- a/src/GrampsCfg.py +++ b/src/GrampsCfg.py @@ -41,7 +41,7 @@ import gtk #------------------------------------------------------------------------- import Config import DateHandler -from NameDisplay import displayer as _nd +from BasicUtils.NameDisplay import displayer as _nd from RelLib import Name import ManagedWindow from GrampsWidgets import * diff --git a/src/GrampsDbUtils/_GedcomParse.py b/src/GrampsDbUtils/_GedcomParse.py index 3e52da31d..d82e72b32 100644 --- a/src/GrampsDbUtils/_GedcomParse.py +++ b/src/GrampsDbUtils/_GedcomParse.py @@ -113,7 +113,7 @@ LOG = logging.getLogger(".GedcomImport") #------------------------------------------------------------------------- import Errors import RelLib -import NameDisplay +from BasicUtils import NameDisplay import Utils import Mime import LdsUtils diff --git a/src/GrampsDbUtils/_ReadGrdb.py b/src/GrampsDbUtils/_ReadGrdb.py index 3213528b0..565d66790 100644 --- a/src/GrampsDbUtils/_ReadGrdb.py +++ b/src/GrampsDbUtils/_ReadGrdb.py @@ -41,7 +41,7 @@ from GrampsDb._GrampsBSDDB import GrampsBSDDB from QuestionDialog import ErrorDialog from Errors import HandleError from BasicUtils import UpdateCallback -import NameDisplay +from BasicUtils import NameDisplay #------------------------------------------------------------------------- # diff --git a/src/GrampsDbUtils/_ReadXML.py b/src/GrampsDbUtils/_ReadXML.py index cf7857ec7..134df4c8b 100644 --- a/src/GrampsDbUtils/_ReadXML.py +++ b/src/GrampsDbUtils/_ReadXML.py @@ -51,7 +51,7 @@ import RelLib import const import Utils import DateHandler -import NameDisplay +from BasicUtils import NameDisplay from GrampsDb._GrampsDbConst import \ PERSON_KEY,FAMILY_KEY,SOURCE_KEY,EVENT_KEY,\ MEDIA_KEY,PLACE_KEY,REPOSITORY_KEY diff --git a/src/GrampsDbUtils/_WriteGedcom.py b/src/GrampsDbUtils/_WriteGedcom.py index 1055a358f..e6cff7bfa 100644 --- a/src/GrampsDbUtils/_WriteGedcom.py +++ b/src/GrampsDbUtils/_WriteGedcom.py @@ -54,7 +54,7 @@ import _GedcomInfo as GedcomInfo import Errors import ansel_utf8 import Utils -import NameDisplay +from BasicUtils import NameDisplay from QuestionDialog import * from BasicUtils import UpdateCallback diff --git a/src/Merge/_MergePerson.py b/src/Merge/_MergePerson.py index 2edf33c5c..55a26c988 100644 --- a/src/Merge/_MergePerson.py +++ b/src/Merge/_MergePerson.py @@ -43,7 +43,7 @@ import pango #------------------------------------------------------------------------- import RelLib from ReportBase import ReportUtils -import NameDisplay +from BasicUtils import NameDisplay import const import DateHandler import QuestionDialog diff --git a/src/Navigation.py b/src/Navigation.py index 0dddb114c..c6a32fd7f 100644 --- a/src/Navigation.py +++ b/src/Navigation.py @@ -35,7 +35,7 @@ __revision__ = "$Revision$" # #------------------------------------------------------------------- import gtk -import NameDisplay +from BasicUtils import NameDisplay DISABLED = -1 diff --git a/src/ObjectSelector/_PersonFrame.py b/src/ObjectSelector/_PersonFrame.py index 898f7800b..70f6f46c3 100644 --- a/src/ObjectSelector/_PersonFrame.py +++ b/src/ObjectSelector/_PersonFrame.py @@ -28,7 +28,7 @@ import gtk import gobject from RelLib import Person -from NameDisplay import displayer +from BasicUtils.NameDisplay import displayer display_name = displayer.display from _ObjectFrameBase import ObjectFrameBase diff --git a/src/ObjectSelector/_PersonTreeFrame.py b/src/ObjectSelector/_PersonTreeFrame.py index 4c339a6b3..164182a5e 100644 --- a/src/ObjectSelector/_PersonTreeFrame.py +++ b/src/ObjectSelector/_PersonTreeFrame.py @@ -27,7 +27,7 @@ import gobject from TreeViews import PersonTreeView -import NameDisplay +from BasicUtils import NameDisplay from _TreeFrameBase import TreeFrameBase diff --git a/src/PageView.py b/src/PageView.py index f5eceb2dc..a52c38063 100644 --- a/src/PageView.py +++ b/src/PageView.py @@ -214,7 +214,7 @@ class BookMarkView(PageView): self.dbstate, self.uistate, bookmarks, self.goto_handle) def add_bookmark(self, obj): - import NameDisplay + from BasicUtils import NameDisplay if self.dbstate.active: self.bookmarks.add(self.dbstate.active.get_handle()) diff --git a/src/PluginUtils/_Tool.py b/src/PluginUtils/_Tool.py index f017459da..df6882ef1 100644 --- a/src/PluginUtils/_Tool.py +++ b/src/PluginUtils/_Tool.py @@ -43,7 +43,7 @@ log = logging.getLogger(".") import const import Utils from Filters import CustomFilters -import NameDisplay +from BasicUtils import NameDisplay import Errors from _Options import * diff --git a/src/Reorder.py b/src/Reorder.py index 860db9e7c..6670d6a28 100644 --- a/src/Reorder.py +++ b/src/Reorder.py @@ -25,7 +25,7 @@ from gettext import gettext as _ import const import gtk -import NameDisplay +from BasicUtils import NameDisplay import ListModel import ManagedWindow diff --git a/src/ReportBase/_BareReportDialog.py b/src/ReportBase/_BareReportDialog.py index 66a512a07..15989a7e7 100644 --- a/src/ReportBase/_BareReportDialog.py +++ b/src/ReportBase/_BareReportDialog.py @@ -40,7 +40,7 @@ import gtk # gramps modules # #------------------------------------------------------------------------- -import NameDisplay +from BasicUtils import NameDisplay import BaseDoc import Utils diff --git a/src/ReportBase/_CommandLineReport.py b/src/ReportBase/_CommandLineReport.py index bd8b3ea73..d7504cc62 100644 --- a/src/ReportBase/_CommandLineReport.py +++ b/src/ReportBase/_CommandLineReport.py @@ -24,7 +24,7 @@ import logging log = logging.getLogger(".") import PluginUtils -import NameDisplay +from BasicUtils import NameDisplay import Utils import BaseDoc from _Constants import CATEGORY_TEXT, CATEGORY_DRAW, CATEGORY_BOOK diff --git a/src/ReportBase/_ReportUtils.py b/src/ReportBase/_ReportUtils.py index 812c297e6..8d8e7ab4c 100644 --- a/src/ReportBase/_ReportUtils.py +++ b/src/ReportBase/_ReportUtils.py @@ -42,7 +42,7 @@ import cStringIO #------------------------------------------------------------------------ import DateHandler import RelLib -from NameDisplay import displayer as _nd +from BasicUtils.NameDisplay import displayer as _nd from QuestionDialog import WarningDialog import BaseDoc diff --git a/src/Sort.py b/src/Sort.py index 1a595d76f..8a4acba5b 100644 --- a/src/Sort.py +++ b/src/Sort.py @@ -40,7 +40,7 @@ import locale # #------------------------------------------------------------------------- from RelLib import Date -from NameDisplay import displayer as _nd +from BasicUtils.NameDisplay import displayer as _nd #------------------------------------------------------------------------- # diff --git a/src/SubstKeywords.py b/src/SubstKeywords.py index 03cf2eb85..75a62e1fd 100644 --- a/src/SubstKeywords.py +++ b/src/SubstKeywords.py @@ -41,7 +41,7 @@ __version__ = "$Revision$" # #------------------------------------------------------------------------ -import NameDisplay +from BasicUtils import NameDisplay import DateHandler import RelLib diff --git a/src/TreeViews/_PersonTreeView.py b/src/TreeViews/_PersonTreeView.py index 9c0f20764..9b46c438b 100644 --- a/src/TreeViews/_PersonTreeView.py +++ b/src/TreeViews/_PersonTreeView.py @@ -7,7 +7,7 @@ import gtk from Models import \ PersonTreeModel, PersonListModel, PersonFilterModel -from NameDisplay import displayer +from BasicUtils.NameDisplay import displayer from RelLib import Event import DateHandler import Utils diff --git a/src/Utils.py b/src/Utils.py index 118ababe8..5629e2294 100644 --- a/src/Utils.py +++ b/src/Utils.py @@ -46,7 +46,7 @@ import gtk # #------------------------------------------------------------------------- import Mime -import NameDisplay +from BasicUtils import NameDisplay import RelLib import Errors from QuestionDialog import WarningDialog diff --git a/src/ViewManager.py b/src/ViewManager.py index 3f2e04cbb..7c413dafa 100644 --- a/src/ViewManager.py +++ b/src/ViewManager.py @@ -73,7 +73,7 @@ import Navigation import TipOfDay import Bookmarks import RecentFiles -import NameDisplay +from BasicUtils import NameDisplay import GrampsWidgets import UndoHistory from DbLoader import DbLoader diff --git a/src/plugins/AncestorChart2.py b/src/plugins/AncestorChart2.py index b64809da2..2e75deeae 100644 --- a/src/plugins/AncestorChart2.py +++ b/src/plugins/AncestorChart2.py @@ -47,7 +47,7 @@ from SubstKeywords import SubstKeywords from PluginUtils import register_report from ReportBase import Report, ReportUtils, ReportOptions, \ CATEGORY_DRAW, MODE_GUI, MODE_BKI, MODE_CLI -import NameDisplay +from BasicUtils import NameDisplay pt2cm = ReportUtils.pt2cm cm2pt = ReportUtils.cm2pt diff --git a/src/plugins/AncestorReport.py b/src/plugins/AncestorReport.py index 2fcadc063..d1c8ef38e 100644 --- a/src/plugins/AncestorReport.py +++ b/src/plugins/AncestorReport.py @@ -40,7 +40,7 @@ from PluginUtils import register_report from ReportBase import Report, ReportUtils, ReportOptions, \ CATEGORY_TEXT, MODE_GUI, MODE_BKI, MODE_CLI import BaseDoc -import NameDisplay +from BasicUtils import NameDisplay from RelLib import ChildRefType diff --git a/src/plugins/Ancestors.py b/src/plugins/Ancestors.py index bf70ca378..f469a7e48 100644 --- a/src/plugins/Ancestors.py +++ b/src/plugins/Ancestors.py @@ -49,7 +49,7 @@ from ReportBase import Report, ReportUtils, ReportOptions, \ import BaseDoc import RelLib from DateHandler import displayer as _dd -from NameDisplay import displayer as _nd +from BasicUtils.NameDisplay import displayer as _nd #------------------------------------------------------------------------ # diff --git a/src/plugins/Check.py b/src/plugins/Check.py index 461accb66..fbcfbb627 100644 --- a/src/plugins/Check.py +++ b/src/plugins/Check.py @@ -61,7 +61,7 @@ import ManagedWindow from PluginUtils import Tool, register_tool from QuestionDialog import OkDialog, MissingMediaDialog -from NameDisplay import displayer as _nd +from BasicUtils.NameDisplay import displayer as _nd #------------------------------------------------------------------------- # diff --git a/src/plugins/DesGraph.py b/src/plugins/DesGraph.py index 6020d254b..01494e068 100644 --- a/src/plugins/DesGraph.py +++ b/src/plugins/DesGraph.py @@ -49,7 +49,7 @@ pt2cm = ReportUtils.pt2cm import BaseDoc from SubstKeywords import SubstKeywords import Errors -import NameDisplay +from BasicUtils import NameDisplay #------------------------------------------------------------------------ # diff --git a/src/plugins/Desbrowser.py b/src/plugins/Desbrowser.py index fafce663f..9db469224 100644 --- a/src/plugins/Desbrowser.py +++ b/src/plugins/Desbrowser.py @@ -43,7 +43,7 @@ import gtk.glade # GRAMPS modules # #------------------------------------------------------------------------ -import NameDisplay +from BasicUtils import NameDisplay from PluginUtils import Tool, register_tool import GrampsDisplay import ManagedWindow diff --git a/src/plugins/DescendChart.py b/src/plugins/DescendChart.py index 29b900024..ab82d7c31 100644 --- a/src/plugins/DescendChart.py +++ b/src/plugins/DescendChart.py @@ -49,7 +49,7 @@ from ReportBase import Report, ReportOptions, ReportUtils, \ pt2cm = ReportUtils.pt2cm cm2pt = ReportUtils.cm2pt from SubstKeywords import SubstKeywords -import NameDisplay +from BasicUtils import NameDisplay #------------------------------------------------------------------------ # diff --git a/src/plugins/DescendReport.py b/src/plugins/DescendReport.py index 5ad571a85..69758179d 100644 --- a/src/plugins/DescendReport.py +++ b/src/plugins/DescendReport.py @@ -42,7 +42,7 @@ import BaseDoc import Errors import Sort from QuestionDialog import ErrorDialog -import NameDisplay +from BasicUtils import NameDisplay import DateHandler #------------------------------------------------------------------------ diff --git a/src/plugins/DetAncestralReport.py b/src/plugins/DetAncestralReport.py index 234216821..fb37c9a37 100644 --- a/src/plugins/DetAncestralReport.py +++ b/src/plugins/DetAncestralReport.py @@ -52,7 +52,7 @@ import BaseDoc import Utils import DateHandler from QuestionDialog import ErrorDialog -from NameDisplay import displayer as _nd +from BasicUtils.NameDisplay import displayer as _nd #------------------------------------------------------------------------ # diff --git a/src/plugins/DetDescendantReport.py b/src/plugins/DetDescendantReport.py index d1c020fa0..5213ed2bc 100644 --- a/src/plugins/DetDescendantReport.py +++ b/src/plugins/DetDescendantReport.py @@ -52,7 +52,7 @@ from ReportBase import Report, ReportUtils, ReportOptions, \ import BaseDoc import const import DateHandler -from NameDisplay import displayer as _nd +from BasicUtils.NameDisplay import displayer as _nd from QuestionDialog import ErrorDialog #------------------------------------------------------------------------ diff --git a/src/plugins/FamilyGroup.py b/src/plugins/FamilyGroup.py index 636b08254..6ff2283fa 100644 --- a/src/plugins/FamilyGroup.py +++ b/src/plugins/FamilyGroup.py @@ -42,7 +42,7 @@ import BaseDoc import DateHandler import Utils from TransUtils import sgettext as _ -from NameDisplay import displayer as _nd +from BasicUtils.NameDisplay import displayer as _nd #------------------------------------------------------------------------ # diff --git a/src/plugins/FindDupes.py b/src/plugins/FindDupes.py index ed7b2ccb3..4bd83874d 100644 --- a/src/plugins/FindDupes.py +++ b/src/plugins/FindDupes.py @@ -46,7 +46,7 @@ import gtk.glade import RelLib import Utils import soundex -import NameDisplay +from BasicUtils import NameDisplay import ListModel import Errors from Merge import PersonCompare diff --git a/src/plugins/IndivComplete.py b/src/plugins/IndivComplete.py index 443de885a..368a6b817 100644 --- a/src/plugins/IndivComplete.py +++ b/src/plugins/IndivComplete.py @@ -49,7 +49,7 @@ import DateHandler from PluginUtils import register_report from ReportBase import Report, ReportUtils, ReportOptions, \ CATEGORY_TEXT, MODE_GUI, MODE_BKI, MODE_CLI -from NameDisplay import displayer as _nd +from BasicUtils.NameDisplay import displayer as _nd from QuestionDialog import WarningDialog #------------------------------------------------------------------------ diff --git a/src/plugins/NarrativeWeb.py b/src/plugins/NarrativeWeb.py index 6bbec984d..fe32157f3 100644 --- a/src/plugins/NarrativeWeb.py +++ b/src/plugins/NarrativeWeb.py @@ -75,7 +75,7 @@ import Utils import ImgManip import GrampsLocale from QuestionDialog import ErrorDialog, WarningDialog -from NameDisplay import displayer as _nd +from BasicUtils.NameDisplay import displayer as _nd from DateHandler import displayer as _dd #------------------------------------------------------------------------ diff --git a/src/plugins/RelCalc.py b/src/plugins/RelCalc.py index f56f6b7e4..619a9b9ca 100644 --- a/src/plugins/RelCalc.py +++ b/src/plugins/RelCalc.py @@ -43,7 +43,7 @@ import gtk.glade # #------------------------------------------------------------------------- import RelLib -import NameDisplay +from BasicUtils import NameDisplay import ManagedWindow import ListModel import DateHandler diff --git a/src/plugins/TimeLine.py b/src/plugins/TimeLine.py index b71e25b10..9559d7ebc 100644 --- a/src/plugins/TimeLine.py +++ b/src/plugins/TimeLine.py @@ -51,7 +51,7 @@ import BaseDoc from Filters import GenericFilter, Rules import Sort from QuestionDialog import ErrorDialog -import NameDisplay +from BasicUtils import NameDisplay #------------------------------------------------------------------------ #