1

Adding additional encodings for autodetect, fixing line wrap bug

Former-commit-id: c8c98e42b5e73f3ae293ce72432ab3530a08c48c
This commit is contained in:
Alex Yatskov 2013-11-09 19:09:40 -08:00
parent c8d6ec9cd7
commit 1d4d03592b
2 changed files with 2 additions and 1 deletions

View File

@ -112,6 +112,7 @@ class MainWindowReader(QtGui.QMainWindow, reader_ui.Ui_MainWindowReader):
font = self.textContent.font()
font.setFamily(self.preferences.uiContentFontFamily)
font.setPointSize(self.preferences.uiContentFontSize + self.zoom)
self.textContent.setLineWrapMode(self.preferences.uiContentWordWrap)
self.textContent.setFont(font)
self.actionToggleWrap.setChecked(self.preferences.uiContentWordWrap)

View File

@ -21,7 +21,7 @@ import re
def decodeContent(content):
encodings = ['utf-8', 'shift_jis', 'utf-16']
encodings = ['utf-8', 'shift_jis', 'euc-jp', 'utf-16']
errors = dict()
for encoding in encodings: