novelWriter 2.2b1__py3-none-any.whl → 2.2.1__py3-none-any.whl

novelwriter/dialogs/wordlist.py

@@ -3,10 +3,10 @@ novelWriter – GUI User Wordlist
 ===============================
 
 File History:
-Created: 2021-02-12 [1.2rc1]
+Created: 2021-02-12 [1.2rc1] GuiWordList
 
 This file is a part of novelWriter
-Copyright 2018–2023, Veronica Berglyd Olsen
+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
@@ -27,10 +27,11 @@ import logging
 
 from typing import TYPE_CHECKING
 
-from PyQt5.QtCore import Qt
+from PyQt5.QtGui import QCloseEvent
+from PyQt5.QtCore import Qt, pyqtSignal, pyqtSlot
 from PyQt5.QtWidgets import (
     QAbstractItemView, QDialog, QDialogButtonBox, QHBoxLayout, QLabel,
-    QLineEdit, QListWidget, QListWidgetItem, QPushButton, QVBoxLayout
+    QLineEdit, QListWidget, QListWidgetItem, QPushButton, QVBoxLayout, qApp
 )
 
 from novelwriter import CONFIG, SHARED
@@ -44,7 +45,9 @@ logger = logging.getLogger(__name__)
 
 class GuiWordList(QDialog):
 
-    def __init__(self, mainGui: GuiMain):
+    newWordListReady = pyqtSignal()
+
+    def __init__(self, mainGui: GuiMain) -> None:
         super().__init__(parent=mainGui)
 
         logger.debug("Create: GuiWordList")
@@ -87,7 +90,7 @@ class GuiWordList(QDialog):
 
         self.buttonBox = QDialogButtonBox(QDialogButtonBox.Save | QDialogButtonBox.Close)
         self.buttonBox.accepted.connect(self._doSave)
-        self.buttonBox.rejected.connect(self._doClose)
+        self.buttonBox.rejected.connect(self.close)
 
         # Assemble
         # ========
@@ -108,15 +111,27 @@ class GuiWordList(QDialog):
 
         return
 
-    def __del__(self):  # pragma: no cover
+    def __del__(self) -> None:  # pragma: no cover
         logger.debug("Delete: GuiWordList")
         return
 
     ##
-    #  Slots
+    #  Events
+    ##
+
+    def closeEvent(self, event: QCloseEvent) -> None:
+        """Capture the close event and perform cleanup."""
+        self._saveGuiSettings()
+        event.accept()
+        self.deleteLater()
+        return
+
+    ##
+    #  Private Slots
     ##
 
-    def _doAdd(self):
+    @pyqtSlot()
+    def _doAdd(self) -> None:
         """Add a new word to the word list."""
         word = self.newEntry.text().strip()
         if word == "":
@@ -134,16 +149,17 @@ class GuiWordList(QDialog):
 
         return
 
-    def _doDelete(self):
+    @pyqtSlot()
+    def _doDelete(self) -> None:
         """Delete the selected item."""
         selItem = self.listBox.selectedItems()
         if selItem:
             self.listBox.takeItem(self.listBox.row(selItem[0]))
         return
 
-    def _doSave(self):
+    @pyqtSlot()
+    def _doSave(self) -> None:
         """Save the new word list and close."""
-        self._saveGuiSettings()
         userDict = UserDictionary(SHARED.project)
         for i in range(self.listBox.count()):
             item = self.listBox.item(i)
@@ -152,20 +168,16 @@ class GuiWordList(QDialog):
                 if word:
                     userDict.add(word)
         userDict.save()
-        self.accept()
-        return True
-
-    def _doClose(self):
-        """Close without saving the word list."""
-        self._saveGuiSettings()
-        self.reject()
+        self.newWordListReady.emit()
+        qApp.processEvents()
+        self.close()
         return
 
     ##
     #  Internal Functions
     ##
 
-    def _loadWordList(self):
+    def _loadWordList(self) -> None:
         """Load the project's word list, if it exists."""
         userDict = UserDictionary(SHARED.project)
         userDict.load()
@@ -175,11 +187,12 @@ class GuiWordList(QDialog):
                 self.listBox.addItem(word)
         return
 
-    def _saveGuiSettings(self):
+    def _saveGuiSettings(self) -> None:
         """Save GUI settings."""
         winWidth  = CONFIG.rpxInt(self.width())
         winHeight = CONFIG.rpxInt(self.height())
 
+        logger.debug("Saving State: GuiWordList")
         pOptions = SHARED.project.options
         pOptions.setValue("GuiWordList", "winWidth",  winWidth)
         pOptions.setValue("GuiWordList", "winHeight", winHeight)

novelwriter/enum.py

@@ -6,7 +6,7 @@ File History:
 Created: 2018-11-02 [0.0.1]
 
 This file is a part of novelWriter
-Copyright 2018–2023, Veronica Berglyd Olsen
+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
@@ -61,10 +61,19 @@ class nwItemLayout(Enum):
 # END Enum nwItemLayout
 
 
+class nwComment(Enum):
+
+    PLAIN    = 0
+    SYNOPSIS = 1
+    SHORT    = 2
+
+# END Enum nwComment
+
+
 class nwTrinary(Enum):
 
     NEGATIVE = -1
-    UNKNOWN  = 0
+    NEUTRAL  = 0
     POSITIVE = 1
 
 # END Enum nwTrinary
@@ -86,9 +95,9 @@ class nwDocAction(Enum):
     CUT       = 3
     COPY      = 4
     PASTE     = 5
-    EMPH      = 6
-    STRONG    = 7
-    STRIKE    = 8
+    MD_ITALIC = 6
+    MD_BOLD   = 7
+    MD_STRIKE = 8
     S_QUOTE   = 9
     D_QUOTE   = 10
     SEL_ALL   = 11
@@ -127,9 +136,11 @@ class nwDocInsert(Enum):
     QUOTE_LD  = 3
     QUOTE_RD  = 4
     SYNOPSIS  = 5
-    NEW_PAGE  = 6
-    VSPACE_S  = 7
-    VSPACE_M  = 8
+    SHORT     = 6
+    NEW_PAGE  = 7
+    VSPACE_S  = 8
+    VSPACE_M  = 9
+    LIPSUM    = 10
 
 # END Enum nwDocInsert
 

novelwriter/error.py

@@ -6,7 +6,7 @@ File History:
 Created: 2020-08-02 [0.10.2]
 
 This file is a part of novelWriter
-Copyright 2018–2023, Veronica Berglyd Olsen
+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

novelwriter/extensions/circularprogress.py

@@ -6,7 +6,7 @@ File History:
 Created: 2023-06-07 [2.1b1]
 
 This file is a part of novelWriter
-Copyright 2018–2023, Veronica Berglyd Olsen
+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

novelwriter/extensions/configlayout.py

@@ -6,7 +6,7 @@ File History:
 Created: 2020-05-03 [0.4.5]
 
 This file is a part of novelWriter
-Copyright 2018–2023, Veronica Berglyd Olsen
+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
@@ -59,10 +59,7 @@ class NConfigLayout(QGridLayout):
     def setHelpTextStyle(self, color: QColor | list | tuple,
                          fontScale: float = FONT_SCALE) -> None:
         """Set the text color for the help text."""
-        if isinstance(color, QColor):
-            self._helpCol = color
-        else:
-            self._helpCol = QColor(*color)
+        self._helpCol = color if isinstance(color, QColor) else QColor(*color)
         self._fontScale = fontScale
         return
 
@@ -74,12 +71,6 @@ class NConfigLayout(QGridLayout):
                 qHelp.setText(text)
         return
 
-    def setLabelText(self, row: int, text: str) -> None:
-        """Set the text for the main label."""
-        if row in self._itemMap:
-            self._itemMap[row](0).setText(text)
-        return
-
     ##
     #  Class Methods
     ##
@@ -211,10 +202,7 @@ class NHelpLabel(QLabel):
                  fontSize: float = FONT_SCALE) -> None:
         super().__init__(text)
 
-        if isinstance(color, QColor):
-            qCol = color
-        else:
-            qCol = QColor(*color)
+        qCol = color if isinstance(color, QColor) else QColor(*color)
 
         lblCol = self.palette()
         lblCol.setColor(QPalette.WindowText, qCol)

novelwriter/extensions/{wheeleventfilter.py → eventfilters.py}

@@ -1,12 +1,13 @@
 """
-novelWriter – Custom Object: Wheel Event Filter
-===============================================
+novelWriter – Custom Objects: Event Filters
+===========================================
 
 File History:
-Created: 2023-08-31 [2.1rc1]
+Created: 2023-08-31 [2.1rc1] WheelEventFilter
+Created: 2023-11-28 [2.2]    StatusTipFilter
 
 This file is a part of novelWriter
-Copyright 2018–2023, Veronica Berglyd Olsen
+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
@@ -23,7 +24,7 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
 """
 from __future__ import annotations
 
-from PyQt5.QtGui import QWheelEvent
+from PyQt5.QtGui import QStatusTipEvent, QWheelEvent
 from PyQt5.QtCore import QEvent, QObject
 from PyQt5.QtWidgets import QWidget
 
@@ -63,3 +64,12 @@ class WheelEventFilter(QObject):
         return False
 
 # END Class WheelEventFilter
+
+
+class StatusTipFilter(QObject):
+
+    def eventFilter(self, obj: QObject, event: QEvent) -> bool:
+        """Filter out status tip events on menus."""
+        return True if isinstance(event, QStatusTipEvent) else super().eventFilter(obj, event)
+
+# END Class StatusTipFilter

novelwriter/extensions/novelselector.py

@@ -6,7 +6,7 @@ File History:
 Created: 2022-11-17 [2.0]
 
 This file is a part of novelWriter
-Copyright 2018–2023, Veronica Berglyd Olsen
+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

novelwriter/extensions/pageddialog.py

@@ -6,7 +6,7 @@ File History:
 Created: 2020-05-17 [0.5.1]
 
 This file is a part of novelWriter
-Copyright 2018–2023, Veronica Berglyd Olsen
+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

novelwriter/extensions/pagedsidebar.py

@@ -8,7 +8,7 @@ Created: 2023-02-21 [2.1b1] NPagedToolButton
 Created: 2023-02-21 [2.1b1] NPagedToolLabel
 
 This file is a part of novelWriter
-Copyright 2018–2023, Veronica Berglyd Olsen
+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
@@ -65,10 +65,7 @@ class NPagedSideBar(QToolBar):
 
     def setLabelColor(self, color: list | QColor) -> None:
         """Set the text color for the labels."""
-        if isinstance(color, list):
-            self._labelCol = QColor(*color)
-        elif isinstance(color, QColor):
-            self._labelCol = color
+        self._labelCol = color if isinstance(color, QColor) else QColor(*color)
         return
 
     def addSeparator(self) -> None:

novelwriter/extensions/simpleprogress.py

@@ -6,7 +6,7 @@ File History:
 Created: 2023-06-09 [2.1b1]
 
 This file is a part of novelWriter
-Copyright 2018–2023, Veronica Berglyd Olsen
+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
@@ -41,14 +41,13 @@ class NProgressSimple(QProgressBar):
 
     def paintEvent(self, event: QPaintEvent) -> None:
         """Custom painter for the progress bar."""
-        if self.value() == 0:
-            return
-        progress = ceil(self.width()*float(self.value())/self.maximum())
-        qPaint = QPainter(self)
-        qPaint.setRenderHint(QPainter.Antialiasing, True)
-        qPaint.setPen(self.palette().highlight().color())
-        qPaint.setBrush(self.palette().highlight())
-        qPaint.drawRect(0, 0, progress, self.height())
+        if (value := self.value()) > 0:
+            progress = ceil(self.width()*float(value)/self.maximum())
+            qPaint = QPainter(self)
+            qPaint.setRenderHint(QPainter.Antialiasing, True)
+            qPaint.setPen(self.palette().highlight().color())
+            qPaint.setBrush(self.palette().highlight())
+            qPaint.drawRect(0, 0, progress, self.height())
         return
 
 # END Class NProgressSimple

novelwriter/extensions/statusled.py

@@ -6,7 +6,7 @@ File History:
 Created: 2020-05-17 [0.5.1]
 
 This file is a part of novelWriter
-Copyright 2018–2023, Veronica Berglyd Olsen
+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

novelwriter/extensions/switch.py

@@ -6,7 +6,7 @@ File History:
 Created: 2020-05-03 [0.4.5]
 
 This file is a part of novelWriter
-Copyright 2018–2023, Veronica Berglyd Olsen
+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
@@ -134,10 +134,10 @@ class NSwitch(QAbstractButton):
         qPaint.setBrush(thumbBrush)
         qPaint.drawEllipse(self._offset - self._rR, self._rB, self._rH, self._rH)
 
-        theFont = qPaint.font()
-        theFont.setPixelSize(self._xT)
+        font = qPaint.font()
+        font.setPixelSize(self._xT)
         qPaint.setPen(textColor)
-        qPaint.setFont(theFont)
+        qPaint.setFont(font)
         qPaint.drawText(
             QRectF(self._offset - self._rR, self._rB, self._rH, self._rH),
             Qt.AlignCenter, thumbText

novelwriter/extensions/switchbox.py

@@ -6,7 +6,7 @@ File History:
 Created: 2023-04-16 [2.1b1]
 
 This file is a part of novelWriter
-Copyright 2018–2023, Veronica Berglyd Olsen
+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
@@ -106,11 +106,6 @@ class NSwitchBox(QScrollArea):
         self._bumpIndex()
         return
 
-    def setInnerContentsMargins(self, left: int, top: int, right: int, bottom: int) -> None:
-        """Set the contents margins of the inner layout."""
-        self._content.setContentsMargins(left, top, right, bottom)
-        return
-
     ##
     #  Internal Functions
     ##