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

OS X: Do not hang the UI waiting for fontconfig to finish scanning on first start. Instead present a blank list of available fonts

Browse Source
This commit is contained in:
Kovid Goyal 2012-10-22 13:56:20 +05:30
parent 80fc2c7c68
commit 737458dc31
3 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -118,7 +118,7 @@ class FontFamilyChooser(QComboBox):
QComboBox.__init__(self, parent) QComboBox.__init__(self, parent)
from calibre.utils.fonts import fontconfig from calibre.utils.fonts import fontconfig
try: try:
self.families = fontconfig.find_font_families() ok, self.families = fontconfig.find_font_families_no_delay()
except: except:
self.families = [] self.families = []
print ('WARNING: Could not load fonts') print ('WARNING: Could not load fonts')

8
src/calibre/utils/fonts/__init__.py
View File

@ -6,7 +6,7 @@ __license__ = 'GPL v3'
__copyright__ = '2009, Kovid Goyal <kovid@kovidgoyal.net>' __copyright__ = '2009, Kovid Goyal <kovid@kovidgoyal.net>'
__docformat__ = 'restructuredtext en' __docformat__ = 'restructuredtext en'
from calibre.constants import iswindows from calibre.constants import iswindows, isosx
class Fonts(object): class Fonts(object):
@ -23,6 +23,12 @@ class Fonts(object):
return self.backend.font_families() return self.backend.font_families()
return self.backend.find_font_families(allowed_extensions=allowed_extensions) return self.backend.find_font_families(allowed_extensions=allowed_extensions)
def find_font_families_no_delay(self, allowed_extensions={'ttf', 'otf'}):
if isosx:
if self.backend.is_scanning():
return False, []
return True, self.find_font_families(allowed_extensions=allowed_extensions)
def files_for_family(self, family, normalize=True): def files_for_family(self, family, normalize=True):
''' '''
Find all the variants in the font family `family`. Find all the variants in the font family `family`.

7
src/calibre/utils/fonts/fc.py
View File

@ -8,7 +8,7 @@ __docformat__ = 'restructuredtext en'
import os, sys import os, sys
from calibre.constants import plugins, islinux, isbsd from calibre.constants import plugins, islinux, isbsd, isosx
_fc, _fc_err = plugins['fontconfig'] _fc, _fc_err = plugins['fontconfig']
@ -44,6 +44,11 @@ class FontConfig(Thread):
if not self.failed and hasattr(_fc, 'add_font_dir'): if not self.failed and hasattr(_fc, 'add_font_dir'):
_fc.add_font_dir(P('fonts/liberation')) _fc.add_font_dir(P('fonts/liberation'))
def is_scanning(self):
if isosx:
return self.is_alive()
return False
def wait(self): def wait(self):
if not (islinux or isbsd): if not (islinux or isbsd):
self.join() self.join()