From 3a624eda8ede59a74a8c9eaaa7de0b204683ea24 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Mon, 17 Apr 2017 15:41:50 +0530 Subject: [PATCH] E-book viewer: Fix a regression int he previous release that broke printing from inside the viewer. --- src/calibre/gui2/viewer/printing.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/calibre/gui2/viewer/printing.py b/src/calibre/gui2/viewer/printing.py index 3b09885783..d2b66bdbae 100644 --- a/src/calibre/gui2/viewer/printing.py +++ b/src/calibre/gui2/viewer/printing.py @@ -159,12 +159,12 @@ class DoPrint(Thread): def do_print(): data = cPickle.loads(sys.stdin.read()) - args = ['ebook-convert', data['input'], data['output'], '--override-profile-size', '--paper-size', data['paper_size'], '--pdf-add-toc', + args = ['ebook-convert', data['input'], data['output'], '--paper-size', data['paper_size'], '--pdf-add-toc', '--disable-remove-fake-margins', '--disable-font-rescaling', '--page-breaks-before', '/', '--chapter-mark', 'none', '-vv'] if data['page_numbers']: args.append('--pdf-page-numbers') for edge in 'left top right bottom'.split(): - args.append('--margin-' + edge), args.append('%.1f' % (data['margin_' + edge] * 72)) + args.append('--pdf-page-margin-' + edge), args.append('%.1f' % (data['margin_' + edge] * 72)) from calibre.ebooks.conversion.cli import main main(args) @@ -215,6 +215,7 @@ def print_book(path_to_book, parent=None, book_title=None): t.start() Printing(t, data['show_file'], parent).exec_() + if __name__ == '__main__': app = Application([]) print_book(sys.argv[-1])