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

* src/Editors/_EditPlace.py: note list support

Browse Source 
* src/Editors/_EditAddress.py: note list support
	* src/Editors/_EditLdsOrd.py: note list support
	* src/Editors/_EditSourceRef.py: note list support
	* src/Editors/_EditSource.py: note list support
	* src/Editors/_EditRepoRef.py: note list support
	* src/Editors/_EditAttribute.py: note list support
	* src/Editors/_EditPersonRef.py: note list support
	* src/Editors/_EditPerson.py: note list support
	* src/Editors/_EditMediaRef.py: note list support
	* src/Editors/_EditEventRef.py: note list support
	* src/Editors/_EditMedia.py: note list support
	* src/Editors/_EditRepository.py: note list support
	* src/Editors/_EditName.py: note list support
	* src/Editors/_EditChildRef.py: note list support
	* src/Editors/_EditFamily.py: note list support
	* src/Editors/_EditEvent.py: note list support
	* src/DisplayTabs/_NoteTab.py: note list support
	* src/GrampsDbUtils/_GedcomParse.py: note list support


svn: r8183
This commit is contained in:
Don Allingham 2007-02-20 01:36:26 +00:00
parent 961a543cda
commit a0d4ea5ab8
20 changed files with 76 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ChangeLog
View File

@ -1,4 +1,23 @@
2007-02-19 Don Allingham <don@gramps-project.org>
* src/Editors/_EditPlace.py: note list support
* src/Editors/_EditAddress.py: note list support
* src/Editors/_EditLdsOrd.py: note list support
* src/Editors/_EditSourceRef.py: note list support
* src/Editors/_EditSource.py: note list support
* src/Editors/_EditRepoRef.py: note list support
* src/Editors/_EditAttribute.py: note list support
* src/Editors/_EditPersonRef.py: note list support
* src/Editors/_EditPerson.py: note list support
* src/Editors/_EditMediaRef.py: note list support
* src/Editors/_EditEventRef.py: note list support
* src/Editors/_EditMedia.py: note list support
* src/Editors/_EditRepository.py: note list support
* src/Editors/_EditName.py: note list support
* src/Editors/_EditChildRef.py: note list support
* src/Editors/_EditFamily.py: note list support
* src/Editors/_EditEvent.py: note list support
* src/DisplayTabs/_NoteTab.py: note list support
* src/GrampsDbUtils/_GedcomParse.py: note list support
* src/GrampsDbUtils/_GedcomParse.py: fix PLAC/ADDR mappings
2007-02-19 Zsolt Foldvari <zfoldvar@users.sourceforge.net>

51
src/DisplayTabs/_NoteTab.py
View File

@ -52,9 +52,9 @@ from MarkupText import EditorBuffer
#-------------------------------------------------------------------------
class NoteTab(GrampsTab):
def __init__(self, dbstate, uistate, track, note_obj, title=_('Note')):
self.note_obj = note_obj
self.original = note_obj.serialize()
def __init__(self, dbstate, uistate, track, note_list, title=_('Note')):
self.note_list = note_list
self.original = note_list[:]
GrampsTab.__init__(self, dbstate, uistate, track, title)
self.show_all()
@ -98,12 +98,12 @@ class NoteTab(GrampsTab):
self.flowed = gtk.RadioButton(None, _('Flowed'))
self.format = gtk.RadioButton(self.flowed, _('Formatted'))
if self.note_obj and self.note_obj.get_format():
self.format.set_active(True)
self.text.set_wrap_mode(gtk.WRAP_NONE)
else:
self.flowed.set_active(True)
self.text.set_wrap_mode(gtk.WRAP_WORD)
# if self.note_obj and self.note_obj.get_format():
# self.format.set_active(True)
# self.text.set_wrap_mode(gtk.WRAP_NONE)
# else:
# self.flowed.set_active(True)
# self.text.set_wrap_mode(gtk.WRAP_WORD)
self.spellcheck = Spell.Spell(self.text)
self.flowed.connect('toggled', self.flow_changed)
@ -147,12 +147,12 @@ class NoteTab(GrampsTab):
self.menu = gtk.ComboBox()
hbox.pack_start(self.menu, True)
if self.note_obj:
self.empty = False
self.buf.set_text(self.note_obj.get(markup=True))
log.debug("Text: %s" % self.buf.get_text())
else:
self.empty = True
# if self.note_obj:
# self.empty = False
# self.buf.set_text(self.note_obj.get(markup=True))
# log.debug("Text: %s" % self.buf.get_text())
# else:
# self.empty = True
self.buf.connect('changed', self.update)
self.buf.connect_after('apply-tag', self.update)
@ -169,26 +169,27 @@ class NoteTab(GrampsTab):
return True
def update(self, obj, *args):
if self.note_obj:
start = self.buf.get_start_iter()
stop = self.buf.get_end_iter()
text = self.buf.get_text(start, stop)
self.note_obj.set(text)
else:
print "NOTE OBJ DOES NOT EXIST"
# if self.note_obj:
# start = self.buf.get_start_iter()
# stop = self.buf.get_end_iter()
# text = self.buf.get_text(start, stop)
# self.note_obj.set(text)
# else:
# print "NOTE OBJ DOES NOT EXIST"
self._update_label(obj)
return False
def flow_changed(self, obj):
if obj.get_active():
self.text.set_wrap_mode(gtk.WRAP_WORD)
self.note_obj.set_format(0)
# self.note_obj.set_format(0)
else:
self.text.set_wrap_mode(gtk.WRAP_NONE)
self.note_obj.set_format(1)
# self.note_obj.set_format(1)
def rebuild(self):
self._set_label()
def cancel(self):
self.note_obj.unserialize(self.original)
pass
# self.note_obj.unserialize(self.original)

2
src/Editors/_EditAddress.py
View File

@ -140,7 +140,7 @@ class EditAddress(EditSecondary):
self.note_tab = self._add_tab(
notebook,
NoteTab(self.dbstate, self.uistate, self.track,
self.obj.get_note_object()))
self.obj.get_note_list()))
self._setup_notebook_tabs( notebook)
notebook.show_all()

2
src/Editors/_EditAttribute.py
View File

@ -117,7 +117,7 @@ class EditAttribute(EditSecondary):
self.note_tab = self._add_tab(
notebook,
NoteTab(self.dbstate, self.uistate, self.track,
self.obj.get_note_object()))
self.obj.get_note_list()))
self._setup_notebook_tabs( notebook)
notebook.show_all()

2
src/Editors/_EditChildRef.py
View File

@ -120,7 +120,7 @@ class EditChildRef(EditSecondary):
self.note_tab = self._add_tab(
notebook,
NoteTab(self.dbstate, self.uistate, self.track,
self.obj.get_note_object()))
self.obj.get_note_list()))
self._setup_notebook_tabs( notebook)
notebook.show_all()

2
src/Editors/_EditEvent.py
View File

@ -173,7 +173,7 @@ class EditEvent(EditPrimary):
self.note_tab = self._add_tab(
notebook,
NoteTab(self.dbstate, self.uistate, self.track,
self.obj.get_note_object()))
self.obj.get_note_list()))
self.gallery_tab = self._add_tab(
notebook,

4
src/Editors/_EditEventRef.py
View File

@ -177,12 +177,12 @@ class EditEventRef(EditReference):
self.note_tab = self._add_tab(
notebook,
NoteTab(self.dbstate, self.uistate, self.track,
self.source.get_note_object()))
self.source.get_note_list()))
self.note_ref_tab = self._add_tab(
notebook_ref,
NoteTab(self.dbstate, self.uistate, self.track,
self.source_ref.get_note_object()))
self.source_ref.get_note_list()))
self.gallery_tab = self._add_tab(
notebook,

2
src/Editors/_EditFamily.py
View File

@ -549,7 +549,7 @@ class EditFamily(EditPrimary):
self.note_tab = self._add_tab(
notebook,
NoteTab(self.dbstate, self.uistate, self.track,
self.obj.get_note_object()))
self.obj.get_note_list()))
self.gallery_tab = self._add_tab(
notebook,

4
src/Editors/_EditLdsOrd.py
View File

@ -255,7 +255,7 @@ class EditLdsOrd(EditSecondary):
self.note_tab = self._add_tab(
notebook,
NoteTab(self.dbstate, self.uistate, self.track,
self.obj.get_note_object()))
self.obj.get_note_list()))
self._setup_notebook_tabs( notebook)
notebook.show_all()
@ -424,7 +424,7 @@ class EditFamilyLdsOrd(EditSecondary):
self.note_tab = self._add_tab(
notebook,
NoteTab(self.dbstate, self.uistate, self.track,
self.obj.get_note_object()))
self.obj.get_note_list()))
notebook.show_all()
self.top.get_widget('vbox').pack_start(notebook,True)

4
src/Editors/_EditMedia.py
View File

@ -160,12 +160,12 @@ class EditMedia(EditPrimary):
self.note_tab = self._add_tab(
notebook,
NoteTab(self.dbstate, self.uistate, self.track,
self.obj.get_note_object()))
self.obj.get_note_list()))
else:
self.note_tab = self._add_tab(
notebook,
NoteTab(self.dbstate, self.uistate, self.track,
self.obj.get_note_object()))
self.obj.get_note_list()))
self.src_list = self._add_tab(
notebook,

4
src/Editors/_EditMediaRef.py
View File

@ -176,7 +176,7 @@ class EditMediaRef(EditReference):
self.note_ref_tab = self._add_tab(
notebook_ref,
NoteTab(self.dbstate, self.uistate, self.track,
self.source_ref.get_note_object()))
self.source_ref.get_note_list()))
self.src_srcref_list = self._add_tab(
notebook_src,
@ -191,7 +191,7 @@ class EditMediaRef(EditReference):
self.src_note_ref_tab = self._add_tab(
notebook_src,
NoteTab(self.dbstate, self.uistate, self.track,
self.source.get_note_object()))
self.source.get_note_list()))
self._setup_notebook_tabs( notebook_src)
self._setup_notebook_tabs( notebook_ref)

2
src/Editors/_EditName.py
View File

@ -196,7 +196,7 @@ class EditName(EditSecondary):
self.note_tab = self._add_tab(
notebook,
NoteTab(self.dbstate, self.uistate, self.track,
self.obj.get_note_object()))
self.obj.get_note_list()))
self._setup_notebook_tabs( notebook)

2
src/Editors/_EditPerson.py
View File

@ -308,7 +308,7 @@ class EditPerson(EditPrimary):
self.note_tab = self._add_tab(
notebook,
NoteTab(self.dbstate, self.uistate, self.track,
self.obj.get_note_object()))
self.obj.get_note_list()))
self.gallery_tab = self._add_tab(
notebook,

2
src/Editors/_EditPersonRef.py
View File

@ -130,7 +130,7 @@ class EditPersonRef(EditSecondary):
self.note_tab = self._add_tab(
notebook,
NoteTab(self.dbstate, self.uistate, self.track,
self.obj.get_note_object()))
self.obj.get_note_list()))
self._setup_notebook_tabs( notebook)
notebook.show_all()

2
src/Editors/_EditPlace.py
View File

@ -167,7 +167,7 @@ class EditPlace(EditPrimary):
self.note_tab = self._add_tab(
notebook,
NoteTab(self.dbstate, self.uistate, self.track,
self.obj.get_note_object()))
self.obj.get_note_list()))
self.gallery_tab = self._add_tab(
notebook,

4
src/Editors/_EditRepoRef.py
View File

@ -128,12 +128,12 @@ class EditRepoRef(EditReference):
self.note_tab = self._add_tab(
notebook_src,
NoteTab(self.dbstate, self.uistate, self.track,
self.source.get_note_object()))
self.source.get_note_list()))
self.comment_tab = self._add_tab(
notebook_ref,
NoteTab(self.dbstate, self.uistate, self.track,
self.source_ref.get_note_object()))
self.source_ref.get_note_list()))
self.address_tab = self._add_tab(
notebook_src,

2
src/Editors/_EditRepository.py
View File

@ -124,7 +124,7 @@ class EditRepository(EditPrimary):
self.note_tab = self._add_tab(
notebook,
NoteTab(self.dbstate, self.uistate, self.track,
self.obj.get_note_object()))
self.obj.get_note_list()))
self.backref_tab = self._add_tab(
notebook,

2
src/Editors/_EditSource.py
View File

@ -130,7 +130,7 @@ class EditSource(EditPrimary):
self.note_tab = self._add_tab(
notebook,
NoteTab(self.dbstate, self.uistate, self.track,
self.obj.get_note_object()))
self.obj.get_note_list()))
self.gallery_tab = self._add_tab(
notebook,

4
src/Editors/_EditSourceRef.py
View File

@ -154,7 +154,7 @@ class EditSourceRef(EditReference):
self.note_tab = self._add_tab(
notebook_src,
NoteTab(self.dbstate, self.uistate, self.track,
self.source.get_note_object()))
self.source.get_note_list()))
self.gallery_tab = self._add_tab(
notebook_src,
@ -185,7 +185,7 @@ class EditSourceRef(EditReference):
self.comment_tab = self._add_tab(
notebook_ref,
NoteTab(self.dbstate, self.uistate, self.track,
self.source_ref.get_note_object(),_('Comments')))
self.source_ref.get_note_list(),_('Comments')))
self._setup_notebook_tabs( notebook_src)
self._setup_notebook_tabs( notebook_ref)

15
src/GrampsDbUtils/_GedcomParse.py
View File

@ -282,13 +282,13 @@ class StageOne:
if level == 0 and value == "FAM":
current = key.strip()
current = current[1:-1]
elif key in ("HUSB", "WIFE") and value[0] == '@':
elif key in ("HUSB", "WIFE") and value and value[0] == '@':
value = value[1:-1]
if self.fams.has_key(current):
self.fams[current].append(value)
else:
self.fams[current] = [value]
elif key == "CHIL" and value[0] == '@':
elif key == "CHIL" and value and value[0] == '@':
value = value[1:-1]
if self.famc.has_key(current):
self.famc[current].append(value)
@ -2381,7 +2381,7 @@ class GedcomParser(UpdateCallback):
@type state: CurrentState
"""
note = self.parse_note(line, state.ref, state.level, "")
state.ref.set_note(note)
state.ref.add_note(note)
#-------------------------------------------------------------------
#
@ -2675,7 +2675,7 @@ class GedcomParser(UpdateCallback):
@type state: CurrentState
"""
note = line.data
state.family.set_note(note)
state.family.add_note(note)
self.skip_subordinate_levels(state.level+1)
def func_family_note(self, line, state):
@ -2933,7 +2933,7 @@ class GedcomParser(UpdateCallback):
@type state: CurrentState
"""
note = self.parse_note(line, state.place, state.level+1, '')
state.place.set_note(note)
state.place.add_note(note)
def func_event_place_form(self, line, state):
"""
@ -3001,7 +3001,7 @@ class GedcomParser(UpdateCallback):
place.set_main_location(location)
if note:
place.set_note(note)
place.add_note(note)
state.event.set_place_handle(place_handle)
self.dbase.commit_place(place, self.trans)
@ -3384,7 +3384,7 @@ class GedcomParser(UpdateCallback):
@type state: CurrentState
"""
note = self.parse_comment(line, state.src_ref, state.level+1, '')
state.src_ref.set_note(note)
state.src_ref.add_note(note)
def func_srcref_text(self, line, state):
"""
@ -3953,6 +3953,7 @@ class GedcomParser(UpdateCallback):
def parse_note_base(self, line, obj, level, old_note, task):
# reference to a named note defined elsewhere
print line
if line.token == TOKEN_RNOTE:
note_obj = self.note_map.get(line.data)
if note_obj: