novelWriter 2.4rc1__tar.gz → 2.4.1__tar.gz

{novelWriter-2.4rc1 → novelwriter-2.4.1}/CHANGELOG.md

@@ -1,5 +1,91 @@
 # novelWriter Changelog
 
+## Version 2.4.1 [2024-05-06]
+
+### Release Notes
+
+This is a patch release that fixes a number of minor issues with the Manuscript Build tool. The
+only critical fix is related to a potential crash when deleting a build entry when its settings
+dialog is still open.
+
+### Detailed Changelog
+
+**Bugfixes**
+
+* Fixed an issue that could crash novelWriter if a build settings entry was deleted from the
+  Manuscript tool while its settings window was open. PR #1845.
+
+**Improvements**
+
+* Changed the font used for the document editor and viewer header and footer from the one used for
+  the document text to the one used for the user interface. Issue #1842. PR #1843.
+* Added a save document step in the editor before running a manuscript build or a preview job. This
+  ensures that the text in the editor is included in the manuscript. Issue #1835. PR #1846.
+* Restore preview panel scroll bar position after updating the preview on the Manuscript tool.
+  Issue #1837. PR #1846.
+* Close all non-modal dialogs when a project is closed. PR #1848.
+
+**Code Improvements**
+
+* Fixed an issue with the Build Settings dialog that blocks the garbage collector from deleting the
+  dialog after it's been closed. PR #1843.
+* Remove some deprecated translation entries from the translation files. PR #1850.
+
+----
+
+## Version 2.4 [2024-04-20]
+
+### Release Notes
+
+This release adds a new global search feature. The tool is still relatively basic, and will likely
+be extended in later releases.
+
+Among new text editing features is the ability to highlight text using `[m]text[/m]` shortcodes.
+The code `[m]` is for "mark", which is the equivalent code in HTML.
+
+A second feature added for text editing is the ability to add an alternatively formatted scene
+heading by adding a `!` to the markup, like for chapters and main titles. This allows to
+distinguish between two scene formatting styles, `### Title` and `###! Title`, which can for
+instance be used for soft and hard scene breaks.
+
+The **Manuscript Build** tool has also been extended with multiple new formatting options.
+
+See the website for complete [Release Notes](https://novelwriter.io/releases/release_2_4.html).
+
+### Detailed Changelog
+
+**Bugfixes**
+
+* Fixed background colour on some widgets on the new Project Search tool. PR #1800.
+* Fixed a bug when using bold/italic/strike through toggle on an existing text selection in the
+  editor. Issue #1807. PR #1808.
+* An index out of bounds error in the word counter has been fixed. It could only be triggered by a
+  single line only containing a ">" character. Issues #1816 and #1825. PR #1817.
+* Fixed an issue where not all theme colours were completely reset before changing theme. PR #1820.
+* Shortcodes are no longer passed to the spell checker. PR #1823.
+
+**Improvements**
+
+* Made placeholder text for search read as "Search for" and "Replace with". PR #1799.
+* The initial count for adding chapter and scenes to new project in the Welcome dialog has been
+  changed to 0. The user must now select to add chapters and scenes. Issue #1811. PR #1815.
+
+**Documentation**
+
+* Updated the documentation for 2.4 features. PR #1818.
+
+**Internationalisation**
+
+* Norwegian and US English translations updated by Veronica Berglyd Olsen (@vkbo).
+  PRs #1799 and #1814.
+* Latin American Spanish translation updated by Tommy Marplatt (@tmarplatt). PR #1814.
+* Italian translation updated by Lou Cyper (loucyper1). PR #1814.
+* Japanese translation updated by @hebekeg. PR #1814.
+* French translation updated by Albert Aribaud (@aaribaud). PR #1821.
+* German translation updated by Myian (@HeyMyian). PR #1821.
+
+----
+
 ## Version 2.4 RC 1 [2024-04-06]
 
 ### Release Notes

{novelWriter-2.4rc1 → novelwriter-2.4.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: novelWriter
-Version: 2.4rc1
+Version: 2.4.1
 Summary: A markdown-like text editor for planning and writing novels
 Author-email: Veronica Berglyd Olsen <code@vkbo.net>
 License: GNU General Public License v3

{novelWriter-2.4rc1 → novelwriter-2.4.1}/README.md

@@ -49,6 +49,10 @@ code, please also read the full
 
 Project credits are available in [CREDITS.md](https://github.com/vkbo/novelWriter/blob/main/CREDITS.md).
 
+**Note:** As of April 2024 only pre-releases are made from the `main` branch. Full releases are
+made from the `release` branch. So if you're submitting a fix to a current release, **including
+changes to documentation**, they must be made to the `release` branch.
+
 ### Translations
 
 New translations are always welcome. This project uses Crowdin to maintain translations, and you

{novelWriter-2.4rc1 → novelwriter-2.4.1}/novelWriter.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: novelWriter
-Version: 2.4rc1
+Version: 2.4.1
 Summary: A markdown-like text editor for planning and writing novels
 Author-email: Veronica Berglyd Olsen <code@vkbo.net>
 License: GNU General Public License v3

{novelWriter-2.4rc1 → novelwriter-2.4.1}/novelWriter.egg-info/SOURCES.txt

@@ -338,6 +338,7 @@ setup/appimage_launcher.sh
 setup/description_pypi.md
 setup/description_short.txt
 setup/iss_license.txt
+setup/launchpad_setup.cfg
 setup/make_clean.sh
 setup/make_pip.sh
 setup/make_release.sh

{novelWriter-2.4rc1 → novelwriter-2.4.1}/novelwriter/__init__.py

@@ -23,16 +23,21 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
 """
 from __future__ import annotations
 
-import sys
 import getopt
 import logging
+import sys
+
+from typing import TYPE_CHECKING
 
 from PyQt5.QtWidgets import QApplication, QErrorMessage
 
-from novelwriter.error import exceptionHandler, logException
 from novelwriter.config import Config
+from novelwriter.error import exceptionHandler, logException
 from novelwriter.shared import SharedData
 
+if TYPE_CHECKING:  # pragma: no cover
+    from novelwriter.guimain import GuiMain
+
 # Package Meta
 # ============
 
@@ -42,9 +47,9 @@ __license__    = "GPLv3"
 __author__     = "Veronica Berglyd Olsen"
 __maintainer__ = "Veronica Berglyd Olsen"
 __email__      = "code@vkbo.net"
-__version__    = "2.4rc1"
-__hexversion__ = "0x020400c1"
-__date__       = "2024-04-06"
+__version__    = "2.4.1"
+__hexversion__ = "0x020401f0"
+__date__       = "2024-05-06"
 __status__     = "Stable"
 __domain__     = "novelwriter.io"
 
@@ -60,7 +65,7 @@ CONFIG = Config()
 SHARED = SharedData()
 
 
-def main(sysArgs: list | None = None):
+def main(sysArgs: list | None = None) -> GuiMain | None:
     """Parse command line, set up logging, and launch main GUI."""
     if sysArgs is None:
         sysArgs = sys.argv[1:]
@@ -239,4 +244,6 @@ def main(sysArgs: list | None = None):
 
         sys.exit(nwApp.exec())
 
+    return None
+
 # END Function main

{novelWriter-2.4rc1 → novelwriter-2.4.1}/novelwriter/common.py

@@ -449,7 +449,7 @@ def xmlIndent(tree: ET.Element | ET.ElementTree) -> None:
 
     indentations = ["\n"]
 
-    def indentChildren(elem, level):
+    def indentChildren(elem: ET.Element, level: int) -> None:
         chLevel = level + 1
         try:
             chIndent = indentations[chLevel]
@@ -472,6 +472,8 @@ def xmlIndent(tree: ET.Element | ET.ElementTree) -> None:
         if last is not None:
             last.tail = indentations[level]
 
+        return
+
     if len(tree):
         indentChildren(tree, 0)
     tree.tail = "\n"
@@ -534,8 +536,9 @@ class NWConfigParser(ConfigParser):
     helper functions, and support for lists.
     """
 
-    def __init__(self):
+    def __init__(self) -> None:
         super().__init__()
+        return
 
     def rdStr(self, section: str, option: str, default: str) -> str:
         """Read string value."""

{novelWriter-2.4rc1 → novelwriter-2.4.1}/novelwriter/config.py

@@ -390,6 +390,10 @@ class Config:
         """Un-scale fixed gui sizes by the screen scale factor."""
         return int(value/self.guiScale)
 
+    def homePath(self) -> Path:
+        """The user's home folder."""
+        return self._homePath
+
     def dataPath(self, target: str | None = None) -> Path:
         """Return a path in the data folder."""
         if isinstance(target, str):

{novelWriter-2.4rc1 → novelwriter-2.4.1}/novelwriter/core/buildsettings.py

@@ -56,13 +56,13 @@ SETTINGS_TEMPLATE = {
     "headings.fmtChapter":     (str, nwHeadFmt.TITLE),
     "headings.fmtUnnumbered":  (str, nwHeadFmt.TITLE),
     "headings.fmtScene":       (str, "* * *"),
-    "headings.fmtHardScene":   (str, ""),
+    "headings.fmtAltScene":    (str, ""),
     "headings.fmtSection":     (str, ""),
     "headings.hideTitle":      (bool, False),
     "headings.hideChapter":    (bool, False),
     "headings.hideUnnumbered": (bool, False),
     "headings.hideScene":      (bool, False),
-    "headings.hideHardScene":  (bool, False),
+    "headings.hideAltScene":   (bool, False),
     "headings.hideSection":    (bool, True),
     "headings.centerTitle":    (bool, True),
     "headings.centerChapter":  (bool, False),
@@ -110,7 +110,7 @@ SETTINGS_LABELS = {
     "headings.fmtChapter":    QT_TRANSLATE_NOOP("Builds", "Chapter Format"),
     "headings.fmtUnnumbered": QT_TRANSLATE_NOOP("Builds", "Unnumbered Format"),
     "headings.fmtScene":      QT_TRANSLATE_NOOP("Builds", "Scene Format"),
-    "headings.fmtHardScene":  QT_TRANSLATE_NOOP("Builds", "Hard Scene Format"),
+    "headings.fmtAltScene":   QT_TRANSLATE_NOOP("Builds", "Alt. Scene Format"),
     "headings.fmtSection":    QT_TRANSLATE_NOOP("Builds", "Section Format"),
 
     "text.grpContent":        QT_TRANSLATE_NOOP("Builds", "Text Content"),
@@ -178,7 +178,7 @@ class BuildSettings:
     def __init__(self) -> None:
         self._name = ""
         self._uuid = str(uuid.uuid4())
-        self._path = Path.home()
+        self._path = CONFIG.homePath()
         self._build = ""
         self._order = 0
         self._format = nwBuildFmt.ODT
@@ -220,7 +220,7 @@ class BuildSettings:
         """The last used build path."""
         if self._path.is_dir():
             return self._path
-        return Path.home()
+        return CONFIG.homePath()
 
     @property
     def lastBuildName(self) -> str:
@@ -297,7 +297,7 @@ class BuildSettings:
         if isinstance(path, Path) and path.is_dir():
             self._path = path
         else:
-            self._path = Path.home()
+            self._path = CONFIG.homePath()
         self._changed = True
         return
 
@@ -382,7 +382,7 @@ class BuildSettings:
 
         postponed = []
 
-        def allowRoot(rHandle):
+        def allowRoot(rHandle: str | None) -> None:
             if rHandle in postponed and rHandle in result and rHandle is not None:
                 result[rHandle] = (True, FilterMode.ROOT)
                 postponed.remove(rHandle)

{novelWriter-2.4rc1 → novelwriter-2.4.1}/novelwriter/core/docbuild.py

@@ -306,8 +306,8 @@ class NWBuildDocument:
             self._build.getBool("headings.hideScene")
         )
         bldObj.setHardSceneFormat(
-            self._build.getStr("headings.fmtHardScene"),
-            self._build.getBool("headings.hideHardScene")
+            self._build.getStr("headings.fmtAltScene"),
+            self._build.getBool("headings.hideAltScene")
         )
         bldObj.setSectionFormat(
             self._build.getStr("headings.fmtSection"),

{novelWriter-2.4rc1 → novelwriter-2.4.1}/novelwriter/core/projectxml.py

@@ -449,7 +449,7 @@ class ProjectXMLReader:
                 result[xEntry.attrib["key"]] = checkString(xEntry.text, "")
         return result
 
-    def _parseDictTagText(self, xItem) -> dict:
+    def _parseDictTagText(self, xItem: ET.Element) -> dict:
         """Parse a dictionary stored with key as the tag and the value
         as the text property.
         """

{novelWriter-2.4rc1 → novelwriter-2.4.1}/novelwriter/core/spellcheck.py

@@ -74,7 +74,7 @@ class NWSpellEnchant:
     #  Setters
     ##
 
-    def setLanguage(self, language: str | None):
+    def setLanguage(self, language: str | None) -> None:
         """Load a dictionary for the language specified in the config.
         If that fails, we load a mock dictionary so that lookups don't
         crash. Note that enchant will allow loading an empty string as
@@ -182,10 +182,10 @@ class FakeEnchant:
     def check(self, word: str) -> bool:
         return True
 
-    def suggest(self, word) -> list[str]:
+    def suggest(self, word: str) -> list[str]:
         return []
 
-    def add_to_session(self, word: str):
+    def add_to_session(self, word: str) -> None:
         return
 
 # END Class FakeEnchant

{novelWriter-2.4rc1 → novelwriter-2.4.1}/novelwriter/core/tokenizer.py

@@ -49,7 +49,7 @@ ESCAPES = {r"\*": "*", r"\~": "~", r"\_": "_", r"\[": "[", r"\]": "]", r"\ ": ""
 RX_ESC = re.compile("|".join([re.escape(k) for k in ESCAPES.keys()]), flags=re.DOTALL)
 
 
-def stripEscape(text) -> str:
+def stripEscape(text: str) -> str:
     """Strip escaped Markdown characters from paragraph text."""
     if "\\" in text:
         return RX_ESC.sub(lambda x: ESCAPES[x.group(0)], text)
@@ -639,8 +639,8 @@ class Tokenizer(ABC):
                     tmpMarkdown.append(f"{aLine}\n")
 
             elif aLine.startswith(("### ", "###! ")):
-                # (Hard) Scene Headings
-                # =====================
+                # (Alternative) Scene Headings
+                # ============================
                 # Scene headings in novel documents are treated as centred
                 # separators if the formatting does not change the text. If the
                 # format is empty, the scene can be hidden or a blank paragraph

{novelWriter-2.4rc1 → novelwriter-2.4.1}/novelwriter/core/toodt.py

@@ -548,7 +548,7 @@ class ToOdt(Tokenizer):
         oVers = _mkTag("office", "version")
         xSett = ET.Element(oRoot, attrib={oVers: X_VERS})
 
-        def putInZip(name, xObj, zipObj):
+        def putInZip(name: str, xObj: ET.Element, zipObj: ZipFile) -> None:
             with zipObj.open(name, mode="w") as fObj:
                 xml = ET.ElementTree(xObj)
                 xml.write(fObj, encoding="utf-8", xml_declaration=True)

{novelWriter-2.4rc1 → novelwriter-2.4.1}/novelwriter/dialogs/preferences.py

@@ -795,7 +795,7 @@ class GuiPreferences(QDialog):
         return
 
     @pyqtSlot()
-    def _selectTextFont(self):
+    def _selectTextFont(self) -> None:
         """Open the QFontDialog and set a font for the font style."""
         current = QFont()
         current.setFamily(CONFIG.textFont)

{novelWriter-2.4rc1 → novelwriter-2.4.1}/novelwriter/dialogs/projectsettings.py

@@ -257,17 +257,17 @@ class _SettingsPage(NScrollableForm):
         )
 
         # Project Language
+        projLang = data.language or CONFIG.guiLocale
         self.projLang = NComboBox(self)
         self.projLang.setMinimumWidth(xW)
         for tag, language in CONFIG.listLanguages(CONFIG.LANG_PROJ):
             self.projLang.addItem(language, tag)
+        self.projLang.setCurrentData(projLang, projLang)
         self.addRow(
             self.tr("Project language"), self.projLang,
             self.tr("Only used when building the manuscript."),
             stretch=(3, 2)
         )
-        if (idx := self.projLang.findData(data.language)) != -1:
-            self.projLang.setCurrentIndex(idx)
 
         # Spell Check Language
         self.spellLang = NComboBox(self)

{novelWriter-2.4rc1 → novelwriter-2.4.1}/novelwriter/dialogs/wordlist.py

@@ -190,7 +190,7 @@ class GuiWordList(QDialog):
         ))
         ffilter = formatFileFilter(["*.txt", "*"])
         path, _ = QFileDialog.getOpenFileName(
-            self, self.tr("Import File"), str(Path.home()), filter=ffilter
+            self, self.tr("Import File"), str(CONFIG.homePath()), filter=ffilter
         )
         if path:
             try:
@@ -207,7 +207,7 @@ class GuiWordList(QDialog):
     def _exportWords(self) -> None:
         """Export words to file."""
         path, _ = QFileDialog.getSaveFileName(
-            self, self.tr("Export File"), str(Path.home())
+            self, self.tr("Export File"), str(CONFIG.homePath())
         )
         if path:
             try:

{novelWriter-2.4rc1 → novelwriter-2.4.1}/novelwriter/error.py

@@ -54,7 +54,7 @@ def logException() -> None:
     return
 
 
-def formatException(exc) -> str:
+def formatException(exc: BaseException) -> str:
     """Format an exception as a string the same way the default
     exception handler does.
     """

{novelWriter-2.4rc1 → novelwriter-2.4.1}/novelwriter/gui/doceditor.py

@@ -39,8 +39,8 @@ from time import time
 from typing import TYPE_CHECKING
 
 from PyQt5.QtCore import (
-    pyqtSignal, pyqtSlot, QObject, QPoint, QRegExp, QRegularExpression,
-    QRunnable, Qt, QTimer
+    QObject, QPoint, QRegExp, QRegularExpression, QRunnable, Qt, QTimer,
+    pyqtSignal, pyqtSlot
 )
 from PyQt5.QtGui import (
     QColor, QCursor, QFont, QKeyEvent, QKeySequence, QMouseEvent, QPalette,
@@ -65,7 +65,7 @@ from novelwriter.text.counting import standardCounter
 from novelwriter.tools.lipsum import GuiLipsum
 from novelwriter.types import (
     QtAlignCenterTop, QtAlignJustify, QtAlignLeft, QtAlignLeftTop,
-    QtAlignRight, QtKeepAnchor, QtModCtrl, QtMouseLeft, QtModeNone, QtModShift,
+    QtAlignRight, QtKeepAnchor, QtModCtrl, QtModeNone, QtModShift, QtMouseLeft,
     QtMoveAnchor, QtMoveLeft, QtMoveRight
 )
 
@@ -334,7 +334,7 @@ class GuiDocEditor(QPlainTextEdit):
         font = QFont()
         font.setFamily(CONFIG.textFont)
         font.setPointSize(CONFIG.textSize)
-        self.setFont(font)
+        self._qDocument.setDefaultFont(font)
 
         # Set default text margins
         # Due to cursor visibility, a part of the margin must be
@@ -381,7 +381,7 @@ class GuiDocEditor(QPlainTextEdit):
 
         return
 
-    def loadText(self, tHandle: str, tLine=None) -> bool:
+    def loadText(self, tHandle: str, tLine: int | None = None) -> bool:
         """Load text from a document into the editor. If we have an I/O
         error, we must handle this and clear the editor so that we don't
         risk overwriting the file if it exists. This can for instance
@@ -497,6 +497,7 @@ class GuiDocEditor(QPlainTextEdit):
             return False
 
         self.setDocumentChanged(False)
+        self.docTextChanged.emit(self._docHandle, self._lastEdit)
 
         oldHeader = self._nwItem.mainHeading
         oldCount = SHARED.project.index.getHandleHeaderCount(tHandle)
@@ -1080,7 +1081,7 @@ class GuiDocEditor(QPlainTextEdit):
         return
 
     @pyqtSlot()
-    def _cursorMoved(self):
+    def _cursorMoved(self) -> None:
         """Triggered when the cursor moved in the editor."""
         self.docFooter.updateLineCount(self.textCursor())
         return
@@ -1470,7 +1471,7 @@ class GuiDocEditor(QPlainTextEdit):
     #  Internal Functions : Text Manipulation
     ##
 
-    def _toggleFormat(self, fLen: int, fChar: str) -> bool:
+    def _toggleFormat(self, fLen: int, fChar: str) -> None:
         """Toggle the formatting of a specific type for a piece of text.
         If more than one block is selected, the formatting is applied to
         the first block.
@@ -1488,12 +1489,12 @@ class GuiDocEditor(QPlainTextEdit):
 
         posS = cursor.selectionStart()
         posE = cursor.selectionEnd()
-        if self._qDocument.characterAt(posO - 1) == fChar:
+        if posS == posE and self._qDocument.characterAt(posO - 1) == fChar:
             logger.warning("Format repetition, cancelling action")
             cursor.clearSelection()
             cursor.setPosition(posO)
             self.setTextCursor(cursor)
-            return False
+            return
 
         blockS = self._qDocument.findBlock(posS)
         blockE = self._qDocument.findBlock(posE)
@@ -1519,7 +1520,6 @@ class GuiDocEditor(QPlainTextEdit):
                 break
 
         if fLen == min(numA, numB):
-            cursor.clearSelection()
             cursor.beginEditBlock()
             cursor.setPosition(posS)
             for i in range(fLen):
@@ -1528,17 +1528,19 @@ class GuiDocEditor(QPlainTextEdit):
             for i in range(fLen):
                 cursor.deletePreviousChar()
             cursor.endEditBlock()
-            cursor.clearSelection()
-            cursor.setPosition(posO - fLen)
-            self.setTextCursor(cursor)
+
+            if select != _SelectAction.KEEP_SELECTION:
+                cursor.clearSelection()
+                cursor.setPosition(posO - fLen)
+                self.setTextCursor(cursor)
 
         else:
             self._wrapSelection(fChar*fLen, pos=posO, select=select)
 
-        return True
+        return
 
     def _wrapSelection(self, before: str, after: str | None = None, pos: int | None = None,
-                       select: _SelectAction = _SelectAction.NO_DECISION) -> bool:
+                       select: _SelectAction = _SelectAction.NO_DECISION) -> None:
         """Wrap the selected text in whatever is in tBefore and tAfter.
         If there is no selection, the autoSelect setting decides the
         action. AutoSelect will select the word under the cursor before
@@ -1578,21 +1580,21 @@ class GuiDocEditor(QPlainTextEdit):
         if select == _SelectAction.MOVE_AFTER:
             cursor.setPosition(posE + len(before + after))
         elif select == _SelectAction.KEEP_SELECTION:
-            cursor.setPosition(posE + len(before), QtMoveAnchor)
-            cursor.setPosition(posS + len(before), QtKeepAnchor)
+            cursor.setPosition(posS + len(before), QtMoveAnchor)
+            cursor.setPosition(posE + len(before), QtKeepAnchor)
         elif select == _SelectAction.KEEP_POSITION:
             cursor.setPosition(posO + len(before))
 
         self.setTextCursor(cursor)
 
-        return True
+        return
 
-    def _replaceQuotes(self, sQuote: str, oQuote: str, cQuote: str) -> bool:
+    def _replaceQuotes(self, sQuote: str, oQuote: str, cQuote: str) -> None:
         """Replace all straight quotes in the selected text."""
         cursor = self.textCursor()
         if not cursor.hasSelection():
             SHARED.error(self.tr("Please select some text before calling replace quotes."))
-            return False
+            return
 
         posS = cursor.selectionStart()
         posE = cursor.selectionEnd()
@@ -1632,7 +1634,7 @@ class GuiDocEditor(QPlainTextEdit):
 
         self._allowAutoReplace(True)
 
-        return True
+        return
 
     def _processBlockFormat(
         self, action: nwDocAction, text: str, toggle: bool = True
@@ -2185,7 +2187,7 @@ class MetaCompleter(QMenu):
     #  Internal Functions
     ##
 
-    def _emitComplete(self, pos: int, length: int, value: str):
+    def _emitComplete(self, pos: int, length: int, value: str) -> None:
         """Emit the signal to indicate a selection has been made."""
         self.complete.emit(pos, length, value)
         return
@@ -2408,12 +2410,12 @@ class GuiDocEditSearch(QFrame):
 
         self.searchBox = QLineEdit(self)
         self.searchBox.setFont(self.boxFont)
-        self.searchBox.setPlaceholderText(self.tr("Search"))
+        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"))
+        self.replaceBox.setPlaceholderText(self.tr("Replace with"))
         self.replaceBox.returnPressed.connect(self._doReplace)
 
         self.searchOpt = QToolBar(self)
@@ -2966,7 +2968,7 @@ class GuiDocEditHeader(QWidget):
     #  Events
     ##
 
-    def mousePressEvent(self, event: QMouseEvent):
+    def mousePressEvent(self, event: QMouseEvent) -> None:
         """Capture a click on the title and ensure that the item is
         selected in the project tree.
         """