GEPS008: Moved glade module

svn: r19765

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

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

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

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\

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:

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

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

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

src/gui/Makefile.am

@@ -27,6 +27,7 @@ pkgpython_PYTHON = \
 	dbloader.py \
 	dbman.py \
 	filtereditor.py \
+	glade.py \
 	grampsbar.py \
 	grampsgui.py \
 	makefilter.py \

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

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

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

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

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
 

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
 

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

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

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)

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,

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

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

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)

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 _
 

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

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,

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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
 

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
 

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)

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

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

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

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

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

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

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

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.

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

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

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

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)

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

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

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)

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
 

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

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
 
 #

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

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

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

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

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