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

Fix #5648 (Enhancement Request: Put up a screen while waiting for calibre to load library)

Browse Source
This commit is contained in:
Kovid Goyal 2010-06-02 15:46:27 -06:00
parent 918bf449b5
commit 4a046a41d0
1 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/calibre/gui2/main.py
View File

@ -5,13 +5,14 @@ import sys, os, time, socket, traceback
from functools import partial from functools import partial
from PyQt4.Qt import QCoreApplication, QIcon, QMessageBox, QObject, QTimer, \ from PyQt4.Qt import QCoreApplication, QIcon, QMessageBox, QObject, QTimer, \
QThread, pyqtSignal, Qt, QProgressDialog, QString QThread, pyqtSignal, Qt, QProgressDialog, QString, QPixmap, \
QSplashScreen, QApplication
from calibre import prints, plugins from calibre import prints, plugins
from calibre.constants import iswindows, __appname__, isosx, filesystem_encoding from calibre.constants import iswindows, __appname__, isosx, filesystem_encoding
from calibre.utils.ipc import ADDRESS, RC from calibre.utils.ipc import ADDRESS, RC
from calibre.gui2 import ORG_NAME, APP_UID, initialize_file_icon_provider, \ from calibre.gui2 import ORG_NAME, APP_UID, initialize_file_icon_provider, \
Application, choose_dir, error_dialog, question_dialog Application, choose_dir, error_dialog, question_dialog, gprefs
from calibre.gui2.main_window import option_parser as _option_parser from calibre.gui2.main_window import option_parser as _option_parser
from calibre.utils.config import prefs, dynamic from calibre.utils.config import prefs, dynamic
from calibre.library.database2 import LibraryDatabase2 from calibre.library.database2 import LibraryDatabase2
@ -117,11 +118,15 @@ class GuiRunner(QObject):
self.actions = actions self.actions = actions
self.main = None self.main = None
QObject.__init__(self) QObject.__init__(self)
self.splash_screen = None
self.timer = QTimer.singleShot(1, self.initialize) self.timer = QTimer.singleShot(1, self.initialize)
def start_gui(self): def start_gui(self):
from calibre.gui2.ui import Main from calibre.gui2.ui import Main
main = Main(self.opts) main = Main(self.opts)
if self.splash_screen is not None:
self.splash_screen.showMessage(_('Initializing user interface...'))
self.splash_screen.finish(main)
main.initialize(self.library_path, self.db, self.listener, self.actions) main.initialize(self.library_path, self.db, self.listener, self.actions)
add_filesystem_book = partial(main.add_filesystem_book, allow_device=False) add_filesystem_book = partial(main.add_filesystem_book, allow_device=False)
sys.excepthook = main.unhandled_exception sys.excepthook = main.unhandled_exception
@ -143,7 +148,7 @@ class GuiRunner(QObject):
if db is None and tb is not None: if db is None and tb is not None:
# DB Repair failed # DB Repair failed
error_dialog(None, _('Repairing failed'), error_dialog(self.splash_screen, _('Repairing failed'),
_('The database repair failed. Starting with ' _('The database repair failed. Starting with '
'a new empty library.'), 'a new empty library.'),
det_msg=tb, show=True) det_msg=tb, show=True)
@ -160,7 +165,7 @@ class GuiRunner(QObject):
os.makedirs(x) os.makedirs(x)
except: except:
x = os.path.expanduser('~') x = os.path.expanduser('~')
candidate = choose_dir(None, 'choose calibre library', candidate = choose_dir(self.splash_screen, 'choose calibre library',
_('Choose a location for your new calibre e-book library'), _('Choose a location for your new calibre e-book library'),
default_dir=x) default_dir=x)
@ -171,7 +176,7 @@ class GuiRunner(QObject):
self.library_path = candidate self.library_path = candidate
db = LibraryDatabase2(candidate) db = LibraryDatabase2(candidate)
except: except:
error_dialog(None, _('Bad database location'), error_dialog(self.splash_screen, _('Bad database location'),
_('Bad database location %r. calibre will now quit.' _('Bad database location %r. calibre will now quit.'
)%self.library_path, )%self.library_path,
det_msg=traceback.format_exc(), show=True) det_msg=traceback.format_exc(), show=True)
@ -185,7 +190,7 @@ class GuiRunner(QObject):
try: try:
db = LibraryDatabase2(self.library_path) db = LibraryDatabase2(self.library_path)
except (sqlite.Error, DatabaseException): except (sqlite.Error, DatabaseException):
repair = question_dialog(None, _('Corrupted database'), repair = question_dialog(self.splash_screen, _('Corrupted database'),
_('Your calibre database appears to be corrupted. Do ' _('Your calibre database appears to be corrupted. Do '
'you want calibre to try and repair it automatically? ' 'you want calibre to try and repair it automatically? '
'If you say No, a new empty calibre library will be created.'), 'If you say No, a new empty calibre library will be created.'),
@ -204,14 +209,28 @@ class GuiRunner(QObject):
self.repair.start() self.repair.start()
return return
except: except:
error_dialog(None, _('Bad database location'), error_dialog(self.splash_screen, _('Bad database location'),
_('Bad database location %r. Will start with ' _('Bad database location %r. Will start with '
' a new, empty calibre library')%self.library_path, ' a new, empty calibre library')%self.library_path,
det_msg=traceback.format_exc(), show=True) det_msg=traceback.format_exc(), show=True)
self.initialize_db_stage2(db, None) self.initialize_db_stage2(db, None)
def show_splash_screen(self):
self.splash_pixmap = QPixmap()
self.splash_pixmap.load(I('library.png'))
self.splash_screen = QSplashScreen(self.splash_pixmap,
Qt.SplashScreen|Qt.WindowStaysOnTopHint)
self.splash_screen.showMessage(_('Starting %s: Loading books...') %
__appname__)
self.splash_screen.show()
QApplication.instance().processEvents()
def initialize(self, *args): def initialize(self, *args):
if gprefs.get('show_splash_screen', True):
self.show_splash_screen()
time.sleep(10)
self.library_path = get_library_path() self.library_path = get_library_path()
if self.library_path is None: if self.library_path is None:
self.initialization_failed() self.initialization_failed()