move src/widgets/* to src/gui/widgets as part of GEP008

svn: r13791

src/DisplayTabs/_BackRefList.py

@@ -41,7 +41,7 @@ import gtk
 #
 #-------------------------------------------------------------------------
 import Errors
-from widgets import SimpleButton
+from gui.widgets import SimpleButton
 from _EmbeddedList import EmbeddedList
 
 #-------------------------------------------------------------------------

src/DisplayTabs/_ButtonTab.py

@@ -40,7 +40,7 @@ import gtk
 # GRAMPS classes
 #
 #-------------------------------------------------------------------------
-from widgets import SimpleButton
+from gui.widgets import SimpleButton
 from _GrampsTab import GrampsTab
 import Errors
 

src/Editors/_EditAddress.py

@@ -51,7 +51,7 @@ from _EditSecondary import EditSecondary
 from gen.lib import NoteType
 from glade import Glade
 from DisplayTabs import SourceEmbedList, NoteTab
-from widgets import MonitoredDate, MonitoredEntry, PrivacyButton
+from gui.widgets import MonitoredDate, MonitoredEntry, PrivacyButton
 
 #-------------------------------------------------------------------------
 #

src/Editors/_EditAttribute.py

@@ -51,7 +51,7 @@ from _EditSecondary import EditSecondary
 from gen.lib import NoteType
 from glade import Glade
 from DisplayTabs import SourceEmbedList, NoteTab
-from widgets import MonitoredEntry, PrivacyButton, MonitoredDataType
+from gui.widgets import MonitoredEntry, PrivacyButton, MonitoredDataType
 
 #-------------------------------------------------------------------------
 #

src/Editors/_EditChildRef.py

@@ -52,7 +52,7 @@ import Errors
 import config
 from glade import Glade
 from DisplayTabs import SourceEmbedList, NoteTab
-from widgets import MonitoredDataType, PrivacyButton
+from gui.widgets import MonitoredDataType, PrivacyButton
 from BasicUtils import name_displayer
 
 #-------------------------------------------------------------------------

src/Editors/_EditEvent.py

@@ -50,7 +50,7 @@ from glade import Glade
 from QuestionDialog import ErrorDialog
 from DisplayTabs import (SourceEmbedList, NoteTab, GalleryTab, 
                          EventBackRefList, AttrEmbedList)
-from widgets import (MonitoredEntry, PrivacyButton, 
+from gui.widgets import (MonitoredEntry, PrivacyButton, 
                      MonitoredDataType, MonitoredDate)
 
 #-------------------------------------------------------------------------

src/Editors/_EditEventRef.py

@@ -39,7 +39,7 @@ import gen.lib
 from glade import Glade
 from DisplayTabs import (SourceEmbedList, NoteTab, GalleryTab, 
                          EventBackRefList, AttrEmbedList)
-from widgets import (PrivacyButton, MonitoredEntry,
+from gui.widgets import (PrivacyButton, MonitoredEntry,
                      MonitoredDate, MonitoredDataType)
 from _EditReference import RefTab, EditReference
 

src/Editors/_EditFamily.py

@@ -67,8 +67,7 @@ from ReportBase import ReportUtils
 from DisplayTabs import (EmbeddedList, EventEmbedList, SourceEmbedList, 
                          FamilyAttrEmbedList, NoteTab, GalleryTab, 
                          FamilyLdsEmbedList, ChildModel)
-from widgets import (PrivacyButton, MonitoredEntry, MonitoredDataType, 
-                     IconButton, LinkBox, BasicLabel)
+from gui.widgets import (PrivacyButton, MonitoredEntry, MonitoredDataType)
 from gen.plug import CATEGORY_QR_FAMILY
 from QuestionDialog import (ErrorDialog, RunDatabaseRepair, WarningDialog,
                             MessageHideDialog)

src/Editors/_EditLdsOrd.py

@@ -53,7 +53,7 @@ from glade import Glade
 from _EditSecondary import EditSecondary
 from ObjectEntries import PlaceEntry
 from DisplayTabs import SourceEmbedList,NoteTab
-from widgets import (PrivacyButton, MonitoredDate, 
+from gui.widgets import (PrivacyButton, MonitoredDate, 
                      MonitoredMenu, MonitoredStrMenu)
 
 _DATA_MAP = {

src/Editors/_EditLocation.py

@@ -30,7 +30,7 @@ import const
 import config
 from _EditSecondary import EditSecondary
 from glade import Glade
-from widgets import MonitoredEntry
+from gui.widgets import MonitoredEntry
 from gettext import gettext as _
 
 #-------------------------------------------------------------------------

src/Editors/_EditMedia.py

@@ -48,7 +48,7 @@ import Mime
 import ThumbNails
 import Utils
 from Editors import EditPrimary
-from widgets import MonitoredDate, MonitoredEntry, PrivacyButton
+from gui.widgets import MonitoredDate, MonitoredEntry, PrivacyButton
 from DisplayTabs import (SourceEmbedList, AttrEmbedList, NoteTab, 
                          MediaBackRefList)
 from Editors.AddMedia import AddMediaObject

src/Editors/_EditMediaRef.py

@@ -51,7 +51,7 @@ from gen.lib import NoteType
 from glade import Glade
 from DisplayTabs import (SourceEmbedList, AttrEmbedList, MediaBackRefList, 
                          NoteTab)
-from widgets import MonitoredSpinButton, MonitoredEntry, PrivacyButton
+from gui.widgets import MonitoredSpinButton, MonitoredEntry, PrivacyButton
 from _EditReference import RefTab, EditReference
 from AddMedia import AddMediaObject
 

src/Editors/_EditName.py

@@ -47,7 +47,7 @@ from BasicUtils import name_displayer
 from _EditSecondary import EditSecondary
 from gen.lib import NoteType
 from DisplayTabs import GrampsTab,SourceEmbedList,NoteTab
-from widgets import (MonitoredEntry, MonitoredMenu, MonitoredDate, 
+from gui.widgets import (MonitoredEntry, MonitoredMenu, MonitoredDate, 
                      MonitoredDataType, PrivacyButton)
 from glade import Glade                     
 

src/Editors/_EditNote.py

@@ -47,10 +47,10 @@ import pango
 #-------------------------------------------------------------------------
 import config
 import const
-from widgets import StyledTextEditor
+from gui.widgets import StyledTextEditor
 from Editors._EditPrimary import EditPrimary
 from DisplayTabs import GrampsTab, NoteBackRefList
-from widgets import (MonitoredDataType, MonitoredCheckbox, 
+from gui.widgets import (MonitoredDataType, MonitoredCheckbox, 
                      MonitoredEntry, PrivacyButton)
 from gen.lib import Note
 from QuestionDialog import ErrorDialog

src/Editors/_EditPerson.py

@@ -51,7 +51,7 @@ import Utils
 from gui.utils import add_menuitem, open_file_with_default_application
 import Mime
 import gen.lib
-import widgets
+from gui import widgets
 from BasicUtils import name_displayer
 import Errors
 from glade import Glade

src/Editors/_EditPersonRef.py

@@ -50,7 +50,7 @@ import config
 from BasicUtils import name_displayer
 from _EditSecondary import EditSecondary
 from gen.lib import NoteType
-from widgets import MonitoredEntry, PrivacyButton
+from gui.widgets import MonitoredEntry, PrivacyButton
 from DisplayTabs import SourceEmbedList, NoteTab
 from glade import Glade
 

src/Editors/_EditPlace.py

@@ -48,7 +48,7 @@ import gen.lib
 from Editors._EditPrimary import EditPrimary
 from DisplayTabs import (GrampsTab, LocationEmbedList, SourceEmbedList, 
                          GalleryTab, NoteTab, WebEmbedList, PlaceBackRefList)
-from widgets import MonitoredEntry, PrivacyButton
+from gui.widgets import MonitoredEntry, PrivacyButton
 from Errors import ValidationError
 from PlaceUtils import conv_lat_lon
 from QuestionDialog import ErrorDialog

src/Editors/_EditRepoRef.py

@@ -39,7 +39,7 @@ import config
 from gen.lib import NoteType
 
 from DisplayTabs import NoteTab,AddrEmbedList,WebEmbedList,SourceBackRefList
-from widgets import MonitoredEntry, PrivacyButton, MonitoredDataType
+from gui.widgets import MonitoredEntry, PrivacyButton, MonitoredDataType
 from _EditReference import RefTab, EditReference
 from glade import Glade
 

src/Editors/_EditRepository.py

@@ -44,7 +44,7 @@ import const
 import config
 import gen.lib
 
-from widgets import MonitoredEntry, MonitoredDataType, PrivacyButton
+from gui.widgets import MonitoredEntry, MonitoredDataType, PrivacyButton
 from DisplayTabs import AddrEmbedList, WebEmbedList, NoteTab, SourceBackRefList
 from Editors._EditPrimary import EditPrimary
 from QuestionDialog import ErrorDialog

src/Editors/_EditSource.py

@@ -49,7 +49,7 @@ from Editors._EditPrimary import EditPrimary
 
 from DisplayTabs import (NoteTab, GalleryTab, DataEmbedList,
                          SourceBackRefList, RepoEmbedList)
-from widgets import MonitoredEntry, PrivacyButton
+from gui.widgets import MonitoredEntry, PrivacyButton
 from QuestionDialog import ErrorDialog
 from glade import Glade
 

src/Editors/_EditSourceRef.py

@@ -39,7 +39,7 @@ import gen.lib
 from glade import Glade
 from DisplayTabs import (NoteTab, GalleryTab, SourceBackRefList, 
                          DataEmbedList, RepoEmbedList)
-from widgets import (PrivacyButton, MonitoredEntry, MonitoredMenu, 
+from gui.widgets import (PrivacyButton, MonitoredEntry, MonitoredMenu, 
                      MonitoredDate)
 from _EditReference import RefTab, EditReference
 

src/Editors/_EditUrl.py

@@ -36,7 +36,7 @@ from gettext import gettext as _
 import const
 import config
 from _EditSecondary import EditSecondary
-from widgets import MonitoredEntry, PrivacyButton, MonitoredDataType
+from gui.widgets import MonitoredEntry, PrivacyButton, MonitoredDataType
 from glade import Glade
 
 #-------------------------------------------------------------------------

src/Filters/SideBar/_EventSidebarFilter.py

@@ -39,7 +39,7 @@ import gtk
 # GRAMPS modules
 #
 #-------------------------------------------------------------------------
-import widgets
+from gui import widgets
 import gen.lib
 
 from Filters.SideBar import SidebarFilter

src/Filters/SideBar/_FamilySidebarFilter.py

@@ -39,7 +39,7 @@ import gtk
 # GRAMPS modules
 #
 #-------------------------------------------------------------------------
-import widgets
+from gui import widgets
 import gen.lib
 
 from Filters.SideBar import SidebarFilter

src/Filters/SideBar/_NoteSidebarFilter.py

@@ -39,7 +39,7 @@ import gtk
 # GRAMPS modules
 #
 #-------------------------------------------------------------------------
-import widgets
+from gui import widgets
 from gen.lib import Note, NoteType
 
 from Filters.SideBar import SidebarFilter

src/Filters/SideBar/_PersonSidebarFilter.py

@@ -39,7 +39,7 @@ import gtk
 # GRAMPS modules
 #
 #-------------------------------------------------------------------------
-import widgets
+from gui import widgets
 import gen.lib
 import DateHandler
 

src/Filters/SideBar/_RepoSidebarFilter.py

@@ -39,7 +39,7 @@ import gtk
 # GRAMPS modules
 #
 #-------------------------------------------------------------------------
-import widgets
+from gui import widgets
 from gen.lib import Repository, RepositoryType
 
 from Filters.SideBar import SidebarFilter

src/Filters/SideBar/_SidebarFilter.py

@@ -24,7 +24,7 @@ from gettext import gettext as _
 import gtk
 import pango
 
-import widgets
+from gui import widgets
 import config
 
 _RETURN = gtk.gdk.keyval_from_name("Return")

src/GrampsCfg.py

@@ -51,7 +51,7 @@ from BasicUtils import name_displayer as _nd
 import Utils
 from gen.lib import Name
 import ManagedWindow
-from widgets import MarkupLabel, BasicLabel
+from gui.widgets import MarkupLabel, BasicLabel
 from QuestionDialog import ErrorDialog, QuestionDialog2
 from Errors import NameDisplayError
 from glade import Glade

src/PluginUtils/_GuiOptions.py

@@ -50,7 +50,7 @@ import gobject
 import Utils
 from gui.utils import ProgressMeter
 from gui.pluginmanager import GuiPluginManager
-import widgets
+from gui import widgets
 import ManagedWindow
 from QuestionDialog import OptionDialog
 from Selectors import selector_factory

src/gui/__init__.py

@@ -26,4 +26,4 @@ Package init for the gui package.
 
 # DO NOT IMPORT METHODS/CLASSES FROM src/gui HERE ! Only __all__ 
 
-__all__ = [ "views" ]
+__all__ = [ "views", "widgets" ]

src/gui/viewmanager.py

@@ -74,7 +74,7 @@ import gui.views.pageview as PageView
 import Navigation
 import RecentFiles
 from BasicUtils import name_displayer
-import widgets
+from gui import widgets
 import UndoHistory
 from gui.dbloader import DbLoader
 import GrampsDisplay

src/gui/views/pageview.py

@@ -47,7 +47,7 @@ from gettext import gettext as _
 #
 #----------------------------------------------------------------
 from gui.dbguielement import DbGUIElement
-from widgets.menutoolbuttonaction import MenuToolButtonAction
+from gui.widgets.menutoolbuttonaction import MenuToolButtonAction
 
 NAVIGATION_NONE   = -1
 NAVIGATION_PERSON = 0

src/gui/widgets/Makefile.am

@@ -1,9 +1,9 @@
-# This is the src/widgets level Makefile for Gramps
+# This is the src/gui/widgets level Makefile for Gramps
 # We could use GNU make's ':=' syntax for nice wildcard use,
 # but that is not necessarily portable.
 # If not using GNU make, then list all .py files individually
 
-pkgdatadir = $(datadir)/@PACKAGE@/widgets
+pkgdatadir = $(datadir)/@PACKAGE@/gui/widgets
 
 pkgdata_PYTHON = \
 	__init__.py \
@@ -24,13 +24,13 @@ pkgdata_PYTHON = \
 	valueaction.py \
 	valuetoolitem.py
 
-pkgpyexecdir = @pkgpyexecdir@/widgets
-pkgpythondir = @pkgpythondir@/widgets
+pkgpyexecdir = @pkgpyexecdir@/gui/widgets
+pkgpythondir = @pkgpythondir@/gui/widgets
 
 # Clean up all the byte-compiled files
 MOSTLYCLEANFILES = *pyc *pyo
 
-GRAMPS_PY_MODPATH = "../"
+GRAMPS_PY_MODPATH = "../../"
 
 pycheck: 
 	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \

src/gui/widgets/shortlistcomboentry.py

@@ -45,7 +45,7 @@ import gtk
 # GRAMPS modules
 #
 #-------------------------------------------------------------------------
-from widgets.validatedcomboentry import ValidatedComboEntry
+from gui.widgets.validatedcomboentry import ValidatedComboEntry
 
 #-------------------------------------------------------------------------
 #

src/gui/widgets/styledtexteditor.py

@@ -49,12 +49,12 @@ from pango import UNDERLINE_SINGLE
 #
 #-------------------------------------------------------------------------
 from gen.lib import StyledTextTagType
-from widgets.styledtextbuffer import (StyledTextBuffer, ALLOWED_STYLES,
+from gui.widgets.styledtextbuffer import (StyledTextBuffer, ALLOWED_STYLES,
                                       MATCH_START, MATCH_END,
                                       MATCH_FLAVOR, MATCH_STRING)
-from widgets.valueaction import ValueAction
-from widgets.toolcomboentry import ToolComboEntry
-from widgets.springseparator import SpringSeparatorAction
+from gui.widgets.valueaction import ValueAction
+from gui.widgets.toolcomboentry import ToolComboEntry
+from gui.widgets.springseparator import SpringSeparatorAction
 from Spell import Spell
 from GrampsDisplay import url as display_url
 

src/gui/widgets/toolcomboentry.py

@@ -45,8 +45,8 @@ import gtk
 # GRAMPS modules
 #
 #-------------------------------------------------------------------------
-from widgets.valuetoolitem import ValueToolItem
-from widgets.shortlistcomboentry import ShortlistComboEntry
+from gui.widgets.valuetoolitem import ValueToolItem
+from gui.widgets.shortlistcomboentry import ShortlistComboEntry
 
 #-------------------------------------------------------------------------
 #

src/gui/widgets/valueaction.py

@@ -45,7 +45,7 @@ import gtk
 # GRAMPS modules
 #
 #-------------------------------------------------------------------------
-from widgets.valuetoolitem import ValueToolItem
+from gui.widgets.valuetoolitem import ValueToolItem
 
 #-------------------------------------------------------------------------
 #

src/plugins/gramplet/NoteGramplet.py

@@ -35,7 +35,7 @@ from gen.plug import Gramplet
 from BasicUtils import name_displayer
 from TransUtils import sgettext as _
 from const import GLADE_FILE
-from widgets import StyledTextEditor
+from gui.widgets import StyledTextEditor
 from gen.lib import StyledText, Note
 import Errors
 

src/plugins/tool/OwnerEditor.py

@@ -39,7 +39,7 @@ import const
 import config
 from Utils import get_researcher
 import GrampsDisplay
-from widgets import MonitoredEntry
+from gui.widgets import MonitoredEntry
 import ManagedWindow
 from PluginUtils import Tool
 from TransUtils import sgettext as _

src/plugins/view/relview.py

@@ -53,7 +53,7 @@ from Utils import media_path_full, probably_alive
 import DateHandler
 import ThumbNails
 import config
-import widgets
+from gui import widgets
 import Errors
 import gen.utils
 import Bookmarks