Remove some unnecessary branches and unused functions

nw/gui/dochighlight.py

@@ -102,10 +102,9 @@ class GuiDocHighlighter(QSyntaxHighlighter):
         self.colTrail  = QColor(*self.theTheme.colEmph)
         self.colTrail.setAlpha(64)
 
+        self.colEmph = None
         if self.mainConf.highlightEmph:
             self.colEmph = QColor(*self.theTheme.colEmph)
-        else:
-            self.colEmph = None
 
         self.hStyles = {
             "header1"    : self._makeFormat(self.colHead, "bold", 1.8),

nw/gui/preferences.py

@@ -806,14 +806,6 @@ class GuiConfigEditEditingTab(QWidget):
     #  Internal Functions
     ##
 
-    def _disableComboItem(self, theList, theValue):
-        """Disable a list item in the combo box.
-        """
-        theModel = theList.model()
-        anItem = theModel.item(1)
-        anItem.setFlags(anItem.flags() ^ Qt.ItemIsEnabled)
-        return theModel
-
     def _doUpdateSpellTool(self, currIdx):
         """Update the list of dictionaries based on spell tool selected.
         """

nw/gui/projload.py

@@ -155,14 +155,14 @@ class GuiProjectLoad(QDialog):
         logger.verbose("GuiProjectLoad open button clicked")
         self._saveSettings()
 
+        self.openPath = None
+        self.openState = self.NONE_STATE
+
         selItems = self.listBox.selectedItems()
         if selItems:
             self.openPath = selItems[0].data(self.C_NAME, Qt.UserRole)
             self.openState = self.OPEN_STATE
             self.accept()
-        else:
-            self.openPath = None
-            self.openState = self.NONE_STATE
 
         return
 

nw/gui/statusbar.py

@@ -130,6 +130,7 @@ class GuiMainStatus(QStatusBar):
         """Reset all widgets on the status bar to default values.
         """
         self.setRefTime(None)
+        self.setLanguage(None)
         self.setStats(0, 0)
         self.setProjectStatus(None)
         self.setDocumentStatus(None)
@@ -234,15 +235,14 @@ class StatusLED(QAbstractButton):
     def setState(self, theState):
         """Set the colour state.
         """
-        if theState is None:
+        self._theCol = self.colNone
-            self._theCol = self.colNone
+        if theState is True:
-        elif theState:
             self._theCol = self.colTrue
-        elif not theState:
+        elif theState is False:
             self._theCol = self.colFalse
-        else:
+
-            self._theCol = self.colNone
         self.update()
+
         return
 
     ##

tests/reference/guiEditor_Main_Final_0e17daca5f3e1.nwd

@@ -21,7 +21,7 @@
 
 This is a paragraph of dummy text.
 
-This is another paragraph of much longer dummy text. It is in fact very very dumb dummy text! We can also try replacing “quotes”, even single ‘quotes’ are replaced. Isn’t that nice? We can hyphen-ate, make dashes – and even longer dashes — if we want. Ellipsis? Not a problem either … How about three hyphens — for long dash? It works too.
+This is another paragraph of much longer dummy text. It is in fact 1 very very DUMB dummy text! We can also try replacing “quotes”, even single ‘quotes’ are replaced. Isn’t that nice? We can hyphen-ate, make dashes – and even longer dashes — if we want. Ellipsis? Not a problem either … How about three hyphens — for long dash? It works too.
 
 “Full line double quoted text.”
 

tests/reference/guiEditor_Main_Final_nwProject.nwx

@@ -14,8 +14,8 @@
     <autoOutline>True</autoOutline>
     <lastEdited>0e17daca5f3e1</lastEdited>
     <lastViewed>None</lastViewed>
-    <lastWordCount>113</lastWordCount>
+    <lastWordCount>114</lastWordCount>
-    <novelWordCount>86</novelWordCount>
+    <novelWordCount>87</novelWordCount>
     <notesWordCount>27</notesWordCount>
     <autoReplace/>
     <titleFormat>
@@ -84,10 +84,10 @@
       <status>New</status>
       <exported>True</exported>
       <layout>SCENE</layout>
-      <charCount>464</charCount>
+      <charCount>466</charCount>
-      <wordCount>82</wordCount>
+      <wordCount>83</wordCount>
       <paraCount>4</paraCount>
-      <cursorPos>602</cursorPos>
+      <cursorPos>604</cursorPos>
     </item>
     <item handle="44cb730c42048" order="1" parent="None">
       <name>Plot</name>

tests/test_gui_doceditor.py

@@ -230,7 +230,7 @@ def testGuiEditor_Main(qtbot, monkeypatch, nwGUI, fncDir, fncProj, refDir, outDi
 
     for c in (
         "This is another paragraph of much longer dummy text. "
-        "It is in fact very very dumb dummy text! "
+        "It is in fact 1 very very DUMB dummy text! "
     ):
         qtbot.keyClick(nwGUI.docEditor, c, delay=typeDelay)
     for c in "We can also try replacing \"quotes\", even single 'quotes' are replaced. ":

tests/test_gui_preferences.py

@@ -209,6 +209,7 @@ def testGuiPreferences_Main(qtbot, monkeypatch, fncDir, outDir, refDir):
 
     # Save and Check Config
     qtbot.mouseClick(nwPrefs.buttonBox.button(QDialogButtonBox.Ok), Qt.LeftButton)
+    nwPrefs._doClose()
 
     assert theConf.confChanged
     theConf.lastPath = ""