novelWriter 2.6rc1__py3-none-any.whl → 2.6.1__py3-none-any.whl

novelwriter/dialogs/preferences.py

@@ -271,10 +271,10 @@ class GuiPreferences(NDialog):
             self.tr("Include project notes in status bar word count"), self.incNotesWCount
         )
 
-        # Auto Save
+        # Behaviour
         # =========
 
-        title = self.tr("Auto Save")
+        title = self.tr("Behaviour")
         section += 1
         self.sidebar.addButton(title, section)
         self.mainForm.addGroupLabel(title, section)
@@ -301,6 +301,14 @@ class GuiPreferences(NDialog):
             self.tr("How often the project is automatically saved."), unit=self.tr("seconds")
         )
 
+        # Ask before exiting novelWriter
+        self.askBeforeExit = NSwitch(self)
+        self.askBeforeExit.setChecked(CONFIG.askBeforeExit)
+        self.mainForm.addRow(
+            self.tr("Ask before exiting novelWriter"), self.askBeforeExit,
+            self.tr("Only applies when a project is open.")
+        )
+
         # Project Backup
         # ==============
 
@@ -927,9 +935,10 @@ class GuiPreferences(NDialog):
         CONFIG.incNotesWCount = self.incNotesWCount.isChecked()
         CONFIG.setTextFont(self._textFont)
 
-        # Auto Save
-        CONFIG.autoSaveDoc  = self.autoSaveDoc.value()
-        CONFIG.autoSaveProj = self.autoSaveProj.value()
+        # Behaviour
+        CONFIG.autoSaveDoc   = self.autoSaveDoc.value()
+        CONFIG.autoSaveProj  = self.autoSaveProj.value()
+        CONFIG.askBeforeExit = self.askBeforeExit.isChecked()
 
         # Project Backup
         CONFIG.setBackupPath(self.backupPath)

novelwriter/enum.py

@@ -68,13 +68,6 @@ class nwComment(Enum):
     STORY    = 7
 
 
-class nwTrinary(Enum):
-
-    NEGATIVE = -1
-    NEUTRAL  = 0
-    POSITIVE = 1
-
-
 class nwChange(Enum):
 
     CREATE = 0

novelwriter/extensions/novelselector.py

@@ -90,12 +90,13 @@ class NovelSelector(QComboBox):
     @pyqtSlot()
     def refreshNovelList(self) -> None:
         """Rebuild the list of novel items."""
+        cHandle = self.currentData()
+
         self._blockSignal = True
         self._firstHandle = None
         self.clear()
 
         icon = SHARED.theme.getIcon(nwLabels.CLASS_ICON[nwItemClass.NOVEL])
-        handle = self.currentData()
         for tHandle, nwItem in SHARED.project.tree.iterRoots(nwItemClass.NOVEL):
             if self._listFormat:
                 name = self._listFormat.format(nwItem.itemName)
@@ -110,7 +111,7 @@ class NovelSelector(QComboBox):
             self.insertSeparator(self.count())
             self.addItem(icon, self.tr("All Novel Folders"), "")
 
-        self.setHandle(handle)
+        self.setHandle(cHandle)
         self.setEnabled(self.count() > 1)
         self._blockSignal = False
 

novelwriter/extensions/statusled.py

@@ -29,7 +29,6 @@ from PyQt5.QtGui import QColor, QPainter, QPaintEvent
 from PyQt5.QtWidgets import QAbstractButton, QWidget
 
 from novelwriter import CONFIG
-from novelwriter.enum import nwTrinary
 from novelwriter.types import QtBlack, QtPaintAntiAlias
 
 logger = logging.getLogger(__name__)
@@ -47,14 +46,14 @@ class StatusLED(QAbstractButton):
         self._postitve = QtBlack
         self._negative = QtBlack
         self._color = QtBlack
-        self._state = nwTrinary.NEUTRAL
+        self._state = None
         self._bPx = CONFIG.pxInt(1)
         self.setFixedWidth(sW)
         self.setFixedHeight(sH)
         return
 
     @property
-    def state(self) -> nwTrinary:
+    def state(self) -> bool | None:
         """The current state of the LED."""
         return self._state
 
@@ -66,11 +65,11 @@ class StatusLED(QAbstractButton):
         self.setState(self._state)
         return
 
-    def setState(self, state: nwTrinary) -> None:
+    def setState(self, state: bool | None) -> None:
         """Set the colour state."""
-        if state == nwTrinary.POSITIVE:
+        if state is True:
             self._color = self._postitve
-        elif state == nwTrinary.NEGATIVE:
+        elif state is False:
             self._color = self._negative
         else:
             self._color = self._neutral

novelwriter/formats/shared.py

@@ -104,17 +104,18 @@ class BlockTyp(IntEnum):
 
     EMPTY   = 1   # Empty line (new paragraph)
     TITLE   = 2   # Title
-    HEAD1   = 3   # Heading 1
-    HEAD2   = 4   # Heading 2
-    HEAD3   = 5   # Heading 3
-    HEAD4   = 6   # Heading 4
-    TEXT    = 7   # Text line
-    SEP     = 8   # Scene separator
-    SKIP    = 9   # Paragraph break
-    SUMMARY = 10  # Synopsis/short comment
-    NOTE    = 11  # Note
-    COMMENT = 12  # Comment
-    KEYWORD = 13  # Tag/reference keywords
+    PART    = 3   # Partition
+    HEAD1   = 4   # Heading 1 or Chapter
+    HEAD2   = 5   # Heading 2 or Scene
+    HEAD3   = 6   # Heading 3 or Section
+    HEAD4   = 7   # Heading 4
+    TEXT    = 8   # Text line
+    SEP     = 9   # Scene separator
+    SKIP    = 10  # Paragraph break
+    SUMMARY = 11  # Synopsis/short comment
+    NOTE    = 12  # Note
+    COMMENT = 13  # Comment
+    KEYWORD = 14  # Tag/reference keywords
 
 
 class BlockFmt(Flag):

novelwriter/formats/todocx.py

@@ -271,7 +271,7 @@ class ToDocX(Tokenizer):
             if tType == BlockTyp.TEXT:
                 self._processFragments(par, S_NORM, tText, tFormat)
 
-            elif tType == BlockTyp.TITLE:
+            elif tType in (BlockTyp.TITLE, BlockTyp.PART):
                 self._processFragments(par, S_TITLE, tText, tFormat)
 
             elif tType == BlockTyp.HEAD1:

novelwriter/formats/tohtml.py

@@ -30,7 +30,7 @@ from pathlib import Path
 from time import time
 
 from novelwriter.common import formatTimeStamp
-from novelwriter.constants import nwHtmlUnicode
+from novelwriter.constants import nwHtmlUnicode, nwStyles
 from novelwriter.core.project import NWProject
 from novelwriter.formats.shared import BlockFmt, BlockTyp, T_Formats, TextFmt, stripEscape
 from novelwriter.formats.tokenizer import Tokenizer
@@ -130,20 +130,6 @@ class ToHtml(Tokenizer):
 
     def doConvert(self) -> None:
         """Convert the list of text tokens into an HTML document."""
-        if self._isNovel:
-            # For story files, we bump the titles one level up
-            h1Cl = " class='title'"
-            h1 = "h1"
-            h2 = "h1"
-            h3 = "h2"
-            h4 = "h3"
-        else:
-            h1Cl = ""
-            h1 = "h1"
-            h2 = "h2"
-            h3 = "h3"
-            h4 = "h4"
-
         lines = []
         for tType, tMeta, tText, tFmt, tStyle in self._blocks:
 
@@ -213,25 +199,25 @@ class ToHtml(Tokenizer):
             if tType == BlockTyp.TEXT:
                 lines.append(f"<p{hStyle}>{self._formatText(tText, tFmt)}</p>\n")
 
-            elif tType == BlockTyp.TITLE:
+            elif tType in (BlockTyp.TITLE, BlockTyp.PART):
                 tHead = tText.replace("\n", "<br>")
                 lines.append(f"<h1 class='title'{hStyle}>{aNm}{tHead}</h1>\n")
 
             elif tType == BlockTyp.HEAD1:
                 tHead = tText.replace("\n", "<br>")
-                lines.append(f"<{h1}{h1Cl}{hStyle}>{aNm}{tHead}</{h1}>\n")
+                lines.append(f"<h1{hStyle}>{aNm}{tHead}</h1>\n")
 
             elif tType == BlockTyp.HEAD2:
                 tHead = tText.replace("\n", "<br>")
-                lines.append(f"<{h2}{hStyle}>{aNm}{tHead}</{h2}>\n")
+                lines.append(f"<h2{hStyle}>{aNm}{tHead}</h2>\n")
 
             elif tType == BlockTyp.HEAD3:
                 tHead = tText.replace("\n", "<br>")
-                lines.append(f"<{h3}{hStyle}>{aNm}{tHead}</{h3}>\n")
+                lines.append(f"<h3{hStyle}>{aNm}{tHead}</h3>\n")
 
             elif tType == BlockTyp.HEAD4:
                 tHead = tText.replace("\n", "<br>")
-                lines.append(f"<{h4}{hStyle}>{aNm}{tHead}</{h4}>\n")
+                lines.append(f"<h4{hStyle}>{aNm}{tHead}</h4>\n")
 
             elif tType == BlockTyp.SEP:
                 lines.append(f"<p class='sep'{hStyle}>{tText}</p>\n")
@@ -310,9 +296,7 @@ class ToHtml(Tokenizer):
                     "</style>\n"
                     "</head>\n"
                     "<body>\n"
-                    "<article>\n"
                     "{body:s}\n"
-                    "</article>\n"
                     "</body>\n"
                     "</html>\n"
                 ).format(
@@ -359,6 +343,12 @@ class ToHtml(Tokenizer):
         mtSP = self._marginSep[0]
         mbSP = self._marginSep[1]
 
+        fSz0 = nwStyles.H_SIZES[0]
+        fSz1 = nwStyles.H_SIZES[1]
+        fSz2 = nwStyles.H_SIZES[2]
+        fSz3 = nwStyles.H_SIZES[3]
+        fSz4 = nwStyles.H_SIZES[4]
+
         font = self._textFont
         fFam = font.family()
         fSz = font.pointSize()
@@ -379,12 +369,25 @@ class ToHtml(Tokenizer):
         styles.append(f"a {{color: {lColor};}}")
         styles.append(f"mark {{background: {mColor};}}")
         styles.append(f"h1, h2, h3, h4 {{color: {hColor}; page-break-after: avoid;}}")
-        styles.append(f"h1 {{margin-top: {mtH1:.2f}em; margin-bottom: {mbH1:.2f}em;}}")
-        styles.append(f"h2 {{margin-top: {mtH2:.2f}em; margin-bottom: {mbH2:.2f}em;}}")
-        styles.append(f"h3 {{margin-top: {mtH3:.2f}em; margin-bottom: {mbH3:.2f}em;}}")
-        styles.append(f"h4 {{margin-top: {mtH4:.2f}em; margin-bottom: {mbH4:.2f}em;}}")
         styles.append(
-            f".title {{font-size: 2.5em; margin-top: {mtH0:.2f}em; margin-bottom: {mbH0:.2f}em;}}"
+            f"h1 {{font-size: {fSz1:.2f}em; "
+            f"margin-top: {mtH1:.2f}em; margin-bottom: {mbH1:.2f}em;}}"
+        )
+        styles.append(
+            f"h2 {{font-size: {fSz2:.2f}em; "
+            f"margin-top: {mtH2:.2f}em; margin-bottom: {mbH2:.2f}em;}}"
+        )
+        styles.append(
+            f"h3 {{font-size: {fSz3:.2f}em; "
+            f"margin-top: {mtH3:.2f}em; margin-bottom: {mbH3:.2f}em;}}"
+        )
+        styles.append(
+            f"h4 {{font-size: {fSz4:.2f}em; "
+            f"margin-top: {mtH4:.2f}em; margin-bottom: {mbH4:.2f}em;}}"
+        )
+        styles.append(
+            f".title {{font-size: {fSz0:.2f}em; "
+            f"margin-top: {mtH0:.2f}em; margin-bottom: {mbH0:.2f}em;}}"
         )
         styles.append(
             f".sep {{text-align: center; margin-top: {mtSP:.2f}em; margin-bottom: {mbSP:.2f}em;}}"

novelwriter/formats/tokenizer.py

@@ -68,11 +68,11 @@ COMMENT_STYLE = {
     nwComment.COMMENT:  ComStyle(),
     nwComment.STORY:    ComStyle("", "modifier", "note"),
 }
-HEADINGS = [BlockTyp.TITLE, BlockTyp.HEAD1, BlockTyp.HEAD2, BlockTyp.HEAD3, BlockTyp.HEAD4]
-SKIP_INDENT = [
-    BlockTyp.TITLE, BlockTyp.HEAD1, BlockTyp.HEAD2, BlockTyp.HEAD2, BlockTyp.HEAD3,
-    BlockTyp.HEAD4, BlockTyp.SEP, BlockTyp.SKIP,
+HEADINGS = [
+    BlockTyp.TITLE, BlockTyp.PART, BlockTyp.HEAD1,
+    BlockTyp.HEAD2, BlockTyp.HEAD3, BlockTyp.HEAD4,
 ]
+SKIP_INDENT = HEADINGS + [BlockTyp.SEP, BlockTyp.SKIP]
 B_EMPTY: T_Block = (BlockTyp.EMPTY, "", "", [], BlockFmt.NONE)
 
 
@@ -654,6 +654,7 @@ class Tokenizer(ABC):
                 if not (isPlain or isNovel and sHide):
                     tStyle |= self._titleStyle
                 if isNovel:
+                    tType = BlockTyp.PART if isPlain else BlockTyp.TITLE
                     if sHide:
                         tText = ""
                         tType = BlockTyp.EMPTY
@@ -687,6 +688,7 @@ class Tokenizer(ABC):
                 sHide = self._hideChapter if isPlain else self._hideUnNum
                 tFormat = self._fmtChapter if isPlain else self._fmtUnNum
                 if isNovel:
+                    tType = BlockTyp.HEAD1  # Promote
                     if isPlain:
                         self._hFormatter.incChapter()
                     if sHide:
@@ -721,6 +723,7 @@ class Tokenizer(ABC):
                 sHide = self._hideScene if isPlain else self._hideHScene
                 tFormat = self._fmtScene if isPlain else self._fmtHScene
                 if isNovel:
+                    tType = BlockTyp.HEAD2  # Promote
                     self._hFormatter.incScene()
                     if sHide:
                         tText = ""
@@ -752,6 +755,7 @@ class Tokenizer(ABC):
                 tText = aLine[5:].strip()
                 tType = BlockTyp.HEAD4
                 if isNovel:
+                    tType = BlockTyp.HEAD3  # Promote
                     if self._hideSection:
                         tText = ""
                         tType = BlockTyp.EMPTY
@@ -927,12 +931,14 @@ class Tokenizer(ABC):
         for tType, tKey, tText, _, _ in self._blocks:
             if tType == BlockTyp.TITLE:
                 prefix = "TT"
+            elif tType == BlockTyp.PART:
+                prefix = "PT"
             elif tType == BlockTyp.HEAD1:
-                prefix = "PT" if isNovel else "H1"
+                prefix = "CH" if isNovel else "H1"
             elif tType == BlockTyp.HEAD2:
-                prefix = "CH" if isNovel else "H2"
-            elif tType == BlockTyp.HEAD3:
-                prefix = "SC" if isNovel else "H3"
+                prefix = "SC" if isNovel else "H2"
+            elif tType == BlockTyp.HEAD3 and not isNovel:
+                prefix = "H3"
             else:
                 continue
 

novelwriter/formats/tomarkdown.py

@@ -113,9 +113,10 @@ class ToMarkdown(Tokenizer):
                 tTemp = self._formatText(tText, tFormat, mTags).replace("\n", "  \n")
                 lines.append(f"{tTemp}\n\n")
 
-            elif tType == BlockTyp.TITLE:
+            elif tType in (BlockTyp.TITLE, BlockTyp.PART):
                 tHead = tText.replace("\n", " - ")
-                lines.append(f"# {tHead}\n\n")
+                lines.append(f"{tHead}\n")
+                lines.append("="*len(tHead) + "\n\n")
 
             elif tType == BlockTyp.HEAD1:
                 tHead = tText.replace("\n", " - ")

novelwriter/formats/toodt.py

@@ -363,7 +363,7 @@ class ToOdt(Tokenizer):
                 else:
                     self._addTextPar(xText, S_TEXT, oStyle, tText, tFmt=tFormat)
 
-            elif tType == BlockTyp.TITLE:
+            elif tType in (BlockTyp.TITLE, BlockTyp.PART):
                 # Title must be text:p
                 self._addTextPar(xText, S_TITLE, oStyle, tText, isHead=False)
 

novelwriter/formats/toqdoc.py

@@ -157,6 +157,7 @@ class ToQTextDocument(Tokenizer):
 
         self._mHead = {
             BlockTyp.TITLE: (fPx * self._marginTitle[0], fPx * self._marginTitle[1]),
+            BlockTyp.PART:  (fPx * self._marginTitle[0], fPx * self._marginTitle[1]),
             BlockTyp.HEAD1: (fPx * self._marginHead1[0], fPx * self._marginHead1[1]),
             BlockTyp.HEAD2: (fPx * self._marginHead2[0], fPx * self._marginHead2[1]),
             BlockTyp.HEAD3: (fPx * self._marginHead3[0], fPx * self._marginHead3[1]),
@@ -166,6 +167,7 @@ class ToQTextDocument(Tokenizer):
         hScale = self._scaleHeads
         self._sHead = {
             BlockTyp.TITLE: (nwStyles.H_SIZES.get(0, 1.0) * fPt) if hScale else fPt,
+            BlockTyp.PART:  (nwStyles.H_SIZES.get(0, 1.0) * fPt) if hScale else fPt,
             BlockTyp.HEAD1: (nwStyles.H_SIZES.get(1, 1.0) * fPt) if hScale else fPt,
             BlockTyp.HEAD2: (nwStyles.H_SIZES.get(2, 1.0) * fPt) if hScale else fPt,
             BlockTyp.HEAD3: (nwStyles.H_SIZES.get(3, 1.0) * fPt) if hScale else fPt,

novelwriter/gui/doceditor.py

@@ -34,7 +34,7 @@ from __future__ import annotations
 import bisect
 import logging
 
-from enum import Enum
+from enum import Enum, IntFlag
 from time import time
 
 from PyQt5.QtCore import (
@@ -57,7 +57,7 @@ from novelwriter.constants import nwConst, nwKeyWords, nwShortcode, nwUnicode
 from novelwriter.core.document import NWDocument
 from novelwriter.enum import (
     nwChange, nwComment, nwDocAction, nwDocInsert, nwDocMode, nwItemClass,
-    nwItemType, nwTrinary
+    nwItemType
 )
 from novelwriter.extensions.configlayout import NColourLabel
 from novelwriter.extensions.eventfilters import WheelEventFilter
@@ -84,6 +84,13 @@ class _SelectAction(Enum):
     MOVE_AFTER     = 3
 
 
+class _TagAction(IntFlag):
+
+    NONE   = 0b00
+    FOLLOW = 0b01
+    CREATE = 0b10
+
+
 class GuiDocEditor(QPlainTextEdit):
     """Gui Widget: Main Document Editor"""
 
@@ -1104,10 +1111,10 @@ class GuiDocEditor(QPlainTextEdit):
             else:
                 self._completer.setVisible(False)
 
-        if self._doReplace and added == 1:
-            cursor = self.textCursor()
-            if self._autoReplace.process(text, cursor):
-                self._qDocument.syntaxHighlighter.rehighlightBlock(cursor.block())
+            if self._doReplace and added == 1:
+                cursor = self.textCursor()
+                if self._autoReplace.process(text, cursor):
+                    self._qDocument.syntaxHighlighter.rehighlightBlock(cursor.block())
 
         return
 
@@ -1158,11 +1165,11 @@ class GuiDocEditor(QPlainTextEdit):
 
         # Follow
         status = self._processTag(cursor=pCursor, follow=False)
-        if status == nwTrinary.POSITIVE:
+        if status & _TagAction.FOLLOW:
             action = ctxMenu.addAction(self.tr("Follow Tag"))
             action.triggered.connect(qtLambda(self._processTag, cursor=pCursor, follow=True))
             ctxMenu.addSeparator()
-        elif status == nwTrinary.NEGATIVE:
+        elif status & _TagAction.CREATE:
             action = ctxMenu.addAction(self.tr("Create Note for Tag"))
             action.triggered.connect(qtLambda(self._processTag, cursor=pCursor, create=True))
             ctxMenu.addSeparator()
@@ -1217,7 +1224,7 @@ class GuiDocEditor(QPlainTextEdit):
 
         # Execute the context menu
         ctxMenu.exec(self.viewport().mapToGlobal(pos))
-        ctxMenu.deleteLater()
+        ctxMenu.setParent(None)
 
         return
 
@@ -1925,8 +1932,9 @@ class GuiDocEditor(QPlainTextEdit):
         self._qDocument.syntaxHighlighter.rehighlightBlock(block)
         return
 
-    def _processTag(self, cursor: QTextCursor | None = None,
-                    follow: bool = True, create: bool = False) -> nwTrinary:
+    def _processTag(
+        self, cursor: QTextCursor | None = None, follow: bool = True, create: bool = False
+    ) -> _TagAction:
         """Activated by Ctrl+Enter. Checks that we're in a block
         starting with '@'. We then find the tag under the cursor and
         check that it is not the tag itself. If all this is fine, we
@@ -1936,19 +1944,22 @@ class GuiDocEditor(QPlainTextEdit):
         if cursor is None:
             cursor = self.textCursor()
 
+        status = _TagAction.NONE
         block = cursor.block()
         text = block.text()
         if len(text) == 0:
-            return nwTrinary.NEUTRAL
+            return status
 
         if text.startswith("@") and self._docHandle:
 
             isGood, tBits, tPos = SHARED.project.index.scanThis(text)
             if (
-                not isGood or not tBits or tBits[0] == nwKeyWords.TAG_KEY
-                or tBits[0] not in nwKeyWords.VALID_KEYS
+                not isGood
+                or not tBits
+                or (key := tBits[0]) == nwKeyWords.TAG_KEY
+                or key not in nwKeyWords.VALID_KEYS
             ):
-                return nwTrinary.NEUTRAL
+                return status
 
             tag = ""
             exist = False
@@ -1965,7 +1976,14 @@ class GuiDocEditor(QPlainTextEdit):
 
             if not tag or tag.startswith("@"):
                 # The keyword cannot be looked up, so we ignore that
-                return nwTrinary.NEUTRAL
+                return status
+
+            if not exist and key in nwKeyWords.CAN_CREATE:
+                # Must only be set if we have a tag selected
+                status |= _TagAction.CREATE
+
+            if exist:
+                status |= _TagAction.FOLLOW
 
             if follow and exist:
                 logger.debug("Attempting to follow tag '%s'", tag)
@@ -1977,9 +1995,7 @@ class GuiDocEditor(QPlainTextEdit):
                     itemClass = nwKeyWords.KEY_CLASS.get(tBits[0], nwItemClass.NO_CLASS)
                     self.requestNewNoteCreation.emit(tag, itemClass)
 
-            return nwTrinary.POSITIVE if exist else nwTrinary.NEGATIVE
-
-        return nwTrinary.NEUTRAL
+        return status
 
     def _emitRenameItem(self, block: QTextBlock) -> None:
         """Emit a signal to request an item be renamed."""

novelwriter/gui/docviewer.py

@@ -424,7 +424,7 @@ class GuiDocViewer(QTextBrowser):
 
         # Open the context menu
         ctxMenu.exec(self.viewport().mapToGlobal(point))
-        ctxMenu.deleteLater()
+        ctxMenu.setParent(None)
 
         return
 

novelwriter/gui/itemdetails.py

@@ -93,6 +93,7 @@ class GuiItemDetails(QWidget):
         self.statusData = QLabel("", self)
         self.statusData.setFont(fntValue)
         self.statusData.setAlignment(QtAlignLeft)
+        self.statusData.setWordWrap(True)
 
         # Class
         self.className = QLabel(self.tr("Class"), self)

novelwriter/gui/projtree.py

@@ -955,23 +955,18 @@ class GuiProjectTree(QTreeView):
         if model := self._getModel():
             if point is None:
                 point = self.visualRect(self.currentIndex()).center()
-
-            if (
-                point is not None
-                and (node := self._getNode(self.currentIndex()))
-                and (indices := self._selectedRows())
-            ):
-                ctxMenu = _TreeContextMenu(self, model, node, indices)
-                if node is SHARED.project.tree.trash:
-                    ctxMenu.buildTrashMenu()
-                elif len(indices) > 1:
-                    ctxMenu.buildMultiSelectMenu()
-                else:
-                    ctxMenu.buildSingleSelectMenu()
-
-                ctxMenu.exec(self.viewport().mapToGlobal(point))
-                ctxMenu.deleteLater()
-
+            if point is not None:
+                index = self.indexAt(point)
+                if (node := self._getNode(index)) and (indices := self._selectedRows()):
+                    ctxMenu = _TreeContextMenu(self, model, node, indices)
+                    if node is SHARED.project.tree.trash:
+                        ctxMenu.buildTrashMenu()
+                    elif len(indices) > 1:
+                        ctxMenu.buildMultiSelectMenu()
+                    else:
+                        ctxMenu.buildSingleSelectMenu()
+                    ctxMenu.exec(self.viewport().mapToGlobal(point))
+                    ctxMenu.setParent(None)
         return
 
     ##
@@ -1020,7 +1015,9 @@ class GuiProjectTree(QTreeView):
     def _clearSelection(self) -> None:
         """Clear the currently selected items."""
         self.clearSelection()
-        self.selectionModel().clearCurrentIndex()
+        if model := self.selectionModel():
+            # Selection model can be None (#2173)
+            model.clearCurrentIndex()
         return
 
     def _selectedRows(self) -> list[QModelIndex]:

novelwriter/gui/statusbar.py

@@ -34,7 +34,6 @@ from PyQt5.QtWidgets import QApplication, QLabel, QStatusBar, QWidget
 from novelwriter import CONFIG, SHARED
 from novelwriter.common import formatTime
 from novelwriter.constants import nwConst
-from novelwriter.enum import nwTrinary
 from novelwriter.extensions.modified import NClickableLabel
 from novelwriter.extensions.statusled import StatusLED
 
@@ -121,8 +120,8 @@ class GuiMainStatus(QStatusBar):
         self.setRefTime(-1.0)
         self.setLanguage(*SHARED.spelling.describeDict())
         self.setProjectStats(0, 0)
-        self.setProjectStatus(nwTrinary.NEUTRAL)
-        self.setDocumentStatus(nwTrinary.NEUTRAL)
+        self.setProjectStatus(None)
+        self.setDocumentStatus(None)
         self.updateTime()
         return
 
@@ -152,12 +151,12 @@ class GuiMainStatus(QStatusBar):
         self._refTime = refTime
         return
 
-    def setProjectStatus(self, state: nwTrinary) -> None:
+    def setProjectStatus(self, state: bool | None) -> None:
         """Set the project status colour icon."""
         self.projIcon.setState(state)
         return
 
-    def setDocumentStatus(self, state: nwTrinary) -> None:
+    def setDocumentStatus(self, state: bool | None) -> None:
         """Set the document status colour icon."""
         self.docIcon.setState(state)
         return
@@ -220,13 +219,13 @@ class GuiMainStatus(QStatusBar):
     @pyqtSlot(bool)
     def updateProjectStatus(self, status: bool) -> None:
         """Update the project status."""
-        self.setProjectStatus(nwTrinary.NEGATIVE if status else nwTrinary.POSITIVE)
+        self.setProjectStatus(not status)
         return
 
     @pyqtSlot(bool)
     def updateDocumentStatus(self, status: bool) -> None:
         """Update the document status."""
-        self.setDocumentStatus(nwTrinary.NEGATIVE if status else nwTrinary.POSITIVE)
+        self.setDocumentStatus(not status)
         return
 
     ##

novelwriter/guimain.py

@@ -852,7 +852,7 @@ class GuiMain(QMainWindow):
 
     def closeMain(self) -> bool:
         """Save everything, and close novelWriter."""
-        if SHARED.hasProject and not SHARED.question("%s<br>%s" % (
+        if SHARED.hasProject and CONFIG.askBeforeExit and not SHARED.question("%s<br>%s" % (
             self.tr("Do you want to exit novelWriter?"),
             self.tr("Changes are saved automatically.")
         )):

novelwriter/tools/dictionaries.py

@@ -65,12 +65,12 @@ class GuiDictionaries(NNonBlockingDialog):
         self.setMinimumHeight(CONFIG.pxInt(300))
 
         # Hunspell Dictionaries
-        foUrl = "https://www.freeoffice.com/en/download/dictionaries"
         loUrl = "https://extensions.libreoffice.org"
+        ooUrl = "https://extensions.openoffice.org"
         self.huInfo = QLabel("<br>".join([
             self.tr("Download a dictionary from one of the links, and add it below."),
-            f"&nbsp;\u203a <a href='{foUrl}'>{foUrl}</a>",
             f"&nbsp;\u203a <a href='{loUrl}'>{loUrl}</a>",
+            f"&nbsp;\u203a <a href='{ooUrl}'>{ooUrl}</a>",
         ]), self)
         self.huInfo.setOpenExternalLinks(True)
         self.huInfo.setWordWrap(True)