novelWriter 2.4.4__py3-none-any.whl → 2.5rc1__py3-none-any.whl

novelwriter/tools/manussettings.py

@@ -27,23 +27,24 @@ import logging
 
 from typing import TYPE_CHECKING
 
-from PyQt5.QtCore import QEvent, Qt, pyqtSignal, pyqtSlot
+from PyQt5.QtCore import QEvent, pyqtSignal, pyqtSlot
 from PyQt5.QtGui import QFont, QIcon, QSyntaxHighlighter, QTextCharFormat, QTextDocument
 from PyQt5.QtWidgets import (
-    QAbstractButton, QAbstractItemView, QDialogButtonBox, QFontDialog, QFrame,
-    QGridLayout, QHBoxLayout, QHeaderView, QLabel, QLineEdit, QMenu,
-    QPlainTextEdit, QPushButton, QSplitter, QStackedWidget, QTreeWidget,
-    QTreeWidgetItem, QVBoxLayout, QWidget
+    QAbstractButton, QAbstractItemView, QDialogButtonBox, QFrame, QGridLayout,
+    QHBoxLayout, QHeaderView, QLabel, QLineEdit, QMenu, QPlainTextEdit,
+    QPushButton, QSplitter, QStackedWidget, QTreeWidget, QTreeWidgetItem,
+    QVBoxLayout, QWidget
 )
 
 from novelwriter import CONFIG, SHARED
+from novelwriter.common import describeFont
 from novelwriter.constants import nwHeadFmt, nwKeyWords, nwLabels, trConst
 from novelwriter.core.buildsettings import BuildSettings, FilterMode
 from novelwriter.extensions.configlayout import (
     NColourLabel, NFixedPage, NScrollableForm, NScrollablePage
 )
 from novelwriter.extensions.modified import (
-    NComboBox, NDialog, NDoubleSpinBox, NIconToolButton, NSpinBox
+    NComboBox, NDoubleSpinBox, NIconToolButton, NSpinBox, NToolDialog
 )
 from novelwriter.extensions.pagedsidebar import NPagedSideBar
 from novelwriter.extensions.switch import NSwitch
@@ -59,7 +60,7 @@ if TYPE_CHECKING:  # pragma: no cover
 logger = logging.getLogger(__name__)
 
 
-class GuiBuildSettings(NDialog):
+class GuiBuildSettings(NToolDialog):
     """GUI Tools: Manuscript Build Settings Dialog
 
     The main tool for configuring manuscript builds. It's a GUI tool for
@@ -74,13 +75,11 @@ class GuiBuildSettings(NDialog):
 
     newSettingsReady = pyqtSignal(BuildSettings)
 
-    def __init__(self, mainGui: GuiMain, build: BuildSettings) -> None:
-        super().__init__(parent=mainGui)
+    def __init__(self, parent: GuiMain, build: BuildSettings) -> None:
+        super().__init__(parent=parent)
 
         logger.debug("Create: GuiBuildSettings")
         self.setObjectName("GuiBuildSettings")
-        if CONFIG.osDarwin:
-            self.setWindowFlag(Qt.WindowType.Tool)
 
         self._build = build
 
@@ -99,8 +98,8 @@ class GuiBuildSettings(NDialog):
 
         # 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
@@ -280,8 +279,6 @@ class GuiBuildSettings(NDialog):
         self._build.resetChangedState()
         return
 
-# END Class GuiBuildSettings
-
 
 class _FilterTab(NFixedPage):
 
@@ -298,8 +295,8 @@ class _FilterTab(NFixedPage):
     F_INCLUDED = 2
     F_EXCLUDED = 3
 
-    def __init__(self, buildMain: GuiBuildSettings, build: BuildSettings) -> None:
-        super().__init__(parent=buildMain)
+    def __init__(self, parent: QWidget, build: BuildSettings) -> None:
+        super().__init__(parent=parent)
 
         self._treeMap: dict[str, QTreeWidgetItem] = {}
         self._build = build
@@ -576,8 +573,6 @@ class _FilterTab(NFixedPage):
                 self._scanChildren(item.child(i), items)
         return items
 
-# END Class _FilterTab
-
 
 class _HeadingsTab(NScrollablePage):
 
@@ -588,8 +583,8 @@ class _HeadingsTab(NScrollablePage):
     EDIT_HSCENE  = 5
     EDIT_SECTION = 6
 
-    def __init__(self, buildMain: GuiBuildSettings, build: BuildSettings) -> None:
-        super().__init__(parent=buildMain)
+    def __init__(self, parent: QWidget, build: BuildSettings) -> None:
+        super().__init__(parent=parent)
 
         self._build = build
         self._editing = 0
@@ -943,8 +938,6 @@ class _HeadingsTab(NScrollablePage):
 
         return
 
-# END Class _HeadingsTab
-
 
 class _HeadingSyntaxHighlighter(QSyntaxHighlighter):
 
@@ -969,13 +962,11 @@ class _HeadingSyntaxHighlighter(QSyntaxHighlighter):
                     self.setFormat(pos + ddots, 1, self._fmtSymbol)
         return
 
-# END Class _HeadingSyntaxHighlighter
-
 
 class _ContentTab(NScrollableForm):
 
-    def __init__(self, buildMain: GuiBuildSettings, build: BuildSettings) -> None:
-        super().__init__(parent=buildMain)
+    def __init__(self, parent: QWidget, build: BuildSettings) -> None:
+        super().__init__(parent=parent)
 
         self._build = build
 
@@ -1054,16 +1045,15 @@ class _ContentTab(NScrollableForm):
         self.ignoredKeywords.setText(", ".join(verified))
         return
 
-# END Class _ContentTab
-
 
 class _FormatTab(NScrollableForm):
 
-    def __init__(self, buildMain: GuiBuildSettings, build: BuildSettings) -> None:
-        super().__init__(parent=buildMain)
+    def __init__(self, parent: QWidget, build: BuildSettings) -> None:
+        super().__init__(parent=parent)
 
         self._build = build
         self._unitScale = 1.0
+        self._textFont = QFont(CONFIG.textFont)
 
         iPx = SHARED.theme.baseIconHeight
         iSz = SHARED.theme.baseIconSize
@@ -1075,24 +1065,16 @@ class _FormatTab(NScrollableForm):
 
         self.addGroupLabel(self._build.getLabel("format.grpFormat"))
 
-        # Font Family
+        # Text Font
         self.textFont = QLineEdit(self)
         self.textFont.setReadOnly(True)
-        self.btnTextFont = NIconToolButton(self, iSz, "more")
+        self.btnTextFont = NIconToolButton(self, iSz, "font")
         self.btnTextFont.clicked.connect(self._selectFont)
         self.addRow(
             self._build.getLabel("format.textFont"), self.textFont,
-            button=self.btnTextFont, stretch=(3, 2)
+            button=self.btnTextFont, stretch=(1, 1)
         )
 
-        # Font Size
-        self.textSize = NSpinBox(self)
-        self.textSize.setMinimum(8)
-        self.textSize.setMaximum(60)
-        self.textSize.setSingleStep(1)
-        self.textSize.setMinimumWidth(spW)
-        self.addRow(self._build.getLabel("format.textSize"), self.textSize, unit="pt")
-
         # Line Height
         self.lineHeight = NDoubleSpinBox(self)
         self.lineHeight.setFixedWidth(spW)
@@ -1110,10 +1092,33 @@ class _FormatTab(NScrollableForm):
         self.justifyText = NSwitch(self, height=iPx)
         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
+        # =================
+
+        self.addGroupLabel(self._build.getLabel("format.grpParIndent"))
+
+        self.firstIndent = NSwitch(self, height=iPx)
+        self.indentFirstPar = NSwitch(self, height=iPx)
+
+        self.indentWidth = NDoubleSpinBox(self)
+        self.indentWidth.setFixedWidth(spW)
+        self.indentWidth.setMinimum(0.1)
+        self.indentWidth.setMaximum(9.9)
+        self.indentWidth.setSingleStep(0.1)
+        self.indentWidth.setDecimals(1)
+
+        self.addRow(self._build.getLabel("format.firstLineIndent"), self.firstIndent)
+        self.addRow(self._build.getLabel("format.firstIndentWidth"), self.indentWidth, unit="em")
+        self.addRow(self._build.getLabel("format.indentFirstPar"), self.indentFirstPar)
 
         # Page Layout
         # ===========
@@ -1166,17 +1171,22 @@ class _FormatTab(NScrollableForm):
 
     def loadContent(self) -> None:
         """Populate the widgets."""
-        textFont = self._build.getStr("format.textFont")
-        if not textFont:
-            textFont = str(CONFIG.textFont)
+        self._textFont = QFont()
+        self._textFont.fromString(self._build.getStr("format.textFont"))
 
-        self.textFont.setText(textFont)
-        self.textSize.setValue(self._build.getInt("format.textSize"))
-        self.lineHeight.setValue(self._build.getFloat("format.lineHeight"))
+        self.textFont.setText(describeFont(self._textFont))
+        self.textFont.setCursorPosition(0)
 
+        self.lineHeight.setValue(self._build.getFloat("format.lineHeight"))
         self.justifyText.setChecked(self._build.getBool("format.justifyText"))
         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"))
+        self.indentFirstPar.setChecked(self._build.getBool("format.indentFirstPar"))
 
         pageUnit = self._build.getStr("format.pageUnit")
         index = self.pageUnit.findData(pageUnit)
@@ -1205,13 +1215,18 @@ class _FormatTab(NScrollableForm):
 
     def saveContent(self) -> None:
         """Save choices back into build object."""
-        self._build.setValue("format.textFont", self.textFont.text())
-        self._build.setValue("format.textSize", self.textSize.value())
+        self._build.setValue("format.textFont", self._textFont.toString())
         self._build.setValue("format.lineHeight", self.lineHeight.value())
 
         self._build.setValue("format.justifyText", self.justifyText.isChecked())
         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())
+        self._build.setValue("format.indentFirstPar", self.indentFirstPar.isChecked())
 
         self._build.setValue("format.pageUnit", str(self.pageUnit.currentData()))
         self._build.setValue("format.pageSize", str(self.pageSize.currentData()))
@@ -1230,13 +1245,11 @@ class _FormatTab(NScrollableForm):
     @pyqtSlot()
     def _selectFont(self) -> None:
         """Open the QFontDialog and set a font for the font style."""
-        currFont = QFont()
-        currFont.setFamily(self.textFont.text())
-        currFont.setPointSize(self.textSize.value())
-        newFont, status = QFontDialog.getFont(currFont, self)
+        font, status = SHARED.getFont(self._textFont, CONFIG.nativeFont)
         if status:
-            self.textFont.setText(newFont.family())
-            self.textSize.setValue(newFont.pointSize())
+            self.textFont.setText(describeFont(font))
+            self.textFont.setCursorPosition(0)
+            self._textFont = font
         return
 
     @pyqtSlot(int)
@@ -1321,13 +1334,11 @@ class _FormatTab(NScrollableForm):
             self.pageSize.setCurrentIndex(index)
         return
 
-# END Class _FormatTab
-
 
 class _OutputTab(NScrollableForm):
 
-    def __init__(self, buildMain: GuiBuildSettings, build: BuildSettings) -> None:
-        super().__init__(parent=buildMain)
+    def __init__(self, parent: QWidget, build: BuildSettings) -> None:
+        super().__init__(parent=parent)
 
         self._build = build
 
@@ -1357,9 +1368,6 @@ class _OutputTab(NScrollableForm):
         self.odtPageCountOffset.setMinimumWidth(spW)
         self.addRow(self._build.getLabel("odt.pageCountOffset"), self.odtPageCountOffset)
 
-        self.odtFirstLineIndent = NSwitch(self, height=iPx)
-        self.addRow(self._build.getLabel("odt.firstLineIndent"), self.odtFirstLineIndent)
-
         # HTML Document
         self.addGroupLabel(self._build.getLabel("html"))
 
@@ -1369,12 +1377,6 @@ class _OutputTab(NScrollableForm):
         self.htmlPreserveTabs = NSwitch(self, height=iPx)
         self.addRow(self._build.getLabel("html.preserveTabs"), self.htmlPreserveTabs)
 
-        # Markdown Document
-        self.addGroupLabel(self._build.getLabel("md"))
-
-        self.mdPreserveBreaks = NSwitch(self, height=iPx)
-        self.addRow(self._build.getLabel("md.preserveBreaks"), self.mdPreserveBreaks)
-
         # Finalise
         self.finalise()
 
@@ -1385,10 +1387,8 @@ class _OutputTab(NScrollableForm):
         self.odtAddColours.setChecked(self._build.getBool("odt.addColours"))
         self.odtPageHeader.setText(self._build.getStr("odt.pageHeader"))
         self.odtPageCountOffset.setValue(self._build.getInt("odt.pageCountOffset"))
-        self.odtFirstLineIndent.setChecked(self._build.getBool("odt.firstLineIndent"))
         self.htmlAddStyles.setChecked(self._build.getBool("html.addStyles"))
         self.htmlPreserveTabs.setChecked(self._build.getBool("html.preserveTabs"))
-        self.mdPreserveBreaks.setChecked(self._build.getBool("md.preserveBreaks"))
         self.odtPageHeader.setCursorPosition(0)
         return
 
@@ -1397,10 +1397,8 @@ class _OutputTab(NScrollableForm):
         self._build.setValue("odt.addColours", self.odtAddColours.isChecked())
         self._build.setValue("odt.pageHeader", self.odtPageHeader.text())
         self._build.setValue("odt.pageCountOffset", self.odtPageCountOffset.value())
-        self._build.setValue("odt.firstLineIndent", self.odtFirstLineIndent.isChecked())
         self._build.setValue("html.addStyles", self.htmlAddStyles.isChecked())
         self._build.setValue("html.preserveTabs", self.htmlPreserveTabs.isChecked())
-        self._build.setValue("md.preserveBreaks", self.mdPreserveBreaks.isChecked())
         return
 
     ##
@@ -1412,5 +1410,3 @@ class _OutputTab(NScrollableForm):
         self.odtPageHeader.setText(nwHeadFmt.ODT_AUTO)
         self.odtPageHeader.setCursorPosition(0)
         return
-
-# END Class _OutputTab

novelwriter/tools/noveldetails.py

@@ -23,21 +23,22 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
 """
 from __future__ import annotations
 
-import math
 import logging
+import math
 
 from PyQt5.QtCore import pyqtSlot
 from PyQt5.QtGui import QCloseEvent
 from PyQt5.QtWidgets import (
-    QAbstractItemView, QDialog, QDialogButtonBox, QFormLayout, QGridLayout,
-    QHBoxLayout, QLabel, QSpinBox, QStackedWidget, QTreeWidget,
-    QTreeWidgetItem, QVBoxLayout, QWidget
+    QAbstractItemView, QDialogButtonBox, QFormLayout, QGridLayout, QHBoxLayout,
+    QLabel, QSpinBox, QStackedWidget, QTreeWidget, QTreeWidgetItem,
+    QVBoxLayout, QWidget
 )
 
 from novelwriter import CONFIG, SHARED
 from novelwriter.common import formatTime, numberToRoman
 from novelwriter.constants import nwUnicode
 from novelwriter.extensions.configlayout import NColourLabel, NFixedPage, NScrollablePage
+from novelwriter.extensions.modified import NNonBlockingDialog
 from novelwriter.extensions.novelselector import NovelSelector
 from novelwriter.extensions.pagedsidebar import NPagedSideBar
 from novelwriter.extensions.switch import NSwitch
@@ -46,7 +47,7 @@ from novelwriter.types import QtAlignRight, QtDecoration, QtDialogClose
 logger = logging.getLogger(__name__)
 
 
-class GuiNovelDetails(QDialog):
+class GuiNovelDetails(NNonBlockingDialog):
 
     PAGE_OVERVIEW = 1
     PAGE_CONTENTS = 2
@@ -67,8 +68,8 @@ class GuiNovelDetails(QDialog):
 
         # 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
@@ -96,7 +97,7 @@ class GuiNovelDetails(QDialog):
 
         # Buttons
         self.buttonBox = QDialogButtonBox(QtDialogClose, self)
-        self.buttonBox.rejected.connect(self.close)
+        self.buttonBox.rejected.connect(self.reject)
 
         # Assemble
         self.topBox = QHBoxLayout()
@@ -149,7 +150,7 @@ class GuiNovelDetails(QDialog):
         """Capture the user closing the window and save settings."""
         self._saveSettings()
         event.accept()
-        self.deleteLater()
+        self.softDelete()
         return
 
     ##
@@ -185,8 +186,6 @@ class GuiNovelDetails(QDialog):
 
         return
 
-# END Class GuiNovelDetails
-
 
 class _OverviewPage(NScrollablePage):
 
@@ -200,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)
@@ -224,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)
@@ -293,8 +292,6 @@ class _OverviewPage(NScrollablePage):
 
         return
 
-# END Class _OverviewPage
-
 
 class _ContentsPage(NFixedPage):
 
@@ -318,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
@@ -523,5 +520,3 @@ class _ContentsPage(NFixedPage):
         self._data = SHARED.project.index.getTableOfContents(rootHandle, 2)
         self._data.append(("", 0, self.tr("END"), 0))
         return
-
-# END Class _ContentsPage

novelwriter/tools/welcome.py

@@ -32,11 +32,11 @@ from PyQt5.QtCore import (
     QAbstractListModel, QEvent, QModelIndex, QObject, QPoint, QSize, Qt,
     pyqtSignal, pyqtSlot
 )
-from PyQt5.QtGui import QCloseEvent, QColor, QFont, QPaintEvent, QPainter, QPen
+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,
-    QStackedWidget, QStyleOptionViewItem, QStyledItemDelegate, QVBoxLayout,
+    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
 
@@ -267,8 +266,6 @@ class GuiWelcome(QDialog):
             self.btnCreate.setFocus()
         return
 
-# END Class GuiWelcome
-
 
 class _OpenProjectPage(QWidget):
 
@@ -392,8 +389,6 @@ class _OpenProjectPage(QWidget):
         self._projectClicked(index)
         return
 
-# END Class _OpenProjectPage
-
 
 class _ProjectListItem(QStyledItemDelegate):
 
@@ -450,8 +445,6 @@ class _ProjectListItem(QStyledItemDelegate):
         """Set the size hint to fixed height."""
         return QSize(opt.rect.width(), self._hPx)
 
-# END Class _ProjectListItem
-
 
 class _ProjectListModel(QAbstractListModel):
 
@@ -491,8 +484,6 @@ class _ProjectListModel(QAbstractListModel):
             return True
         return False
 
-# END Class _ProjectListModel
-
 
 class _NewProjectPage(QWidget):
 
@@ -548,8 +539,6 @@ class _NewProjectPage(QWidget):
             self.openProjectRequest.emit(path)
         return
 
-# END Class _NewProjectPage
-
 
 class _NewProjectForm(QWidget):
 
@@ -560,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
 
@@ -736,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()
@@ -805,8 +795,6 @@ class _NewProjectForm(QWidget):
 
         return
 
-# END Class _NewProjectForm
-
 
 class _PopLeftDirectionMenu(QMenu):
 
@@ -817,5 +805,3 @@ class _PopLeftDirectionMenu(QMenu):
                 offset = QPoint(parent.width() - self.width(), parent.height())
                 self.move(parent.mapToGlobal(offset))
         return super(_PopLeftDirectionMenu, self).event(event)
-
-# END Class _PopLeftDirectionMenu

novelwriter/tools/writingstats.py

@@ -32,15 +32,16 @@ from typing import TYPE_CHECKING
 from PyQt5.QtCore import Qt, pyqtSlot
 from PyQt5.QtGui import QCloseEvent, QCursor, QPixmap
 from PyQt5.QtWidgets import (
-    QAction, QApplication, QDialog, QDialogButtonBox, QFileDialog, QGridLayout,
+    QAction, QApplication, QDialogButtonBox, QFileDialog, QGridLayout,
     QGroupBox, QHBoxLayout, QLabel, QMenu, QSpinBox, QTreeWidget,
     QTreeWidgetItem
 )
 
 from novelwriter import CONFIG, SHARED
-from novelwriter.common import formatTime, checkInt, checkIntTuple, minmax
+from novelwriter.common import checkInt, checkIntTuple, formatTime, minmax
 from novelwriter.constants import nwConst
 from novelwriter.error import formatException
+from novelwriter.extensions.modified import NToolDialog
 from novelwriter.extensions.switch import NSwitch
 from novelwriter.types import (
     QtAlignLeftMiddle, QtAlignRight, QtAlignRightMiddle, QtDecoration,
@@ -53,7 +54,7 @@ if TYPE_CHECKING:  # pragma: no cover
 logger = logging.getLogger(__name__)
 
 
-class GuiWritingStats(QDialog):
+class GuiWritingStats(NToolDialog):
     """GUI Tools: Writing Statistics
 
     Displays data from the NWSessionLog object.
@@ -68,13 +69,11 @@ class GuiWritingStats(QDialog):
     FMT_JSON = 0
     FMT_CSV  = 1
 
-    def __init__(self, mainGui: GuiMain) -> None:
-        super().__init__(parent=mainGui)
+    def __init__(self, parent: GuiMain) -> None:
+        super().__init__(parent=parent)
 
         logger.debug("Create: GuiWritingStats")
         self.setObjectName("GuiWritingStats")
-        if CONFIG.osDarwin:
-            self.setWindowFlag(Qt.WindowType.Tool)
 
         self.logData    = []
         self.filterData = []
@@ -319,7 +318,7 @@ class GuiWritingStats(QDialog):
     def closeEvent(self, event: QCloseEvent) -> None:
         """Capture the user closing the window."""
         event.accept()
-        self.deleteLater()
+        self.softDelete()
         return
 
     ##
@@ -385,14 +384,14 @@ class GuiWritingStats(QDialog):
             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
@@ -615,5 +614,3 @@ class GuiWritingStats(QDialog):
         self.labelFilter.setText(formatTime(round(self.timeFilter)))
 
         return
-
-# END Class GuiWritingStats