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

* src/EditPerson.py: clean up building notebook pages

Browse Source 
* src/DisplayTabs.py: support for drag-n-drop


svn: r5859
This commit is contained in:
Don Allingham 2006-01-31 15:13:54 +00:00
parent 2c1d8b226c
commit 3bb985186d
3 changed files with 145 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gramps2/ChangeLog
View File

@ -1,3 +1,7 @@
2006-01-31 Don Allingham <don@gramps-project.org>
* src/EditPerson.py: clean up building notebook pages
* src/DisplayTabs.py: support for drag-n-drop
2006-01-30 Alex Roitman <shura@gramps-project.org> 2006-01-30 Alex Roitman <shura@gramps-project.org>
* src/GrampsDb/_GrampsBSDDB.py (get_gramps_ids): Move to * src/GrampsDb/_GrampsBSDDB.py (get_gramps_ids): Move to
GrampsDbBase; (_get_obj_from_gramps_id,_find_from_handle): Only GrampsDbBase; (_get_obj_from_gramps_id,_find_from_handle): Only

130
gramps2/src/DisplayTabs.py
View File

@ -259,7 +259,7 @@ class EmbeddedList(ButtonTab):
""" """
_HANDLE_COL = -1 _HANDLE_COL = -1
_DND_TYPE = "" _DND_TYPE = None
def __init__(self, dbstate, uistate, track, name, build_model): def __init__(self, dbstate, uistate, track, name, build_model):
""" """
@ -267,6 +267,7 @@ class EmbeddedList(ButtonTab):
populate the list. populate the list.
""" """
ButtonTab.__init__(self, dbstate, uistate, track, name) ButtonTab.__init__(self, dbstate, uistate, track, name)
self.changed = False
self.build_model = build_model self.build_model = build_model
# handle the selection # handle the selection
@ -277,57 +278,108 @@ class EmbeddedList(ButtonTab):
self.columns = [] self.columns = []
self.build_columns() self.build_columns()
self.set_dnd() self._set_dnd()
# build the initial data # build the initial data
self.rebuild() self.rebuild()
self.show_all() self.show_all()
def set_dnd(self): def find_index(self,obj):
self.tree.drag_dest_set(gtk.DEST_DEFAULT_ALL, """
[DdTargets.NAME.target()], returns the index of the object within the associated data
"""
return self.get_data().index(obj)
def _set_dnd(self):
"""
Sets up drag-n-drop. The source and destionation are set by calling .target()
on the _DND_TYPE. Obviously, this means that there must be a _DND_TYPE
variable defined that points to an entry in DdTargets.
"""
self.tree.drag_dest_set(gtk.DEST_DEFAULT_ALL, [self._DND_TYPE.target()],
ACTION_COPY) ACTION_COPY)
self.tree.drag_source_set(BUTTON1_MASK, self.tree.drag_source_set(BUTTON1_MASK, [self._DND_TYPE.target()], ACTION_COPY)
[DdTargets.NAME.target()],
ACTION_COPY)
self.tree.connect('drag_data_get', self.drag_data_get) self.tree.connect('drag_data_get', self.drag_data_get)
self.tree.connect('drag_data_received', self.drag_data_received) self.tree.connect('drag_data_received', self.drag_data_received)
def drag_data_get(self,widget, context, sel_data, info, time): def drag_data_get(self,widget, context, sel_data, info, time):
"""
Provide the drag_data_get function, which passes a tuple consisting of:
1) Drag type defined by the .drag_type field specfied by the value
assigned to _DND_TYPE
2) The id value of this object, used for the purpose of determining
the source of the object. If the source of the object is the same
as the object, we are doing a reorder instead of a normal drag
and drop
3) Pickled data. The pickled version of the selected object
4) Source row. Used for a reorder to determine the original position
of the object
"""
# get the selected object, returning if not is defined
obj = self.get_selected() obj = self.get_selected()
if not obj: if not obj:
return return
bits_per = 8; # we're going to pass a string # pickle the data, and build the tuple to be passed
pickled = pickle.dumps(obj); pickled = pickle.dumps(obj);
data = str((self._DND_TYPE, id(self), pickled)) data = str((self._DND_TYPE.drag_type, id(self), pickled, self.find_index(obj)))
sel_data.set(sel_data.target, bits_per, data)
# pass as a string (8 bits)
sel_data.set(sel_data.target, 8, data)
def drag_data_received(self,widget,context,x,y,sel_data,info,time): def drag_data_received(self,widget,context,x,y,sel_data,info,time):
row = self.tree.get_path_at_pos(x,y) """
if row == None: Handle the standard gtk interface for drag_data_received.
row = len(self.get_data())
else: If the selection data is define, extract the value from sel_data.data,
row = row[0][0] and decide if this is a move or a reorder.
"""
if sel_data and sel_data.data: if sel_data and sel_data.data:
exec 'dnddata = %s' % sel_data.data exec 'dnddata = %s' % sel_data.data
mytype = dnddata[0] mytype = dnddata[0]
selfid = dnddata[1] selfid = dnddata[1]
obj = pickle.loads(dnddata[2]) obj = pickle.loads(dnddata[2])
if mytype == self._DND_TYPE: row_from = dnddata[3]
# 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: if id(self) == selfid:
self.move(row,obj) self._move(row_from,row,obj)
else: else:
self.handle_drag(row,obj) self._handle_drag(row,obj)
self.rebuild() self.rebuild()
def handle_drag(self, row, obj): def _find_row(self,x,y):
print "drag row=",row row = self.tree.get_path_at_pos(x,y)
print "drag obj=", obj if row == None:
return len(self.get_data())
else:
return row[0][0]
def move(self, row, obj): def _handle_drag(self, row, obj):
print "move row=",row self.get_data().insert(row,obj)
print "move obj=", obj self.changed = True
self.rebuild()
def _move(self, row_from, row_to, obj):
dlist = self.get_data()
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 get_icon_name(self): def get_icon_name(self):
""" """
@ -466,7 +518,7 @@ class EmbeddedList(ButtonTab):
class EventEmbedList(EmbeddedList): class EventEmbedList(EmbeddedList):
_HANDLE_COL = 6 _HANDLE_COL = 6
_DND_TYPE = DdTargets.EVENTREF.drag_type _DND_TYPE = DdTargets.EVENTREF
_column_names = [ _column_names = [
(_('Type'),0,100), (_('Type'),0,100),
@ -479,7 +531,6 @@ class EventEmbedList(EmbeddedList):
def __init__(self,dbstate,uistate,track,obj): def __init__(self,dbstate,uistate,track,obj):
self.obj = obj self.obj = obj
self.changed = False
EmbeddedList.__init__(self, dbstate, uistate, track, EmbeddedList.__init__(self, dbstate, uistate, track,
_('Events'), EventRefModel) _('Events'), EventRefModel)
@ -503,7 +554,8 @@ class EventEmbedList(EmbeddedList):
if ref: if ref:
ref_list = self.obj.get_event_ref_list() ref_list = self.obj.get_event_ref_list()
ref_list.remove(ref) ref_list.remove(ref)
self.rebuild() self.changed = True
self.rebuild()
def edit_button_clicked(self,obj): def edit_button_clicked(self,obj):
ref = self.get_selected() ref = self.get_selected()
@ -526,13 +578,15 @@ class EventEmbedList(EmbeddedList):
class PersonEventEmbedList(EventEmbedList): class PersonEventEmbedList(EventEmbedList):
def __init__(self,dbstate,uistate,track,obj): def __init__(self,dbstate,uistate,track,obj):
self.orig_data = [ data for data in [ obj.get_birth_ref(), \
obj.get_death_ref()] + \
obj.get_event_ref_list() \
if data ]
EventEmbedList.__init__(self, dbstate, uistate, track, obj) EventEmbedList.__init__(self, dbstate, uistate, track, obj)
def get_data(self): def get_data(self):
return [ obj for obj in [ self.obj.get_birth_ref(), \ return self.orig_data
self.obj.get_death_ref()] + self.obj.get_event_ref_list() \
if obj ]
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #
@ -648,7 +702,7 @@ class DataEmbedList(EmbeddedList):
class AttrEmbedList(EmbeddedList): class AttrEmbedList(EmbeddedList):
_HANDLE_COL = 2 _HANDLE_COL = 2
_DND_TYPE = DdTargets.ATTRIBUTE.drag_type _DND_TYPE = DdTargets.ATTRIBUTE
_column_names = [ _column_names = [
(_('Type'),0,250), (_('Type'),0,250),
@ -674,7 +728,7 @@ class AttrEmbedList(EmbeddedList):
class WebEmbedList(EmbeddedList): class WebEmbedList(EmbeddedList):
_HANDLE_COL = -1 _HANDLE_COL = -1
_DND_TYPE = DdTargets.URL.drag_type _DND_TYPE = DdTargets.URL
_column_names = [ _column_names = [
(_('Type') ,0, 100), (_('Type') ,0, 100),
@ -701,7 +755,7 @@ class WebEmbedList(EmbeddedList):
class NameEmbedList(EmbeddedList): class NameEmbedList(EmbeddedList):
_HANDLE_COL = -1 _HANDLE_COL = -1
_DND_TYPE = DdTargets.NAME.drag_type _DND_TYPE = DdTargets.NAME
_column_names = [ _column_names = [
(_('Name'),0, 250), (_('Name'),0, 250),
@ -727,7 +781,7 @@ class NameEmbedList(EmbeddedList):
class AddrEmbedList(EmbeddedList): class AddrEmbedList(EmbeddedList):
_HANDLE_COL = -1 _HANDLE_COL = -1
_DND_TYPE = DdTargets.ADDRESS.drag_type _DND_TYPE = DdTargets.ADDRESS
_column_names = [ _column_names = [
(_('Date'), 0, 150), (_('Date'), 0, 150),
@ -892,7 +946,7 @@ class GalleryTab(ButtonTab):
class SourceEmbedList(EmbeddedList): class SourceEmbedList(EmbeddedList):
_HANDLE_COL = 4 _HANDLE_COL = 4
_DND_TYPE = DdTargets.SOURCEREF.drag_type _DND_TYPE = DdTargets.SOURCEREF
_column_names = [ _column_names = [
(_('ID'), 0, 75), (_('ID'), 0, 75),
@ -938,7 +992,7 @@ class SourceEmbedList(EmbeddedList):
class ChildModel(gtk.ListStore): class ChildModel(gtk.ListStore):
_HANDLE_COL = -8 _HANDLE_COL = -8
_DND_TYPE = DdTargets.PERSON_LINK.drag_type _DND_TYPE = DdTargets.PERSON_LINK
def __init__(self, family, db): def __init__(self, family, db):
self.family = family self.family = family

87
gramps2/src/EditPerson.py
View File

@ -253,47 +253,52 @@ class EditPerson(DisplayState.ManagedWindow):
self.eventbox.connect('button-press-event',self.image_button_press) self.eventbox.connect('button-press-event',self.image_button_press)
self.notebook = gtk.Notebook() self._create_tabbed_pages()
self.vbox.pack_start(self.notebook,True)
self.notebook.show_all()
self.event_list = PersonEventEmbedList(self.dbstate,self.uistate,
self.track,self.person)
self.name_list = NameEmbedList(self.dbstate, self.uistate, self.track,
self.person.get_alternate_names())
self.srcref_list = SourceEmbedList(self.dbstate,self.uistate,
self.track,self.person.source_list)
self.attr_list = AttrEmbedList(self.dbstate,self.uistate,self.track,
self.person.get_attribute_list())
self.addr_list = AddrEmbedList(self.dbstate,self.uistate,self.track,
self.person.get_address_list())
self.note_tab = NoteTab(self.dbstate, self.uistate, self.track,
self.person.get_note_object())
self.gallery_tab = GalleryTab(self.dbstate, self.uistate, self.track,
self.person.get_media_list())
self.web_list = WebEmbedList(self.dbstate,self.uistate,self.track,
self.person.get_url_list())
self.notebook.insert_page(self.event_list)
self.notebook.set_tab_label(self.event_list,self.event_list.get_tab_widget())
self.notebook.insert_page(self.name_list)
self.notebook.set_tab_label(self.name_list,self.name_list.get_tab_widget())
self.notebook.insert_page(self.attr_list)
self.notebook.set_tab_label(self.attr_list,self.attr_list.get_tab_widget())
self.notebook.insert_page(self.addr_list)
self.notebook.set_tab_label(self.addr_list,self.addr_list.get_tab_widget())
self.notebook.insert_page(self.note_tab)
self.notebook.set_tab_label(self.note_tab,self.note_tab.get_tab_widget())
self.notebook.insert_page(self.srcref_list)
self.notebook.set_tab_label(self.srcref_list,self.srcref_list.get_tab_widget())
self.notebook.insert_page(self.gallery_tab)
self.notebook.set_tab_label(self.gallery_tab,self.gallery_tab.get_tab_widget())
self.notebook.insert_page(self.web_list)
self.notebook.set_tab_label(self.web_list,self.web_list.get_tab_widget())
self.given.grab_focus() self.given.grab_focus()
self.show() self.show()
def _add_page(self,page):
self.notebook.insert_page(page)
self.notebook.set_tab_label(page,page.get_tab_widget())
return page
def _create_tabbed_pages(self):
"""
Creates the notebook tabs and inserts them into the main
window.
"""
self.notebook = gtk.Notebook()
self.event_list = self._add_page(PersonEventEmbedList(
self.dbstate,self.uistate, self.track,self.person))
self.name_list = self._add_page(NameEmbedList(
self.dbstate, self.uistate, self.track,
self.person.get_alternate_names()))
self.srcref_list = self._add_page(SourceEmbedList(
self.dbstate,self.uistate, self.track,
self.person.source_list))
self.attr_list = self._add_page(AttrEmbedList(
self.dbstate,self.uistate,self.track,
self.person.get_attribute_list()))
self.addr_list = self._add_page(AddrEmbedList(
self.dbstate,self.uistate,self.track,
self.person.get_address_list()))
self.note_tab = self._add_page(NoteTab(
self.dbstate, self.uistate, self.track,
self.person.get_note_object()))
self.gallery_tab = self._add_page(GalleryTab(
self.dbstate, self.uistate, self.track,
self.person.get_media_list()))
self.web_list = self._add_page(WebEmbedList(
self.dbstate,self.uistate,self.track,
self.person.get_url_list()))
self.notebook.show_all()
self.vbox.pack_start(self.notebook,True)
def build_menu_names(self,person): def build_menu_names(self,person):
win_menu_label = self.nd.display(person) win_menu_label = self.nd.display(person)
if not win_menu_label.strip(): if not win_menu_label.strip():
@ -593,6 +598,12 @@ class EditPerson(DisplayState.ManagedWindow):
self.person_photo.hide() self.person_photo.hide()
def on_apply_person_clicked(self,obj): def on_apply_person_clicked(self,obj):
print self.event_list.changed
print self.name_list.changed
print self.srcref_list.changed
print self.attr_list.changed
print self.addr_list.changed
print self.web_list.changed
return return
if self.gender.get_active() == RelLib.Person.UNKNOWN: if self.gender.get_active() == RelLib.Person.UNKNOWN: