From 88bafa75e21872f1383e5eba842a9315ad938db3 Mon Sep 17 00:00:00 2001 From: John Schember Date: Sat, 2 May 2009 08:15:26 -0400 Subject: [PATCH] Move jetbook import. Add note that 72 pts = 1 inch. --- src/calibre/devices/jetbook/driver.py | 5 +++-- src/calibre/ebooks/conversion/plumber.py | 12 ++++++++---- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/calibre/devices/jetbook/driver.py b/src/calibre/devices/jetbook/driver.py index d2054cd7a1..bdeb3a4032 100644 --- a/src/calibre/devices/jetbook/driver.py +++ b/src/calibre/devices/jetbook/driver.py @@ -7,7 +7,7 @@ Device driver for Ectaco Jetbook firmware >= JL04_v030e import os, re, sys, shutil from itertools import cycle -from calibre.devices.usbms.driver import USBMS, metadata_from_formats +from calibre.devices.usbms.driver import USBMS from calibre import sanitize_file_name as sanitize class JETBOOK(USBMS): @@ -98,7 +98,8 @@ class JETBOOK(USBMS): return txt.decode(sys.getfilesystemencoding(), 'replace') return txt - + + from calibre.devices.usbms.driver import metadata_from_formats mi = metadata_from_formats([path]) if (mi.title==_('Unknown') or mi.authors==[_('Unknown')]) \ diff --git a/src/calibre/ebooks/conversion/plumber.py b/src/calibre/ebooks/conversion/plumber.py index 9987ec0243..b4c418547b 100644 --- a/src/calibre/ebooks/conversion/plumber.py +++ b/src/calibre/ebooks/conversion/plumber.py @@ -251,19 +251,23 @@ OptionRecommendation(name='page_breaks_before', OptionRecommendation(name='margin_top', recommended_value=5.0, level=OptionRecommendation.LOW, - help=_('Set the top margin in pts. Default is %default')), + help=_('Set the top margin in pts. Default is %default. ' + 'Note: 72 pts equals 1 inch')), OptionRecommendation(name='margin_bottom', recommended_value=5.0, level=OptionRecommendation.LOW, - help=_('Set the bottom margin in pts. Default is %default')), + help=_('Set the bottom margin in pts. Default is %default. ' + 'Note: 72 pts equals 1 inch')), OptionRecommendation(name='margin_left', recommended_value=5.0, level=OptionRecommendation.LOW, - help=_('Set the left margin in pts. Default is %default')), + help=_('Set the left margin in pts. Default is %default. ' + 'Note: 72 pts equals 1 inch')), OptionRecommendation(name='margin_right', recommended_value=5.0, level=OptionRecommendation.LOW, - help=_('Set the right margin in pts. Default is %default')), + help=_('Set the right margin in pts. Default is %default. ' + 'Note: 72 pts equals 1 inch')), OptionRecommendation(name='dont_justify', recommended_value=False, level=OptionRecommendation.LOW,