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

...

Browse Source
This commit is contained in:
Kovid Goyal 2012-08-31 15:11:08 +05:30
parent 8d881f9f7f
commit b7f2788244
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/calibre/ebooks/pdf/writer.py
View File

@ -137,11 +137,15 @@ class Page(QWebPage):
std = {'serif':opts.pdf_serif_family, 'sans':opts.pdf_sans_family, std = {'serif':opts.pdf_serif_family, 'sans':opts.pdf_sans_family,
'mono':opts.pdf_mono_family}.get(opts.pdf_standard_font, 'mono':opts.pdf_mono_family}.get(opts.pdf_standard_font,
opts.pdf_serif_family) opts.pdf_serif_family)
settings.setFontFamily(QWebSettings.StandardFont, std) if std:
settings.setFontFamily(QWebSettings.SerifFont, opts.pdf_serif_family) settings.setFontFamily(QWebSettings.StandardFont, std)
settings.setFontFamily(QWebSettings.SansSerifFont, if opts.pdf_serif_family:
opts.pdf_sans_family) settings.setFontFamily(QWebSettings.SerifFont, opts.pdf_serif_family)
settings.setFontFamily(QWebSettings.FixedFont, opts.pdf_mono_family) if opts.pdf_sans_family:
settings.setFontFamily(QWebSettings.SansSerifFont,
opts.pdf_sans_family)
if opts.pdf_mono_family:
settings.setFontFamily(QWebSettings.FixedFont, opts.pdf_mono_family)
def javaScriptConsoleMessage(self, msg, lineno, msgid): def javaScriptConsoleMessage(self, msg, lineno, msgid):
self.log.debug(u'JS:', unicode(msg)) self.log.debug(u'JS:', unicode(msg))

2
src/calibre/gui2/convert/__init__.py
View File

@ -143,7 +143,7 @@ class Widget(QWidget):
ans = None ans = None
return ans return ans
elif isinstance(g, QFontComboBox): elif isinstance(g, QFontComboBox):
ans = unicode(QFontInfo(g.currentFont().family())) return unicode(QFontInfo(g.currentFont()).family())
elif isinstance(g, EncodingComboBox): elif isinstance(g, EncodingComboBox):
ans = unicode(g.currentText()).strip() ans = unicode(g.currentText()).strip()
try: try: