diff --git a/ui/preferences.ui b/ui/preferences.ui index f38a975..043b623 100644 --- a/ui/preferences.ui +++ b/ui/preferences.ui @@ -146,6 +146,13 @@ + + + + Allow editing + + + diff --git a/yomi_base/defaults.json b/yomi_base/defaults.json index 2b0e2aa..29e7e3c 100644 --- a/yomi_base/defaults.json +++ b/yomi_base/defaults.json @@ -11,5 +11,6 @@ "scanLength": 16, "stripReadings": false, "tags": [], - "wordWrap": false + "wordWrap": false, + "allowEditing": false } diff --git a/yomi_base/gen/about_ui.py b/yomi_base/gen/about_ui.py index 9e5b57f..81990bd 100644 --- a/yomi_base/gen/about_ui.py +++ b/yomi_base/gen/about_ui.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'ui/about.ui' # -# Created: Wed Dec 24 17:04:45 2014 +# Created: Fri Jan 30 18:21:34 2015 # by: PyQt4 UI code generator 4.10.4 # # WARNING! All changes made in this file will be lost! diff --git a/yomi_base/gen/preferences_ui.py b/yomi_base/gen/preferences_ui.py index 4990f83..e58d45c 100644 --- a/yomi_base/gen/preferences_ui.py +++ b/yomi_base/gen/preferences_ui.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'ui/preferences.ui' # -# Created: Wed Dec 24 17:04:45 2014 +# Created: Fri Jan 30 18:21:34 2015 # by: PyQt4 UI code generator 4.10.4 # # WARNING! All changes made in this file will be lost! @@ -104,6 +104,9 @@ class Ui_DialogPreferences(object): self.textSample = QtGui.QPlainTextEdit(self.tabAppearance) self.textSample.setObjectName(_fromUtf8("textSample")) self.verticalLayout_3.addWidget(self.textSample) + self.checkAllowEditing = QtGui.QCheckBox(self.tabAppearance) + self.checkAllowEditing.setObjectName(_fromUtf8("checkAllowEditing")) + self.verticalLayout_3.addWidget(self.checkAllowEditing) self.tabWidget.addTab(self.tabAppearance, _fromUtf8("")) self.tabAnki = QtGui.QWidget() self.tabAnki.setEnabled(False) @@ -191,6 +194,7 @@ class Ui_DialogPreferences(object): self.buttonColorFg.setText(_translate("DialogPreferences", "Foreground...", None)) self.buttonColorBg.setText(_translate("DialogPreferences", "Background...", None)) self.textSample.setPlainText(_translate("DialogPreferences", "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam accumsan nisi a leo faucibus ut varius velit fringilla. Cras hendrerit eleifend porttitor. Quisque eu elit quis tellus hendrerit ornare et ac tellus. Nunc id felis ut sapien blandit viverra vel ac est. Ut erat lorem, rutrum at scelerisque sollicitudin, lacinia quis diam. Suspendisse potenti. Integer id justo ac ligula aliquet mattis. Etiam malesuada faucibus risus, vel hendrerit elit consectetur quis. Etiam consectetur ipsum ut odio feugiat suscipit. Etiam a tellus metus. ", None)) + self.checkAllowEditing.setText(_translate("DialogPreferences", "Allow editing", None)) self.tabWidget.setTabText(self.tabWidget.indexOf(self.tabAppearance), _translate("DialogPreferences", "Appearance", None)) self.label.setText(_translate("DialogPreferences", "Displayed profile", None)) self.radioButtonVocab.setText(_translate("DialogPreferences", "Vocabulary", None)) diff --git a/yomi_base/gen/reader_ui.py b/yomi_base/gen/reader_ui.py index 5a840a6..fcd82a7 100644 --- a/yomi_base/gen/reader_ui.py +++ b/yomi_base/gen/reader_ui.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'ui/reader.ui' # -# Created: Wed Dec 24 17:04:45 2014 +# Created: Fri Jan 30 18:21:34 2015 # by: PyQt4 UI code generator 4.10.4 # # WARNING! All changes made in this file will be lost! diff --git a/yomi_base/gen/resources_rc.py b/yomi_base/gen/resources_rc.py index cee9d53..9818498 100644 --- a/yomi_base/gen/resources_rc.py +++ b/yomi_base/gen/resources_rc.py @@ -2,7 +2,7 @@ # Resource object code # -# Created: Wed Dec 24 17:04:45 2014 +# Created: Fri Jan 30 18:21:34 2015 # by: The Resource Compiler for PyQt (Qt v4.8.6) # # WARNING! All changes made in this file will be lost! diff --git a/yomi_base/preferences.py b/yomi_base/preferences.py index cfa79dc..311d320 100644 --- a/yomi_base/preferences.py +++ b/yomi_base/preferences.py @@ -45,6 +45,7 @@ class DialogPreferences(QtGui.QDialog, gen.preferences_ui.Ui_DialogPreferences): def dataToDialog(self): self.checkCheckForUpdates.setChecked(self.preferences['checkForUpdates']) + self.checkAllowEditing.setChecked(self.preferences['allowEditing']) self.checkLoadRecentFile.setChecked(self.preferences['loadRecentFile']) self.checkStripReadings.setChecked(self.preferences['stripReadings']) self.spinMaxResults.setValue(self.preferences['maxResults']) @@ -63,6 +64,7 @@ class DialogPreferences(QtGui.QDialog, gen.preferences_ui.Ui_DialogPreferences): def dialogToData(self): self.preferences['checkForUpdates'] = self.checkCheckForUpdates.isChecked() + self.preferences['allowEditing'] = self.checkAllowEditing.isChecked() self.preferences['loadRecentFile'] = self.checkLoadRecentFile.isChecked() self.preferences['maxResults'] = self.spinMaxResults.value() self.preferences['scanLength'] = self.spinScanLength.value() diff --git a/yomi_base/reader.py b/yomi_base/reader.py index d6b5037..fc81205 100644 --- a/yomi_base/reader.py +++ b/yomi_base/reader.py @@ -112,6 +112,9 @@ class MainWindowReader(QtGui.QMainWindow, gen.reader_ui.Ui_MainWindowReader): palette.setColor(QtGui.QPalette.Text, QtGui.QColor(self.preferences['fgColor'])) self.textContent.setPalette(palette) + self.textContent.setReadOnly(not self.preferences['allowEditing']) + self.textContent.setAttribute(QtCore.Qt.WA_InputMethodEnabled) + font = self.textContent.font() font.setFamily(self.preferences['fontFamily']) font.setPointSize(self.preferences['fontSize'] + self.zoom)