Core classes should only init with project class and if needed access main gui via project

nw/core/document.py

@@ -38,10 +38,10 @@ logger = logging.getLogger(__name__)
 
 class NWDoc():
 
-    def __init__(self, theProject, theParent):
+    def __init__(self, theProject):
 
         self.theProject = theProject
-        self.theParent  = theParent
+        self.theParent  = theProject.theParent
 
         # Internal Variables
         self._theItem   = None # The currently open item

nw/core/index.py

@@ -32,7 +32,7 @@ import os
 
 from time import time
 
-from nw.enum import nwItemType, nwItemClass, nwItemLayout, nwAlert
+from nw.enum import nwItemType, nwItemClass, nwItemLayout
 from nw.common import isHandle, isTitleTag, isItemClass, isItemLayout
 from nw.constants import nwFiles, nwKeyWords, nwUnicode
 from nw.core.document import NWDoc
@@ -44,12 +44,11 @@ class NWIndex():
     H_VALID = ("H0", "H1", "H2", "H3", "H4")
     H_LEVEL = {"H0": 0, "H1": 1, "H2": 2, "H3": 3, "H4": 4}
 
-    def __init__(self, theProject, theParent):
+    def __init__(self, theProject):
 
         # Internal
         self.mainConf    = nw.CONFIG
         self.theProject  = theProject
-        self.theParent   = theParent
         self.indexBroken = False
 
         # Indices
@@ -116,7 +115,7 @@ class NWIndex():
         if tItem.itemType != nwItemType.FILE:
             return False
 
-        theDoc = NWDoc(self.theProject, self.theParent)
+        theDoc = NWDoc(self.theProject)
         theText = theDoc.readDocument(tHandle)
         if theText:
             self.scanText(tHandle, theText)
@@ -157,10 +156,6 @@ class NWIndex():
                 logger.error("Failed to load index file")
                 nw.logException()
                 self.indexBroken = True
-                self.theParent.makeAlert(
-                    "Could not load cached index file. Rebuilding index.",
-                    nwAlert.WARN
-                )
                 return False
 
             self._tagIndex   = theData.get("tagIndex", {})

nw/core/project.py

@@ -266,7 +266,7 @@ class NWProject():
             titlePage = "%s%s %s\n" % (titlePage, self.tr("By"), self.getAuthors())
 
         # Document object for writing files
-        aDoc = NWDoc(self, self.theParent)
+        aDoc = NWDoc(self)
 
         if popMinimal:
             # Creating a minimal project with a few root folders and a
@@ -1393,7 +1393,7 @@ class NWProject():
             return
 
         # Handle orphans
-        aDoc = NWDoc(self, self.theParent)
+        aDoc = NWDoc(self)
         nOrph = 0
         noWhere = False
         oPrefix = self.tr("Recovered")

nw/core/tohtml.py

@@ -37,8 +37,8 @@ class ToHtml(Tokenizer):
     M_EXPORT  = 1 # Tweak output for saving to HTML or printing
     M_EBOOK   = 2 # Tweak output for converting to epub
 
-    def __init__(self, theProject, theParent):
-        Tokenizer.__init__(self, theProject, theParent)
+    def __init__(self, theProject):
+        Tokenizer.__init__(self, theProject)
 
         self.genMode   = self.M_EXPORT
         self.cssStyles = True

nw/core/tokenizer.py

@@ -76,10 +76,10 @@ class Tokenizer():
     A_Z_TOPMRG = 0x0100 # Zero top margin
     A_Z_BTMMRG = 0x0200 # Zero bottom margin
 
-    def __init__(self, theProject, theParent):
+    def __init__(self, theProject):
 
         self.theProject = theProject
-        self.theParent  = theParent
+        self.theParent  = theProject.theParent
 
         # Data Variables
         self.theText     = ""   # The raw text to be tokenized
@@ -284,7 +284,7 @@ class Tokenizer():
             self.theText = theText
         else:
             # Otherwise, load it from file
-            theDoc  = NWDoc(self.theProject, self.theParent)
+            theDoc  = NWDoc(self.theProject)
             theText = theDoc.readDocument(theHandle)
             if theText:
                 self.theText = theText

nw/core/tomd.py

@@ -36,8 +36,8 @@ class ToMarkdown(Tokenizer):
     M_STD = 0 # Standard Markdown
     M_GH  = 1 # GitHub Markdown
 
-    def __init__(self, theProject, theParent):
-        Tokenizer.__init__(self, theProject, theParent)
+    def __init__(self, theProject):
+        Tokenizer.__init__(self, theProject)
 
         self.genMode = self.M_STD
         self.fullMD = []

nw/core/toodt.py

@@ -65,8 +65,8 @@ class ToOdt(Tokenizer):
     X_BRK = 0x08 # Line break
     X_TAB = 0x10 # Tab
 
-    def __init__(self, theProject, theParent, isFlat):
-        Tokenizer.__init__(self, theProject, theParent)
+    def __init__(self, theProject, isFlat):
+        Tokenizer.__init__(self, theProject)
 
         self.mainConf = nw.CONFIG