move src/Editors/* to src/gui/editors as part of GEP008
svn: r13807
This commit is contained in:
@@ -53,7 +53,7 @@ import Errors
|
||||
import Bookmarks
|
||||
import config
|
||||
from DdTargets import DdTargets
|
||||
from Editors import EditEvent, DelEventQuery
|
||||
from gui.editors import EditEvent, DeleteEventQuery
|
||||
from Filters.SideBar import EventSidebarFilter
|
||||
from gen.plug import CATEGORY_QR_EVENT
|
||||
|
||||
@@ -233,8 +233,8 @@ class EventView(ListView):
|
||||
|
||||
object = self.dbstate.db.get_event_from_handle(handle)
|
||||
|
||||
query = DelEventQuery(self.dbstate, self.uistate, object,
|
||||
person_list, family_list)
|
||||
query = DeleteEventQuery(self.dbstate, self.uistate, object,
|
||||
person_list, family_list)
|
||||
is_used = len(person_list) + len(family_list) > 0
|
||||
return (query, is_used, object)
|
||||
|
||||
|
||||
@@ -46,6 +46,7 @@ import gtk
|
||||
import gen.lib
|
||||
from gui.views.listview import ListView
|
||||
from gui.views.treemodels import FamilyModel
|
||||
from gui.editors import EditFamily
|
||||
import Bookmarks
|
||||
import Errors
|
||||
import config
|
||||
@@ -191,7 +192,6 @@ class FamilyView(ListView):
|
||||
"no one was selected."))
|
||||
|
||||
def add(self, obj):
|
||||
from Editors import EditFamily
|
||||
family = gen.lib.Family()
|
||||
try:
|
||||
EditFamily(self.dbstate, self.uistate, [], family)
|
||||
@@ -215,7 +215,6 @@ class FamilyView(ListView):
|
||||
|
||||
def edit(self, obj):
|
||||
for handle in self.selected_handles():
|
||||
from Editors import EditFamily
|
||||
family = self.dbstate.db.get_family_from_handle(handle)
|
||||
try:
|
||||
EditFamily(self.dbstate, self.uistate, [], family)
|
||||
|
||||
@@ -43,6 +43,7 @@ try:
|
||||
import cairo
|
||||
except ImportError:
|
||||
pass
|
||||
from gettext import gettext as _
|
||||
|
||||
if gtk.pygtk_version < (2,3,93):
|
||||
raise Exception("PyGtk 2.3.93 or later required")
|
||||
@@ -54,14 +55,12 @@ if gtk.pygtk_version < (2,3,93):
|
||||
#-------------------------------------------------------------------------
|
||||
from gui.views.navigationview import NavigationView
|
||||
from BasicUtils import name_displayer
|
||||
from gettext import gettext as _
|
||||
from gen.plug import Gramplet
|
||||
from Utils import (find_children, find_parents, find_witnessed_people)
|
||||
from libformatting import FormattingHelper
|
||||
import gen.lib
|
||||
import Errors
|
||||
import Bookmarks
|
||||
from Editors import EditPerson, EditFamily
|
||||
from gui.editors import EditPerson, EditFamily
|
||||
|
||||
#-------------------------------------------------------------------------
|
||||
#
|
||||
|
||||
@@ -47,6 +47,7 @@ from gettext import gettext as _
|
||||
import Errors
|
||||
import const
|
||||
from gui.views.pageview import PageView
|
||||
from gui.editors import EditPerson, EditFamily
|
||||
import ManagedWindow
|
||||
import ConfigParser
|
||||
from gui.utils import add_menuitem
|
||||
@@ -656,7 +657,6 @@ class GuiGramplet(object):
|
||||
if event.button == 1: # left mouse
|
||||
if event.type == gtk.gdk._2BUTTON_PRESS: # double
|
||||
try:
|
||||
from Editors import EditPerson
|
||||
EditPerson(self.dbstate,
|
||||
self.uistate,
|
||||
[], person)
|
||||
@@ -669,7 +669,6 @@ class GuiGramplet(object):
|
||||
elif event.button == 3: # right mouse
|
||||
#FIXME: add a popup menu with options
|
||||
try:
|
||||
from Editors import EditPerson
|
||||
EditPerson(self.dbstate,
|
||||
self.uistate,
|
||||
[], person)
|
||||
@@ -714,7 +713,6 @@ class GuiGramplet(object):
|
||||
if event.button == 1: # left mouse
|
||||
if event.type == gtk.gdk._2BUTTON_PRESS: # double
|
||||
try:
|
||||
from Editors import EditFamily
|
||||
EditFamily(self.dbstate,
|
||||
self.uistate,
|
||||
[], family)
|
||||
@@ -724,7 +722,6 @@ class GuiGramplet(object):
|
||||
elif event.button == 3: # right mouse
|
||||
#FIXME: add a popup menu with options
|
||||
try:
|
||||
from Editors import EditFamily
|
||||
EditFamily(self.dbstate,
|
||||
self.uistate,
|
||||
[], family)
|
||||
|
||||
@@ -56,7 +56,7 @@ import Utils
|
||||
import Bookmarks
|
||||
import Mime
|
||||
import gen.lib
|
||||
from Editors import EditMedia, DeleteMediaQuery
|
||||
from gui.editors import EditMedia, DeleteMediaQuery
|
||||
import Errors
|
||||
from Filters.SideBar import MediaSidebarFilter
|
||||
from DdTargets import DdTargets
|
||||
|
||||
@@ -54,7 +54,7 @@ import ColumnOrder
|
||||
from gen.lib import Note
|
||||
from DdTargets import DdTargets
|
||||
from Filters.SideBar import NoteSidebarFilter
|
||||
from Editors import EditNote, DeleteNoteQuery
|
||||
from gui.editors import EditNote, DeleteNoteQuery
|
||||
|
||||
#-------------------------------------------------------------------------
|
||||
#
|
||||
|
||||
@@ -61,7 +61,7 @@ import DateHandler
|
||||
import ThumbNails
|
||||
import Errors
|
||||
from ReportBase import ReportUtils
|
||||
from Editors import EditPerson, EditFamily
|
||||
from gui.editors import EditPerson, EditFamily
|
||||
from DdTargets import DdTargets
|
||||
import cPickle as pickle
|
||||
import config
|
||||
|
||||
@@ -58,11 +58,9 @@ from BasicUtils import name_displayer
|
||||
from Utils import (media_path_full, probably_alive, find_children,
|
||||
find_parents, find_witnessed_people)
|
||||
from libformatting import FormattingHelper
|
||||
import DateHandler
|
||||
import ThumbNails
|
||||
import Errors
|
||||
from ReportBase import ReportUtils
|
||||
from Editors import EditPerson, EditFamily
|
||||
from gui.editors import EditPerson, EditFamily
|
||||
from DdTargets import DdTargets
|
||||
import cPickle as pickle
|
||||
import config
|
||||
|
||||
@@ -56,7 +56,7 @@ import Errors
|
||||
import Bookmarks
|
||||
import config
|
||||
from DdTargets import DdTargets
|
||||
from Editors import EditPerson
|
||||
from gui.editors import EditPerson
|
||||
from Filters.SideBar import PersonSidebarFilter
|
||||
from gen.plug import CATEGORY_QR_PERSON
|
||||
|
||||
|
||||
@@ -32,7 +32,7 @@ from gui.views.placebaseview import PlaceBaseView
|
||||
from gui.views.treemodels import PlaceTreeModel
|
||||
import gen.lib
|
||||
import Errors
|
||||
from Editors import EditPlace
|
||||
from gui.editors import EditPlace
|
||||
|
||||
#-------------------------------------------------------------------------
|
||||
#
|
||||
|
||||
@@ -47,6 +47,7 @@ import pango
|
||||
#-------------------------------------------------------------------------
|
||||
import gen.lib
|
||||
import gui.views.pageview as PageView
|
||||
from gui.editors import EditPerson, EditFamily
|
||||
from gui.views.navigationview import NavigationView
|
||||
from BasicUtils import name_displayer
|
||||
from Utils import media_path_full, probably_alive
|
||||
@@ -1206,7 +1207,6 @@ class RelationshipView(NavigationView):
|
||||
return item
|
||||
|
||||
def edit_menu(self, obj, handle):
|
||||
from Editors import EditPerson
|
||||
person = self.dbstate.db.get_person_from_handle(handle)
|
||||
try:
|
||||
EditPerson(self.dbstate, self.uistate, [], person)
|
||||
@@ -1394,7 +1394,6 @@ class RelationshipView(NavigationView):
|
||||
self.edit_person(obj, handle)
|
||||
|
||||
def edit_person(self, obj, handle):
|
||||
from Editors import EditPerson
|
||||
person = self.dbstate.db.get_person_from_handle(handle)
|
||||
try:
|
||||
EditPerson(self.dbstate, self.uistate, [], person)
|
||||
@@ -1403,7 +1402,6 @@ class RelationshipView(NavigationView):
|
||||
|
||||
def edit_family(self, obj, event, handle):
|
||||
if button_activated(event, _LEFT_BUTTON):
|
||||
from Editors import EditFamily
|
||||
family = self.dbstate.db.get_family_from_handle(handle)
|
||||
try:
|
||||
EditFamily(self.dbstate, self.uistate, [], family)
|
||||
@@ -1412,7 +1410,6 @@ class RelationshipView(NavigationView):
|
||||
|
||||
def add_family(self, obj, event, handle):
|
||||
if button_activated(event, _LEFT_BUTTON):
|
||||
from Editors import EditFamily
|
||||
family = gen.lib.Family()
|
||||
person = self.dbstate.active
|
||||
if not person:
|
||||
@@ -1429,7 +1426,6 @@ class RelationshipView(NavigationView):
|
||||
pass
|
||||
|
||||
def add_spouse(self, obj):
|
||||
from Editors import EditFamily
|
||||
family = gen.lib.Family()
|
||||
person = self.dbstate.active
|
||||
|
||||
@@ -1453,7 +1449,6 @@ class RelationshipView(NavigationView):
|
||||
def add_child_to_fam(self, obj, event, handle):
|
||||
if button_activated(event, _LEFT_BUTTON):
|
||||
callback = lambda x: self.callback_add_child(x, handle)
|
||||
from Editors import EditPerson
|
||||
person = gen.lib.Person()
|
||||
family = self.dbstate.db.get_family_from_handle(handle)
|
||||
father = self.dbstate.db.get_person_from_handle(
|
||||
@@ -1539,7 +1534,6 @@ class RelationshipView(NavigationView):
|
||||
child)
|
||||
|
||||
def add_parents(self, obj):
|
||||
from Editors import EditFamily
|
||||
family = gen.lib.Family()
|
||||
person = self.dbstate.active
|
||||
|
||||
@@ -1557,7 +1551,6 @@ class RelationshipView(NavigationView):
|
||||
|
||||
def add_parent_family(self, obj, event, handle):
|
||||
if button_activated(event, _LEFT_BUTTON):
|
||||
from Editors import EditFamily
|
||||
family = gen.lib.Family()
|
||||
person = self.dbstate.active
|
||||
|
||||
|
||||
@@ -39,11 +39,10 @@ import gtk
|
||||
import gen.lib
|
||||
from gui.views.listview import ListView
|
||||
from gui.views.treemodels import RepositoryModel
|
||||
import Utils
|
||||
import Bookmarks
|
||||
import Errors
|
||||
import config
|
||||
from Editors import EditRepository, DelRepositoryQuery
|
||||
from gui.editors import EditRepository, DeleteRepositoryQuery
|
||||
from DdTargets import DdTargets
|
||||
from Filters.SideBar import RepoSidebarFilter
|
||||
from gen.plug import CATEGORY_QR_REPOSITORY
|
||||
@@ -199,8 +198,8 @@ class RepositoryView(ListView):
|
||||
item[1] for item in
|
||||
self.dbstate.db.find_backlink_handles(handle, ['Source'])]
|
||||
object = self.dbstate.db.get_repository_from_handle(handle)
|
||||
query = DelRepositoryQuery(self.dbstate, self.uistate, object,
|
||||
source_list)
|
||||
query = DeleteRepositoryQuery(self.dbstate, self.uistate, object,
|
||||
source_list)
|
||||
is_used = len(source_list) > 0
|
||||
return (query, is_used, object)
|
||||
|
||||
|
||||
@@ -45,7 +45,7 @@ import Bookmarks
|
||||
import Errors
|
||||
from DdTargets import DdTargets
|
||||
from QuestionDialog import ErrorDialog
|
||||
from Editors import EditSource, DelSrcQuery
|
||||
from gui.editors import EditSource, DeleteSrcQuery
|
||||
from Filters.SideBar import SourceSidebarFilter
|
||||
|
||||
#-------------------------------------------------------------------------
|
||||
@@ -186,7 +186,7 @@ class SourceView(ListView):
|
||||
def remove_object_from_handle(self, handle):
|
||||
the_lists = Utils.get_source_referents(handle, self.dbstate.db)
|
||||
object = self.dbstate.db.get_source_from_handle(handle)
|
||||
query = DelSrcQuery(self.dbstate, self.uistate, object, the_lists)
|
||||
query = DeleteSrcQuery(self.dbstate, self.uistate, object, the_lists)
|
||||
is_used = any(the_lists)
|
||||
return (query, is_used, object)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user