Coversion S&R: Do not strip leading and trailing whitespace from the search and replace expressions in the GUI

This commit is contained in:
Kovid Goyal 2011-03-12 10:30:59 -07:00
commit f38fecea88

View File

@ -6,6 +6,8 @@ __docformat__ = 'restructuredtext en'
import re import re
from PyQt4.Qt import QLineEdit, QTextEdit
from calibre.gui2.convert.search_and_replace_ui import Ui_Form from calibre.gui2.convert.search_and_replace_ui import Ui_Form
from calibre.gui2.convert import Widget from calibre.gui2.convert import Widget
from calibre.gui2 import error_dialog from calibre.gui2 import error_dialog
@ -72,3 +74,13 @@ class SearchAndReplaceWidget(Widget, Ui_Form):
_('Invalid regular expression: %s')%err, show=True) _('Invalid regular expression: %s')%err, show=True)
return False return False
return True return True
def get_vaule(self, g):
if isinstance(g, (QLineEdit, QTextEdit)):
func = getattr(g, 'toPlainText', getattr(g, 'text', None))()
ans = unicode(func)
if not ans:
ans = None
return ans
else:
return Widget.get_value(self, g)