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

merge user_none's branch

Browse Source
This commit is contained in:
ldolse 2011-01-16 22:31:57 +08:00
commit fa3d7e2d1f
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,8 +34,11 @@ class HeuristicsWidget(Widget, Ui_Form):
def break_cycles(self):
Widget.break_cycles(self)
self.opt_enable_heuristics.stateChanged.disconnect()
self.opt_unwrap_lines.stateChanged.disconnect()
try:
self.opt_enable_heuristics.stateChanged.disconnect()
self.opt_unwrap_lines.stateChanged.disconnect()
except:
pass
def set_value_handler(self, g, val):
if val is None and g is self.opt_html_unwrap_factor:

5
src/calibre/gui2/convert/search_and_replace.py
View File

@ -36,7 +36,7 @@ class SearchAndReplaceWidget(Widget, Ui_Form):
self.opt_sr3_search.break_cycles()
def pre_commit_check(self):
for x in ('sr1-search', 'sr2-search', 'sr3-search'):
for x in ('sr1_search', 'sr2_search', 'sr3_search'):
x = getattr(self, 'opt_'+x)
try:
pat = unicode(x.regex)
@ -45,5 +45,4 @@ class SearchAndReplaceWidget(Widget, Ui_Form):
error_dialog(self, _('Invalid regular expression'),
_('Invalid regular expression: %s')%err).exec_()
return False
return True