diff --git a/src/Report.py b/src/Report.py index a66b58b70..a5b45808b 100644 --- a/src/Report.py +++ b/src/Report.py @@ -158,13 +158,13 @@ class Report: self.ptop.vbox.add(gtk.HSeparator()) self.ptop.vbox.set_spacing(10) self.pbar = gtk.ProgressBar() - self.pbar.set_format_string(_("%v of %u (%P%%)")) - self.pbar.configure(0.0,0.0,total) - self.pbar.set_show_text(1) - self.pbar.set_usize(350,20) +# self.pbar.set_format_string(_("%v of %u (%P%%)")) +# self.pbar.configure(0.0,0.0,total) +# self.pbar.set_show_text(1) self.pbar_max = total self.pbar_index = 0.0 + self.ptop.set_size_request(350,20) self.ptop.vbox.add(self.pbar) self.ptop.show_all() @@ -174,7 +174,7 @@ class Report: self.pbar_index = self.pbar_index + 1.0 if (self.pbar_index > self.pbar_max): self.pbar_index = self.pbar_max - self.pbar.set_value(self.pbar_index) + self.pbar.set_fraction(self.pbar_index/100.0) def progress_bar_done(self): """Done with the progress bar. It can be destroyed now.""" diff --git a/src/plugins/WebPage.py b/src/plugins/WebPage.py index 1a061ffff..a0b2ef806 100644 --- a/src/plugins/WebPage.py +++ b/src/plugins/WebPage.py @@ -778,7 +778,7 @@ class WebReport(Report.Report): image_dir_name) return - ind_list = self.filter.apply(self.db.getPersonMap().values()) + ind_list = self.filter.apply(self.db,self.db.getPersonMap().values()) self.progress_bar_setup(float(len(ind_list))) doc = HtmlLinkDoc(self.selected_style,None,self.template_name,None) @@ -1066,7 +1066,7 @@ class WebReportDialog(Report.ReportDialog): """The format frame is not used in this dialog. Hide it, and set the output notebook to always display the html template page.""" - self.output_notebook.set_page(1) + self.output_notebook.set_current_page(1) #------------------------------------------------------------------------ # diff --git a/src/sort.py b/src/sort.py index 6f1164b0e..30b4ed8dd 100644 --- a/src/sort.py +++ b/src/sort.py @@ -75,14 +75,14 @@ def by_last_name(first, second): name1 = first.PrimaryName name2 = second.PrimaryName - fsn = su(name1.Surname) - ssn = su(name2.Surname) + fsn = name1.Surname.upper() + ssn = name2.Surname.upper() if fsn == ssn : - ffn = su(name1.FirstName) - sfn = su(name2.FirstName) + ffn = name1.FirstName.upper() + sfn = name2.FirstName.upper() if ffn == sfn : - return cmp(su(name1.Suffix), su(name2.Suffix)) + return cmp(name1.Suffix.upper(), name2.Suffix.upper()) else : return cmp(ffn, sfn) else :