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

2007-05-09 Benny Malengier <bm@cage.ugent.be>

Browse Source 
* src/glade/gramps.glade: fix #797
	* src/glade/gramps.glade: fix #796
	* src/GrampsDbUtils/_ReadXML.py: Set specific notetype on import/read of pre 2.3 xml, 
          inherit privacy of creating object for pre 2.3 xml as much as possible.



svn: r8453
This commit is contained in:
Benny Malengier 2007-05-09 19:27:15 +00:00
parent 92b3f4da04
commit 5b4807732d
4 changed files with 78 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2007-05-09 Benny Malengier <bm@cage.ugent.be>
* src/glade/gramps.glade: fix #797
* src/glade/gramps.glade: fix #796
* src/GrampsDbUtils/_ReadXML.py: Set specific notetype on import/read of pre 2.3 xml,
inherit privacy of creating object for pre 2.3 xml as much as possible.
2007-05-08 Brian Matherly <brian@gramps-project.org>
* src/plugins/NarrativeWeb.py: Change the default directory so people don't
generate the report in their database directory.

2
TODO
View File

@ -27,6 +27,8 @@
in a report
--> Support for multiple notes in all reports.
--> Empty text field on Saving Note should throw an error that Note is empty ! (?)
--> Undo in Note. Serious editing needs an undo function. Furthermore, the function
the Clear icon is unclear: tooltip? Other icon?
* Split views

66
src/GrampsDbUtils/_ReadXML.py
View File

@ -743,6 +743,8 @@ class GrampsParser(UpdateCallback):
note = RelLib.Note()
note.handle = Utils.create_id()
note.set(_("Witness name: %s") % attrs['name'])
note.type.set(RelLib.NoteType.EVENT)
note.private = self.event.private
self.db.add_note(note,self.trans)
self.event.add_note(note.handle)
return
@ -1130,11 +1132,68 @@ class GrampsParser(UpdateCallback):
self.note.type.set_from_xml_str(attrs['type'])
else:
# GRAMPS LEGACY: old notes that were written inside other objects
# We need to create a top-level note.
# We need to create a top-level note, it's type depends on
# the caller object, and inherits privacy from caller object
# On stop_note the reference to this note will be added
self.note = RelLib.Note()
self.note.handle = Utils.create_id()
self.note.format = int(attrs.get('format',RelLib.Note.FLOWED))
if self.source_ref:
self.note.type.set(RelLib.NoteType.SOURCEREF)
# self.note.private = ... sourceref has no private ??
elif self.address:
self.note.type.set(RelLib.NoteType.ADDRESS)
self.note.private = self.address.private
elif self.ord:
self.note.type.set(elLib.NoteType.LDS)
# self.note.private = ... lds_ord has no private ??
elif self.attribute:
self.note.type.set(RelLib.NoteType.ATTRIBUTE)
self.note.private = self.attribute.private
elif self.object:
self.note.type.set(RelLib.NoteType.MEDIA)
# self.note.private = ... object has no private ??
elif self.objref:
self.note.type.set(RelLib.NoteType.MEDIAREF)
self.note.private = self.objref.private
elif self.photo:
self.note.type.set(RelLib.NoteType.MEDIA)
# ?? photo no privacy? only pref: self.pref.get_privacy()??
elif self.name:
self.note.type.set(RelLib.NoteType.PERSONNAME)
# ?? error in self.name ?? set_private instead of private ??
self.note.private = self.name.set_private
elif self.source:
self.note.type.set(RelLib.NoteType.SOURCE)
# ?? self.note.private = self.source. ?? no private ??
elif self.event:
self.note.type.set(RelLib.NoteType.EVENT)
self.note.private = self.event.private
elif self.personref:
self.note.type.set(RelLib.NoteType.ASSOCIATION)
self.note.private = self.personref.private
elif self.person:
self.note.type.set(RelLib.NoteType.PERSON)
# ?? self.note.private = self.person ... ?? no private ??
elif self.childref:
self.note.type.set(RelLib.NoteType.CHILDREF)
self.note.private = self.childref.private
elif self.family:
self.note.type.set(RelLib.NoteType.FAMILY)
# ?? self.note.private = self.family ... ?? no private ??
elif self.placeobj:
self.note.type.set(RelLib.NoteType.PLACE)
# ?? self.note.private = self.family ... ?? no private ??
elif self.eventref:
self.note.type.set(RelLib.NoteType.EVENTREF)
self.note.private = self.eventref.private
elif self.repo:
self.note.type.set(RelLib.NoteType.REPO)
# ?? self.note.private = self.repo ... ?? no private ??
elif self.reporef:
self.note.type.set(RelLib.NoteType.REPOREF)
# reporef has no private, correct
self.db.add_note(self.note,self.trans)
def start_noteref(self,attrs):
@ -1537,6 +1596,8 @@ class GrampsParser(UpdateCallback):
note = RelLib.Note()
note.handle = Utils.create_id()
note.set(_("Witness comment: %s") % text)
note.type.set(RelLib.NoteType.EVENT)
note.private = self.event.private
self.db.add_note(note,self.trans)
self.event.add_note(note.handle)
self.in_witness = False
@ -1641,6 +1702,8 @@ class GrampsParser(UpdateCallback):
note = RelLib.Note()
note.handle = Utils.create_id()
note.set(_("Witness name: %s") % tag)
note.type.set(RelLib.NoteType.EVENT)
note.private = self.event.private
self.db.add_note(note,self.trans)
self.event.add_note(note.handle)
elif self.alt_name:
@ -1787,6 +1850,7 @@ class GrampsParser(UpdateCallback):
note = RelLib.Note()
note.handle = Utils.create_id()
note.set(text)
note.type.set(RelLib.NoteType.SOURCEREF)
self.db.add_note(note,self.trans)
self.source_ref.add_note(note.handle)

7
src/glade/gramps.glade
View File

@ -1813,7 +1813,7 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="mnemonic_widget">city</property>
<property name="mnemonic_widget">street</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
@ -6801,6 +6801,7 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="mnemonic_widget">personal_events</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
@ -6969,6 +6970,7 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">3</property>
<property name="mnemonic_widget">select_place</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
@ -10521,6 +10523,7 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="mnemonic_widget">eer_type_combo</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
@ -10612,7 +10615,7 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">3</property>
<property name="mnemonic_widget">eer_place</property>
<property name="mnemonic_widget">share_place</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>