Fix minor issues and clean up class inits

novelwriter/core/document.py

@@ -33,7 +33,7 @@
 logger = logging.getLogger(__name__)
 
 
-class NWDoc():
+class NWDoc:
 
     def __init__(self, theProject, theHandle):
 

novelwriter/core/item.py

@@ -36,7 +36,7 @@
 logger = logging.getLogger(__name__)
 
 
-class NWItem():
+class NWItem:
 
     def __init__(self, theProject):
 

novelwriter/core/options.py

@@ -63,7 +63,7 @@
 }
 
 
-class OptionState():
+class OptionState:
 
     def __init__(self, theProject):
         self.theProject = theProject

novelwriter/core/project.py

@@ -52,7 +52,7 @@
 logger = logging.getLogger(__name__)
 
 
-class NWProject():
+class NWProject:
 
     FILE_VERSION = "1.4"  # The current project file format version
 

novelwriter/core/spellcheck.py

@@ -33,7 +33,7 @@
 logger = logging.getLogger(__name__)
 
 
-class NWSpellEnchant():
+class NWSpellEnchant:
 
     def __init__(self):
 

novelwriter/core/status.py

@@ -37,7 +37,7 @@
 logger = logging.getLogger(__name__)
 
 
-class NWStatus():
+class NWStatus:
 
     STATUS = 1
     IMPORT = 2

novelwriter/core/tohtml.py

@@ -38,7 +38,7 @@ class ToHtml(Tokenizer):
     M_EBOOK   = 2  # Tweak output for converting to epub
 
     def __init__(self, theProject):
-        Tokenizer.__init__(self, theProject)
+        super().__init__(theProject)
 
         self._genMode = self.M_EXPORT
         self._cssStyles = True
@@ -107,7 +107,7 @@ def doPreProcessing(self):
         """Extend the auto-replace to also properly encode some unicode
         characters into their respective HTML entities.
         """
-        Tokenizer.doPreProcessing(self)
+        super().doPreProcessing()
         self._theText = self._theText.translate(self._trMap)
         return
 

novelwriter/core/tomd.py

@@ -37,7 +37,7 @@ class ToMarkdown(Tokenizer):
     M_GH  = 1  # GitHub Markdown
 
     def __init__(self, theProject):
-        Tokenizer.__init__(self, theProject)
+        super().__init__(theProject)
 
         self._genMode = self.M_STD
         self._fullMD = []

novelwriter/core/toodt.py

@@ -89,7 +89,7 @@ def _mkTag(nsName, tagName, nsMap=XML_NS):
 class ToOdt(Tokenizer):
 
     def __init__(self, theProject, isFlat):
-        Tokenizer.__init__(self, theProject)
+        super().__init__(theProject)
 
         self._isFlat = isFlat  # Flat: .fodt, otherwise .odt
 
@@ -994,7 +994,7 @@ def _writeHeader(self):
 #  Auto-Style Classes
 # =============================================================================================== #
 
-class ODTParagraphStyle():
+class ODTParagraphStyle:
     """Wrapper class for the paragraph style setting used by the
     exporter. Only the used settings are exposed here to keep the class
     minimal and fast.
@@ -1208,7 +1208,7 @@ def packXML(self, xParent, xName):
 # END Class ODTParagraphStyle
 
 
-class ODTTextStyle():
+class ODTTextStyle:
     """Wrapper class for the text style setting used by the exporter.
     Only the used settings are exposed here to keep the class minimal
     and fast.
@@ -1297,7 +1297,7 @@ def packXML(self, xParent, xName):
 X_SPAN_SING = 3
 
 
-class XMLParagraph():
+class XMLParagraph:
     """This is a helper class to manage the text content of a single
     XML element using mixed content tags.
 

novelwriter/core/tree.py

@@ -38,7 +38,7 @@
 logger = logging.getLogger(__name__)
 
 
-class NWTree():
+class NWTree:
 
     MAX_DEPTH = 1000  # Cap of tree traversing for loops
 

novelwriter/dialogs/about.py

@@ -44,7 +44,7 @@
 class GuiAbout(QDialog):
 
     def __init__(self, mainGui):
-        QDialog.__init__(self, mainGui)
+        super().__init__(parent=mainGui)
 
         logger.debug("Initialising GuiAbout ...")
         self.setObjectName("GuiAbout")

novelwriter/dialogs/docsplit.py

@@ -42,7 +42,7 @@
 class GuiDocSplit(QDialog):
 
     def __init__(self, mainGui):
-        QDialog.__init__(self, mainGui)
+        super().__init__(parent=mainGui)
 
         logger.debug("Initialising GuiDocSplit ...")
         self.setObjectName("GuiDocSplit")

novelwriter/dialogs/editlabel.py

@@ -36,7 +36,7 @@
 class GuiEditLabel(QDialog):
 
     def __init__(self, parent, text=""):
-        QDialog.__init__(self, parent=parent)
+        super().__init__(parent=parent)
 
         self.setObjectName("GuiEditLabel")
         self.setWindowTitle(self.tr("Item Label"))

novelwriter/dialogs/preferences.py

@@ -44,7 +44,7 @@
 class GuiPreferences(PagedDialog):
 
     def __init__(self, mainGui):
-        PagedDialog.__init__(self, mainGui)
+        super().__init__(parent=mainGui)
 
         logger.debug("Initialising GuiPreferences ...")
         self.setObjectName("GuiPreferences")
@@ -55,13 +55,13 @@ def __init__(self, mainGui):
 
         self.setWindowTitle(self.tr("Preferences"))
 
-        self.tabGeneral  = GuiPreferencesGeneral(self.mainGui)
-        self.tabProjects = GuiPreferencesProjects(self.mainGui)
-        self.tabDocs     = GuiPreferencesDocuments(self.mainGui)
-        self.tabEditor   = GuiPreferencesEditor(self.mainGui)
-        self.tabSyntax   = GuiPreferencesSyntax(self.mainGui)
-        self.tabAuto     = GuiPreferencesAutomation(self.mainGui)
-        self.tabQuote    = GuiPreferencesQuotes(self.mainGui)
+        self.tabGeneral  = GuiPreferencesGeneral(self)
+        self.tabProjects = GuiPreferencesProjects(self)
+        self.tabDocs     = GuiPreferencesDocuments(self)
+        self.tabEditor   = GuiPreferencesEditor(self)
+        self.tabSyntax   = GuiPreferencesSyntax(self)
+        self.tabAuto     = GuiPreferencesAutomation(self)
+        self.tabQuote    = GuiPreferencesQuotes(self)
 
         self.addTab(self.tabGeneral,  self.tr("General"))
         self.addTab(self.tabProjects, self.tr("Projects"))
@@ -138,12 +138,12 @@ def _saveWindowSize(self):
 
 class GuiPreferencesGeneral(QWidget):
 
-    def __init__(self, mainGui):
-        QWidget.__init__(self, mainGui)
+    def __init__(self, prefsGui):
+        super().__init__(parent=prefsGui)
 
         self.mainConf  = novelwriter.CONFIG
-        self.mainGui   = mainGui
-        self.mainTheme = mainGui.mainTheme
+        self.mainGui   = prefsGui.mainGui
+        self.mainTheme = prefsGui.mainGui.mainTheme
 
         # The Form
         self.mainForm = QConfigLayout()
@@ -344,12 +344,12 @@ def _selectFont(self):
 
 class GuiPreferencesProjects(QWidget):
 
-    def __init__(self, mainGui):
-        QWidget.__init__(self, mainGui)
+    def __init__(self, prefsGui):
+        super().__init__(parent=prefsGui)
 
         self.mainConf  = novelwriter.CONFIG
-        self.mainGui   = mainGui
-        self.mainTheme = mainGui.mainTheme
+        self.mainGui   = prefsGui.mainGui
+        self.mainTheme = prefsGui.mainGui.mainTheme
 
         # The Form
         self.mainForm = QConfigLayout()
@@ -505,12 +505,12 @@ def _toggledBackupOnClose(self, theState):
 
 class GuiPreferencesDocuments(QWidget):
 
-    def __init__(self, mainGui):
-        QWidget.__init__(self, mainGui)
+    def __init__(self, prefsGui):
+        super().__init__(parent=prefsGui)
 
         self.mainConf  = novelwriter.CONFIG
-        self.mainGui   = mainGui
-        self.mainTheme = mainGui.mainTheme
+        self.mainGui   = prefsGui.mainGui
+        self.mainTheme = prefsGui.mainGui.mainTheme
 
         # The Form
         self.mainForm = QConfigLayout()
@@ -666,12 +666,12 @@ def _selectFont(self):
 
 class GuiPreferencesEditor(QWidget):
 
-    def __init__(self, mainGui):
-        QWidget.__init__(self, mainGui)
+    def __init__(self, prefsGui):
+        super().__init__(parent=prefsGui)
 
         self.mainConf  = novelwriter.CONFIG
-        self.mainGui   = mainGui
-        self.mainTheme = mainGui.mainTheme
+        self.mainGui   = prefsGui.mainGui
+        self.mainTheme = prefsGui.mainGui.mainTheme
 
         # The Form
         self.mainForm = QConfigLayout()
@@ -840,12 +840,12 @@ def saveValues(self):
 
 class GuiPreferencesSyntax(QWidget):
 
-    def __init__(self, mainGui):
-        QWidget.__init__(self, mainGui)
+    def __init__(self, prefsGui):
+        super().__init__(parent=prefsGui)
 
         self.mainConf  = novelwriter.CONFIG
-        self.mainGui   = mainGui
-        self.mainTheme = mainGui.mainTheme
+        self.mainGui   = prefsGui.mainGui
+        self.mainTheme = prefsGui.mainGui.mainTheme
 
         # The Form
         self.mainForm = QConfigLayout()
@@ -943,12 +943,12 @@ def _toggleHighlightQuotes(self, theState):
 
 class GuiPreferencesAutomation(QWidget):
 
-    def __init__(self, mainGui):
-        QWidget.__init__(self, mainGui)
+    def __init__(self, prefsGui):
+        super().__init__(parent=prefsGui)
 
         self.mainConf  = novelwriter.CONFIG
-        self.mainGui   = mainGui
-        self.mainTheme = mainGui.mainTheme
+        self.mainGui   = prefsGui.mainGui
+        self.mainTheme = prefsGui.mainGui.mainTheme
 
         # The Form
         self.mainForm = QConfigLayout()
@@ -1100,12 +1100,12 @@ def _toggleAutoReplaceMain(self, theState):
 
 class GuiPreferencesQuotes(QWidget):
 
-    def __init__(self, mainGui):
-        QWidget.__init__(self, mainGui)
+    def __init__(self, prefsGui):
+        super().__init__(parent=prefsGui)
 
         self.mainConf  = novelwriter.CONFIG
-        self.mainGui   = mainGui
-        self.mainTheme = mainGui.mainTheme
+        self.mainGui   = prefsGui.mainGui
+        self.mainTheme = prefsGui.mainGui.mainTheme
 
         # The Form
         self.mainForm = QConfigLayout()

novelwriter/dialogs/projdetails.py

@@ -46,7 +46,7 @@
 class GuiProjectDetails(PagedDialog):
 
     def __init__(self, mainGui):
-        PagedDialog.__init__(self, mainGui)
+        super().__init__(parent=mainGui)
 
         logger.debug("Initialising GuiProjectDetails ...")
         self.setObjectName("GuiProjectDetails")
@@ -142,7 +142,7 @@ def _saveGuiSettings(self):
 class GuiProjectDetailsMain(QWidget):
 
     def __init__(self, mainGui, theProject):
-        QWidget.__init__(self, mainGui)
+        super().__init__(parent=mainGui)
 
         self.mainConf   = novelwriter.CONFIG
         self.theProject = theProject
@@ -274,7 +274,7 @@ class GuiProjectDetailsContents(QWidget):
     C_PROG  = 4
 
     def __init__(self, mainGui, theProject):
-        QWidget.__init__(self, mainGui)
+        super().__init__(parent=mainGui)
 
         self.mainConf   = novelwriter.CONFIG
         self.theProject = theProject

novelwriter/dialogs/projload.py

@@ -54,7 +54,7 @@ class GuiProjectLoad(QDialog):
     C_TIME  = 2
 
     def __init__(self, mainGui):
-        QDialog.__init__(self, mainGui)
+        super().__init__(parent=mainGui)
 
         logger.debug("Initialising GuiProjectLoad ...")
         self.setObjectName("GuiProjectLoad")