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

Do not scan the system for fonts on viewer startup, only on main GUI startup

Browse Source
This commit is contained in:
Kovid Goyal 2012-10-31 13:36:10 +05:30
parent e7397f60d5
commit 9977bafa67
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/calibre/gui2/__init__.py
View File

@ -764,7 +764,7 @@ qt_app = None
class Application(QApplication): class Application(QApplication):
def __init__(self, args, force_calibre_style=False, def __init__(self, args, force_calibre_style=False,
override_program_name=None): override_program_name=None, scan_for_fonts=False):
self.file_event_hook = None self.file_event_hook = None
if override_program_name: if override_program_name:
args = [override_program_name] + args[1:] args = [override_program_name] + args[1:]
@ -780,7 +780,7 @@ class Application(QApplication):
qt_app = self qt_app = self
self._file_open_paths = [] self._file_open_paths = []
self._file_open_lock = RLock() self._file_open_lock = RLock()
self.load_builtin_fonts() self.load_builtin_fonts(scan_for_fonts=scan_for_fonts)
self.setup_styles(force_calibre_style) self.setup_styles(force_calibre_style)
if DEBUG: if DEBUG:
@ -793,8 +793,9 @@ class Application(QApplication):
self.redirect_notify = True self.redirect_notify = True
return ret return ret
def load_builtin_fonts(self): def load_builtin_fonts(self, scan_for_fonts=False):
global _rating_font global _rating_font
if scan_for_fonts:
from calibre.utils.fonts.scanner import font_scanner from calibre.utils.fonts.scanner import font_scanner
# Start scanning the users computer for fonts # Start scanning the users computer for fonts
font_scanner font_scanner

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

@ -95,7 +95,7 @@ def init_qt(args):
QCoreApplication.setOrganizationName(ORG_NAME) QCoreApplication.setOrganizationName(ORG_NAME)
QCoreApplication.setApplicationName(APP_UID) QCoreApplication.setApplicationName(APP_UID)
override = 'calibre-gui' if islinux else None override = 'calibre-gui' if islinux else None
app = Application(args, override_program_name=override) app = Application(args, override_program_name=override, scan_for_fonts=True)
actions = tuple(Main.create_application_menubar()) actions = tuple(Main.create_application_menubar())
app.setWindowIcon(QIcon(I('lt.png'))) app.setWindowIcon(QIcon(I('lt.png')))
return app, opts, args, actions return app, opts, args, actions