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

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

@@ -177,6 +177,7 @@ class GuiProjectView(QWidget):
         self.projTree.addAction(trash)
         rename.triggered.connect(self.renameTreeItem)
         delete.triggered.connect(self.projTree.processDeleteRequest)
+        trash.triggered.connect(self.projTree.emptyTrash)
         return
 
     ##
@@ -955,23 +956,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 +1016,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)

novelwriter/tools/manussettings.py

@@ -38,7 +38,7 @@ from PyQt5.QtWidgets import (
 
 from novelwriter import CONFIG, SHARED
 from novelwriter.common import describeFont, fontMatcher, qtLambda
-from novelwriter.constants import nwHeadFmt, nwKeyWords, nwLabels, nwStyles, trConst
+from novelwriter.constants import nwHeadFmt, nwKeyWords, nwLabels, trConst
 from novelwriter.core.buildsettings import BuildSettings, FilterMode
 from novelwriter.extensions.configlayout import (
     NColourLabel, NFixedPage, NScrollableForm, NScrollablePage
@@ -1074,7 +1074,7 @@ class _FormattingTab(NScrollableForm):
         self.titleMarginB.setFixedWidth(dbW)
 
         self.addRow(
-            trConst(nwStyles.T_LABEL["H0"]),
+            self._build.getLabel("format.titleMargin"),
             [pixT, self.titleMarginT, 6, pixB, self.titleMarginB],
             unit="em",
         )
@@ -1087,7 +1087,7 @@ class _FormattingTab(NScrollableForm):
         self.h1MarginB.setFixedWidth(dbW)
 
         self.addRow(
-            trConst(nwStyles.T_LABEL["H1"]),
+            self._build.getLabel("format.h1Margin"),
             [pixT, self.h1MarginT, 6, pixB, self.h1MarginB],
             unit="em",
         )
@@ -1100,7 +1100,7 @@ class _FormattingTab(NScrollableForm):
         self.h2MarginB.setFixedWidth(dbW)
 
         self.addRow(
-            trConst(nwStyles.T_LABEL["H2"]),
+            self._build.getLabel("format.h2Margin"),
             [pixT, self.h2MarginT, 6, pixB, self.h2MarginB],
             unit="em",
         )
@@ -1113,7 +1113,7 @@ class _FormattingTab(NScrollableForm):
         self.h3MarginB.setFixedWidth(dbW)
 
         self.addRow(
-            trConst(nwStyles.T_LABEL["H3"]),
+            self._build.getLabel("format.h3Margin"),
             [pixT, self.h3MarginT, 6, pixB, self.h3MarginB],
             unit="em",
         )
@@ -1126,7 +1126,7 @@ class _FormattingTab(NScrollableForm):
         self.h4MarginB.setFixedWidth(dbW)
 
         self.addRow(
-            trConst(nwStyles.T_LABEL["H4"]),
+            self._build.getLabel("format.h4Margin"),
             [pixT, self.h4MarginT, 6, pixB, self.h4MarginB],
             unit="em",
         )
@@ -1139,7 +1139,7 @@ class _FormattingTab(NScrollableForm):
         self.textMarginB.setFixedWidth(dbW)
 
         self.addRow(
-            trConst(nwStyles.T_LABEL["TT"]),
+            self._build.getLabel("format.textMargin"),
             [pixT, self.textMarginT, 6, pixB, self.textMarginB],
             unit="em",
         )
@@ -1152,7 +1152,7 @@ class _FormattingTab(NScrollableForm):
         self.sepMarginB.setFixedWidth(dbW)
 
         self.addRow(
-            trConst(nwStyles.T_LABEL["SP"]),
+            self._build.getLabel("format.sepMargin"),
             [pixT, self.sepMarginT, 6, pixB, self.sepMarginB],
             unit="em",
         )

novelwriter/tools/welcome.py

@@ -376,7 +376,7 @@ class _OpenProjectPage(QWidget):
         action = ctxMenu.addAction(self.tr("Remove Project"))
         action.triggered.connect(self._deleteSelectedItem)
         ctxMenu.exec(self.mapToGlobal(pos))
-        ctxMenu.deleteLater()
+        ctxMenu.setParent(None)
         return
 
     ##