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

* src/DbPrompter.py: Try to give a more intelligent error message on an

Browse Source 
exception thrown in DbPrompter - don't give a traceback.
* src/MediaView.py: clear out details and image if unselected


svn: r5938
This commit is contained in:
Don Allingham 2006-02-14 19:27:03 +00:00
parent c1b12a893f
commit 810a80da51
3 changed files with 55 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gramps2/ChangeLog
View File

@ -1,3 +1,8 @@
2006-02-14 Don Allingham <don@gramps-project.org>
* src/DbPrompter.py: Try to give a more intelligent error message on an
exception thrown in DbPrompter - don't give a traceback.
* src/MediaView.py: clear out details and image if unselected
2006-02-14 Alex Roitman <shura@gramps-project.org> 2006-02-14 Alex Roitman <shura@gramps-project.org>
* src/ReportUtils.py (buried_str): Change the logic to be the same * src/ReportUtils.py (buried_str): Change the logic to be the same
as in born_str: first test for modified date, then full date, then as in born_str: first test for modified date, then full date, then

9
gramps2/src/DbPrompter.py
View File

@ -138,16 +138,12 @@ class DbPrompter:
top.show() top.show()
response = top.run() response = top.run()
top.hide() top.hide()
try:
if response == gtk.RESPONSE_OK: if response == gtk.RESPONSE_OK:
if recent.get_active(): if recent.get_active():
try:
(filename,filetype) = self.recent_files[filelist.get_active()] (filename,filetype) = self.recent_files[filelist.get_active()]
if open_native(self.parent,filename,filetype): if open_native(self.parent,filename,filetype):
break break
except RuntimeError,msg:
QuestionDialog.ErrorDialog(
_("Could not open file: %s") % self.recent_file,
str(msg))
continue continue
elif new.get_active(): elif new.get_active():
prompter = NewNativeDbPrompter(self.parent, prompter = NewNativeDbPrompter(self.parent,
@ -161,6 +157,9 @@ class DbPrompter:
break break
elif response == gtk.RESPONSE_HELP: elif response == gtk.RESPONSE_HELP:
GrampsDisplay.help('choose-db-start') GrampsDisplay.help('choose-db-start')
except:
import sys
QuestionDialog.ErrorDialog(_("Could not open file"),str(sys.exc_info()[1]))
top.destroy() top.destroy()
if response == gtk.RESPONSE_CANCEL: if response == gtk.RESPONSE_CANCEL:

9
gramps2/src/MediaView.py
View File

@ -227,8 +227,13 @@ class MediaView:
store,node = self.selection.get_selected() store,node = self.selection.get_selected()
if not node: if not node:
return self.preview.set_from_pixbuf(None)
self.mid.set_text('')
self.mdesc.set_text('')
self.mpath.set_text('')
self.mdetails.set_text('')
self.mtype.set_text('')
else:
handle = store.get_value(node,_HANDLE_COL) handle = store.get_value(node,_HANDLE_COL)
mobj = self.db.get_object_from_handle(handle) mobj = self.db.get_object_from_handle(handle)