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

novelwriter/dialogs/docmerge.py

@@ -26,14 +26,14 @@ from __future__ import annotations
 
 import logging
 
-from PyQt5.QtCore import Qt, pyqtSlot
-from PyQt5.QtWidgets import (
+from PyQt6.QtCore import Qt, pyqtSlot
+from PyQt6.QtWidgets import (
     QAbstractItemView, QDialogButtonBox, QGridLayout, QLabel, QListWidget,
     QListWidgetItem, QVBoxLayout, QWidget
 )
 
-from novelwriter import CONFIG, SHARED
-from novelwriter.extensions.configlayout import NColourLabel
+from novelwriter import SHARED
+from novelwriter.extensions.configlayout import NColorLabel
 from novelwriter.extensions.modified import NDialog
 from novelwriter.extensions.switch import NSwitch
 from novelwriter.types import QtAccepted, QtDialogCancel, QtDialogOk, QtDialogReset, QtUserRole
@@ -56,33 +56,31 @@ class GuiDocMerge(NDialog):
 
         self.headLabel = QLabel(self.tr("Documents to Merge"), self)
         self.headLabel.setFont(SHARED.theme.guiFontB)
-        self.helpLabel = NColourLabel(
+        self.helpLabel = NColorLabel(
             self.tr("Drag and drop items to change the order, or uncheck to exclude."),
             self, color=SHARED.theme.helpText, wrap=True
         )
 
         iPx = SHARED.theme.baseIconHeight
         iSz = SHARED.theme.baseIconSize
-        hSp = CONFIG.pxInt(12)
-        vSp = CONFIG.pxInt(8)
-        bSp = CONFIG.pxInt(12)
 
         self.listBox = QListWidget(self)
         self.listBox.setIconSize(iSz)
-        self.listBox.setMinimumWidth(CONFIG.pxInt(400))
-        self.listBox.setMinimumHeight(CONFIG.pxInt(180))
+        self.listBox.setMinimumWidth(400)
+        self.listBox.setMinimumHeight(180)
         self.listBox.setSelectionBehavior(QAbstractItemView.SelectionBehavior.SelectRows)
         self.listBox.setSelectionMode(QAbstractItemView.SelectionMode.SingleSelection)
         self.listBox.setDragDropMode(QAbstractItemView.DragDropMode.InternalMove)
 
         # Merge Options
-        self.trashLabel = QLabel(self.tr("Move merged items to Trash"), self)
         self.trashSwitch = NSwitch(self, height=iPx)
+        self.trashLabel = QLabel(self.tr("Move merged items to Trash"), self)
+        self.trashLabel.setBuddy(self.trashSwitch)
 
         self.optBox = QGridLayout()
         self.optBox.addWidget(self.trashLabel,  0, 0)
         self.optBox.addWidget(self.trashSwitch, 0, 1)
-        self.optBox.setHorizontalSpacing(hSp)
+        self.optBox.setHorizontalSpacing(12)
         self.optBox.setColumnStretch(2, 1)
 
         # Buttons
@@ -91,18 +89,19 @@ class GuiDocMerge(NDialog):
         self.buttonBox.rejected.connect(self.reject)
 
         self.resetButton = self.buttonBox.addButton(QtDialogReset)
-        self.resetButton.clicked.connect(self._resetList)
+        if self.resetButton:
+            self.resetButton.clicked.connect(self._resetList)
 
         # Assemble
         self.outerBox = QVBoxLayout()
         self.outerBox.setSpacing(0)
         self.outerBox.addWidget(self.headLabel)
         self.outerBox.addWidget(self.helpLabel)
-        self.outerBox.addSpacing(vSp)
+        self.outerBox.addSpacing(8)
         self.outerBox.addWidget(self.listBox)
-        self.outerBox.addSpacing(vSp)
+        self.outerBox.addSpacing(8)
         self.outerBox.addLayout(self.optBox)
-        self.outerBox.addSpacing(bSp)
+        self.outerBox.addSpacing(12)
         self.outerBox.addWidget(self.buttonBox)
         self.setLayout(self.outerBox)
 
@@ -133,11 +132,11 @@ class GuiDocMerge(NDialog):
     @classmethod
     def getData(cls, parent: QWidget, handle: str, items: list[str]) -> tuple[dict, bool]:
         """Pop the dialog and return the result."""
-        cls = GuiDocMerge(parent, handle, items)
-        cls.exec()
-        data = cls.data()
-        accepted = cls.result() == QtAccepted
-        cls.softDelete()
+        dialog = cls(parent, handle, items)
+        dialog.exec()
+        data = dialog.data()
+        accepted = dialog.result() == QtAccepted
+        dialog.softDelete()
         return data, accepted
 
     ##
@@ -148,9 +147,9 @@ class GuiDocMerge(NDialog):
     def _resetList(self) -> None:
         """Reset the content of the list box to its original state."""
         logger.debug("Resetting list box content")
-        sHandle = self._data.get("sHandle", None)
-        itemList = self._data.get("origItems", [])
-        self._loadContent(sHandle, itemList)
+        if sHandle := self._data.get("sHandle"):
+            itemList = self._data.get("origItems", [])
+            self._loadContent(sHandle, itemList)
         return
 
     ##

novelwriter/dialogs/docsplit.py

@@ -26,14 +26,14 @@ from __future__ import annotations
 
 import logging
 
-from PyQt5.QtCore import pyqtSlot
-from PyQt5.QtWidgets import (
+from PyQt6.QtCore import pyqtSlot
+from PyQt6.QtWidgets import (
     QAbstractItemView, QComboBox, QDialogButtonBox, QGridLayout, QLabel,
     QListWidget, QListWidgetItem, QVBoxLayout, QWidget
 )
 
-from novelwriter import CONFIG, SHARED
-from novelwriter.extensions.configlayout import NColourLabel
+from novelwriter import SHARED
+from novelwriter.extensions.configlayout import NColorLabel
 from novelwriter.extensions.modified import NDialog
 from novelwriter.extensions.switch import NSwitch
 from novelwriter.types import QtAccepted, QtDialogCancel, QtDialogOk, QtUserRole
@@ -60,16 +60,13 @@ class GuiDocSplit(NDialog):
 
         self.headLabel = QLabel(self.tr("Document Headings"), self)
         self.headLabel.setFont(SHARED.theme.guiFontB)
-        self.helpLabel = NColourLabel(
+        self.helpLabel = NColorLabel(
             self.tr("Select the maximum level to split into files."),
             self, color=SHARED.theme.helpText, wrap=True
         )
 
         # Values
         iPx = SHARED.theme.baseIconHeight
-        hSp = CONFIG.pxInt(12)
-        vSp = CONFIG.pxInt(8)
-        bSp = CONFIG.pxInt(12)
 
         options = SHARED.project.options
         spLevel = options.getInt("GuiDocSplit", "spLevel", 3)
@@ -79,11 +76,11 @@ class GuiDocSplit(NDialog):
         # Heading Selection
         self.listBox = QListWidget(self)
         self.listBox.setDragDropMode(QAbstractItemView.DragDropMode.NoDragDrop)
-        self.listBox.setMinimumWidth(CONFIG.pxInt(400))
-        self.listBox.setMinimumHeight(CONFIG.pxInt(180))
+        self.listBox.setMinimumWidth(400)
+        self.listBox.setMinimumHeight(180)
 
         self.splitLevel = QComboBox(self)
-        self.splitLevel.addItem(self.tr("Split on Heading Level 1 (Partition)"),      1)
+        self.splitLevel.addItem(self.tr("Split on Heading Level 1 (Partition)"),  1)
         self.splitLevel.addItem(self.tr("Split up to Heading Level 2 (Chapter)"), 2)
         self.splitLevel.addItem(self.tr("Split up to Heading Level 3 (Scene)"),   3)
         self.splitLevel.addItem(self.tr("Split up to Heading Level 4 (Section)"), 4)
@@ -93,16 +90,19 @@ class GuiDocSplit(NDialog):
         self.splitLevel.currentIndexChanged.connect(self._reloadList)
 
         # Split Options
-        self.folderLabel = QLabel(self.tr("Split into a new folder"), self)
         self.folderSwitch = NSwitch(self, height=iPx)
         self.folderSwitch.setChecked(intoFolder)
+        self.folderLabel = QLabel(self.tr("Split into a new folder"), self)
+        self.folderLabel.setBuddy(self.folderSwitch)
 
-        self.hierarchyLabel = QLabel(self.tr("Create document hierarchy"), self)
         self.hierarchySwitch = NSwitch(self, height=iPx)
         self.hierarchySwitch.setChecked(docHierarchy)
+        self.hierarchyLabel = QLabel(self.tr("Create document hierarchy"), self)
+        self.hierarchyLabel.setBuddy(self.hierarchySwitch)
 
-        self.trashLabel = QLabel(self.tr("Move split document to Trash"), self)
         self.trashSwitch = NSwitch(self, height=iPx)
+        self.trashLabel = QLabel(self.tr("Move split document to Trash"), self)
+        self.trashLabel.setBuddy(self.trashSwitch)
 
         self.optBox = QGridLayout()
         self.optBox.addWidget(self.folderLabel,  0, 0)
@@ -111,8 +111,8 @@ class GuiDocSplit(NDialog):
         self.optBox.addWidget(self.hierarchySwitch, 1, 1)
         self.optBox.addWidget(self.trashLabel,  2, 0)
         self.optBox.addWidget(self.trashSwitch, 2, 1)
-        self.optBox.setVerticalSpacing(vSp)
-        self.optBox.setHorizontalSpacing(hSp)
+        self.optBox.setVerticalSpacing(8)
+        self.optBox.setHorizontalSpacing(12)
         self.optBox.setColumnStretch(3, 1)
 
         # Buttons
@@ -125,12 +125,12 @@ class GuiDocSplit(NDialog):
         self.outerBox.setSpacing(0)
         self.outerBox.addWidget(self.headLabel)
         self.outerBox.addWidget(self.helpLabel)
-        self.outerBox.addSpacing(vSp)
+        self.outerBox.addSpacing(8)
         self.outerBox.addWidget(self.listBox)
         self.outerBox.addWidget(self.splitLevel)
-        self.outerBox.addSpacing(vSp)
+        self.outerBox.addSpacing(8)
         self.outerBox.addLayout(self.optBox)
-        self.outerBox.addSpacing(bSp)
+        self.outerBox.addSpacing(12)
         self.outerBox.addWidget(self.buttonBox)
         self.setLayout(self.outerBox)
 
@@ -181,11 +181,11 @@ class GuiDocSplit(NDialog):
     @classmethod
     def getData(cls, parent: QWidget, handle: str) -> tuple[dict, list[str], bool]:
         """Pop the dialog and return the result."""
-        cls = GuiDocSplit(parent, handle)
-        cls.exec()
-        data, text = cls.data()
-        accepted = cls.result() == QtAccepted
-        cls.softDelete()
+        dialog = cls(parent, handle)
+        dialog.exec()
+        data, text = dialog.data()
+        accepted = dialog.result() == QtAccepted
+        dialog.softDelete()
         return data, text, accepted
 
     ##
@@ -195,8 +195,8 @@ class GuiDocSplit(NDialog):
     @pyqtSlot()
     def _reloadList(self) -> None:
         """Reload the content of the list box."""
-        sHandle = self._data.get("sHandle", None)
-        self._loadContent(sHandle)
+        if sHandle := self._data.get("sHandle"):
+            self._loadContent(sHandle)
         return
 
     ##

novelwriter/dialogs/editlabel.py

@@ -25,9 +25,8 @@ from __future__ import annotations
 
 import logging
 
-from PyQt5.QtWidgets import QDialogButtonBox, QHBoxLayout, QLabel, QLineEdit, QVBoxLayout, QWidget
+from PyQt6.QtWidgets import QDialogButtonBox, QHBoxLayout, QLabel, QLineEdit, QVBoxLayout, QWidget
 
-from novelwriter import CONFIG
 from novelwriter.extensions.modified import NDialog
 from novelwriter.types import QtAccepted, QtDialogCancel, QtDialogOk
 
@@ -43,15 +42,15 @@ class GuiEditLabel(NDialog):
         self.setObjectName("GuiEditLabel")
         self.setWindowTitle(self.tr("Item Label"))
 
-        mVd = CONFIG.pxInt(220)
-        mSp = CONFIG.pxInt(12)
-
         # Item Label
-        self.labelValue = QLineEdit(self)
-        self.labelValue.setMinimumWidth(mVd)
-        self.labelValue.setMaxLength(200)
-        self.labelValue.setText(text)
-        self.labelValue.selectAll()
+        self.edtValue = QLineEdit(self)
+        self.edtValue.setMinimumWidth(220)
+        self.edtValue.setMaxLength(200)
+        self.edtValue.setText(text)
+        self.edtValue.selectAll()
+
+        self.lblValue = QLabel(self.tr("Label"), self)
+        self.lblValue.setBuddy(self.lblValue)
 
         # Buttons
         self.buttonBox = QDialogButtonBox(QtDialogOk | QtDialogCancel, self)
@@ -60,12 +59,12 @@ class GuiEditLabel(NDialog):
 
         # Assemble
         self.innerBox = QHBoxLayout()
-        self.innerBox.addWidget(QLabel(self.tr("Label"), self), 0)
-        self.innerBox.addWidget(self.labelValue, 1)
-        self.innerBox.setSpacing(mSp)
+        self.innerBox.addWidget(self.lblValue, 0)
+        self.innerBox.addWidget(self.edtValue, 1)
+        self.innerBox.setSpacing(12)
 
         self.outerBox = QVBoxLayout()
-        self.outerBox.setSpacing(mSp)
+        self.outerBox.setSpacing(12)
         self.outerBox.addLayout(self.innerBox, 1)
         self.outerBox.addWidget(self.buttonBox, 0)
 
@@ -81,14 +80,14 @@ class GuiEditLabel(NDialog):
 
     @property
     def itemLabel(self) -> str:
-        return self.labelValue.text()
+        return self.edtValue.text()
 
     @classmethod
     def getLabel(cls, parent: QWidget, text: str) -> tuple[str, bool]:
         """Pop the dialog and return the result."""
-        cls = GuiEditLabel(parent, text=text)
-        cls.exec()
-        label = cls.itemLabel
-        accepted = cls.result() == QtAccepted
-        cls.softDelete()
+        dialog = cls(parent, text=text)
+        dialog.exec()
+        label = dialog.itemLabel
+        accepted = dialog.result() == QtAccepted
+        dialog.softDelete()
         return label, accepted