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

* src/DbPrompter.py: destroy filechooser if open cancelled.

Browse Source 
* src/Report.py: Use markup in dialog
* src/Utils.py: fix year handling
* src/plugins/Webpage.py: use markup


svn: r3791
This commit is contained in:
Don Allingham 2004-12-08 22:54:26 +00:00
parent 9f7132db4c
commit 4a948c6178
5 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2004-12-07 Don Allingham <dallingham@users.sourceforge.net>
* src/DbPrompter.py: destroy filechooser if open cancelled.
* src/Report.py: Use markup in dialog
* src/Utils.py: fix year handling
* src/plugins/Webpage.py: use markup
2004-12-07 Alex Roitman <shura@alex.neuro.umn.edu> 2004-12-07 Alex Roitman <shura@alex.neuro.umn.edu>
* src/data/Makefile.am: Replace dist_data_DATA with EXTRA_DIST. * src/data/Makefile.am: Replace dist_data_DATA with EXTRA_DIST.

3
src/DbPrompter.py
View File

@ -202,7 +202,7 @@ class ExistingDbPrompter:
QuestionDialog.ErrorDialog( QuestionDialog.ErrorDialog(
_("Could not open file: %s") % filename, _("Could not open file: %s") % filename,
_('The type "%s" is not in the list of known file types') % filetype ) _('The type "%s" is not in the list of known file types') % filetype )
#choose.destroy() choose.destroy()
return False return False
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
@ -365,6 +365,7 @@ class NewNativeDbPrompter:
else: else:
choose.destroy() choose.destroy()
return False return False
choose.destroy()
return False return False
#------------------------------------------------------------------------- #-------------------------------------------------------------------------

4
src/Report.py
View File

@ -151,7 +151,9 @@ class Report:
self.ptop = gtk.Dialog() self.ptop = gtk.Dialog()
self.ptop.set_has_separator(gtk.FALSE) self.ptop.set_has_separator(gtk.FALSE)
self.ptop.set_title(title) self.ptop.set_title(title)
self.ptop.vbox.add(gtk.Label(header)) lbl = gtk.Label(header)
lbl.set_use_markup(True)
self.ptop.vbox.add(lbl)
self.ptop.vbox.set_spacing(10) self.ptop.vbox.set_spacing(10)
self.pbar = gtk.ProgressBar() self.pbar = gtk.ProgressBar()
self.pbar_max = total self.pbar_max = total

4
src/Utils.py
View File

@ -538,7 +538,7 @@ def probably_alive(person,db):
# These are fairly good indications that someone's not alive. # These are fairly good indications that someone's not alive.
for ev_handle in person.event_list: for ev_handle in person.event_list:
ev = db.get_event_from_handle(ev_handle) ev = db.get_event_from_handle(ev_handle)
if ev.name in ["Cause Of Death", "Burial", "Cremation"]: if ev and ev.name in ["Cause Of Death", "Burial", "Cremation"]:
return False return False
if person.birth_handle: if person.birth_handle:
@ -564,7 +564,7 @@ def probably_alive(person,db):
if dobj.get_start_date() != Date.EMPTY: if dobj.get_start_date() != Date.EMPTY:
d = Date.Date(dobj) d = Date.Date(dobj)
val = d.get_start_date() val = d.get_start_date()
val = (val[0],val[1],d.get_year() - years,val[3]) val = d.get_year() - years
d.set_year(val) d.set_year(val)
if not not_too_old (d): if not not_too_old (d):
return True return True

4
src/plugins/WebPage.py
View File

@ -770,7 +770,9 @@ class WebReport(Report.Report):
self.sort = Sort.Sort(self.db) self.sort = Sort.Sort(self.db)
def get_progressbar_data(self): def get_progressbar_data(self):
return (_("Generate HTML reports - GRAMPS"), _("Creating Web Pages")) return (_("Generate HTML reports - GRAMPS"),
'<span size="larger" weight="bold">%s</span>' %
_("Creating Web Pages"))
def dump_gendex(self,person_handle_list,html_dir): def dump_gendex(self,person_handle_list,html_dir):
fname = "%s/gendex.txt" % html_dir fname = "%s/gendex.txt" % html_dir