Merge branch 'main' into new_project_wizard

This commit is contained in:
Veronica K. B. Olsen
2020-08-09 16:17:40 +02:00
32 changed files with 446 additions and 249 deletions
+6 -5
View File
@@ -28,7 +28,7 @@
import logging
import nw
from os import path, mkdir, rename, unlink
from os import path, rename, unlink
from nw.core.item import NWItem
from nw.constants import nwAlert
@@ -44,10 +44,11 @@ class NWDoc():
self.mainConf = nw.CONFIG
self.theProject = theProject
self.theParent = theParent
self.theItem = None
self.docHandle = None
self.fileLoc = None
self.docMeta = ""
self.theItem = None
self.docHandle = None
self.fileLoc = None
self.docMeta = ""
# Internal Mapping
self.makeAlert = self.theParent.makeAlert
+1
View File
@@ -58,6 +58,7 @@ class OptionState():
"hideZeros",
"hideNegative",
"groupByDay",
"histMax",
},
"GuiDocSplit": {
"spLevel",
-1
View File
@@ -195,7 +195,6 @@ class NWSpellEnchant(NWSpellCheck):
class NWSpellEnchantDummy:
"""Fallback for when Enchant is selected, but not installed.
"""
def __init__(self):
return
-3
View File
@@ -227,7 +227,6 @@ class Tokenizer():
"""Set the text for the tokenizer from a handle. If theText is
not set, load it from the file.
"""
self.theHandle = theHandle
self.theItem = self.theProject.projTree[theHandle]
if self.theItem is None:
@@ -308,7 +307,6 @@ class Tokenizer():
4: The internal formatting map of the text, self.FMT_*
5: The style of the block, self.A_*
"""
# RegExes for adding formatting tags within text lines
rxFormats = [
(QRegularExpression(nwRegEx.FMT_I), [None, self.FMT_I_B, None, self.FMT_I_E]),
@@ -457,7 +455,6 @@ class Tokenizer():
"""Apply formatting to the text headers according to document
layout and user settings.
"""
# No special header formatting for notes and no-layout files
if self.isNone or self.isNote:
return
-2
View File
@@ -30,8 +30,6 @@
import logging
import nw
from os import path, unlink, rmdir
logger = logging.getLogger(__name__)
# =============================================================================================== #