Merge from trunk

This commit is contained in:
Charles Haley 2010-09-26 16:29:04 +01:00
commit 010b24a01c
2 changed files with 3 additions and 2 deletions

View File

@ -233,8 +233,7 @@ class GuiRunner(QObject):
def show_splash_screen(self): def show_splash_screen(self):
self.splash_pixmap = QPixmap() self.splash_pixmap = QPixmap()
self.splash_pixmap.load(I('library.png')) self.splash_pixmap.load(I('library.png'))
self.splash_screen = QSplashScreen(self.splash_pixmap, self.splash_screen = QSplashScreen(self.splash_pixmap)
Qt.SplashScreen)
self.splash_screen.showMessage(_('Starting %s: Loading books...') % self.splash_screen.showMessage(_('Starting %s: Loading books...') %
__appname__) __appname__)
self.splash_screen.show() self.splash_screen.show()

View File

@ -22,6 +22,8 @@ NON_EBOOK_EXTENSIONS = frozenset([
class RestoreDatabase(LibraryDatabase2): class RestoreDatabase(LibraryDatabase2):
PATH_LIMIT = 10
def set_path(self, *args, **kwargs): def set_path(self, *args, **kwargs):
pass pass