novelWriter 2.4rc1__py3-none-any.whl → 2.4.1__py3-none-any.whl

novelwriter/tools/manuscript.py

@@ -30,9 +30,9 @@ from datetime import datetime
 from time import time
 from typing import TYPE_CHECKING
 
-from PyQt5.QtCore import QTimer, QUrl, Qt, pyqtSignal, pyqtSlot
+from PyQt5.QtCore import Qt, QTimer, QUrl, pyqtSignal, pyqtSlot
 from PyQt5.QtGui import QCloseEvent, QColor, QCursor, QFont, QPalette, QResizeEvent
-from PyQt5.QtPrintSupport import QPrintPreviewDialog, QPrinter
+from PyQt5.QtPrintSupport import QPrinter, QPrintPreviewDialog
 from PyQt5.QtWidgets import (
     QAbstractItemView, QApplication, QDialog, QFormLayout, QGridLayout,
     QHBoxLayout, QLabel, QListWidget, QListWidgetItem, QPushButton,
@@ -155,7 +155,7 @@ class GuiManuscript(QDialog):
         self.buildOutline = _OutlineWidget(self)
 
         self.detailsTabs = QTabWidget(self)
-        self.detailsTabs.addTab(self.buildDetails, self.tr("Build"))
+        self.detailsTabs.addTab(self.buildDetails, self.tr("Details"))
         self.detailsTabs.addTab(self.buildOutline, self.tr("Outline"))
         self.detailsTabs.setStyleSheet(SHARED.theme.getStyleSheet(STYLES_FLAT_TABS))
 
@@ -303,26 +303,24 @@ class GuiManuscript(QDialog):
     @pyqtSlot()
     def _editSelectedBuild(self) -> None:
         """Edit the currently selected build settings entry."""
-        build = self._getSelectedBuild()
-        if build is not None:
+        if build := self._getSelectedBuild():
             self._openSettingsDialog(build)
         return
 
     @pyqtSlot("QListWidgetItem*", "QListWidgetItem*")
     def _updateBuildDetails(self, current: QListWidgetItem, previous: QListWidgetItem) -> None:
         """Process change of build selection to update the details."""
-        if isinstance(current, QListWidgetItem):
-            build = self._builds.getBuild(current.data(self.D_KEY))
-            if build is not None:
-                self.buildDetails.updateInfo(build)
+        if current and (build := self._builds.getBuild(current.data(self.D_KEY))):
+            self.buildDetails.updateInfo(build)
         return
 
     @pyqtSlot()
     def _deleteSelectedBuild(self) -> None:
         """Delete the currently selected build settings entry."""
-        build = self._getSelectedBuild()
-        if build is not None:
+        if build := self._getSelectedBuild():
             if SHARED.question(self.tr("Delete build '{0}'?".format(build.name))):
+                if dialog := self._findSettingsDialog(build.buildID):
+                    dialog.close()
                 self._builds.removeBuild(build.buildID)
                 self._updateBuildsList()
         return
@@ -332,8 +330,7 @@ class GuiManuscript(QDialog):
         """Process new build settings from the settings dialog."""
         self._builds.setBuild(build)
         self._updateBuildItem(build)
-        current = self.buildList.currentItem()
-        if isinstance(current, QListWidgetItem) and current.data(self.D_KEY) == build.buildID:
+        if (current := self.buildList.currentItem()) and current.data(self.D_KEY) == build.buildID:
             self._updateBuildDetails(current, current)
         return
 
@@ -342,10 +339,12 @@ class GuiManuscript(QDialog):
         """Run the document builder on the current build settings for
         the preview widget.
         """
-        build = self._getSelectedBuild()
-        if build is None:
+        if not (build := self._getSelectedBuild()):
             return
 
+        # Make sure editor content is saved before we start
+        SHARED.mainGui.saveDocument()
+
         docBuild = NWBuildDocument(SHARED.project, build)
         docBuild.setPreviewMode(True)
         docBuild.queueAll()
@@ -383,8 +382,7 @@ class GuiManuscript(QDialog):
     @pyqtSlot()
     def _buildManuscript(self) -> None:
         """Open the build dialog and build the manuscript."""
-        build = self._getSelectedBuild()
-        if isinstance(build, BuildSettings):
+        if build := self._getSelectedBuild():
             dlgBuild = GuiManuscriptBuild(self, build)
             dlgBuild.exec()
 
@@ -474,14 +472,10 @@ class GuiManuscript(QDialog):
 
     def _openSettingsDialog(self, build: BuildSettings) -> None:
         """Open the build settings dialog."""
-        for obj in self.mainGui.children():
-            # Don't open a second dialog if one exists
-            if isinstance(obj, GuiBuildSettings):
-                if obj.buildID == build.buildID:
-                    logger.debug("Found instance of GuiBuildSettings")
-                    obj.show()
-                    obj.raise_()
-                    return
+        if dialog := self._findSettingsDialog(build.buildID):
+            dialog.show()
+            dialog.raise_()
+            return
 
         dlgSettings = GuiBuildSettings(self.mainGui, build)
         dlgSettings.setModal(False)
@@ -496,6 +490,7 @@ class GuiManuscript(QDialog):
     def _updateBuildsList(self) -> None:
         """Update the list of available builds."""
         self.buildList.clear()
+        self._buildMap.clear()
         for key, name in self._builds.builds():
             bItem = QListWidgetItem()
             bItem.setText(name)
@@ -514,6 +509,15 @@ class GuiManuscript(QDialog):
             self._updateBuildsList()
         return
 
+    def _findSettingsDialog(self, buildID: str) -> GuiBuildSettings | None:
+        """Return an open build settings dialog for a given build, if
+        one exists.
+        """
+        for obj in SHARED.mainGui.children():
+            if isinstance(obj, GuiBuildSettings) and obj.buildID == buildID:
+                return obj
+        return None
+
 # END Class GuiManuscript
 
 
@@ -627,7 +631,7 @@ class _DetailsWidget(QWidget):
             ("headings.fmtChapter", "headings.hideChapter"),
             ("headings.fmtUnnumbered", "headings.hideUnnumbered"),
             ("headings.fmtScene", "headings.hideScene"),
-            ("headings.fmtHardScene", "headings.hideHardScene"),
+            ("headings.fmtAltScene", "headings.hideAltScene"),
             ("headings.fmtSection", "headings.hideSection"),
         ]:
             sub = QTreeWidgetItem()
@@ -748,6 +752,7 @@ class _PreviewWidget(QTextBrowser):
 
         self._docTime = 0
         self._buildName = ""
+        self._scrollPos = 0
 
         # Document Setup
         dPalette = self.palette()
@@ -844,6 +849,7 @@ class _PreviewWidget(QTextBrowser):
         self.buildProgress.setValue(0)
         self.buildProgress.setCentreText(None)
         self.buildProgress.setVisible(True)
+        self._scrollPos = self.verticalScrollBar().value()
         self.setPlaceholderText("")
         self.clear()
         return
@@ -856,7 +862,6 @@ class _PreviewWidget(QTextBrowser):
 
     def setContent(self, data: dict) -> None:
         """Set the content of the preview widget."""
-        sPos = self.verticalScrollBar().value()
         QApplication.setOverrideCursor(QCursor(Qt.CursorShape.WaitCursor))
 
         self.buildProgress.setCentreText(self.tr("Processing ..."))
@@ -873,7 +878,6 @@ class _PreviewWidget(QTextBrowser):
             cursor = self.textCursor()
             cursor.insertText("\t")
 
-        self.verticalScrollBar().setValue(sPos)
         self._docTime = checkInt(data.get("time"), 0)
         self._updateBuildAge()
 
@@ -884,7 +888,7 @@ class _PreviewWidget(QTextBrowser):
         self.buildProgress.setCentreText(self.tr("Done"))
         QApplication.restoreOverrideCursor()
         QApplication.processEvents()
-        QTimer.singleShot(300, self._hideProgress)
+        QTimer.singleShot(300, self._postUpdate)
 
         return
 
@@ -939,9 +943,10 @@ class _PreviewWidget(QTextBrowser):
         return
 
     @pyqtSlot()
-    def _hideProgress(self) -> None:
-        """Clean up the build progress bar."""
+    def _postUpdate(self) -> None:
+        """Run tasks after content update."""
         self.buildProgress.setVisible(False)
+        self.verticalScrollBar().setValue(self._scrollPos)
         return
 
     ##
@@ -1008,7 +1013,7 @@ class _StatsWidget(QWidget):
 
         # Maximal
         self.maxTotalWords.setText("{0:n}".format(data.get("allWords", 0)))
-        self.maxHeaderWords.setText("{0:n}".format(data.get("titleWords", 0)))
+        self.maxHeadWords.setText("{0:n}".format(data.get("titleWords", 0)))
         self.maxTextWords.setText("{0:n}".format(data.get("textWords", 0)))
         self.maxTitleCount.setText("{0:n}".format(data.get("titleCount", 0)))
         self.maxParCount.setText("{0:n}".format(data.get("paragraphCount", 0)))
@@ -1018,7 +1023,7 @@ class _StatsWidget(QWidget):
         self.maxTextChars.setText("{0:n}".format(data.get("textChars", 0)))
 
         self.maxTotalWordChars.setText("{0:n}".format(data.get("allWordChars", 0)))
-        self.maxHeaderWordChars.setText("{0:n}".format(data.get("titleWordChars", 0)))
+        self.maxHeadWordChars.setText("{0:n}".format(data.get("titleWordChars", 0)))
         self.maxTextWordChars.setText("{0:n}".format(data.get("textWordChars", 0)))
 
         return
@@ -1082,21 +1087,21 @@ class _StatsWidget(QWidget):
 
         # Left Column
         self.maxTotalWords = QLabel(self)
-        self.maxHeaderWords = QLabel(self)
+        self.maxHeadWords = QLabel(self)
         self.maxTextWords = QLabel(self)
         self.maxTitleCount = QLabel(self)
         self.maxParCount = QLabel(self)
 
         self.maxTotalWords.setAlignment(QtAlignRight)
-        self.maxHeaderWords.setAlignment(QtAlignRight)
+        self.maxHeadWords.setAlignment(QtAlignRight)
         self.maxTextWords.setAlignment(QtAlignRight)
         self.maxTitleCount.setAlignment(QtAlignRight)
         self.maxParCount.setAlignment(QtAlignRight)
 
         self.leftForm = QFormLayout()
         self.leftForm.addRow(self.tr("Words"), self.maxTotalWords)
-        self.leftForm.addRow(self.tr("Heading Words"), self.maxHeaderWords)
-        self.leftForm.addRow(self.tr("Body Text Words"), self.maxTextWords)
+        self.leftForm.addRow(self.tr("Words in Headings"), self.maxHeadWords)
+        self.leftForm.addRow(self.tr("Words in Text"), self.maxTextWords)
         self.leftForm.addRow("", QLabel(self))
         self.leftForm.addRow(self.tr("Headings"), self.maxTitleCount)
         self.leftForm.addRow(self.tr("Paragraphs"), self.maxParCount)
@@ -1109,7 +1114,7 @@ class _StatsWidget(QWidget):
         self.maxTextChars = QLabel(self)
 
         self.maxTotalWordChars = QLabel(self)
-        self.maxHeaderWordChars = QLabel(self)
+        self.maxHeadWordChars = QLabel(self)
         self.maxTextWordChars = QLabel(self)
 
         self.maxTotalChars.setAlignment(QtAlignRight)
@@ -1117,16 +1122,16 @@ class _StatsWidget(QWidget):
         self.maxTextChars.setAlignment(QtAlignRight)
 
         self.maxTotalWordChars.setAlignment(QtAlignRight)
-        self.maxHeaderWordChars.setAlignment(QtAlignRight)
+        self.maxHeadWordChars.setAlignment(QtAlignRight)
         self.maxTextWordChars.setAlignment(QtAlignRight)
 
         self.rightForm = QFormLayout()
         self.rightForm.addRow(self.tr("Characters"), self.maxTotalChars)
-        self.rightForm.addRow(self.tr("Heading Characters"), self.maxHeaderChars)
-        self.rightForm.addRow(self.tr("Body Text Characters"), self.maxTextChars)
+        self.rightForm.addRow(self.tr("Characters in Headings"), self.maxHeaderChars)
+        self.rightForm.addRow(self.tr("Characters in Text"), self.maxTextChars)
         self.rightForm.addRow(self.tr("Characters, No Spaces"), self.maxTotalWordChars)
-        self.rightForm.addRow(self.tr("Heading Characters, No Spaces"), self.maxHeaderWordChars)
-        self.rightForm.addRow(self.tr("Body Text Characters, No Spaces"), self.maxTextWordChars)
+        self.rightForm.addRow(self.tr("Characters in Headings, No Spaces"), self.maxHeadWordChars)
+        self.rightForm.addRow(self.tr("Characters in Text, No Spaces"), self.maxTextWordChars)
         self.rightForm.setHorizontalSpacing(hPx)
         self.rightForm.setVerticalSpacing(vPx)
 

novelwriter/tools/manussettings.py

@@ -27,13 +27,13 @@ import logging
 
 from typing import TYPE_CHECKING
 
-from PyQt5.QtGui import QFont, QIcon, QSyntaxHighlighter, QTextCharFormat, QTextDocument
 from PyQt5.QtCore import QEvent, Qt, pyqtSignal, pyqtSlot
+from PyQt5.QtGui import QFont, QIcon, QSyntaxHighlighter, QTextCharFormat, QTextDocument
 from PyQt5.QtWidgets import (
-    QAbstractButton, QAbstractItemView, QDialog, QDialogButtonBox,
-    QFontDialog, QFrame, QGridLayout, QHBoxLayout, QHeaderView, QLabel,
-    QLineEdit, QMenu, QPlainTextEdit, QPushButton, QSplitter, QStackedWidget,
-    QTreeWidget, QTreeWidgetItem, QVBoxLayout, QWidget
+    QAbstractButton, QAbstractItemView, QDialog, QDialogButtonBox, QFontDialog,
+    QFrame, QGridLayout, QHBoxLayout, QHeaderView, QLabel, QLineEdit, QMenu,
+    QPlainTextEdit, QPushButton, QSplitter, QStackedWidget, QTreeWidget,
+    QTreeWidgetItem, QVBoxLayout, QWidget
 )
 
 from novelwriter import CONFIG, SHARED
@@ -669,20 +669,20 @@ class _HeadingsTab(NScrollablePage):
         self.formatBox.addWidget(self.swtScene, 3, 4)
 
         # Alt Scene Heading
-        self.lblHScene = QLabel(self._build.getLabel("headings.fmtHardScene"), self)
-        self.fmtHScene = QLineEdit("", self)
-        self.fmtHScene.setReadOnly(True)
-        self.btnHScene = NIconToolButton(self, iSz, "edit")
-        self.btnHScene.clicked.connect(lambda: self._editHeading(self.EDIT_HSCENE))
-        self.hdeHScene = QLabel(trHide, self)
-        self.hdeHScene.setIndent(bSp)
-        self.swtHScene = NSwitch(self, height=iPx)
-
-        self.formatBox.addWidget(self.lblHScene, 4, 0)
-        self.formatBox.addWidget(self.fmtHScene, 4, 1)
-        self.formatBox.addWidget(self.btnHScene, 4, 2)
-        self.formatBox.addWidget(self.hdeHScene, 4, 3)
-        self.formatBox.addWidget(self.swtHScene, 4, 4)
+        self.lblAScene = QLabel(self._build.getLabel("headings.fmtAltScene"), self)
+        self.fmtAScene = QLineEdit("", self)
+        self.fmtAScene.setReadOnly(True)
+        self.btnAScene = NIconToolButton(self, iSz, "edit")
+        self.btnAScene.clicked.connect(lambda: self._editHeading(self.EDIT_HSCENE))
+        self.hdeAScene = QLabel(trHide, self)
+        self.hdeAScene.setIndent(bSp)
+        self.swtAScene = NSwitch(self, height=iPx)
+
+        self.formatBox.addWidget(self.lblAScene, 4, 0)
+        self.formatBox.addWidget(self.fmtAScene, 4, 1)
+        self.formatBox.addWidget(self.btnAScene, 4, 2)
+        self.formatBox.addWidget(self.hdeAScene, 4, 3)
+        self.formatBox.addWidget(self.swtAScene, 4, 4)
 
         # Section Heading
         self.lblSection = QLabel(self._build.getLabel("headings.fmtSection"), self)
@@ -826,14 +826,14 @@ class _HeadingsTab(NScrollablePage):
         self.fmtChapter.setText(self._build.getStr("headings.fmtChapter"))
         self.fmtUnnumbered.setText(self._build.getStr("headings.fmtUnnumbered"))
         self.fmtScene.setText(self._build.getStr("headings.fmtScene"))
-        self.fmtHScene.setText(self._build.getStr("headings.fmtHardScene"))
+        self.fmtAScene.setText(self._build.getStr("headings.fmtAltScene"))
         self.fmtSection.setText(self._build.getStr("headings.fmtSection"))
 
         self.swtTitle.setChecked(self._build.getBool("headings.hideTitle"))
         self.swtChapter.setChecked(self._build.getBool("headings.hideChapter"))
         self.swtUnnumbered.setChecked(self._build.getBool("headings.hideUnnumbered"))
         self.swtScene.setChecked(self._build.getBool("headings.hideScene"))
-        self.swtHScene.setChecked(self._build.getBool("headings.hideHardScene"))
+        self.swtAScene.setChecked(self._build.getBool("headings.hideAltScene"))
         self.swtSection.setChecked(self._build.getBool("headings.hideSection"))
 
         self.centerTitle.setChecked(self._build.getBool("headings.centerTitle"))
@@ -850,7 +850,7 @@ class _HeadingsTab(NScrollablePage):
         self._build.setValue("headings.hideChapter", self.swtChapter.isChecked())
         self._build.setValue("headings.hideUnnumbered", self.swtUnnumbered.isChecked())
         self._build.setValue("headings.hideScene", self.swtScene.isChecked())
-        self._build.setValue("headings.hideHardScene", self.swtHScene.isChecked())
+        self._build.setValue("headings.hideAltScene", self.swtAScene.isChecked())
         self._build.setValue("headings.hideSection", self.swtSection.isChecked())
 
         self._build.setValue("headings.centerTitle", self.centerTitle.isChecked())
@@ -890,8 +890,8 @@ class _HeadingsTab(NScrollablePage):
             text = self.fmtScene.text()
             label = self._build.getLabel("headings.fmtScene")
         elif heading == self.EDIT_HSCENE:
-            text = self.fmtHScene.text()
-            label = self._build.getLabel("headings.fmtHardScene")
+            text = self.fmtAScene.text()
+            label = self._build.getLabel("headings.fmtAltScene")
         elif heading == self.EDIT_SECTION:
             text = self.fmtSection.text()
             label = self._build.getLabel("headings.fmtSection")
@@ -928,8 +928,8 @@ class _HeadingsTab(NScrollablePage):
             self.fmtScene.setText(text)
             self._build.setValue("headings.fmtScene", text)
         elif heading == self.EDIT_HSCENE:
-            self.fmtHScene.setText(text)
-            self._build.setValue("headings.fmtHardScene", text)
+            self.fmtAScene.setText(text)
+            self._build.setValue("headings.fmtAltScene", text)
         elif heading == self.EDIT_SECTION:
             self.fmtSection.setText(text)
             self._build.setValue("headings.fmtSection", text)
@@ -1060,8 +1060,6 @@ class _FormatTab(NScrollableForm):
     def __init__(self, buildMain: GuiBuildSettings, build: BuildSettings) -> None:
         super().__init__(parent=buildMain)
 
-        self.buildMain = buildMain
-
         self._build = build
         self._unitScale = 1.0
 
@@ -1312,7 +1310,7 @@ class _FormatTab(NScrollableForm):
         return
 
     @pyqtSlot()
-    def _pageSizeValueChanged(self):
+    def _pageSizeValueChanged(self) -> None:
         """The user has changed the page size spin boxes, so we flip
         the page size box to Custom.
         """

novelwriter/tools/welcome.py

@@ -560,7 +560,7 @@ class _NewProjectForm(QWidget):
     def __init__(self, parent: QWidget) -> None:
         super().__init__(parent=parent)
 
-        self._basePath = CONFIG.lastPath()
+        self._basePath = CONFIG.homePath()
         self._fillMode = self.FILL_BLANK
         self._copyPath = None
 
@@ -632,7 +632,7 @@ class _NewProjectForm(QWidget):
 
         self.numChapters = NSpinBox(self)
         self.numChapters.setRange(0, 200)
-        self.numChapters.setValue(5)
+        self.numChapters.setValue(0)
         self.numChapters.setToolTip(self.tr("Set to 0 to only add scenes"))
 
         self.chapterBox = NWrappedWidgetBox(
@@ -642,7 +642,7 @@ class _NewProjectForm(QWidget):
 
         self.numScenes = NSpinBox(self)
         self.numScenes.setRange(0, 200)
-        self.numScenes.setValue(5)
+        self.numScenes.setValue(0)
 
         self.sceneBox = NWrappedWidgetBox(
             self.tr("Add {0} scene documents (to each chapter)"), self.numScenes
@@ -742,7 +742,6 @@ class _NewProjectForm(QWidget):
         ):
             self._basePath = Path(projDir)
             self._updateProjPath()
-            CONFIG.setLastPath(self._basePath)
         return
 
     @pyqtSlot()
@@ -753,7 +752,7 @@ class _NewProjectForm(QWidget):
         return
 
     @pyqtSlot()
-    def _syncSwitches(self):
+    def _syncSwitches(self) -> None:
         """Check if the add notes option should also be switched off."""
         addPlot = self.addPlot.isChecked()
         addChar = self.addChar.isChecked()