Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-06-23 15:30:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

Busy cursor for split and merge

Browse Source
This commit is contained in:
Kovid Goyal 2013-11-26 21:02:58 +05:30
parent 4077030da1
commit 170b16b74b
1 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/calibre/gui2/tweak_book/boss.py
View File

@ -565,27 +565,35 @@ class Boss(QObject):
def split_requested(self, name, loc): def split_requested(self, name, loc):
if not self.check_dirtied(): if not self.check_dirtied():
return return
self.add_savepoint(_('Split %s') % self.gui.elided_text(name)) QApplication.setOverrideCursor(QCursor(Qt.WaitCursor))
try: try:
bottom_name = split(current_container(), name, loc) self.add_savepoint(_('Split %s') % self.gui.elided_text(name))
except AbortError: try:
self.rewind_savepoint() bottom_name = split(current_container(), name, loc)
raise except AbortError:
self.apply_container_update_to_gui() self.rewind_savepoint()
self.edit_file(bottom_name, 'html') raise
self.apply_container_update_to_gui()
self.edit_file(bottom_name, 'html')
finally:
QApplication.restoreOverrideCursor()
def merge_requested(self, category, names, master): def merge_requested(self, category, names, master):
if not self.check_dirtied(): if not self.check_dirtied():
return return
self.add_savepoint(_('Merge files into %s') % self.gui.elided_text(master)) QApplication.setOverrideCursor(QCursor(Qt.WaitCursor))
try: try:
merge(current_container(), category, names, master) self.add_savepoint(_('Merge files into %s') % self.gui.elided_text(master))
except AbortError: try:
self.rewind_savepoint() merge(current_container(), category, names, master)
raise except AbortError:
self.apply_container_update_to_gui() self.rewind_savepoint()
if master in editors: raise
self.show_editor(master) self.apply_container_update_to_gui()
if master in editors:
self.show_editor(master)
finally:
QApplication.restoreOverrideCursor()
def sync_editor_to_preview(self, name, lnum): def sync_editor_to_preview(self, name, lnum):
editor = self.edit_file(name, 'html') editor = self.edit_file(name, 'html')