From a9d7dd1b4261c0fc65030c7950527caf90d3bf61 Mon Sep 17 00:00:00 2001 From: Don Allingham Date: Thu, 19 Jul 2007 04:33:10 +0000 Subject: [PATCH] * src/Merge/_MergeSource.py: convert get_note to get_note_list * src/Merge/_MergePlace.py: convert get_note to get_note_list * src/Merge/_MergePerson.py: convert get_note to get_note_list 2007-07-18 Don Allingham svn: r8742 --- ChangeLog | 5 +++++ src/Merge/_MergePerson.py | 15 ++------------- src/Merge/_MergePlace.py | 25 +------------------------ src/Merge/_MergeSource.py | 25 +------------------------ 4 files changed, 9 insertions(+), 61 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7a0e4d656..432750ab1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-07-18 Don Allingham + * src/Merge/_MergeSource.py: convert get_note to get_note_list + * src/Merge/_MergePlace.py: convert get_note to get_note_list + * src/Merge/_MergePerson.py: convert get_note to get_note_list + 2007-07-18 Don Allingham * src/ReportBase/_StyleEditor.py: get rid of Utils.destroy_passed_object * src/Utils.py: Remove unused functions diff --git a/src/Merge/_MergePerson.py b/src/Merge/_MergePerson.py index 2631a6a30..21ae27e67 100644 --- a/src/Merge/_MergePerson.py +++ b/src/Merge/_MergePerson.py @@ -345,13 +345,7 @@ class MergePeople: self.p2 = person2 def copy_note(self,one,two): - text1 = one.get_note(markup=True) - text2 = two.get_note(markup=True) - - if text1 and text1 != text2: - one.set_note("%s\n\n%s" % (text1,text2)) - else: - one.set_note(two.get_note(markup=True)) + one.set_note_list(one.get_note_list() + two.get_note_list()) def copy_sources(self,one,two): slist = one.get_source_references()[:] @@ -838,12 +832,7 @@ class MergePeople: tgt_family.add_attribute(xdata) # merge family notes - - if src_family.get_note(markup=True) != "": - old_note = tgt_family.get_note(markup=True) - if old_note: - old_note = old_note + "\n\n" - tgt_family.set_note(old_note + src_family.get_note(markup=True)) + tgt_family.set_note_list(tgt_family.get_note_list() + src_family.get_note_list()) # merge family top-level sources diff --git a/src/Merge/_MergePlace.py b/src/Merge/_MergePlace.py index adeadf292..8ae5a5959 100644 --- a/src/Merge/_MergePlace.py +++ b/src/Merge/_MergePlace.py @@ -76,19 +76,6 @@ class MergePlaces(ManagedWindow.ManagedWindow): title2_text.set_text(self.p2.get_title()) self.title3_entry.set_text(self.p1.get_title()) - self.note_p1 = self.glade.get_widget('note_p1') - self.note_p2 = self.glade.get_widget('note_p2') - self.note_merge = self.glade.get_widget('note_merge') - self.note_title = self.glade.get_widget('note_title') - - self.note_conflict = (self.p1.get_note(markup=True) and - self.p2.get_note(markup=True)) - if self.note_conflict: - self.note_title.show() - self.note_p1.show() - self.note_p2.show() - self.note_merge.show() - self.glade.get_widget('cancel').connect('clicked', self.close_window) self.glade.get_widget('ok').connect('clicked', self.merge) self.glade.get_widget('help').connect('clicked', self.help) @@ -137,17 +124,7 @@ class MergePlaces(ManagedWindow.ManagedWindow): self.p1.add_source_reference(source) # Add notes from P2 to P1 - if self.note_conflict: - note1 = self.p1.get_note(markup=True) - note2 = self.p2.get_note(markup=True) - if self.note_p2.get_active(): - self.p1.set_note(note2) - elif self.note_merge.get_active(): - self.p1.set_note("%s\n\n%s" % (note1,note2)) - else: - note = self.p2.get_note(markup=True) - if note != "" and self.p1.get_note(markup=True) == "": - self.p1.set_note(note) + self.p1.set_note_list(self.p1.get_note_list() + self.p2.get_note_list()) if t2active: lst = [self.p1.get_main_location()] + self.p1.get_alternate_locations() diff --git a/src/Merge/_MergeSource.py b/src/Merge/_MergeSource.py index 9aacf2c5d..4941e1b5c 100644 --- a/src/Merge/_MergeSource.py +++ b/src/Merge/_MergeSource.py @@ -95,19 +95,6 @@ class MergeSources(ManagedWindow.ManagedWindow): self.gramps1.set_text(self.s1.get_gramps_id()) self.gramps2.set_text(self.s2.get_gramps_id()) - self.note_s1 = self.glade.get_widget('note_s1') - self.note_s2 = self.glade.get_widget('note_s2') - self.note_merge = self.glade.get_widget('note_merge') - self.note_title = self.glade.get_widget('note_title') - - self.note_conflict = (self.s1.get_note(markup=True) and - self.s2.get_note(markup=True)) - if self.note_conflict: - self.note_title.show() - self.note_s1.show() - self.note_s2.show() - self.note_merge.show() - self.glade.get_widget('ok').connect('clicked',self.merge) self.glade.get_widget('cancel').connect('clicked',self.close_window) self.glade.get_widget('help').connect('clicked',self.help) @@ -151,17 +138,7 @@ class MergeSources(ManagedWindow.ManagedWindow): self.s1.add_media_reference(photo) # Add notes from S2 to S1 - if self.note_conflict: - note1 = self.s1.get_note(markup=True) - note2 = self.s2.get_note(markup=True) - if self.note_s2.get_active(): - self.s1.set_note(note2) - elif self.note_merge.get_active(): - self.s1.set_note("%s\n\n%s" % (note1,note2)) - else: - note = self.s2.get_note(markup=True) - if note != "" and self.s1.get_note(markup=True) == "": - self.s1.set_note(note) + self.s1.set_note_list(self.s1.get_note_list() + self.s2.get_note_list()) src2_map = self.s2.get_data_map() src1_map = self.s1.get_data_map()