mirror of
https://github.com/kovidgoyal/calibre.git
synced 2025-07-09 03:04:10 -04:00
Fix Adding books progress dialog not being hidden after all books are added on Windows
This commit is contained in:
parent
18214e706b
commit
65887df713
@ -701,7 +701,7 @@ class Main(MainWindow, Ui_MainWindow):
|
|||||||
progress.show()
|
progress.show()
|
||||||
try:
|
try:
|
||||||
for c, book in enumerate(paths):
|
for c, book in enumerate(paths):
|
||||||
progress.set_value(c)
|
progress.set_value(c+1)
|
||||||
if progress.canceled:
|
if progress.canceled:
|
||||||
return
|
return
|
||||||
format = os.path.splitext(book)[1]
|
format = os.path.splitext(book)[1]
|
||||||
@ -722,9 +722,11 @@ class Main(MainWindow, Ui_MainWindow):
|
|||||||
'cover':self.default_thumbnail, 'tags':[]})
|
'cover':self.default_thumbnail, 'tags':[]})
|
||||||
title = mi.title if isinstance(mi.title, unicode) else mi.title.decode(preferred_encoding, 'replace')
|
title = mi.title if isinstance(mi.title, unicode) else mi.title.decode(preferred_encoding, 'replace')
|
||||||
progress.set_msg(_('Read metadata from ')+title)
|
progress.set_msg(_('Read metadata from ')+title)
|
||||||
|
QApplication.processEvents()
|
||||||
|
|
||||||
if not to_device:
|
if not to_device:
|
||||||
progress.set_msg(_('Adding books to database...'))
|
progress.set_msg(_('Adding books to database...'))
|
||||||
|
QApplication.processEvents()
|
||||||
model = self.library_view.model()
|
model = self.library_view.model()
|
||||||
|
|
||||||
paths = list(paths)
|
paths = list(paths)
|
||||||
@ -741,6 +743,7 @@ class Main(MainWindow, Ui_MainWindow):
|
|||||||
else:
|
else:
|
||||||
self.upload_books(paths, list(map(sanitize_file_name, names)), infos, on_card=on_card)
|
self.upload_books(paths, list(map(sanitize_file_name, names)), infos, on_card=on_card)
|
||||||
finally:
|
finally:
|
||||||
|
QApplication.processEvents()
|
||||||
progress.hide()
|
progress.hide()
|
||||||
|
|
||||||
def upload_books(self, files, names, metadata, on_card=False, memory=None):
|
def upload_books(self, files, names, metadata, on_card=False, memory=None):
|
||||||
|
Loading…
x
Reference in New Issue
Block a user