novelWriter 2.7b1__py3-none-any.whl → 2.7.1__py3-none-any.whl

novelwriter/splash.py

@@ -0,0 +1,74 @@
+"""
+novelWriter – Splash Screen
+===========================
+
+File History:
+Created: 2015-04-25 [2.7rc1]
+
+This file is a part of novelWriter
+Copyright (C) 2025 Veronica Berglyd Olsen and novelWriter contributors
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <https://www.gnu.org/licenses/>.
+"""
+from __future__ import annotations
+
+import logging
+
+from pathlib import Path
+from time import sleep
+
+from PyQt6.QtCore import QRect, Qt
+from PyQt6.QtGui import QColor, QPainter, QPixmap
+from PyQt6.QtWidgets import QSplashScreen
+
+logger = logging.getLogger(__name__)
+
+SPLASH_IMG = Path(__file__).parent / "assets" / "images" / "splash.png"
+
+
+class NSplashScreen(QSplashScreen):
+
+    __slots__ = ("_color", "_rect", "_text")
+
+    def __init__(self) -> None:
+        super().__init__(pixmap=QPixmap(str(SPLASH_IMG)), flags=Qt.WindowType.WindowStaysOnTopHint)
+
+        logger.debug("Create: NSplashScreen")
+
+        font = self.font()
+        font.setPointSizeF(12.0)
+        self.setFont(font)
+        self._color = QColor(26, 52, 78)
+        self._rect = QRect(144, 110, 440, 30)
+        self._text = ""
+        return
+
+    def __del__(self) -> None:  # pragma: no cover
+        logger.debug("Delete: NSplashScreen")
+        return
+
+    def drawContents(self, painter: QPainter) -> None:
+        """Draw the text message."""
+        painter.setPen(self._color)
+        painter.drawText(self._rect, Qt.AlignmentFlag.AlignLeft, self._text)
+        return
+
+    def showStatus(self, message: str) -> None:
+        """Update the status message."""
+        self._text = message
+        self.showMessage(message)
+        if message:
+            logger.info("[Splash] %s", message)
+        sleep(0.025)
+        return

novelwriter/tools/lipsum.py

@@ -75,8 +75,9 @@ class GuiLipsum(NDialog):
         self.paraCount.setMaximum(100)
         self.paraCount.setValue(5)
 
-        self.randLabel = QLabel(self.tr("Randomise order"), self)
         self.randSwitch = NSwitch(self)
+        self.randLabel = QLabel(self.tr("Randomise order"), self)
+        self.randLabel.setBuddy(self.randSwitch)
 
         self.formBox = QGridLayout()
         self.formBox.addWidget(self.headLabel, 0, 0, 1, 2, QtAlignLeft)

novelwriter/tools/manuscript.py

@@ -630,7 +630,7 @@ class _DetailsWidget(QWidget):
         self.listView.addTopLevelItem(item)
         for key in [
             "text.includeSynopsis", "text.includeComments", "text.includeStory",
-            "text.includeKeywords", "text.includeBodyText",
+            "text.includeNotes", "text.includeKeywords", "text.includeBodyText",
         ]:
             sub = QTreeWidgetItem()
             sub.setText(0, build.getLabel(key))

novelwriter/tools/manussettings.py

@@ -80,7 +80,8 @@ class GuiBuildSettings(NToolDialog):
         logger.debug("Create: GuiBuildSettings")
         self.setObjectName("GuiBuildSettings")
 
-        self._build = build
+        # Make a copy of the build object
+        self._build = BuildSettings.fromDict(build.pack())
 
         self.setWindowTitle(self.tr("Manuscript Build Settings"))
         self.setMinimumSize(700, 400)
@@ -104,6 +105,7 @@ class GuiBuildSettings(NToolDialog):
         # SideBar
         self.sidebar = NPagedSideBar(self)
         self.sidebar.setLabelColor(SHARED.theme.helpText)
+        self.sidebar.setAccessibleName(self.titleLabel.text())
 
         self.sidebar.addLabel(self.tr("General"))
         self.sidebar.addButton(self.tr("Selection"), self.OPT_FILTERS)
@@ -183,6 +185,7 @@ class GuiBuildSettings(NToolDialog):
         settings.
         """
         logger.debug("Closing: GuiBuildSettings")
+        self._applyChanges()
         self._askToSaveBuild()
         self._saveSettings()
         event.accept()
@@ -210,11 +213,14 @@ class GuiBuildSettings(NToolDialog):
         """Handle button clicks from the dialog button box."""
         role = self.buttonBox.buttonRole(button)
         if role == QtRoleApply:
+            self._applyChanges()
             self._emitBuildData()
         elif role == QtRoleAccept:
+            self._applyChanges()
             self._emitBuildData()
             self.close()
         elif role == QtRoleReject:
+            self._build.resetChangedState()
             self.close()
         return
 
@@ -227,10 +233,9 @@ class GuiBuildSettings(NToolDialog):
         whether the user wants to save them.
         """
         if self._build.changed:
-            response = SHARED.question(self.tr(
+            if SHARED.question(self.tr(
                 "Do you want to save your changes to '{0}'?"
-            ).format(self._build.name))
-            if response:
+            ).format(self._build.name)):
                 self._emitBuildData()
             self._build.resetChangedState()
         return
@@ -245,14 +250,17 @@ class GuiBuildSettings(NToolDialog):
         pOptions.setValue("GuiBuildSettings", "treeWidth", treeWidth)
         pOptions.setValue("GuiBuildSettings", "filterWidth", filterWidth)
         pOptions.saveSettings()
-
         return
 
-    def _emitBuildData(self) -> None:
-        """Assemble the build data and emit the signal."""
+    def _applyChanges(self) -> None:
+        """Apply all settings changes to the build object."""
         self._build.setName(self.editBuildName.text())
         self.optTabHeadings.saveContent()
         self.optTabFormatting.saveContent()
+        return
+
+    def _emitBuildData(self) -> None:
+        """Assemble the build data and emit the signal."""
         self.newSettingsReady.emit(self._build)
         self._build.resetChangedState()
         return
@@ -564,9 +572,10 @@ class _HeadingsTab(NScrollablePage):
         self.fmtPart.setReadOnly(True)
         self.btnPart = NIconToolButton(self, iSz, "edit", "green")
         self.btnPart.clicked.connect(qtLambda(self._editHeading, self.EDIT_TITLE))
+        self.swtPart = NSwitch(self, height=iPx)
         self.hdePart = QLabel(trHide, self)
         self.hdePart.setIndent(6)
-        self.swtPart = NSwitch(self, height=iPx)
+        self.hdePart.setBuddy(self.swtPart)
 
         self.formatBox.addWidget(self.lblPart, 0, 0)
         self.formatBox.addWidget(self.fmtPart, 0, 1)
@@ -580,9 +589,10 @@ class _HeadingsTab(NScrollablePage):
         self.fmtChapter.setReadOnly(True)
         self.btnChapter = NIconToolButton(self, iSz, "edit", "green")
         self.btnChapter.clicked.connect(qtLambda(self._editHeading, self.EDIT_CHAPTER))
+        self.swtChapter = NSwitch(self, height=iPx)
         self.hdeChapter = QLabel(trHide, self)
         self.hdeChapter.setIndent(6)
-        self.swtChapter = NSwitch(self, height=iPx)
+        self.hdeChapter.setBuddy(self.swtChapter)
 
         self.formatBox.addWidget(self.lblChapter, 1, 0)
         self.formatBox.addWidget(self.fmtChapter, 1, 1)
@@ -596,9 +606,10 @@ class _HeadingsTab(NScrollablePage):
         self.fmtUnnumbered.setReadOnly(True)
         self.btnUnnumbered = NIconToolButton(self, iSz, "edit", "green")
         self.btnUnnumbered.clicked.connect(qtLambda(self._editHeading, self.EDIT_UNNUM))
+        self.swtUnnumbered = NSwitch(self, height=iPx)
         self.hdeUnnumbered = QLabel(trHide, self)
         self.hdeUnnumbered.setIndent(6)
-        self.swtUnnumbered = NSwitch(self, height=iPx)
+        self.hdeUnnumbered.setBuddy(self.swtUnnumbered)
 
         self.formatBox.addWidget(self.lblUnnumbered, 2, 0)
         self.formatBox.addWidget(self.fmtUnnumbered, 2, 1)
@@ -612,9 +623,10 @@ class _HeadingsTab(NScrollablePage):
         self.fmtScene.setReadOnly(True)
         self.btnScene = NIconToolButton(self, iSz, "edit", "green")
         self.btnScene.clicked.connect(qtLambda(self._editHeading, self.EDIT_SCENE))
+        self.swtScene = NSwitch(self, height=iPx)
         self.hdeScene = QLabel(trHide, self)
         self.hdeScene.setIndent(6)
-        self.swtScene = NSwitch(self, height=iPx)
+        self.hdeScene.setBuddy(self.swtScene)
 
         self.formatBox.addWidget(self.lblScene, 3, 0)
         self.formatBox.addWidget(self.fmtScene, 3, 1)
@@ -628,9 +640,10 @@ class _HeadingsTab(NScrollablePage):
         self.fmtAScene.setReadOnly(True)
         self.btnAScene = NIconToolButton(self, iSz, "edit", "green")
         self.btnAScene.clicked.connect(qtLambda(self._editHeading, self.EDIT_HSCENE))
+        self.swtAScene = NSwitch(self, height=iPx)
         self.hdeAScene = QLabel(trHide, self)
         self.hdeAScene.setIndent(6)
-        self.swtAScene = NSwitch(self, height=iPx)
+        self.hdeAScene.setBuddy(self.swtAScene)
 
         self.formatBox.addWidget(self.lblAScene, 4, 0)
         self.formatBox.addWidget(self.fmtAScene, 4, 1)
@@ -644,9 +657,10 @@ class _HeadingsTab(NScrollablePage):
         self.fmtSection.setReadOnly(True)
         self.btnSection = NIconToolButton(self, iSz, "edit", "green")
         self.btnSection.clicked.connect(qtLambda(self._editHeading, self.EDIT_SECTION))
+        self.swtSection = NSwitch(self, height=iPx)
         self.hdeSection = QLabel(trHide, self)
         self.hdeSection.setIndent(6)
-        self.swtSection = NSwitch(self, height=iPx)
+        self.hdeSection.setBuddy(self.swtSection)
 
         self.formatBox.addWidget(self.lblSection, 5, 0)
         self.formatBox.addWidget(self.fmtSection, 5, 1)
@@ -704,44 +718,59 @@ class _HeadingsTab(NScrollablePage):
 
         # Layout Matrix
         # =============
+        trCentre = self.tr("Centre")
+        trBreak = self.tr("Page Break")
+
         self.layoutMatrix = QGridLayout()
         self.layoutMatrix.setVerticalSpacing(12)
         self.layoutMatrix.setHorizontalSpacing(12)
 
-        self.layoutMatrix.addWidget(QLabel(self.tr("Centre"), self), 0, 1)
-        self.layoutMatrix.addWidget(QLabel(self.tr("Page Break"), self), 0, 2)
+        self.layoutMatrix.addWidget(QLabel(trCentre, self), 0, 1)
+        self.layoutMatrix.addWidget(QLabel(trBreak, self), 0, 2)
 
         # Title Layout
-        self.lblTitle = QLabel(self._build.getLabel("headings.styleTitle"), self)
+        trLabel = self._build.getLabel("headings.styleTitle")
+        self.lblTitle = QLabel(trLabel, self)
         self.centerTitle = NSwitch(self, height=iPx)
+        self.centerTitle.setAccessibleName(f"{trLabel}: {trCentre}")
         self.breakTitle = NSwitch(self, height=iPx)
+        self.breakTitle.setAccessibleName(f"{trLabel}: {trBreak}")
 
         self.layoutMatrix.addWidget(self.lblTitle,    1, 0)
         self.layoutMatrix.addWidget(self.centerTitle, 1, 1, QtAlignCenter)
         self.layoutMatrix.addWidget(self.breakTitle,  1, 2, QtAlignCenter)
 
         # Partition Layout
-        self.lblPart = QLabel(self._build.getLabel("headings.stylePart"), self)
+        trLabel = self._build.getLabel("headings.stylePart")
+        self.lblPart = QLabel(trLabel, self)
         self.centerPart = NSwitch(self, height=iPx)
+        self.centerPart.setAccessibleName(f"{trLabel}: {trCentre}")
         self.breakPart = NSwitch(self, height=iPx)
+        self.breakPart.setAccessibleName(f"{trLabel}: {trBreak}")
 
         self.layoutMatrix.addWidget(self.lblPart,    2, 0)
         self.layoutMatrix.addWidget(self.centerPart, 2, 1, QtAlignCenter)
         self.layoutMatrix.addWidget(self.breakPart,  2, 2, QtAlignCenter)
 
         # Chapter Layout
-        self.lblChapter = QLabel(self._build.getLabel("headings.styleChapter"), self)
+        trLabel = self._build.getLabel("headings.styleChapter")
+        self.lblChapter = QLabel(trLabel, self)
         self.centerChapter = NSwitch(self, height=iPx)
+        self.centerChapter.setAccessibleName(f"{trLabel}: {trCentre}")
         self.breakChapter = NSwitch(self, height=iPx)
+        self.breakChapter.setAccessibleName(f"{trLabel}: {trBreak}")
 
         self.layoutMatrix.addWidget(self.lblChapter,    3, 0)
         self.layoutMatrix.addWidget(self.centerChapter, 3, 1, QtAlignCenter)
         self.layoutMatrix.addWidget(self.breakChapter,  3, 2, QtAlignCenter)
 
         # Scene Layout
-        self.lblScene = QLabel(self._build.getLabel("headings.styleScene"), self)
+        trLabel = self._build.getLabel("headings.styleScene")
+        self.lblScene = QLabel(trLabel, self)
         self.centerScene = NSwitch(self, height=iPx)
+        self.centerScene.setAccessibleName(f"{trLabel}: {trCentre}")
         self.breakScene = NSwitch(self, height=iPx)
+        self.breakScene.setAccessibleName(f"{trLabel}: {trBreak}")
 
         self.layoutMatrix.addWidget(self.lblScene,    4, 0)
         self.layoutMatrix.addWidget(self.centerScene, 4, 1, QtAlignCenter)
@@ -952,12 +981,14 @@ class _FormattingTab(NScrollableForm):
         self.incSynopsis = NSwitch(self, height=iPx)
         self.incComments = NSwitch(self, height=iPx)
         self.incStory = NSwitch(self, height=iPx)
+        self.incNotes = NSwitch(self, height=iPx)
         self.incKeywords = NSwitch(self, height=iPx)
 
         self.addRow(self._build.getLabel("text.includeBodyText"), self.incBodyText)
         self.addRow(self._build.getLabel("text.includeSynopsis"), self.incSynopsis)
         self.addRow(self._build.getLabel("text.includeComments"), self.incComments)
         self.addRow(self._build.getLabel("text.includeStory"), self.incStory)
+        self.addRow(self._build.getLabel("text.includeNotes"), self.incNotes)
         self.addRow(self._build.getLabel("text.includeKeywords"), self.incKeywords)
 
         # Ignored Keywords
@@ -979,7 +1010,6 @@ class _FormattingTab(NScrollableForm):
 
         # Note Headings
         self.addNoteHead = NSwitch(self, height=iPx)
-
         self.addRow(self._build.getLabel("text.addNoteHeadings"), self.addNoteHead)
 
         # Text Format
@@ -1267,6 +1297,7 @@ class _FormattingTab(NScrollableForm):
         self.incSynopsis.setChecked(self._build.getBool("text.includeSynopsis"))
         self.incComments.setChecked(self._build.getBool("text.includeComments"))
         self.incStory.setChecked(self._build.getBool("text.includeStory"))
+        self.incNotes.setChecked(self._build.getBool("text.includeNotes"))
         self.incKeywords.setChecked(self._build.getBool("text.includeKeywords"))
         self.ignoredKeywords.setText(self._build.getStr("text.ignoredKeywords"))
         self.addNoteHead.setChecked(self._build.getBool("text.addNoteHeadings"))
@@ -1366,6 +1397,7 @@ class _FormattingTab(NScrollableForm):
         self._build.setValue("text.includeSynopsis", self.incSynopsis.isChecked())
         self._build.setValue("text.includeComments", self.incComments.isChecked())
         self._build.setValue("text.includeStory", self.incStory.isChecked())
+        self._build.setValue("text.includeNotes", self.incNotes.isChecked())
         self._build.setValue("text.includeKeywords", self.incKeywords.isChecked())
         self._build.setValue("text.ignoredKeywords", self.ignoredKeywords.text())
         self._build.setValue("text.addNoteHeadings", self.addNoteHead.isChecked())

novelwriter/tools/noveldetails.py

@@ -86,6 +86,7 @@ class GuiNovelDetails(NNonBlockingDialog):
         # SideBar
         self.sidebar = NPagedSideBar(self)
         self.sidebar.setLabelColor(SHARED.theme.helpText)
+        self.sidebar.setAccessibleName(self.titleLabel.text())
         self.sidebar.addButton(self.tr("Overview"), self.PAGE_OVERVIEW)
         self.sidebar.addButton(self.tr("Contents"), self.PAGE_CONTENTS)
         self.sidebar.setSelected(self.PAGE_OVERVIEW)
@@ -256,8 +257,8 @@ class _OverviewPage(NScrollablePage):
     def updateProjectData(self) -> None:
         """Load information about the project."""
         project = SHARED.project
-        project.updateWordCounts()
-        wcNovel, wcNotes = project.data.currCounts
+        project.updateCounts()
+        wcNovel, wcNotes, _, _ = project.data.currCounts
 
         self.projName.setText(project.data.name)
         self.projRevisions.setText(f"{project.data.saveCount:n}")
@@ -356,16 +357,14 @@ class _ContentsPage(NFixedPage):
         countFrom    = options.getInt("GuiNovelDetails", "countFrom", 1)
         clearDouble  = options.getBool("GuiNovelDetails", "clearDouble", True)
 
-        self.wpLabel = QLabel(self.tr("Words per page"), self)
-
         self.wpValue = QSpinBox(self)
         self.wpValue.setMinimum(10)
         self.wpValue.setMaximum(1000)
         self.wpValue.setSingleStep(10)
         self.wpValue.setValue(wordsPerPage)
         self.wpValue.valueChanged.connect(self._populateTree)
-
-        self.poLabel = QLabel(self.tr("First page offset"), self)
+        self.wpLabel = QLabel(self.tr("Words per page"), self)
+        self.wpLabel.setBuddy(self.wpValue)
 
         self.poValue = QSpinBox(self)
         self.poValue.setMinimum(1)
@@ -373,12 +372,14 @@ class _ContentsPage(NFixedPage):
         self.poValue.setSingleStep(1)
         self.poValue.setValue(countFrom)
         self.poValue.valueChanged.connect(self._populateTree)
-
-        self.dblLabel = QLabel(self.tr("Chapters on odd pages"), self)
+        self.poLabel = QLabel(self.tr("First page offset"), self)
+        self.poLabel.setBuddy(self.poValue)
 
         self.dblValue = NSwitch(self, height=iPx)
         self.dblValue.setChecked(clearDouble)
         self.dblValue.clicked.connect(self._populateTree)
+        self.dblLabel = QLabel(self.tr("Chapters on odd pages"), self)
+        self.dblLabel.setBuddy(self.dblValue)
 
         self.optionsBox = QGridLayout()
         self.optionsBox.addWidget(self.wpLabel,  0, 0)

novelwriter/tools/welcome.py

@@ -565,6 +565,7 @@ class _NewProjectForm(QWidget):
         self.projAuthor = QLineEdit(self)
         self.projAuthor.setMaxLength(200)
         self.projAuthor.setPlaceholderText(self.tr("Optional"))
+        self.projAuthor.setText(CONFIG.lastAuthor)
 
         # Project Path
         self.projPath = QLineEdit(self)

novelwriter/tools/writingstats.py

@@ -183,59 +183,82 @@ class GuiWritingStats(NToolDialog):
         # Filter Options
         iPx = SHARED.theme.baseIconHeight
 
-        self.filterBox = QGroupBox(self.tr("Filters"), self)
         self.filterForm = QGridLayout(self)
+        self.filterForm.setRowStretch(6, 1)
+        self.filterBox = QGroupBox(self.tr("Filters"), self)
         self.filterBox.setLayout(self.filterForm)
 
-        self.incNovel = NSwitch(self, height=iPx)
-        self.incNovel.setChecked(
+        # Include Novel Files
+        self.swtIncNovel = NSwitch(self, height=iPx)
+        self.swtIncNovel.setChecked(
             pOptions.getBool("GuiWritingStats", "incNovel", True)
         )
-        self.incNovel.clicked.connect(self._updateListBox)
+        self.swtIncNovel.clicked.connect(self._updateListBox)
+        self.lblIncNovel = QLabel(self.tr("Count novel files"), self)
+        self.lblIncNovel.setBuddy(self.swtIncNovel)
 
-        self.incNotes = NSwitch(self, height=iPx)
-        self.incNotes.setChecked(
+        self.filterForm.addWidget(self.lblIncNovel, 0, 0)
+        self.filterForm.addWidget(self.swtIncNovel, 0, 1)
+
+        # Include Note Files
+        self.swtIncNotes = NSwitch(self, height=iPx)
+        self.swtIncNotes.setChecked(
             pOptions.getBool("GuiWritingStats", "incNotes", True)
         )
-        self.incNotes.clicked.connect(self._updateListBox)
+        self.swtIncNotes.clicked.connect(self._updateListBox)
+        self.lblIncNotes = QLabel(self.tr("Count note files"), self)
+        self.lblIncNotes.setBuddy(self.swtIncNotes)
+
+        self.filterForm.addWidget(self.lblIncNotes, 1, 0)
+        self.filterForm.addWidget(self.swtIncNotes, 1, 1)
 
-        self.hideZeros = NSwitch(self, height=iPx)
-        self.hideZeros.setChecked(
+        # Hide Zero Counts
+        self.swtHideZeros = NSwitch(self, height=iPx)
+        self.swtHideZeros.setChecked(
             pOptions.getBool("GuiWritingStats", "hideZeros", True)
         )
-        self.hideZeros.clicked.connect(self._updateListBox)
+        self.swtHideZeros.clicked.connect(self._updateListBox)
+        self.lblHideZeros = QLabel(self.tr("Hide zero word count"), self)
+        self.lblHideZeros.setBuddy(self.swtHideZeros)
 
-        self.hideNegative = NSwitch(self, height=iPx)
-        self.hideNegative.setChecked(
+        self.filterForm.addWidget(self.lblHideZeros, 2, 0)
+        self.filterForm.addWidget(self.swtHideZeros, 2, 1)
+
+        # Hide Negative Counts
+        self.swtHideNegative = NSwitch(self, height=iPx)
+        self.swtHideNegative.setChecked(
             pOptions.getBool("GuiWritingStats", "hideNegative", False)
         )
-        self.hideNegative.clicked.connect(self._updateListBox)
+        self.swtHideNegative.clicked.connect(self._updateListBox)
+        self.lblHideNegative = QLabel(self.tr("Hide negative word count"), self)
+        self.lblHideNegative.setBuddy(self.swtHideNegative)
+
+        self.filterForm.addWidget(self.lblHideNegative, 3, 0)
+        self.filterForm.addWidget(self.swtHideNegative, 3, 1)
 
-        self.groupByDay = NSwitch(self, height=iPx)
-        self.groupByDay.setChecked(
+        # Group Entries
+        self.swtGroupByDay = NSwitch(self, height=iPx)
+        self.swtGroupByDay.setChecked(
             pOptions.getBool("GuiWritingStats", "groupByDay", False)
         )
-        self.groupByDay.clicked.connect(self._updateListBox)
+        self.swtGroupByDay.clicked.connect(self._updateListBox)
+        self.lblGroupByDay = QLabel(self.tr("Group entries by day"), self)
+        self.lblGroupByDay.setBuddy(self.swtGroupByDay)
+
+        self.filterForm.addWidget(self.lblGroupByDay, 4, 0)
+        self.filterForm.addWidget(self.swtGroupByDay, 4, 1)
 
-        self.showIdleTime = NSwitch(self, height=iPx)
-        self.showIdleTime.setChecked(
+        # Show Idle
+        self.swtShowIdleTime = NSwitch(self, height=iPx)
+        self.swtShowIdleTime.setChecked(
             pOptions.getBool("GuiWritingStats", "showIdleTime", False)
         )
-        self.showIdleTime.clicked.connect(self._updateListBox)
-
-        self.filterForm.addWidget(QLabel(self.tr("Count novel files"), self),        0, 0)
-        self.filterForm.addWidget(QLabel(self.tr("Count note files"), self),         1, 0)
-        self.filterForm.addWidget(QLabel(self.tr("Hide zero word count"), self),     2, 0)
-        self.filterForm.addWidget(QLabel(self.tr("Hide negative word count"), self), 3, 0)
-        self.filterForm.addWidget(QLabel(self.tr("Group entries by day"), self),     4, 0)
-        self.filterForm.addWidget(QLabel(self.tr("Show idle time"), self),           5, 0)
-        self.filterForm.addWidget(self.incNovel,     0, 1)
-        self.filterForm.addWidget(self.incNotes,     1, 1)
-        self.filterForm.addWidget(self.hideZeros,    2, 1)
-        self.filterForm.addWidget(self.hideNegative, 3, 1)
-        self.filterForm.addWidget(self.groupByDay,   4, 1)
-        self.filterForm.addWidget(self.showIdleTime, 5, 1)
-        self.filterForm.setRowStretch(6, 1)
+        self.swtShowIdleTime.clicked.connect(self._updateListBox)
+        self.lblShowIdleTime = QLabel(self.tr("Show idle time"), self)
+        self.lblShowIdleTime.setBuddy(self.swtShowIdleTime)
+
+        self.filterForm.addWidget(self.lblShowIdleTime, 5, 0)
+        self.filterForm.addWidget(self.swtShowIdleTime, 5, 1)
 
         # Settings
         self.histMax = QSpinBox(self)
@@ -325,12 +348,12 @@ class GuiWritingStats(NToolDialog):
 
         sortCol      = self.listBox.sortColumn()
         sortOrder    = header.sortIndicatorOrder() if header else 0
-        incNovel     = self.incNovel.isChecked()
-        incNotes     = self.incNotes.isChecked()
-        hideZeros    = self.hideZeros.isChecked()
-        hideNegative = self.hideNegative.isChecked()
-        groupByDay   = self.groupByDay.isChecked()
-        showIdleTime = self.showIdleTime.isChecked()
+        incNovel     = self.swtIncNovel.isChecked()
+        incNotes     = self.swtIncNotes.isChecked()
+        hideZeros    = self.swtHideZeros.isChecked()
+        hideNegative = self.swtHideNegative.isChecked()
+        groupByDay   = self.swtGroupByDay.isChecked()
+        showIdleTime = self.swtShowIdleTime.isChecked()
         histMax      = self.histMax.value()
 
         logger.debug("Saving State: GuiWritingStats")
@@ -487,11 +510,11 @@ class GuiWritingStats(NToolDialog):
         self.listBox.clear()
         self.timeFilter = 0.0
 
-        incNovel     = self.incNovel.isChecked()
-        incNotes     = self.incNotes.isChecked()
-        hideZeros    = self.hideZeros.isChecked()
-        hideNegative = self.hideNegative.isChecked()
-        groupByDay   = self.groupByDay.isChecked()
+        incNovel     = self.swtIncNovel.isChecked()
+        incNotes     = self.swtIncNotes.isChecked()
+        hideZeros    = self.swtHideZeros.isChecked()
+        hideNegative = self.swtHideNegative.isChecked()
+        groupByDay   = self.swtGroupByDay.isChecked()
         histMax      = self.histMax.value()
 
         # Group the data
@@ -563,7 +586,7 @@ class GuiWritingStats(NToolDialog):
         # Populate the list
         mTrans = Qt.TransformationMode.FastTransformation
         mAspect = Qt.AspectRatioMode.IgnoreAspectRatio
-        showIdleTime = self.showIdleTime.isChecked()
+        showIdleTime = self.swtShowIdleTime.isChecked()
         for _, sStart, sDiff, nWords, _, _, sIdle in self.filterData:
 
             if showIdleTime:

{novelwriter-2.7b1.dist-info → novelwriter-2.7.1.dist-info}/METADATA

@@ -1,7 +1,7 @@
 Metadata-Version: 2.4
 Name: novelWriter
-Version: 2.7b1
-Summary: A markdown-like text editor for planning and writing novels
+Version: 2.7.1
+Summary: A plain text editor for planning and writing novels
 Author-email: Veronica Berglyd Olsen <code@vkbo.net>
 License: GNU General Public License v3
 Project-URL: Homepage, https://novelwriter.io