From 6a15f8fd18ea378595c89e62b136ea840d99972d Mon Sep 17 00:00:00 2001 From: Nick Hall Date: Wed, 6 Jun 2012 16:00:54 +0000 Subject: [PATCH] GEPS008: Moved DdTargets module svn: r19773 --- po/POTFILES.skip | 2 +- src/Makefile.am | 1 - src/gui/Makefile.am | 1 + src/gui/clipboard.py | 2 +- src/gui/dbman.py | 2 +- src/{DdTargets.py => gui/ddtargets.py} | 2 +- src/gui/editors/displaytabs/addrembedlist.py | 2 +- src/gui/editors/displaytabs/attrembedlist.py | 2 +- src/gui/editors/displaytabs/citationembedlist.py | 2 +- src/gui/editors/displaytabs/eventembedlist.py | 2 +- src/gui/editors/displaytabs/gallerytab.py | 2 +- src/gui/editors/displaytabs/locationembedlist.py | 2 +- src/gui/editors/displaytabs/nameembedlist.py | 2 +- src/gui/editors/displaytabs/notetab.py | 2 +- src/gui/editors/displaytabs/personrefembedlist.py | 2 +- src/gui/editors/displaytabs/repoembedlist.py | 2 +- src/gui/editors/displaytabs/surnametab.py | 2 +- src/gui/editors/displaytabs/webembedlist.py | 2 +- src/gui/editors/editfamily.py | 2 +- src/gui/editors/objectentries.py | 2 +- src/gui/plug/quick/_quicktable.py | 2 +- src/gui/views/listview.py | 2 +- src/plugins/lib/libpersonview.py | 2 +- src/plugins/lib/libplaceview.py | 2 +- src/plugins/view/citationlistview.py | 2 +- src/plugins/view/citationtreeview.py | 2 +- src/plugins/view/eventview.py | 2 +- src/plugins/view/familyview.py | 2 +- src/plugins/view/mediaview.py | 2 +- src/plugins/view/noteview.py | 2 +- src/plugins/view/pedigreeview.py | 2 +- src/plugins/view/repoview.py | 2 +- src/plugins/view/sourceview.py | 2 +- 33 files changed, 32 insertions(+), 32 deletions(-) rename src/{DdTargets.py => gui/ddtargets.py} (99%) diff --git a/po/POTFILES.skip b/po/POTFILES.skip index ae945be19..2c3e0f452 100644 --- a/po/POTFILES.skip +++ b/po/POTFILES.skip @@ -5,7 +5,6 @@ #src src/AutoComp.py -src/DdTargets.py src/Errors.py src/ImgManip.py src/ListModel.py @@ -228,6 +227,7 @@ src/gen/utils/callman.py # gui - GUI code src/gui/__init__.py src/gui/dbguielement.py +src/gui/ddtargets.py src/gui/display.py src/gui/glade.py src/gui/managedwindow.py diff --git a/src/Makefile.am b/src/Makefile.am index 4644bdecf..d875f20b8 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -20,7 +20,6 @@ gdir_PYTHON = \ constfunc.py\ DateEdit.py\ DbState.py\ - DdTargets.py\ Errors.py\ ExportAssistant.py\ ExportOptions.py\ diff --git a/src/gui/Makefile.am b/src/gui/Makefile.am index 2132f04f3..7b882ecf7 100644 --- a/src/gui/Makefile.am +++ b/src/gui/Makefile.am @@ -27,6 +27,7 @@ pkgpython_PYTHON = \ dbguielement.py \ dbloader.py \ dbman.py \ + ddtargets.py \ dialog.py \ display.py \ displaystate.py \ diff --git a/src/gui/clipboard.py b/src/gui/clipboard.py index 70101f1b3..e53fe4cf1 100644 --- a/src/gui/clipboard.py +++ b/src/gui/clipboard.py @@ -54,7 +54,7 @@ from gen.ggettext import sgettext as _ from TransUtils import trans_objclass from constfunc import mac from gui.glade import Glade -from DdTargets import DdTargets +from gui.ddtargets import DdTargets from gui.makefilter import make_filter import gui.utils diff --git a/src/gui/dbman.py b/src/gui/dbman.py index 413d1a544..2ef61120a 100644 --- a/src/gui/dbman.py +++ b/src/gui/dbman.py @@ -74,7 +74,7 @@ from gui.dialog import ErrorDialog, QuestionDialog, QuestionDialog2 from gen.db import DbBsddb from gui.pluginmanager import GuiPluginManager from cli.clidbman import CLIDbManager, NAME_FILE, time_val -from DdTargets import DdTargets +from gui.ddtargets import DdTargets import RecentFiles from gui.glade import Glade from gen.db.backup import restore diff --git a/src/DdTargets.py b/src/gui/ddtargets.py similarity index 99% rename from src/DdTargets.py rename to src/gui/ddtargets.py index 572a7bb1f..5916c323c 100644 --- a/src/DdTargets.py +++ b/src/gui/ddtargets.py @@ -39,7 +39,7 @@ The module defines a singleton instance of _DdTargets called DdTargets. - from DdTargets import DdTargets + from gui.ddtargets import DdTargets drag_dest_set(gtk.DEST_DEFAULT_ALL, DdTargets.all_targets(), diff --git a/src/gui/editors/displaytabs/addrembedlist.py b/src/gui/editors/displaytabs/addrembedlist.py index e837780ee..fd58a7967 100644 --- a/src/gui/editors/displaytabs/addrembedlist.py +++ b/src/gui/editors/displaytabs/addrembedlist.py @@ -39,7 +39,7 @@ import gobject #------------------------------------------------------------------------- import gen.lib import Errors -from DdTargets import DdTargets +from gui.ddtargets import DdTargets from addressmodel import AddressModel from embeddedlist import EmbeddedList diff --git a/src/gui/editors/displaytabs/attrembedlist.py b/src/gui/editors/displaytabs/attrembedlist.py index b4037144d..f926c9acf 100644 --- a/src/gui/editors/displaytabs/attrembedlist.py +++ b/src/gui/editors/displaytabs/attrembedlist.py @@ -35,7 +35,7 @@ import gobject #------------------------------------------------------------------------- import gen.lib import Errors -from DdTargets import DdTargets +from gui.ddtargets import DdTargets from attrmodel import AttrModel from embeddedlist import EmbeddedList diff --git a/src/gui/editors/displaytabs/citationembedlist.py b/src/gui/editors/displaytabs/citationembedlist.py index 976eb9871..f02fb08a8 100644 --- a/src/gui/editors/displaytabs/citationembedlist.py +++ b/src/gui/editors/displaytabs/citationembedlist.py @@ -49,7 +49,7 @@ from gui.dbguielement import DbGUIElement from gui.selectors import SelectorFactory from citationrefmodel import CitationRefModel from embeddedlist import EmbeddedList -from DdTargets import DdTargets +from gui.ddtargets import DdTargets #------------------------------------------------------------------------- # diff --git a/src/gui/editors/displaytabs/eventembedlist.py b/src/gui/editors/displaytabs/eventembedlist.py index e064f7428..3ef3a6df2 100644 --- a/src/gui/editors/displaytabs/eventembedlist.py +++ b/src/gui/editors/displaytabs/eventembedlist.py @@ -37,7 +37,7 @@ import gobject #------------------------------------------------------------------------- import gen.lib import Errors -from DdTargets import DdTargets +from gui.ddtargets import DdTargets from groupembeddedlist import GroupEmbeddedList from eventrefmodel import EventRefModel from gui.dbguielement import DbGUIElement diff --git a/src/gui/editors/displaytabs/gallerytab.py b/src/gui/editors/displaytabs/gallerytab.py index 9a10d5040..8ec6f4c6f 100644 --- a/src/gui/editors/displaytabs/gallerytab.py +++ b/src/gui/editors/displaytabs/gallerytab.py @@ -56,7 +56,7 @@ import Utils import ThumbNails import Errors import gen.mime -from DdTargets import DdTargets +from gui.ddtargets import DdTargets from buttontab import ButtonTab import constfunc import const diff --git a/src/gui/editors/displaytabs/locationembedlist.py b/src/gui/editors/displaytabs/locationembedlist.py index e2269320b..672b92319 100644 --- a/src/gui/editors/displaytabs/locationembedlist.py +++ b/src/gui/editors/displaytabs/locationembedlist.py @@ -35,7 +35,7 @@ import gobject #------------------------------------------------------------------------- import gen.lib import Errors -from DdTargets import DdTargets +from gui.ddtargets import DdTargets from locationmodel import LocationModel from embeddedlist import EmbeddedList diff --git a/src/gui/editors/displaytabs/nameembedlist.py b/src/gui/editors/displaytabs/nameembedlist.py index c524c3f9a..140689a4f 100644 --- a/src/gui/editors/displaytabs/nameembedlist.py +++ b/src/gui/editors/displaytabs/nameembedlist.py @@ -43,7 +43,7 @@ from gen.ggettext import gettext as _ #------------------------------------------------------------------------- import gen.lib import Errors -from DdTargets import DdTargets +from gui.ddtargets import DdTargets from namemodel import NameModel from groupembeddedlist import GroupEmbeddedList diff --git a/src/gui/editors/displaytabs/notetab.py b/src/gui/editors/displaytabs/notetab.py index 4bdab28af..3fe3102bb 100644 --- a/src/gui/editors/displaytabs/notetab.py +++ b/src/gui/editors/displaytabs/notetab.py @@ -45,7 +45,7 @@ from gui.dbguielement import DbGUIElement from gui.selectors import SelectorFactory from notemodel import NoteModel from embeddedlist import EmbeddedList -from DdTargets import DdTargets +from gui.ddtargets import DdTargets #------------------------------------------------------------------------- # diff --git a/src/gui/editors/displaytabs/personrefembedlist.py b/src/gui/editors/displaytabs/personrefembedlist.py index a1c0d7c75..059fcd389 100644 --- a/src/gui/editors/displaytabs/personrefembedlist.py +++ b/src/gui/editors/displaytabs/personrefembedlist.py @@ -35,7 +35,7 @@ import gobject #------------------------------------------------------------------------- import gen.lib import Errors -from DdTargets import DdTargets +from gui.ddtargets import DdTargets from personrefmodel import PersonRefModel from embeddedlist import EmbeddedList diff --git a/src/gui/editors/displaytabs/repoembedlist.py b/src/gui/editors/displaytabs/repoembedlist.py index 2d0bf2bd5..a3d4f085c 100644 --- a/src/gui/editors/displaytabs/repoembedlist.py +++ b/src/gui/editors/displaytabs/repoembedlist.py @@ -37,7 +37,7 @@ import gen.lib from gui.dbguielement import DbGUIElement from gui.selectors import SelectorFactory import Errors -from DdTargets import DdTargets +from gui.ddtargets import DdTargets from reporefmodel import RepoRefModel from embeddedlist import EmbeddedList diff --git a/src/gui/editors/displaytabs/surnametab.py b/src/gui/editors/displaytabs/surnametab.py index 46c910eb4..8855fbb77 100644 --- a/src/gui/editors/displaytabs/surnametab.py +++ b/src/gui/editors/displaytabs/surnametab.py @@ -47,7 +47,7 @@ _ENTER = gtk.gdk.keyval_from_name("Enter") #------------------------------------------------------------------------- from surnamemodel import SurnameModel from embeddedlist import EmbeddedList -from DdTargets import DdTargets +from gui.ddtargets import DdTargets import AutoComp from gen.lib import Surname, NameOriginType diff --git a/src/gui/editors/displaytabs/webembedlist.py b/src/gui/editors/displaytabs/webembedlist.py index f908614fb..21a34e25d 100644 --- a/src/gui/editors/displaytabs/webembedlist.py +++ b/src/gui/editors/displaytabs/webembedlist.py @@ -36,7 +36,7 @@ import gobject #------------------------------------------------------------------------- import gen.lib import Errors -from DdTargets import DdTargets +from gui.ddtargets import DdTargets from webmodel import WebModel from embeddedlist import EmbeddedList diff --git a/src/gui/editors/editfamily.py b/src/gui/editors/editfamily.py index b31bc45e3..d45c2f48d 100644 --- a/src/gui/editors/editfamily.py +++ b/src/gui/editors/editfamily.py @@ -49,7 +49,7 @@ log = logging.getLogger(".") # #------------------------------------------------------------------------- from gen.ggettext import gettext as _ -from DdTargets import DdTargets +from gui.ddtargets import DdTargets import gtk from gtk import gdk import pango diff --git a/src/gui/editors/objectentries.py b/src/gui/editors/objectentries.py index dbfd41ff5..8e4470745 100644 --- a/src/gui/editors/objectentries.py +++ b/src/gui/editors/objectentries.py @@ -49,7 +49,7 @@ from editplace import EditPlace from editmedia import EditMedia from editnote import EditNote from gui.selectors import SelectorFactory -from DdTargets import DdTargets +from gui.ddtargets import DdTargets from Errors import WindowActiveError #------------------------------------------------------------------------- diff --git a/src/gui/plug/quick/_quicktable.py b/src/gui/plug/quick/_quicktable.py index 13c17c14f..a5b48b05c 100644 --- a/src/gui/plug/quick/_quicktable.py +++ b/src/gui/plug/quick/_quicktable.py @@ -51,7 +51,7 @@ from gen.simple import SimpleTable from TransUtils import trans_objclass import Errors from gui.widgets.multitreeview import MultiTreeView -from DdTargets import DdTargets +from gui.ddtargets import DdTargets from gui.plug.quick import run_quick_report_by_name from gui.editors import (EditPerson, EditEvent, EditFamily, EditCitation, EditSource, EditPlace, EditRepository, EditNote, diff --git a/src/gui/views/listview.py b/src/gui/views/listview.py index 22816239a..9045da83f 100644 --- a/src/gui/views/listview.py +++ b/src/gui/views/listview.py @@ -63,7 +63,7 @@ import Utils from gui.dialog import QuestionDialog, QuestionDialog2 from gui.filtereditor import FilterEditor from gen.ggettext import sgettext as _ -from DdTargets import DdTargets +from gui.ddtargets import DdTargets from gui.plug.quick import create_quickreport_menu, create_web_connect_menu import gui.utils diff --git a/src/plugins/lib/libpersonview.py b/src/plugins/lib/libpersonview.py index 57f35a8f7..c8e296039 100644 --- a/src/plugins/lib/libpersonview.py +++ b/src/plugins/lib/libpersonview.py @@ -56,7 +56,7 @@ from gui.dialog import ErrorDialog, QuestionDialog import Errors import Bookmarks import config -from DdTargets import DdTargets +from gui.ddtargets import DdTargets from gui.editors import EditPerson from gui.filters.sidebar import PersonSidebarFilter from gui.merge import MergePerson diff --git a/src/plugins/lib/libplaceview.py b/src/plugins/lib/libplaceview.py index 7099189ba..a749cb3cc 100644 --- a/src/plugins/lib/libplaceview.py +++ b/src/plugins/lib/libplaceview.py @@ -53,7 +53,7 @@ import Bookmarks import config from gui.dialog import ErrorDialog from gui.pluginmanager import GuiPluginManager -from DdTargets import DdTargets +from gui.ddtargets import DdTargets from gui.editors import EditPlace, DeletePlaceQuery from gui.filters.sidebar import PlaceSidebarFilter from gui.merge import MergePlace diff --git a/src/plugins/view/citationlistview.py b/src/plugins/view/citationlistview.py index 0526d4a37..48262cbd1 100644 --- a/src/plugins/view/citationlistview.py +++ b/src/plugins/view/citationlistview.py @@ -52,7 +52,7 @@ from gui.views.listview import ListView import Utils import Bookmarks import Errors -from DdTargets import DdTargets +from gui.ddtargets import DdTargets from gui.dialog import ErrorDialog from gui.editors import EditCitation, DeleteCitationQuery from gui.filters.sidebar import CitationSidebarFilter diff --git a/src/plugins/view/citationtreeview.py b/src/plugins/view/citationtreeview.py index 5582a4f4c..1d27ec635 100644 --- a/src/plugins/view/citationtreeview.py +++ b/src/plugins/view/citationtreeview.py @@ -53,7 +53,7 @@ from gui.views.listview import ListView import Utils import Bookmarks import Errors -from DdTargets import DdTargets +from gui.ddtargets import DdTargets from gui.dialog import ErrorDialog from gui.editors import EditCitation, DeleteCitationQuery, EditSource, \ DeleteSrcQuery diff --git a/src/plugins/view/eventview.py b/src/plugins/view/eventview.py index 794ce2736..173df6db1 100644 --- a/src/plugins/view/eventview.py +++ b/src/plugins/view/eventview.py @@ -53,7 +53,7 @@ import Utils import Errors import Bookmarks import config -from DdTargets import DdTargets +from gui.ddtargets import DdTargets from gui.dialog import ErrorDialog from gui.editors import EditEvent, DeleteEventQuery from gui.filters.sidebar import EventSidebarFilter diff --git a/src/plugins/view/familyview.py b/src/plugins/view/familyview.py index ded3aac66..562ebc765 100644 --- a/src/plugins/view/familyview.py +++ b/src/plugins/view/familyview.py @@ -56,7 +56,7 @@ from gui.dialog import ErrorDialog from gui.filters.sidebar import FamilySidebarFilter from gui.merge import MergeFamily from gen.plug import CATEGORY_QR_FAMILY -from DdTargets import DdTargets +from gui.ddtargets import DdTargets #------------------------------------------------------------------------- # diff --git a/src/plugins/view/mediaview.py b/src/plugins/view/mediaview.py index 751515172..bf642cb7f 100644 --- a/src/plugins/view/mediaview.py +++ b/src/plugins/view/mediaview.py @@ -65,7 +65,7 @@ from gui.editors import EditMedia, DeleteMediaQuery import Errors from gui.filters.sidebar import MediaSidebarFilter from gui.merge import MergeMedia -from DdTargets import DdTargets +from gui.ddtargets import DdTargets from gui.dialog import ErrorDialog from gen.plug import CATEGORY_QR_MEDIA diff --git a/src/plugins/view/noteview.py b/src/plugins/view/noteview.py index 19c768511..ac8c56118 100644 --- a/src/plugins/view/noteview.py +++ b/src/plugins/view/noteview.py @@ -52,7 +52,7 @@ import Errors import Bookmarks import config from gen.lib import Note -from DdTargets import DdTargets +from gui.ddtargets import DdTargets from gui.dialog import ErrorDialog from gui.filters.sidebar import NoteSidebarFilter from gui.editors import EditNote, DeleteNoteQuery diff --git a/src/plugins/view/pedigreeview.py b/src/plugins/view/pedigreeview.py index d3472ba8a..c1af24d21 100644 --- a/src/plugins/view/pedigreeview.py +++ b/src/plugins/view/pedigreeview.py @@ -57,7 +57,7 @@ from libformatting import FormattingHelper import ThumbNails import Errors from gui.editors import EditPerson, EditFamily -from DdTargets import DdTargets +from gui.ddtargets import DdTargets import cPickle as pickle import config import Bookmarks diff --git a/src/plugins/view/repoview.py b/src/plugins/view/repoview.py index a4a82aa5b..7506a1696 100644 --- a/src/plugins/view/repoview.py +++ b/src/plugins/view/repoview.py @@ -43,7 +43,7 @@ import Bookmarks import Errors import config from gui.editors import EditRepository, DeleteRepositoryQuery -from DdTargets import DdTargets +from gui.ddtargets import DdTargets from gui.dialog import ErrorDialog from gui.filters.sidebar import RepoSidebarFilter from gui.merge import MergeRepository diff --git a/src/plugins/view/sourceview.py b/src/plugins/view/sourceview.py index 1b10bcdb5..b3a5c061a 100644 --- a/src/plugins/view/sourceview.py +++ b/src/plugins/view/sourceview.py @@ -46,7 +46,7 @@ from gui.views.treemodels import SourceModel import Utils import Bookmarks import Errors -from DdTargets import DdTargets +from gui.ddtargets import DdTargets from gui.dialog import ErrorDialog from gui.editors import EditSource, DeleteSrcQuery from gui.filters.sidebar import SourceSidebarFilter