From 5226adca6724439c27460a2443b0f39c43484dec Mon Sep 17 00:00:00 2001 From: felixvd Date: Thu, 12 Feb 2015 13:14:31 +0900 Subject: [PATCH] Basics for persistent text box functionality MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Text is saved in the JSON upon closing and loaded on startup if the flag “rememberTextBoxContent” is true (default). Text seems to be escaped automatically for export into the JSON. Tested with quote characters only. Missing the UI for controlling this feature, as discussed. Former-commit-id: 77c46388edc0a25e36ae8d2538448f1c1e61c069 --- yomi_base/defaults.json | 4 +++- yomi_base/reader.py | 6 +++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/yomi_base/defaults.json b/yomi_base/defaults.json index 41181d6..9c6d364 100644 --- a/yomi_base/defaults.json +++ b/yomi_base/defaults.json @@ -4,10 +4,12 @@ "fgColor": 4278190080, "fontFamily": "Arial", "fontSize": 12, - "loadRecentFile": true, + "rememberTextBoxContent": true, + "loadRecentFile": false, "maxResults": 20, "profiles": {}, "recentFiles": [], + "textBoxContent": "", "scanLength": 16, "stripReadings": false, "tags": [], diff --git a/yomi_base/reader.py b/yomi_base/reader.py index 084fbb8..eb467e8 100644 --- a/yomi_base/reader.py +++ b/yomi_base/reader.py @@ -60,7 +60,9 @@ class MainWindowReader(QtGui.QMainWindow, gen.reader_ui.Ui_MainWindowReader): self.updateVocabDefs() self.updateKanjiDefs() - if filename is not None: + if self.preferences['rememberTextBoxContent']: + self.textContent.setPlainText(self.preferences['textBoxContent']) + elif filename is not None: self.openFile(filename) elif self.preferences['loadRecentFile']: filenames = self.preferences.recentFiles() @@ -133,6 +135,8 @@ class MainWindowReader(QtGui.QMainWindow, gen.reader_ui.Ui_MainWindowReader): def closeEvent(self, event): + if self.preferences['rememberTextBoxContent']: # Before closeFile() because that clears the window + self.preferences['textBoxContent'] = unicode(self.textContent.toPlainText()) self.closeFile() self.preferences['windowState'] = str(self.saveState().toBase64()) self.preferences.save()