From a7813b9acdc1743f3b1813038a552384e723f8e9 Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alex@foosoft.net>
Date: Sun, 15 Feb 2015 13:25:45 +0900
Subject: [PATCH] Minor fixups

Former-commit-id: 7e6057db62be3251f7f8ffffbbc7d054e92eb1b6
---
 yomi_base/defaults.json |  4 ++--
 yomi_base/reader.py     | 11 ++++++-----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/yomi_base/defaults.json b/yomi_base/defaults.json
index 9c6d364..fdb8c61 100644
--- a/yomi_base/defaults.json
+++ b/yomi_base/defaults.json
@@ -4,12 +4,12 @@
     "fgColor": 4278190080,
     "fontFamily": "Arial",
     "fontSize": 12,
-    "rememberTextBoxContent": true,
+    "rememberTextContent": false,
     "loadRecentFile": false,
     "maxResults": 20,
     "profiles": {},
     "recentFiles": [],
-    "textBoxContent": "",
+    "textContent": "",
     "scanLength": 16,
     "stripReadings": false,
     "tags": [],
diff --git a/yomi_base/reader.py b/yomi_base/reader.py
index eb467e8..fa8a9f3 100644
--- a/yomi_base/reader.py
+++ b/yomi_base/reader.py
@@ -60,10 +60,10 @@ class MainWindowReader(QtGui.QMainWindow, gen.reader_ui.Ui_MainWindowReader):
         self.updateVocabDefs()
         self.updateKanjiDefs()
 
-        if self.preferences['rememberTextBoxContent']:
-            self.textContent.setPlainText(self.preferences['textBoxContent'])
-        elif filename is not None:
+        if filename is not None:
             self.openFile(filename)
+        elif self.preferences['rememberTextContent']:
+            self.textContent.setPlainText(self.preferences['textContent'])
         elif self.preferences['loadRecentFile']:
             filenames = self.preferences.recentFiles()
             if len(filenames) > 0 and os.path.isfile(filenames[0]):
@@ -135,8 +135,6 @@ 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()
@@ -381,6 +379,9 @@ class MainWindowReader(QtGui.QMainWindow, gen.reader_ui.Ui_MainWindowReader):
 
 
     def closeFile(self):
+        if self.preferences['rememberTextContent']:
+            self.preferences['textContent'] = unicode(self.textContent.toPlainText())
+
         self.setWindowTitle('Yomichan')
         self.textContent.setPlainText(unicode())
         self.updateRecentFile(False)