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

2007-10-08 Don Allingham <don@gramps-project.org>

Browse Source 
* various: gen.lib integration. probably touches almost every file

	* various: gen.utils integration


svn: r9101
This commit is contained in:
Don Allingham
2007-10-08 16:41:39 +00:00
parent 8038bc0dca
commit d58641415d
245 changed files with 2315 additions and 2355 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/DisplayTabs/_AddrEmbedList.py
View File

@@ -36,7 +36,7 @@ from gettext import gettext as _
# GRAMPS classes
#
#-------------------------------------------------------------------------
import RelLib
import gen.lib
import Errors
from DdTargets import DdTargets
from _AddressModel import AddressModel
@@ -94,7 +94,7 @@ class AddrEmbedList(EmbeddedList):
already exists (Errors.WindowActiveError), we ignore it. This prevents
the dialog from coming up twice on the same object.
"""
addr = RelLib.Address()
addr = gen.lib.Address()
try:
from Editors import EditAddress

4
src/DisplayTabs/_AttrEmbedList.py
View File

@@ -32,7 +32,7 @@ from gettext import gettext as _
# GRAMPS classes
#
#-------------------------------------------------------------------------
import RelLib
import gen.lib
import Errors
from DdTargets import DdTargets
from _AttrModel import AttrModel
@@ -76,7 +76,7 @@ class AttrEmbedList(EmbeddedList):
def add_button_clicked(self, obj):
pname = ''
attr = RelLib.Attribute()
attr = gen.lib.Attribute()
try:
self.get_editor()(
self.dbstate, self.uistate, self.track, attr,

16
src/DisplayTabs/_EventEmbedList.py
View File

@@ -32,7 +32,7 @@ from gettext import gettext as _
# GRAMPS classes
#
#-------------------------------------------------------------------------
import RelLib
import gen.lib
import Errors
from DdTargets import DdTargets
from _EmbeddedList import EmbeddedList
@@ -84,15 +84,15 @@ class EventEmbedList(EmbeddedList):
return ((1, 0), (1, 1), (1, 2), (1, 3), (1, 4), (1, 5))
def default_type(self):
return RelLib.EventType(RelLib.EventType.MARRIAGE)
return gen.lib.EventType(gen.lib.EventType.MARRIAGE)
def default_role(self):
return RelLib.EventRoleType(RelLib.EventRoleType.FAMILY)
return gen.lib.EventRoleType(gen.lib.EventRoleType.FAMILY)
def add_button_clicked(self, obj):
try:
ref = RelLib.EventRef()
event = RelLib.Event()
ref = gen.lib.EventRef()
event = gen.lib.Event()
ref.set_role(self.default_role())
event.set_type(self.default_type())
self.get_ref_editor()(
@@ -109,7 +109,7 @@ class EventEmbedList(EmbeddedList):
event = sel.run()
if event:
try:
ref = RelLib.EventRef()
ref = gen.lib.EventRef()
ref.set_role(self.default_role())
self.get_ref_editor()(
self.dbstate, self.uistate, self.track,
@@ -151,7 +151,7 @@ class EventEmbedList(EmbeddedList):
And event reference that is from a drag and drop has
an unknown event reference type
"""
from RelLib import EventRoleType
from gen.lib import EventRoleType
obj.set_role((EventRoleType.UNKNOWN,''))
EmbeddedList._handle_drag(self, row, obj)
@@ -163,7 +163,7 @@ class EventEmbedList(EmbeddedList):
def handle_extra_type(self, objtype, obj):
try:
ref = RelLib.EventRef()
ref = gen.lib.EventRef()
event = self.dbstate.db.get_event_from_handle(obj)
ref.set_role(self.default_role())
self.get_ref_editor()(

6
src/DisplayTabs/_FamilyLdsEmbedList.py
View File

@@ -33,7 +33,7 @@ from gettext import gettext as _
#
#-------------------------------------------------------------------------
from _LdsEmbedList import LdsEmbedList
import RelLib
import gen.lib
#-------------------------------------------------------------------------
#
@@ -61,6 +61,6 @@ class FamilyLdsEmbedList(LdsEmbedList):
return EditFamilyLdsOrd
def new_data(self):
lds = RelLib.LdsOrd()
lds.set_type(RelLib.LdsOrd.SEAL_TO_SPOUSE)
lds = gen.lib.LdsOrd()
lds.set_type(gen.lib.LdsOrd.SEAL_TO_SPOUSE)
return lds

16
src/DisplayTabs/_GalleryTab.py
View File

@@ -43,7 +43,7 @@ import os
# GRAMPS classes
#
#-------------------------------------------------------------------------
import RelLib
import gen.lib
import Utils
import ThumbNails
import Errors
@@ -243,7 +243,7 @@ class GalleryTab(ButtonTab):
src = am.object
if src:
sref = RelLib.MediaRef()
sref = gen.lib.MediaRef()
try:
from Editors import EditMediaRef
@@ -269,7 +269,7 @@ class GalleryTab(ButtonTab):
sel = SelectObject(self.dbstate,self.uistate,self.track)
src = sel.run()
if src:
sref = RelLib.MediaRef()
sref = gen.lib.MediaRef()
try:
from Editors import EditMediaRef
@@ -410,7 +410,7 @@ class GalleryTab(ButtonTab):
self._handle_drag(row, obj)
self.rebuild()
elif mytype == DdTargets.MEDIAOBJ.drag_type:
oref = RelLib.MediaRef()
oref = gen.lib.MediaRef()
oref.set_reference_handle(obj)
self.get_data().append(oref)
self.changed = True
@@ -425,7 +425,7 @@ class GalleryTab(ButtonTab):
mime = Mime.get_type(name)
if not Mime.is_valid_type(mime):
return
photo = RelLib.MediaObject()
photo = gen.lib.MediaObject()
photo.set_path(name)
photo.set_mime_type(mime)
basename = os.path.basename(name)
@@ -433,7 +433,7 @@ class GalleryTab(ButtonTab):
photo.set_description(root)
trans = self.dbstate.db.transaction_begin()
self.dbstate.db.add_object(photo, trans)
oref = RelLib.MediaRef()
oref = gen.lib.MediaRef()
oref.set_reference_handle(photo.get_handle())
self.get_data().append(oref)
self.changed = True
@@ -452,14 +452,14 @@ class GalleryTab(ButtonTab):
# return
# tfile = Utils.fix_encoding(tfile)
# mime = GrampsMime.get_type(tfile)
# photo = RelLib.MediaObject()
# photo = gen.lib.MediaObject()
# photo.set_mime_type(mime)
# photo.set_description(d)
# photo.set_path(tfile)
# trans = self.db.transaction_begin()
# self.db.add_object(photo,trans)
# self.db.transaction_commit(trans,_("Drag Media Object"))
# oref = RelLib.MediaRef()
# oref = gen.lib.MediaRef()
# oref.set_reference_handle(photo.get_handle())
# self.dataobj.add_media_reference(oref)
# self.add_thumbnail(oref)

4
src/DisplayTabs/_LdsEmbedList.py
View File

@@ -32,7 +32,7 @@ from gettext import gettext as _
# GRAMPS classes
#
#-------------------------------------------------------------------------
import RelLib
import gen.lib
import Errors
from _LdsModel import LdsModel
from _EmbeddedList import EmbeddedList
@@ -65,7 +65,7 @@ class LdsEmbedList(EmbeddedList):
return EditLdsOrd
def new_data(self):
return RelLib.LdsOrd()
return gen.lib.LdsOrd()
def get_data(self):
return self.data

4
src/DisplayTabs/_LocationEmbedList.py
View File

@@ -32,7 +32,7 @@ from gettext import gettext as _
# GRAMPS classes
#
#-------------------------------------------------------------------------
import RelLib
import gen.lib
import Errors
from DdTargets import DdTargets
from _LocationModel import LocationModel
@@ -68,7 +68,7 @@ class LocationEmbedList(EmbeddedList):
return ((1, 0), (1, 1), (1, 2), (1, 3), (1, 4))
def add_button_clicked(self, obj):
loc = RelLib.Location()
loc = gen.lib.Location()
try:
from Editors import EditLocation

4
src/DisplayTabs/_NameEmbedList.py
View File

@@ -39,7 +39,7 @@ from gettext import gettext as _
# GRAMPS classes
#
#-------------------------------------------------------------------------
import RelLib
import gen.lib
import Errors
from DdTargets import DdTargets
from _NameModel import NameModel
@@ -93,7 +93,7 @@ class NameEmbedList(EmbeddedList):
self.callback()
def add_button_clicked(self, obj):
name = RelLib.Name()
name = gen.lib.Name()
try:
from Editors import EditName

4
src/DisplayTabs/_NoteTab.py
View File

@@ -42,7 +42,7 @@ import gtk
#-------------------------------------------------------------------------
import Spell
import Errors
import RelLib
import gen.lib
from DisplayTabs import log
from _NoteModel import NoteModel
from _EmbeddedList import EmbeddedList
@@ -104,7 +104,7 @@ class NoteTab(EmbeddedList):
return ((1, 0), (1, 1))
def add_button_clicked(self, obj):
note = RelLib.Note()
note = gen.lib.Note()
if self.notetype :
note.set_type(self.notetype)
try:

12
src/DisplayTabs/_PersonEventEmbedList.py
View File

@@ -25,12 +25,12 @@
# GRAMPS classes
#
#-------------------------------------------------------------------------
import RelLib
import gen.lib
from _EventEmbedList import EventEmbedList
_std_types = [
RelLib.EventType(RelLib.EventType.BIRTH),
RelLib.EventType(RelLib.EventType.DEATH),
gen.lib.EventType(gen.lib.EventType.BIRTH),
gen.lib.EventType(gen.lib.EventType.DEATH),
]
@@ -48,7 +48,7 @@ class PersonEventEmbedList(EventEmbedList):
return self.obj.get_event_ref_list()
def default_role(self):
return RelLib.EventRoleType(RelLib.EventRoleType.PRIMARY)
return gen.lib.EventRoleType(gen.lib.EventRoleType.PRIMARY)
def default_type(self):
type_list = []
@@ -62,8 +62,8 @@ class PersonEventEmbedList(EventEmbedList):
for etype in _std_types:
if etype not in type_list:
return RelLib.EventType(etype)
return RelLib.EventType(RelLib.EventType.BIRTH)
return gen.lib.EventType(etype)
return gen.lib.EventType(gen.lib.EventType.BIRTH)
def get_ref_editor(self):
from Editors import EditEventRef

6
src/DisplayTabs/_PersonRefEmbedList.py
View File

@@ -32,7 +32,7 @@ from gettext import gettext as _
# GRAMPS classes
#
#-------------------------------------------------------------------------
import RelLib
import gen.lib
import Errors
from DdTargets import DdTargets
from _PersonRefModel import PersonRefModel
@@ -73,7 +73,7 @@ class PersonRefEmbedList(EmbeddedList):
from Editors import EditPersonRef
try:
ref = RelLib.PersonRef()
ref = gen.lib.PersonRef()
ref.rel = _('Godfather')
EditPersonRef(
self.dbstate, self.uistate, self.track,
@@ -106,7 +106,7 @@ class PersonRefEmbedList(EmbeddedList):
"""
try:
from Editors import EditPersonRef
ref = RelLib.PersonRef(obj)
ref = gen.lib.PersonRef(obj)
ref.rel = _('Unknown')
EditPersonRef(
self.dbstate, self.uistate, self.track,

10
src/DisplayTabs/_RepoEmbedList.py
View File

@@ -32,7 +32,7 @@ from gettext import gettext as _
# GRAMPS classes
#
#-------------------------------------------------------------------------
import RelLib
import gen.lib
import Errors
from DdTargets import DdTargets
from _RepoRefModel import RepoRefModel
@@ -81,7 +81,7 @@ class RepoEmbedList(EmbeddedList):
try:
from Editors import EditRepoRef
ref = RelLib.RepoRef()
ref = gen.lib.RepoRef()
repo = self.dbstate.db.get_repository_from_handle(obj)
EditRepoRef(
self.dbstate, self.uistate, self.track,
@@ -90,8 +90,8 @@ class RepoEmbedList(EmbeddedList):
pass
def add_button_clicked(self, obj):
ref = RelLib.RepoRef()
repo = RelLib.Repository()
ref = gen.lib.RepoRef()
repo = gen.lib.Repository()
try:
from Editors import EditRepoRef
@@ -116,7 +116,7 @@ class RepoEmbedList(EmbeddedList):
try:
from Editors import EditRepoRef
ref = RelLib.RepoRef()
ref = gen.lib.RepoRef()
EditRepoRef(self.dbstate,
self.uistate,
self.track,

10
src/DisplayTabs/_SourceEmbedList.py
View File

@@ -32,7 +32,7 @@ from gettext import gettext as _
# GRAMPS classes
#
#-------------------------------------------------------------------------
import RelLib
import gen.lib
import Errors
from DdTargets import DdTargets
from _SourceRefModel import SourceRefModel
@@ -81,8 +81,8 @@ class SourceEmbedList(EmbeddedList):
try:
from Editors import EditSourceRef
sref = RelLib.SourceRef()
src = RelLib.Source()
sref = gen.lib.SourceRef()
src = gen.lib.Source()
EditSourceRef(
self.dbstate,
self.uistate,
@@ -103,7 +103,7 @@ class SourceEmbedList(EmbeddedList):
try:
from Editors import EditSourceRef
ref = RelLib.SourceRef()
ref = gen.lib.SourceRef()
EditSourceRef(self.dbstate,
self.uistate,
self.track,
@@ -146,7 +146,7 @@ class SourceEmbedList(EmbeddedList):
self.rebuild()
def handle_extra_type(self, objtype, obj):
sref = RelLib.SourceRef()
sref = gen.lib.SourceRef()
src = self.dbstate.db.get_source_from_handle(obj)
try:
from Editors import EditSourceRef

4
src/DisplayTabs/_WebEmbedList.py
View File

@@ -33,7 +33,7 @@ import gtk
# GRAMPS classes
#
#-------------------------------------------------------------------------
import RelLib
import gen.lib
import Errors
from DdTargets import DdTargets
from _WebModel import WebModel
@@ -70,7 +70,7 @@ class WebEmbedList(EmbeddedList):
return ((1, 0), (1, 1), (1, 2))
def add_button_clicked(self, obj):
url = RelLib.Url()
url = gen.lib.Url()
try:
from Editors import EditUrl