Change file extentions in reports when different filetype is chosen

svn: r1534
This commit is contained in:
Don Allingham
2003-05-16 01:49:50 +00:00
parent 4d5f13b00e
commit 4247f38dbb
25 changed files with 142 additions and 38 deletions

View File

@@ -126,11 +126,7 @@ class AncestorChart:
self.print_page(index, generation, page)
page = page + 1
generation = generation + 3
try:
self.doc.close()
except:
import DisplayTrace
DisplayTrace.DisplayTrace()
self.doc.close()
def calc(self):
"""
@@ -259,7 +255,8 @@ class AncestorChartDialog(Report.DrawReportDialog):
self.max_gen, self.doc, self.report_text)
MyReport.write_report()
except Errors.ReportError, msg:
ErrorDialog(str(msg))
(m1,m2) = msg.messages()
ErrorDialog(m1,m2)
except:
import DisplayTrace
DisplayTrace.DisplayTrace()

View File

@@ -271,7 +271,8 @@ class AncestorReportDialog(Report.TextReportDialog):
self.max_gen, self.doc, self.pg_brk)
MyReport.write_report()
except Errors.ReportError, msg:
ErrorDialog(str(msg))
(m1,m2) = msg.messages()
ErrorDialog(m1,m2)
except:
import DisplayTrace
DisplayTrace.DisplayTrace()

View File

@@ -344,7 +344,8 @@ class DescendantReportDialog(Report.DrawReportDialog):
self.person, self.target_path, self.doc)
MyReport.write_report()
except Errors.ReportError, msg:
ErrorDialog(str(msg))
(m1,m2) = msg.messages()
ErrorDialog(m1,m2)
except:
import DisplayTrace
DisplayTrace.DisplayTrace()

View File

@@ -167,7 +167,8 @@ class DescendantReportDialog(Report.TextReportDialog):
MyReport.report()
MyReport.end()
except Errors.ReportError, msg:
ErrorDialog(str(msg))
(m1,m2) = msg.messages()
ErrorDialog(m1,m2)
except:
import DisplayTrace
DisplayTrace.DisplayTrace()

View File

@@ -760,7 +760,8 @@ class DetAncestorReportDialog(TextReportDialog):
MyReport.write_report(rptOpt)
except Errors.ReportError, msg:
ErrorDialog(str(msg))
(m1,m2) = msg.messages()
ErrorDialog(m1,m2)
except:
import DisplayTrace
DisplayTrace.DisplayTrace()

View File

@@ -449,7 +449,8 @@ class FamilyGroupDialog(Report.TextReportDialog):
MyReport.setup()
MyReport.write_report()
except Errors.ReportError, msg:
ErrorDialog(str(msg))
(m1,m2) = msg.messages()
ErrorDialog(m1,m2)
except:
import DisplayTrace
DisplayTrace.DisplayTrace()

View File

@@ -759,7 +759,8 @@ class FtmAncestorReportDialog(Report.TextReportDialog):
self.max_gen, self.doc, self.pg_brk)
MyReport.write_report()
except Errors.ReportError, msg:
ErrorDialog(str(msg))
(m1,m2) = msg.messages()
ErrorDialog(m1,m2)
except:
import DisplayTrace
DisplayTrace.DisplayTrace()

View File

@@ -1153,7 +1153,8 @@ class FtmDescendantReportDialog(Report.TextReportDialog):
self.max_gen, self.doc, self.pg_brk)
MyReport.write_report()
except Errors.ReportError, msg:
ErrorDialog(str(msg))
(m1,m2) = msg.messages()
ErrorDialog(m1,m2)
except:
import DisplayTrace
DisplayTrace.DisplayTrace()

View File

@@ -544,7 +544,8 @@ class IndivSummaryDialog(Report.TextReportDialog):
MyReport.setup()
MyReport.write_report()
except Errors.ReportError, msg:
ErrorDialog(str(msg))
(m1,m2) = msg.messages()
ErrorDialog(m1,m2)
except:
import DisplayTrace
DisplayTrace.DisplayTrace()

View File

@@ -384,7 +384,8 @@ class IndivSummaryDialog(Report.TextReportDialog):
MyReport.setup()
MyReport.write_report()
except Errors.ReportError, msg:
ErrorDialog(str(msg))
(m1,m2) = msg.messages()
ErrorDialog(m1,m2)
except:
import DisplayTrace
DisplayTrace.DisplayTrace()

View File

@@ -141,7 +141,7 @@ def importData(database, filename, cb=None):
g = GedcomParser(database,filename,statusTop)
except IOError,msg:
Utils.destroy_passed_object(statusWindow)
ErrorDialog(_("%s could not be opened\n") % filename + str(msg))
ErrorDialog(_("%s could not be opened\n") % filename,str(msg))
return
except:
Utils.destroy_passed_object(statusWindow)
@@ -154,12 +154,12 @@ def importData(database, filename, cb=None):
except IOError,msg:
Utils.destroy_passed_object(statusWindow)
errmsg = _("%s could not be opened\n") % filename
ErrorDialog(errmsg + str(msg))
ErrorDialog(errmsg,str(msg))
return
except Errors.GedcomError, val:
msg = str(val)
(m1,m2) = val.messages()
Utils.destroy_passed_object(statusWindow)
ErrorDialog(msg)
ErrorDialog(m1,m2)
return
except:
import DisplayTrace

View File

@@ -410,7 +410,8 @@ class TimeLineDialog(Report.DrawReportDialog):
MyReport.setup()
MyReport.write_report()
except Errors.ReportError, msg:
ErrorDialog(str(msg))
(m1,m2) = msg.messages()
ErrorDialog(m1,m2)
except:
import DisplayTrace
DisplayTrace.DisplayTrace()