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

E-book viewer: Fix a regression int he previous release that broke printing from inside the viewer.

Browse Source
This commit is contained in:
Kovid Goyal 2017-04-17 15:41:50 +05:30
parent 67865aa9df
commit 3a624eda8e
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/calibre/gui2/viewer/printing.py
View File

@ -159,12 +159,12 @@ class DoPrint(Thread):
def do_print(): def do_print():
data = cPickle.loads(sys.stdin.read()) 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'] '--disable-remove-fake-margins', '--disable-font-rescaling', '--page-breaks-before', '/', '--chapter-mark', 'none', '-vv']
if data['page_numbers']: if data['page_numbers']:
args.append('--pdf-page-numbers') args.append('--pdf-page-numbers')
for edge in 'left top right bottom'.split(): 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 from calibre.ebooks.conversion.cli import main
main(args) main(args)
@ -215,6 +215,7 @@ def print_book(path_to_book, parent=None, book_title=None):
t.start() t.start()
Printing(t, data['show_file'], parent).exec_() Printing(t, data['show_file'], parent).exec_()
if __name__ == '__main__': if __name__ == '__main__':
app = Application([]) app = Application([])
print_book(sys.argv[-1]) print_book(sys.argv[-1])