2007-05-14 Don Allingham <don@gramps-project.org>
* src/DataViews/_PedigreeView.py: catch errors * src/DataViews/_RelationView.py: catch errors * src/ReportBase/_ReportDialog.py: catch errors * src/ReportBase/_SimpleAccess.py: fix marriage place/date values * src/Editors/_EditFamily.py: catch errors * src/DisplayTabs/_EmbeddedList.py: catch errors * src/plugins/FindDupes.py: catch errors * src/plugins/Verify.py: catch errors * src/AddMedia.py: fix scale_simple types * src/AutoComp.py: pylint fixes * src/ImgManip.py: pylint fixes * src/LdsUtils.py: new temple types * src/DbLoader.py: error types svn: r8473
This commit is contained in:
@@ -161,7 +161,12 @@ class Merge(Tool.Tool,ManagedWindow.ManagedWindow):
|
||||
def on_merge_ok_clicked(self,obj):
|
||||
threshold = self.menu.get_menu().get_active().get_data("v")
|
||||
self.use_soundex = int(self.soundex_obj.get_active())
|
||||
self.find_potentials(threshold)
|
||||
try:
|
||||
self.find_potentials(threshold)
|
||||
except AttributeError, msg:
|
||||
import QuestionDialog
|
||||
QuestionDialog.RunDatabaseRepair(str(msg))
|
||||
return
|
||||
|
||||
self.options.handler.options_dict['threshold'] = threshold
|
||||
self.options.handler.options_dict['soundex'] = self.use_soundex
|
||||
|
||||
@@ -329,14 +329,20 @@ class Verify(Tool.Tool, ManagedWindow, UpdateCallback):
|
||||
self.uistate.window.window.set_cursor(gtk.gdk.Cursor(gtk.gdk.WATCH))
|
||||
self.uistate.progress.show()
|
||||
self.window.window.set_cursor(gtk.gdk.Cursor(gtk.gdk.WATCH))
|
||||
vr.window.window.set_cursor(gtk.gdk.Cursor(gtk.gdk.WATCH))
|
||||
try:
|
||||
vr.window.window.set_cursor(gtk.gdk.Cursor(gtk.gdk.WATCH))
|
||||
except AttributeError:
|
||||
pass
|
||||
|
||||
self.run_tool(cli=False)
|
||||
|
||||
self.uistate.progress.hide()
|
||||
self.uistate.window.window.set_cursor(None)
|
||||
self.window.window.set_cursor(None)
|
||||
vr.window.window.set_cursor(None)
|
||||
try:
|
||||
vr.window.window.set_cursor(None)
|
||||
except AttributeError:
|
||||
pass
|
||||
self.reset()
|
||||
|
||||
# Save options
|
||||
|
||||
@@ -27,3 +27,5 @@ def run(database, document, person):
|
||||
sd.paragraph("%-12s\t%-12s\t%s" % (sa.event_type(event),
|
||||
sa.event_date(event),
|
||||
sa.event_place(event)))
|
||||
|
||||
sd.paragraph("Marriage %s" % sa.marriage_place(person))
|
||||
|
||||
Reference in New Issue
Block a user