From e02c5fe6fec7a7821cf267a99c83fc19349a0098 Mon Sep 17 00:00:00 2001 From: Olivier Keshavjee Date: Thu, 10 Mar 2016 15:35:41 +0100 Subject: [PATCH] One more bug corrected --- manuskript/load_save/version_1.py | 2 +- manuskript/settings.py | 9 ++++++--- sample-projects/book-of-acts/settings.txt | 7 ++++--- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/manuskript/load_save/version_1.py b/manuskript/load_save/version_1.py index e996927..19f84e2 100644 --- a/manuskript/load_save/version_1.py +++ b/manuskript/load_save/version_1.py @@ -49,7 +49,7 @@ characterMap = OrderedDict([ ]) # If true, logs infos while saving and loading. -LOG = True +LOG = False def formatMetaData(name, value, tabLength=10): diff --git a/manuskript/settings.py b/manuskript/settings.py index fc6065f..cffff20 100644 --- a/manuskript/settings.py +++ b/manuskript/settings.py @@ -231,10 +231,13 @@ def load(string, fromString=False, protocol=None): for i in revisions["rules"]: if i == "null": r[None] = revisions["rules"]["null"] - continue + elif i == None: - continue - r[int(i)] = revisions["rules"][i] + r[None] = revisions["rules"][None] + + else: + r[int(i)] = revisions["rules"][i] + revisions["rules"] = r if "frequencyAnalyzer" in allSettings: diff --git a/sample-projects/book-of-acts/settings.txt b/sample-projects/book-of-acts/settings.txt index d02fd20..1eca091 100644 --- a/sample-projects/book-of-acts/settings.txt +++ b/sample-projects/book-of-acts/settings.txt @@ -10,7 +10,7 @@ "corkSizeFactor": 84, "defaultTextType": "txt", "dict": "en_US", - "folderView": "text", + "folderView": "cork", "frequencyAnalyzer": { "phraseMax": 5, "phraseMin": 2, @@ -18,7 +18,7 @@ "wordMin": 1 }, "fullScreenTheme": "gentleblues", - "lastTab": 4, + "lastTab": 6, "openIndexes": [ null ], @@ -38,7 +38,8 @@ "2592000": 86400, "3600": 600, "600": 60, - "86400": 3600 + "86400": 3600, + "null": 604800 }, "smartremove": true },