Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-08 10:44:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

ebook-viewer now uses system default fonts on windows. This should fix the bug with truncated characters on the right edge on the screen.

Browse Source
This commit is contained in:
Kovid Goyal 2009-02-07 18:12:13 -08:00
parent 68f801dd24
commit 51f3cb775c
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1223,6 +1223,8 @@ class Main(MainWindow, Ui_MainWindow):
format = 'LRF' format = 'LRF'
if 'EPUB' in formats: if 'EPUB' in formats:
format = 'EPUB' format = 'EPUB'
if 'MOBI' in formats:
format = 'MOBI'
if not formats: if not formats:
d = error_dialog(self, _('Cannot view'), d = error_dialog(self, _('Cannot view'),
_('%s has no available formats.')%(title,)) _('%s has no available formats.')%(title,))

10
src/calibre/gui2/viewer/documentview.py
View File

@ -15,6 +15,7 @@ from calibre.utils.config import Config, StringConfig
from calibre.gui2.viewer.config_ui import Ui_Dialog from calibre.gui2.viewer.config_ui import Ui_Dialog
from calibre.gui2.viewer.js import bookmarks, referencing from calibre.gui2.viewer.js import bookmarks, referencing
from calibre.ptempfile import PersistentTemporaryFile from calibre.ptempfile import PersistentTemporaryFile
from calibre.constants import iswindows
def load_builtin_fonts(): def load_builtin_fonts():
from calibre.ebooks.lrf.fonts.liberation import LiberationMono_BoldItalic from calibre.ebooks.lrf.fonts.liberation import LiberationMono_BoldItalic
@ -56,9 +57,12 @@ def config(defaults=None):
help=_('Set the user CSS stylesheet. This can be used to customize the look of all books.')) help=_('Set the user CSS stylesheet. This can be used to customize the look of all books.'))
fonts = c.add_group('FONTS', _('Font options')) fonts = c.add_group('FONTS', _('Font options'))
fonts('serif_family', default='Liberation Serif', help=_('The serif font family')) fonts('serif_family', default='Times New Roman' if iswindows else 'Liberation Serif',
fonts('sans_family', default='Liberation Sans', help=_('The sans-serif font family')) help=_('The serif font family'))
fonts('mono_family', default='Liberation Mono', help=_('The monospaced font family')) fonts('sans_family', default='Verdana' if iswindows else 'Liberation Sans',
help=_('The sans-serif font family'))
fonts('mono_family', default='Courier New' if iswindows else 'Liberation Mono',
help=_('The monospaced font family'))
fonts('default_font_size', default=20, help=_('The standard font size in px')) fonts('default_font_size', default=20, help=_('The standard font size in px'))
fonts('mono_font_size', default=16, help=_('The monospaced font size in px')) fonts('mono_font_size', default=16, help=_('The monospaced font size in px'))
fonts('standard_font', default='serif', help=_('The standard font type')) fonts('standard_font', default='serif', help=_('The standard font type'))