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

novelwriter/tools/dictionaries.py

@@ -28,16 +28,18 @@ import logging
 from pathlib import Path
 from zipfile import ZipFile
 
-from PyQt5.QtGui import QCloseEvent, QTextCursor
 from PyQt5.QtCore import pyqtSlot
+from PyQt5.QtGui import QCloseEvent, QTextCursor
 from PyQt5.QtWidgets import (
-    QDialog, QDialogButtonBox, QFileDialog, QFrame, QHBoxLayout, QLabel,
-    QLineEdit, QPlainTextEdit, QPushButton, QVBoxLayout, QWidget, qApp
+    QApplication, QDialog, QDialogButtonBox, QFileDialog, QFrame, QHBoxLayout,
+    QLabel, QLineEdit, QPlainTextEdit, QPushButton, QVBoxLayout, QWidget
 )
 
 from novelwriter import CONFIG, SHARED
-from novelwriter.error import formatException
 from novelwriter.common import formatFileFilter, openExternalPath, formatInt, getFileSize
+from novelwriter.error import formatException
+from novelwriter.extensions.modified import NIconToolButton
+from novelwriter.types import QtDialogClose
 
 logger = logging.getLogger(__name__)
 
@@ -54,6 +56,7 @@ class GuiDictionaries(QDialog):
         self._installPath = None
         self._currDicts = set()
 
+        iSz = SHARED.theme.baseIconSize
         iPx = CONFIG.pxInt(4)
         mPx = CONFIG.pxInt(8)
         sPx = CONFIG.pxInt(16)
@@ -68,12 +71,11 @@ class GuiDictionaries(QDialog):
             self.tr("Download a dictionary from one of the links, and add it below."),
             f"&nbsp;\u203a <a href='{foUrl}'>{foUrl}</a>",
             f"&nbsp;\u203a <a href='{loUrl}'>{loUrl}</a>",
-        ]))
+        ]), self)
         self.huInfo.setOpenExternalLinks(True)
         self.huInfo.setWordWrap(True)
         self.huInput = QLineEdit(self)
-        self.huBrowse = QPushButton(self)
-        self.huBrowse.setIcon(SHARED.theme.getIcon("browse"))
+        self.huBrowse = NIconToolButton(self, iSz, "browse")
         self.huBrowse.clicked.connect(self._doBrowseHunspell)
         self.huImport = QPushButton(self.tr("Add Dictionary"), self)
         self.huImport.setIcon(SHARED.theme.getIcon("add"))
@@ -88,11 +90,10 @@ class GuiDictionaries(QDialog):
         self.huAddBox.addWidget(self.huImport)
 
         # Install Path
-        self.inInfo = QLabel(self.tr("Dictionary install location"))
+        self.inInfo = QLabel(self.tr("Dictionary install location"), self)
         self.inPath = QLineEdit(self)
         self.inPath.setReadOnly(True)
-        self.inBrowse = QPushButton(self)
-        self.inBrowse.setIcon(SHARED.theme.getIcon("browse"))
+        self.inBrowse = NIconToolButton(self, iSz, "browse")
         self.inBrowse.clicked.connect(self._doOpenInstallLocation)
 
         self.inBox = QHBoxLayout()
@@ -107,7 +108,7 @@ class GuiDictionaries(QDialog):
         self.infoBox.setFrameStyle(QFrame.Shape.NoFrame)
 
         # Buttons
-        self.buttonBox = QDialogButtonBox(QDialogButtonBox.Close)
+        self.buttonBox = QDialogButtonBox(QtDialogClose, self)
         self.buttonBox.rejected.connect(self._doClose)
 
         # Assemble
@@ -158,7 +159,7 @@ class GuiDictionaries(QDialog):
                 "Additional dictionaries found: {0}"
             ).format(len(self._currDicts)))
 
-        qApp.processEvents()
+        QApplication.processEvents()
         self.adjustSize()
 
         return True
@@ -178,7 +179,7 @@ class GuiDictionaries(QDialog):
     ##
 
     @pyqtSlot()
-    def _doBrowseHunspell(self):
+    def _doBrowseHunspell(self) -> None:
         """Browse for a Free/Libre Office dictionary."""
         ffilter = formatFileFilter([
             (self.tr("Free or Libre Office extension"), "*.sox *.oxt"), "*"
@@ -192,7 +193,7 @@ class GuiDictionaries(QDialog):
         return
 
     @pyqtSlot()
-    def _doImportHunspell(self):
+    def _doImportHunspell(self) -> None:
         """Import a hunspell dictionary from .sox or .oxt file."""
         procErr = self.tr("Could not process dictionary file")
         if self._installPath:

novelwriter/tools/lipsum.py

@@ -35,6 +35,7 @@ from PyQt5.QtWidgets import (
 from novelwriter import CONFIG, SHARED
 from novelwriter.common import readTextFile
 from novelwriter.extensions.switch import NSwitch
+from novelwriter.types import QtAlignLeft, QtAlignRight, QtRoleAction, QtDialogClose
 
 logger = logging.getLogger(__name__)
 
@@ -53,13 +54,14 @@ class GuiLipsum(QDialog):
 
         self.setWindowTitle(self.tr("Insert Placeholder Text"))
 
+        vSp = CONFIG.pxInt(4)
+        nPx = CONFIG.pxInt(64)
+
         self.innerBox = QHBoxLayout()
         self.innerBox.setSpacing(CONFIG.pxInt(16))
 
         # Icon
-        nPx = CONFIG.pxInt(64)
-        vSp = CONFIG.pxInt(4)
-        self.docIcon = QLabel()
+        self.docIcon = QLabel(self)
         self.docIcon.setPixmap(SHARED.theme.getPixmap("proj_document", (nPx, nPx)))
 
         self.leftBox = QVBoxLayout()
@@ -69,35 +71,36 @@ class GuiLipsum(QDialog):
         self.innerBox.addLayout(self.leftBox)
 
         # Form
-        self.headLabel = QLabel("<b>{0}</b>".format(self.tr("Insert Lorem Ipsum Text")))
+        self.headLabel = QLabel(self.tr("Insert Lorem Ipsum Text"))
+        self.headLabel.setFont(SHARED.theme.guiFontB)
 
-        self.paraLabel = QLabel(self.tr("Number of paragraphs"))
-        self.paraCount = QSpinBox()
+        self.paraLabel = QLabel(self.tr("Number of paragraphs"), self)
+        self.paraCount = QSpinBox(self)
         self.paraCount.setMinimum(1)
         self.paraCount.setMaximum(100)
         self.paraCount.setValue(5)
 
-        self.randLabel = QLabel(self.tr("Randomise order"))
-        self.randSwitch = NSwitch()
+        self.randLabel = QLabel(self.tr("Randomise order"), self)
+        self.randSwitch = NSwitch(self)
 
         self.formBox = QGridLayout()
-        self.formBox.addWidget(self.headLabel, 0, 0, 1, 2, Qt.AlignLeft)
-        self.formBox.addWidget(self.paraLabel, 1, 0, 1, 1, Qt.AlignLeft)
-        self.formBox.addWidget(self.paraCount, 1, 1, 1, 1, Qt.AlignRight)
-        self.formBox.addWidget(self.randLabel, 2, 0, 1, 1, Qt.AlignLeft)
-        self.formBox.addWidget(self.randSwitch, 2, 1, 1, 1, Qt.AlignRight)
+        self.formBox.addWidget(self.headLabel, 0, 0, 1, 2, QtAlignLeft)
+        self.formBox.addWidget(self.paraLabel, 1, 0, 1, 1, QtAlignLeft)
+        self.formBox.addWidget(self.paraCount, 1, 1, 1, 1, QtAlignRight)
+        self.formBox.addWidget(self.randLabel, 2, 0, 1, 1, QtAlignLeft)
+        self.formBox.addWidget(self.randSwitch, 2, 1, 1, 1, QtAlignRight)
         self.formBox.setVerticalSpacing(vSp)
         self.formBox.setRowStretch(3, 1)
         self.innerBox.addLayout(self.formBox)
 
         # Buttons
-        self.buttonBox = QDialogButtonBox()
+        self.buttonBox = QDialogButtonBox(self)
         self.buttonBox.rejected.connect(self.close)
 
-        self.btnClose = self.buttonBox.addButton(QDialogButtonBox.Close)
+        self.btnClose = self.buttonBox.addButton(QtDialogClose)
         self.btnClose.setAutoDefault(False)
 
-        self.btnInsert = self.buttonBox.addButton(self.tr("Insert"), QDialogButtonBox.ActionRole)
+        self.btnInsert = self.buttonBox.addButton(self.tr("Insert"), QtRoleAction)
         self.btnInsert.clicked.connect(self._doInsert)
         self.btnInsert.setAutoDefault(False)
 
@@ -127,7 +130,7 @@ class GuiLipsum(QDialog):
     def getLipsum(cls, parent: QWidget) -> str:
         """Pop the dialog and return the lipsum text."""
         cls = GuiLipsum(parent)
-        cls.exec_()
+        cls.exec()
         text = cls.lipsumText
         cls.deleteLater()
         return text

novelwriter/tools/manusbuild.py

@@ -27,8 +27,8 @@ import logging
 
 from pathlib import Path
 
+from PyQt5.QtCore import QTimer, pyqtSlot
 from PyQt5.QtGui import QCloseEvent
-from PyQt5.QtCore import QSize, QTimer, Qt, pyqtSlot
 from PyQt5.QtWidgets import (
     QAbstractButton, QAbstractItemView, QDialog, QDialogButtonBox, QFileDialog,
     QGridLayout, QHBoxLayout, QLabel, QLineEdit, QListWidget, QListWidgetItem,
@@ -36,13 +36,15 @@ from PyQt5.QtWidgets import (
 )
 
 from novelwriter import CONFIG, SHARED
-from novelwriter.enum import nwBuildFmt
 from novelwriter.common import makeFileNameSafe, openExternalPath
 from novelwriter.constants import nwLabels
-from novelwriter.core.item import NWItem
-from novelwriter.core.docbuild import NWBuildDocument
 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.types import QtAlignCenter, QtDialogClose, QtRoleAction, QtRoleReject, QtUserRole
 
 logger = logging.getLogger(__name__)
 
@@ -54,9 +56,9 @@ class GuiManuscriptBuild(QDialog):
     independently of the Manuscript Build Tool.
     """
 
-    D_KEY = Qt.ItemDataRole.UserRole
+    D_KEY = QtUserRole
 
-    def __init__(self, parent: QWidget, build: BuildSettings):
+    def __init__(self, parent: QWidget, build: BuildSettings) -> None:
         super().__init__(parent=parent)
 
         logger.debug("Create: GuiManuscriptBuild")
@@ -69,7 +71,8 @@ class GuiManuscriptBuild(QDialog):
         self.setMinimumWidth(CONFIG.pxInt(500))
         self.setMinimumHeight(CONFIG.pxInt(300))
 
-        iPx = SHARED.theme.baseIconSize
+        iSz = SHARED.theme.baseIconSize
+        bSz = SHARED.theme.buttonIconSize
         sp4 = CONFIG.pxInt(4)
         sp8 = CONFIG.pxInt(8)
         sp16 = CONFIG.pxInt(16)
@@ -85,9 +88,9 @@ class GuiManuscriptBuild(QDialog):
         # Output Format
         # =============
 
-        self.lblFormat = QLabel(self.tr("Output Format"))
-        self.listFormats = QListWidget()
-        self.listFormats.setIconSize(QSize(iPx, iPx))
+        self.lblFormat = QLabel(self.tr("Output Format"), self)
+        self.listFormats = QListWidget(self)
+        self.listFormats.setIconSize(iSz)
         current = None
         for key in nwBuildFmt:
             item = QListWidgetItem()
@@ -104,17 +107,17 @@ class GuiManuscriptBuild(QDialog):
         self.formatBox.addWidget(self.listFormats, 1)
         self.formatBox.setContentsMargins(0, 0, 0, 0)
 
-        self.formatWidget = QWidget()
+        self.formatWidget = QWidget(self)
         self.formatWidget.setLayout(self.formatBox)
         self.formatWidget.setContentsMargins(0, 0, 0, 0)
 
         # Table of Contents
         # =================
 
-        self.lblContent = QLabel(self.tr("Table of Contents"))
+        self.lblContent = QLabel(self.tr("Table of Contents"), self)
 
         self.listContent = QListWidget(self)
-        self.listContent.setIconSize(QSize(iPx, iPx))
+        self.listContent.setIconSize(iSz)
         self.listContent.setSelectionMode(QAbstractItemView.SelectionMode.NoSelection)
 
         self.contentBox = QVBoxLayout()
@@ -122,7 +125,7 @@ class GuiManuscriptBuild(QDialog):
         self.contentBox.addWidget(self.listContent, 0)
         self.contentBox.setContentsMargins(0, 0, 0, 0)
 
-        self.contentWidget = QWidget()
+        self.contentWidget = QWidget(self)
         self.contentWidget.setLayout(self.contentBox)
         self.contentWidget.setContentsMargins(0, 0, 0, 0)
 
@@ -134,14 +137,14 @@ class GuiManuscriptBuild(QDialog):
         font.setUnderline(True)
         font.setPointSizeF(1.5*font.pointSizeF())
 
-        self.lblMain = QLabel(self._build.name)
+        self.lblMain = QLabel(self._build.name, self)
         self.lblMain.setWordWrap(True)
         self.lblMain.setFont(font)
 
         # Build Path
-        self.lblPath = QLabel(self.tr("Path"))
+        self.lblPath = QLabel(self.tr("Path"), self)
         self.buildPath = QLineEdit(self)
-        self.btnBrowse = QPushButton(SHARED.theme.getIcon("browse"), "")
+        self.btnBrowse = NIconToolButton(self, iSz, "browse")
 
         self.pathBox = QHBoxLayout()
         self.pathBox.addWidget(self.buildPath)
@@ -149,9 +152,9 @@ class GuiManuscriptBuild(QDialog):
         self.pathBox.setSpacing(sp8)
 
         # Build Name
-        self.lblName = QLabel(self.tr("File Name"))
+        self.lblName = QLabel(self.tr("File Name"), self)
         self.buildName = QLineEdit(self)
-        self.btnReset = QPushButton(SHARED.theme.getIcon("revert"), "")
+        self.btnReset = NIconToolButton(self, iSz, "revert")
         self.btnReset.setToolTip(self.tr("Reset file name to default"))
 
         self.nameBox = QHBoxLayout()
@@ -176,16 +179,19 @@ class GuiManuscriptBuild(QDialog):
         self.buildBox.setVerticalSpacing(sp4)
 
         # Dialog Buttons
-        self.btnOpen = QPushButton(SHARED.theme.getIcon("browse"), self.tr("Open Folder"))
-        self.btnBuild = QPushButton(SHARED.theme.getIcon("export"), self.tr("&Build"))
-        self.dlgButtons = QDialogButtonBox(QDialogButtonBox.StandardButton.Close)
-        self.dlgButtons.addButton(self.btnOpen, QDialogButtonBox.ButtonRole.ActionRole)
-        self.dlgButtons.addButton(self.btnBuild, QDialogButtonBox.ButtonRole.ActionRole)
+        self.btnOpen = QPushButton(SHARED.theme.getIcon("browse"), self.tr("Open Folder"), self)
+        self.btnOpen.setIconSize(bSz)
+        self.btnBuild = QPushButton(SHARED.theme.getIcon("export"), self.tr("&Build"), self)
+        self.btnBuild.setIconSize(bSz)
+
+        self.dlgButtons = QDialogButtonBox(QtDialogClose, self)
+        self.dlgButtons.addButton(self.btnOpen, QtRoleAction)
+        self.dlgButtons.addButton(self.btnBuild, QtRoleAction)
 
         # Assemble GUI
         # ============
 
-        self.mainSplit = QSplitter()
+        self.mainSplit = QSplitter(self)
         self.mainSplit.addWidget(self.formatWidget)
         self.mainSplit.addWidget(self.contentWidget)
         self.mainSplit.setHandleWidth(sp16)
@@ -199,7 +205,7 @@ class GuiManuscriptBuild(QDialog):
         ])
 
         self.outerBox = QVBoxLayout()
-        self.outerBox.addWidget(self.lblMain, 0, Qt.AlignCenter)
+        self.outerBox.addWidget(self.lblMain, 0, QtAlignCenter)
         self.outerBox.addSpacing(sp16)
         self.outerBox.addWidget(self.mainSplit, 1)
         self.outerBox.addSpacing(sp4)
@@ -252,20 +258,20 @@ class GuiManuscriptBuild(QDialog):
     ##
 
     @pyqtSlot("QAbstractButton*")
-    def _dialogButtonClicked(self, button: QAbstractButton):
+    def _dialogButtonClicked(self, button: QAbstractButton) -> None:
         """Handle button clicks from the dialog button box."""
         role = self.dlgButtons.buttonRole(button)
-        if role == QDialogButtonBox.ActionRole:
+        if role == QtRoleAction:
             if button == self.btnBuild:
                 self._runBuild()
             elif button == self.btnOpen:
                 self._openOutputFolder()
-        elif role == QDialogButtonBox.RejectRole:
+        elif role == QtRoleReject:
             self.close()
         return
 
     @pyqtSlot()
-    def _doSelectPath(self):
+    def _doSelectPath(self) -> None:
         """Select a folder for output."""
         bPath = Path(self.buildPath.text())
         bPath = bPath if bPath.is_dir() else self._build.lastPath
@@ -277,7 +283,7 @@ class GuiManuscriptBuild(QDialog):
         return
 
     @pyqtSlot()
-    def _doResetBuildName(self):
+    def _doResetBuildName(self) -> None:
         """Generate a default build name."""
         bName = f"{SHARED.project.data.name} - {self._build.name}"
         self.buildName.setText(bName)
@@ -285,7 +291,7 @@ class GuiManuscriptBuild(QDialog):
         return
 
     @pyqtSlot()
-    def _resetProgress(self):
+    def _resetProgress(self) -> None:
         """Set the progress bar back to 0."""
         self.buildProgress.setValue(0)
         return
@@ -320,6 +326,9 @@ class GuiManuscriptBuild(QDialog):
             ):
                 return False
 
+        # Make sure editor content is saved before we start
+        SHARED.mainGui.saveDocument()
+
         docBuild = NWBuildDocument(SHARED.project, self._build)
         docBuild.queueAll()
 
@@ -342,7 +351,7 @@ class GuiManuscriptBuild(QDialog):
             return items[0].data(self.D_KEY)
         return None
 
-    def _saveSettings(self):
+    def _saveSettings(self) -> None:
         """Save the user GUI settings."""
         winWidth  = CONFIG.rpxInt(self.width())
         winHeight = CONFIG.rpxInt(self.height())
@@ -361,7 +370,7 @@ class GuiManuscriptBuild(QDialog):
 
         return
 
-    def _populateContentList(self):
+    def _populateContentList(self) -> None:
         """Build the content list."""
         rootMap = {}
         filtered = self._build.buildItemFilter(SHARED.project)
@@ -390,7 +399,7 @@ class GuiManuscriptBuild(QDialog):
 
         return
 
-    def _openOutputFolder(self):
+    def _openOutputFolder(self) -> None:
         """Open the build folder in the system's file explorer."""
         openExternalPath(Path(self.buildPath.text()))
         return