Reproog/novelWriter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' into novel_tab

Browse Source
This commit is contained in:
Veronica K. B. Olsen
2021-01-03 17:17:30 +01:00
parent 0b7e4d594e b6e18e70bc
commit 323ab5498b
46 changed files with 168 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nw/core/document.py
+1 -1
View File
@@ -9,7 +9,7 @@
Created: 2018-09-29 [0.0.1]
This file is a part of novelWriter
Copyright 2018–2020, Veronica Berglyd Olsen
Copyright 2018–2021, Veronica Berglyd Olsen
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
nw/core/index.py
+8 -13
View File
@@ -9,7 +9,7 @@
Created: 2019-05-27 [0.1.4]
This file is a part of novelWriter
Copyright 2018–2020, Veronica Berglyd Olsen
Copyright 2018–2021, Veronica Berglyd Olsen
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -156,16 +156,11 @@ class NWIndex():
logger.error(str(e))
return False
if "tagIndex" in theData.keys():
self._tagIndex = theData["tagIndex"]
if "refIndex" in theData.keys():
self._refIndex = theData["refIndex"]
if "novelIndex" in theData.keys():
self._novelIndex = theData["novelIndex"]
if "noteIndex" in theData.keys():
self._noteIndex = theData["noteIndex"]
if "textCounts" in theData.keys():
self._textCounts = theData["textCounts"]
self._tagIndex = theData.get("tagIndex", {})
self._refIndex = theData.get("refIndex", {})
self._novelIndex = theData.get("novelIndex", {})
self._noteIndex = theData.get("noteIndex", {})
self._textCounts = theData.get("textCounts", {})
nowTime = round(time())
self._timeNovel = nowTime
@@ -234,6 +229,7 @@ class NWIndex():
except Exception:
self.indexBroken = True
logger.debug("Index check complete")
if self.indexBroken:
self.clearIndex()
self.theParent.makeAlert(
@@ -604,8 +600,7 @@ class NWIndex():
return theRefs
for refTitle in self._refIndex[tHandle]:
theTags = self._refIndex[tHandle][refTitle].get("tags", None)
for aTag in theTags:
for aTag in self._refIndex[tHandle][refTitle].get("tags", []):
if len(aTag) == 3 and (sTitle is None or sTitle == refTitle):
theRefs[aTag[1]].append(aTag[2])
nw/core/item.py
+1 -1
View File
@@ -9,7 +9,7 @@
Created: 2018-10-27 [0.0.1]
This file is a part of novelWriter
Copyright 2018–2020, Veronica Berglyd Olsen
Copyright 2018–2021, Veronica Berglyd Olsen
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
nw/core/options.py
+1 -1
View File
@@ -10,7 +10,7 @@
Rewritten: 2020-02-19 [0.4.5]
This file is a part of novelWriter
Copyright 2018–2020, Veronica Berglyd Olsen
Copyright 2018–2021, Veronica Berglyd Olsen
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
nw/core/project.py
+1 -1
View File
@@ -9,7 +9,7 @@
Created: 2018-09-29 [0.0.1]
This file is a part of novelWriter
Copyright 2018–2020, Veronica Berglyd Olsen
Copyright 2018–2021, Veronica Berglyd Olsen
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
nw/core/spellcheck.py
+1 -1
View File
@@ -9,7 +9,7 @@
Created: 2019-06-11 [0.1.5]
This file is a part of novelWriter
Copyright 2018–2020, Veronica Berglyd Olsen
Copyright 2018–2021, Veronica Berglyd Olsen
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
nw/core/status.py
+1 -1
View File
@@ -9,7 +9,7 @@
Created: 2019-05-19 [0.1.3]
This file is a part of novelWriter
Copyright 2018–2020, Veronica Berglyd Olsen
Copyright 2018–2021, Veronica Berglyd Olsen
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
nw/core/tohtml.py
+1 -1
View File
@@ -9,7 +9,7 @@
Created: 2019-05-07 [0.0.1]
This file is a part of novelWriter
Copyright 2018–2020, Veronica Berglyd Olsen
Copyright 2018–2021, Veronica Berglyd Olsen
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
nw/core/tokenizer.py
+1 -1
View File
@@ -9,7 +9,7 @@
Created: 2019-05-05 [0.0.1]
This file is a part of novelWriter
Copyright 2018–2020, Veronica Berglyd Olsen
Copyright 2018–2021, Veronica Berglyd Olsen
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
nw/core/tools.py
+1 -1
View File
@@ -12,7 +12,7 @@
Created: 2020-07-05 [0.10.0] numberToRoman
This file is a part of novelWriter
Copyright 2018–2020, Veronica Berglyd Olsen
Copyright 2018–2021, Veronica Berglyd Olsen
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
nw/core/tree.py
+1 -1
View File
@@ -9,7 +9,7 @@
Created: 2020-05-07 [0.4.5]
This file is a part of novelWriter
Copyright 2018–2020, Veronica Berglyd Olsen
Copyright 2018–2021, Veronica Berglyd Olsen
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by