Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

move src/Editors/* to src/gui/editors as part of GEP008

Browse Source 
svn: r13807
This commit is contained in:
Brian Matherly 2009-12-15 05:56:12 +00:00
parent baa13df670
commit bbe2b6da0c
71 changed files with 194 additions and 280 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/DisplayTabs/_AddrEmbedList.py
View File

@ -107,8 +107,7 @@ class AddrEmbedList(EmbeddedList):
""" """
addr = gen.lib.Address() addr = gen.lib.Address()
try: try:
from Editors import EditAddress from gui.editors import EditAddress
EditAddress(self.dbstate, self.uistate, self.track, EditAddress(self.dbstate, self.uistate, self.track,
addr, self.add_callback) addr, self.add_callback)
except Errors.WindowActiveError: except Errors.WindowActiveError:
@ -131,8 +130,7 @@ class AddrEmbedList(EmbeddedList):
addr = self.get_selected() addr = self.get_selected()
if addr: if addr:
try: try:
from Editors import EditAddress from gui.editors import EditAddress
EditAddress(self.dbstate, self.uistate, self.track, EditAddress(self.dbstate, self.uistate, self.track,
addr, self.edit_callback) addr, self.edit_callback)
except Errors.WindowActiveError: except Errors.WindowActiveError:

2
src/DisplayTabs/_AttrEmbedList.py
View File

@ -69,7 +69,7 @@ class AttrEmbedList(EmbeddedList):
AttrModel, move_buttons=True) AttrModel, move_buttons=True)
def get_editor(self): def get_editor(self):
from Editors import EditAttribute from gui.editors import EditAttribute
return EditAttribute return EditAttribute
def get_user_values(self): def get_user_values(self):

18
src/DisplayTabs/_BackRefList.py
View File

@ -128,59 +128,49 @@ class BackRefList(EmbeddedList):
return (None, None) return (None, None)
def edit_button_clicked(self, obj): def edit_button_clicked(self, obj):
from gui.editors import EditEvent, EditPerson, EditFamily, EditSource, \
EditPlace, EditMedia, EditRepository
(reftype, ref) = self.find_node() (reftype, ref) = self.find_node()
if reftype == 'Person': if reftype == 'Person':
try: try:
from Editors import EditPerson
person = self.dbstate.db.get_person_from_handle(ref) person = self.dbstate.db.get_person_from_handle(ref)
EditPerson(self.dbstate, self.uistate, [], person) EditPerson(self.dbstate, self.uistate, [], person)
except Errors.WindowActiveError: except Errors.WindowActiveError:
pass pass
elif reftype == 'Family': elif reftype == 'Family':
try: try:
from Editors import EditFamily
family = self.dbstate.db.get_family_from_handle(ref) family = self.dbstate.db.get_family_from_handle(ref)
EditFamily(self.dbstate, self.uistate, [], family) EditFamily(self.dbstate, self.uistate, [], family)
except Errors.WindowActiveError: except Errors.WindowActiveError:
pass pass
elif reftype == 'Source': elif reftype == 'Source':
try: try:
from Editors import EditSource
source = self.dbstate.db.get_source_from_handle(ref) source = self.dbstate.db.get_source_from_handle(ref)
EditSource(self.dbstate, self.uistate, [], source) EditSource(self.dbstate, self.uistate, [], source)
except Errors.WindowActiveError: except Errors.WindowActiveError:
pass pass
elif reftype == 'Place': elif reftype == 'Place':
try: try:
from Editors import EditPlace
place = self.dbstate.db.get_place_from_handle(ref) place = self.dbstate.db.get_place_from_handle(ref)
EditPlace(self.dbstate, self.uistate, [], place) EditPlace(self.dbstate, self.uistate, [], place)
except Errors.WindowActiveError: except Errors.WindowActiveError:
pass pass
elif reftype == 'MediaObject': elif reftype == 'MediaObject':
try: try:
from Editors import EditMedia
obj = self.dbstate.db.get_object_from_handle(ref) obj = self.dbstate.db.get_object_from_handle(ref)
EditMedia(self.dbstate, self.uistate, [], obj) EditMedia(self.dbstate, self.uistate, [], obj)
except Errors.WindowActiveError: except Errors.WindowActiveError:
pass pass
elif reftype == 'Event': elif reftype == 'Event':
try: try:
from Editors import EditEvent
event = self.dbstate.db.get_event_from_handle(ref) event = self.dbstate.db.get_event_from_handle(ref)
EditEvent(self.dbstate, self.uistate, [], event) EditEvent(self.dbstate, self.uistate, [], event)
except Errors.WindowActiveError: except Errors.WindowActiveError:
pass pass
elif reftype == 'Repository': elif reftype == 'Repository':
try: try:
from Editors import EditRepository
repo = self.dbstate.db.get_repository_from_handle(ref) repo = self.dbstate.db.get_repository_from_handle(ref)
EditRepository(self.dbstate, self.uistate, [], repo) EditRepository(self.dbstate, self.uistate, [], repo)
except Errors.WindowActiveError: except Errors.WindowActiveError:

4
src/DisplayTabs/_EventEmbedList.py
View File

@ -139,7 +139,7 @@ class EventEmbedList(DbGUIElement, GroupEmbeddedList):
self.rebuild_callback() self.rebuild_callback()
def get_ref_editor(self): def get_ref_editor(self):
from Editors import EditFamilyEventRef from gui.editors import EditFamilyEventRef
return EditFamilyEventRef return EditFamilyEventRef
def get_icon_name(self): def get_icon_name(self):
@ -330,9 +330,9 @@ class EventEmbedList(DbGUIElement, GroupEmbeddedList):
""" """
Edit non native event in own editor Edit non native event in own editor
""" """
from Editors import EditPerson
person = self.dbstate.db.get_person_from_handle(key) person = self.dbstate.db.get_person_from_handle(key)
try: try:
from gui.editors import EditPerson
EditPerson(self.dbstate, self.uistate, [], person) EditPerson(self.dbstate, self.uistate, [], person)
except Errors.WindowActiveError: except Errors.WindowActiveError:
pass pass

2
src/DisplayTabs/_FamilyAttrEmbedList.py
View File

@ -38,7 +38,7 @@ class FamilyAttrEmbedList(AttrEmbedList):
AttrEmbedList.__init__(self, dbstate, uistate, track, data) AttrEmbedList.__init__(self, dbstate, uistate, track, data)
def get_editor(self): def get_editor(self):
from Editors import EditFamilyAttribute from gui.editors import EditFamilyAttribute
return EditFamilyAttribute return EditFamilyAttribute
def get_user_values(self): def get_user_values(self):

2
src/DisplayTabs/_FamilyLdsEmbedList.py
View File

@ -59,7 +59,7 @@ class FamilyLdsEmbedList(LdsEmbedList):
LdsEmbedList.__init__(self, dbstate, uistate, track, data) LdsEmbedList.__init__(self, dbstate, uistate, track, data)
def get_editor(self): def get_editor(self):
from Editors import EditFamilyLdsOrd from gui.editors import EditFamilyLdsOrd
return EditFamilyLdsOrd return EditFamilyLdsOrd
def new_data(self): def new_data(self):

6
src/DisplayTabs/_GalleryTab.py
View File

@ -267,7 +267,7 @@ class GalleryTab(ButtonTab, DbGUIElement):
def add_button_clicked(self, obj): def add_button_clicked(self, obj):
try: try:
from Editors import EditMediaRef from gui.editors import EditMediaRef
EditMediaRef(self.dbstate, self.uistate, self.track, EditMediaRef(self.dbstate, self.uistate, self.track,
gen.lib.MediaObject(), gen.lib.MediaRef(), gen.lib.MediaObject(), gen.lib.MediaRef(),
self.add_callback) self.add_callback)
@ -295,7 +295,7 @@ class GalleryTab(ButtonTab, DbGUIElement):
if src: if src:
sref = gen.lib.MediaRef() sref = gen.lib.MediaRef()
try: try:
from Editors import EditMediaRef from gui.editors import EditMediaRef
EditMediaRef(self.dbstate, self.uistate, self.track, EditMediaRef(self.dbstate, self.uistate, self.track,
src, sref, self.add_callback) src, sref, self.add_callback)
except Errors.WindowActiveError: except Errors.WindowActiveError:
@ -313,7 +313,7 @@ class GalleryTab(ButtonTab, DbGUIElement):
obj = self.dbstate.db.get_object_from_handle( obj = self.dbstate.db.get_object_from_handle(
ref.get_reference_handle()) ref.get_reference_handle())
try: try:
from Editors import EditMediaRef from gui.editors import EditMediaRef
EditMediaRef(self.dbstate, self.uistate, self.track, EditMediaRef(self.dbstate, self.uistate, self.track,
obj, ref, None) obj, ref, None)
except Errors.WindowActiveError: except Errors.WindowActiveError:

2
src/DisplayTabs/_LdsEmbedList.py
View File

@ -71,7 +71,7 @@ class LdsEmbedList(EmbeddedList):
LdsModel, move_buttons=True) LdsModel, move_buttons=True)
def get_editor(self): def get_editor(self):
from Editors import EditLdsOrd from gui.editors import EditLdsOrd
return EditLdsOrd return EditLdsOrd
def new_data(self): def new_data(self):

6
src/DisplayTabs/_LocationEmbedList.py
View File

@ -73,8 +73,7 @@ class LocationEmbedList(EmbeddedList):
def add_button_clicked(self, obj): def add_button_clicked(self, obj):
loc = gen.lib.Location() loc = gen.lib.Location()
try: try:
from Editors import EditLocation from gui.editors import EditLocation
EditLocation(self.dbstate, self.uistate, self.track, EditLocation(self.dbstate, self.uistate, self.track,
loc, self.add_callback) loc, self.add_callback)
except Errors.WindowActiveError: except Errors.WindowActiveError:
@ -88,8 +87,7 @@ class LocationEmbedList(EmbeddedList):
loc = self.get_selected() loc = self.get_selected()
if loc: if loc:
try: try:
from Editors import EditLocation from gui.editors import EditLocation
EditLocation(self.dbstate, self.uistate, self.track, EditLocation(self.dbstate, self.uistate, self.track,
loc, self.edit_callback) loc, self.edit_callback)
except Errors.WindowActiveError: except Errors.WindowActiveError:

5
src/DisplayTabs/_NameEmbedList.py
View File

@ -147,8 +147,7 @@ class NameEmbedList(GroupEmbeddedList):
def add_button_clicked(self, obj): def add_button_clicked(self, obj):
name = gen.lib.Name() name = gen.lib.Name()
try: try:
from Editors import EditName from gui.editors import EditName
EditName(self.dbstate, self.uistate, self.track, EditName(self.dbstate, self.uistate, self.track,
name, self.add_callback) name, self.add_callback)
except Errors.WindowActiveError: except Errors.WindowActiveError:
@ -162,7 +161,7 @@ class NameEmbedList(GroupEmbeddedList):
name = self.get_selected() name = self.get_selected()
if name and name[1] is not None: if name and name[1] is not None:
try: try:
from Editors import EditName from gui.editors import EditName
if name[0] == NameModel.ALTINDEX: if name[0] == NameModel.ALTINDEX:
EditName(self.dbstate, self.uistate, self.track, EditName(self.dbstate, self.uistate, self.track,
name[1], self.edit_callback) name[1], self.edit_callback)

4
src/DisplayTabs/_NoteTab.py
View File

@ -130,7 +130,7 @@ class NoteTab(EmbeddedList, DbGUIElement):
if self.notetype : if self.notetype :
note.set_type(self.notetype) note.set_type(self.notetype)
try: try:
from Editors import EditNote from gui.editors import EditNote
EditNote(self.dbstate, self.uistate, self.track, EditNote(self.dbstate, self.uistate, self.track,
note, self.add_callback, note, self.add_callback,
self.callertitle, extratype = [self.notetype]) self.callertitle, extratype = [self.notetype])
@ -159,7 +159,7 @@ class NoteTab(EmbeddedList, DbGUIElement):
if handle: if handle:
note = self.dbstate.db.get_note_from_handle(handle) note = self.dbstate.db.get_note_from_handle(handle)
try: try:
from Editors import EditNote from gui.editors import EditNote
EditNote(self.dbstate, self.uistate, self.track, note, EditNote(self.dbstate, self.uistate, self.track, note,
callertitle = self.callertitle, callertitle = self.callertitle,
extratype = [self.notetype] ) extratype = [self.notetype] )

4
src/DisplayTabs/_PersonEventEmbedList.py
View File

@ -117,16 +117,16 @@ class PersonEventEmbedList(EventEmbedList):
return gen.lib.EventType(gen.lib.EventType.BIRTH) return gen.lib.EventType(gen.lib.EventType.BIRTH)
def get_ref_editor(self): def get_ref_editor(self):
from Editors import EditEventRef from gui.editors import EditEventRef
return EditEventRef return EditEventRef
def editnotworkgroup(self, key): def editnotworkgroup(self, key):
""" """
Edit non native event in own editor Edit non native event in own editor
""" """
from Editors import EditFamily
family = self.dbstate.db.get_family_from_handle(key) family = self.dbstate.db.get_family_from_handle(key)
try: try:
from gui.editors import EditFamily
EditFamily(self.dbstate, self.uistate, [], family) EditFamily(self.dbstate, self.uistate, [], family)
except Errors.WindowActiveError: except Errors.WindowActiveError:
pass pass

9
src/DisplayTabs/_PersonRefEmbedList.py
View File

@ -71,7 +71,7 @@ class PersonRefEmbedList(EmbeddedList):
move_buttons=True) move_buttons=True)
def get_ref_editor(self): def get_ref_editor(self):
from Editors import EditPersonRef from gui.editors import EditPersonRef
return EditPersonRef return EditPersonRef
def get_data(self): def get_data(self):
@ -81,8 +81,7 @@ class PersonRefEmbedList(EmbeddedList):
return ((1, 0), (1, 1), (1, 2)) return ((1, 0), (1, 1), (1, 2))
def add_button_clicked(self, obj): def add_button_clicked(self, obj):
from Editors import EditPersonRef from gui.editors import EditPersonRef
try: try:
ref = gen.lib.PersonRef() ref = gen.lib.PersonRef()
ref.rel = _('Godfather') ref.rel = _('Godfather')
@ -97,10 +96,10 @@ class PersonRefEmbedList(EmbeddedList):
self.rebuild() self.rebuild()
def edit_button_clicked(self, obj): def edit_button_clicked(self, obj):
from gui.editors import EditPersonRef
ref = self.get_selected() ref = self.get_selected()
if ref: if ref:
try: try:
from Editors import EditPersonRef
EditPersonRef( EditPersonRef(
self.dbstate, self.uistate, self.track, self.dbstate, self.uistate, self.track,
ref, self.edit_callback) ref, self.edit_callback)
@ -115,8 +114,8 @@ class PersonRefEmbedList(EmbeddedList):
And event reference that is from a drag and drop has And event reference that is from a drag and drop has
an unknown event reference type an unknown event reference type
""" """
from gui.editors import EditPersonRef
try: try:
from Editors import EditPersonRef
ref = gen.lib.PersonRef(obj) ref = gen.lib.PersonRef(obj)
ref.rel = _('Unknown') ref.rel = _('Unknown')
EditPersonRef( EditPersonRef(

12
src/DisplayTabs/_RepoEmbedList.py
View File

@ -99,9 +99,8 @@ class RepoEmbedList(EmbeddedList, DbGUIElement):
return ((1, 0), (1, 1), (1, 2), (1, 3)) return ((1, 0), (1, 1), (1, 2), (1, 3))
def handle_extra_type(self, objtype, obj): def handle_extra_type(self, objtype, obj):
from gui.editors import EditRepoRef
try: try:
from Editors import EditRepoRef
ref = gen.lib.RepoRef() ref = gen.lib.RepoRef()
repo = self.dbstate.db.get_repository_from_handle(obj) repo = self.dbstate.db.get_repository_from_handle(obj)
EditRepoRef( EditRepoRef(
@ -111,11 +110,10 @@ class RepoEmbedList(EmbeddedList, DbGUIElement):
pass pass
def add_button_clicked(self, obj): def add_button_clicked(self, obj):
from gui.editors import EditRepoRef
ref = gen.lib.RepoRef() ref = gen.lib.RepoRef()
repo = gen.lib.Repository() repo = gen.lib.Repository()
try: try:
from Editors import EditRepoRef
EditRepoRef( EditRepoRef(
self.dbstate, self.uistate, self.track, self.dbstate, self.uistate, self.track,
repo, ref, self.add_callback) repo, ref, self.add_callback)
@ -133,8 +131,7 @@ class RepoEmbedList(EmbeddedList, DbGUIElement):
repo = sel.run() repo = sel.run()
if repo: if repo:
try: try:
from Editors import EditRepoRef from gui.editors import EditRepoRef
ref = gen.lib.RepoRef() ref = gen.lib.RepoRef()
EditRepoRef(self.dbstate, EditRepoRef(self.dbstate,
self.uistate, self.uistate,
@ -158,8 +155,7 @@ class RepoEmbedList(EmbeddedList, DbGUIElement):
if ref: if ref:
repo = self.dbstate.db.get_repository_from_handle(ref.ref) repo = self.dbstate.db.get_repository_from_handle(ref.ref)
try: try:
from Editors import EditRepoRef from gui.editors import EditRepoRef
EditRepoRef( EditRepoRef(
self.dbstate, self.uistate, self.track, repo, self.dbstate, self.uistate, self.track, repo,
ref, self.edit_callback) ref, self.edit_callback)

12
src/DisplayTabs/_SourceEmbedList.py
View File

@ -99,9 +99,8 @@ class SourceEmbedList(EmbeddedList, DbGUIElement):
return ((1, 0), (1, 1), (1, 2), (1, 3)) return ((1, 0), (1, 1), (1, 2), (1, 3))
def add_button_clicked(self, obj): def add_button_clicked(self, obj):
from gui.editors import EditSourceRef
try: try:
from Editors import EditSourceRef
sref = gen.lib.SourceRef() sref = gen.lib.SourceRef()
src = gen.lib.Source() src = gen.lib.Source()
EditSourceRef( EditSourceRef(
@ -115,14 +114,13 @@ class SourceEmbedList(EmbeddedList, DbGUIElement):
pass pass
def share_button_clicked(self, obj): def share_button_clicked(self, obj):
from gui.editors import EditSourceRef
SelectSource = SelectorFactory('Source') SelectSource = SelectorFactory('Source')
sel = SelectSource(self.dbstate,self.uistate,self.track) sel = SelectSource(self.dbstate,self.uistate,self.track)
src = sel.run() src = sel.run()
if src: if src:
try: try:
from Editors import EditSourceRef
ref = gen.lib.SourceRef() ref = gen.lib.SourceRef()
EditSourceRef(self.dbstate, EditSourceRef(self.dbstate,
self.uistate, self.uistate,
@ -135,13 +133,12 @@ class SourceEmbedList(EmbeddedList, DbGUIElement):
pass pass
def edit_button_clicked(self, obj): def edit_button_clicked(self, obj):
from gui.editors import EditSourceRef
sref = self.get_selected() sref = self.get_selected()
if sref: if sref:
src = self.dbstate.db.get_source_from_handle(sref.ref) src = self.dbstate.db.get_source_from_handle(sref.ref)
try: try:
from Editors import EditSourceRef
EditSourceRef(self.dbstate, self.uistate, self.track, EditSourceRef(self.dbstate, self.uistate, self.track,
src, sref, self.object_edited) src, sref, self.object_edited)
except Errors.WindowActiveError: except Errors.WindowActiveError:
@ -180,11 +177,10 @@ class SourceEmbedList(EmbeddedList, DbGUIElement):
self.rebuild() self.rebuild()
def handle_extra_type(self, objtype, obj): def handle_extra_type(self, objtype, obj):
from gui.editors import EditSourceRef
sref = gen.lib.SourceRef() sref = gen.lib.SourceRef()
src = self.dbstate.db.get_source_from_handle(obj) src = self.dbstate.db.get_source_from_handle(obj)
try: try:
from Editors import EditSourceRef
EditSourceRef(self.dbstate, self.uistate, self.track, EditSourceRef(self.dbstate, self.uistate, self.track,
src, sref, self.object_added) src, sref, self.object_added)
except Errors.WindowActiveError: except Errors.WindowActiveError:

6
src/DisplayTabs/_WebEmbedList.py
View File

@ -81,10 +81,9 @@ class WebEmbedList(EmbeddedList):
return ((1, 0), (1, 1), (1, 2)) return ((1, 0), (1, 1), (1, 2))
def add_button_clicked(self, obj): def add_button_clicked(self, obj):
from gui.editors import EditUrl
url = gen.lib.Url() url = gen.lib.Url()
try: try:
from Editors import EditUrl
EditUrl(self.dbstate, self.uistate, self.track, EditUrl(self.dbstate, self.uistate, self.track,
'', url, self.add_callback) '', url, self.add_callback)
except Errors.WindowActiveError: except Errors.WindowActiveError:
@ -95,11 +94,10 @@ class WebEmbedList(EmbeddedList):
self.rebuild() self.rebuild()
def edit_button_clicked(self, obj): def edit_button_clicked(self, obj):
from gui.editors import EditUrl
url = self.get_selected() url = self.get_selected()
if url: if url:
try: try:
from Editors import EditUrl
EditUrl(self.dbstate, self.uistate, self.track, EditUrl(self.dbstate, self.uistate, self.track,
'', url, self.edit_callback) '', url, self.edit_callback)
except Errors.WindowActiveError: except Errors.WindowActiveError:

46
src/Editors/Makefile.am
View File

@ -1,46 +0,0 @@
# This is the src/Editors 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@/Editors
pkgdata_PYTHON = \
AddMedia.py\
__init__.py\
_EditAddress.py \
_EditAttribute.py \
_EditChildRef.py \
_EditEvent.py \
_EditEventRef.py \
_EditFamily.py \
_EditLdsOrd.py \
_EditLocation.py \
_EditMedia.py \
_EditMediaRef.py \
_EditName.py \
_EditPerson.py \
_EditPersonRef.py \
_EditPlace.py \
_EditPrimary.py \
_EditReference.py \
_EditRepository.py \
_EditRepoRef.py \
_EditSecondary.py \
_EditSource.py \
_EditSourceRef.py \
_EditNote.py \
_EditUrl.py \
ObjectEntries.py
pkgpyexecdir = @pkgpyexecdir@/Editors
pkgpythondir = @pkgpythondir@/Editors
# Clean up all the byte-compiled files
MOSTLYCLEANFILES = *pyc *pyo
GRAMPS_PY_MODPATH = "../"
pycheck:
(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
pychecker $(pkgdata_PYTHON));

40
src/Editors/__init__.py
View File

@ -1,40 +0,0 @@
#
# Gramps - a GTK+/GNOME based genealogy program
#
# Copyright (C) 2000-2006 Donald N. Allingham
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
from _EditNote import *
from _EditAddress import *
from _EditAttribute import *
from _EditEvent import *
from _EditEventRef import *
from _EditFamily import *
from _EditLdsOrd import *
from _EditLocation import *
from _EditMedia import *
from _EditMediaRef import *
from _EditName import *
from _EditPerson import *
from _EditPlace import *
from _EditRepository import *
from _EditRepoRef import *
from _EditSource import *
from _EditSourceRef import *
from _EditUrl import *
from _EditPersonRef import *
from _EditChildRef import *

2
src/Makefile.am
View File

@ -8,7 +8,6 @@ SUBDIRS = \
DateHandler \ DateHandler \
DisplayTabs \ DisplayTabs \
docgen \ docgen \
Editors \
Filters \ Filters \
FilterEditor \ FilterEditor \
gen \ gen \
@ -24,7 +23,6 @@ SUBDIRS = \
PluginUtils \ PluginUtils \
plugins \ plugins \
ReportBase \ ReportBase \
Selectors \
Simple Simple
gdirdir=$(prefix)/share/gramps gdirdir=$(prefix)/share/gramps

3
src/PluginUtils/_PluginWindows.py
View File

@ -51,7 +51,7 @@ from gui.utils import open_file_with_default_application
from gui.pluginmanager import GuiPluginManager from gui.pluginmanager import GuiPluginManager
import _Tool as Tool import _Tool as Tool
from QuestionDialog import InfoDialog from QuestionDialog import InfoDialog
import config from gui.editors import EditPerson
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #
@ -468,7 +468,6 @@ class ToolManagedWindowBase(ManagedWindow.ManagedWindow):
return False # handle event further, if necessary return False # handle event further, if necessary
def on_button_press(self, view, event): def on_button_press(self, view, event):
from Editors import EditPerson
buffer_location = view.window_to_buffer_coords(gtk.TEXT_WINDOW_TEXT, buffer_location = view.window_to_buffer_coords(gtk.TEXT_WINDOW_TEXT,
int(event.x), int(event.x),
int(event.y)) int(event.y))

4
src/Simple/_SimpleTable.py
View File

@ -31,6 +31,8 @@ import gen.lib
import Errors import Errors
import config import config
import DateHandler import DateHandler
from gui.editors import (EditPerson, EditEvent, EditFamily, EditSource,
EditPlace, EditRepository)
class SimpleTable(object): class SimpleTable(object):
""" """
@ -84,8 +86,6 @@ class SimpleTable(object):
""" """
Handle events on tables. obj is a treeview Handle events on tables. obj is a treeview
""" """
from Editors import (EditPerson, EditEvent, EditFamily, EditSource,
EditPlace, EditRepository)
selection = obj.get_selection() selection = obj.get_selection()
store, node = selection.get_selected() store, node = selection.get_selected()
if not node: if not node:

1
src/gui/Makefile.am
View File

@ -4,6 +4,7 @@
# If not using GNU make, then list all .py files individually # If not using GNU make, then list all .py files individually
SUBDIRS = \ SUBDIRS = \
editors \
selectors \ selectors \
views \ views \
widgets widgets

2
src/gui/__init__.py
View File

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

46
src/gui/editors/Makefile.am Normal file
View File

@ -0,0 +1,46 @@
# This is the src/Editors 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@/gui/editors
pkgdata_PYTHON = \
addmedia.py\
__init__.py\
editaddress.py \
editattribute.py \
editchildRef.py \
editevent.py \
editeventRef.py \
editfamily.py \
editldsOrd.py \
editlocation.py \
editmedia.py \
editmediaRef.py \
editname.py \
editnote.py \
editperson.py \
editpersonRef.py \
editplace.py \
editprimary.py \
editreference.py \
editrepository.py \
editrepoRef.py \
editsecondary.py \
editsource.py \
editsourceRef.py \
editurl.py \
objectentries.py
pkgpyexecdir = @pkgpyexecdir@/src/editors
pkgpythondir = @pkgpythondir@/src/editors
# Clean up all the byte-compiled files
MOSTLYCLEANFILES = *pyc *pyo
GRAMPS_PY_MODPATH = "../../"
pycheck:
(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
pychecker $(pkgdata_PYTHON));

40
src/gui/editors/__init__.py Normal file
View File

@ -0,0 +1,40 @@
#
# Gramps - a GTK+/GNOME based genealogy program
#
# Copyright (C) 2000-2006 Donald N. Allingham
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
from editaddress import EditAddress
from editattribute import EditAttribute, EditFamilyAttribute
from editchildref import EditChildRef
from editevent import EditEvent, DeleteEventQuery
from editeventref import EditEventRef
from editfamily import EditFamily
from editldsord import EditLdsOrd, EditFamilyLdsOrd
from editlocation import EditLocation
from editmedia import EditMedia, DeleteMediaQuery
from editmediaref import EditMediaRef
from editname import EditName
from editnote import EditNote, DeleteNoteQuery
from editperson import EditPerson
from editpersonref import EditPersonRef
from editplace import EditPlace, DeletePlaceQuery
from editrepository import EditRepository, DeleteRepositoryQuery
from editreporef import EditRepoRef
from editsource import EditSource, DeleteSrcQuery
from editsourceref import EditSourceRef
from editurl import EditUrl

0
src/Editors/AddMedia.py → src/gui/editors/addmedia.py
View File

4
src/Editors/_EditAddress.py → src/gui/editors/editaddress.py
View File

@ -45,9 +45,7 @@ import gtk
# gramps modules # gramps modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
import const from editsecondary import EditSecondary
import config
from _EditSecondary import EditSecondary
from gen.lib import NoteType from gen.lib import NoteType
from glade import Glade from glade import Glade
from DisplayTabs import SourceEmbedList, NoteTab from DisplayTabs import SourceEmbedList, NoteTab

4
src/Editors/_EditAttribute.py → src/gui/editors/editattribute.py
View File

@ -45,9 +45,7 @@ import gtk
# gramps modules # gramps modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
import const from editsecondary import EditSecondary
import config
from _EditSecondary import EditSecondary
from gen.lib import NoteType from gen.lib import NoteType
from glade import Glade from glade import Glade
from DisplayTabs import SourceEmbedList, NoteTab from DisplayTabs import SourceEmbedList, NoteTab

4
src/Editors/_EditChildRef.py → src/gui/editors/editchildref.py
View File

@ -45,11 +45,9 @@ import gtk
# gramps modules # gramps modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
import const from editsecondary import EditSecondary
from _EditSecondary import EditSecondary
from gen.lib import NoteType from gen.lib import NoteType
import Errors import Errors
import config
from glade import Glade from glade import Glade
from DisplayTabs import SourceEmbedList, NoteTab from DisplayTabs import SourceEmbedList, NoteTab
from gui.widgets import MonitoredDataType, PrivacyButton from gui.widgets import MonitoredDataType, PrivacyButton

7
src/Editors/_EditEvent.py → src/gui/editors/editevent.py
View File

@ -41,11 +41,10 @@ import gtk
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
import const import const
import config
import gen.lib import gen.lib
import GrampsDisplay import GrampsDisplay
from _EditPrimary import EditPrimary from editprimary import EditPrimary
from ObjectEntries import PlaceEntry from objectentries import PlaceEntry
from glade import Glade from glade import Glade
from QuestionDialog import ErrorDialog from QuestionDialog import ErrorDialog
from DisplayTabs import (SourceEmbedList, NoteTab, GalleryTab, from DisplayTabs import (SourceEmbedList, NoteTab, GalleryTab,
@ -316,7 +315,7 @@ class EditFamilyEvent(EditEvent):
# Delete Query class # Delete Query class
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
class DelEventQuery(object): class DeleteEventQuery(object):
def __init__(self, dbstate, uistate, event, person_list, family_list): def __init__(self, dbstate, uistate, event, person_list, family_list):
self.event = event self.event = event
self.db = dbstate.db self.db = dbstate.db

6
src/Editors/_EditEventRef.py → src/gui/editors/editeventref.py
View File

@ -33,17 +33,15 @@ from gettext import gettext as _
# gramps modules # gramps modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
import const
import config
import gen.lib import gen.lib
from glade import Glade from glade import Glade
from DisplayTabs import (SourceEmbedList, NoteTab, GalleryTab, from DisplayTabs import (SourceEmbedList, NoteTab, GalleryTab,
EventBackRefList, AttrEmbedList) EventBackRefList, AttrEmbedList)
from gui.widgets import (PrivacyButton, MonitoredEntry, from gui.widgets import (PrivacyButton, MonitoredEntry,
MonitoredDate, MonitoredDataType) MonitoredDate, MonitoredDataType)
from _EditReference import RefTab, EditReference from editreference import RefTab, EditReference
from ObjectEntries import PlaceEntry from objectentries import PlaceEntry
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #

12
src/Editors/_EditFamily.py → src/gui/editors/editfamily.py
View File

@ -54,7 +54,6 @@ import pango
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
import Utils import Utils
import const
import config import config
from BasicUtils import name_displayer from BasicUtils import name_displayer
import gen.lib import gen.lib
@ -62,7 +61,9 @@ import Errors
import DateHandler import DateHandler
from glade import Glade from glade import Glade
from Editors import EditPrimary from editprimary import EditPrimary
from editchildref import EditChildRef
from editperson import EditPerson
from ReportBase import ReportUtils from ReportBase import ReportUtils
from DisplayTabs import (EmbeddedList, EventEmbedList, SourceEmbedList, from DisplayTabs import (EmbeddedList, EventEmbedList, SourceEmbedList,
FamilyAttrEmbedList, NoteTab, GalleryTab, FamilyAttrEmbedList, NoteTab, GalleryTab,
@ -203,7 +204,6 @@ class ChildEmbedList(EmbeddedList):
(0, 8), (0, 9)] (0, 8), (0, 9)]
def add_button_clicked(self, obj): def add_button_clicked(self, obj):
from Editors import EditPerson
person = gen.lib.Person() person = gen.lib.Person()
autoname = config.get('behavior.surname-guessing') autoname = config.get('behavior.surname-guessing')
#_("Father's surname"), #_("Father's surname"),
@ -268,8 +268,6 @@ class ChildEmbedList(EmbeddedList):
self.call_edit_childref(handle) self.call_edit_childref(handle)
def call_edit_childref(self, handle): def call_edit_childref(self, handle):
from Editors import EditChildRef
for ref in self.family.get_child_ref_list(): for ref in self.family.get_child_ref_list():
if ref.ref == handle: if ref.ref == handle:
p = self.dbstate.db.get_person_from_handle(handle) p = self.dbstate.db.get_person_from_handle(handle)
@ -284,8 +282,6 @@ class ChildEmbedList(EmbeddedList):
def edit_child_button_clicked(self, obj): def edit_child_button_clicked(self, obj):
handle = self.get_selected() handle = self.get_selected()
if handle: if handle:
from Editors import EditPerson
for ref in self.family.get_child_ref_list(): for ref in self.family.get_child_ref_list():
if ref.ref == handle: if ref.ref == handle:
p = self.dbstate.db.get_person_from_handle(handle) p = self.dbstate.db.get_person_from_handle(handle)
@ -736,7 +732,6 @@ class EditFamily(EditPrimary):
self.mbutton_del, self.mbutton_edit) self.mbutton_del, self.mbutton_edit)
def add_mother_clicked(self, obj): def add_mother_clicked(self, obj):
from Editors import EditPerson
person = gen.lib.Person() person = gen.lib.Person()
person.set_gender(gen.lib.Person.FEMALE) person.set_gender(gen.lib.Person.FEMALE)
autoname = config.get('behavior.surname-guessing') autoname = config.get('behavior.surname-guessing')
@ -754,7 +749,6 @@ class EditFamily(EditPrimary):
self.new_mother_added) self.new_mother_added)
def add_father_clicked(self, obj): def add_father_clicked(self, obj):
from Editors import EditPerson
person = gen.lib.Person() person = gen.lib.Person()
person.set_gender(gen.lib.Person.MALE) person.set_gender(gen.lib.Person.MALE)
autoname = config.get('behavior.surname-guessing') autoname = config.get('behavior.surname-guessing')

4
src/Editors/_EditLdsOrd.py → src/gui/editors/editldsord.py
View File

@ -48,8 +48,8 @@ import gen.lib
from BasicUtils import name_displayer from BasicUtils import name_displayer
import LdsUtils import LdsUtils
from glade import Glade from glade import Glade
from _EditSecondary import EditSecondary from editsecondary import EditSecondary
from ObjectEntries import PlaceEntry from objectentries import PlaceEntry
from DisplayTabs import SourceEmbedList,NoteTab from DisplayTabs import SourceEmbedList,NoteTab
from gui.widgets import (PrivacyButton, MonitoredDate, from gui.widgets import (PrivacyButton, MonitoredDate,
MonitoredMenu, MonitoredStrMenu) MonitoredMenu, MonitoredStrMenu)

4
src/Editors/_EditLocation.py → src/gui/editors/editlocation.py
View File

@ -26,9 +26,7 @@
# gramps modules # gramps modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
import const from editsecondary import EditSecondary
import config
from _EditSecondary import EditSecondary
from glade import Glade from glade import Glade
from gui.widgets import MonitoredEntry from gui.widgets import MonitoredEntry
from gettext import gettext as _ from gettext import gettext as _

6
src/Editors/_EditMedia.py → src/gui/editors/editmedia.py
View File

@ -41,17 +41,15 @@ import gtk
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from gui.utils import open_file_with_default_application from gui.utils import open_file_with_default_application
import const
import config
import gen.lib import gen.lib
import Mime import Mime
import ThumbNails import ThumbNails
import Utils import Utils
from Editors import EditPrimary from editprimary import EditPrimary
from gui.widgets import MonitoredDate, MonitoredEntry, PrivacyButton from gui.widgets import MonitoredDate, MonitoredEntry, PrivacyButton
from DisplayTabs import (SourceEmbedList, AttrEmbedList, NoteTab, from DisplayTabs import (SourceEmbedList, AttrEmbedList, NoteTab,
MediaBackRefList) MediaBackRefList)
from Editors.AddMedia import AddMediaObject from addmedia import AddMediaObject
from QuestionDialog import ErrorDialog from QuestionDialog import ErrorDialog
from glade import Glade from glade import Glade

5
src/Editors/_EditMediaRef.py → src/gui/editors/editmediaref.py
View File

@ -43,7 +43,6 @@ import gtk
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from gui.utils import open_file_with_default_application from gui.utils import open_file_with_default_application
import const import const
import config
import Mime import Mime
import ThumbNails import ThumbNails
import Utils import Utils
@ -52,8 +51,8 @@ from glade import Glade
from DisplayTabs import (SourceEmbedList, AttrEmbedList, MediaBackRefList, from DisplayTabs import (SourceEmbedList, AttrEmbedList, MediaBackRefList,
NoteTab) NoteTab)
from gui.widgets import MonitoredSpinButton, MonitoredEntry, PrivacyButton from gui.widgets import MonitoredSpinButton, MonitoredEntry, PrivacyButton
from _EditReference import RefTab, EditReference from editreference import RefTab, EditReference
from AddMedia import AddMediaObject from addmedia import AddMediaObject
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #

4
src/Editors/_EditName.py → src/gui/editors/editname.py
View File

@ -41,10 +41,8 @@ import gtk
# gramps modules # gramps modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
import const
import config
from BasicUtils import name_displayer from BasicUtils import name_displayer
from _EditSecondary import EditSecondary from editsecondary import EditSecondary
from gen.lib import NoteType from gen.lib import NoteType
from DisplayTabs import GrampsTab,SourceEmbedList,NoteTab from DisplayTabs import GrampsTab,SourceEmbedList,NoteTab
from gui.widgets import (MonitoredEntry, MonitoredMenu, MonitoredDate, from gui.widgets import (MonitoredEntry, MonitoredMenu, MonitoredDate,

4
src/Editors/_EditNote.py → src/gui/editors/editnote.py
View File

@ -29,7 +29,7 @@
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from gettext import gettext as _ from gettext import gettext as _
import logging import logging
_LOG = logging.getLogger(".Editors.EditNote") _LOG = logging.getLogger(".gui.editors.EditNote")
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #
@ -48,7 +48,7 @@ import pango
import config import config
import const import const
from gui.widgets import StyledTextEditor from gui.widgets import StyledTextEditor
from Editors._EditPrimary import EditPrimary from editprimary import EditPrimary
from DisplayTabs import GrampsTab, NoteBackRefList from DisplayTabs import GrampsTab, NoteBackRefList
from gui.widgets import (MonitoredDataType, MonitoredCheckbox, from gui.widgets import (MonitoredDataType, MonitoredCheckbox,
MonitoredEntry, PrivacyButton) MonitoredEntry, PrivacyButton)

9
src/Editors/_EditPerson.py → src/gui/editors/editperson.py
View File

@ -57,7 +57,9 @@ import Errors
from glade import Glade from glade import Glade
from gen.utils import set_birth_death_index from gen.utils import set_birth_death_index
from Editors._EditPrimary import EditPrimary from editprimary import EditPrimary
from editmediaref import EditMediaRef
from editname import EditName
import config import config
from QuestionDialog import ErrorDialog, ICON from QuestionDialog import ErrorDialog, ICON
@ -482,8 +484,6 @@ class EditPerson(EditPrimary):
media_list = self.obj.get_media_list() media_list = self.obj.get_media_list()
if media_list: if media_list:
from Editors import EditMediaRef
media_ref = media_list[0] media_ref = media_list[0]
object_handle = media_ref.get_reference_handle() object_handle = media_ref.get_reference_handle()
media_obj = self.db.get_object_from_handle(object_handle) media_obj = self.db.get_object_from_handle(object_handle)
@ -535,8 +535,6 @@ class EditPerson(EditPrimary):
""" """
media_list = self.obj.get_media_list() media_list = self.obj.get_media_list()
if media_list: if media_list:
from Editors import EditMediaRef
media_ref = media_list[0] media_ref = media_list[0]
object_handle = media_ref.get_reference_handle() object_handle = media_ref.get_reference_handle()
media_obj = self.db.get_object_from_handle(object_handle) media_obj = self.db.get_object_from_handle(object_handle)
@ -768,7 +766,6 @@ class EditPerson(EditPrimary):
on the main form (not in the names tab). on the main form (not in the names tab).
""" """
from Editors import EditName
EditName(self.dbstate, self.uistate, self.track, EditName(self.dbstate, self.uistate, self.track,
self.pname, self._update_name) self.pname, self._update_name)

2
src/Editors/_EditPersonRef.py → src/gui/editors/editpersonref.py
View File

@ -46,7 +46,7 @@ import gtk
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from BasicUtils import name_displayer from BasicUtils import name_displayer
from _EditSecondary import EditSecondary from editsecondary import EditSecondary
from gen.lib import NoteType from gen.lib import NoteType
from gui.widgets import MonitoredEntry, PrivacyButton from gui.widgets import MonitoredEntry, PrivacyButton
from gui.selectors import SelectorFactory from gui.selectors import SelectorFactory

4
src/Editors/_EditPlace.py → src/gui/editors/editplace.py
View File

@ -42,10 +42,8 @@ import gtk
# gramps modules # gramps modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
import const
import config
import gen.lib import gen.lib
from Editors._EditPrimary import EditPrimary from editprimary import EditPrimary
from DisplayTabs import (GrampsTab, LocationEmbedList, SourceEmbedList, from DisplayTabs import (GrampsTab, LocationEmbedList, SourceEmbedList,
GalleryTab, NoteTab, WebEmbedList, PlaceBackRefList) GalleryTab, NoteTab, WebEmbedList, PlaceBackRefList)
from gui.widgets import MonitoredEntry, PrivacyButton from gui.widgets import MonitoredEntry, PrivacyButton

0
src/Editors/_EditPrimary.py → src/gui/editors/editprimary.py
View File

0
src/Editors/_EditReference.py → src/gui/editors/editreference.py
View File

5
src/Editors/_EditRepoRef.py → src/gui/editors/editreporef.py
View File

@ -33,14 +33,11 @@ from gettext import gettext as _
# gramps modules # gramps modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
import const
import config
from gen.lib import NoteType from gen.lib import NoteType
from DisplayTabs import NoteTab,AddrEmbedList,WebEmbedList,SourceBackRefList from DisplayTabs import NoteTab,AddrEmbedList,WebEmbedList,SourceBackRefList
from gui.widgets import MonitoredEntry, PrivacyButton, MonitoredDataType from gui.widgets import MonitoredEntry, PrivacyButton, MonitoredDataType
from _EditReference import RefTab, EditReference from editreference import RefTab, EditReference
from glade import Glade from glade import Glade
#------------------------------------------------------------------------- #-------------------------------------------------------------------------

6
src/Editors/_EditRepository.py → src/gui/editors/editrepository.py
View File

@ -40,13 +40,11 @@ import gtk
# gramps modules # gramps modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
import const
import config
import gen.lib import gen.lib
from gui.widgets import MonitoredEntry, MonitoredDataType, PrivacyButton from gui.widgets import MonitoredEntry, MonitoredDataType, PrivacyButton
from DisplayTabs import AddrEmbedList, WebEmbedList, NoteTab, SourceBackRefList from DisplayTabs import AddrEmbedList, WebEmbedList, NoteTab, SourceBackRefList
from Editors._EditPrimary import EditPrimary from editprimary import EditPrimary
from QuestionDialog import ErrorDialog from QuestionDialog import ErrorDialog
from glade import Glade from glade import Glade
@ -195,7 +193,7 @@ class EditRepository(EditPrimary):
def _cleanup_on_exit(self): def _cleanup_on_exit(self):
self.backref_list.close() self.backref_list.close()
class DelRepositoryQuery(object): class DeleteRepositoryQuery(object):
def __init__(self, dbstate, uistate, repository, sources): def __init__(self, dbstate, uistate, repository, sources):
self.obj = repository self.obj = repository
self.db = dbstate.db self.db = dbstate.db

0
src/Editors/_EditSecondary.py → src/gui/editors/editsecondary.py
View File

6
src/Editors/_EditSource.py → src/gui/editors/editsource.py
View File

@ -42,10 +42,8 @@ import gtk
# gramps modules # gramps modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
import const
import config
import gen.lib import gen.lib
from Editors._EditPrimary import EditPrimary from editprimary import EditPrimary
from DisplayTabs import (NoteTab, GalleryTab, DataEmbedList, from DisplayTabs import (NoteTab, GalleryTab, DataEmbedList,
SourceBackRefList, RepoEmbedList) SourceBackRefList, RepoEmbedList)
@ -213,7 +211,7 @@ class EditSource(EditPrimary):
def _cleanup_on_exit(self): def _cleanup_on_exit(self):
self.backref_tab.close() self.backref_tab.close()
class DelSrcQuery(object): class DeleteSrcQuery(object):
def __init__(self, dbstate, uistate, source, the_lists): def __init__(self, dbstate, uistate, source, the_lists):
self.source = source self.source = source
self.db = dbstate.db self.db = dbstate.db

4
src/Editors/_EditSourceRef.py → src/gui/editors/editsourceref.py
View File

@ -33,15 +33,13 @@ from gettext import gettext as _
# gramps modules # gramps modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
import const
import config
import gen.lib import gen.lib
from glade import Glade from glade import Glade
from DisplayTabs import (NoteTab, GalleryTab, SourceBackRefList, from DisplayTabs import (NoteTab, GalleryTab, SourceBackRefList,
DataEmbedList, RepoEmbedList) DataEmbedList, RepoEmbedList)
from gui.widgets import (PrivacyButton, MonitoredEntry, MonitoredMenu, from gui.widgets import (PrivacyButton, MonitoredEntry, MonitoredMenu,
MonitoredDate) MonitoredDate)
from _EditReference import RefTab, EditReference from editreference import RefTab, EditReference
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #

4
src/Editors/_EditUrl.py → src/gui/editors/editurl.py
View File

@ -33,9 +33,7 @@ from gettext import gettext as _
# gramps modules # gramps modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
import const from editsecondary import EditSecondary
import config
from _EditSecondary import EditSecondary
from gui.widgets import MonitoredEntry, PrivacyButton, MonitoredDataType from gui.widgets import MonitoredEntry, PrivacyButton, MonitoredDataType
from glade import Glade from glade import Glade

6
src/Editors/ObjectEntries.py → src/gui/editors/objectentries.py
View File

@ -45,9 +45,9 @@ from pango import ELLIPSIZE_END
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from gen.lib import (Place, MediaObject, Note) from gen.lib import (Place, MediaObject, Note)
from Editors._EditPlace import EditPlace from editplace import EditPlace
from Editors._EditMedia import EditMedia from editmedia import EditMedia
from Editors._EditNote import EditNote from editnote import EditNote
from gui.selectors import SelectorFactory from gui.selectors import SelectorFactory
from DdTargets import DdTargets from DdTargets import DdTargets
from Errors import WindowActiveError from Errors import WindowActiveError

2
src/gui/views/placebaseview.py
View File

@ -52,7 +52,7 @@ import config
from QuestionDialog import ErrorDialog from QuestionDialog import ErrorDialog
from gui.pluginmanager import GuiPluginManager from gui.pluginmanager import GuiPluginManager
from DdTargets import DdTargets from DdTargets import DdTargets
from Editors import EditPlace, DeletePlaceQuery from gui.editors import EditPlace, DeletePlaceQuery
from Filters.SideBar import PlaceSidebarFilter from Filters.SideBar import PlaceSidebarFilter
#------------------------------------------------------------------------- #-------------------------------------------------------------------------

2
src/plugins/gramplet/FanChartGramplet.py
View File

@ -59,7 +59,7 @@ from Utils import (find_children, find_parents, find_witnessed_people)
from libformatting import FormattingHelper from libformatting import FormattingHelper
import gen.lib import gen.lib
import Errors import Errors
from Editors import EditPerson, EditFamily from gui.editors import EditPerson, EditFamily
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #

6
src/plugins/gramplet/NoteGramplet.py
View File

@ -34,8 +34,8 @@ import pango
from gen.plug import Gramplet from gen.plug import Gramplet
from BasicUtils import name_displayer from BasicUtils import name_displayer
from TransUtils import sgettext as _ from TransUtils import sgettext as _
from const import GLADE_FILE
from gui.widgets import StyledTextEditor from gui.widgets import StyledTextEditor
from gui.editors import EditPerson, EditFamily
from gen.lib import StyledText, Note from gen.lib import StyledText, Note
import Errors import Errors
@ -130,7 +130,7 @@ class NoteGramplet(Gramplet):
def build_interface(self): def build_interface(self):
""" """
Based on src/Editors/_EditNote.py Based on src/gui/editors/editnote.py
""" """
vbox = gtk.VBox() vbox = gtk.VBox()
self.texteditor = StyledTextEditor() self.texteditor = StyledTextEditor()
@ -220,7 +220,6 @@ class NoteGramplet(Gramplet):
self.update() self.update()
def edit_person(self, obj): def edit_person(self, obj):
from Editors import EditPerson
try: try:
EditPerson(self.gui.dbstate, EditPerson(self.gui.dbstate,
self.gui.uistate, [], self.gui.uistate, [],
@ -230,7 +229,6 @@ class NoteGramplet(Gramplet):
pass pass
def edit_family(self, obj): def edit_family(self, obj):
from Editors import EditFamily
try: try:
EditFamily(self.gui.dbstate, EditFamily(self.gui.dbstate,
self.gui.uistate, [], self.gui.uistate, [],

3
src/plugins/tool/Desbrowser.py
View File

@ -42,6 +42,7 @@ import GrampsDisplay
import ManagedWindow import ManagedWindow
from TransUtils import sgettext as _ from TransUtils import sgettext as _
from glade import Glade from glade import Glade
from gui.editors import EditPerson
#------------------------------------------------------------------------ #------------------------------------------------------------------------
# #
@ -114,8 +115,6 @@ class DesBrowse(Tool.ActivePersonTool, ManagedWindow.ManagedWindow):
return item_id return item_id
def button_press_event(self, obj,event): def button_press_event(self, obj,event):
from Editors import EditPerson
if event.type == gtk.gdk._2BUTTON_PRESS and event.button == 1: if event.type == gtk.gdk._2BUTTON_PRESS and event.button == 1:
store, node = self.tree.get_selection().get_selected() store, node = self.tree.get_selection().get_selected()
if node: if node:

3
src/plugins/tool/NotRelated.py
View File

@ -40,8 +40,7 @@ import const
from gettext import ngettext from gettext import ngettext
from PluginUtils import Tool from PluginUtils import Tool
from ReportBase import ReportUtils from ReportBase import ReportUtils
from PluginUtils import Tool from gui.editors import EditPerson, EditFamily
from Editors import EditPerson, EditFamily
import ManagedWindow import ManagedWindow
from gui.utils import ProgressMeter from gui.utils import ProgressMeter
import GrampsDisplay import GrampsDisplay

2
src/plugins/tool/RemoveUnused.py
View File

@ -347,7 +347,7 @@ class RemoveUnused(Tool.Tool, ManagedWindow.ManagedWindow, UpdateCallback):
def call_editor(self, the_type, handle): def call_editor(self, the_type, handle):
try: try:
obj = self.tables[the_type]['get_func'](handle) obj = self.tables[the_type]['get_func'](handle)
editor_str = 'from Editors import %s as editor' \ editor_str = 'from gui.editors import %s as editor' \
% self.tables[the_type]['editor'] % self.tables[the_type]['editor']
exec(editor_str) exec(editor_str)
editor(self.dbstate, self.uistate, [], obj) editor(self.dbstate, self.uistate, [], obj)

3
src/plugins/tool/Verify.py
View File

@ -54,6 +54,7 @@ import gobject
#------------------------------------------------------------------------ #------------------------------------------------------------------------
import const import const
import gen.lib import gen.lib
from gui.editors import EditPerson, EditFamily
import Utils import Utils
import GrampsDisplay import GrampsDisplay
from ManagedWindow import ManagedWindow from ManagedWindow import ManagedWindow
@ -605,14 +606,12 @@ class VerifyResults(ManagedWindow):
handle = row[VerifyResults.OBJ_HANDLE_COL] handle = row[VerifyResults.OBJ_HANDLE_COL]
if the_type == 'Person': if the_type == 'Person':
try: try:
from Editors import EditPerson
person = self.dbstate.db.get_person_from_handle(handle) person = self.dbstate.db.get_person_from_handle(handle)
EditPerson(self.dbstate, self.uistate, [], person) EditPerson(self.dbstate, self.uistate, [], person)
except Errors.WindowActiveError: except Errors.WindowActiveError:
pass pass
elif the_type == 'Family': elif the_type == 'Family':
try: try:
from Editors import EditFamily
family = self.dbstate.db.get_family_from_handle(handle) family = self.dbstate.db.get_family_from_handle(handle)
EditFamily(self.dbstate, self.uistate, [], family) EditFamily(self.dbstate, self.uistate, [], family)
except Errors.WindowActiveError: except Errors.WindowActiveError:

4
src/plugins/view/eventview.py
View File

@ -53,7 +53,7 @@ import Errors
import Bookmarks import Bookmarks
import config import config
from DdTargets import DdTargets from DdTargets import DdTargets
from Editors import EditEvent, DelEventQuery from gui.editors import EditEvent, DeleteEventQuery
from Filters.SideBar import EventSidebarFilter from Filters.SideBar import EventSidebarFilter
from gen.plug import CATEGORY_QR_EVENT from gen.plug import CATEGORY_QR_EVENT
@ -233,7 +233,7 @@ class EventView(ListView):
object = self.dbstate.db.get_event_from_handle(handle) object = self.dbstate.db.get_event_from_handle(handle)
query = DelEventQuery(self.dbstate, self.uistate, object, query = DeleteEventQuery(self.dbstate, self.uistate, object,
person_list, family_list) person_list, family_list)
is_used = len(person_list) + len(family_list) > 0 is_used = len(person_list) + len(family_list) > 0
return (query, is_used, object) return (query, is_used, object)

3
src/plugins/view/familyview.py
View File

@ -46,6 +46,7 @@ import gtk
import gen.lib import gen.lib
from gui.views.listview import ListView from gui.views.listview import ListView
from gui.views.treemodels import FamilyModel from gui.views.treemodels import FamilyModel
from gui.editors import EditFamily
import Bookmarks import Bookmarks
import Errors import Errors
import config import config
@ -191,7 +192,6 @@ class FamilyView(ListView):
"no one was selected.")) "no one was selected."))
def add(self, obj): def add(self, obj):
from Editors import EditFamily
family = gen.lib.Family() family = gen.lib.Family()
try: try:
EditFamily(self.dbstate, self.uistate, [], family) EditFamily(self.dbstate, self.uistate, [], family)
@ -215,7 +215,6 @@ class FamilyView(ListView):
def edit(self, obj): def edit(self, obj):
for handle in self.selected_handles(): for handle in self.selected_handles():
from Editors import EditFamily
family = self.dbstate.db.get_family_from_handle(handle) family = self.dbstate.db.get_family_from_handle(handle)
try: try:
EditFamily(self.dbstate, self.uistate, [], family) EditFamily(self.dbstate, self.uistate, [], family)

5
src/plugins/view/fanchartview.py
View File

@ -43,6 +43,7 @@ try:
import cairo import cairo
except ImportError: except ImportError:
pass pass
from gettext import gettext as _
if gtk.pygtk_version < (2,3,93): if gtk.pygtk_version < (2,3,93):
raise Exception("PyGtk 2.3.93 or later required") 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 gui.views.navigationview import NavigationView
from BasicUtils import name_displayer 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 Utils import (find_children, find_parents, find_witnessed_people)
from libformatting import FormattingHelper from libformatting import FormattingHelper
import gen.lib import gen.lib
import Errors import Errors
import Bookmarks import Bookmarks
from Editors import EditPerson, EditFamily from gui.editors import EditPerson, EditFamily
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #

5
src/plugins/view/grampletview.py
View File

@ -47,6 +47,7 @@ from gettext import gettext as _
import Errors import Errors
import const import const
from gui.views.pageview import PageView from gui.views.pageview import PageView
from gui.editors import EditPerson, EditFamily
import ManagedWindow import ManagedWindow
import ConfigParser import ConfigParser
from gui.utils import add_menuitem from gui.utils import add_menuitem
@ -656,7 +657,6 @@ class GuiGramplet(object):
if event.button == 1: # left mouse if event.button == 1: # left mouse
if event.type == gtk.gdk._2BUTTON_PRESS: # double if event.type == gtk.gdk._2BUTTON_PRESS: # double
try: try:
from Editors import EditPerson
EditPerson(self.dbstate, EditPerson(self.dbstate,
self.uistate, self.uistate,
[], person) [], person)
@ -669,7 +669,6 @@ class GuiGramplet(object):
elif event.button == 3: # right mouse elif event.button == 3: # right mouse
#FIXME: add a popup menu with options #FIXME: add a popup menu with options
try: try:
from Editors import EditPerson
EditPerson(self.dbstate, EditPerson(self.dbstate,
self.uistate, self.uistate,
[], person) [], person)
@ -714,7 +713,6 @@ class GuiGramplet(object):
if event.button == 1: # left mouse if event.button == 1: # left mouse
if event.type == gtk.gdk._2BUTTON_PRESS: # double if event.type == gtk.gdk._2BUTTON_PRESS: # double
try: try:
from Editors import EditFamily
EditFamily(self.dbstate, EditFamily(self.dbstate,
self.uistate, self.uistate,
[], family) [], family)
@ -724,7 +722,6 @@ class GuiGramplet(object):
elif event.button == 3: # right mouse elif event.button == 3: # right mouse
#FIXME: add a popup menu with options #FIXME: add a popup menu with options
try: try:
from Editors import EditFamily
EditFamily(self.dbstate, EditFamily(self.dbstate,
self.uistate, self.uistate,
[], family) [], family)

2
src/plugins/view/mediaview.py
View File

@ -56,7 +56,7 @@ import Utils
import Bookmarks import Bookmarks
import Mime import Mime
import gen.lib import gen.lib
from Editors import EditMedia, DeleteMediaQuery from gui.editors import EditMedia, DeleteMediaQuery
import Errors import Errors
from Filters.SideBar import MediaSidebarFilter from Filters.SideBar import MediaSidebarFilter
from DdTargets import DdTargets from DdTargets import DdTargets

2
src/plugins/view/noteview.py
View File

@ -54,7 +54,7 @@ import ColumnOrder
from gen.lib import Note from gen.lib import Note
from DdTargets import DdTargets from DdTargets import DdTargets
from Filters.SideBar import NoteSidebarFilter from Filters.SideBar import NoteSidebarFilter
from Editors import EditNote, DeleteNoteQuery from gui.editors import EditNote, DeleteNoteQuery
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #

2
src/plugins/view/pedigreeview.py
View File

@ -61,7 +61,7 @@ import DateHandler
import ThumbNails import ThumbNails
import Errors import Errors
from ReportBase import ReportUtils from ReportBase import ReportUtils
from Editors import EditPerson, EditFamily from gui.editors import EditPerson, EditFamily
from DdTargets import DdTargets from DdTargets import DdTargets
import cPickle as pickle import cPickle as pickle
import config import config

4
src/plugins/view/pedigreeviewext.py
View File

@ -58,11 +58,9 @@ from BasicUtils import name_displayer
from Utils import (media_path_full, probably_alive, find_children, from Utils import (media_path_full, probably_alive, find_children,
find_parents, find_witnessed_people) find_parents, find_witnessed_people)
from libformatting import FormattingHelper from libformatting import FormattingHelper
import DateHandler
import ThumbNails import ThumbNails
import Errors import Errors
from ReportBase import ReportUtils from gui.editors import EditPerson, EditFamily
from Editors import EditPerson, EditFamily
from DdTargets import DdTargets from DdTargets import DdTargets
import cPickle as pickle import cPickle as pickle
import config import config

2
src/plugins/view/personview.py
View File

@ -56,7 +56,7 @@ import Errors
import Bookmarks import Bookmarks
import config import config
from DdTargets import DdTargets from DdTargets import DdTargets
from Editors import EditPerson from gui.editors import EditPerson
from Filters.SideBar import PersonSidebarFilter from Filters.SideBar import PersonSidebarFilter
from gen.plug import CATEGORY_QR_PERSON from gen.plug import CATEGORY_QR_PERSON

2
src/plugins/view/placetreeview.py
View File

@ -32,7 +32,7 @@ from gui.views.placebaseview import PlaceBaseView
from gui.views.treemodels import PlaceTreeModel from gui.views.treemodels import PlaceTreeModel
import gen.lib import gen.lib
import Errors import Errors
from Editors import EditPlace from gui.editors import EditPlace
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #

9
src/plugins/view/relview.py
View File

@ -47,6 +47,7 @@ import pango
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
import gen.lib import gen.lib
import gui.views.pageview as PageView import gui.views.pageview as PageView
from gui.editors import EditPerson, EditFamily
from gui.views.navigationview import NavigationView from gui.views.navigationview import NavigationView
from BasicUtils import name_displayer from BasicUtils import name_displayer
from Utils import media_path_full, probably_alive from Utils import media_path_full, probably_alive
@ -1206,7 +1207,6 @@ class RelationshipView(NavigationView):
return item return item
def edit_menu(self, obj, handle): def edit_menu(self, obj, handle):
from Editors import EditPerson
person = self.dbstate.db.get_person_from_handle(handle) person = self.dbstate.db.get_person_from_handle(handle)
try: try:
EditPerson(self.dbstate, self.uistate, [], person) EditPerson(self.dbstate, self.uistate, [], person)
@ -1394,7 +1394,6 @@ class RelationshipView(NavigationView):
self.edit_person(obj, handle) self.edit_person(obj, handle)
def edit_person(self, obj, handle): def edit_person(self, obj, handle):
from Editors import EditPerson
person = self.dbstate.db.get_person_from_handle(handle) person = self.dbstate.db.get_person_from_handle(handle)
try: try:
EditPerson(self.dbstate, self.uistate, [], person) EditPerson(self.dbstate, self.uistate, [], person)
@ -1403,7 +1402,6 @@ class RelationshipView(NavigationView):
def edit_family(self, obj, event, handle): def edit_family(self, obj, event, handle):
if button_activated(event, _LEFT_BUTTON): if button_activated(event, _LEFT_BUTTON):
from Editors import EditFamily
family = self.dbstate.db.get_family_from_handle(handle) family = self.dbstate.db.get_family_from_handle(handle)
try: try:
EditFamily(self.dbstate, self.uistate, [], family) EditFamily(self.dbstate, self.uistate, [], family)
@ -1412,7 +1410,6 @@ class RelationshipView(NavigationView):
def add_family(self, obj, event, handle): def add_family(self, obj, event, handle):
if button_activated(event, _LEFT_BUTTON): if button_activated(event, _LEFT_BUTTON):
from Editors import EditFamily
family = gen.lib.Family() family = gen.lib.Family()
person = self.dbstate.active person = self.dbstate.active
if not person: if not person:
@ -1429,7 +1426,6 @@ class RelationshipView(NavigationView):
pass pass
def add_spouse(self, obj): def add_spouse(self, obj):
from Editors import EditFamily
family = gen.lib.Family() family = gen.lib.Family()
person = self.dbstate.active person = self.dbstate.active
@ -1453,7 +1449,6 @@ class RelationshipView(NavigationView):
def add_child_to_fam(self, obj, event, handle): def add_child_to_fam(self, obj, event, handle):
if button_activated(event, _LEFT_BUTTON): if button_activated(event, _LEFT_BUTTON):
callback = lambda x: self.callback_add_child(x, handle) callback = lambda x: self.callback_add_child(x, handle)
from Editors import EditPerson
person = gen.lib.Person() person = gen.lib.Person()
family = self.dbstate.db.get_family_from_handle(handle) family = self.dbstate.db.get_family_from_handle(handle)
father = self.dbstate.db.get_person_from_handle( father = self.dbstate.db.get_person_from_handle(
@ -1539,7 +1534,6 @@ class RelationshipView(NavigationView):
child) child)
def add_parents(self, obj): def add_parents(self, obj):
from Editors import EditFamily
family = gen.lib.Family() family = gen.lib.Family()
person = self.dbstate.active person = self.dbstate.active
@ -1557,7 +1551,6 @@ class RelationshipView(NavigationView):
def add_parent_family(self, obj, event, handle): def add_parent_family(self, obj, event, handle):
if button_activated(event, _LEFT_BUTTON): if button_activated(event, _LEFT_BUTTON):
from Editors import EditFamily
family = gen.lib.Family() family = gen.lib.Family()
person = self.dbstate.active person = self.dbstate.active

5
src/plugins/view/repoview.py
View File

@ -39,11 +39,10 @@ import gtk
import gen.lib import gen.lib
from gui.views.listview import ListView from gui.views.listview import ListView
from gui.views.treemodels import RepositoryModel from gui.views.treemodels import RepositoryModel
import Utils
import Bookmarks import Bookmarks
import Errors import Errors
import config import config
from Editors import EditRepository, DelRepositoryQuery from gui.editors import EditRepository, DeleteRepositoryQuery
from DdTargets import DdTargets from DdTargets import DdTargets
from Filters.SideBar import RepoSidebarFilter from Filters.SideBar import RepoSidebarFilter
from gen.plug import CATEGORY_QR_REPOSITORY from gen.plug import CATEGORY_QR_REPOSITORY
@ -199,7 +198,7 @@ class RepositoryView(ListView):
item[1] for item in item[1] for item in
self.dbstate.db.find_backlink_handles(handle, ['Source'])] self.dbstate.db.find_backlink_handles(handle, ['Source'])]
object = self.dbstate.db.get_repository_from_handle(handle) object = self.dbstate.db.get_repository_from_handle(handle)
query = DelRepositoryQuery(self.dbstate, self.uistate, object, query = DeleteRepositoryQuery(self.dbstate, self.uistate, object,
source_list) source_list)
is_used = len(source_list) > 0 is_used = len(source_list) > 0
return (query, is_used, object) return (query, is_used, object)

4
src/plugins/view/sourceview.py
View File

@ -45,7 +45,7 @@ import Bookmarks
import Errors import Errors
from DdTargets import DdTargets from DdTargets import DdTargets
from QuestionDialog import ErrorDialog from QuestionDialog import ErrorDialog
from Editors import EditSource, DelSrcQuery from gui.editors import EditSource, DeleteSrcQuery
from Filters.SideBar import SourceSidebarFilter from Filters.SideBar import SourceSidebarFilter
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
@ -186,7 +186,7 @@ class SourceView(ListView):
def remove_object_from_handle(self, handle): def remove_object_from_handle(self, handle):
the_lists = Utils.get_source_referents(handle, self.dbstate.db) the_lists = Utils.get_source_referents(handle, self.dbstate.db)
object = self.dbstate.db.get_source_from_handle(handle) 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) is_used = any(the_lists)
return (query, is_used, object) return (query, is_used, object)