This commit is contained in:
Kovid Goyal 2016-11-19 08:46:19 +05:30
parent 2974bb4d1e
commit ad2f3c6518

View File

@ -70,11 +70,9 @@ def in_thread_job(func):
return func(*args, **kwargs) return func(*args, **kwargs)
return ans return ans
_boss = None
def get_boss(): def get_boss():
return _boss return get_boss.boss
class Boss(QObject): class Boss(QObject):
@ -82,7 +80,6 @@ class Boss(QObject):
handle_completion_result_signal = pyqtSignal(object) handle_completion_result_signal = pyqtSignal(object)
def __init__(self, parent, notify=None): def __init__(self, parent, notify=None):
global _boss
QObject.__init__(self, parent) QObject.__init__(self, parent)
self.global_undo = GlobalUndoHistory() self.global_undo = GlobalUndoHistory()
self.container_count = 0 self.container_count = 0
@ -93,7 +90,7 @@ class Boss(QObject):
self.doing_terminal_save = False self.doing_terminal_save = False
self.ignore_preview_to_editor_sync = False self.ignore_preview_to_editor_sync = False
setup_cssutils_serialization() setup_cssutils_serialization()
_boss = self get_boss.boss = self
self.gui = parent self.gui = parent
completion_worker().result_callback = self.handle_completion_result_signal.emit completion_worker().result_callback = self.handle_completion_result_signal.emit
self.handle_completion_result_signal.connect(self.handle_completion_result, Qt.QueuedConnection) self.handle_completion_result_signal.connect(self.handle_completion_result, Qt.QueuedConnection)
@ -592,7 +589,7 @@ class Boss(QObject):
return return
from calibre.gui2.tweak_book.download import DownloadResources from calibre.gui2.tweak_book.download import DownloadResources
with BusyCursor(): with BusyCursor():
self.add_savepoint(_('Before get external resources')) self.add_savepoint(_('Before: Get external resources'))
try: try:
d = DownloadResources(self.gui) d = DownloadResources(self.gui)
d.exec_() d.exec_()
@ -656,7 +653,7 @@ class Boss(QObject):
' different ebook viewers. Are you sure you want to proceed?').format( ' different ebook viewers. Are you sure you want to proceed?').format(
'<pre>%s</pre>'%newname, '<pre>%s</pre>' % urlnormalize(newname)), '<pre>%s</pre>'%newname, '<pre>%s</pre>' % urlnormalize(newname)),
'confirm-urlunsafe-change', parent=self.gui, title=_('Are you sure?'), config_set=tprefs): 'confirm-urlunsafe-change', parent=self.gui, title=_('Are you sure?'), config_set=tprefs):
return return
self.add_savepoint(_('Before: Rename %s') % oldname) self.add_savepoint(_('Before: Rename %s') % oldname)
name_map = {oldname:newname} name_map = {oldname:newname}
self.gui.blocking_job( self.gui.blocking_job(