From 0001133eb8d78d848f306ce7e0752c150ed605f7 Mon Sep 17 00:00:00 2001 From: Brian Matherly Date: Mon, 14 Dec 2009 03:20:19 +0000 Subject: [PATCH] move src/widgets/* to src/gui/widgets as part of GEP008 svn: r13791 --- src/DisplayTabs/_BackRefList.py | 2 +- src/DisplayTabs/_ButtonTab.py | 2 +- src/Editors/_EditAddress.py | 2 +- src/Editors/_EditAttribute.py | 2 +- src/Editors/_EditChildRef.py | 2 +- src/Editors/_EditEvent.py | 2 +- src/Editors/_EditEventRef.py | 2 +- src/Editors/_EditFamily.py | 3 +-- src/Editors/_EditLdsOrd.py | 2 +- src/Editors/_EditLocation.py | 2 +- src/Editors/_EditMedia.py | 2 +- src/Editors/_EditMediaRef.py | 2 +- src/Editors/_EditName.py | 2 +- src/Editors/_EditNote.py | 4 ++-- src/Editors/_EditPerson.py | 2 +- src/Editors/_EditPersonRef.py | 2 +- src/Editors/_EditPlace.py | 2 +- src/Editors/_EditRepoRef.py | 2 +- src/Editors/_EditRepository.py | 2 +- src/Editors/_EditSource.py | 2 +- src/Editors/_EditSourceRef.py | 2 +- src/Editors/_EditUrl.py | 2 +- src/Filters/SideBar/_EventSidebarFilter.py | 2 +- src/Filters/SideBar/_FamilySidebarFilter.py | 2 +- src/Filters/SideBar/_NoteSidebarFilter.py | 2 +- src/Filters/SideBar/_PersonSidebarFilter.py | 2 +- src/Filters/SideBar/_RepoSidebarFilter.py | 2 +- src/Filters/SideBar/_SidebarFilter.py | 2 +- src/GrampsCfg.py | 2 +- src/PluginUtils/_GuiOptions.py | 2 +- src/gui/__init__.py | 2 +- src/gui/viewmanager.py | 2 +- src/gui/views/pageview.py | 2 +- src/{ => gui}/widgets/Makefile.am | 10 +++++----- src/{ => gui}/widgets/__init__.py | 0 src/{ => gui}/widgets/buttons.py | 0 src/{ => gui}/widgets/expandcollapsearrow.py | 0 src/{ => gui}/widgets/labels.py | 0 src/{ => gui}/widgets/linkbox.py | 0 src/{ => gui}/widgets/menutoolbuttonaction.py | 0 src/{ => gui}/widgets/monitoredwidgets.py | 0 src/{ => gui}/widgets/shortlistcomboentry.py | 2 +- src/{ => gui}/widgets/springseparator.py | 0 src/{ => gui}/widgets/statusbar.py | 0 src/{ => gui}/widgets/styledtextbuffer.py | 0 src/{ => gui}/widgets/styledtexteditor.py | 8 ++++---- src/{ => gui}/widgets/toolcomboentry.py | 4 ++-- src/{ => gui}/widgets/validatedcomboentry.py | 0 src/{ => gui}/widgets/validatedmaskedentry.py | 0 src/{ => gui}/widgets/valueaction.py | 2 +- src/{ => gui}/widgets/valuetoolitem.py | 0 src/plugins/gramplet/NoteGramplet.py | 2 +- src/plugins/tool/OwnerEditor.py | 2 +- src/plugins/view/relview.py | 2 +- 54 files changed, 50 insertions(+), 51 deletions(-) rename src/{ => gui}/widgets/Makefile.am (76%) rename src/{ => gui}/widgets/__init__.py (100%) rename src/{ => gui}/widgets/buttons.py (100%) rename src/{ => gui}/widgets/expandcollapsearrow.py (100%) rename src/{ => gui}/widgets/labels.py (100%) rename src/{ => gui}/widgets/linkbox.py (100%) rename src/{ => gui}/widgets/menutoolbuttonaction.py (100%) rename src/{ => gui}/widgets/monitoredwidgets.py (100%) rename src/{ => gui}/widgets/shortlistcomboentry.py (98%) rename src/{ => gui}/widgets/springseparator.py (100%) rename src/{ => gui}/widgets/statusbar.py (100%) rename src/{ => gui}/widgets/styledtextbuffer.py (100%) rename src/{ => gui}/widgets/styledtexteditor.py (99%) rename src/{ => gui}/widgets/toolcomboentry.py (95%) rename src/{ => gui}/widgets/validatedcomboentry.py (100%) rename src/{ => gui}/widgets/validatedmaskedentry.py (100%) rename src/{ => gui}/widgets/valueaction.py (99%) rename src/{ => gui}/widgets/valuetoolitem.py (100%) diff --git a/src/DisplayTabs/_BackRefList.py b/src/DisplayTabs/_BackRefList.py index 62239c335..f35ede3b9 100644 --- a/src/DisplayTabs/_BackRefList.py +++ b/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 #------------------------------------------------------------------------- diff --git a/src/DisplayTabs/_ButtonTab.py b/src/DisplayTabs/_ButtonTab.py index c0862aa19..c4ea00a99 100644 --- a/src/DisplayTabs/_ButtonTab.py +++ b/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 diff --git a/src/Editors/_EditAddress.py b/src/Editors/_EditAddress.py index b828ea7ec..3c9b1d14b 100644 --- a/src/Editors/_EditAddress.py +++ b/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 #------------------------------------------------------------------------- # diff --git a/src/Editors/_EditAttribute.py b/src/Editors/_EditAttribute.py index 0b0ace15b..4fb5d9143 100644 --- a/src/Editors/_EditAttribute.py +++ b/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 #------------------------------------------------------------------------- # diff --git a/src/Editors/_EditChildRef.py b/src/Editors/_EditChildRef.py index 9053de8a8..2e5780ed4 100644 --- a/src/Editors/_EditChildRef.py +++ b/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 #------------------------------------------------------------------------- diff --git a/src/Editors/_EditEvent.py b/src/Editors/_EditEvent.py index 48b28edf0..477f68e73 100644 --- a/src/Editors/_EditEvent.py +++ b/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) #------------------------------------------------------------------------- diff --git a/src/Editors/_EditEventRef.py b/src/Editors/_EditEventRef.py index f06e2cf07..eda619d36 100644 --- a/src/Editors/_EditEventRef.py +++ b/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 diff --git a/src/Editors/_EditFamily.py b/src/Editors/_EditFamily.py index 78126539f..16254be7e 100644 --- a/src/Editors/_EditFamily.py +++ b/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) diff --git a/src/Editors/_EditLdsOrd.py b/src/Editors/_EditLdsOrd.py index f119454e5..b767df660 100644 --- a/src/Editors/_EditLdsOrd.py +++ b/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 = { diff --git a/src/Editors/_EditLocation.py b/src/Editors/_EditLocation.py index d455df5a0..73577e86e 100644 --- a/src/Editors/_EditLocation.py +++ b/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 _ #------------------------------------------------------------------------- diff --git a/src/Editors/_EditMedia.py b/src/Editors/_EditMedia.py index 90232f896..12a3b5047 100644 --- a/src/Editors/_EditMedia.py +++ b/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 diff --git a/src/Editors/_EditMediaRef.py b/src/Editors/_EditMediaRef.py index 0cb7eeafb..4460ac81f 100644 --- a/src/Editors/_EditMediaRef.py +++ b/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 diff --git a/src/Editors/_EditName.py b/src/Editors/_EditName.py index 4df8885d3..3a508030d 100644 --- a/src/Editors/_EditName.py +++ b/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 diff --git a/src/Editors/_EditNote.py b/src/Editors/_EditNote.py index 8c7fde901..793459b68 100644 --- a/src/Editors/_EditNote.py +++ b/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 diff --git a/src/Editors/_EditPerson.py b/src/Editors/_EditPerson.py index 016e2fcb3..62e44feb6 100644 --- a/src/Editors/_EditPerson.py +++ b/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 diff --git a/src/Editors/_EditPersonRef.py b/src/Editors/_EditPersonRef.py index a91b30dbc..d39fbaf48 100644 --- a/src/Editors/_EditPersonRef.py +++ b/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 diff --git a/src/Editors/_EditPlace.py b/src/Editors/_EditPlace.py index eb944bc82..b8dc5db6e 100644 --- a/src/Editors/_EditPlace.py +++ b/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 diff --git a/src/Editors/_EditRepoRef.py b/src/Editors/_EditRepoRef.py index 8e7a89671..00bcdf7b0 100644 --- a/src/Editors/_EditRepoRef.py +++ b/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 diff --git a/src/Editors/_EditRepository.py b/src/Editors/_EditRepository.py index ebf3b6394..76e928e8e 100644 --- a/src/Editors/_EditRepository.py +++ b/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 diff --git a/src/Editors/_EditSource.py b/src/Editors/_EditSource.py index 9ef9b46c8..183ec3808 100644 --- a/src/Editors/_EditSource.py +++ b/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 diff --git a/src/Editors/_EditSourceRef.py b/src/Editors/_EditSourceRef.py index 5c6385cec..9691c118a 100644 --- a/src/Editors/_EditSourceRef.py +++ b/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 diff --git a/src/Editors/_EditUrl.py b/src/Editors/_EditUrl.py index 706b262ed..7d5b4e565 100644 --- a/src/Editors/_EditUrl.py +++ b/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 #------------------------------------------------------------------------- diff --git a/src/Filters/SideBar/_EventSidebarFilter.py b/src/Filters/SideBar/_EventSidebarFilter.py index 0c2359dd2..81a1c7957 100644 --- a/src/Filters/SideBar/_EventSidebarFilter.py +++ b/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 diff --git a/src/Filters/SideBar/_FamilySidebarFilter.py b/src/Filters/SideBar/_FamilySidebarFilter.py index 50a387fde..91ff34e57 100644 --- a/src/Filters/SideBar/_FamilySidebarFilter.py +++ b/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 diff --git a/src/Filters/SideBar/_NoteSidebarFilter.py b/src/Filters/SideBar/_NoteSidebarFilter.py index 889a8da09..e348a4605 100644 --- a/src/Filters/SideBar/_NoteSidebarFilter.py +++ b/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 diff --git a/src/Filters/SideBar/_PersonSidebarFilter.py b/src/Filters/SideBar/_PersonSidebarFilter.py index 9ec2500e1..d9769b054 100644 --- a/src/Filters/SideBar/_PersonSidebarFilter.py +++ b/src/Filters/SideBar/_PersonSidebarFilter.py @@ -39,7 +39,7 @@ import gtk # GRAMPS modules # #------------------------------------------------------------------------- -import widgets +from gui import widgets import gen.lib import DateHandler diff --git a/src/Filters/SideBar/_RepoSidebarFilter.py b/src/Filters/SideBar/_RepoSidebarFilter.py index c40b205e7..9c31713d5 100644 --- a/src/Filters/SideBar/_RepoSidebarFilter.py +++ b/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 diff --git a/src/Filters/SideBar/_SidebarFilter.py b/src/Filters/SideBar/_SidebarFilter.py index d1ccf6485..1d2f0ed3a 100644 --- a/src/Filters/SideBar/_SidebarFilter.py +++ b/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") diff --git a/src/GrampsCfg.py b/src/GrampsCfg.py index 25f762097..a44e0048f 100644 --- a/src/GrampsCfg.py +++ b/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 diff --git a/src/PluginUtils/_GuiOptions.py b/src/PluginUtils/_GuiOptions.py index 06fa13adc..e95f5d56b 100644 --- a/src/PluginUtils/_GuiOptions.py +++ b/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 diff --git a/src/gui/__init__.py b/src/gui/__init__.py index 7dd896dde..0b4733d99 100644 --- a/src/gui/__init__.py +++ b/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" ] diff --git a/src/gui/viewmanager.py b/src/gui/viewmanager.py index 3f15054a9..933ad9c87 100644 --- a/src/gui/viewmanager.py +++ b/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 diff --git a/src/gui/views/pageview.py b/src/gui/views/pageview.py index d147b6421..413598cac 100644 --- a/src/gui/views/pageview.py +++ b/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 diff --git a/src/widgets/Makefile.am b/src/gui/widgets/Makefile.am similarity index 76% rename from src/widgets/Makefile.am rename to src/gui/widgets/Makefile.am index d92bd4fdf..8b11ca53e 100644 --- a/src/widgets/Makefile.am +++ b/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); \ diff --git a/src/widgets/__init__.py b/src/gui/widgets/__init__.py similarity index 100% rename from src/widgets/__init__.py rename to src/gui/widgets/__init__.py diff --git a/src/widgets/buttons.py b/src/gui/widgets/buttons.py similarity index 100% rename from src/widgets/buttons.py rename to src/gui/widgets/buttons.py diff --git a/src/widgets/expandcollapsearrow.py b/src/gui/widgets/expandcollapsearrow.py similarity index 100% rename from src/widgets/expandcollapsearrow.py rename to src/gui/widgets/expandcollapsearrow.py diff --git a/src/widgets/labels.py b/src/gui/widgets/labels.py similarity index 100% rename from src/widgets/labels.py rename to src/gui/widgets/labels.py diff --git a/src/widgets/linkbox.py b/src/gui/widgets/linkbox.py similarity index 100% rename from src/widgets/linkbox.py rename to src/gui/widgets/linkbox.py diff --git a/src/widgets/menutoolbuttonaction.py b/src/gui/widgets/menutoolbuttonaction.py similarity index 100% rename from src/widgets/menutoolbuttonaction.py rename to src/gui/widgets/menutoolbuttonaction.py diff --git a/src/widgets/monitoredwidgets.py b/src/gui/widgets/monitoredwidgets.py similarity index 100% rename from src/widgets/monitoredwidgets.py rename to src/gui/widgets/monitoredwidgets.py diff --git a/src/widgets/shortlistcomboentry.py b/src/gui/widgets/shortlistcomboentry.py similarity index 98% rename from src/widgets/shortlistcomboentry.py rename to src/gui/widgets/shortlistcomboentry.py index 2df87f4c4..a1681c823 100644 --- a/src/widgets/shortlistcomboentry.py +++ b/src/gui/widgets/shortlistcomboentry.py @@ -45,7 +45,7 @@ import gtk # GRAMPS modules # #------------------------------------------------------------------------- -from widgets.validatedcomboentry import ValidatedComboEntry +from gui.widgets.validatedcomboentry import ValidatedComboEntry #------------------------------------------------------------------------- # diff --git a/src/widgets/springseparator.py b/src/gui/widgets/springseparator.py similarity index 100% rename from src/widgets/springseparator.py rename to src/gui/widgets/springseparator.py diff --git a/src/widgets/statusbar.py b/src/gui/widgets/statusbar.py similarity index 100% rename from src/widgets/statusbar.py rename to src/gui/widgets/statusbar.py diff --git a/src/widgets/styledtextbuffer.py b/src/gui/widgets/styledtextbuffer.py similarity index 100% rename from src/widgets/styledtextbuffer.py rename to src/gui/widgets/styledtextbuffer.py diff --git a/src/widgets/styledtexteditor.py b/src/gui/widgets/styledtexteditor.py similarity index 99% rename from src/widgets/styledtexteditor.py rename to src/gui/widgets/styledtexteditor.py index f3d5c16d2..caf2619ae 100644 --- a/src/widgets/styledtexteditor.py +++ b/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 diff --git a/src/widgets/toolcomboentry.py b/src/gui/widgets/toolcomboentry.py similarity index 95% rename from src/widgets/toolcomboentry.py rename to src/gui/widgets/toolcomboentry.py index dfb727f20..0920fb520 100644 --- a/src/widgets/toolcomboentry.py +++ b/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 #------------------------------------------------------------------------- # diff --git a/src/widgets/validatedcomboentry.py b/src/gui/widgets/validatedcomboentry.py similarity index 100% rename from src/widgets/validatedcomboentry.py rename to src/gui/widgets/validatedcomboentry.py diff --git a/src/widgets/validatedmaskedentry.py b/src/gui/widgets/validatedmaskedentry.py similarity index 100% rename from src/widgets/validatedmaskedentry.py rename to src/gui/widgets/validatedmaskedentry.py diff --git a/src/widgets/valueaction.py b/src/gui/widgets/valueaction.py similarity index 99% rename from src/widgets/valueaction.py rename to src/gui/widgets/valueaction.py index 20d0e73fc..40a5f3809 100644 --- a/src/widgets/valueaction.py +++ b/src/gui/widgets/valueaction.py @@ -45,7 +45,7 @@ import gtk # GRAMPS modules # #------------------------------------------------------------------------- -from widgets.valuetoolitem import ValueToolItem +from gui.widgets.valuetoolitem import ValueToolItem #------------------------------------------------------------------------- # diff --git a/src/widgets/valuetoolitem.py b/src/gui/widgets/valuetoolitem.py similarity index 100% rename from src/widgets/valuetoolitem.py rename to src/gui/widgets/valuetoolitem.py diff --git a/src/plugins/gramplet/NoteGramplet.py b/src/plugins/gramplet/NoteGramplet.py index ba102b8ca..c0fec1330 100644 --- a/src/plugins/gramplet/NoteGramplet.py +++ b/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 diff --git a/src/plugins/tool/OwnerEditor.py b/src/plugins/tool/OwnerEditor.py index 1c764bb7c..5d074ec9c 100644 --- a/src/plugins/tool/OwnerEditor.py +++ b/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 _ diff --git a/src/plugins/view/relview.py b/src/plugins/view/relview.py index 135309f7e..f9cf46de6 100644 --- a/src/plugins/view/relview.py +++ b/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