Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge from trunk

Browse Source
This commit is contained in:
Charles Haley 2010-09-29 18:59:07 +01:00
parent 084b0cff49
commit bc2abb333b
2 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/calibre/gui2/actions/choose_library.py
View File

@ -217,7 +217,6 @@ class ChooseLibraryAction(InterfaceAction):
def backup_status(self, location): def backup_status(self, location):
dirty_text = 'no' dirty_text = 'no'
try: try:
print 'here'
dirty_text = \ dirty_text = \
unicode(self.gui.library_view.model().db.dirty_queue_length()) unicode(self.gui.library_view.model().db.dirty_queue_length())
except: except:

7
src/calibre/gui2/dialogs/metadata_bulk.py
View File

@ -658,12 +658,6 @@ class MetadataBulkDialog(QDialog, Ui_MetadataBulkDialog):
do_remove_conv, do_auto_author, series, do_series_restart, do_remove_conv, do_auto_author, series, do_series_restart,
series_start_value, do_title_case, clear_series) series_start_value, do_title_case, clear_series)
# bb = BlockingBusy(_('Applying changes to %d books. This may take a while.')
# %len(self.ids), parent=self)
# self.worker = Worker(args, self.db, self.ids,
# getattr(self, 'custom_column_widgets', []),
# Dispatcher(bb.accept, parent=bb))
bb = MyBlockingBusy(_('Applying changes to %d books.\nPhase {0} {1}%%.') bb = MyBlockingBusy(_('Applying changes to %d books.\nPhase {0} {1}%%.')
%len(self.ids), args, self.db, self.ids, %len(self.ids), args, self.db, self.ids,
getattr(self, 'custom_column_widgets', []), getattr(self, 'custom_column_widgets', []),
@ -673,7 +667,6 @@ class MetadataBulkDialog(QDialog, Ui_MetadataBulkDialog):
# which can slow down bulk editing of large numbers of books # which can slow down bulk editing of large numbers of books
self.model.stop_metadata_backup() self.model.stop_metadata_backup()
try: try:
# self.worker.start()
bb.exec_() bb.exec_()
finally: finally:
self.model.start_metadata_backup() self.model.start_metadata_backup()