diff --git a/src/calibre/ebooks/snb/output.py b/src/calibre/ebooks/snb/output.py index fa8442391b..07a0460c57 100644 --- a/src/calibre/ebooks/snb/output.py +++ b/src/calibre/ebooks/snb/output.py @@ -35,14 +35,17 @@ class SNBOutput(OutputFormatPlugin): recommended_value=False, level=OptionRecommendation.LOW, help=_('Specify whether or not to insert an empty line between ' 'two paragraphs.')), - OptionRecommendation(name='snb_indent_first_line', - recommended_value=True, level=OptionRecommendation.LOW, + OptionRecommendation(name='snb_dont_indent_first_line', + recommended_value=False, level=OptionRecommendation.LOW, help=_('Specify whether or not to insert two space characters ' 'to indent the first line of each paragraph.')), OptionRecommendation(name='snb_hide_chapter_name', recommended_value=False, level=OptionRecommendation.LOW, help=_('Specify whether or not to hide the chapter title for each ' 'chapter. Useful for image-only output (eg. comics).')), + OptionRecommendation(name='snb_full_screen', + recommended_value=False, level=OptionRecommendation.LOW, + help=_('Resize all the images for full screen view. ')), ]) def convert(self, oeb_book, output_path, input_plugin, opts, log): @@ -228,7 +231,10 @@ class SNBOutput(OutputFormatPlugin): img.load(imageData) (x,y) = img.size if self.opts: - SCREEN_X, SCREEN_Y = self.opts.output_profile.comic_screen_size + if self.opts.snb_full_screen: + SCREEN_X, SCREEN_Y = self.opts.output_profile.screen_size + else: + SCREEN_X, SCREEN_Y = self.opts.output_profile.comic_screen_size else: SCREEN_X = 540 SCREEN_Y = 700 diff --git a/src/calibre/ebooks/snb/snbml.py b/src/calibre/ebooks/snb/snbml.py index 7c16eb5d90..078e7ebe76 100644 --- a/src/calibre/ebooks/snb/snbml.py +++ b/src/calibre/ebooks/snb/snbml.py @@ -121,7 +121,7 @@ class SNBMLizer(object): subitem = line[len(CALIBRE_SNB_BM_TAG):] bodyTree = trees[subitem].find(".//body") else: - if self.opts and self.opts.snb_indent_first_line: + if self.opts and not self.opts.snb_dont_indent_first_line: prefix = u'\u3000\u3000' else: prefix = u'' diff --git a/src/calibre/gui2/convert/snb_output.py b/src/calibre/gui2/convert/snb_output.py index e3a6861811..73527365c2 100644 --- a/src/calibre/gui2/convert/snb_output.py +++ b/src/calibre/gui2/convert/snb_output.py @@ -18,8 +18,8 @@ class PluginWidget(Widget, Ui_Form): def __init__(self, parent, get_option, get_help, db=None, book_id=None): Widget.__init__(self, parent, - ['snb_insert_empty_line', 'snb_indent_first_line', - 'snb_hide_chapter_name',]) + ['snb_insert_empty_line', 'snb_dont_indent_first_line', + 'snb_hide_chapter_name','snb_full_screen']) self.db, self.book_id = db, book_id self.initialize_options(get_option, get_help, db, book_id) diff --git a/src/calibre/gui2/convert/snb_output.ui b/src/calibre/gui2/convert/snb_output.ui index 0decd7469d..d6d288981f 100644 --- a/src/calibre/gui2/convert/snb_output.ui +++ b/src/calibre/gui2/convert/snb_output.ui @@ -13,8 +13,8 @@ Form - - + + Qt::Vertical @@ -35,9 +35,9 @@ - + - Insert space before the first line for each paragraph + Don't indent the first line for each paragraph @@ -48,6 +48,13 @@ + + + + Optimize for full-sceen view + + +