novelWriter 2.6.3__py3-none-any.whl → 2.7rc1__py3-none-any.whl

novelwriter/tools/dictionaries.py

@@ -28,18 +28,18 @@ import logging
 from pathlib import Path
 from zipfile import ZipFile
 
-from PyQt5.QtCore import pyqtSlot
-from PyQt5.QtGui import QCloseEvent, QTextCursor
-from PyQt5.QtWidgets import (
+from PyQt6.QtCore import pyqtSlot
+from PyQt6.QtGui import QCloseEvent, QTextCursor
+from PyQt6.QtWidgets import (
     QApplication, QDialogButtonBox, QFileDialog, QFrame, QHBoxLayout, QLabel,
     QLineEdit, QPlainTextEdit, QPushButton, QVBoxLayout, QWidget
 )
 
 from novelwriter import CONFIG, SHARED
-from novelwriter.common import cssCol, formatFileFilter, formatInt, getFileSize, openExternalPath
+from novelwriter.common import formatFileFilter, formatInt, getFileSize, openExternalPath
 from novelwriter.error import formatException
 from novelwriter.extensions.modified import NIconToolButton, NNonBlockingDialog
-from novelwriter.types import QtDialogClose
+from novelwriter.types import QtDialogClose, QtHexArgb
 
 logger = logging.getLogger(__name__)
 
@@ -57,12 +57,9 @@ class GuiDictionaries(NNonBlockingDialog):
         self._currDicts = set()
 
         iSz = SHARED.theme.baseIconSize
-        iPx = CONFIG.pxInt(4)
-        mPx = CONFIG.pxInt(8)
-        sPx = CONFIG.pxInt(16)
 
-        self.setMinimumWidth(CONFIG.pxInt(500))
-        self.setMinimumHeight(CONFIG.pxInt(300))
+        self.setMinimumWidth(500)
+        self.setMinimumHeight(300)
 
         # Hunspell Dictionaries
         loUrl = "https://extensions.libreoffice.org"
@@ -78,13 +75,13 @@ class GuiDictionaries(NNonBlockingDialog):
         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"))
+        self.huImport.setIcon(SHARED.theme.getIcon("add", "green"))
         self.huImport.clicked.connect(self._doImportHunspell)
 
         self.huPathBox = QHBoxLayout()
         self.huPathBox.addWidget(self.huInput)
         self.huPathBox.addWidget(self.huBrowse)
-        self.huPathBox.setSpacing(iPx)
+        self.huPathBox.setSpacing(4)
         self.huAddBox = QHBoxLayout()
         self.huAddBox.addStretch(1)
         self.huAddBox.addWidget(self.huImport)
@@ -99,12 +96,11 @@ class GuiDictionaries(NNonBlockingDialog):
         self.inBox = QHBoxLayout()
         self.inBox.addWidget(self.inPath)
         self.inBox.addWidget(self.inBrowse)
-        self.inBox.setSpacing(iPx)
+        self.inBox.setSpacing(4)
 
         # Info Box
         self.infoBox = QPlainTextEdit(self)
         self.infoBox.setReadOnly(True)
-        self.infoBox.setFixedHeight(4*SHARED.theme.fontPixelSize)
         self.infoBox.setFrameStyle(QFrame.Shape.NoFrame)
 
         # Buttons
@@ -112,21 +108,16 @@ class GuiDictionaries(NNonBlockingDialog):
         self.buttonBox.rejected.connect(self.reject)
 
         # Assemble
-        self.innerBox = QVBoxLayout()
-        self.innerBox.addWidget(self.huInfo)
-        self.innerBox.addLayout(self.huPathBox)
-        self.innerBox.addLayout(self.huAddBox)
-        self.innerBox.addSpacing(mPx)
-        self.innerBox.addWidget(self.inInfo)
-        self.innerBox.addLayout(self.inBox)
-        self.innerBox.addWidget(self.infoBox)
-        self.innerBox.setSpacing(iPx)
-
         self.outerBox = QVBoxLayout()
-        self.outerBox.addLayout(self.innerBox, 0)
-        self.outerBox.addStretch(1)
+        self.outerBox.addWidget(self.huInfo, 0)
+        self.outerBox.addLayout(self.huPathBox, 0)
+        self.outerBox.addLayout(self.huAddBox, 0)
+        self.outerBox.addSpacing(8)
+        self.outerBox.addWidget(self.inInfo, 0)
+        self.outerBox.addLayout(self.inBox, 0)
+        self.outerBox.addWidget(self.infoBox, 1)
+        self.outerBox.addSpacing(8)
         self.outerBox.addWidget(self.buttonBox, 0)
-        self.outerBox.setSpacing(sPx)
 
         self.setLayout(self.outerBox)
 
@@ -251,8 +242,8 @@ class GuiDictionaries(NNonBlockingDialog):
         cursor.movePosition(QTextCursor.MoveOperation.End)
         if cursor.position() > 0:
             cursor.insertText("\n")
-        textCol = cssCol(SHARED.theme.errorText if err else self.palette().text().color())
-        cursor.insertHtml(f"<font style='color: {textCol}'>{text}</font>")
+        textCol = SHARED.theme.errorText if err else self.palette().text().color()
+        cursor.insertHtml(f"<font style='color: {textCol.name(QtHexArgb)}'>{text}</font>")
         cursor.movePosition(QTextCursor.MoveOperation.End)
         cursor.deleteChar()
         self.infoBox.setTextCursor(cursor)

novelwriter/tools/lipsum.py

@@ -26,8 +26,8 @@ from __future__ import annotations
 import logging
 import random
 
-from PyQt5.QtCore import pyqtSlot
-from PyQt5.QtWidgets import (
+from PyQt6.QtCore import pyqtSlot
+from PyQt6.QtWidgets import (
     QDialogButtonBox, QGridLayout, QHBoxLayout, QLabel, QSpinBox, QVBoxLayout,
     QWidget
 )
@@ -52,18 +52,15 @@ class GuiLipsum(NDialog):
 
         self._lipsumText = ""
 
-        vSp = CONFIG.pxInt(4)
-        nPx = CONFIG.pxInt(64)
-
         self.innerBox = QHBoxLayout()
-        self.innerBox.setSpacing(CONFIG.pxInt(16))
+        self.innerBox.setSpacing(16)
 
         # Icon
         self.docIcon = QLabel(self)
-        self.docIcon.setPixmap(SHARED.theme.getPixmap("proj_document", (nPx, nPx)))
+        self.docIcon.setPixmap(SHARED.theme.getPixmap("text", (64, 64), "blue"))
 
         self.leftBox = QVBoxLayout()
-        self.leftBox.setSpacing(vSp)
+        self.leftBox.setSpacing(4)
         self.leftBox.addWidget(self.docIcon)
         self.leftBox.addStretch(1)
         self.innerBox.addLayout(self.leftBox)
@@ -78,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)
@@ -87,7 +85,7 @@ class GuiLipsum(NDialog):
         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.setVerticalSpacing(4)
         self.formBox.setRowStretch(3, 1)
         self.innerBox.addLayout(self.formBox)
 
@@ -96,17 +94,19 @@ class GuiLipsum(NDialog):
         self.buttonBox.rejected.connect(self.reject)
 
         self.btnClose = self.buttonBox.addButton(QtDialogClose)
-        self.btnClose.setAutoDefault(False)
+        if self.btnClose:
+            self.btnClose.setAutoDefault(False)
 
         self.btnInsert = self.buttonBox.addButton(self.tr("Insert"), QtRoleAction)
-        self.btnInsert.clicked.connect(self._doInsert)
-        self.btnInsert.setAutoDefault(False)
+        if self.btnInsert:
+            self.btnInsert.clicked.connect(self._doInsert)
+            self.btnInsert.setAutoDefault(False)
 
         # Assemble
         self.outerBox = QVBoxLayout()
         self.outerBox.addLayout(self.innerBox)
         self.outerBox.addWidget(self.buttonBox)
-        self.outerBox.setSpacing(CONFIG.pxInt(16))
+        self.outerBox.setSpacing(16)
         self.setLayout(self.outerBox)
 
         logger.debug("Ready: GuiLipsum")
@@ -125,10 +125,10 @@ class GuiLipsum(NDialog):
     @classmethod
     def getLipsum(cls, parent: QWidget) -> str:
         """Pop the dialog and return the lipsum text."""
-        cls = GuiLipsum(parent)
-        cls.exec()
-        text = cls.lipsumText
-        cls.softDelete()
+        dialog = cls(parent)
+        dialog.exec()
+        text = dialog.lipsumText
+        dialog.softDelete()
         return text
 
     ##

novelwriter/tools/manusbuild.py

@@ -26,19 +26,18 @@ from __future__ import annotations
 import logging
 
 from pathlib import Path
+from typing import TYPE_CHECKING
 
-from PyQt5.QtCore import QTimer, pyqtSlot
-from PyQt5.QtGui import QCloseEvent
-from PyQt5.QtWidgets import (
+from PyQt6.QtCore import QTimer, pyqtSlot
+from PyQt6.QtWidgets import (
     QAbstractButton, QAbstractItemView, QDialogButtonBox, QFileDialog,
     QGridLayout, QHBoxLayout, QLabel, QLineEdit, QListWidget, QListWidgetItem,
     QPushButton, QSplitter, QVBoxLayout, QWidget
 )
 
-from novelwriter import CONFIG, SHARED
+from novelwriter import SHARED
 from novelwriter.common import makeFileNameSafe, openExternalPath
 from novelwriter.constants import nwLabels
-from novelwriter.core.buildsettings import BuildSettings
 from novelwriter.core.docbuild import NWBuildDocument
 from novelwriter.core.item import NWItem
 from novelwriter.enum import nwBuildFmt
@@ -46,6 +45,11 @@ from novelwriter.extensions.modified import NDialog, NIconToolButton
 from novelwriter.extensions.progressbars import NProgressSimple
 from novelwriter.types import QtAlignCenter, QtDialogClose, QtRoleAction, QtRoleReject, QtUserRole
 
+if TYPE_CHECKING:
+    from PyQt6.QtGui import QCloseEvent
+
+    from novelwriter.core.buildsettings import BuildSettings
+
 logger = logging.getLogger(__name__)
 
 
@@ -68,21 +72,16 @@ class GuiManuscriptBuild(NDialog):
         self._build = build
 
         self.setWindowTitle(self.tr("Build Manuscript"))
-        self.setMinimumWidth(CONFIG.pxInt(500))
-        self.setMinimumHeight(CONFIG.pxInt(300))
+        self.setMinimumWidth(500)
+        self.setMinimumHeight(300)
 
         iSz = SHARED.theme.baseIconSize
         bSz = SHARED.theme.buttonIconSize
-        sp4 = CONFIG.pxInt(4)
-        sp8 = CONFIG.pxInt(8)
-        sp16 = CONFIG.pxInt(16)
-        wWin = CONFIG.pxInt(620)
-        hWin = CONFIG.pxInt(360)
 
         pOptions = SHARED.project.options
         self.resize(
-            CONFIG.pxInt(pOptions.getInt("GuiManuscriptBuild", "winWidth", wWin)),
-            CONFIG.pxInt(pOptions.getInt("GuiManuscriptBuild", "winHeight", hWin))
+            pOptions.getInt("GuiManuscriptBuild", "winWidth", 620),
+            pOptions.getInt("GuiManuscriptBuild", "winHeight", 360),
         )
 
         # Output Format
@@ -149,25 +148,25 @@ class GuiManuscriptBuild(NDialog):
         self.pathBox = QHBoxLayout()
         self.pathBox.addWidget(self.buildPath)
         self.pathBox.addWidget(self.btnBrowse)
-        self.pathBox.setSpacing(sp8)
+        self.pathBox.setSpacing(8)
 
         # Build Name
         self.lblName = QLabel(self.tr("File Name"), self)
         self.buildName = QLineEdit(self)
-        self.btnReset = NIconToolButton(self, iSz, "revert")
+        self.btnReset = NIconToolButton(self, iSz, "revert", "green")
         self.btnReset.setToolTip(self.tr("Reset file name to default"))
 
         self.nameBox = QHBoxLayout()
         self.nameBox.addWidget(self.buildName)
         self.nameBox.addWidget(self.btnReset)
-        self.nameBox.setSpacing(sp8)
+        self.nameBox.setSpacing(8)
 
         # Build Progress
         self.buildProgress = NProgressSimple(self)
         self.buildProgress.setMinimum(0)
         self.buildProgress.setValue(0)
         self.buildProgress.setTextVisible(False)
-        self.buildProgress.setFixedHeight(sp8)
+        self.buildProgress.setFixedHeight(8)
 
         # Build Box
         self.buildBox = QGridLayout()
@@ -175,24 +174,29 @@ class GuiManuscriptBuild(NDialog):
         self.buildBox.addLayout(self.pathBox, 0, 1)
         self.buildBox.addWidget(self.lblName, 1, 0)
         self.buildBox.addLayout(self.nameBox, 1, 1)
-        self.buildBox.setHorizontalSpacing(sp8)
-        self.buildBox.setVerticalSpacing(sp4)
+        self.buildBox.setHorizontalSpacing(8)
+        self.buildBox.setVerticalSpacing(4)
 
         # Dialog Buttons
         self.buttonBox = QDialogButtonBox(self)
 
-        self.btnOpen = QPushButton(SHARED.theme.getIcon("browse"), self.tr("Open Folder"), self)
+        self.btnOpen = QPushButton(
+            SHARED.theme.getIcon("browse", "yellow"), self.tr("Open Folder"), self
+        )
         self.btnOpen.setIconSize(bSz)
         self.btnOpen.setAutoDefault(False)
         self.buttonBox.addButton(self.btnOpen, QtRoleAction)
 
-        self.btnBuild = QPushButton(SHARED.theme.getIcon("export"), self.tr("&Build"), self)
+        self.btnBuild = QPushButton(
+            SHARED.theme.getIcon("sb_build", "blue"), self.tr("&Build"), self
+        )
         self.btnBuild.setIconSize(bSz)
         self.btnBuild.setAutoDefault(True)
         self.buttonBox.addButton(self.btnBuild, QtRoleAction)
 
         self.btnClose = self.buttonBox.addButton(QtDialogClose)
-        self.btnClose.setAutoDefault(False)
+        if self.btnClose:
+            self.btnClose.setAutoDefault(False)
 
         # Assemble GUI
         # ============
@@ -200,25 +204,25 @@ class GuiManuscriptBuild(NDialog):
         self.mainSplit = QSplitter(self)
         self.mainSplit.addWidget(self.formatWidget)
         self.mainSplit.addWidget(self.contentWidget)
-        self.mainSplit.setHandleWidth(sp16)
+        self.mainSplit.setHandleWidth(16)
         self.mainSplit.setCollapsible(0, False)
         self.mainSplit.setCollapsible(1, False)
         self.mainSplit.setStretchFactor(0, 0)
         self.mainSplit.setStretchFactor(1, 1)
         self.mainSplit.setSizes([
-            CONFIG.pxInt(pOptions.getInt("GuiManuscriptBuild", "fmtWidth", wWin//2)),
-            CONFIG.pxInt(pOptions.getInt("GuiManuscriptBuild", "sumWidth", wWin//2)),
+            pOptions.getInt("GuiManuscriptBuild", "fmtWidth", 360),
+            pOptions.getInt("GuiManuscriptBuild", "sumWidth", 360),
         ])
 
         self.outerBox = QVBoxLayout()
         self.outerBox.addWidget(self.lblMain, 0, QtAlignCenter)
-        self.outerBox.addSpacing(sp16)
+        self.outerBox.addSpacing(16)
         self.outerBox.addWidget(self.mainSplit, 1)
-        self.outerBox.addSpacing(sp4)
+        self.outerBox.addSpacing(4)
         self.outerBox.addWidget(self.buildProgress, 0)
-        self.outerBox.addSpacing(sp4)
+        self.outerBox.addSpacing(4)
         self.outerBox.addLayout(self.buildBox, 0)
-        self.outerBox.addSpacing(sp16)
+        self.outerBox.addSpacing(16)
         self.outerBox.addWidget(self.buttonBox, 0)
         self.outerBox.setSpacing(0)
 
@@ -359,21 +363,14 @@ class GuiManuscriptBuild(NDialog):
 
     def _saveSettings(self) -> None:
         """Save the user GUI settings."""
-        winWidth  = CONFIG.rpxInt(self.width())
-        winHeight = CONFIG.rpxInt(self.height())
-
-        mainSplit = self.mainSplit.sizes()
-        fmtWidth = CONFIG.rpxInt(mainSplit[0])
-        sumWidth = CONFIG.rpxInt(mainSplit[1])
-
         logger.debug("Saving State: GuiManuscriptBuild")
+        mainSplit = self.mainSplit.sizes()
         pOptions = SHARED.project.options
-        pOptions.setValue("GuiManuscriptBuild", "winWidth", winWidth)
-        pOptions.setValue("GuiManuscriptBuild", "winHeight", winHeight)
-        pOptions.setValue("GuiManuscriptBuild", "fmtWidth", fmtWidth)
-        pOptions.setValue("GuiManuscriptBuild", "sumWidth", sumWidth)
+        pOptions.setValue("GuiManuscriptBuild", "winWidth", self.width())
+        pOptions.setValue("GuiManuscriptBuild", "winHeight", self.height())
+        pOptions.setValue("GuiManuscriptBuild", "fmtWidth", mainSplit[0])
+        pOptions.setValue("GuiManuscriptBuild", "sumWidth", mainSplit[1])
         pOptions.saveSettings()
-
         return
 
     def _populateContentList(self) -> None: