Better fix for polish progress bar

This commit is contained in:
Kovid Goyal 2019-01-14 08:25:54 +05:30
parent dbf8c10e4c
commit c1bd466d07
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C

View File

@ -258,14 +258,14 @@ class Polish(QDialog): # {{{
self.jobs = [] self.jobs = []
self.pd.reject() self.pd.reject()
return return
num, book_id = self.queue.pop() num, book_id = self.queue.pop(0)
try: try:
self.do_book(num, book_id, self.book_id_map[book_id]) self.do_book(num, book_id, self.book_id_map[book_id])
except: except:
self.pd.reject() self.pd.reject()
raise raise
else: else:
self.pd.set_value(self.pd.max - num) self.pd.set_value(num)
QTimer.singleShot(0, self.do_one) QTimer.singleShot(0, self.do_one)
def do_book(self, num, book_id, formats): def do_book(self, num, book_id, formats):
@ -291,7 +291,7 @@ class Polish(QDialog): # {{{
desc = ngettext(_('Polish %s')%mi.title, desc = ngettext(_('Polish %s')%mi.title,
_('Polish book %(nums)s of %(tot)s (%(title)s)')%dict( _('Polish book %(nums)s of %(tot)s (%(title)s)')%dict(
nums=num, tot=len(self.book_id_map), nums=self.pd.max - num, tot=len(self.book_id_map),
title=mi.title), len(self.book_id_map)) title=mi.title), len(self.book_id_map))
if hasattr(self, 'pd'): if hasattr(self, 'pd'):
self.pd.set_msg(_('Queueing book %(nums)s of %(tot)s (%(title)s)')%dict( self.pd.set_msg(_('Queueing book %(nums)s of %(tot)s (%(title)s)')%dict(