novelWriter 2.7b1__py3-none-any.whl → 2.7rc1__py3-none-any.whl

novelwriter/gui/doceditor.py

@@ -3,15 +3,16 @@ novelWriter – GUI Document Editor
 =================================
 
 File History:
-Created:   2018-09-29 [0.0.1] GuiDocEditor
-Created:   2019-04-22 [0.0.1] BackgroundWordCounter
-Created:   2019-09-29 [0.2.1] GuiDocEditSearch
-Created:   2020-04-25 [0.4.5] GuiDocEditHeader
-Rewritten: 2020-06-15 [0.9]   GuiDocEditSearch
-Created:   2020-06-27 [0.10]  GuiDocEditFooter
-Rewritten: 2020-10-07 [1.0b3] BackgroundWordCounter
-Created:   2023-11-06 [2.2b1] MetaCompleter
-Created:   2023-11-07 [2.2b1] GuiDocToolBar
+Created:   2018-09-29 [0.0.1]  GuiDocEditor
+Created:   2019-04-22 [0.0.1]  BackgroundWordCounter
+Created:   2019-09-29 [0.2.1]  GuiDocEditSearch
+Created:   2020-04-25 [0.4.5]  GuiDocEditHeader
+Rewritten: 2020-06-15 [0.9]    GuiDocEditSearch
+Created:   2020-06-27 [0.10]   GuiDocEditFooter
+Rewritten: 2020-10-07 [1.0b3]  BackgroundWordCounter
+Created:   2023-11-06 [2.2b1]  MetaCompleter
+Created:   2023-11-07 [2.2b1]  GuiDocToolBar
+Extended:  2025-05-18 [2.7rc1] CommandCompleter
 
 This file is a part of novelWriter
 Copyright (C) 2018 Veronica Berglyd Olsen and novelWriter contributors
@@ -55,7 +56,9 @@ from novelwriter import CONFIG, SHARED
 from novelwriter.common import (
     decodeMimeHandles, fontMatcher, minmax, qtAddAction, qtLambda, transferCase
 )
-from novelwriter.constants import nwConst, nwKeyWords, nwShortcode, nwUnicode
+from novelwriter.constants import (
+    nwConst, nwKeyWords, nwLabels, nwShortcode, nwStats, nwUnicode, trStats
+)
 from novelwriter.core.document import NWDocument
 from novelwriter.enum import (
     nwChange, nwComment, nwDocAction, nwDocInsert, nwDocMode, nwItemClass,
@@ -147,7 +150,7 @@ class GuiDocEditor(QPlainTextEdit):
         self._autoReplace = TextAutoReplace()
 
         # Completer
-        self._completer = MetaCompleter(self)
+        self._completer = CommandCompleter(self)
         self._completer.complete.connect(self._insertCompletion)
 
         # Create Custom Document
@@ -321,6 +324,7 @@ class GuiDocEditor(QPlainTextEdit):
         """
         # Auto-Replace
         self._autoReplace.initSettings()
+        self.docFooter.initSettings()
 
         # Reload spell check and dictionaries
         SHARED.updateSpellCheckLanguage()
@@ -1076,13 +1080,16 @@ class GuiDocEditor(QPlainTextEdit):
 
         if (block := self._qDocument.findBlock(pos)).isValid():
             text = block.text()
-            if text.startswith("@") and added + removed == 1:
+            if text and text[0] in "@%" and added + removed == 1:
                 # Only run on single character changes, or it will trigger
                 # at unwanted times when other changes are made to the document
                 cursor = self.textCursor()
                 bPos = cursor.positionInBlock()
                 if bPos > 0 and (viewport := self.viewport()):
-                    show = self._completer.updateText(text, bPos)
+                    if text[0] == "@":
+                        show = self._completer.updateMetaText(text, bPos)
+                    else:
+                        show = self._completer.updateCommentText(text, bPos)
                     point = self.cursorRect().bottomRight()
                     self._completer.move(viewport.mapToGlobal(point))
                     self._completer.setVisible(show)
@@ -1233,7 +1240,8 @@ class GuiDocEditor(QPlainTextEdit):
         """Process the word counter's finished signal."""
         if self._docHandle and self._nwItem:
             logger.debug("Updating word count")
-            needsRefresh = wCount != self._nwItem.wordCount
+            mCount = cCount if CONFIG.useCharCount else wCount
+            needsRefresh = mCount != self._nwItem.mainCount
             self._nwItem.setCharCount(cCount)
             self._nwItem.setWordCount(wCount)
             self._nwItem.setParaCount(pCount)
@@ -1241,7 +1249,7 @@ class GuiDocEditor(QPlainTextEdit):
                 self._nwItem.notifyToRefresh()
                 if not self.textCursor().hasSelection():
                     # Selection counter should take precedence (#2155)
-                    self.docFooter.updateWordCount(wCount, False)
+                    self.docFooter.updateMainCount(mCount, False)
         return
 
     @pyqtSlot()
@@ -1254,7 +1262,7 @@ class GuiDocEditor(QPlainTextEdit):
                 self._timerSel.start()
         else:
             self._timerSel.stop()
-            self.docFooter.updateWordCount(0, False)
+            self.docFooter.updateMainCount(0, False)
         return
 
     @pyqtSlot()
@@ -1271,8 +1279,7 @@ class GuiDocEditor(QPlainTextEdit):
     def _updateSelCounts(self, cCount: int, wCount: int, pCount: int) -> None:
         """Update the counts on the counter's finished signal."""
         if self._docHandle and self._nwItem:
-            logger.debug("User selected %d words", wCount)
-            self.docFooter.updateWordCount(wCount, True)
+            self.docFooter.updateMainCount(cCount if CONFIG.useCharCount else wCount, True)
             self._timerSel.stop()
         return
 
@@ -2070,13 +2077,13 @@ class GuiDocEditor(QPlainTextEdit):
         return
 
 
-class MetaCompleter(QMenu):
-    """GuiWidget: Meta Completer Menu
+class CommandCompleter(QMenu):
+    """GuiWidget: Command Completer Menu
 
     This is a context menu with options populated from the user's
-    defined tags. It also helps to type the meta data keyword on a new
-    line starting with an @. The updateText function should be called on
-    every keystroke on a line starting with @.
+    defined tags and keys. It also helps to type the meta data keyword
+    on a new line starting with @ or %. The update functions should be
+    called on every keystroke on a line starting with @ or %.
     """
 
     complete = pyqtSignal(int, int, str)
@@ -2085,7 +2092,7 @@ class MetaCompleter(QMenu):
         super().__init__(parent=parent)
         return
 
-    def updateText(self, text: str, pos: int) -> bool:
+    def updateMetaText(self, text: str, pos: int) -> bool:
         """Update the menu options based on the line of text."""
         self.clear()
         kw, sep, _ = text.partition(":")
@@ -2093,7 +2100,7 @@ class MetaCompleter(QMenu):
             offset = 0
             length = len(kw.rstrip())
             suffix = "" if sep else ":"
-            options = list(filter(
+            options = sorted(filter(
                 lambda x: x.startswith(kw.rstrip()), nwKeyWords.VALID_KEYS
             ))
         else:
@@ -2105,7 +2112,7 @@ class MetaCompleter(QMenu):
             offset = tPos[index] if lookup else pos
             length = len(lookup)
             suffix = ""
-            options = list(filter(
+            options = sorted(filter(
                 lambda x: lookup in x.lower(), SHARED.project.index.getClassTags(
                     nwKeyWords.KEY_CLASS.get(kw.strip())
                 )
@@ -2114,13 +2121,57 @@ class MetaCompleter(QMenu):
         if not options:
             return False
 
-        for value in sorted(options):
+        for value in options:
             rep = value + suffix
             action = qtAddAction(self, value)
             action.triggered.connect(qtLambda(self._emitComplete, offset, length, rep))
 
         return True
 
+    def updateCommentText(self, text: str, pos: int) -> bool:
+        """Update the menu options based on the line of text."""
+        self.clear()
+        cmd, sep, _ = text.partition(":")
+        if pos <= len(cmd):
+            clean = text[1:].lstrip()[:6].lower()
+            if clean[:6] == "story.":
+                pre, _, key = cmd.partition(".")
+                offset = len(pre) + 1
+                length = len(key)
+                suffix = "" if sep else ": "
+                options = sorted(filter(
+                    lambda x: x.startswith(key.rstrip()),
+                    SHARED.project.index.getStoryKeys(),
+                ))
+            elif clean[:5] == "note.":
+                pre, _, key = cmd.partition(".")
+                offset = len(pre) + 1
+                length = len(key)
+                suffix = "" if sep else ": "
+                options = sorted(filter(
+                    lambda x: x.startswith(key.rstrip()),
+                    SHARED.project.index.getNoteKeys(),
+                ))
+            elif pos < 12:
+                offset = 0
+                length = len(cmd.rstrip())
+                suffix = ""
+                options = list(filter(
+                    lambda x: x.startswith(cmd.rstrip()),
+                    ["%Synopsis: ", "%Short: ", "%Story", "%Note"],
+                ))
+            else:
+                return False
+
+            if options:
+                for value in options:
+                    rep = value + suffix
+                    action = qtAddAction(self, rep.rstrip(":. "))
+                    action.triggered.connect(qtLambda(self._emitComplete, offset, length, rep))
+                return True
+
+        return False
+
     ##
     #  Events
     ##
@@ -3045,9 +3096,9 @@ class GuiDocEditFooter(QWidget):
         fPx = int(0.9*SHARED.theme.fontPixelSize)
 
         # Cached Translations
+        self.initSettings()
         self._trLineCount = self.tr("Line: {0} ({1})")
-        self._trWordCount = self.tr("Words: {0} ({1})")
-        self._trSelectCount = self.tr("Words: {0} selected")
+        self._trSelectCount = self.tr("Selected: {0}")
 
         # Main Widget Settings
         self.setContentsMargins(0, 0, 0, 0)
@@ -3108,7 +3159,7 @@ class GuiDocEditFooter(QWidget):
         self.updateTheme()
 
         # Initialise Info
-        self.updateWordCount(0, False)
+        self.updateMainCount(0, False)
 
         logger.debug("Ready: GuiDocEditFooter")
 
@@ -3118,6 +3169,13 @@ class GuiDocEditFooter(QWidget):
     #  Methods
     ##
 
+    def initSettings(self) -> None:
+        """Apply user settings."""
+        self._trMainCount = trStats(nwLabels.STATS_DISPLAY[
+            nwStats.CHARS if CONFIG.useCharCount else nwStats.WORDS
+        ])
+        return
+
     def updateFont(self) -> None:
         """Update the font settings."""
         self.setFont(SHARED.theme.guiFont)
@@ -3162,7 +3220,7 @@ class GuiDocEditFooter(QWidget):
             self._tItem = SHARED.project.tree[self._docHandle]
 
         self.updateInfo()
-        self.updateWordCount(0, False)
+        self.updateMainCount(0, False)
 
         return
 
@@ -3193,15 +3251,15 @@ class GuiDocEditFooter(QWidget):
             )
         return
 
-    def updateWordCount(self, wCount: int, selection: bool) -> None:
-        """Update word counter information."""
-        if selection and wCount:
-            wText = self._trSelectCount.format(f"{wCount:n}")
+    def updateMainCount(self, count: int, selection: bool) -> None:
+        """Update main counter information."""
+        if selection and count:
+            text = self._trSelectCount.format(f"{count:n}")
         elif self._tItem:
-            wCount = self._tItem.wordCount
-            wDiff = wCount - self._tItem.initCount
-            wText = self._trWordCount.format(f"{wCount:n}", f"{wDiff:+n}")
+            count = self._tItem.mainCount
+            diff = count - self._tItem.initCount
+            text = self._trMainCount.format(f"{count:n}", f"{diff:+n}")
         else:
-            wText = self._trWordCount.format("0", "+0")
-        self.wordsText.setText(wText)
+            text = self._trMainCount.format("0", "+0")
+        self.wordsText.setText(text)
         return

novelwriter/gui/noveltree.py

@@ -80,6 +80,7 @@ class GuiNovelView(QWidget):
         # Function Mappings
         self.setActive = self.novelBar.setActive
         self.getSelectedHandle = self.novelTree.getSelectedHandle
+        self.refreshCurrentTree = self.novelBar.forceRefreshNovelTree
 
         return
 
@@ -209,7 +210,7 @@ class GuiNovelToolBar(QWidget):
         # Refresh Button
         self.tbRefresh = NIconToolButton(self, iSz)
         self.tbRefresh.setToolTip(self.tr("Refresh"))
-        self.tbRefresh.clicked.connect(self._forceRefreshNovelTree)
+        self.tbRefresh.clicked.connect(self.forceRefreshNovelTree)
 
         # More Options Menu
         self.mMore = QMenu(self)
@@ -274,7 +275,7 @@ class GuiNovelToolBar(QWidget):
         self.novelValue.updateTheme()
         self.tbNovel.setVisible(self.novelValue.count() > 1)
 
-        self._forceRefreshNovelTree()
+        self.forceRefreshNovelTree()
 
         return
 
@@ -298,6 +299,7 @@ class GuiNovelToolBar(QWidget):
         self.novelValue.setHandle(rootHandle)
         SHARED.project.data.setLastHandle(rootHandle, "novel")
         self.novelView.setCurrentNovel(rootHandle)
+        self.novelView.novelTree.setAccessibleName(self.novelValue.currentText())
         return
 
     def setLastColType(self, colType: nwNovelExtra, doRefresh: bool = True) -> None:
@@ -305,7 +307,7 @@ class GuiNovelToolBar(QWidget):
         self.aLastCol[colType].setChecked(True)
         self.novelView.novelTree.setLastColType(colType)
         if doRefresh:
-            self._forceRefreshNovelTree()
+            self.forceRefreshNovelTree()
             self.novelView.novelTree.resizeColumns()
         return
 
@@ -323,11 +325,11 @@ class GuiNovelToolBar(QWidget):
         return
 
     ##
-    #  Private Slots
+    #  Public Slots
     ##
 
     @pyqtSlot()
-    def _forceRefreshNovelTree(self) -> None:
+    def forceRefreshNovelTree(self) -> None:
         """Rebuild the current tree."""
         if tHandle := self.novelValue.handle:
             self.novelView.setCurrentNovel(tHandle)
@@ -335,6 +337,10 @@ class GuiNovelToolBar(QWidget):
             self._refresh[tHandle] = False
         return
 
+    ##
+    #  Private Slots
+    ##
+
     @pyqtSlot(str)
     def _refreshNovelTree(self, tHandle: str) -> None:
         """Refresh or schedule refresh of a novel tree."""

novelwriter/gui/outline.py

@@ -751,9 +751,13 @@ class GuiOutlineTree(QTreeWidget):
     def _dumpNovelData(self, rootHandle: str | None) -> list[list[str | int]]:
         """Dump all novel data into a table."""
         sLabel = SHARED.project.localLookup("Story Structure")
+        nLabel = SHARED.project.localLookup("Note")
         sKeys = sorted(SHARED.project.index.getStoryKeys())
+        nKeys = sorted(SHARED.project.index.getNoteKeys())
         sMatch = [f"story.{k}" for k in sKeys]
+        nMatch = [f"note.{k}" for k in nKeys]
         sHeaders = [f"{sLabel} ({k})" for k in sKeys]
+        nHeaders = [f"{nLabel} ({k})" for k in nKeys]
 
         data: list[list[str | int]] = [[
             "H",
@@ -777,6 +781,7 @@ class GuiOutlineTree(QTreeWidget):
             trConst(nwLabels.OUTLINE_COLS[nwOutline.MENTION]),
             trConst(nwLabels.OUTLINE_COLS[nwOutline.SYNOP]),
             *sHeaders,
+            *nHeaders,
         ]]
 
         for _, tHandle, sTitle, novIdx in SHARED.project.index.novelStructure(
@@ -784,7 +789,9 @@ class GuiOutlineTree(QTreeWidget):
         ):
             if novIdx.level != "H0" and (nwItem := SHARED.project.tree[tHandle]):
                 refs = SHARED.project.index.getReferences(tHandle, sTitle)
-                story = {k: v for k, v in novIdx.comments.items() if k in sMatch}.values()
+                comments = dict(novIdx.comments.items())
+                story = [comments.get(k, "") for k in sMatch]
+                notes = [comments.get(k, "") for k in nMatch]
                 data.append([
                     novIdx.level,
                     novIdx.title,
@@ -807,6 +814,7 @@ class GuiOutlineTree(QTreeWidget):
                     ", ".join(refs[nwKeyWords.MENTION_KEY]),
                     novIdx.synopsis,
                     *story,
+                    *notes,
                 ])
 
         return data

novelwriter/gui/projtree.py

@@ -254,6 +254,7 @@ class GuiProjectToolBar(QWidget):
         self.viewLabel.setFont(SHARED.theme.guiFontB)
         self.viewLabel.setContentsMargins(0, 0, 0, 0)
         self.viewLabel.setSizePolicy(QtSizeExpanding, QtSizeExpanding)
+        self.projTree.setAccessibleName(self.viewLabel.text())
 
         # Quick Links
         self.mQuick = QMenu(self)

novelwriter/gui/search.py

@@ -125,6 +125,7 @@ class GuiProjectSearch(QWidget):
         self.searchResult.setAllColumnsShowFocus(True)
         self.searchResult.itemDoubleClicked.connect(self._searchResultDoubleClicked)
         self.searchResult.itemSelectionChanged.connect(self._searchResultSelected)
+        self.searchResult.setAccessibleName(self.viewLabel.text())
 
         if header := self.searchResult.header():
             header.setStretchLastSection(False)

novelwriter/gui/statusbar.py

@@ -33,7 +33,7 @@ from PyQt6.QtWidgets import QApplication, QLabel, QStatusBar, QWidget
 
 from novelwriter import CONFIG, SHARED
 from novelwriter.common import formatTime
-from novelwriter.constants import nwConst
+from novelwriter.constants import nwConst, nwLabels, nwStats, trStats
 from novelwriter.extensions.modified import NClickableLabel
 from novelwriter.extensions.statusled import StatusLED
 
@@ -108,11 +108,22 @@ class GuiMainStatus(QStatusBar):
 
         logger.debug("Ready: GuiMainStatus")
 
+        self.initSettings()
         self.updateTheme()
         self.clearStatus()
 
         return
 
+    def initSettings(self) -> None:
+        """Apply user settings."""
+        if CONFIG.useCharCount:
+            self._trStatsCount = trStats(nwLabels.STATS_DISPLAY[nwStats.CHARS])
+            self._trStatsTip = self.tr("Total character count (session change)")
+        else:
+            self._trStatsCount = trStats(nwLabels.STATS_DISPLAY[nwStats.WORDS])
+            self._trStatsTip = self.tr("Total word count (session change)")
+        return
+
     def clearStatus(self) -> None:
         """Reset all widgets on the status bar to default values."""
         self.setRefTime(-1.0)
@@ -173,11 +184,8 @@ class GuiMainStatus(QStatusBar):
 
     def setProjectStats(self, pWC: int, sWC: int) -> None:
         """Update the current project statistics."""
-        self.statsText.setText(self.tr("Words: {0} ({1})").format(f"{pWC:n}", f"{sWC:+n}"))
-        if CONFIG.incNotesWCount:
-            self.statsText.setToolTip(self.tr("Project word count (session change)"))
-        else:
-            self.statsText.setToolTip(self.tr("Novel word count (session change)"))
+        self.statsText.setText(self._trStatsCount.format(f"{pWC:n}", f"{sWC:+n}"))
+        self.statsText.setToolTip(self._trStatsTip)
         return
 
     def updateTime(self, idleTime: float = 0.0) -> None:

novelwriter/gui/theme.py

@@ -130,14 +130,6 @@ class GuiTheme:
         self._availSyntax: dict[str, Path] = {}
         self._styleSheets: dict[str, str] = {}
 
-        _listConf(self._availSyntax, CONFIG.assetPath("syntax"), ".conf")
-        _listConf(self._availThemes, CONFIG.assetPath("themes"), ".conf")
-        _listConf(self._availSyntax, CONFIG.dataPath("syntax"), ".conf")
-        _listConf(self._availThemes, CONFIG.dataPath("themes"), ".conf")
-
-        self.loadTheme()
-        self.loadSyntax()
-
         # Icon Functions
         self.getIcon = self.iconCache.getIcon
         self.getPixmap = self.iconCache.getPixmap
@@ -186,6 +178,15 @@ class GuiTheme:
         logger.debug("Text 'N' Height: %d", self.textNHeight)
         logger.debug("Text 'N' Width: %d", self.textNWidth)
 
+        # Process Themes
+        _listConf(self._availSyntax, CONFIG.assetPath("syntax"), ".conf")
+        _listConf(self._availThemes, CONFIG.assetPath("themes"), ".conf")
+        _listConf(self._availSyntax, CONFIG.dataPath("syntax"), ".conf")
+        _listConf(self._availThemes, CONFIG.dataPath("themes"), ".conf")
+
+        self.loadTheme()
+        self.loadSyntax()
+
         return
 
     ##
@@ -218,6 +219,7 @@ class GuiTheme:
             logger.error("Could not load GUI theme")
             return False
 
+        CONFIG.splashMessage("Loading GUI theme ...")
         logger.info("Loading GUI theme '%s'", theme)
         parser = NWConfigParser()
         try:
@@ -357,6 +359,8 @@ class GuiTheme:
         QApplication.setPalette(self._guiPalette)
         self._buildStyleSheets(self._guiPalette)
 
+        CONFIG.splashMessage(f"Loaded GUI theme: {meta.name}")
+
         return True
 
     def loadSyntax(self) -> bool:
@@ -371,6 +375,7 @@ class GuiTheme:
             logger.error("Could not load syntax theme")
             return False
 
+        CONFIG.splashMessage("Loading syntax theme ...")
         logger.info("Loading syntax theme '%s'", theme)
         parser = NWConfigParser()
         try:
@@ -418,6 +423,8 @@ class GuiTheme:
             syntax.mod    = self._parseColor(parser, sec, "modifier")
             syntax.mark   = self._parseColor(parser, sec, "texthighlight")
 
+        CONFIG.splashMessage(f"Loaded syntax theme: {meta.name}")
+
         self.syntaxMeta = meta
         self.syntaxTheme = syntax
 
@@ -633,6 +640,7 @@ class GuiIcons:
             logger.error("Could not load icon theme")
             return False
 
+        CONFIG.splashMessage("Loading icon theme ...")
         logger.info("Loading icon theme '%s'", theme)
         try:
             meta = ThemeMeta()
@@ -656,6 +664,9 @@ class GuiIcons:
             logException()
             return False
 
+        CONFIG.splashMessage(f"Loaded icon theme: {meta.name}")
+        CONFIG.splashMessage("Generating additional icons ...")
+
         # Set colour overrides for project item icons
         if (override := CONFIG.iconColTree) != "theme":
             color = self._svgColors.get(override, b"#000000")
@@ -668,6 +679,10 @@ class GuiIcons:
                 self._svgColors["scene"] = color
                 self._svgColors["note"] = color
 
+        # Populate generated icons cache
+        self.getHeaderDecoration(0)
+        self.getHeaderDecorationNarrow(0)
+
         return True
 
     def setIconColor(self, key: str, color: QColor) -> None:
@@ -822,8 +837,8 @@ class GuiIcons:
     ##
 
     def _loadIcon(self, name: str, color: str | None = None, w: int = 24, h: int = 24) -> QIcon:
-        """Load an icon from the assets themes folder. Is guaranteed to
-        return a QIcon.
+        """Load an icon from the assets themes folder. This function is
+        guaranteed to return a QIcon.
         """
         # If we just want the app icons, return right away
         if name == "novelwriter":

novelwriter/guimain.py

@@ -310,11 +310,11 @@ class GuiMain(QMainWindow):
         self.asProjTimer.start()
         self.asDocTimer.start()
         self.mainStatus.clearStatus()
-        self.showNormal()
 
         logger.debug("Ready: GUI")
         logger.info("novelWriter is ready ...")
         self.mainStatus.setStatusMessage(self.tr("novelWriter is ready ..."))
+        CONFIG.splashMessage("novelWriter is ready ...")
 
         return
 
@@ -340,6 +340,15 @@ class GuiMain(QMainWindow):
             logger.info("Command line path: %s", cmdOpen)
             self.openProject(cmdOpen)
 
+        # Add a small delay for the window coordinates to be ready
+        # before showing any dialogs
+        QTimer.singleShot(50, self.showPostLaunchDialogs)
+
+        return
+
+    @pyqtSlot()
+    def showPostLaunchDialogs(self) -> None:
+        """Show post launch dialogs."""
         if not SHARED.hasProject:
             self.showWelcomeDialog()
 
@@ -1039,8 +1048,10 @@ class GuiMain(QMainWindow):
         self.initMain()
         self.saveDocument()
 
-        if tree:
+        if tree and not theme:
+            # These are also updated by a theme refresh
             SHARED.project.tree.refreshAllItems()
+            self.novelView.refreshCurrentTree()
 
         if theme:
             SHARED.theme.loadTheme()
@@ -1066,6 +1077,7 @@ class GuiMain(QMainWindow):
         self.projView.initSettings()
         self.novelView.initSettings()
         self.outlineView.initSettings()
+        self.mainStatus.initSettings()
 
         # Force update of word count
         self._lastTotalCount = 0
@@ -1252,15 +1264,23 @@ class GuiMain(QMainWindow):
         if self._lastTotalCount != currentTotalCount:
             self._lastTotalCount = currentTotalCount
 
-            SHARED.project.updateWordCounts()
+            SHARED.project.updateCounts()
             if CONFIG.incNotesWCount:
-                iTotal = sum(SHARED.project.data.initCounts)
-                cTotal = sum(SHARED.project.data.currCounts)
-                self.mainStatus.setProjectStats(cTotal, cTotal - iTotal)
+                if CONFIG.useCharCount:
+                    iTotal = sum(SHARED.project.data.initCounts[2:])
+                    cTotal = sum(SHARED.project.data.currCounts[2:])
+                else:
+                    iTotal = sum(SHARED.project.data.initCounts[:2])
+                    cTotal = sum(SHARED.project.data.currCounts[:2])
             else:
-                iNovel, _ = SHARED.project.data.initCounts
-                cNovel, _ = SHARED.project.data.currCounts
-                self.mainStatus.setProjectStats(cNovel, cNovel - iNovel)
+                if CONFIG.useCharCount:
+                    iTotal = SHARED.project.data.initCounts[2]
+                    cTotal = SHARED.project.data.currCounts[2]
+                else:
+                    iTotal = SHARED.project.data.initCounts[0]
+                    cTotal = SHARED.project.data.currCounts[0]
+
+            self.mainStatus.setProjectStats(cTotal, cTotal - iTotal)
 
         return