novelWriter 2.2.1__py3-none-any.whl → 2.3b1__py3-none-any.whl

novelwriter/gui/doceditor.py

@@ -56,7 +56,6 @@ from novelwriter import CONFIG, SHARED
 from novelwriter.enum import nwDocAction, nwDocInsert, nwDocMode, nwItemClass, nwTrinary
 from novelwriter.common import minmax, transferCase
 from novelwriter.constants import nwKeyWords, nwLabels, nwShortcode, nwUnicode, trConst
-from novelwriter.core.item import NWItem
 from novelwriter.core.index import countWords
 from novelwriter.tools.lipsum import GuiLipsum
 from novelwriter.core.document import NWDocument
@@ -187,13 +186,12 @@ class GuiDocEditor(QPlainTextEdit):
         # Set Up Document Word Counter
         self.wcTimerDoc = QTimer()
         self.wcTimerDoc.timeout.connect(self._runDocCounter)
+        self.wcTimerDoc.setInterval(5000)
 
         self.wCounterDoc = BackgroundWordCounter(self)
         self.wCounterDoc.setAutoDelete(False)
         self.wCounterDoc.signals.countsReady.connect(self._updateDocCounts)
 
-        self.wcInterval = CONFIG.wordCountTimer
-
         # Set Up Selection Word Counter
         self.wcTimerSel = QTimer()
         self.wcTimerSel.timeout.connect(self._runSelCounter)
@@ -277,14 +275,14 @@ class GuiDocEditor(QPlainTextEdit):
     def updateSyntaxColours(self) -> None:
         """Update the syntax highlighting theme."""
         mainPalette = self.palette()
-        mainPalette.setColor(QPalette.ColorRole.Window, QColor(*SHARED.theme.colBack))
-        mainPalette.setColor(QPalette.ColorRole.Base, QColor(*SHARED.theme.colBack))
-        mainPalette.setColor(QPalette.ColorRole.Text, QColor(*SHARED.theme.colText))
+        mainPalette.setColor(QPalette.ColorRole.Window, SHARED.theme.colBack)
+        mainPalette.setColor(QPalette.ColorRole.Base, SHARED.theme.colBack)
+        mainPalette.setColor(QPalette.ColorRole.Text, SHARED.theme.colText)
         self.setPalette(mainPalette)
 
         docPalette = self.viewport().palette()
-        docPalette.setColor(QPalette.ColorRole.Base, QColor(*SHARED.theme.colBack))
-        docPalette.setColor(QPalette.ColorRole.Text, QColor(*SHARED.theme.colText))
+        docPalette.setColor(QPalette.ColorRole.Base, SHARED.theme.colBack)
+        docPalette.setColor(QPalette.ColorRole.Text, SHARED.theme.colText)
         self.viewport().setPalette(docPalette)
 
         self.docHeader.matchColours()
@@ -320,10 +318,10 @@ class GuiDocEditor(QPlainTextEdit):
         SHARED.updateSpellCheckLanguage()
 
         # Set font
-        textFont = QFont()
-        textFont.setFamily(CONFIG.textFont)
-        textFont.setPointSize(CONFIG.textSize)
-        self.setFont(textFont)
+        font = QFont()
+        font.setFamily(CONFIG.textFont)
+        font.setPointSize(CONFIG.textSize)
+        self.setFont(font)
 
         # Set default text margins
         # Due to cursor visibility, a part of the margin must be
@@ -359,17 +357,14 @@ class GuiDocEditor(QPlainTextEdit):
         # Refresh the tab stops
         self.setTabStopDistance(CONFIG.getTabWidth())
 
-        # Configure word count timer
-        self.wcInterval = CONFIG.wordCountTimer
-        self.wcTimerDoc.setInterval(int(self.wcInterval*1000))
-
-        # If we have a document open, we should reload it in case the
+        # If we have a document open, we should refresh it in case the
         # font changed, otherwise we just clear the editor entirely,
         # which makes it read only.
-        if self._docHandle is None:
-            self.clearEditor()
-        else:
+        if self._docHandle:
             self._qDocument.syntaxHighlighter.rehighlight()
+            self.docHeader.setTitleFromHandle(self._docHandle)
+        else:
+            self.clearEditor()
 
         return
 
@@ -741,9 +736,11 @@ class GuiDocEditor(QPlainTextEdit):
         elif action == nwDocAction.BLOCK_H4:
             self._formatBlock(nwDocAction.BLOCK_H4)
         elif action == nwDocAction.BLOCK_COM:
-            self._formatBlock(nwDocAction.BLOCK_COM)
+            self._iterFormatBlocks(nwDocAction.BLOCK_COM)
+        elif action == nwDocAction.BLOCK_IGN:
+            self._iterFormatBlocks(nwDocAction.BLOCK_IGN)
         elif action == nwDocAction.BLOCK_TXT:
-            self._formatBlock(nwDocAction.BLOCK_TXT)
+            self._iterFormatBlocks(nwDocAction.BLOCK_TXT)
         elif action == nwDocAction.BLOCK_TTL:
             self._formatBlock(nwDocAction.BLOCK_TTL)
         elif action == nwDocAction.BLOCK_UNN:
@@ -1190,7 +1187,7 @@ class GuiDocEditor(QPlainTextEdit):
             logger.debug("Word counter is busy")
             return
 
-        if time() - self._lastEdit < 5.0 * self.wcInterval:
+        if time() - self._lastEdit < 25.0:
             logger.debug("Running word counter")
             SHARED.runInThreadPool(self.wCounterDoc)
 
@@ -1593,9 +1590,7 @@ class GuiDocEditor(QPlainTextEdit):
 
         posS = cursor.selectionStart()
         posE = cursor.selectionEnd()
-        closeCheck = (
-            " ", "\n", nwUnicode.U_LSEP, nwUnicode.U_PSEP
-        )
+        closeCheck = (" ", "\n", nwUnicode.U_LSEP, nwUnicode.U_PSEP)
 
         self._allowAutoReplace(False)
         for posC in range(posS, posE+1):
@@ -1639,159 +1634,189 @@ class GuiDocEditor(QPlainTextEdit):
 
         return True
 
-    def _formatBlock(self, action: nwDocAction) -> bool:
-        """Change the block format of the block under the cursor."""
-        cursor = self.textCursor()
-        block = cursor.block()
-        if not block.isValid():
-            logger.debug("Invalid block selected for action '%s'", str(action))
-            return False
-
+    def _processBlockFormat(
+        self, action: nwDocAction, text: str, toggle: bool = True
+    ) -> tuple[nwDocAction, str, int]:
+        """Process the formatting of a single text block."""
         # Remove existing format first, if any
-        setText = block.text()
-        hasText = len(setText) > 0
-        if setText.startswith("@"):
+        if text.startswith("@"):
             logger.error("Cannot apply block format to keyword/value line")
-            return False
-        elif setText.startswith("% "):
-            newText = setText[2:]
-            cOffset = 2
-            if action == nwDocAction.BLOCK_COM:
+            return nwDocAction.NO_ACTION, "", 0
+        elif text.startswith("%~"):
+            temp = text[2:].lstrip()
+            offset = len(text) - len(temp)
+            if toggle and action == nwDocAction.BLOCK_IGN:
                 action = nwDocAction.BLOCK_TXT
-        elif setText.startswith("%"):
-            newText = setText[1:]
-            cOffset = 1
-            if action == nwDocAction.BLOCK_COM:
+        elif text.startswith("%"):
+            temp = text[1:].lstrip()
+            offset = len(text) - len(temp)
+            if toggle and action == nwDocAction.BLOCK_COM:
                 action = nwDocAction.BLOCK_TXT
-        elif setText.startswith("# "):
-            newText = setText[2:]
-            cOffset = 2
-        elif setText.startswith("## "):
-            newText = setText[3:]
-            cOffset = 3
-        elif setText.startswith("### "):
-            newText = setText[4:]
-            cOffset = 4
-        elif setText.startswith("#### "):
-            newText = setText[5:]
-            cOffset = 5
-        elif setText.startswith("#! "):
-            newText = setText[3:]
-            cOffset = 3
-        elif setText.startswith("##! "):
-            newText = setText[4:]
-            cOffset = 4
-        elif setText.startswith(">> "):
-            newText = setText[3:]
-            cOffset = 3
-        elif setText.startswith("> ") and action != nwDocAction.INDENT_R:
-            newText = setText[2:]
-            cOffset = 2
-        elif setText.startswith(">>"):
-            newText = setText[2:]
-            cOffset = 2
-        elif setText.startswith(">") and action != nwDocAction.INDENT_R:
-            newText = setText[1:]
-            cOffset = 1
+        elif text.startswith("# "):
+            temp = text[2:]
+            offset = 2
+        elif text.startswith("## "):
+            temp = text[3:]
+            offset = 3
+        elif text.startswith("### "):
+            temp = text[4:]
+            offset = 4
+        elif text.startswith("#### "):
+            temp = text[5:]
+            offset = 5
+        elif text.startswith("#! "):
+            temp = text[3:]
+            offset = 3
+        elif text.startswith("##! "):
+            temp = text[4:]
+            offset = 4
+        elif text.startswith(">> "):
+            temp = text[3:]
+            offset = 3
+        elif text.startswith("> ") and action != nwDocAction.INDENT_R:
+            temp = text[2:]
+            offset = 2
+        elif text.startswith(">>"):
+            temp = text[2:]
+            offset = 2
+        elif text.startswith(">") and action != nwDocAction.INDENT_R:
+            temp = text[1:]
+            offset = 1
         else:
-            newText = setText
-            cOffset = 0
+            temp = text
+            offset = 0
 
         # Also remove formatting tags at the end
-        if setText.endswith(" <<"):
-            newText = newText[:-3]
-        elif setText.endswith(" <") and action != nwDocAction.INDENT_L:
-            newText = newText[:-2]
-        elif setText.endswith("<<"):
-            newText = newText[:-2]
-        elif setText.endswith("<") and action != nwDocAction.INDENT_L:
-            newText = newText[:-1]
+        if text.endswith(" <<"):
+            temp = temp[:-3]
+        elif text.endswith(" <") and action != nwDocAction.INDENT_L:
+            temp = temp[:-2]
+        elif text.endswith("<<"):
+            temp = temp[:-2]
+        elif text.endswith("<") and action != nwDocAction.INDENT_L:
+            temp = temp[:-1]
 
         # Apply new format
         if action == nwDocAction.BLOCK_COM:
-            setText = "% "+newText
-            cOffset -= 2
+            text = f"% {temp}"
+            offset -= 2
+        elif action == nwDocAction.BLOCK_IGN:
+            text = f"%~ {temp}"
+            offset -= 3
         elif action == nwDocAction.BLOCK_H1:
-            setText = "# "+newText
-            cOffset -= 2
+            text = f"# {temp}"
+            offset -= 2
         elif action == nwDocAction.BLOCK_H2:
-            setText = "## "+newText
-            cOffset -= 3
+            text = f"## {temp}"
+            offset -= 3
         elif action == nwDocAction.BLOCK_H3:
-            setText = "### "+newText
-            cOffset -= 4
+            text = f"### {temp}"
+            offset -= 4
         elif action == nwDocAction.BLOCK_H4:
-            setText = "#### "+newText
-            cOffset -= 5
+            text = f"#### {temp}"
+            offset -= 5
         elif action == nwDocAction.BLOCK_TTL:
-            setText = "#! "+newText
-            cOffset -= 3
+            text = f"#! {temp}"
+            offset -= 3
         elif action == nwDocAction.BLOCK_UNN:
-            setText = "##! "+newText
-            cOffset -= 4
+            text = f"##! {temp}"
+            offset -= 4
         elif action == nwDocAction.ALIGN_L:
-            setText = newText+" <<"
+            text = f"{temp} <<"
         elif action == nwDocAction.ALIGN_C:
-            setText = ">> "+newText+" <<"
-            cOffset -= 3
+            text = f">> {temp} <<"
+            offset -= 3
         elif action == nwDocAction.ALIGN_R:
-            setText = ">> "+newText
-            cOffset -= 3
+            text = f">> {temp}"
+            offset -= 3
         elif action == nwDocAction.INDENT_L:
-            setText = "> "+newText
-            cOffset -= 2
+            text = f"> {temp}"
+            offset -= 2
         elif action == nwDocAction.INDENT_R:
-            setText = newText+" <"
+            text = f"{temp} <"
         elif action == nwDocAction.BLOCK_TXT:
-            setText = newText
+            text = temp
         else:
             logger.error("Unknown or unsupported block format requested: '%s'", str(action))
+            return nwDocAction.NO_ACTION, "", 0
+
+        return action, text, offset
+
+    def _formatBlock(self, action: nwDocAction) -> bool:
+        """Change the block format of the block under the cursor."""
+        cursor = self.textCursor()
+        block = cursor.block()
+        if not block.isValid():
+            logger.debug("Invalid block selected for action '%s'", str(action))
+            return False
+
+        action, text, offset = self._processBlockFormat(action, block.text())
+        if action == nwDocAction.NO_ACTION:
             return False
 
-        # Replace the block text
+        pos = cursor.position()
+
         cursor.beginEditBlock()
-        posO = cursor.position()
-        cursor.select(QTextCursor.SelectionType.BlockUnderCursor)
-        posS = cursor.selectionStart()
-        cursor.removeSelectedText()
-        cursor.setPosition(posS)
+        self._makeSelection(QTextCursor.SelectionType.BlockUnderCursor, cursor)
+        cursor.insertText(text)
+        cursor.endEditBlock()
+
+        if (move := pos - offset) >= 0:
+            cursor.setPosition(move)
+        self.setTextCursor(cursor)
 
-        if posS > 0 and hasText:
-            # If the block already had text, we must insert a new block
-            # first before we can add back the text to it.
-            cursor.insertBlock()
+        return True
 
-        cursor.insertText(setText)
+    def _iterFormatBlocks(self, action: nwDocAction) -> bool:
+        """Iterate over all selected blocks and apply format. If no
+        selection is made, just forward the call to the single block
+        formatter function.
+        """
+        cursor = self.textCursor()
+        blocks = self._selectedBlocks(cursor)
+        if len(blocks) < 2:
+            return self._formatBlock(action)
 
-        if posO - cOffset >= 0:
-            cursor.setPosition(posO - cOffset)
+        toggle = True
+        cursor.beginEditBlock()
+        for block in blocks:
+            blockText = block.text()
+            pAction, text, _ = self._processBlockFormat(action, blockText, toggle)
+            if pAction != nwDocAction.NO_ACTION and blockText.strip():
+                action = pAction  # First block decides further actions
+                cursor.setPosition(block.position())
+                self._makeSelection(QTextCursor.SelectionType.BlockUnderCursor, cursor)
+                cursor.insertText(text)
+                toggle = False
 
         cursor.endEditBlock()
-        self.setTextCursor(cursor)
 
         return True
 
+    def _selectedBlocks(self, cursor: QTextCursor) -> list[QTextBlock]:
+        """Return a list of all blocks selected by a cursor."""
+        if cursor.hasSelection():
+            iS = self._qDocument.findBlock(cursor.selectionStart()).blockNumber()
+            iE = self._qDocument.findBlock(cursor.selectionEnd()).blockNumber()
+            return [self._qDocument.findBlockByNumber(i) for i in range(iS, iE+1)]
+        return []
+
     def _removeInParLineBreaks(self) -> None:
         """Strip line breaks within paragraphs in the selected text."""
         cursor = self.textCursor()
+        if not cursor.hasSelection():
+            cursor.select(QTextCursor.SelectionType.Document)
 
-        iS = 0
-        iE = self._qDocument.blockCount() - 1
         rS = 0
         rE = self._qDocument.characterCount()
-        if cursor.hasSelection():
-            sBlock = self._qDocument.findBlock(cursor.selectionStart())
-            eBlock = self._qDocument.findBlock(cursor.selectionEnd())
-            iS = sBlock.blockNumber()
-            iE = eBlock.blockNumber()
-            rS = sBlock.position()
-            rE = eBlock.position() + eBlock.length()
+        if sBlocks := self._selectedBlocks(cursor):
+            rS = sBlocks[0].position()
+            rE = sBlocks[-1].position() + sBlocks[-1].length()
 
         # Clean up the text
         currPar = []
         cleanText = ""
-        for i in range(iS, iE+1):
-            cBlock = self._qDocument.findBlockByNumber(i)
+        for cBlock in sBlocks:
             cText = cBlock.text()
             if cText.strip() == "":
                 if currPar:
@@ -1839,16 +1864,16 @@ class GuiDocEditor(QPlainTextEdit):
         if len(text) == 0:
             return nwTrinary.NEUTRAL
 
-        if text.startswith("@") and isinstance(self._nwItem, NWItem):
+        if text.startswith("@") and self._docHandle:
 
             isGood, tBits, tPos = SHARED.project.index.scanThis(text)
-            if not isGood:
+            if not isGood or not tBits or tBits[0] == nwKeyWords.TAG_KEY:
                 return nwTrinary.NEUTRAL
 
             tag = ""
             exist = False
             cPos = cursor.selectionStart() - block.position()
-            tExist = SHARED.project.index.checkThese(tBits, self._nwItem)
+            tExist = SHARED.project.index.checkThese(tBits, self._docHandle)
             for sTag, sPos, sExist in zip(reversed(tBits), reversed(tPos), reversed(tExist)):
                 if cPos >= sPos:
                     # The cursor is between the start of two tags
@@ -2045,9 +2070,11 @@ class GuiDocEditor(QPlainTextEdit):
 
         return cursor
 
-    def _makeSelection(self, mode: QTextCursor.SelectionType) -> None:
+    def _makeSelection(self, mode: QTextCursor.SelectionType,
+                       cursor: QTextCursor | None = None) -> None:
         """Select text based on selection mode."""
-        cursor = self.textCursor()
+        if cursor is None:
+            cursor = self.textCursor()
         cursor.clearSelection()
         cursor.select(mode)
 
@@ -2330,9 +2357,9 @@ class GuiDocToolBar(QWidget):
     def updateTheme(self) -> None:
         """Initialise GUI elements that depend on specific settings."""
         palette = QPalette()
-        palette.setColor(QPalette.ColorRole.Window, QColor(*SHARED.theme.colBack))
-        palette.setColor(QPalette.ColorRole.WindowText, QColor(*SHARED.theme.colText))
-        palette.setColor(QPalette.ColorRole.Text, QColor(*SHARED.theme.colText))
+        palette.setColor(QPalette.ColorRole.Window, SHARED.theme.colBack)
+        palette.setColor(QPalette.ColorRole.WindowText, SHARED.theme.colText)
+        palette.setColor(QPalette.ColorRole.Text, SHARED.theme.colText)
         self.setPalette(palette)
 
         self.tbBoldMD.setIcon(SHARED.theme.getIcon("fmt_bold-md"))
@@ -2870,10 +2897,11 @@ class GuiDocEditHeader(QWidget):
         self.minmaxButton.setIcon(SHARED.theme.getIcon("maximise"))
         self.closeButton.setIcon(SHARED.theme.getIcon("close"))
 
+        colText = SHARED.theme.colText
         buttonStyle = (
             "QToolButton {{border: none; background: transparent;}} "
-            "QToolButton:hover {{border: none; background: rgba({0},{1},{2},0.2);}}"
-        ).format(*SHARED.theme.colText)
+            "QToolButton:hover {{border: none; background: rgba({0}, {1}, {2}, 0.2);}}"
+        ).format(colText.red(), colText.green(), colText.blue())
 
         self.tbButton.setStyleSheet(buttonStyle)
         self.searchButton.setStyleSheet(buttonStyle)
@@ -2889,9 +2917,9 @@ class GuiDocEditHeader(QWidget):
         theme rather than the main GUI.
         """
         palette = QPalette()
-        palette.setColor(QPalette.ColorRole.Window, QColor(*SHARED.theme.colBack))
-        palette.setColor(QPalette.ColorRole.WindowText, QColor(*SHARED.theme.colText))
-        palette.setColor(QPalette.ColorRole.Text, QColor(*SHARED.theme.colText))
+        palette.setColor(QPalette.ColorRole.Window, SHARED.theme.colBack)
+        palette.setColor(QPalette.ColorRole.WindowText, SHARED.theme.colText)
+        palette.setColor(QPalette.ColorRole.Text, SHARED.theme.colText)
 
         self.setPalette(palette)
         self.itemTitle.setPalette(palette)
@@ -3097,9 +3125,9 @@ class GuiDocEditFooter(QWidget):
         theme rather than the main GUI.
         """
         palette = QPalette()
-        palette.setColor(QPalette.ColorRole.Window, QColor(*SHARED.theme.colBack))
-        palette.setColor(QPalette.ColorRole.WindowText, QColor(*SHARED.theme.colText))
-        palette.setColor(QPalette.ColorRole.Text, QColor(*SHARED.theme.colText))
+        palette.setColor(QPalette.ColorRole.Window, SHARED.theme.colBack)
+        palette.setColor(QPalette.ColorRole.WindowText, SHARED.theme.colText)
+        palette.setColor(QPalette.ColorRole.Text, SHARED.theme.colText)
 
         self.setPalette(palette)
         self.statusText.setPalette(palette)