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

...

Browse Source
This commit is contained in:
Kovid Goyal 2011-02-01 17:40:58 -07:00
commit 6bc8bf81e4
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/calibre/ebooks/conversion/plumber.py
View File

@ -532,7 +532,7 @@ OptionRecommendation(name='format_scene_breaks',
'horizontal rules.')), 'horizontal rules.')),
OptionRecommendation(name='replace_scene_breaks', OptionRecommendation(name='replace_scene_breaks',
recommended_value=None, level=OptionRecommendation.LOW, recommended_value='', level=OptionRecommendation.LOW,
help=_('Replace scene breaks with the specified text. By default, the ' help=_('Replace scene breaks with the specified text. By default, the '
'text from the input document is used.')), 'text from the input document is used.')),

2
src/calibre/ebooks/txt/txtml.py
View File

@ -218,7 +218,7 @@ class TXTMLizer(object):
if tag in SPACE_TAGS: if tag in SPACE_TAGS:
text.append(u' ') text.append(u' ')
# Scene breaks. # Scene breaks.
if tag == 'hr': if tag == 'hr':
text.append('\n\n* * *\n\n') text.append('\n\n* * *\n\n')

12
src/calibre/gui2/convert/heuristics.py
View File

@ -27,7 +27,8 @@ class HeuristicsWidget(Widget, Ui_Form):
'dehyphenate', 'renumber_headings'] 'dehyphenate', 'renumber_headings']
) )
self.db, self.book_id = db, book_id self.db, self.book_id = db, book_id
self.rssb_defaults = ['', '<hr />', '* * *'] self.rssb_defaults = [u'', u'<hr />', u'* * *', u'• • •', u'✦ ✦ ✦',
u'✮ ✮ ✮', u'☆ ☆ ☆', u'❂ ❂ ❂', u'✣ ✣ ✣', u'❖ ❖ ❖', u'☼ ☼ ☼', u'✠ ✠ ✠']
self.initialize_options(get_option, get_help, db, book_id) self.initialize_options(get_option, get_help, db, book_id)
self.load_histories() self.load_histories()
@ -39,16 +40,18 @@ class HeuristicsWidget(Widget, Ui_Form):
def restore_defaults(self, get_option): def restore_defaults(self, get_option):
Widget.restore_defaults(self, get_option) Widget.restore_defaults(self, get_option)
self.save_histories()
rssb_hist = gprefs['replace_scene_breaks_history'] rssb_hist = gprefs['replace_scene_breaks_history']
for x in self.rssb_defaults: for x in self.rssb_defaults:
if x in rssb_hist: if x in rssb_hist:
del rssb_hist[rssb_hist.index(x)] del rssb_hist[rssb_hist.index(x)]
gprefs['replace_scene_breaks_history'] = self.rssb_defaults + gprefs['replace_scene_breaks_history'] gprefs['replace_scene_breaks_history'] = self.rssb_defaults + gprefs['replace_scene_breaks_history']
self.load_histories()
def commit_options(self, save_defaults=False): def commit_options(self, save_defaults=False):
self.save_histories() self.save_histories()
return Widget.commit_options(self, save_defaults) return Widget.commit_options(self, save_defaults)
def break_cycles(self): def break_cycles(self):
@ -69,6 +72,9 @@ class HeuristicsWidget(Widget, Ui_Form):
return True return True
def load_histories(self): def load_histories(self):
self.opt_replace_scene_breaks.clear()
self.opt_replace_scene_breaks.lineEdit().setText('')
val = unicode(self.opt_replace_scene_breaks.currentText()) val = unicode(self.opt_replace_scene_breaks.currentText())
rssb_hist = gprefs.get('replace_scene_breaks_history', self.rssb_defaults) rssb_hist = gprefs.get('replace_scene_breaks_history', self.rssb_defaults)
if val in rssb_hist: if val in rssb_hist: