mirror of
git://github.com/kovidgoyal/calibre.git
synced 2025-12-21 20:56:12 +01:00
Merge from trunk
This commit is contained in:
commit
010b24a01c
2 changed files with 3 additions and 2 deletions
|
|
@ -233,8 +233,7 @@ def initialize_db(self):
|
|||
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)
|
||||
self.splash_screen = QSplashScreen(self.splash_pixmap)
|
||||
self.splash_screen.showMessage(_('Starting %s: Loading books...') %
|
||||
__appname__)
|
||||
self.splash_screen.show()
|
||||
|
|
|
|||
|
|
@ -22,6 +22,8 @@
|
|||
|
||||
class RestoreDatabase(LibraryDatabase2):
|
||||
|
||||
PATH_LIMIT = 10
|
||||
|
||||
def set_path(self, *args, **kwargs):
|
||||
pass
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue