From 1d4d03592bffc067793c64689a7413292ed48b96 Mon Sep 17 00:00:00 2001 From: Alex Yatskov Date: Sat, 9 Nov 2013 19:09:40 -0800 Subject: [PATCH] Adding additional encodings for autodetect, fixing line wrap bug Former-commit-id: c8c98e42b5e73f3ae293ce72432ab3530a08c48c --- yomi_base/reader.py | 1 + yomi_base/reader_util.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/yomi_base/reader.py b/yomi_base/reader.py index 879b35b..87d2bfb 100644 --- a/yomi_base/reader.py +++ b/yomi_base/reader.py @@ -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) diff --git a/yomi_base/reader_util.py b/yomi_base/reader_util.py index eb66749..067d54f 100644 --- a/yomi_base/reader_util.py +++ b/yomi_base/reader_util.py @@ -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: