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

novelwriter/tools/manusbuild.py

@@ -30,7 +30,7 @@ from pathlib import Path
 from PyQt5.QtCore import QTimer, pyqtSlot
 from PyQt5.QtGui import QCloseEvent
 from PyQt5.QtWidgets import (
-    QAbstractButton, QAbstractItemView, QDialog, QDialogButtonBox, QFileDialog,
+    QAbstractButton, QAbstractItemView, QDialogButtonBox, QFileDialog,
     QGridLayout, QHBoxLayout, QLabel, QLineEdit, QListWidget, QListWidgetItem,
     QPushButton, QSplitter, QVBoxLayout, QWidget
 )
@@ -42,14 +42,14 @@ from novelwriter.core.buildsettings import BuildSettings
 from novelwriter.core.docbuild import NWBuildDocument
 from novelwriter.core.item import NWItem
 from novelwriter.enum import nwBuildFmt
-from novelwriter.extensions.modified import NIconToolButton
-from novelwriter.extensions.simpleprogress import NProgressSimple
+from novelwriter.extensions.modified import NDialog, NIconToolButton
+from novelwriter.extensions.progressbars import NProgressSimple
 from novelwriter.types import QtAlignCenter, QtDialogClose, QtRoleAction, QtRoleReject, QtUserRole
 
 logger = logging.getLogger(__name__)
 
 
-class GuiManuscriptBuild(QDialog):
+class GuiManuscriptBuild(NDialog):
     """GUI Tools: Manuscript Build Dialog
 
     This is the tool for running the build itself. It can be accessed
@@ -220,7 +220,7 @@ class GuiManuscriptBuild(QDialog):
 
         self.btnBuild.setFocus()
         self._populateContentList()
-        self.buildPath.setText(str(self._build.lastPath))
+        self.buildPath.setText(str(self._build.lastBuildPath))
         if self._build.lastBuildName:
             self.buildName.setText(self._build.lastBuildName)
         else:
@@ -250,7 +250,7 @@ class GuiManuscriptBuild(QDialog):
         """
         self._saveSettings()
         event.accept()
-        self.deleteLater()
+        self.softDelete()
         return
 
     ##
@@ -274,7 +274,7 @@ class GuiManuscriptBuild(QDialog):
     def _doSelectPath(self) -> None:
         """Select a folder for output."""
         bPath = Path(self.buildPath.text())
-        bPath = bPath if bPath.is_dir() else self._build.lastPath
+        bPath = bPath if bPath.is_dir() else self._build.lastBuildPath
         savePath = QFileDialog.getExistingDirectory(
             self, self.tr("Select Folder"), str(bPath)
         )
@@ -327,7 +327,7 @@ class GuiManuscriptBuild(QDialog):
                 return False
 
         # Make sure editor content is saved before we start
-        SHARED.saveDocument()
+        SHARED.saveEditor()
 
         docBuild = NWBuildDocument(SHARED.project, self._build)
         docBuild.queueAll()
@@ -336,7 +336,7 @@ class GuiManuscriptBuild(QDialog):
         for i, _ in docBuild.iterBuild(buildPath, bFormat):
             self.buildProgress.setValue(i+1)
 
-        self._build.setLastPath(bPath)
+        self._build.setLastBuildPath(bPath)
         self._build.setLastBuildName(bName)
         self._build.setLastFormat(bFormat)
 

novelwriter/tools/manuscript.py

@@ -44,8 +44,8 @@ from novelwriter.core.buildsettings import BuildCollection, BuildSettings
 from novelwriter.core.docbuild import NWBuildDocument
 from novelwriter.core.tokenizer import HeadingFormatter
 from novelwriter.core.toqdoc import TextDocumentTheme, ToQTextDocument
-from novelwriter.extensions.circularprogress import NProgressCircle
 from novelwriter.extensions.modified import NIconToggleButton, NIconToolButton, NToolDialog
+from novelwriter.extensions.progressbars import NProgressCircle
 from novelwriter.gui.theme import STYLES_FLAT_TABS, STYLES_MIN_TOOLBUTTON
 from novelwriter.tools.manusbuild import GuiManuscriptBuild
 from novelwriter.tools.manussettings import GuiBuildSettings
@@ -265,7 +265,7 @@ class GuiManuscript(NToolDialog):
             if isinstance(obj, GuiBuildSettings) and obj.isVisible():
                 obj.close()
         event.accept()
-        self.deleteLater()
+        self.softDelete()
         return
 
     ##
@@ -322,8 +322,10 @@ class GuiManuscript(NToolDialog):
         if not (build := self._getSelectedBuild()):
             return
 
+        start = time()
+
         # Make sure editor content is saved before we start
-        SHARED.saveDocument()
+        SHARED.saveEditor()
 
         docBuild = NWBuildDocument(SHARED.project, build)
         docBuild.queueAll()
@@ -339,6 +341,8 @@ class GuiManuscript(NToolDialog):
         theme.keyword   = QColor(245, 135, 31)
         theme.tag       = QColor(66, 113, 174)
         theme.optional  = QColor(66, 113, 174)
+        theme.dialog    = QColor(66, 113, 174)
+        theme.altdialog = QColor(129, 55, 9)
 
         self.docPreview.beginNewBuild(len(docBuild))
         for step, _ in docBuild.iterBuildPreview(theme):
@@ -358,6 +362,8 @@ class GuiManuscript(NToolDialog):
         self.docStats.updateStats(buildObj.textStats)
         self.buildOutline.updateOutline(buildObj.textOutline)
 
+        logger.debug("Build completed in %.3f ms", 1000*(time()-start))
+
         return
 
     @pyqtSlot()
@@ -891,9 +897,8 @@ class _PreviewWidget(QTextBrowser):
         document within the viewport.
         """
         vBar = self.verticalScrollBar()
-        sW = vBar.width() if vBar.isVisible() else 0
         tB = self.frameWidth()
-        vW = self.width() - 2*tB - sW
+        vW = self.width() - 2*tB - vBar.width()
         vH = self.height() - 2*tB
         tH = self.ageLabel.height()
         pS = self.buildProgress.width()

novelwriter/tools/manussettings.py

@@ -98,8 +98,8 @@ class GuiBuildSettings(NToolDialog):
 
         # Title
         self.titleLabel = NColourLabel(
-            self.tr("Manuscript Build Settings"), SHARED.theme.helpText,
-            parent=self, scale=NColourLabel.HEADER_SCALE, indent=CONFIG.pxInt(4)
+            self.tr("Manuscript Build Settings"), self, color=SHARED.theme.helpText,
+            scale=NColourLabel.HEADER_SCALE, indent=CONFIG.pxInt(4)
         )
 
         # Settings Name
@@ -200,7 +200,7 @@ class GuiBuildSettings(NToolDialog):
         self._askToSaveBuild()
         self._saveSettings()
         event.accept()
-        self.deleteLater()
+        self.softDelete()
         return
 
     ##
@@ -1093,11 +1093,13 @@ class _FormatTab(NScrollableForm):
         self.stripUnicode = NSwitch(self, height=iPx)
         self.replaceTabs = NSwitch(self, height=iPx)
         self.keepBreaks = NSwitch(self, height=iPx)
+        self.showDialogue = NSwitch(self, height=iPx)
 
         self.addRow(self._build.getLabel("format.justifyText"), self.justifyText)
         self.addRow(self._build.getLabel("format.stripUnicode"), self.stripUnicode)
         self.addRow(self._build.getLabel("format.replaceTabs"), self.replaceTabs)
         self.addRow(self._build.getLabel("format.keepBreaks"), self.keepBreaks)
+        self.addRow(self._build.getLabel("format.showDialogue"), self.showDialogue)
 
         # First Line Indent
         # =================
@@ -1180,6 +1182,7 @@ class _FormatTab(NScrollableForm):
         self.stripUnicode.setChecked(self._build.getBool("format.stripUnicode"))
         self.replaceTabs.setChecked(self._build.getBool("format.replaceTabs"))
         self.keepBreaks.setChecked(self._build.getBool("format.keepBreaks"))
+        self.showDialogue.setChecked(self._build.getBool("format.showDialogue"))
 
         self.firstIndent.setChecked(self._build.getBool("format.firstLineIndent"))
         self.indentWidth.setValue(self._build.getFloat("format.firstIndentWidth"))
@@ -1219,6 +1222,7 @@ class _FormatTab(NScrollableForm):
         self._build.setValue("format.stripUnicode", self.stripUnicode.isChecked())
         self._build.setValue("format.replaceTabs", self.replaceTabs.isChecked())
         self._build.setValue("format.keepBreaks", self.keepBreaks.isChecked())
+        self._build.setValue("format.showDialogue", self.showDialogue.isChecked())
 
         self._build.setValue("format.firstLineIndent", self.firstIndent.isChecked())
         self._build.setValue("format.firstIndentWidth", self.indentWidth.value())

novelwriter/tools/noveldetails.py

@@ -68,8 +68,8 @@ class GuiNovelDetails(NNonBlockingDialog):
 
         # Title
         self.titleLabel = NColourLabel(
-            self.tr("Novel Details"), SHARED.theme.helpText,
-            parent=self, scale=NColourLabel.HEADER_SCALE, indent=CONFIG.pxInt(4)
+            self.tr("Novel Details"), self, color=SHARED.theme.helpText,
+            scale=NColourLabel.HEADER_SCALE, indent=CONFIG.pxInt(4)
         )
 
         # Novel Selector
@@ -97,7 +97,7 @@ class GuiNovelDetails(NNonBlockingDialog):
 
         # Buttons
         self.buttonBox = QDialogButtonBox(QtDialogClose, self)
-        self.buttonBox.rejected.connect(self.close)
+        self.buttonBox.rejected.connect(self.reject)
 
         # Assemble
         self.topBox = QHBoxLayout()
@@ -150,7 +150,7 @@ class GuiNovelDetails(NNonBlockingDialog):
         """Capture the user closing the window and save settings."""
         self._saveSettings()
         event.accept()
-        self.deleteLater()
+        self.softDelete()
         return
 
     ##
@@ -199,8 +199,8 @@ class _OverviewPage(NScrollablePage):
 
         # Project Info
         self.projLabel = NColourLabel(
-            self.tr("Project"), SHARED.theme.helpText,
-            parent=self, scale=NColourLabel.HEADER_SCALE
+            self.tr("Project"), self, color=SHARED.theme.helpText,
+            scale=NColourLabel.HEADER_SCALE
         )
 
         self.projName = QLabel("", self)
@@ -223,8 +223,8 @@ class _OverviewPage(NScrollablePage):
 
         # Novel Info
         self.novelLabel = NColourLabel(
-            self.tr("Selected Novel"), SHARED.theme.helpText,
-            parent=self, scale=NColourLabel.HEADER_SCALE
+            self.tr("Selected Novel"), self, color=SHARED.theme.helpText,
+            scale=NColourLabel.HEADER_SCALE
         )
 
         self.novelName = QLabel("", self)
@@ -315,8 +315,8 @@ class _ContentsPage(NFixedPage):
 
         # Title
         self.contentLabel = NColourLabel(
-            self.tr("Table of Contents"), SHARED.theme.helpText,
-            parent=self, scale=NColourLabel.HEADER_SCALE
+            self.tr("Table of Contents"), self, color=SHARED.theme.helpText,
+            scale=NColourLabel.HEADER_SCALE
         )
 
         # Contents Tree

novelwriter/tools/welcome.py

@@ -34,8 +34,8 @@ from PyQt5.QtCore import (
 )
 from PyQt5.QtGui import QCloseEvent, QColor, QFont, QPainter, QPaintEvent, QPen
 from PyQt5.QtWidgets import (
-    QAction, QApplication, QDialog, QFileDialog, QFormLayout, QHBoxLayout,
-    QLabel, QLineEdit, QListView, QMenu, QPushButton, QScrollArea, QShortcut,
+    QAction, QApplication, QFileDialog, QFormLayout, QHBoxLayout, QLabel,
+    QLineEdit, QListView, QMenu, QPushButton, QScrollArea, QShortcut,
     QStackedWidget, QStyledItemDelegate, QStyleOptionViewItem, QVBoxLayout,
     QWidget
 )
@@ -46,7 +46,7 @@ from novelwriter.constants import nwFiles
 from novelwriter.core.coretools import ProjectBuilder
 from novelwriter.enum import nwItemClass
 from novelwriter.extensions.configlayout import NWrappedWidgetBox
-from novelwriter.extensions.modified import NIconToolButton, NSpinBox
+from novelwriter.extensions.modified import NDialog, NIconToolButton, NSpinBox
 from novelwriter.extensions.switch import NSwitch
 from novelwriter.extensions.versioninfo import VersionInfoWidget
 from novelwriter.types import QtAlignLeft, QtAlignRightTop, QtSelected
@@ -56,7 +56,7 @@ logger = logging.getLogger(__name__)
 PANEL_ALPHA = 178
 
 
-class GuiWelcome(QDialog):
+class GuiWelcome(NDialog):
 
     openProjectRequest = pyqtSignal(Path)
 
@@ -196,7 +196,7 @@ class GuiWelcome(QDialog):
         """Capture the user closing the window and save settings."""
         self._saveSettings()
         event.accept()
-        self.deleteLater()
+        self.softDelete()
         return
 
     ##
@@ -220,8 +220,7 @@ class GuiWelcome(QDialog):
     @pyqtSlot()
     def _browseForProject(self) -> None:
         """Browse for a project to open."""
-        if path := SHARED.getProjectPath(self, path=CONFIG.lastPath(), allowZip=False):
-            CONFIG.setLastPath(path)
+        if path := SHARED.getProjectPath(self, path=CONFIG.homePath(), allowZip=False):
             self._openProjectPath(path)
         return
 
@@ -550,7 +549,7 @@ class _NewProjectForm(QWidget):
     def __init__(self, parent: QWidget) -> None:
         super().__init__(parent=parent)
 
-        self._basePath = CONFIG.homePath()
+        self._basePath = CONFIG.lastPath("project")
         self._fillMode = self.FILL_BLANK
         self._copyPath = None
 
@@ -726,12 +725,13 @@ class _NewProjectForm(QWidget):
     @pyqtSlot()
     def _doBrowse(self) -> None:
         """Select a project folder."""
-        if projDir := QFileDialog.getExistingDirectory(
+        if path := QFileDialog.getExistingDirectory(
             self, self.tr("Select Project Folder"),
             str(self._basePath), options=QFileDialog.Option.ShowDirsOnly
         ):
-            self._basePath = Path(projDir)
+            self._basePath = Path(path)
             self._updateProjPath()
+            CONFIG.setLastPath("project", path)
         return
 
     @pyqtSlot()

novelwriter/tools/writingstats.py

@@ -318,7 +318,7 @@ class GuiWritingStats(NToolDialog):
     def closeEvent(self, event: QCloseEvent) -> None:
         """Capture the user closing the window."""
         event.accept()
-        self.deleteLater()
+        self.softDelete()
         return
 
     ##
@@ -384,14 +384,14 @@ class GuiWritingStats(NToolDialog):
             return False
 
         # Generate the file name
-        savePath = CONFIG.lastPath() / f"sessionStats.{fileExt}"
+        savePath = CONFIG.lastPath("stats") / f"sessionStats.{fileExt}"
         savePath, _ = QFileDialog.getSaveFileName(
             self, self.tr("Save Data As"), str(savePath), f"{textFmt} (*.{fileExt})"
         )
         if not savePath:
             return False
 
-        CONFIG.setLastPath(savePath)
+        CONFIG.setLastPath("stats", savePath)
 
         # Do the actual writing
         wSuccess = False

novelwriter/types.py

@@ -25,7 +25,7 @@ from __future__ import annotations
 
 from PyQt5.QtCore import QRegularExpression, Qt
 from PyQt5.QtGui import QColor, QFont, QPainter, QTextCharFormat, QTextCursor, QTextFormat
-from PyQt5.QtWidgets import QDialogButtonBox, QSizePolicy, QStyle
+from PyQt5.QtWidgets import QDialog, QDialogButtonBox, QSizePolicy, QStyle
 
 # Qt Alignment Flags
 
@@ -73,13 +73,16 @@ QtUserRole = Qt.ItemDataRole.UserRole
 # Keyboard and Mouse Buttons
 
 QtModCtrl = Qt.KeyboardModifier.ControlModifier
-QtModeNone = Qt.KeyboardModifier.NoModifier
+QtModNone = Qt.KeyboardModifier.NoModifier
 QtModShift = Qt.KeyboardModifier.ShiftModifier
 QtMouseLeft = Qt.MouseButton.LeftButton
 QtMouseMiddle = Qt.MouseButton.MiddleButton
 
 # Dialog Button Box Types
 
+QtAccepted = QDialog.DialogCode.Accepted
+QtRejected = QDialog.DialogCode.Rejected
+
 QtDialogApply = QDialogButtonBox.StandardButton.Apply
 QtDialogCancel = QDialogButtonBox.StandardButton.Cancel
 QtDialogClose = QDialogButtonBox.StandardButton.Close

novelwriter/extensions/simpleprogress.py

@@ -1,53 +0,0 @@
-"""
-novelWriter – Custom Widget: Progress Simple
-============================================
-
-File History:
-Created: 2023-06-09 [2.1b1]
-
-This file is a part of novelWriter
-Copyright 2018–2024, Veronica Berglyd Olsen
-
-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
-
-from math import ceil
-
-from PyQt5.QtGui import QPainter, QPaintEvent
-from PyQt5.QtWidgets import QProgressBar, QWidget
-
-from novelwriter.types import QtPaintAnitAlias
-
-
-class NProgressSimple(QProgressBar):
-    """Extension: Simple Progress Widget
-
-    A custom widget that paints a plain bar with no other styling.
-    """
-
-    def __init__(self, parent: QWidget) -> None:
-        super().__init__(parent=parent)
-        return
-
-    def paintEvent(self, event: QPaintEvent) -> None:
-        """Custom painter for the progress bar."""
-        if (value := self.value()) > 0:
-            progress = ceil(self.width()*float(value)/self.maximum())
-            painter = QPainter(self)
-            painter.setRenderHint(QtPaintAnitAlias, True)
-            painter.setPen(self.palette().highlight().color())
-            painter.setBrush(self.palette().highlight())
-            painter.drawRect(0, 0, progress, self.height())
-        return