From 51f3cb775c6bee1d4fa7c7555d0bb7b371f53d18 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sat, 7 Feb 2009 18:12:13 -0800 Subject: [PATCH] ebook-viewer now uses system default fonts on windows. This should fix the bug with truncated characters on the right edge on the screen. --- src/calibre/gui2/main.py | 2 ++ src/calibre/gui2/viewer/documentview.py | 10 +++++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/calibre/gui2/main.py b/src/calibre/gui2/main.py index b88842706a..776e549b2b 100644 --- a/src/calibre/gui2/main.py +++ b/src/calibre/gui2/main.py @@ -1223,6 +1223,8 @@ class Main(MainWindow, Ui_MainWindow): format = 'LRF' if 'EPUB' in formats: format = 'EPUB' + if 'MOBI' in formats: + format = 'MOBI' if not formats: d = error_dialog(self, _('Cannot view'), _('%s has no available formats.')%(title,)) diff --git a/src/calibre/gui2/viewer/documentview.py b/src/calibre/gui2/viewer/documentview.py index 6c1eca0061..3745036249 100644 --- a/src/calibre/gui2/viewer/documentview.py +++ b/src/calibre/gui2/viewer/documentview.py @@ -15,6 +15,7 @@ from calibre.utils.config import Config, StringConfig from calibre.gui2.viewer.config_ui import Ui_Dialog from calibre.gui2.viewer.js import bookmarks, referencing from calibre.ptempfile import PersistentTemporaryFile +from calibre.constants import iswindows def load_builtin_fonts(): 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.')) fonts = c.add_group('FONTS', _('Font options')) - fonts('serif_family', default='Liberation Serif', help=_('The serif font family')) - fonts('sans_family', default='Liberation Sans', help=_('The sans-serif font family')) - fonts('mono_family', default='Liberation Mono', help=_('The monospaced font family')) + fonts('serif_family', default='Times New Roman' if iswindows else 'Liberation Serif', + help=_('The serif 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('mono_font_size', default=16, help=_('The monospaced font size in px')) fonts('standard_font', default='serif', help=_('The standard font type'))