Rename statusBar to mainStatus in main GUI due to conflict with Qt method (#1190)

novelwriter/core/project.py

@@ -1185,7 +1185,7 @@ class NWProject:
         information to the GUI statusbar.
         """
         self.projChanged = bValue
-        self.mainGui.statusBar.doUpdateProjectStatus(bValue)
+        self.mainGui.mainStatus.doUpdateProjectStatus(bValue)
         if bValue:
             # If we've changed the project at all, this should be True
             self.projAltered = True

novelwriter/gui/doceditor.py

@@ -740,7 +740,7 @@ class GuiDocEditor(QTextEdit):
             qApp.restoreOverrideCursor()
             afTime = time()
             logger.debug("Document highlighted in %.3f ms", 1000*(afTime-bfTime))
-            self.mainGui.statusBar.setStatus(self.tr("Spell check complete"))
+            self.mainGui.mainStatus.setStatus(self.tr("Spell check complete"))
 
         return True
 

novelwriter/guimain.py

@@ -104,7 +104,7 @@ class GuiMain(QMainWindow):
         hWd = self.mainConf.pxInt(4)
 
         # Main GUI Elements
-        self.statusBar   = GuiMainStatus(self)
+        self.mainStatus  = GuiMainStatus(self)
         self.projView    = GuiProjectView(self)
         self.novelView   = GuiNovelView(self)
         self.docEditor   = GuiDocEditor(self)
@@ -189,7 +189,7 @@ class GuiMain(QMainWindow):
         # Set Main Window Elements
         self.setMenuBar(self.mainMenu)
         self.setCentralWidget(self.mainStack)
-        self.setStatusBar(self.statusBar)
+        self.setStatusBar(self.mainStatus)
         self.addToolBar(Qt.LeftToolBarArea, self.viewsBar)
         self.setContextMenuPolicy(Qt.NoContextMenu)  # Issue #1147
 
@@ -211,8 +211,8 @@ class GuiMain(QMainWindow):
         self.novelView.selectedItemChanged.connect(self.itemDetails.updateViewBox)
         self.novelView.openDocumentRequest.connect(self._openDocument)
 
-        self.docEditor.spellDictionaryChanged.connect(self.statusBar.setLanguage)
+        self.docEditor.spellDictionaryChanged.connect(self.mainStatus.setLanguage)
-        self.docEditor.docEditedStatusChanged.connect(self.statusBar.doUpdateDocumentStatus)
+        self.docEditor.docEditedStatusChanged.connect(self.mainStatus.doUpdateDocumentStatus)
         self.docEditor.docCountsChanged.connect(self.itemDetails.updateCounts)
         self.docEditor.docCountsChanged.connect(self.projView.updateCounts)
         self.docEditor.loadDocumentTagRequest.connect(self._followTag)
@@ -254,7 +254,7 @@ class GuiMain(QMainWindow):
         keyEscape.activated.connect(self._keyPressEscape)
 
         # Forward Functions
-        self.setStatus = self.statusBar.setStatus
+        self.setStatus = self.mainStatus.setStatus
 
         # Force a show of the GUI
         self.show()
@@ -266,7 +266,7 @@ class GuiMain(QMainWindow):
         self.initMain()
         self.asProjTimer.start()
         self.asDocTimer.start()
-        self.statusBar.clearStatus()
+        self.mainStatus.clearStatus()
 
         # Handle Windows Mode
         self.showNormal()
@@ -307,7 +307,7 @@ class GuiMain(QMainWindow):
         self.outlineView.clearProject()
 
         # General
-        self.statusBar.clearStatus()
+        self.mainStatus.clearStatus()
         self._updateWindowTitle()
 
         return True
@@ -376,10 +376,10 @@ class GuiMain(QMainWindow):
             self.outlineView.openProjectTasks()
             self.rebuildIndex(beQuiet=True)
 
-            self.statusBar.setRefTime(self.theProject.projOpened)
+            self.mainStatus.setRefTime(self.theProject.projOpened)
-            self.statusBar.setProjectStatus(nwState.GOOD)
+            self.mainStatus.setProjectStatus(nwState.GOOD)
-            self.statusBar.setDocumentStatus(nwState.NONE)
+            self.mainStatus.setDocumentStatus(nwState.NONE)
-            self.statusBar.setStatus(self.tr("New project created ..."))
+            self.mainStatus.setStatus(self.tr("New project created ..."))
 
             self._updateWindowTitle(self.theProject.projName)
 
@@ -523,7 +523,7 @@ class GuiMain(QMainWindow):
         self.rebuildTrees()
         self.docEditor.setDictionaries()
         self.docEditor.toggleSpellCheck(self.theProject.spellCheck)
-        self.statusBar.setRefTime(self.theProject.projOpened)
+        self.mainStatus.setRefTime(self.theProject.projOpened)
         self.projView.openProjectTasks()
         self.novelView.openProjectTasks()
         self.outlineView.openProjectTasks()
@@ -1221,7 +1221,7 @@ class GuiMain(QMainWindow):
 
         isVisible = not self.isFocusMode
         self.treePane.setVisible(isVisible)
-        self.statusBar.setVisible(isVisible)
+        self.mainStatus.setVisible(isVisible)
         self.mainMenu.setVisible(isVisible)
         self.viewsBar.setVisible(isVisible)
 
@@ -1505,12 +1505,12 @@ class GuiMain(QMainWindow):
 
         if editIdle or userIdle:
             self.idleTime += currTime - self.idleRefTime
-            self.statusBar.setUserIdle(True)
+            self.mainStatus.setUserIdle(True)
         else:
-            self.statusBar.setUserIdle(False)
+            self.mainStatus.setUserIdle(False)
 
         self.idleRefTime = currTime
-        self.statusBar.updateTime(idleTime=self.idleTime)
+        self.mainStatus.updateTime(idleTime=self.idleTime)
 
         return
 
@@ -1519,7 +1519,7 @@ class GuiMain(QMainWindow):
         """Update the word count on the status bar.
         """
         if not self.hasProject:
-            self.statusBar.setProjectStats(0, 0)
+            self.mainStatus.setProjectStats(0, 0)
 
         self.theProject.updateWordCounts()
         if self.mainConf.incNotesWCount:
@@ -1529,7 +1529,7 @@ class GuiMain(QMainWindow):
             currWords = self.theProject.currNovelWC
             diffWords = currWords - self.theProject.lastNovelWC
 
-        self.statusBar.setProjectStats(currWords, diffWords)
+        self.mainStatus.setProjectStats(currWords, diffWords)
 
         return
 

tests/mock.py

@@ -30,7 +30,7 @@ class MockGuiMain:
         self.mainConf = None
         self.hasProject = True
         self.theProject = None
-        self.statusBar = MockStatusBar()
+        self.mainStatus = MockStatusBar()
 
         # Test Variables
         self.askResponse = True

tests/test_gui/test_gui_guimain.py

@@ -575,7 +575,7 @@ def testGuiMain_FocusFullMode(qtbot, monkeypatch, nwGUI, fncProj, mockRnd):
     # Enable focus mode
     assert nwGUI.toggleFocusMode() is True
     assert nwGUI.treePane.isVisible() is False
-    assert nwGUI.statusBar.isVisible() is False
+    assert nwGUI.mainStatus.isVisible() is False
     assert nwGUI.mainMenu.isVisible() is False
     assert nwGUI.viewsBar.isVisible() is False
     assert nwGUI.splitView.isVisible() is False
@@ -583,7 +583,7 @@ def testGuiMain_FocusFullMode(qtbot, monkeypatch, nwGUI, fncProj, mockRnd):
     # Disable focus mode
     assert nwGUI.toggleFocusMode() is True
     assert nwGUI.treePane.isVisible() is True
-    assert nwGUI.statusBar.isVisible() is True
+    assert nwGUI.mainStatus.isVisible() is True
     assert nwGUI.mainMenu.isVisible() is True
     assert nwGUI.viewsBar.isVisible() is True
     assert nwGUI.splitView.isVisible() is True

tests/test_gui/test_gui_statusbar.py

@@ -45,57 +45,57 @@ def testGuiStatusBar_Main(qtbot, monkeypatch, nwGUI, fncProj, mockRnd):
 
     # Reference Time
     refTime = time.time()
-    nwGUI.statusBar.setRefTime(refTime)
+    nwGUI.mainStatus.setRefTime(refTime)
-    assert nwGUI.statusBar.refTime == refTime
+    assert nwGUI.mainStatus.refTime == refTime
 
     # Project Status
-    nwGUI.statusBar.setProjectStatus(nwState.NONE)
+    nwGUI.mainStatus.setProjectStatus(nwState.NONE)
-    assert nwGUI.statusBar.projIcon._theCol == nwGUI.statusBar.projIcon._colNone
+    assert nwGUI.mainStatus.projIcon._theCol == nwGUI.mainStatus.projIcon._colNone
-    nwGUI.statusBar.setProjectStatus(nwState.BAD)
+    nwGUI.mainStatus.setProjectStatus(nwState.BAD)
-    assert nwGUI.statusBar.projIcon._theCol == nwGUI.statusBar.projIcon._colBad
+    assert nwGUI.mainStatus.projIcon._theCol == nwGUI.mainStatus.projIcon._colBad
-    nwGUI.statusBar.setProjectStatus(nwState.GOOD)
+    nwGUI.mainStatus.setProjectStatus(nwState.GOOD)
-    assert nwGUI.statusBar.projIcon._theCol == nwGUI.statusBar.projIcon._colGood
+    assert nwGUI.mainStatus.projIcon._theCol == nwGUI.mainStatus.projIcon._colGood
 
     # Document Status
-    nwGUI.statusBar.setDocumentStatus(nwState.NONE)
+    nwGUI.mainStatus.setDocumentStatus(nwState.NONE)
-    assert nwGUI.statusBar.docIcon._theCol == nwGUI.statusBar.docIcon._colNone
+    assert nwGUI.mainStatus.docIcon._theCol == nwGUI.mainStatus.docIcon._colNone
-    nwGUI.statusBar.setDocumentStatus(nwState.BAD)
+    nwGUI.mainStatus.setDocumentStatus(nwState.BAD)
-    assert nwGUI.statusBar.docIcon._theCol == nwGUI.statusBar.docIcon._colBad
+    assert nwGUI.mainStatus.docIcon._theCol == nwGUI.mainStatus.docIcon._colBad
-    nwGUI.statusBar.setDocumentStatus(nwState.GOOD)
+    nwGUI.mainStatus.setDocumentStatus(nwState.GOOD)
-    assert nwGUI.statusBar.docIcon._theCol == nwGUI.statusBar.docIcon._colGood
+    assert nwGUI.mainStatus.docIcon._theCol == nwGUI.mainStatus.docIcon._colGood
 
     # Idle Status
-    nwGUI.statusBar.mainConf.stopWhenIdle = False
+    nwGUI.mainStatus.mainConf.stopWhenIdle = False
-    nwGUI.statusBar.setUserIdle(True)
+    nwGUI.mainStatus.setUserIdle(True)
-    nwGUI.statusBar.updateTime()
+    nwGUI.mainStatus.updateTime()
-    assert nwGUI.statusBar.userIdle is False
+    assert nwGUI.mainStatus.userIdle is False
-    assert nwGUI.statusBar.timeText.text() == "00:00:00"
+    assert nwGUI.mainStatus.timeText.text() == "00:00:00"
 
-    nwGUI.statusBar.mainConf.stopWhenIdle = True
+    nwGUI.mainStatus.mainConf.stopWhenIdle = True
-    nwGUI.statusBar.setUserIdle(True)
+    nwGUI.mainStatus.setUserIdle(True)
-    nwGUI.statusBar.updateTime(5)
+    nwGUI.mainStatus.updateTime(5)
-    assert nwGUI.statusBar.userIdle is True
+    assert nwGUI.mainStatus.userIdle is True
-    assert nwGUI.statusBar.timeText.text() != "00:00:00"
+    assert nwGUI.mainStatus.timeText.text() != "00:00:00"
 
-    nwGUI.statusBar.setUserIdle(False)
+    nwGUI.mainStatus.setUserIdle(False)
-    nwGUI.statusBar.updateTime(5)
+    nwGUI.mainStatus.updateTime(5)
-    assert nwGUI.statusBar.userIdle is False
+    assert nwGUI.mainStatus.userIdle is False
-    assert nwGUI.statusBar.timeText.text() != "00:00:00"
+    assert nwGUI.mainStatus.timeText.text() != "00:00:00"
 
     # Language
-    nwGUI.statusBar.setLanguage("None", "None")
+    nwGUI.mainStatus.setLanguage("None", "None")
-    assert nwGUI.statusBar.langText.text() == "None"
+    assert nwGUI.mainStatus.langText.text() == "None"
-    nwGUI.statusBar.setLanguage("en", "None")
+    nwGUI.mainStatus.setLanguage("en", "None")
-    assert nwGUI.statusBar.langText.text() == "American English"
+    assert nwGUI.mainStatus.langText.text() == "American English"
 
     # Project Stats
-    nwGUI.statusBar.mainConf.incNotesWCount = False
+    nwGUI.mainStatus.mainConf.incNotesWCount = False
     nwGUI._updateStatusWordCount()
-    assert nwGUI.statusBar.statsText.text() == "Words: 9 (+9)"
+    assert nwGUI.mainStatus.statsText.text() == "Words: 9 (+9)"
-    nwGUI.statusBar.mainConf.incNotesWCount = True
+    nwGUI.mainStatus.mainConf.incNotesWCount = True
     nwGUI._updateStatusWordCount()
-    assert nwGUI.statusBar.statsText.text() == "Words: 11 (+11)"
+    assert nwGUI.mainStatus.statsText.text() == "Words: 11 (+11)"
 
-    # qtbot.stopForInteraction()
+    # qtbot.stop()
 
 # END Test testGuiStatusBar_Init