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

* src/Editors/_EditSourceRef.py (_cleanup_on_exit): Factor out

Browse Source 
cleanup into its own method (as in the parent class).
	FIXME: This needs to be fixed so that _cleanup_on_exit is not
	run on OK, only on cancel. Maybe we need _clean_up_on_cancel() ?
	* src/DisplayTabs/_TextTab.py (cancel): Only reset text, not the
	whole source reference.


svn: r7370
This commit is contained in:
Alex Roitman 2006-10-08 06:19:07 +00:00
parent f558e54a21
commit e674fed647
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gramps2/ChangeLog
View File

@ -1,4 +1,10 @@
2006-10-07 Alex Roitman <shura@gramps-project.org> 2006-10-07 Alex Roitman <shura@gramps-project.org>
* src/Editors/_EditSourceRef.py (_cleanup_on_exit): Factor out
cleanup into its own method (as in the parent class).
FIXME: This needs to be fixed so that _cleanup_on_exit is not
run on OK, only on cancel. Maybe we need _clean_up_on_cancel() ?
* src/DisplayTabs/_TextTab.py (cancel): Only reset text, not the
whole source reference.
* src/plugins/BookReport.py (BookList.parse): Catch ValueError * src/plugins/BookReport.py (BookList.parse): Catch ValueError
exception (coming from urllib2). exception (coming from urllib2).
* src/LdsUtils.py (temples): Correct code for San Antonio. * src/LdsUtils.py (temples): Correct code for San Antonio.

4
gramps2/src/DisplayTabs/_TextTab.py
View File

@ -51,7 +51,7 @@ class TextTab(GrampsTab):
def __init__(self, dbstate, uistate, track, obj, title=_('Text')): def __init__(self, dbstate, uistate, track, obj, title=_('Text')):
self.obj = obj self.obj = obj
self.original = obj.serialize() self.original = self.obj.get_text()
GrampsTab.__init__(self, dbstate, uistate, track, title) GrampsTab.__init__(self, dbstate, uistate, track, title)
self.show_all() self.show_all()
@ -109,4 +109,4 @@ class TextTab(GrampsTab):
self._set_label() self._set_label()
def cancel(self): def cancel(self):
self.obj.unserialize(self.original) self.obj.set_text(self.original)

8
gramps2/src/Editors/_EditSourceRef.py
View File

@ -73,11 +73,15 @@ class EditSourceRef(EditReference):
self.define_ok_button(self.top.get_widget('ok'),self.ok_clicked) self.define_ok_button(self.top.get_widget('ok'),self.ok_clicked)
self.define_cancel_button(self.top.get_widget('cancel')) self.define_cancel_button(self.top.get_widget('cancel'))
def close(self, *obj): def _cleanup_on_exit(self):
# FIXME: the second call was causing the problem, as it was
# re-setting the whole sref to its original state.
# that problem is fixed, but _cleanup_on_exit SHOULD NOT be run
# in close(), because close() is called on OK.
# Until this is fixed, notes, text and comments are not saved!!!
self.note_tab.cancel() self.note_tab.cancel()
self.text_tab.cancel() self.text_tab.cancel()
self.comment_tab.cancel() self.comment_tab.cancel()
EditReference.close(self,obj)
def _setup_fields(self): def _setup_fields(self):
self.ref_privacy = PrivacyButton( self.ref_privacy = PrivacyButton(