Project class should not contain any GUI elements. Status icons moved to main GUI class.

nw/gui/docdetails.py

@@ -35,6 +35,7 @@ class GuiDocDetails(QFrame):
         logger.debug("Initialising DocDetails ...")
         self.mainConf   = nw.CONFIG
         self.debugGUI   = self.mainConf.debugGUI
+        self.theParent  = theParent
         self.theProject = theProject
 
         self.mainBox = QGridLayout(self)
@@ -70,11 +71,11 @@ class GuiDocDetails(QFrame):
             colTwo = [""]*4
         else:
             itemStatus = nwItem.itemStatus
-            if itemStatus < 0 or itemStatus >= len(self.theProject.statusLabels):
+            if itemStatus < 0 or itemStatus >= len(self.theParent.statusLabels):
                 itemStatus = 0
             colTwo = [
                 nwItem.itemName,
-                self.theProject.statusLabels[itemStatus],
+                self.theParent.statusLabels[itemStatus],
                 nwLabels.CLASS_NAME[nwItem.itemClass],
                 nwLabels.LAYOUT_NAME[nwItem.itemLayout],
             ]

nw/gui/doctree.py

@@ -252,12 +252,12 @@ class GuiDocTree(QTreeWidget):
         if nwItem.itemType == nwItemType.FILE:
             tStatus += "."+nwLabels.LAYOUT_FLAG[nwItem.itemLayout]
         nStatus = nwItem.itemStatus
-        if nStatus < 0 or nStatus >= len(self.theProject.statusIcons):
+        if nStatus < 0 or nStatus >= len(self.theParent.statusIcons):
             nStatus = 0
 
         trItem.setText(self.C_NAME,tName)
         trItem.setText(self.C_FLAGS,tStatus)
-        trItem.setIcon(self.C_FLAGS,self.theProject.statusIcons[nStatus])
+        trItem.setIcon(self.C_FLAGS,self.theParent.statusIcons[nStatus])
 
         return
 

nw/gui/winmain.py

@@ -15,7 +15,7 @@ import nw
 
 from os                   import path
 from PyQt5.QtWidgets      import QWidget, QMainWindow, QVBoxLayout, QFrame, QSplitter, QFileDialog, QStackedWidget, QShortcut, QMessageBox
-from PyQt5.QtGui          import QIcon
+from PyQt5.QtGui          import QIcon, QPixmap, QColor
 from PyQt5.QtCore         import Qt, QTimer
 
 from nw.gui.doctree       import GuiDocTree
@@ -57,6 +57,10 @@ class GuiMain(QMainWindow):
         self.mainMenu   = GuiMainMenu(self, self.theProject)
         self.statusBar  = GuiMainStatus(self)
 
+        # Minor Gui Elements
+        self.statusIcons  = []
+        self.statusLabels = []
+
         # Assemble Main Window
         self.stackPane = QStackedWidget()
         self.stackNone = self.stackPane.addWidget(QWidget())
@@ -82,7 +86,7 @@ class GuiMain(QMainWindow):
         self.treeView.itemSelectionChanged.connect(self._treeSingleClick)
         self.treeView.itemDoubleClicked.connect(self._treeDoubleClick)
         self.treeView.buildTree()
-        QShortcut(Qt.Key_Return, self.treeView, context=Qt.WidgetShortcut, activated=self._treeKeyPressReturn)
+        self._makeStatusIcons()
 
         # Set Main Window Elements
         self.setMenuBar(self.mainMenu)
@@ -106,6 +110,13 @@ class GuiMain(QMainWindow):
         self.asDocTimer.timeout.connect(self._autoSaveDocument)
         self.asDocTimer.start()
 
+        # Keyboard Shortcuts
+        QShortcut(Qt.Key_Return, self.treeView, context=Qt.WidgetShortcut, activated=self._treeKeyPressReturn)
+
+        # Forward Functions
+        self.setStatus        = self.statusBar.setStatus
+        self.setProjectStatus = self.statusBar.setProjectStatus
+
         if self.mainConf.showGUI:
             self.show()
 
@@ -162,6 +173,7 @@ class GuiMain(QMainWindow):
         self.treeView.buildTree()
         self.mainMenu.updateRecentProjects()
         self._setWindowTitle(self.theProject.projName)
+        self._makeStatusIcons()
         return True
 
     def saveProject(self):
@@ -340,6 +352,16 @@ class GuiMain(QMainWindow):
             return False
         return True
 
+    def _makeStatusIcons(self):
+        self.statusIcons  = []
+        self.statusLabels = []
+        for sLabel, sR, sG, sB in self.theProject.statusCols:
+            theIcon = QPixmap(32,32)
+            theIcon.fill(QColor(sR,sG,sB))
+            self.statusIcons.append(QIcon(theIcon))
+            self.statusLabels.append(sLabel)
+        return
+
     ##
     #  Events
     ##