From 918bf449b5c9303b4d8a22036e3b3ad49e2edc46 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Wed, 2 Jun 2010 15:12:09 -0600 Subject: [PATCH 1/3] ... --- src/calibre/gui2/dialogs/saved_search_editor.ui | 8 ++++++-- src/calibre/gui2/dialogs/tag_categories.ui | 2 +- src/calibre/gui2/dialogs/tag_list_editor.ui | 15 +++++++++++++++ 3 files changed, 22 insertions(+), 3 deletions(-) diff --git a/src/calibre/gui2/dialogs/saved_search_editor.ui b/src/calibre/gui2/dialogs/saved_search_editor.ui index 3fffff7abf..6d98d25667 100644 --- a/src/calibre/gui2/dialogs/saved_search_editor.ui +++ b/src/calibre/gui2/dialogs/saved_search_editor.ui @@ -11,7 +11,7 @@ - Tag Editor + Saved Search Editor @@ -137,7 +137,11 @@ - + + + Change the contents of the saved search + + diff --git a/src/calibre/gui2/dialogs/tag_categories.ui b/src/calibre/gui2/dialogs/tag_categories.ui index 2904b2464e..d280d5061a 100644 --- a/src/calibre/gui2/dialogs/tag_categories.ui +++ b/src/calibre/gui2/dialogs/tag_categories.ui @@ -11,7 +11,7 @@ - Tag Editor + User Categories Editor diff --git a/src/calibre/gui2/dialogs/tag_list_editor.ui b/src/calibre/gui2/dialogs/tag_list_editor.ui index 5d7c95db1f..383dc875ac 100644 --- a/src/calibre/gui2/dialogs/tag_list_editor.ui +++ b/src/calibre/gui2/dialogs/tag_list_editor.ui @@ -63,6 +63,12 @@ :/images/trash.svg:/images/trash.svg + + + 32 + 32 + + @@ -77,6 +83,15 @@ :/images/edit_input.svg:/images/edit_input.svg + + + 32 + 32 + + + + Ctrl+S + From 4a046a41d0f8e754ec087c0932c50224ce97e115 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Wed, 2 Jun 2010 15:46:27 -0600 Subject: [PATCH 2/3] Fix #5648 (Enhancement Request: Put up a screen while waiting for calibre to load library) --- src/calibre/gui2/main.py | 33 ++++++++++++++++++++++++++------- 1 file changed, 26 insertions(+), 7 deletions(-) diff --git a/src/calibre/gui2/main.py b/src/calibre/gui2/main.py index 73f7f3839d..c6777566f7 100644 --- a/src/calibre/gui2/main.py +++ b/src/calibre/gui2/main.py @@ -5,13 +5,14 @@ import sys, os, time, socket, traceback from functools import partial 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.constants import iswindows, __appname__, isosx, filesystem_encoding from calibre.utils.ipc import ADDRESS, RC 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.utils.config import prefs, dynamic from calibre.library.database2 import LibraryDatabase2 @@ -117,11 +118,15 @@ class GuiRunner(QObject): self.actions = actions self.main = None QObject.__init__(self) + self.splash_screen = None self.timer = QTimer.singleShot(1, self.initialize) def start_gui(self): from calibre.gui2.ui import Main 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) add_filesystem_book = partial(main.add_filesystem_book, allow_device=False) sys.excepthook = main.unhandled_exception @@ -143,7 +148,7 @@ class GuiRunner(QObject): if db is None and tb is not None: # DB Repair failed - error_dialog(None, _('Repairing failed'), + error_dialog(self.splash_screen, _('Repairing failed'), _('The database repair failed. Starting with ' 'a new empty library.'), det_msg=tb, show=True) @@ -160,7 +165,7 @@ class GuiRunner(QObject): os.makedirs(x) except: 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'), default_dir=x) @@ -171,7 +176,7 @@ class GuiRunner(QObject): self.library_path = candidate db = LibraryDatabase2(candidate) except: - error_dialog(None, _('Bad database location'), + error_dialog(self.splash_screen, _('Bad database location'), _('Bad database location %r. calibre will now quit.' )%self.library_path, det_msg=traceback.format_exc(), show=True) @@ -185,7 +190,7 @@ class GuiRunner(QObject): try: db = LibraryDatabase2(self.library_path) 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 ' 'you want calibre to try and repair it automatically? ' 'If you say No, a new empty calibre library will be created.'), @@ -204,14 +209,28 @@ class GuiRunner(QObject): self.repair.start() return except: - error_dialog(None, _('Bad database location'), + error_dialog(self.splash_screen, _('Bad database location'), _('Bad database location %r. Will start with ' ' a new, empty calibre library')%self.library_path, det_msg=traceback.format_exc(), show=True) 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): + if gprefs.get('show_splash_screen', True): + self.show_splash_screen() + + time.sleep(10) self.library_path = get_library_path() if self.library_path is None: self.initialization_failed() From edc4b10817b30c887cd9c8b2ccf35ac994746faf Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Wed, 2 Jun 2010 16:06:38 -0600 Subject: [PATCH 3/3] Add option to disable splash screen --- src/calibre/gui2/dialogs/config/__init__.py | 5 ++- src/calibre/gui2/dialogs/config/config.ui | 35 ++++++++++++--------- src/calibre/gui2/main.py | 9 ++++-- 3 files changed, 32 insertions(+), 17 deletions(-) diff --git a/src/calibre/gui2/dialogs/config/__init__.py b/src/calibre/gui2/dialogs/config/__init__.py index 5e10ea1621..5d855b5263 100644 --- a/src/calibre/gui2/dialogs/config/__init__.py +++ b/src/calibre/gui2/dialogs/config/__init__.py @@ -14,7 +14,7 @@ from PyQt4.Qt import QDialog, QListWidgetItem, QIcon, \ from calibre.constants import iswindows, isosx from calibre.gui2.dialogs.config.config_ui import Ui_Dialog from calibre.gui2.dialogs.config.create_custom_column import CreateCustomColumn -from calibre.gui2 import choose_dir, error_dialog, config, \ +from calibre.gui2 import choose_dir, error_dialog, config, gprefs, \ ALL_COLUMNS, NONE, info_dialog, choose_files, \ warning_dialog, ResizableDialog, question_dialog from calibre.utils.config import prefs @@ -480,6 +480,8 @@ class ConfigDialog(ResizableDialog, Ui_Dialog): self.opt_enforce_cpu_limit.setChecked(config['enforce_cpu_limit']) self.device_detection_button.clicked.connect(self.debug_device_detection) self.port.editingFinished.connect(self.check_port_value) + self.show_splash_screen.setChecked(gprefs.get('show_splash_screen', + True)) def check_port_value(self, *args): port = self.port.value() @@ -852,6 +854,7 @@ class ConfigDialog(ResizableDialog, Ui_Dialog): config['get_social_metadata'] = self.opt_get_social_metadata.isChecked() config['overwrite_author_title_metadata'] = self.opt_overwrite_author_title_metadata.isChecked() config['enforce_cpu_limit'] = bool(self.opt_enforce_cpu_limit.isChecked()) + gprefs['show_splash_screen'] = bool(self.show_splash_screen.isChecked()) fmts = [] for i in range(self.viewer.count()): if self.viewer.item(i).checkState() == Qt.Checked: diff --git a/src/calibre/gui2/dialogs/config/config.ui b/src/calibre/gui2/dialogs/config/config.ui index 5d84e2e2af..db748dae7e 100644 --- a/src/calibre/gui2/dialogs/config/config.ui +++ b/src/calibre/gui2/dialogs/config/config.ui @@ -331,8 +331,8 @@ - - + + Use &Roman numerals for series number @@ -342,28 +342,35 @@ - + Enable system &tray icon (needs restart) - + Show &notifications in system tray - + + + + Show &splash screen at startup + + + + Show cover &browser in a separate window (needs restart) - + Search as you type @@ -373,21 +380,21 @@ - + Automatically send downloaded &news to ebook reader - + &Delete news from library when it is automatically sent to reader - + @@ -404,7 +411,7 @@ - + Toolbar @@ -452,7 +459,7 @@ - + @@ -527,12 +534,12 @@ - - ... - Add a user-defined column + + ... + :/images/plus.svg:/images/plus.svg diff --git a/src/calibre/gui2/main.py b/src/calibre/gui2/main.py index c6777566f7..29ae1875c8 100644 --- a/src/calibre/gui2/main.py +++ b/src/calibre/gui2/main.py @@ -9,7 +9,8 @@ from PyQt4.Qt import QCoreApplication, QIcon, QMessageBox, QObject, QTimer, \ QSplashScreen, QApplication from calibre import prints, plugins -from calibre.constants import iswindows, __appname__, isosx, filesystem_encoding +from calibre.constants import iswindows, __appname__, isosx, DEBUG, \ + filesystem_encoding from calibre.utils.ipc import ADDRESS, RC from calibre.gui2 import ORG_NAME, APP_UID, initialize_file_icon_provider, \ Application, choose_dir, error_dialog, question_dialog, gprefs @@ -114,12 +115,15 @@ class GuiRunner(QObject): initialization''' def __init__(self, opts, args, actions, listener, app): + self.startup_time = time.time() self.opts, self.args, self.listener, self.app = opts, args, listener, app self.actions = actions self.main = None QObject.__init__(self) self.splash_screen = None self.timer = QTimer.singleShot(1, self.initialize) + if DEBUG: + prints('Starting up...') def start_gui(self): from calibre.gui2.ui import Main @@ -128,6 +132,8 @@ class GuiRunner(QObject): self.splash_screen.showMessage(_('Initializing user interface...')) self.splash_screen.finish(main) main.initialize(self.library_path, self.db, self.listener, self.actions) + if DEBUG: + prints('Started up in', time.time() - self.startup_time) add_filesystem_book = partial(main.add_filesystem_book, allow_device=False) sys.excepthook = main.unhandled_exception if len(self.args) > 1: @@ -230,7 +236,6 @@ class GuiRunner(QObject): if gprefs.get('show_splash_screen', True): self.show_splash_screen() - time.sleep(10) self.library_path = get_library_path() if self.library_path is None: self.initialization_failed()