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

* src/plugins/WebPage.py: fixed check on dialog run() return value,

Browse Source 
changed deprecated gtk.mainiteration to gtk.main_iteration


svn: r4358
This commit is contained in:
Don Allingham 2005-04-13 18:16:20 +00:00
parent 26afdf71e9
commit 61a5f5e168
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -1,4 +1,6 @@
2005-04-13 Don Allingham <don@gramps-project.org> 2005-04-13 Don Allingham <don@gramps-project.org>
* src/plugins/WebPage.py: fixed check on dialog run() return value,
changed deprecated gtk.mainiteration to gtk.main_iteration
* src/WriteGedcom.py: fixed problem with skipping events * src/WriteGedcom.py: fixed problem with skipping events
2005-04-12 Don Allingham <don@gramps-project.org> 2005-04-12 Don Allingham <don@gramps-project.org>

15
src/plugins/WebPage.py
View File

@ -1124,8 +1124,9 @@ class WebReport(Report.Report):
ErrorDialog(_("Could not create the directory: %s") % \ ErrorDialog(_("Could not create the directory: %s") % \
image_dir_name) image_dir_name)
return return
ind_list = self.filter.apply(self.database,self.database.get_person_handles(sort_handles=False)) ind_list = self.database.get_person_handles(sort_handles=False)
ind_list = self.filter.apply(self.database,ind_list)
progress_steps = len(ind_list) progress_steps = len(ind_list)
if len(ind_list) > 1: if len(ind_list) > 1:
progress_steps = progress_steps+1 progress_steps = progress_steps+1
@ -1161,25 +1162,25 @@ class WebReport(Report.Report):
idoc.close() idoc.close()
self.progress_bar_step() self.progress_bar_step()
while gtk.events_pending(): while gtk.events_pending():
gtk.mainiteration() gtk.main_iteration()
if len(ind_list) > 1: if len(ind_list) > 1:
self.dump_index(ind_list,self.selected_style, self.dump_index(ind_list,self.selected_style,
self.ind_template_name,dir_name) self.ind_template_name,dir_name)
self.progress_bar_step() self.progress_bar_step()
while gtk.events_pending(): while gtk.events_pending():
gtk.mainiteration() gtk.main_iteration()
if self.use_gendex == 1: if self.use_gendex == 1:
self.dump_gendex(ind_list,dir_name) self.dump_gendex(ind_list,dir_name)
self.progress_bar_step() self.progress_bar_step()
while gtk.events_pending(): while gtk.events_pending():
gtk.mainiteration() gtk.main_iteration()
if self.use_places == 1: if self.use_places == 1:
self.dump_places(ind_list,self.selected_style, self.dump_places(ind_list,self.selected_style,
self.ind_template_name,dir_name) self.ind_template_name,dir_name)
self.progress_bar_step() self.progress_bar_step()
while gtk.events_pending(): while gtk.events_pending():
gtk.mainiteration() gtk.main_iteration()
self.progress_bar_done() self.progress_bar_done()
def add_styles(self,doc): def add_styles(self,doc):
@ -1702,7 +1703,7 @@ class WebReportDialog(Report.ReportDialog):
name,translated_name) name,translated_name)
response = self.window.run() response = self.window.run()
if response == True: if response == gtk.RESPONSE_OK:
try: try:
self.make_report() self.make_report()
except (IOError,OSError),msg: except (IOError,OSError),msg: