novelWriter 2.4.2__py3-none-any.whl → 2.5b1__py3-none-any.whl

novelwriter/extensions/versioninfo.py

@@ -26,16 +26,16 @@ from __future__ import annotations
 import json
 import logging
 
-from time import sleep
 from datetime import datetime
+from time import sleep
 from urllib.error import HTTPError
 from urllib.request import Request, urlopen
 
-from PyQt5.QtGui import QDesktopServices
 from PyQt5.QtCore import QObject, QRunnable, QUrl, pyqtSignal, pyqtSlot
+from PyQt5.QtGui import QDesktopServices
 from PyQt5.QtWidgets import QLabel, QVBoxLayout, QWidget
 
-from novelwriter import CONFIG, SHARED, __version__, __date__, __domain__
+from novelwriter import CONFIG, SHARED, __date__, __domain__, __version__
 from novelwriter.common import formatVersion
 from novelwriter.constants import nwConst
 
@@ -111,8 +111,6 @@ class VersionInfoWidget(QWidget):
             self._lblRelease.setText(self._trLatest.format(reason or self.tr("Failed")))
         return
 
-# END Class VersionInfoWidget
-
 
 class _Retriever(QRunnable):
 
@@ -144,10 +142,6 @@ class _Retriever(QRunnable):
             self.signals.dataReady.emit("", str(e))
         return
 
-# END Class _Retriever
-
 
 class _RetrieverSignal(QObject):
     dataReady = pyqtSignal(str, str)
-
-# END Class _RetrieverSignal

novelwriter/gui/doceditor.py

@@ -36,15 +36,14 @@ import logging
 
 from enum import Enum
 from time import time
-from typing import TYPE_CHECKING
 
 from PyQt5.QtCore import (
-    QObject, QPoint, QRegExp, QRegularExpression, QRunnable, Qt, QTimer,
-    pyqtSignal, pyqtSlot
+    QObject, QPoint, QRegularExpression, QRunnable, Qt, QTimer, pyqtSignal,
+    pyqtSlot
 )
 from PyQt5.QtGui import (
-    QColor, QCursor, QFont, QKeyEvent, QKeySequence, QMouseEvent, QPalette,
-    QPixmap, QResizeEvent, QTextBlock, QTextCursor, QTextDocument, QTextOption
+    QColor, QCursor, QKeyEvent, QKeySequence, QMouseEvent, QPalette, QPixmap,
+    QResizeEvent, QTextBlock, QTextCursor, QTextDocument, QTextOption
 )
 from PyQt5.QtWidgets import (
     QAction, QApplication, QFrame, QGridLayout, QHBoxLayout, QLabel, QLineEdit,
@@ -55,7 +54,7 @@ from novelwriter import CONFIG, SHARED
 from novelwriter.common import minmax, transferCase
 from novelwriter.constants import nwConst, nwKeyWords, nwShortcode, nwUnicode
 from novelwriter.core.document import NWDocument
-from novelwriter.enum import nwDocAction, nwDocInsert, nwDocMode, nwItemClass, nwTrinary
+from novelwriter.enum import nwComment, nwDocAction, nwDocInsert, nwDocMode, nwItemClass, nwTrinary
 from novelwriter.extensions.eventfilters import WheelEventFilter
 from novelwriter.extensions.modified import NIconToggleButton, NIconToolButton
 from novelwriter.gui.dochighlight import BLOCK_META, BLOCK_TITLE
@@ -69,9 +68,6 @@ from novelwriter.types import (
     QtMoveAnchor, QtMoveLeft, QtMoveRight
 )
 
-if TYPE_CHECKING:  # pragma: no cover
-    from novelwriter.guimain import GuiMain
-
 logger = logging.getLogger(__name__)
 
 
@@ -82,8 +78,6 @@ class _SelectAction(Enum):
     KEEP_POSITION  = 2
     MOVE_AFTER     = 3
 
-# END Class _SelectAction
-
 
 class GuiDocEditor(QPlainTextEdit):
     """Gui Widget: Main Document Editor"""
@@ -107,15 +101,14 @@ class GuiDocEditor(QPlainTextEdit):
     requestProjectItemSelected = pyqtSignal(str, bool)
     requestProjectItemRenamed = pyqtSignal(str, str)
     requestNewNoteCreation = pyqtSignal(str, nwItemClass)
+    requestNextDocument = pyqtSignal(str, bool)
 
-    def __init__(self, mainGui: GuiMain) -> None:
-        super().__init__(parent=mainGui)
+    def __init__(self, parent: QWidget) -> None:
+        super().__init__(parent=parent)
 
         logger.debug("Create: GuiDocEditor")
 
         # Class Variables
-        self.mainGui = mainGui
-
         self._nwDocument = None
         self._nwItem     = None
 
@@ -328,11 +321,11 @@ class GuiDocEditor(QPlainTextEdit):
         # Reload spell check and dictionaries
         SHARED.updateSpellCheckLanguage()
 
-        # Set font
-        font = QFont()
-        font.setFamily(CONFIG.textFont)
-        font.setPointSize(CONFIG.textSize)
-        self._qDocument.setDefaultFont(font)
+        # Set the font. See issues #1862 and #1875.
+        self.setFont(CONFIG.textFont)
+        self.docHeader.updateFont()
+        self.docFooter.updateFont()
+        self.docSearch.updateFont()
 
         # Update highlighter settings
         self._qDocument.syntaxHighlighter.initHighlighter()
@@ -478,7 +471,6 @@ class GuiDocEditor(QPlainTextEdit):
         cC, wC, pC = standardCounter(docText)
         self._updateDocCounts(cC, wC, pC)
 
-        self.saveCursorPosition()
         if not self._nwDocument.writeDocument(docText):
             saveOk = False
             if self._nwDocument.hashError:
@@ -841,14 +833,15 @@ class GuiDocEditor(QPlainTextEdit):
             )
         return
 
-    def insertText(self, insert: str | nwDocInsert) -> bool:
+    def insertText(self, insert: str | nwDocInsert) -> None:
         """Insert a specific type of text at the cursor position."""
         if self._docHandle is None:
             logger.error("No document open")
-            return False
+            return
 
-        newBlock = False
-        goAfter = False
+        text = ""
+        block = False
+        after = False
 
         if isinstance(insert, str):
             text = insert
@@ -863,43 +856,41 @@ class GuiDocEditor(QPlainTextEdit):
                 text = self._typDQuoteC
             elif insert == nwDocInsert.SYNOPSIS:
                 text = "%Synopsis: "
-                newBlock = True
-                goAfter = True
+                block = True
+                after = True
             elif insert == nwDocInsert.SHORT:
                 text = "%Short: "
-                newBlock = True
-                goAfter = True
+                block = True
+                after = True
             elif insert == nwDocInsert.NEW_PAGE:
                 text = "[newpage]"
-                newBlock = True
-                goAfter = False
+                block = True
+                after = False
             elif insert == nwDocInsert.VSPACE_S:
                 text = "[vspace]"
-                newBlock = True
-                goAfter = False
+                block = True
+                after = False
             elif insert == nwDocInsert.VSPACE_M:
                 text = "[vspace:2]"
-                newBlock = True
-                goAfter = False
+                block = True
+                after = False
             elif insert == nwDocInsert.LIPSUM:
                 text = GuiLipsum.getLipsum(self)
-                newBlock = True
-                goAfter = False
-            else:
-                return False
-        else:
-            return False
+                block = True
+                after = False
+            elif insert == nwDocInsert.FOOTNOTE:
+                self._insertCommentStructure(nwComment.FOOTNOTE)
 
         if text:
-            if newBlock:
-                self.insertNewBlock(text, defaultAfter=goAfter)
+            if block:
+                self.insertNewBlock(text, defaultAfter=after)
             else:
                 cursor = self.textCursor()
                 cursor.beginEditBlock()
                 cursor.insertText(text)
                 cursor.endEditBlock()
 
-        return True
+        return
 
     def insertNewBlock(self, text: str, defaultAfter: bool = True) -> bool:
         """Insert a piece of text on a blank line."""
@@ -1165,7 +1156,8 @@ class GuiDocEditor(QPlainTextEdit):
                             lambda _, option=option: self._correctWord(sCursor, option)
                         )
                 else:
-                    ctxMenu.addAction("%s %s" % (nwUnicode.U_ENDASH, self.tr("No Suggestions")))
+                    trNone = self.tr("No Suggestions")
+                    ctxMenu.addAction(f"{nwUnicode.U_ENDASH} {trNone}")
 
                 ctxMenu.addSeparator()
                 action = ctxMenu.addAction(self.tr("Add Word to Dictionary"))
@@ -1321,9 +1313,8 @@ class GuiDocEditor(QPlainTextEdit):
             self.docSearch.setResultCount(0, 0)
             self._lastFind = None
             if CONFIG.searchNextFile and not goBack:
-                self.mainGui.openNextDocument(
-                    self._docHandle, wrapAround=CONFIG.searchLoop
-                )
+                self.requestNextDocument.emit(self._docHandle, CONFIG.searchLoop)
+                QApplication.processEvents()
                 self.beginSearch()
                 self.setFocus()
             return
@@ -1342,9 +1333,8 @@ class GuiDocEditor(QPlainTextEdit):
 
         if resIdx > maxIdx and self._docHandle:
             if CONFIG.searchNextFile and not goBack:
-                self.mainGui.openNextDocument(
-                    self._docHandle, wrapAround=CONFIG.searchLoop
-                )
+                self.requestNextDocument.emit(self._docHandle, CONFIG.searchLoop)
+                QApplication.processEvents()
                 self.beginSearch()
                 self.setFocus()
                 return
@@ -1851,6 +1841,32 @@ class GuiDocEditor(QPlainTextEdit):
 
         return
 
+    def _insertCommentStructure(self, style: nwComment) -> None:
+        """Insert a shortcut/comment combo."""
+        if self._docHandle and style == nwComment.FOOTNOTE:
+            self.saveText()  # Index must be up to date
+            key = SHARED.project.index.newCommentKey(self._docHandle, style)
+            code = nwShortcode.COMMENT_STYLES[nwComment.FOOTNOTE]
+
+            cursor = self.textCursor()
+            block = cursor.block()
+            text = block.text().rstrip()
+            if not text or text.startswith("@"):
+                logger.error("Invalid footnote location")
+                return
+
+            cursor.beginEditBlock()
+            cursor.insertText(code.format(key))
+            cursor.setPosition(block.position() + block.length() - 1)
+            cursor.insertBlock()
+            cursor.insertBlock()
+            cursor.insertText(f"%Footnote.{key}: ")
+            cursor.endEditBlock()
+
+            self.setTextCursor(cursor)
+
+        return
+
     ##
     #  Internal Functions
     ##
@@ -2114,8 +2130,6 @@ class GuiDocEditor(QPlainTextEdit):
             self._doReplace = False
         return
 
-# END Class GuiDocEditor
-
 
 class MetaCompleter(QMenu):
     """GuiWidget: Meta Completer Menu
@@ -2193,15 +2207,13 @@ class MetaCompleter(QMenu):
         self.complete.emit(pos, length, value)
         return
 
-# END Class MetaCompleter
-
-
-# =============================================================================================== #
-#  The Off-GUI Thread Word Counter
-#  A runnable for the word counter to be run in the thread pool off the main GUI thread.
-# =============================================================================================== #
 
 class BackgroundWordCounter(QRunnable):
+    """The Off-GUI Thread Word Counter
+
+    A runnable for the word counter to be run in the thread pool off the
+    main GUI thread.
+    """
 
     def __init__(self, docEditor: GuiDocEditor, forSelection: bool = False) -> None:
         super().__init__()
@@ -2234,8 +2246,6 @@ class BackgroundWordCounter(QRunnable):
 
         return
 
-# END Class BackgroundWordCounter
-
 
 class BackgroundWordCounterSignals(QObject):
     """The QRunnable cannot emit a signal, so we need a simple QObject
@@ -2243,15 +2253,13 @@ class BackgroundWordCounterSignals(QObject):
     """
     countsReady = pyqtSignal(int, int, int)
 
-# END Class BackgroundWordCounterSignals
-
-
-# =============================================================================================== #
-#  The Formatting and Options Fold Out Menu
-#  Only used by DocEditor, and is opened by the first button in the header
-# =============================================================================================== #
 
 class GuiDocToolBar(QWidget):
+    """The Formatting and Options Fold Out Menu
+
+    Only used by DocEditor, and is opened by the first button in the
+    header.
+    """
 
     requestDocAction = pyqtSignal(nwDocAction)
 
@@ -2376,15 +2384,13 @@ class GuiDocToolBar(QWidget):
 
         return
 
-# END Class GuiDocToolBar
-
-
-# =============================================================================================== #
-#  The Embedded Document Search/Replace Feature
-#  Only used by DocEditor, and is at a fixed position in the QTextEdit's viewport
-# =============================================================================================== #
 
 class GuiDocEditSearch(QFrame):
+    """The Embedded Document Search/Replace Feature
+
+    Only used by DocEditor, and is at a fixed position in the
+    QTextEdit's viewport.
+    """
 
     def __init__(self, docEditor: GuiDocEditor) -> None:
         super().__init__(parent=docEditor)
@@ -2396,9 +2402,6 @@ class GuiDocEditSearch(QFrame):
         iSz = SHARED.theme.baseIconSize
         mPx = CONFIG.pxInt(6)
 
-        self.boxFont = SHARED.theme.guiFont
-        self.boxFont.setPointSizeF(0.9*SHARED.theme.fontPointSize)
-
         self.setContentsMargins(0, 0, 0, 0)
         self.setAutoFillBackground(True)
         self.setFrameStyle(QFrame.Shape.StyledPanel | QFrame.Shadow.Plain)
@@ -2410,12 +2413,10 @@ class GuiDocEditSearch(QFrame):
         # ==========
 
         self.searchBox = QLineEdit(self)
-        self.searchBox.setFont(self.boxFont)
         self.searchBox.setPlaceholderText(self.tr("Search for"))
         self.searchBox.returnPressed.connect(self._doSearch)
 
         self.replaceBox = QLineEdit(self)
-        self.replaceBox.setFont(self.boxFont)
         self.replaceBox.setPlaceholderText(self.tr("Replace with"))
         self.replaceBox.returnPressed.connect(self._doReplace)
 
@@ -2425,12 +2426,9 @@ class GuiDocEditSearch(QFrame):
         self.searchOpt.setContentsMargins(0, 0, 0, 0)
 
         self.searchLabel = QLabel(self.tr("Search"), self)
-        self.searchLabel.setFont(self.boxFont)
         self.searchLabel.setIndent(CONFIG.pxInt(6))
 
         self.resultLabel = QLabel("?/?", self)
-        self.resultLabel.setFont(self.boxFont)
-        self.resultLabel.setMinimumWidth(SHARED.theme.getTextWidth("?/?", self.boxFont))
 
         self.toggleCase = QAction(self.tr("Case Sensitive"), self)
         self.toggleCase.setCheckable(True)
@@ -2515,6 +2513,7 @@ class GuiDocEditSearch(QFrame):
         self.replaceButton.setVisible(False)
         self.adjustSize()
 
+        self.updateFont()
         self.updateTheme()
 
         logger.debug("Ready: GuiDocEditSearch")
@@ -2539,32 +2538,18 @@ class GuiDocEditSearch(QFrame):
     #  Getters
     ##
 
-    def getSearchObject(self) -> str | QRegularExpression | QRegExp:
+    def getSearchObject(self) -> str | QRegularExpression:
         """Return the current search text either as text or as a regular
         expression object.
         """
         text = self.searchBox.text()
         if CONFIG.searchRegEx:
-            # Using the Unicode-capable QRegularExpression class was
-            # only added in Qt 5.13. Otherwise, 5.3 and up supports
-            # only the QRegExp class.
-            if CONFIG.verQtValue >= 0x050d00:
-                rxOpt = QRegularExpression.PatternOption.UseUnicodePropertiesOption
-                if not CONFIG.searchCase:
-                    rxOpt |= QRegularExpression.PatternOption.CaseInsensitiveOption
-                regEx = QRegularExpression(text, rxOpt)
-                self._alertSearchValid(regEx.isValid())
-                return regEx
-            else:  # pragma: no cover
-                # >= 50300 to < 51300
-                if CONFIG.searchCase:
-                    rxOpt = Qt.CaseSensitivity.CaseSensitive
-                else:
-                    rxOpt = Qt.CaseSensitivity.CaseInsensitive
-                regEx = QRegExp(text, rxOpt)
-                self._alertSearchValid(regEx.isValid())
-                return regEx
-
+            rxOpt = QRegularExpression.PatternOption.UseUnicodePropertiesOption
+            if not CONFIG.searchCase:
+                rxOpt |= QRegularExpression.PatternOption.CaseInsensitiveOption
+            regEx = QRegularExpression(text, rxOpt)
+            self._alertSearchValid(regEx.isValid())
+            return regEx
         return text
 
     ##
@@ -2598,7 +2583,9 @@ class GuiDocEditSearch(QFrame):
         numCount = f"{lim:n}+" if (resCount or 0) > lim else f"{resCount:n}"
         sCurrRes = "?" if currRes is None else str(currRes)
         sResCount = "?" if resCount is None else numCount
-        minWidth = SHARED.theme.getTextWidth(f"{sResCount}//{sResCount}", self.boxFont)
+        minWidth = SHARED.theme.getTextWidth(
+            f"{sResCount}//{sResCount}", SHARED.theme.guiFontSmall
+        )
         self.resultLabel.setText(f"{sCurrRes}/{sResCount}")
         self.resultLabel.setMinimumWidth(minWidth)
         self.adjustSize()
@@ -2609,6 +2596,18 @@ class GuiDocEditSearch(QFrame):
     #  Methods
     ##
 
+    def updateFont(self) -> None:
+        """Update the font settings."""
+        self.setFont(SHARED.theme.guiFont)
+        self.searchBox.setFont(SHARED.theme.guiFontSmall)
+        self.replaceBox.setFont(SHARED.theme.guiFontSmall)
+        self.searchLabel.setFont(SHARED.theme.guiFontSmall)
+        self.resultLabel.setFont(SHARED.theme.guiFontSmall)
+        self.resultLabel.setMinimumWidth(
+            SHARED.theme.getTextWidth("?/?", SHARED.theme.guiFontSmall)
+        )
+        return
+
     def updateTheme(self) -> None:
         """Update theme elements."""
         qPalette = QApplication.palette()
@@ -2754,15 +2753,13 @@ class GuiDocEditSearch(QFrame):
         self.searchBox.setPalette(qPalette)
         return
 
-# END Class GuiDocEditSearch
-
-
-# =============================================================================================== #
-#  The Embedded Document Header
-#  Only used by DocEditor, and is at a fixed position in the QTextEdit's viewport
-# =============================================================================================== #
 
 class GuiDocEditHeader(QWidget):
+    """The Embedded Document Header
+
+    Only used by DocEditor, and is at a fixed position in the
+    QTextEdit's viewport.
+    """
 
     closeDocumentRequest = pyqtSignal()
     toggleToolBarRequest = pyqtSignal()
@@ -2793,10 +2790,6 @@ class GuiDocEditHeader(QWidget):
         self.itemTitle.setAlignment(QtAlignCenterTop)
         self.itemTitle.setFixedHeight(iPx)
 
-        lblFont = self.itemTitle.font()
-        lblFont.setPointSizeF(0.9*SHARED.theme.fontPointSize)
-        self.itemTitle.setFont(lblFont)
-
         # Other Widgets
         self.outlineMenu = QMenu(self)
 
@@ -2850,6 +2843,7 @@ class GuiDocEditHeader(QWidget):
         self.setContentsMargins(0, 0, 0, 0)
         self.setMinimumHeight(iPx + 2*mPx)
 
+        self.updateFont()
         self.updateTheme()
 
         logger.debug("Ready: GuiDocEditHeader")
@@ -2888,6 +2882,12 @@ class GuiDocEditHeader(QWidget):
             logger.debug("Document outline updated in %.3f ms", 1000*(time() - tStart))
         return
 
+    def updateFont(self) -> None:
+        """Update the font settings."""
+        self.setFont(SHARED.theme.guiFont)
+        self.itemTitle.setFont(SHARED.theme.guiFontSmall)
+        return
+
     def updateTheme(self) -> None:
         """Update theme elements."""
         self.tbButton.setThemeIcon("menu")
@@ -2977,15 +2977,13 @@ class GuiDocEditHeader(QWidget):
             self.docEditor.requestProjectItemSelected.emit(self._docHandle or "", True)
         return
 
-# END Class GuiDocEditHeader
-
-
-# =============================================================================================== #
-#  The Embedded Document Footer
-#  Only used by DocEditor, and is at a fixed position in the QTextEdit's viewport
-# =============================================================================================== #
 
 class GuiDocEditFooter(QWidget):
+    """The Embedded Document Footer
+
+    Only used by DocEditor, and is at a fixed position in the
+    QTextEdit's viewport.
+    """
 
     def __init__(self, parent: QWidget) -> None:
         super().__init__(parent=parent)
@@ -3001,9 +2999,6 @@ class GuiDocEditFooter(QWidget):
         bSp = CONFIG.pxInt(4)
         hSp = CONFIG.pxInt(6)
 
-        lblFont = self.font()
-        lblFont.setPointSizeF(0.9*SHARED.theme.fontPointSize)
-
         # Cached Translations
         self._trLineCount = self.tr("Line: {0} ({1})")
         self._trWordCount = self.tr("Words: {0} ({1})")
@@ -3026,7 +3021,6 @@ class GuiDocEditFooter(QWidget):
         self.statusText.setAutoFillBackground(True)
         self.statusText.setFixedHeight(fPx)
         self.statusText.setAlignment(QtAlignLeftTop)
-        self.statusText.setFont(lblFont)
 
         # Lines
         self.linesIcon = QLabel("", self)
@@ -3041,7 +3035,6 @@ class GuiDocEditFooter(QWidget):
         self.linesText.setAutoFillBackground(True)
         self.linesText.setFixedHeight(fPx)
         self.linesText.setAlignment(QtAlignLeftTop)
-        self.linesText.setFont(lblFont)
 
         # Words
         self.wordsIcon = QLabel("", self)
@@ -3056,7 +3049,6 @@ class GuiDocEditFooter(QWidget):
         self.wordsText.setAutoFillBackground(True)
         self.wordsText.setFixedHeight(fPx)
         self.wordsText.setAlignment(QtAlignLeftTop)
-        self.wordsText.setFont(lblFont)
 
         # Assemble Layout
         self.outerBox = QHBoxLayout()
@@ -3079,6 +3071,7 @@ class GuiDocEditFooter(QWidget):
         self.setMinimumHeight(fPx + 2*mPx)
 
         # Fix the Colours
+        self.updateFont()
         self.updateTheme()
 
         # Initialise Info
@@ -3092,6 +3085,14 @@ class GuiDocEditFooter(QWidget):
     #  Methods
     ##
 
+    def updateFont(self) -> None:
+        """Update the font settings."""
+        self.setFont(SHARED.theme.guiFont)
+        self.statusText.setFont(SHARED.theme.guiFontSmall)
+        self.linesText.setFont(SHARED.theme.guiFontSmall)
+        self.wordsText.setFont(SHARED.theme.guiFontSmall)
+        return
+
     def updateTheme(self) -> None:
         """Update theme elements."""
         iPx = round(0.9*SHARED.theme.baseIconHeight)
@@ -3137,7 +3138,7 @@ class GuiDocEditFooter(QWidget):
             sText = ""
         else:
             iPx = round(0.9*SHARED.theme.baseIconHeight)
-            status, icon = self._tItem.getImportStatus(incIcon=True)
+            status, icon = self._tItem.getImportStatus()
             sIcon = icon.pixmap(iPx, iPx)
             sText = f"{status} / {self._tItem.describeMe()}"
 
@@ -3168,5 +3169,3 @@ class GuiDocEditFooter(QWidget):
             wText = self._trWordCount.format("0", "+0")
         self.wordsText.setText(wText)
         return
-
-# END Class GuiDocEditFooter