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

Restore removed qapp.original_font

Browse Source
This commit is contained in:
Kovid Goyal 2014-04-25 22:24:59 +05:30
parent 8967c57252
commit 0ec844aea4
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -886,9 +886,18 @@ class Application(QApplication):
self.redirect_notify = True self.redirect_notify = True
self.setup_styles(force_calibre_style) self.setup_styles(force_calibre_style)
QApplication.__init__(self, qargs) QApplication.__init__(self, qargs)
self.original_font = QFont(QApplication.font())
if not self.using_calibre_style and self.style().objectName() == 'fusion': if not self.using_calibre_style and self.style().objectName() == 'fusion':
# Since Qt is using the fusion style anyway, specialize it # Since Qt is using the fusion style anyway, specialize it
self.load_calibre_style() self.load_calibre_style()
fi = gprefs['font']
if fi is not None:
font = QFont(*(fi[:4]))
s = gprefs.get('font_stretch', None)
if s is not None:
font.setStretch(s)
QApplication.setFont(font)
dl = QLocale(get_lang()) dl = QLocale(get_lang())
if unicode(dl.bcp47Name()) != u'C': if unicode(dl.bcp47Name()) != u'C':
QLocale.setDefault(dl) QLocale.setDefault(dl)
@ -918,14 +927,6 @@ class Application(QApplication):
load_builtin_fonts() load_builtin_fonts()
def setup_styles(self, force_calibre_style): def setup_styles(self, force_calibre_style):
fi = gprefs['font']
if fi is not None:
font = QFont(*(fi[:4]))
s = gprefs.get('font_stretch', None)
if s is not None:
font.setStretch(s)
QApplication.setFont(font)
depth_ok = True depth_ok = True
if iswindows: if iswindows:
# There are some people that still run 16 bit winxp installs. The # There are some people that still run 16 bit winxp installs. The