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

novelwriter/core/sessions.py

@@ -79,29 +79,36 @@ class NWSessionLog:
             return False
 
         now = time()
-        iNovel, iNotes = self._project.data.initCounts
-        cNovel, cNotes = self._project.data.currCounts
-        iTotal = iNovel + iNotes
-        wDiff = cNovel + cNotes - iTotal
+        iWNovel, iWNotes, iCNovel, iCNotes = self._project.data.initCounts
+        cWNovel, cWNotes, cCNovel, cCNotes = self._project.data.currCounts
+        iWTotal = iWNovel + iWNotes
+        iCTotal = iCNovel + iCNotes
+        wDiff = cWNovel + cWNotes - iWTotal
+        cDiff = cCNovel + cCNotes - iCTotal
         sTime = now - self._start
 
-        logger.info("The session lasted %d sec and added %d words", int(sTime), wDiff)
-        if sTime < 300 and wDiff == 0:
+        logger.info(
+            "The session lasted %d sec and added %d words abd %d characters",
+            int(sTime), wDiff, cDiff
+        )
+        if sTime < 300 and (wDiff == 0 or cDiff == 0):
             logger.info("Session too short, skipping log entry")
             return False
 
         try:
             if not sessFile.exists():
                 with open(sessFile, mode="w", encoding="utf-8") as fObj:
-                    fObj.write(self.createInitial(iTotal))
+                    fObj.write(self.createInitial(iWTotal))
 
             with open(sessFile, mode="a+", encoding="utf-8") as fObj:
                 fObj.write(self.createRecord(
                     start=formatTimeStamp(self._start),
                     end=formatTimeStamp(now),
-                    novel=cNovel,
-                    notes=cNotes,
-                    idle=round(idleTime)
+                    novel=cWNovel,
+                    notes=cWNotes,
+                    idle=round(idleTime),
+                    cnovel=cCNovel,
+                    cnotes=cCNotes,
                 ))
 
         except Exception:
@@ -129,10 +136,19 @@ class NWSessionLog:
         data = json.dumps({"type": "initial", "offset": total})
         return f"{data}\n"
 
-    def createRecord(self, start: str, end: str, novel: int, notes: int, idle: int) -> str:
+    def createRecord(
+        self, start: str, end: str, novel: int, notes: int, idle: int,
+        cnovel: int = 0, cnotes: int = 0,
+    ) -> str:
         """Low level function to create a log record."""
         data = json.dumps({
-            "type": "record", "start": start, "end": end,
-            "novel": novel, "notes": notes, "idle": idle,
+            "type": "record",
+            "start": start,
+            "end": end,
+            "novel": novel,
+            "notes": notes,
+            "cnovel": cnovel,
+            "cnotes": cnotes,
+            "idle": idle,
         })
         return f"{data}\n"

novelwriter/core/tree.py

@@ -410,16 +410,20 @@ class NWTree:
 
         return True
 
-    def sumWords(self) -> tuple[int, int]:
-        """Loop over all entries and add up the word counts."""
-        noteWords = 0
+    def sumCounts(self) -> tuple[int, int, int, int]:
+        """Loop over all entries and add up the word and char counts."""
         novelWords = 0
+        notesWords = 0
+        novelChars = 0
+        notesChars = 0
         for item in self._items.values():
             if item.itemLayout == nwItemLayout.NOTE:
-                noteWords += item.wordCount
+                notesWords += item.wordCount
+                notesChars += item.charCount
             elif item.itemLayout == nwItemLayout.DOCUMENT:
                 novelWords += item.wordCount
-        return novelWords, noteWords
+                novelChars += item.charCount
+        return novelWords, notesWords, novelChars, notesChars
 
     ##
     #  Tree Item Methods

novelwriter/dialogs/docmerge.py

@@ -73,8 +73,9 @@ class GuiDocMerge(NDialog):
         self.listBox.setDragDropMode(QAbstractItemView.DragDropMode.InternalMove)
 
         # Merge Options
-        self.trashLabel = QLabel(self.tr("Move merged items to Trash"), self)
         self.trashSwitch = NSwitch(self, height=iPx)
+        self.trashLabel = QLabel(self.tr("Move merged items to Trash"), self)
+        self.trashLabel.setBuddy(self.trashSwitch)
 
         self.optBox = QGridLayout()
         self.optBox.addWidget(self.trashLabel,  0, 0)

novelwriter/dialogs/docsplit.py

@@ -90,16 +90,19 @@ class GuiDocSplit(NDialog):
         self.splitLevel.currentIndexChanged.connect(self._reloadList)
 
         # Split Options
-        self.folderLabel = QLabel(self.tr("Split into a new folder"), self)
         self.folderSwitch = NSwitch(self, height=iPx)
         self.folderSwitch.setChecked(intoFolder)
+        self.folderLabel = QLabel(self.tr("Split into a new folder"), self)
+        self.folderLabel.setBuddy(self.folderSwitch)
 
-        self.hierarchyLabel = QLabel(self.tr("Create document hierarchy"), self)
         self.hierarchySwitch = NSwitch(self, height=iPx)
         self.hierarchySwitch.setChecked(docHierarchy)
+        self.hierarchyLabel = QLabel(self.tr("Create document hierarchy"), self)
+        self.hierarchyLabel.setBuddy(self.hierarchySwitch)
 
-        self.trashLabel = QLabel(self.tr("Move split document to Trash"), self)
         self.trashSwitch = NSwitch(self, height=iPx)
+        self.trashLabel = QLabel(self.tr("Move split document to Trash"), self)
+        self.trashLabel.setBuddy(self.trashSwitch)
 
         self.optBox = QGridLayout()
         self.optBox.addWidget(self.folderLabel,  0, 0)

novelwriter/dialogs/editlabel.py

@@ -43,11 +43,14 @@ class GuiEditLabel(NDialog):
         self.setWindowTitle(self.tr("Item Label"))
 
         # Item Label
-        self.labelValue = QLineEdit(self)
-        self.labelValue.setMinimumWidth(220)
-        self.labelValue.setMaxLength(200)
-        self.labelValue.setText(text)
-        self.labelValue.selectAll()
+        self.edtValue = QLineEdit(self)
+        self.edtValue.setMinimumWidth(220)
+        self.edtValue.setMaxLength(200)
+        self.edtValue.setText(text)
+        self.edtValue.selectAll()
+
+        self.lblValue = QLabel(self.tr("Label"), self)
+        self.lblValue.setBuddy(self.lblValue)
 
         # Buttons
         self.buttonBox = QDialogButtonBox(QtDialogOk | QtDialogCancel, self)
@@ -56,8 +59,8 @@ class GuiEditLabel(NDialog):
 
         # Assemble
         self.innerBox = QHBoxLayout()
-        self.innerBox.addWidget(QLabel(self.tr("Label"), self), 0)
-        self.innerBox.addWidget(self.labelValue, 1)
+        self.innerBox.addWidget(self.lblValue, 0)
+        self.innerBox.addWidget(self.edtValue, 1)
         self.innerBox.setSpacing(12)
 
         self.outerBox = QVBoxLayout()
@@ -77,7 +80,7 @@ class GuiEditLabel(NDialog):
 
     @property
     def itemLabel(self) -> str:
-        return self.labelValue.text()
+        return self.edtValue.text()
 
     @classmethod
     def getLabel(cls, parent: QWidget, text: str) -> tuple[str, bool]:

novelwriter/dialogs/preferences.py

@@ -34,9 +34,9 @@ from PyQt6.QtWidgets import (
 )
 
 from novelwriter import CONFIG, SHARED
-from novelwriter.common import compact, describeFont, uniqueCompact
+from novelwriter.common import compact, describeFont, processDialogSymbols, uniqueCompact
 from novelwriter.config import DEF_GUI, DEF_ICONS, DEF_SYNTAX, DEF_TREECOL
-from novelwriter.constants import nwLabels, nwUnicode, trConst
+from novelwriter.constants import nwLabels, nwQuotes, nwUnicode, trConst
 from novelwriter.dialogs.quotes import GuiQuoteSelect
 from novelwriter.extensions.configlayout import NColorLabel, NScrollableForm
 from novelwriter.extensions.modified import (
@@ -80,6 +80,7 @@ class GuiPreferences(NDialog):
         # SideBar
         self.sidebar = NPagedSideBar(self)
         self.sidebar.setLabelColor(SHARED.theme.helpText)
+        self.sidebar.setAccessibleName(self.titleLabel.text())
         self.sidebar.buttonClicked.connect(self._sidebarClicked)
 
         # Form
@@ -225,6 +226,14 @@ class GuiPreferences(NDialog):
             self.tr("Turn off to use the Qt font dialog, which may have more options.")
         )
 
+        # Use Character Count
+        self.useCharCount = NSwitch(self)
+        self.useCharCount.setChecked(CONFIG.useCharCount)
+        self.mainForm.addRow(
+            self.tr("Prefer character count over word count"), self.useCharCount,
+            self.tr("Display character count instead where available.")
+        )
+
         # Document Style
         # ==============
 
@@ -636,21 +645,20 @@ class GuiPreferences(NDialog):
             self.tr("Lines starting with any of these symbols are dialogue.")
         )
 
-        self.narratorBreak = QLineEdit(self)
-        self.narratorBreak.setMaxLength(1)
-        self.narratorBreak.setFixedWidth(boxFixed)
-        self.narratorBreak.setAlignment(QtAlignCenter)
-        self.narratorBreak.setText(CONFIG.narratorBreak)
+        self.narratorBreak = NComboBox(self)
+        self.narratorDialog = NComboBox(self)
+        for key, value in nwQuotes.DASHES.items():
+            label = trConst(value)
+            self.narratorBreak.addItem(label, key)
+            self.narratorDialog.addItem(label, key)
+
+        self.narratorBreak.setCurrentData(CONFIG.narratorBreak, "")
+        self.narratorDialog.setCurrentData(CONFIG.narratorDialog, "")
+
         self.mainForm.addRow(
             self.tr("Narrator break symbol"), self.narratorBreak,
             self.tr("Symbol to indicate a narrator break in dialogue.")
         )
-
-        self.narratorDialog = QLineEdit(self)
-        self.narratorDialog.setMaxLength(1)
-        self.narratorDialog.setFixedWidth(boxFixed)
-        self.narratorDialog.setAlignment(QtAlignCenter)
-        self.narratorDialog.setText(CONFIG.narratorDialog)
         self.mainForm.addRow(
             self.tr("Alternating dialogue/narration symbol"), self.narratorDialog,
             self.tr("Alternates dialogue highlighting within any paragraph.")
@@ -957,21 +965,24 @@ class GuiPreferences(NDialog):
         refreshTree  = False
 
         # Appearance
-        guiLocale   = self.guiLocale.currentData()
-        guiTheme    = self.guiTheme.currentData()
-        iconTheme   = self.iconTheme.currentData()
+        guiLocale    = self.guiLocale.currentData()
+        guiTheme     = self.guiTheme.currentData()
+        iconTheme    = self.iconTheme.currentData()
+        useCharCount = self.useCharCount.isChecked()
 
         updateTheme  |= CONFIG.guiTheme != guiTheme
         updateTheme  |= CONFIG.iconTheme != iconTheme
         needsRestart |= CONFIG.guiLocale != guiLocale
         needsRestart |= CONFIG.guiFont != self._guiFont
-
-        CONFIG.guiLocale   = guiLocale
-        CONFIG.guiTheme    = guiTheme
-        CONFIG.iconTheme   = iconTheme
-        CONFIG.hideVScroll = self.hideVScroll.isChecked()
-        CONFIG.hideHScroll = self.hideHScroll.isChecked()
-        CONFIG.nativeFont  = self.nativeFont.isChecked()
+        refreshTree  |= CONFIG.useCharCount != useCharCount
+
+        CONFIG.guiLocale    = guiLocale
+        CONFIG.guiTheme     = guiTheme
+        CONFIG.iconTheme    = iconTheme
+        CONFIG.hideVScroll  = self.hideVScroll.isChecked()
+        CONFIG.hideHScroll  = self.hideHScroll.isChecked()
+        CONFIG.nativeFont   = self.nativeFont.isChecked()
+        CONFIG.useCharCount = useCharCount
         CONFIG.setGuiFont(self._guiFont)
 
         # Document Style
@@ -1034,9 +1045,9 @@ class GuiPreferences(NDialog):
         # Text Highlighting
         dialogueStyle   = self.dialogStyle.currentData()
         allowOpenDial   = self.allowOpenDial.isChecked()
-        dialogueLine    = uniqueCompact(self.dialogLine.text())
-        narratorBreak   = self.narratorBreak.text().strip()
-        narratorDialog  = self.narratorDialog.text().strip()
+        dialogueLine    = processDialogSymbols(self.dialogLine.text())
+        narratorBreak   = self.narratorBreak.currentData()
+        narratorDialog  = self.narratorDialog.currentData()
         altDialogOpen   = compact(self.altDialogOpen.text())
         altDialogClose  = compact(self.altDialogClose.text())
         highlightEmph   = self.highlightEmph.isChecked()

novelwriter/dialogs/projectsettings.py

@@ -86,6 +86,7 @@ class GuiProjectSettings(NDialog):
         # SideBar
         self.sidebar = NPagedSideBar(self)
         self.sidebar.setLabelColor(SHARED.theme.helpText)
+        self.sidebar.setAccessibleName(self.titleLabel.text())
         self.sidebar.addButton(self.tr("Settings"), self.PAGE_SETTINGS)
         self.sidebar.addButton(self.tr("Status"), self.PAGE_STATUS)
         self.sidebar.addButton(self.tr("Importance"), self.PAGE_IMPORT)
@@ -349,6 +350,7 @@ class _StatusPage(NFixedPage):
         self.listBox.setHeaderLabels([self.tr("Label"), self.tr("Usage")])
         self.listBox.setColumnWidth(self.C_LABEL, wCol0)
         self.listBox.setIndentation(0)
+        self.listBox.setAccessibleName(pageLabel)
         self.listBox.setSelectionBehavior(QAbstractItemView.SelectionBehavior.SelectRows)
         self.listBox.setSelectionMode(QAbstractItemView.SelectionMode.SingleSelection)
         self.listBox.itemSelectionChanged.connect(self._onSelectionChanged)
@@ -686,6 +688,7 @@ class _ReplacePage(NFixedPage):
         self.listBox.setHeaderLabels([self.tr("Keyword"), self.tr("Replace With")])
         self.listBox.setColumnWidth(self.C_KEY, wCol0)
         self.listBox.setIndentation(0)
+        self.listBox.setAccessibleName(self.pageTitle.text())
         self.listBox.setSelectionBehavior(QAbstractItemView.SelectionBehavior.SelectRows)
         self.listBox.setSelectionMode(QAbstractItemView.SelectionMode.SingleSelection)
         self.listBox.itemSelectionChanged.connect(self._onSelectionChanged)

novelwriter/extensions/configlayout.py

@@ -211,7 +211,8 @@ class NScrollableForm(QScrollArea):
         else:
             qWidget = widget
 
-        qLabel = QLabel(label or "", self)
+        text = label or ""
+        qLabel = QLabel(text, self)
         qLabel.setIndent(self._indent)
         qLabel.setBuddy(qWidget)
 
@@ -227,6 +228,7 @@ class NScrollableForm(QScrollArea):
             row.addLayout(labelBox, stretch[0])
             if editable:
                 self._editable[editable] = qHelp
+            text = f"{text}: {helpText}"
         else:
             row.addWidget(qLabel, stretch[0])
 
@@ -235,6 +237,7 @@ class NScrollableForm(QScrollArea):
             box.addWidget(qWidget, 1)
             box.addWidget(QLabel(unit, self), 0)
             row.addLayout(box, stretch[1])
+            text = f"{text} Unit: {unit}"
         elif isinstance(button, QAbstractButton):
             box = QHBoxLayout()
             box.addWidget(qWidget, 1)
@@ -243,10 +246,11 @@ class NScrollableForm(QScrollArea):
         else:
             row.addWidget(qWidget, stretch[1])
 
+        self._first = False
         self._layout.addLayout(row)
         if label:
             self._index[label.strip()] = qWidget
-        self._first = False
+        qLabel.setAccessibleName(text)
 
         return
 

novelwriter/extensions/switch.py

@@ -23,12 +23,12 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
 """
 from __future__ import annotations
 
-from PyQt6.QtCore import QPropertyAnimation, Qt, pyqtProperty  # pyright: ignore
-from PyQt6.QtGui import QEnterEvent, QMouseEvent, QPainter, QPaintEvent, QResizeEvent
+from PyQt6.QtCore import QPropertyAnimation, Qt, pyqtProperty, pyqtSlot  # pyright: ignore
+from PyQt6.QtGui import QEnterEvent, QPainter, QPaintEvent, QResizeEvent
 from PyQt6.QtWidgets import QAbstractButton, QWidget
 
 from novelwriter import SHARED
-from novelwriter.types import QtMouseLeft, QtNoPen, QtPaintAntiAlias, QtSizeFixed
+from novelwriter.types import QtNoPen, QtPaintAntiAlias, QtSizeFixed
 
 
 class NSwitch(QAbstractButton):
@@ -50,6 +50,8 @@ class NSwitch(QAbstractButton):
         self.setFixedHeight(self._xH)
         self._offset = self._xR
 
+        self.clicked.connect(self._onClick)
+
         return
 
     ##
@@ -94,7 +96,7 @@ class NSwitch(QAbstractButton):
         painter.setRenderHint(QtPaintAntiAlias, True)
         painter.setOpacity(1.0 if self.isEnabled() else 0.5)
 
-        painter.setPen(palette.mid().color())
+        painter.setPen(palette.highlight().color() if self.hasFocus() else palette.mid().color())
         painter.setBrush(palette.highlight() if self.isChecked() else palette.alternateBase())
         painter.drawRoundedRect(0, 0, self._xW, self._xH, self._xR, self._xR)
 
@@ -106,19 +108,18 @@ class NSwitch(QAbstractButton):
 
         return
 
-    def mouseReleaseEvent(self, event: QMouseEvent) -> None:
-        """Animate the switch on mouse release."""
-        super().mouseReleaseEvent(event)
-        if event.button() == QtMouseLeft:
-            anim = QPropertyAnimation(self, b"offset", self)
-            anim.setDuration(120)
-            anim.setStartValue(self._offset)
-            anim.setEndValue((self._xW - self._xR) if self.isChecked() else self._xR)
-            anim.start()
-        return
-
     def enterEvent(self, event: QEnterEvent) -> None:
         """Change the cursor when hovering the button."""
         self.setCursor(Qt.CursorShape.PointingHandCursor)
         super().enterEvent(event)
         return
+
+    @pyqtSlot(bool)
+    def _onClick(self, checked: bool) -> None:
+        """Animate the toggle action."""
+        anim = QPropertyAnimation(self, b"offset", self)
+        anim.setDuration(120)
+        anim.setStartValue(self._offset)
+        anim.setEndValue((self._xW - self._xR) if checked else self._xR)
+        anim.start()
+        return

novelwriter/extensions/switchbox.py

@@ -100,6 +100,7 @@ class NSwitchBox(QScrollArea):
         switch.toggled.connect(lambda state: self._emitSwitchSignal(identifier, state))
         self._content.addWidget(switch, self._index, 2, QtAlignRight)
 
+        label.setBuddy(switch)
         self._widgets.append(switch)
         self._bumpIndex()
 

novelwriter/formats/tokenizer.py

@@ -614,7 +614,8 @@ class Tokenizer(ABC):
                     tStyle |= BlockFmt.JUSTIFY
 
                 if cStyle in (
-                    nwComment.SYNOPSIS, nwComment.SHORT, nwComment.PLAIN, nwComment.STORY
+                    nwComment.SYNOPSIS, nwComment.SHORT, nwComment.PLAIN,
+                    nwComment.STORY, nwComment.NOTE,
                 ):
                     bStyle = COMMENT_STYLE[cStyle]
                     tLine, tFmt = self._formatComment(bStyle, cKey, cText)