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

If the user specifies an unknown encoding, automatically change it to None

Browse Source
This commit is contained in:
Kovid Goyal 2011-01-06 14:40:01 -07:00
parent 91ba0d2df4
commit 9af7ba996f
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/calibre/gui2/convert/__init__.py
View File

@ -6,7 +6,7 @@ __license__ = 'GPL v3'
__copyright__ = '2009, Kovid Goyal <kovid@kovidgoyal.net>' __copyright__ = '2009, Kovid Goyal <kovid@kovidgoyal.net>'
__docformat__ = 'restructuredtext en' __docformat__ = 'restructuredtext en'
import textwrap import textwrap, codecs
from functools import partial from functools import partial
from PyQt4.Qt import QWidget, QSpinBox, QDoubleSpinBox, QLineEdit, QTextEdit, \ from PyQt4.Qt import QWidget, QSpinBox, QDoubleSpinBox, QLineEdit, QTextEdit, \
@ -128,6 +128,7 @@ class Widget(QWidget):
def get_value(self, g): def get_value(self, g):
from calibre.gui2.convert.xpath_wizard import XPathEdit from calibre.gui2.convert.xpath_wizard import XPathEdit
from calibre.gui2.convert.regex_builder import RegexEdit from calibre.gui2.convert.regex_builder import RegexEdit
from calibre.gui2.widgets import EncodingComboBox
ret = self.get_value_handler(g) ret = self.get_value_handler(g)
if ret != 'this is a dummy return value, xcswx1avcx4x': if ret != 'this is a dummy return value, xcswx1avcx4x':
return ret return ret
@ -139,6 +140,13 @@ class Widget(QWidget):
if not ans: if not ans:
ans = None ans = None
return ans return ans
elif isinstance(g, EncodingComboBox):
ans = unicode(g.currentText()).strip()
try:
codecs.lookup(ans)
except:
ans = ''
return ans
elif isinstance(g, QComboBox): elif isinstance(g, QComboBox):
return unicode(g.currentText()) return unicode(g.currentText())
elif isinstance(g, QCheckBox): elif isinstance(g, QCheckBox):