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

5321: Tidy up code for the children tab in the family editor

Browse Source 
svn: r18372
This commit is contained in:
Nick Hall 2011-10-25 21:31:32 +00:00
parent cec721c95c
commit 594bc9257f
4 changed files with 90 additions and 173 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/DdTargets.py
View File

@ -111,6 +111,7 @@ class _DdTargets(object):
self.ADDRESS = _DdType(self, 'paddr') self.ADDRESS = _DdType(self, 'paddr')
self.ATTRIBUTE = _DdType(self, 'pattr') self.ATTRIBUTE = _DdType(self, 'pattr')
self.CHILDREF = _DdType(self, 'childref')
self.DATA = _DdType(self, 'data_tuple') self.DATA = _DdType(self, 'data_tuple')
self.EVENT = _DdType(self, 'pevent') self.EVENT = _DdType(self, 'pevent')
self.EVENTREF = _DdType(self, 'eventref') self.EVENTREF = _DdType(self, 'eventref')
@ -141,6 +142,7 @@ class _DdTargets(object):
self._all_gramps_types = [ self._all_gramps_types = [
self.ADDRESS, self.ADDRESS,
self.ATTRIBUTE, self.ATTRIBUTE,
self.CHILDREF,
self.EVENT, self.EVENT,
self.EVENTREF, self.EVENTREF,
self.LOCATION, self.LOCATION,

22
src/ScratchPad.py
View File

@ -102,6 +102,7 @@ def map2class(target):
d = {"person-link": ScratchPersonLink, d = {"person-link": ScratchPersonLink,
"family-link": ScratchFamilyLink, "family-link": ScratchFamilyLink,
'personref': ScratchPersonRef, 'personref': ScratchPersonRef,
'childref': ScratchChildRef,
'source-link': ScratchSourceLink, 'source-link': ScratchSourceLink,
'srcref': ScratchSourceRef, 'srcref': ScratchSourceRef,
'repo-link': ScratchRepositoryLink, 'repo-link': ScratchRepositoryLink,
@ -592,6 +593,24 @@ class ScratchPersonRef(ScratchObjWrapper):
self._title = self._obj.get_relation() self._title = self._obj.get_relation()
self._value = person.get_primary_name().get_name() self._value = person.get_primary_name().get_name()
class ScratchChildRef(ScratchObjWrapper):
DROP_TARGETS = [DdTargets.CHILDREF]
DRAG_TARGET = DdTargets.CHILDREF
ICON = LINK_PIC
def __init__(self, dbstate, obj):
super(ScratchChildRef, self).__init__(dbstate, obj)
self._type = _("Child ref")
if self._obj:
person = self._db.get_person_from_handle(self._obj.get_reference_handle())
if person:
frel = str(self._obj.get_father_relation())
mrel = str(self._obj.get_mother_relation())
self._title = _('%(frel)s %(mrel)s') % {'frel': frel,
'mrel': mrel}
self._value = person.get_primary_name().get_name()
class ScratchPersonLink(ScratchHandleWrapper): class ScratchPersonLink(ScratchHandleWrapper):
DROP_TARGETS = [DdTargets.PERSON_LINK] DROP_TARGETS = [DdTargets.PERSON_LINK]
@ -889,6 +908,8 @@ class ScratchPadListView(object):
gen_del_obj(self.delete_object, 'person-link')) gen_del_obj(self.delete_object, 'person-link'))
self._db.connect('person-delete', self._db.connect('person-delete',
gen_del_obj(self.delete_object_ref, 'personref')) gen_del_obj(self.delete_object_ref, 'personref'))
self._db.connect('person-delete',
gen_del_obj(self.delete_object_ref, 'childref'))
self._db.connect('source-delete', self._db.connect('source-delete',
gen_del_obj(self.delete_object, 'source-link')) gen_del_obj(self.delete_object, 'source-link'))
self._db.connect('source-delete', self._db.connect('source-delete',
@ -964,6 +985,7 @@ class ScratchPadListView(object):
self.register_wrapper_class(ScratchDropRawList) self.register_wrapper_class(ScratchDropRawList)
self.register_wrapper_class(ScratchDropHandleList) self.register_wrapper_class(ScratchDropHandleList)
self.register_wrapper_class(ScratchPersonRef) self.register_wrapper_class(ScratchPersonRef)
self.register_wrapper_class(ScratchChildRef)
self.register_wrapper_class(ScratchText) self.register_wrapper_class(ScratchText)
self.register_wrapper_class(ScratchNote) self.register_wrapper_class(ScratchNote)

44
src/gui/editors/displaytabs/childmodel.py
View File

@ -37,7 +37,7 @@ import DateHandler
from gen.display.name import displayer as name_displayer from gen.display.name import displayer as name_displayer
import Utils import Utils
import gen.lib import gen.lib
from gen.utils import get_birth_or_fallback from gen.utils import get_birth_or_fallback, get_death_or_fallback
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #
@ -46,19 +46,15 @@ from gen.utils import get_birth_or_fallback
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
class ChildModel(gtk.ListStore): class ChildModel(gtk.ListStore):
_HANDLE_COL = -8 def __init__(self, child_ref_list, db):
def __init__(self, family, db):
self.family = family
gtk.ListStore.__init__(self, int, str, str, str, str, str, gtk.ListStore.__init__(self, int, str, str, str, str, str,
str, str, str, str, str, str, str, str) str, str, str, str, str, str, str, object)
self.db = db self.db = db
index = 1 for index, child_ref in enumerate(child_ref_list):
for child_ref in self.get_data():
child = db.get_person_from_handle(child_ref.ref) child = db.get_person_from_handle(child_ref.ref)
if child: if child:
self.append(row=[ self.append(row=[
index, index + 1,
child.get_gramps_id(), child.get_gramps_id(),
name_displayer.display(child), name_displayer.display(child),
Utils.gender[child.get_gender()], Utils.gender[child.get_gender()],
@ -68,15 +64,11 @@ class ChildModel(gtk.ListStore):
self.column_death_day(child), self.column_death_day(child),
self.column_birth_place(child), self.column_birth_place(child),
self.column_death_place(child), self.column_death_place(child),
child.get_handle(),
name_displayer.sort_string(child.primary_name), name_displayer.sort_string(child.primary_name),
self.column_birth_sort(child), self.column_birth_sort(child),
self.column_death_sort(child), self.column_death_sort(child),
child_ref
]) ])
index += 1
def get_data(self):
return self.family.get_child_ref_list()
def column_birth_day(self, data): def column_birth_day(self, data):
birth = get_birth_or_fallback(self.db, data) birth = get_birth_or_fallback(self.db, data)
@ -95,18 +87,19 @@ class ChildModel(gtk.ListStore):
to a string of 10 long prepended with 0 as needed. to a string of 10 long prepended with 0 as needed.
This gives correct string sort for years in the millenia around today This gives correct string sort for years in the millenia around today
""" """
event_ref = data.get_birth_ref() birth = get_birth_or_fallback(self.db, data)
if event_ref and event_ref.ref: if birth:
event = self.db.get_event_from_handle(event_ref.ref) return '%012d' % birth.get_date_object().get_sort_value()
return '%012d' % event.get_date_object().get_sort_value()
else: else:
return '%012d' % 0 return '%012d' % 0
def column_death_day(self, data): def column_death_day(self, data):
event_ref = data.get_death_ref() death = get_death_or_fallback(self.db, data)
if event_ref and event_ref.ref: if death:
event = self.db.get_event_from_handle(event_ref.ref) if death.get_type() == gen.lib.EventType.DEATH:
return DateHandler.get_date(event) return DateHandler.get_date(death)
else:
return '<i>%s</i>' % cgi.escape(DateHandler.get_date(death))
else: else:
return u"" return u""
@ -117,10 +110,9 @@ class ChildModel(gtk.ListStore):
to a string of 10 long prepended with 0 as needed. to a string of 10 long prepended with 0 as needed.
This gives correct string sort for years in the millenia around today This gives correct string sort for years in the millenia around today
""" """
event_ref = data.get_death_ref() death = get_death_or_fallback(self.db, data)
if event_ref and event_ref.ref: if death:
event = self.db.get_event_from_handle(event_ref.ref) return '%012d' % death.get_date_object().get_sort_value()
return '%012d' % event.get_date_object().get_sort_value()
else: else:
return '%012d' % 0 return '%012d' % 0

169
src/gui/editors/editfamily.py
View File

@ -95,8 +95,9 @@ class ChildEmbedList(EmbeddedList):
is contained here instead of in displaytabs. is contained here instead of in displaytabs.
""" """
_HANDLE_COL = 10 _HANDLE_COL = 13
_DND_TYPE = DdTargets.PERSON_LINK _DND_TYPE = DdTargets.CHILDREF
_DND_EXTRA = DdTargets.PERSON_LINK
_MSG = { _MSG = {
'add' : _('Create a new person and add the child to the family'), 'add' : _('Create a new person and add the child to the family'),
@ -107,17 +108,18 @@ class ChildEmbedList(EmbeddedList):
'down' : _('Move the child down in the children list'), 'down' : _('Move the child down in the children list'),
} }
# (name, column in model, width, markup/text, font weight)
_column_names = [ _column_names = [
(_('#'),0) , (_('#'), 0, 25, 0, -1),
(_('ID'),1) , (_('ID'), 1, 60, 0, -1),
(_('Name'),11), (_('Name'), 10, 250, 0, -1),
(_('Gender'),3), (_('Gender'), 3, 75, 0, -1),
(_('Paternal'),4), (_('Paternal'), 4, 100, 0, -1),
(_('Maternal'),5), (_('Maternal'), 5, 100, 0, -1),
(_('Birth Date'),12), (_('Birth Date'), 11, 150, 1, -1),
(_('Death Date'),13), (_('Death Date'), 12, 150, 1, -1),
(_('Birth Place'),8), (_('Birth Place'), 8, 150, 0, -1),
(_('Death Place'),9), (_('Death Place'), 9, 150, 0, -1),
] ]
def __init__(self, dbstate, uistate, track, family): def __init__(self, dbstate, uistate, track, family):
@ -143,69 +145,16 @@ class ChildEmbedList(EmbeddedList):
def get_middle_click(self): def get_middle_click(self):
return self.edit_child_button_clicked return self.edit_child_button_clicked
def find_index(self, obj):
"""
returns the index of the object within the associated data
"""
reflist = [ref.ref for ref in self.family.get_child_ref_list()]
return reflist.index(obj)
def _find_row(self, x, y):
row = self.tree.get_path_at_pos(x, y)
if row is None:
return len(self.family.get_child_ref_list())
else:
return row[0][0]
def _handle_drag(self, row, obj):
self.family.get_child_ref_list().insert(row, obj)
self.changed = True
self.rebuild()
def _move(self, row_from, row_to, obj):
dlist = self.family.get_child_ref_list()
if row_from < row_to:
dlist.insert(row_to, obj)
del dlist[row_from]
else:
del dlist[row_from]
dlist.insert(row_to-1, obj)
self.changed = True
self.rebuild()
def build_columns(self):
map(self.tree.remove_column, self.columns)
self.columns = []
for pair in self.column_order():
if not pair[0]:
continue
name = self._column_names[pair[1]][0]
render = gtk.CellRendererText()
column = gtk.TreeViewColumn(name, render, markup=pair[1])
column.set_min_width(50)
column.set_resizable(True)
column.set_expand(True)
column.set_sort_column_id(self._column_names[pair[1]][1])
self.columns.append(column)
self.tree.append_column(column)
def get_icon_name(self): def get_icon_name(self):
return 'gramps-family' return 'gramps-family'
def is_empty(self):
"""
The list is considered empty if the child list is empty.
"""
return len(self.family.get_child_ref_list()) == 0
def get_data(self): def get_data(self):
""" """
Normally, get_data returns a list. However, we return family Normally, get_data returns a list. However, we return family
object here instead. object here instead.
""" """
return self.family return self.family.get_child_ref_list()
def column_order(self): def column_order(self):
return [(1, 0), (1, 1), (1, 2), (1, 3), (1, 4), (1, 5), (1, 6), return [(1, 0), (1, 1), (1, 2), (1, 3), (1, 4), (1, 5), (1, 6),
@ -229,12 +178,20 @@ class ChildEmbedList(EmbeddedList):
EditPerson(self.dbstate, self.uistate, self.track, person, EditPerson(self.dbstate, self.uistate, self.track, person,
self.new_child_added) self.new_child_added)
def handle_extra_type(self, objtype, obj):
"""
Called when a person is dropped onto the list. objtype will be
'person-link' and obj will contain a person handle.
"""
person = self.dbstate.db.get_person_from_handle(obj)
self.new_child_added(person)
def new_child_added(self, person): def new_child_added(self, person):
ref = gen.lib.ChildRef() ref = gen.lib.ChildRef()
ref.ref = person.get_handle() ref.ref = person.get_handle()
self.family.add_child_ref(ref) self.family.add_child_ref(ref)
self.rebuild() self.rebuild()
self.call_edit_childref(ref.ref) self.call_edit_childref(ref)
def child_ref_edited(self, person): def child_ref_edited(self, person):
self.rebuild() self.rebuild()
@ -254,7 +211,7 @@ class ChildEmbedList(EmbeddedList):
ref.ref = person.get_handle() ref.ref = person.get_handle()
self.family.add_child_ref(ref) self.family.add_child_ref(ref)
self.rebuild() self.rebuild()
self.call_edit_childref(ref.ref) self.call_edit_childref(ref)
def run(self, skip): def run(self, skip):
skip_list = filter(None, skip) skip_list = filter(None, skip)
@ -262,90 +219,34 @@ class ChildEmbedList(EmbeddedList):
_("Select Child"), skip=skip_list) _("Select Child"), skip=skip_list)
def del_button_clicked(self, obj=None): def del_button_clicked(self, obj=None):
handle = self.get_selected() ref = self.get_selected()
if handle: if ref:
for ref in self.family.get_child_ref_list():
if ref.ref == handle:
self.family.remove_child_ref(ref) self.family.remove_child_ref(ref)
self.rebuild() self.rebuild()
def edit_button_clicked(self, obj=None): def edit_button_clicked(self, obj=None):
handle = self.get_selected() ref = self.get_selected()
if handle: if ref:
self.call_edit_childref(handle) self.call_edit_childref(ref)
def call_edit_childref(self, handle): def call_edit_childref(self, ref):
for ref in self.family.get_child_ref_list(): p = self.dbstate.db.get_person_from_handle(ref.ref)
if ref.ref == handle:
p = self.dbstate.db.get_person_from_handle(handle)
n = name_displayer.display(p) n = name_displayer.display(p)
try: try:
EditChildRef(n, self.dbstate, self.uistate, self.track, EditChildRef(n, self.dbstate, self.uistate, self.track,
ref, self.child_ref_edited) ref, self.child_ref_edited)
except Errors.WindowActiveError: except Errors.WindowActiveError:
pass pass
break
def edit_child_button_clicked(self, obj=None): def edit_child_button_clicked(self, obj=None):
handle = self.get_selected() ref = self.get_selected()
if handle: if ref:
for ref in self.family.get_child_ref_list(): p = self.dbstate.db.get_person_from_handle(ref.ref)
if ref.ref == handle:
p = self.dbstate.db.get_person_from_handle(handle)
try: try:
EditPerson(self.dbstate, self.uistate, self.track, EditPerson(self.dbstate, self.uistate, self.track,
p, self.child_ref_edited) p, self.child_ref_edited)
except Errors.WindowActiveError: except Errors.WindowActiveError:
pass pass
break
def up_button_clicked(self, obj):
handle = self.get_selected()
if handle:
pos = self.find_index(handle)
if pos > 0 :
self._move_up(pos,self.family.get_child_ref_list()[pos],
selmethod=self.family.get_child_ref_list)
def down_button_clicked(self, obj):
ref = self.get_selected()
if ref:
pos = self.find_index(ref)
if pos >=0 and pos < len(self.family.get_child_ref_list())-1:
self._move_down(pos,self.family.get_child_ref_list()[pos],
selmethod=self.family.get_child_ref_list)
def drag_data_received(self, widget, context, x, y, sel_data, info, time):
"""
Handle the standard gtk interface for drag_data_received.
If the selection data is define, extract the value from sel_data.data,
and decide if this is a move or a reorder.
"""
if sel_data and sel_data.data:
(mytype, selfid, obj, row_from) = pickle.loads(sel_data.data)
# make sure this is the correct DND type for this object
if mytype == self._DND_TYPE.drag_type:
# determine the destination row
row = self._find_row(x, y)
# if the is same object, we have a move, otherwise,
# it is a standard drag-n-drop
if id(self) == selfid:
obj = self.get_data().get_child_ref_list()[row_from]
self._move(row_from, row, obj)
else:
handle = obj
obj = gen.lib.ChildRef()
obj.ref = handle
self._handle_drag(row, obj)
self.rebuild()
elif self._DND_EXTRA and mytype == self._DND_EXTRA.drag_type:
self.handle_extra_type(mytype, obj)
def north_american(self): def north_american(self):
""" """