From 8dbbf3d6fcbbebcdbbcc737db7413f3b689664ca Mon Sep 17 00:00:00 2001 From: Alex Yatskov Date: Fri, 30 Jan 2015 18:42:18 +0900 Subject: [PATCH] Add some initial text to the text area, text area is now editable by default Former-commit-id: 9141971f189946f62c664e9065e48a5af1763042 --- ui/reader.ui | 3 +++ yomi_base/defaults.json | 2 +- yomi_base/gen/about_ui.py | 2 +- yomi_base/gen/preferences_ui.py | 2 +- yomi_base/gen/reader_ui.py | 3 ++- yomi_base/gen/resources_rc.py | 2 +- 6 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ui/reader.ui b/ui/reader.ui index a88af2f..3e7e6e2 100644 --- a/ui/reader.ui +++ b/ui/reader.ui @@ -30,6 +30,9 @@ true + + Paste text here or open a .txt file you want to read! + diff --git a/yomi_base/defaults.json b/yomi_base/defaults.json index 29e7e3c..fcf3347 100644 --- a/yomi_base/defaults.json +++ b/yomi_base/defaults.json @@ -12,5 +12,5 @@ "stripReadings": false, "tags": [], "wordWrap": false, - "allowEditing": false + "allowEditing": true } diff --git a/yomi_base/gen/about_ui.py b/yomi_base/gen/about_ui.py index 81990bd..6dc7715 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: Fri Jan 30 18:21:34 2015 +# Created: Fri Jan 30 18:40:48 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 e58d45c..502a7c9 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: Fri Jan 30 18:21:34 2015 +# Created: Fri Jan 30 18:40:48 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/reader_ui.py b/yomi_base/gen/reader_ui.py index fcd82a7..e5fdd85 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: Fri Jan 30 18:21:34 2015 +# Created: Fri Jan 30 18:40:48 2015 # by: PyQt4 UI code generator 4.10.4 # # WARNING! All changes made in this file will be lost! @@ -263,6 +263,7 @@ class Ui_MainWindowReader(object): def retranslateUi(self, MainWindowReader): MainWindowReader.setWindowTitle(_translate("MainWindowReader", "Yomichan", None)) + self.textContent.setPlainText(_translate("MainWindowReader", "Paste text here or open a .txt file you want to read!", None)) self.menuFile.setTitle(_translate("MainWindowReader", "&File", None)) self.menuOpenRecent.setTitle(_translate("MainWindowReader", "Open &recent", None)) self.menuImport.setTitle(_translate("MainWindowReader", "&Import", None)) diff --git a/yomi_base/gen/resources_rc.py b/yomi_base/gen/resources_rc.py index 9818498..7bd5407 100644 --- a/yomi_base/gen/resources_rc.py +++ b/yomi_base/gen/resources_rc.py @@ -2,7 +2,7 @@ # Resource object code # -# Created: Fri Jan 30 18:21:34 2015 +# Created: Fri Jan 30 18:40:48 2015 # by: The Resource Compiler for PyQt (Qt v4.8.6) # # WARNING! All changes made in this file will be lost!