From 956b65327a483a7123c76e1174c680298d662817 Mon Sep 17 00:00:00 2001 From: Don Allingham Date: Wed, 25 May 2005 03:58:27 +0000 Subject: [PATCH] conflict resolution svn: r4668 --- ChangeLog | 3 + src/EditPerson.py | 237 +------------------------------------------ src/GrampsBSDDB.py | 4 +- src/GrampsDbBase.py | 13 +-- src/GrampsInMemDB.py | 75 +------------- 5 files changed, 11 insertions(+), 321 deletions(-) diff --git a/ChangeLog b/ChangeLog index 936833a59..faad4fe7a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +2005-05-24 Don Allingham + * various: CVS conflict resolution + 2005-05-24 Martin Hawlisch * src/plugins/PHPGedViewConnector.py: Enhanced version. diff --git a/src/EditPerson.py b/src/EditPerson.py index d12df8d6e..1d54ef198 100644 --- a/src/EditPerson.py +++ b/src/EditPerson.py @@ -225,7 +225,6 @@ class EditPerson: # event display -<<<<<<< EditPerson.py self.event_box = ListBox.EventListBox( self, self.person, self.event_list, events_label, [event_add_btn,event_edit_btn,event_delete_btn]) @@ -245,53 +244,6 @@ class EditPerson: self.url_box = ListBox.UrlListBox( self, self.person, self.web_list, web_label, [web_add_btn, web_edit_btn, web_delete_btn]) -======= - event_default = [ 'Event', 'Description', 'Date', 'Place' ] - self.event_trans = TransTable.TransTable(event_default) - evalues = { - 'Event' : (_('Event'),-1,150), - 'Description' : (_('Description'),-1,150), - 'Date' : (_('Date'),-1,100), - 'Place' : (_('Place'),-1,100) - } - - #if not self.db.readonly: - # values = self.db.metadata.get('event_order',event_default) - #else: - values = event_default - - etitles = [] - for val in values: - etitles.append(evalues[val]) - - self.etree = ListModel.ListModel(self.event_list,etitles, - self.on_event_select_row, - self.on_event_update_clicked) - - # attribute display - atitles = [(_('Attribute'),-1,150),(_('Value'),-1,150)] - self.atree = ListModel.ListModel(self.attr_list,atitles, - self.on_attr_select_row, - self.on_update_attr_clicked) - - # address display - ptitles = [(_('Date'),-1,150),(_('Address'),-1,150)] - self.ptree = ListModel.ListModel(self.addr_list, ptitles, - self.on_addr_select_row, - self.on_update_addr_clicked) - - # name display - ntitles = [(_('Name'),-1,250),(_('Type'),-1,100)] - self.ntree = ListModel.ListModel(self.name_list,ntitles, - self.on_name_select_row) - self.ntree.tree.connect('event',self.aka_double_click) - - # web display - wtitles = [(_('Path'),-1,250),(_('Description'),-1,100)] - self.wtree = ListModel.ListModel(self.web_list,wtitles, - self.on_web_select_row, - self.on_update_url_clicked) ->>>>>>> 1.194.2.7 self.place_list = self.pdmap.keys() self.place_list.sort() @@ -680,75 +632,6 @@ class EditPerson: def set_lds_seal(self,obj): self.lds_sealing.set_status(obj.get_active()) -<<<<<<< EditPerson.py -======= - def name_drag_data_get(self,widget, context, sel_data, info, time): - name = self.ntree.get_selected_objects() - if not name: - return - bits_per = 8; # we're going to pass a string - pickled = pickle.dumps(name[0]); - data = str((DdTargets.NAME.drag_type,self.person.get_handle(),pickled)); - sel_data.set(sel_data.target, bits_per, data) - - def name_drag_begin(self, context, a): - return - icon = self.ntree.get_icon() - t = self.ntree.tree - (x,y) = icon.get_size() - mask = gtk.gdk.Pixmap(self.window.window,x,y,1) - mask.draw_rectangle(t.get_style().white_gc, True, 0,0,x,y) - t.drag_source_set_icon(t.get_colormap(),icon,mask) - - def name_drag_data_received(self,widget,context,x,y,sel_data,info,time): - row = self.ntree.get_row_at(x,y) - - if sel_data and sel_data.data: - exec 'data = %s' % sel_data.data - exec 'mytype = "%s"' % data[0] - exec 'person = "%s"' % data[1] - if mytype != DdTargets.NAME.drag_type: - return - elif person == self.person.get_handle(): - self.move_element(self.nlist,self.ntree.get_selected_row(),row) - else: - foo = pickle.loads(data[2]); - for src in foo.get_source_references(): - base_handle = src.get_base_handle() - newbase = self.db.get_source_from_handle(base_handle) - src.set_base_handle(newbase.get_handle()) - - self.nlist.insert(row,foo) - - self.lists_changed = True - self.redraw_name_list() - - def ev_drag_data_received(self,widget,context,x,y,sel_data,info,time): - row = self.etree.get_row_at(x,y) - - if sel_data and sel_data.data: - exec 'data = %s' % sel_data.data - exec 'mytype = "%s"' % data[0] - exec 'person = "%s"' % data[1] - if mytype != DdTargets.EVENT.drag_type: - return - elif person == self.person.get_handle(): - self.move_element(self.elist,self.etree.get_selected_row(),row) - else: - foo = pickle.loads(data[2]); - for src in foo.get_source_references(): - base_handle = src.get_base_handle() - newbase = self.db.get_source_from_handle(base_handle) - src.set_base_handle(newbase.get_handle()) - place = foo.get_place_handle() - if place: - foo.set_place_handle(place.get_handle()) - self.elist.insert(row,foo.get_handle()) - - self.lists_changed = True - self.redraw_event_list() - ->>>>>>> 1.194.2.7 def move_element(self,list,src,dest): if src == -1: return @@ -756,125 +639,6 @@ class EditPerson: list.remove(obj) list.insert(dest,obj) -<<<<<<< EditPerson.py -======= - def ev_drag_data_get(self,widget, context, sel_data, info, time): - ev = self.etree.get_selected_objects() - if not ev: - return - bits_per = 8; # we're going to pass a string - pickled = pickle.dumps(ev[0]); - data = str((DdTargets.EVENT.drag_type,self.person.get_handle(),pickled)); - sel_data.set(sel_data.target, bits_per, data) - - def ev_drag_begin(self, context, a): - return - icon = self.etree.get_icon() - t = self.etree.tree - (x,y) = icon.get_size() - mask = gtk.gdk.Pixmap(self.window.window,x,y,1) - mask.draw_rectangle(t.get_style().white_gc, True, 0,0,x,y) - t.drag_source_set_icon(t.get_colormap(),icon,mask) - - def url_drag_data_received(self,widget,context,x,y,sel_data,info,time): - row = self.wtree.get_row_at(x,y) - - if sel_data and sel_data.data: - exec 'data = %s' % sel_data.data - exec 'mytype = "%s"' % data[0] - exec 'person = "%s"' % data[1] - if mytype != DdTargets.URL.drag_type: - return - elif person == self.person.get_handle(): - self.move_element(self.ulist,self.wtree.get_selected_row(),row) - else: - foo = pickle.loads(data[2]); - self.ulist.append(foo) - self.lists_changed = True - self.redraw_url_list() - - def url_drag_begin(self, context, a): - return - - def url_drag_data_get(self,widget, context, sel_data, info, time): - ev = self.wtree.get_selected_objects() - - if len(ev): - bits_per = 8; # we're going to pass a string - pickled = pickle.dumps(ev[0]); - data = str((DdTargets.URL.drag_type,self.person.get_handle(),pickled)); - sel_data.set(sel_data.target, bits_per, data) - - def at_drag_data_received(self,widget,context,x,y,sel_data,info,time): - row = self.atree.get_row_at(x,y) - - if sel_data and sel_data.data: - exec 'data = %s' % sel_data.data - exec 'mytype = "%s"' % data[0] - exec 'person = "%s"' % data[1] - if mytype != DdTargets.ATTRIBUTE.drag_type: - return - elif person == self.person.get_handle(): - self.move_element(self.alist,self.atree.get_selected_row(),row) - else: - foo = pickle.loads(data[2]); - for src in foo.get_source_references(): - base_handle = src.get_base_handle() - newbase = self.db.get_source_from_handle(base_handle) - src.set_base_handle(newbase.get_handle()) - self.alist.append(foo) - self.lists_changed = True - self.redraw_attr_list() - - def at_drag_begin(self, context, a): - return - - def at_drag_data_get(self,widget, context, sel_data, info, time): - ev = self.atree.get_selected_objects() - - if len(ev): - bits_per = 8; # we're going to pass a string - pickled = pickle.dumps(ev[0]); - data = str((DdTargets.ATTRIBUTE.drag_type, - self.person.get_handle(),pickled)); - sel_data.set(sel_data.target, bits_per, data) - - def ad_drag_data_received(self,widget,context,x,y,sel_data,info,time): - row = self.ptree.get_row_at(x,y) - - if sel_data and sel_data.data: - exec 'data = %s' % sel_data.data - exec 'mytype = "%s"' % data[0] - exec 'person = "%s"' % data[1] - if mytype != DdTargets.ADDRESS.drag_type: - return - elif person == self.person.get_handle(): - self.move_element(self.plist,self.ptree.get_selected_row(),row) - else: - foo = pickle.loads(data[2]); - for src in foo.get_source_references(): - base_handle = src.get_base_handle() - newbase = self.db.get_source_from_handle(base_handle) - src.set_base_handle(newbase.get_handle()) - self.plist.insert(row,foo) - - self.lists_changed = True - self.redraw_addr_list() - - def ad_drag_data_get(self,widget, context, sel_data, info, time): - ev = self.ptree.get_selected_objects() - - if len(ev): - bits_per = 8; # we're going to pass a string - pickled = pickle.dumps(ev[0]); - data = str((DdTargets.ADDRESS.drag_type, - self.person.get_handle(),pickled)); - sel_data.set(sel_data.target, bits_per, data) - - def ad_drag_begin(self, context, a): - return - ->>>>>>> 1.194.2.7 def menu_changed(self,obj): self.ldsfam = self.lds_fam_list[obj.get_active()] @@ -1514,3 +1278,4 @@ def build_combo(entry,strings): store.set(node,0,unicode(value)) entry.set_model(store) + diff --git a/src/GrampsBSDDB.py b/src/GrampsBSDDB.py index 697c53b01..76c49c2d5 100644 --- a/src/GrampsBSDDB.py +++ b/src/GrampsBSDDB.py @@ -292,8 +292,6 @@ class GrampsBSDDB(GrampsDbBase): vals.sort() return vals -<<<<<<< GrampsBSDDB.py -======= def remove_person(self,handle,transaction): if not self.readonly and handle and str(handle) in self.person_map: person = self.get_person_from_handle(handle) @@ -342,7 +340,6 @@ class GrampsBSDDB(GrampsDbBase): self.emit('media-delete',([handle],)) self.media_map.delete(str(handle)) ->>>>>>> 1.41.2.5 def get_person_from_gramps_id(self,val): """finds a Person in the database from the passed gramps' ID. If no such Person exists, a new Person is added to the database.""" @@ -754,3 +751,4 @@ class GrampsBSDDB(GrampsDbBase): if val[1] != 6: order.append(val) self.set_media_column_order(order) + diff --git a/src/GrampsDbBase.py b/src/GrampsDbBase.py index 8e5f2acab..565c65043 100644 --- a/src/GrampsDbBase.py +++ b/src/GrampsDbBase.py @@ -1230,20 +1230,8 @@ class GrampsDbBase(GrampsDBCallback.GrampsDBCallback): Returns the MediaObject display common information stored in the database's metadata. """ -<<<<<<< GrampsDbBase.py default = [(1,1),(0,5),(0,6),(1,2),(1,3),(0,4)] return self._get_column_order(MEDIA_COL_KEY,default) -======= - default = [(1,1),(0,5),(0,4),(1,2),(1,3)] - if self.metadata == None: - return default - else: - cols = self.metadata.get('media_columns',default) - if len(cols) != len(default): - return cols + default[len(cols):] - else: - return cols ->>>>>>> 1.53.2.3 class Transaction: """ @@ -1343,3 +1331,4 @@ class Transaction: return self.last - self.first + 1 return 0 + diff --git a/src/GrampsInMemDB.py b/src/GrampsInMemDB.py index 25a64f02e..497c6bce5 100644 --- a/src/GrampsInMemDB.py +++ b/src/GrampsInMemDB.py @@ -145,124 +145,59 @@ class GrampsInMemDB(GrampsDbBase): vals.sort() return vals -<<<<<<< GrampsInMemDB.py def _del_person(self,handle): -======= - def remove_person(self,handle,transaction): - if self.readonly or not handle or str(handle) not in self.person_map: - return - person = self.get_person_from_handle(handle) - self.genderStats.uncount_person (person) - if transaction != None: - old_data = self.person_map.get(handle) - transaction.add(PERSON_KEY,handle,old_data) - self.emit('person-delete',([handle],)) ->>>>>>> 1.23.2.2 del self.id_trans[person.get_gramps_id()] del self.person_map[handle] -<<<<<<< GrampsInMemDB.py def _del_source(self,handle): -======= - def remove_source(self,handle,transaction): - if self.readonly or not handle or str(handle) not in self.source_map: - return - source = self.get_source_from_handle(handle) - if transaction != None: - old_data = self.source_map.get(str(handle)) - transaction.add(SOURCE_KEY,handle,old_data) - self.emit('source-delete',([handle],)) ->>>>>>> 1.23.2.2 del self.sid_trans[source.get_gramps_id()] del self.source_map[str(handle)] -<<<<<<< GrampsInMemDB.py def _del_place(self,handle): -======= - def remove_place(self,handle,transaction): - if self.readonly or not handle or str(handle) not in self.place_map: - return - place = self.get_place_from_handle(handle) - if transaction != None: - old_data = self.place_map.get(str(handle)) - transaction.add(PLACE_KEY,handle,old_data) - self.emit('place-delete',([handle],)) ->>>>>>> 1.23.2.2 del self.pid_trans[place.get_gramps_id()] del self.place_map[str(handle)] -<<<<<<< GrampsInMemDB.py def _del_media(self,handle): -======= - def remove_object(self,handle,transaction): - if self.readonly or not handle or str(handle) not in self.media_map: - return - obj = self.get_object_from_handle(handle) - if transaction != None: - old_data = self.media_map.get(str(handle)) - transaction.add(MEDIA_KEY,handle,old_data) - self.emit('media-delete',([handle],)) ->>>>>>> 1.23.2.2 del self.oid_trans[obj.get_gramps_id()] del self.media_map[str(handle)] -<<<<<<< GrampsInMemDB.py def _del_family(self,handle): -======= - def remove_family(self,handle,transaction): - if self.readonly or not handle or str(handle) not in self.family_map: - return - family = self.get_family_from_handle(handle) - if transaction != None: - old_data = self.family_map.get(str(handle)) - transaction.add(FAMILY_KEY,handle,old_data) - self.emit('family-delete',([handle],)) ->>>>>>> 1.23.2.2 del self.fid_trans[family.get_gramps_id()] del self.family_map[str(handle)] -<<<<<<< GrampsInMemDB.py def _del_event(self,handle): -======= - def remove_event(self,handle,transaction): - if self.readonly or not handle or str(handle) not in self.event_map: - return - if transaction != None: - old_data = self.event_map.get(str(handle)) - transaction.add(EVENT_KEY,handle,old_data) ->>>>>>> 1.23.2.2 del self.event_map[str(handle)] def commit_person(self,person,transaction,change_time=None): - if self.readonly or not person or not person.get_handle(): + if self.readonly or not person.get_handle(): return gid = person.get_gramps_id() self.id_trans[gid] = person.get_handle() GrampsDbBase.commit_person(self,person,transaction,change_time) def commit_place(self,place,transaction,change_time=None): - if self.readonly or not place or not place.get_handle(): + if self.readonly or not place.get_handle(): return gid = place.get_gramps_id() self.pid_trans[gid] = place.get_handle() GrampsDbBase.commit_place(self,place,transaction,change_time) def commit_family(self,family,transaction,change_time=None): - if self.readonly or not family or not family.get_handle(): + if self.readonly or not family.get_handle(): return gid = family.get_gramps_id() self.fid_trans[gid] = family.get_handle() GrampsDbBase.commit_family(self,family,transaction,change_time) def commit_media_object(self,obj,transaction,change_time=None): - if self.readonly or not obj or not obj.get_handle(): + if self.readonly or not obj.get_handle(): return gid = obj.get_gramps_id() self.oid_trans[gid] = obj.get_handle() GrampsDbBase.commit_media_object(self,obj,transaction,change_time) def commit_source(self,source,transaction,change_time=None): - if self.readonly or not source or not source.get_handle(): + if self.readonly or not source.get_handle(): return gid = source.get_gramps_id() self.sid_trans[gid] = source.get_handle()