diff --git a/po/POTFILES.skip b/po/POTFILES.skip index 6ee94f3ac..2ffd75040 100644 --- a/po/POTFILES.skip +++ b/po/POTFILES.skip @@ -7,7 +7,6 @@ src/AutoComp.py src/DdTargets.py src/Errors.py -src/glade.py src/GrampsDisplay.py src/ImgManip.py src/ListModel.py @@ -230,7 +229,8 @@ src/gen/utils/callman.py # gui - GUI code src/gui/__init__.py src/gui/dbguielement.py -src/managedwindow.py +src/gui/glade.py +src/gui/managedwindow.py src/gui/navigator.py src/gui/pluginmanager.py src/gui/user.py diff --git a/src/DateEdit.py b/src/DateEdit.py index d68bb01ab..64bf8392b 100644 --- a/src/DateEdit.py +++ b/src/DateEdit.py @@ -68,7 +68,7 @@ import const import GrampsDisplay from gui.managedwindow import ManagedWindow from Errors import ValidationError -from glade import Glade +from gui.glade import Glade #------------------------------------------------------------------------- # diff --git a/src/DisplayState.py b/src/DisplayState.py index fa644258e..64e3be486 100644 --- a/src/DisplayState.py +++ b/src/DisplayState.py @@ -60,7 +60,7 @@ import config from gen.display.name import displayer as name_displayer from gui.managedwindow import GrampsWindowManager import Relationship -from glade import Glade +from gui.glade import Glade from Utils import navigation_label DISABLED = -1 diff --git a/src/Makefile.am b/src/Makefile.am index 31ff49b53..4538179b5 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -13,7 +13,6 @@ SUBDIRS = \ gdirdir=$(prefix)/share/gramps gdir_PYTHON = \ - Assistant.py\ AutoComp.py\ Bookmarks.py\ config.py\ @@ -26,7 +25,6 @@ gdir_PYTHON = \ Errors.py\ ExportAssistant.py\ ExportOptions.py\ - glade.py\ GrampsDisplay.py\ gramps.py\ ImgManip.py\ diff --git a/src/QuestionDialog.py b/src/QuestionDialog.py index 9023d02b3..f5c243f9e 100644 --- a/src/QuestionDialog.py +++ b/src/QuestionDialog.py @@ -42,7 +42,7 @@ from gtk.gdk import pixbuf_new_from_file #------------------------------------------------------------------------- import const import config -from glade import Glade +from gui.glade import Glade from gen.ggettext import gettext as _ try: diff --git a/src/Reorder.py b/src/Reorder.py index 5571a18a2..3ac458ef6 100644 --- a/src/Reorder.py +++ b/src/Reorder.py @@ -35,7 +35,7 @@ from gen.db import DbTxn from gen.display.name import displayer as name_displayer import ListModel from gui.managedwindow import ManagedWindow -from glade import Glade +from gui.glade import Glade PARENT_TITLES = [(_('Father'), -1, 200), (_('Mother'), -1, 200), ('', -1, 0)] FAMILY_TITLES = [(_('Spouse'), -1, 200), (_('Relationship'), -1, 200), ('', -1, 0)] diff --git a/src/ScratchPad.py b/src/ScratchPad.py index 6978533a6..03717cdb2 100644 --- a/src/ScratchPad.py +++ b/src/ScratchPad.py @@ -53,7 +53,7 @@ from gui.managedwindow import ManagedWindow from gen.ggettext import sgettext as _ from TransUtils import trans_objclass from constfunc import mac -from glade import Glade +from gui.glade import Glade from DdTargets import DdTargets from gui.makefilter import make_filter import gui.utils diff --git a/src/TipOfDay.py b/src/TipOfDay.py index d8f871740..285d7bf1b 100644 --- a/src/TipOfDay.py +++ b/src/TipOfDay.py @@ -49,7 +49,7 @@ import const import config from gui.managedwindow import ManagedWindow from QuestionDialog import ErrorDialog -from glade import Glade +from gui.glade import Glade #------------------------------------------------------------------------- # diff --git a/src/gui/Makefile.am b/src/gui/Makefile.am index 3ce92a370..002d3a780 100644 --- a/src/gui/Makefile.am +++ b/src/gui/Makefile.am @@ -27,6 +27,7 @@ pkgpython_PYTHON = \ dbloader.py \ dbman.py \ filtereditor.py \ + glade.py \ grampsbar.py \ grampsgui.py \ makefilter.py \ diff --git a/src/gui/columnorder.py b/src/gui/columnorder.py index e9d66628a..93cb513a0 100644 --- a/src/gui/columnorder.py +++ b/src/gui/columnorder.py @@ -50,7 +50,7 @@ import gobject #------------------------------------------------------------------------- import const from gui.managedwindow import ManagedWindow -from glade import Glade +from gui.glade import Glade #------------------------------------------------------------------------- diff --git a/src/gui/configure.py b/src/gui/configure.py index d7dc0f8a6..7890aef35 100644 --- a/src/gui/configure.py +++ b/src/gui/configure.py @@ -57,7 +57,7 @@ from gen.lib import Name, Surname, NameOriginType from gui.managedwindow import ManagedWindow from gui.widgets import MarkupLabel, BasicLabel from QuestionDialog import ErrorDialog, QuestionDialog2, OkDialog -from glade import Glade +from gui.glade import Glade #------------------------------------------------------------------------- # diff --git a/src/gui/dbman.py b/src/gui/dbman.py index 5a9dc0a21..991fe00c1 100644 --- a/src/gui/dbman.py +++ b/src/gui/dbman.py @@ -76,7 +76,7 @@ from gui.pluginmanager import GuiPluginManager from cli.clidbman import CLIDbManager, NAME_FILE, time_val from DdTargets import DdTargets import RecentFiles -from glade import Glade +from gui.glade import Glade from gen.db.backup import restore from gen.db.exceptions import DbException from Utils import get_unicode_path_from_env_var diff --git a/src/gui/editors/addmedia.py b/src/gui/editors/addmedia.py index 61a1efe02..f278a59b1 100644 --- a/src/gui/editors/addmedia.py +++ b/src/gui/editors/addmedia.py @@ -58,7 +58,7 @@ import ThumbNails import GrampsDisplay from gui.managedwindow import ManagedWindow from QuestionDialog import ErrorDialog, WarningDialog -from glade import Glade +from gui.glade import Glade #------------------------------------------------------------------------- # diff --git a/src/gui/editors/editaddress.py b/src/gui/editors/editaddress.py index 64f363c46..6b38d0334 100644 --- a/src/gui/editors/editaddress.py +++ b/src/gui/editors/editaddress.py @@ -49,7 +49,7 @@ import gtk #------------------------------------------------------------------------- from editsecondary import EditSecondary from gen.lib import NoteType -from glade import Glade +from gui.glade import Glade from displaytabs import CitationEmbedList, NoteTab from gui.widgets import MonitoredDate, MonitoredEntry, PrivacyButton diff --git a/src/gui/editors/editattribute.py b/src/gui/editors/editattribute.py index 41f68e828..0742a758c 100644 --- a/src/gui/editors/editattribute.py +++ b/src/gui/editors/editattribute.py @@ -48,7 +48,7 @@ import gtk #------------------------------------------------------------------------- from editsecondary import EditSecondary from gen.lib import NoteType -from glade import Glade +from gui.glade import Glade from displaytabs import CitationEmbedList, NoteTab from gui.widgets import MonitoredEntry, PrivacyButton, MonitoredDataType diff --git a/src/gui/editors/editchildref.py b/src/gui/editors/editchildref.py index 4f676c27a..9c533fcef 100644 --- a/src/gui/editors/editchildref.py +++ b/src/gui/editors/editchildref.py @@ -49,7 +49,7 @@ import gtk from editsecondary import EditSecondary from gen.lib import NoteType import Errors -from glade import Glade +from gui.glade import Glade from displaytabs import CitationEmbedList, NoteTab from gui.widgets import MonitoredDataType, PrivacyButton from gen.display.name import displayer as name_displayer diff --git a/src/gui/editors/editcitation.py b/src/gui/editors/editcitation.py index df557d4f5..b23524c27 100644 --- a/src/gui/editors/editcitation.py +++ b/src/gui/editors/editcitation.py @@ -50,7 +50,7 @@ from gui.widgets import (MonitoredEntry, PrivacyButton, MonitoredMenu, MonitoredDate) from QuestionDialog import ErrorDialog from editreference import RefTab -from glade import Glade +from gui.glade import Glade #------------------------------------------------------------------------- # diff --git a/src/gui/editors/editevent.py b/src/gui/editors/editevent.py index 4d6fe9a9e..f1fcba5eb 100644 --- a/src/gui/editors/editevent.py +++ b/src/gui/editors/editevent.py @@ -47,7 +47,7 @@ from gen.db import DbTxn import GrampsDisplay from editprimary import EditPrimary from objectentries import PlaceEntry -from glade import Glade +from gui.glade import Glade from QuestionDialog import ErrorDialog from displaytabs import (CitationEmbedList, NoteTab, GalleryTab, EventBackRefList, AttrEmbedList) diff --git a/src/gui/editors/editeventref.py b/src/gui/editors/editeventref.py index 6bf5c6bc6..218f44185 100644 --- a/src/gui/editors/editeventref.py +++ b/src/gui/editors/editeventref.py @@ -37,7 +37,7 @@ from gen.ggettext import gettext as _ #------------------------------------------------------------------------- import gen.lib from gen.db import DbTxn -from glade import Glade +from gui.glade import Glade from displaytabs import (CitationEmbedList, NoteTab, GalleryTab, EventBackRefList, AttrEmbedList) from gui.widgets import (PrivacyButton, MonitoredEntry, diff --git a/src/gui/editors/editfamily.py b/src/gui/editors/editfamily.py index 2550b8326..da53dc252 100644 --- a/src/gui/editors/editfamily.py +++ b/src/gui/editors/editfamily.py @@ -68,7 +68,7 @@ import gen.lib from gen.db import DbTxn import Errors import gen.datehandler -from glade import Glade +from gui.glade import Glade from editprimary import EditPrimary from editchildref import EditChildRef diff --git a/src/gui/editors/editldsord.py b/src/gui/editors/editldsord.py index 3b16921d1..d1a325cb3 100644 --- a/src/gui/editors/editldsord.py +++ b/src/gui/editors/editldsord.py @@ -48,7 +48,7 @@ import gtk import gen.lib from gen.display.name import displayer as name_displayer import LdsUtils -from glade import Glade +from gui.glade import Glade from editsecondary import EditSecondary from objectentries import PlaceEntry from displaytabs import CitationEmbedList,NoteTab diff --git a/src/gui/editors/editlink.py b/src/gui/editors/editlink.py index 038c4485d..1f0028f9a 100644 --- a/src/gui/editors/editlink.py +++ b/src/gui/editors/editlink.py @@ -36,7 +36,7 @@ import re from gen.ggettext import gettext as _ from gui.managedwindow import ManagedWindow import GrampsDisplay -from glade import Glade +from gui.glade import Glade from gen.simple import SimpleAccess WEB, EVENT, FAMILY, MEDIA, NOTE, PERSON, PLACE, REPOSITORY, SOURCE = range(9) diff --git a/src/gui/editors/editlocation.py b/src/gui/editors/editlocation.py index 7ced81f4c..8d867e162 100644 --- a/src/gui/editors/editlocation.py +++ b/src/gui/editors/editlocation.py @@ -28,7 +28,7 @@ # #------------------------------------------------------------------------- from editsecondary import EditSecondary -from glade import Glade +from gui.glade import Glade from gui.widgets import MonitoredEntry from gen.ggettext import gettext as _ diff --git a/src/gui/editors/editmedia.py b/src/gui/editors/editmedia.py index 830c86038..d89c1664f 100644 --- a/src/gui/editors/editmedia.py +++ b/src/gui/editors/editmedia.py @@ -55,7 +55,7 @@ from displaytabs import (CitationEmbedList, AttrEmbedList, NoteTab, MediaBackRefList) from addmedia import AddMediaObject from QuestionDialog import ErrorDialog -from glade import Glade +from gui.glade import Glade #------------------------------------------------------------------------- # diff --git a/src/gui/editors/editmediaref.py b/src/gui/editors/editmediaref.py index fabab1c12..7f841f088 100644 --- a/src/gui/editors/editmediaref.py +++ b/src/gui/editors/editmediaref.py @@ -50,7 +50,7 @@ import ThumbNails import Utils from gen.lib import NoteType from gen.db import DbTxn -from glade import Glade +from gui.glade import Glade from displaytabs import (CitationEmbedList, AttrEmbedList, MediaBackRefList, NoteTab) from gui.widgets import (MonitoredSpinButton, MonitoredEntry, PrivacyButton, diff --git a/src/gui/editors/editname.py b/src/gui/editors/editname.py index 6c1324348..6f0ab71e8 100644 --- a/src/gui/editors/editname.py +++ b/src/gui/editors/editname.py @@ -52,7 +52,7 @@ from gen.lib import NoteType from displaytabs import GrampsTab, CitationEmbedList, NoteTab, SurnameTab from gui.widgets import (MonitoredEntry, MonitoredMenu, MonitoredDate, MonitoredDataType, PrivacyButton) -from glade import Glade +from gui.glade import Glade from Errors import ValidationError #------------------------------------------------------------------------- diff --git a/src/gui/editors/editnote.py b/src/gui/editors/editnote.py index e5ea3a03e..307a1b059 100644 --- a/src/gui/editors/editnote.py +++ b/src/gui/editors/editnote.py @@ -56,7 +56,7 @@ from gui.widgets import (MonitoredDataType, MonitoredCheckbox, from gen.lib import Note from gen.db import DbTxn from QuestionDialog import ErrorDialog -from glade import Glade +from gui.glade import Glade #------------------------------------------------------------------------- # diff --git a/src/gui/editors/editperson.py b/src/gui/editors/editperson.py index 860a3fce9..e09569665 100644 --- a/src/gui/editors/editperson.py +++ b/src/gui/editors/editperson.py @@ -58,7 +58,7 @@ from gen.db import DbTxn from gui import widgets from gen.display.name import displayer as name_displayer import Errors -from glade import Glade +from gui.glade import Glade from editprimary import EditPrimary from editmediaref import EditMediaRef diff --git a/src/gui/editors/editpersonref.py b/src/gui/editors/editpersonref.py index 3c3bd03ba..4cba87dd5 100644 --- a/src/gui/editors/editpersonref.py +++ b/src/gui/editors/editpersonref.py @@ -52,7 +52,7 @@ from gen.lib import NoteType from gui.widgets import MonitoredEntry, PrivacyButton from gui.selectors import SelectorFactory from displaytabs import CitationEmbedList, NoteTab -from glade import Glade +from gui.glade import Glade #------------------------------------------------------------------------- # diff --git a/src/gui/editors/editplace.py b/src/gui/editors/editplace.py index b004173af..0cc0f0eae 100644 --- a/src/gui/editors/editplace.py +++ b/src/gui/editors/editplace.py @@ -53,7 +53,7 @@ from gui.widgets import MonitoredEntry, PrivacyButton from Errors import ValidationError from PlaceUtils import conv_lat_lon from QuestionDialog import ErrorDialog -from glade import Glade +from gui.glade import Glade #------------------------------------------------------------------------- # diff --git a/src/gui/editors/editreporef.py b/src/gui/editors/editreporef.py index 686d4d6ee..f3624e0e5 100644 --- a/src/gui/editors/editreporef.py +++ b/src/gui/editors/editreporef.py @@ -39,7 +39,7 @@ from gen.db import DbTxn from displaytabs import NoteTab,AddrEmbedList,WebEmbedList,SourceBackRefList from gui.widgets import MonitoredEntry, PrivacyButton, MonitoredDataType from editreference import RefTab, EditReference -from glade import Glade +from gui.glade import Glade #------------------------------------------------------------------------- # diff --git a/src/gui/editors/editrepository.py b/src/gui/editors/editrepository.py index 3ff0138b5..b1f03d25e 100644 --- a/src/gui/editors/editrepository.py +++ b/src/gui/editors/editrepository.py @@ -47,7 +47,7 @@ from gui.widgets import MonitoredEntry, MonitoredDataType, PrivacyButton from displaytabs import AddrEmbedList, WebEmbedList, NoteTab, SourceBackRefList from editprimary import EditPrimary from QuestionDialog import ErrorDialog -from glade import Glade +from gui.glade import Glade class EditRepository(EditPrimary): diff --git a/src/gui/editors/editsource.py b/src/gui/editors/editsource.py index acc894812..2840e63f7 100644 --- a/src/gui/editors/editsource.py +++ b/src/gui/editors/editsource.py @@ -52,7 +52,7 @@ from displaytabs import (NoteTab, GalleryTab, DataEmbedList, CitationBackRefList, RepoEmbedList) from gui.widgets import MonitoredEntry, PrivacyButton from QuestionDialog import ErrorDialog -from glade import Glade +from gui.glade import Glade #------------------------------------------------------------------------- # diff --git a/src/gui/editors/editurl.py b/src/gui/editors/editurl.py index 5c6a97448..9217e318c 100644 --- a/src/gui/editors/editurl.py +++ b/src/gui/editors/editurl.py @@ -35,7 +35,7 @@ from gen.ggettext import gettext as _ #------------------------------------------------------------------------- from editsecondary import EditSecondary from gui.widgets import MonitoredEntry, PrivacyButton, MonitoredDataType -from glade import Glade +from gui.glade import Glade #------------------------------------------------------------------------- # diff --git a/src/glade.py b/src/gui/glade.py similarity index 100% rename from src/glade.py rename to src/gui/glade.py diff --git a/src/gui/managedwindow.py b/src/gui/managedwindow.py index 15cd41573..02994bc63 100644 --- a/src/gui/managedwindow.py +++ b/src/gui/managedwindow.py @@ -49,7 +49,7 @@ import gtk import const import Errors import config -from glade import Glade +from gui.glade import Glade #------------------------------------------------------------------------- # diff --git a/src/gui/plug/report/_papermenu.py b/src/gui/plug/report/_papermenu.py index 85cc50a2b..26b15995c 100644 --- a/src/gui/plug/report/_papermenu.py +++ b/src/gui/plug/report/_papermenu.py @@ -43,7 +43,7 @@ import gobject #------------------------------------------------------------------------- from gen.plug.docgen import PaperStyle, PAPER_PORTRAIT, PAPER_LANDSCAPE from gen.plug.report._paper import paper_sizes -from glade import Glade +from gui.glade import Glade #------------------------------------------------------------------------- # diff --git a/src/gui/plug/report/_styleeditor.py b/src/gui/plug/report/_styleeditor.py index 50c8f7a74..e366ffbf9 100644 --- a/src/gui/plug/report/_styleeditor.py +++ b/src/gui/plug/report/_styleeditor.py @@ -56,7 +56,7 @@ from gen.plug.docgen import (StyleSheet, FONT_SERIF, FONT_SANS_SERIF, PARA_ALIGN_JUSTIFY) import ListModel from gui.managedwindow import ManagedWindow -from glade import Glade +from gui.glade import Glade #------------------------------------------------------------------------ # diff --git a/src/gui/selectors/baseselector.py b/src/gui/selectors/baseselector.py index 3af1d1d18..b7aedc084 100644 --- a/src/gui/selectors/baseselector.py +++ b/src/gui/selectors/baseselector.py @@ -36,7 +36,7 @@ import pango #------------------------------------------------------------------------- from gui.managedwindow import ManagedWindow from gui.filters import SearchBar -from glade import Glade +from gui.glade import Glade #------------------------------------------------------------------------- # diff --git a/src/gui/viewmanager.py b/src/gui/viewmanager.py index c6ed7fe05..5aa239a6d 100644 --- a/src/gui/viewmanager.py +++ b/src/gui/viewmanager.py @@ -442,7 +442,7 @@ class ViewManager(CLIManager): self.window) def update_addons(self, addon_update_list): - from glade import Glade + from gui.glade import Glade from gui.managedwindow import ManagedWindow from ListModel import ListModel, NOSORT, TOGGLE glade = Glade("updateaddons.glade") diff --git a/src/gui/widgets/grampletpane.py b/src/gui/widgets/grampletpane.py index 35ff50fb2..e9237a4ce 100644 --- a/src/gui/widgets/grampletpane.py +++ b/src/gui/widgets/grampletpane.py @@ -49,7 +49,7 @@ import ConfigParser import gui.utils from gui.plug.quick import run_quick_report_by_name import GrampsDisplay -from glade import Glade +from gui.glade import Glade from gui.pluginmanager import GuiPluginManager from gui.widgets.undoablebuffer import UndoableBuffer diff --git a/src/plugins/BookReport.py b/src/plugins/BookReport.py index 51298b1b4..7f00433a8 100644 --- a/src/plugins/BookReport.py +++ b/src/plugins/BookReport.py @@ -76,7 +76,7 @@ from gen.plug.docgen import StyleSheet, StyleSheetList, PaperStyle from QuestionDialog import WarningDialog, ErrorDialog from gen.plug.menu import PersonOption, FilterOption, FamilyOption from gui.managedwindow import ManagedWindow -from glade import Glade +from gui.glade import Glade import gui.utils import gui.user diff --git a/src/plugins/docgen/GtkPrint.py b/src/plugins/docgen/GtkPrint.py index e6022bfea..6e789a720 100644 --- a/src/plugins/docgen/GtkPrint.py +++ b/src/plugins/docgen/GtkPrint.py @@ -204,7 +204,7 @@ class PrintPreview(object): def __build_window(self): """Build the window from Glade. """ - from glade import Glade + from gui.glade import Glade glade_xml = Glade() self._window = glade_xml.toplevel #self._window.set_transient_for(parent) diff --git a/src/plugins/export/ExportCsv.py b/src/plugins/export/ExportCsv.py index de59c60b5..6fd2ae2d3 100644 --- a/src/plugins/export/ExportCsv.py +++ b/src/plugins/export/ExportCsv.py @@ -54,7 +54,7 @@ from gen.lib.eventroletype import EventRoleType from ExportOptions import WriterOptionBox import Utils import gen.datehandler -from glade import Glade +from gui.glade import Glade #------------------------------------------------------------------------- # diff --git a/src/plugins/export/ExportFtree.py b/src/plugins/export/ExportFtree.py index 73100d7bb..508476bd0 100644 --- a/src/plugins/export/ExportFtree.py +++ b/src/plugins/export/ExportFtree.py @@ -48,7 +48,7 @@ log = logging.getLogger(".WriteFtree") import Utils from ExportOptions import WriterOptionBox import Errors -from glade import Glade +from gui.glade import Glade #------------------------------------------------------------------------- # diff --git a/src/plugins/export/ExportGeneWeb.py b/src/plugins/export/ExportGeneWeb.py index 20d567ce8..4138170cb 100644 --- a/src/plugins/export/ExportGeneWeb.py +++ b/src/plugins/export/ExportGeneWeb.py @@ -50,7 +50,7 @@ import gen.lib from ExportOptions import WriterOptionBox #import const import Utils -from glade import Glade +from gui.glade import Glade import config class GeneWebWriter(object): diff --git a/src/plugins/export/ExportVCalendar.py b/src/plugins/export/ExportVCalendar.py index 1cc654ba0..fcdc45578 100644 --- a/src/plugins/export/ExportVCalendar.py +++ b/src/plugins/export/ExportVCalendar.py @@ -51,7 +51,7 @@ from ExportOptions import WriterOptionBox import Utils from gen.lib import Date, EventType import Errors -from glade import Glade +from gui.glade import Glade class CalendarWriter(object): def __init__(self, database, filename, user, option_box=None): diff --git a/src/plugins/import/ImportGedcom.py b/src/plugins/import/ImportGedcom.py index 37c90b9fd..fd9ad3f96 100644 --- a/src/plugins/import/ImportGedcom.py +++ b/src/plugins/import/ImportGedcom.py @@ -44,7 +44,7 @@ LOG = logging.getLogger(".GedcomImport") # #------------------------------------------------------------------------ import Errors -from glade import Glade +from gui.glade import Glade from libmixin import DbMixin import libgedcom module = __import__("libgedcom") diff --git a/src/plugins/tool/ChangeNames.py b/src/plugins/tool/ChangeNames.py index d319f80bd..3c4ba73f2 100644 --- a/src/plugins/tool/ChangeNames.py +++ b/src/plugins/tool/ChangeNames.py @@ -46,7 +46,7 @@ from gui.managedwindow import ManagedWindow from QuestionDialog import OkDialog from gui.plug import tool from gen.ggettext import sgettext as _ -from glade import Glade +from gui.glade import Glade #------------------------------------------------------------------------- # diff --git a/src/plugins/tool/ChangeTypes.py b/src/plugins/tool/ChangeTypes.py index 65308242c..1f696988d 100644 --- a/src/plugins/tool/ChangeTypes.py +++ b/src/plugins/tool/ChangeTypes.py @@ -45,7 +45,7 @@ from gen.lib import EventType from gen.db import DbTxn from QuestionDialog import OkDialog from gui.plug import tool -from glade import Glade +from gui.glade import Glade #------------------------------------------------------------------------- # diff --git a/src/plugins/tool/Check.py b/src/plugins/tool/Check.py index 5feab4cc2..75adf74ce 100644 --- a/src/plugins/tool/Check.py +++ b/src/plugins/tool/Check.py @@ -72,7 +72,7 @@ from gui.managedwindow import ManagedWindow from gui.plug import tool from QuestionDialog import OkDialog, MissingMediaDialog from gen.display.name import displayer as _nd -from glade import Glade +from gui.glade import Glade # table for handling control chars in notes. # All except 09, 0A, 0D are replaced with space. diff --git a/src/plugins/tool/Desbrowser.py b/src/plugins/tool/Desbrowser.py index 1a61d3dee..f71d703b8 100644 --- a/src/plugins/tool/Desbrowser.py +++ b/src/plugins/tool/Desbrowser.py @@ -42,7 +42,7 @@ from gui.plug import tool import GrampsDisplay from gui.managedwindow import ManagedWindow from gen.ggettext import sgettext as _ -from glade import Glade +from gui.glade import Glade from gui.editors import EditPerson #------------------------------------------------------------------------ diff --git a/src/plugins/tool/Eval.py b/src/plugins/tool/Eval.py index 8401b56db..ae06012d5 100644 --- a/src/plugins/tool/Eval.py +++ b/src/plugins/tool/Eval.py @@ -42,7 +42,7 @@ import traceback #------------------------------------------------------------------------ from gui.plug import tool from gui.managedwindow import ManagedWindow -from glade import Glade +from gui.glade import Glade #------------------------------------------------------------------------- # diff --git a/src/plugins/tool/EventCmp.py b/src/plugins/tool/EventCmp.py index a5c03d1ba..75f54676d 100644 --- a/src/plugins/tool/EventCmp.py +++ b/src/plugins/tool/EventCmp.py @@ -59,7 +59,7 @@ from gen.plug.report import utils as ReportUtils import GrampsDisplay from gui.managedwindow import ManagedWindow from gen.ggettext import sgettext as _ -from glade import Glade +from gui.glade import Glade from gui.filtereditor import FilterEditor #------------------------------------------------------------------------- diff --git a/src/plugins/tool/ExtractCity.py b/src/plugins/tool/ExtractCity.py index 88ac6dfc2..4edf52f39 100644 --- a/src/plugins/tool/ExtractCity.py +++ b/src/plugins/tool/ExtractCity.py @@ -52,7 +52,7 @@ import GrampsDisplay from gui.plug import tool from gui.utils import ProgressMeter -from glade import Glade +from gui.glade import Glade CITY_STATE_ZIP = re.compile("((\w|\s)+)\s*,\s*((\w|\s)+)\s*(,\s*((\d|-)+))", re.UNICODE) CITY_STATE = re.compile("((?:\w|\s)+(?:-(?:\w|\s)+)*),((?:\w|\s)+)", re.UNICODE) diff --git a/src/plugins/tool/FindDupes.py b/src/plugins/tool/FindDupes.py index 1bd928810..eba6ee07f 100644 --- a/src/plugins/tool/FindDupes.py +++ b/src/plugins/tool/FindDupes.py @@ -50,7 +50,7 @@ import GrampsDisplay from gui.managedwindow import ManagedWindow from QuestionDialog import RunDatabaseRepair from gen.ggettext import sgettext as _ -from glade import Glade +from gui.glade import Glade #------------------------------------------------------------------------- # diff --git a/src/plugins/tool/Leak.py b/src/plugins/tool/Leak.py index e882286d5..a25221d6f 100644 --- a/src/plugins/tool/Leak.py +++ b/src/plugins/tool/Leak.py @@ -55,7 +55,7 @@ import gc from gui.plug import tool from gui.managedwindow import ManagedWindow from QuestionDialog import InfoDialog -from glade import Glade +from gui.glade import Glade import gui.utils #------------------------------------------------------------------------- diff --git a/src/plugins/tool/MergeCitations.py b/src/plugins/tool/MergeCitations.py index 8a8964765..f905ef91c 100644 --- a/src/plugins/tool/MergeCitations.py +++ b/src/plugins/tool/MergeCitations.py @@ -55,7 +55,7 @@ import gen.datehandler from gui.managedwindow import ManagedWindow from gen.ggettext import sgettext as _ from gen.ggettext import ngettext -from glade import Glade +from gui.glade import Glade from gen.db import DbTxn from gen.lib import (Person, Family, Event, Place, MediaObject, Citation, Repository) diff --git a/src/plugins/tool/NotRelated.py b/src/plugins/tool/NotRelated.py index d904af081..50f504b7b 100644 --- a/src/plugins/tool/NotRelated.py +++ b/src/plugins/tool/NotRelated.py @@ -54,7 +54,7 @@ from gui.managedwindow import ManagedWindow from gui.utils import ProgressMeter import GrampsDisplay from gen.ggettext import sgettext as _ -from glade import Glade +from gui.glade import Glade from gen.lib import Tag from gen.db import DbTxn diff --git a/src/plugins/tool/OwnerEditor.py b/src/plugins/tool/OwnerEditor.py index 1d77fbfaf..453844d68 100644 --- a/src/plugins/tool/OwnerEditor.py +++ b/src/plugins/tool/OwnerEditor.py @@ -45,7 +45,7 @@ from gui.widgets import MonitoredEntry from gui.managedwindow import ManagedWindow from gui.plug import tool from gen.ggettext import sgettext as _ -from glade import Glade +from gui.glade import Glade import gui.utils #------------------------------------------------------------------------- diff --git a/src/plugins/tool/PHPGedViewConnector.py b/src/plugins/tool/PHPGedViewConnector.py index b5472fa25..1ae9447a0 100644 --- a/src/plugins/tool/PHPGedViewConnector.py +++ b/src/plugins/tool/PHPGedViewConnector.py @@ -29,7 +29,7 @@ import gtk import os from tempfile import mkstemp from gen.ggettext import gettext as _ -from glade import Glade +from gui.glade import Glade import libgedcom # diff --git a/src/plugins/tool/PatchNames.py b/src/plugins/tool/PatchNames.py index 8b0f5407e..94658f1f0 100644 --- a/src/plugins/tool/PatchNames.py +++ b/src/plugins/tool/PatchNames.py @@ -53,7 +53,7 @@ import GrampsDisplay import gen.lib from gen.db import DbTxn from gen.ggettext import sgettext as _ -from glade import Glade +from gui.glade import Glade #------------------------------------------------------------------------- # diff --git a/src/plugins/tool/RelCalc.py b/src/plugins/tool/RelCalc.py index 1d7f4aa0b..cd2bf5ae7 100644 --- a/src/plugins/tool/RelCalc.py +++ b/src/plugins/tool/RelCalc.py @@ -52,7 +52,7 @@ import Relationship from QuestionDialog import ErrorDialog from gui.plug import tool -from glade import Glade +from gui.glade import Glade #------------------------------------------------------------------------- # diff --git a/src/plugins/tool/RemoveUnused.py b/src/plugins/tool/RemoveUnused.py index 650c74ea8..f50744b72 100644 --- a/src/plugins/tool/RemoveUnused.py +++ b/src/plugins/tool/RemoveUnused.py @@ -60,7 +60,7 @@ from gui.managedwindow import ManagedWindow from gen.datehandler import displayer as _dd from gen.updatecallback import UpdateCallback from gui.plug import tool -from glade import Glade +from gui.glade import Glade #------------------------------------------------------------------------- # diff --git a/src/plugins/tool/SoundGen.py b/src/plugins/tool/SoundGen.py index edaf8bf20..8784dd3c7 100644 --- a/src/plugins/tool/SoundGen.py +++ b/src/plugins/tool/SoundGen.py @@ -36,7 +36,7 @@ from gui.managedwindow import ManagedWindow import AutoComp from gen.ggettext import sgettext as _ from gui.plug import tool -from glade import Glade +from gui.glade import Glade #------------------------------------------------------------------------- # diff --git a/src/plugins/tool/Verify.py b/src/plugins/tool/Verify.py index 7399e9f9e..ef8df3176 100644 --- a/src/plugins/tool/Verify.py +++ b/src/plugins/tool/Verify.py @@ -63,7 +63,7 @@ from ManagedWindow from gui.managedwindow import ManagedWindow from gen.updatecallback import UpdateCallback from gui.plug import tool from gen.ggettext import sgettext as _ -from glade import Glade +from gui.glade import Glade #------------------------------------------------------------------------- #