Refactor build settings (#2031)

vkbo · Sep 28, 2024 · 3da5074 · 3da5074
2 parents 7cc48ae + e97a476
commit 3da5074
Show file tree

Hide file tree

Showing 5 changed files with 316 additions and 277 deletions.
diff --git a/novelwriter/core/buildsettings.py b/novelwriter/core/buildsettings.py
@@ -121,13 +121,11 @@
     "text.includeKeywords":    QT_TRANSLATE_NOOP("Builds", "Include Keywords"),
     "text.includeBodyText":    QT_TRANSLATE_NOOP("Builds", "Include Body Text"),
     "text.ignoredKeywords":    QT_TRANSLATE_NOOP("Builds", "Ignore These Keywords"),
-    "text.grpInsert":          QT_TRANSLATE_NOOP("Builds", "Insert Content"),
     "text.addNoteHeadings":    QT_TRANSLATE_NOOP("Builds", "Add Titles for Notes"),
 
     "format.grpFormat":        QT_TRANSLATE_NOOP("Builds", "Text Format"),
     "format.textFont":         QT_TRANSLATE_NOOP("Builds", "Text Font"),
     "format.lineHeight":       QT_TRANSLATE_NOOP("Builds", "Line Height"),
-    "format.grpOptions":       QT_TRANSLATE_NOOP("Builds", "Text Options"),
     "format.justifyText":      QT_TRANSLATE_NOOP("Builds", "Justify Text Margins"),
     "format.stripUnicode":     QT_TRANSLATE_NOOP("Builds", "Replace Unicode Characters"),
     "format.replaceTabs":      QT_TRANSLATE_NOOP("Builds", "Replace Tabs with Spaces"),
@@ -149,12 +147,12 @@
     "format.leftMargin":       QT_TRANSLATE_NOOP("Builds", "Left Margin"),
     "format.rightMargin":      QT_TRANSLATE_NOOP("Builds", "Right Margin"),
 
-    "odt":                     QT_TRANSLATE_NOOP("Builds", "Open Document (.odt)"),
+    "odt":                     QT_TRANSLATE_NOOP("Builds", "ODT Documents"),
     "odt.addColours":          QT_TRANSLATE_NOOP("Builds", "Add Highlight Colours"),
     "odt.pageHeader":          QT_TRANSLATE_NOOP("Builds", "Page Header"),
     "odt.pageCountOffset":     QT_TRANSLATE_NOOP("Builds", "Page Counter Offset"),
 
-    "html":                    QT_TRANSLATE_NOOP("Builds", "HTML (.html)"),
+    "html":                    QT_TRANSLATE_NOOP("Builds", "HTML Document"),
     "html.addStyles":          QT_TRANSLATE_NOOP("Builds", "Add CSS Styles"),
     "html.preserveTabs":       QT_TRANSLATE_NOOP("Builds", "Preserve Tab Characters"),
 }

diff --git a/novelwriter/gui/doceditor.py b/novelwriter/gui/doceditor.py
@@ -1095,6 +1095,12 @@ def _insertCompletion(self, pos: int, length: int, text: str) -> None:
             self._completer.hide()
         return
 
+    @pyqtSlot()
+    def _openContextFromCursor(self) -> None:
+        """Open the spell check context menu at the cursor."""
+        self._openContextMenu(self.cursorRect().center())
+        return
+
     @pyqtSlot("QPoint")
     def _openContextMenu(self, pos: QPoint) -> None:
         """Open the editor context menu at a given coordinate."""
@@ -1938,11 +1944,6 @@ def _emitRenameItem(self, block: QTextBlock) -> None:
             self.requestProjectItemRenamed.emit(self._docHandle, text)
         return
 
-    def _openContextFromCursor(self) -> None:
-        """Open the spell check context menu at the cursor."""
-        self._openContextMenu(self.cursorRect().center())
-        return
-
     def _docAutoReplace(self, text: str) -> None:
         """Auto-replace text elements based on main configuration."""
         cursor = self.textCursor()

diff --git a/novelwriter/gui/dochighlight.py b/novelwriter/gui/dochighlight.py
@@ -491,7 +491,7 @@ def spellCheck(self, text: str, offset: int) -> list[tuple[int, int]]:
 
         self._spellErrors = []
         checker = SHARED.spelling
-        for match in RX_WORDS.finditer(text.replace("_", " ")):
+        for match in RX_WORDS.finditer(text.replace("_", " "), offset):
             if (
                 (word := match.group(0))
                 and not (word.isnumeric() or word.isupper() or checker.checkWord(word))