novelWriter 2.2rc1__py3-none-any.whl → 2.2.1__py3-none-any.whl

novelwriter/gui/doceditor.py

@@ -14,7 +14,7 @@ Created:   2023-11-06 [2.2b1] MetaCompleter
 Created:   2023-11-07 [2.2b1] GuiDocToolBar
 
 This file is a part of novelWriter
-Copyright 2018–2023, Veronica Berglyd Olsen
+Copyright 2018–2024, Veronica Berglyd Olsen
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -58,10 +58,11 @@ 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
 from novelwriter.gui.dochighlight import GuiDocHighlighter
 from novelwriter.gui.editordocument import GuiTextDocument
-from novelwriter.extensions.wheeleventfilter import WheelEventFilter
+from novelwriter.extensions.eventfilters import WheelEventFilter
 
 if TYPE_CHECKING:  # pragma: no cover
     from novelwriter.guimain import GuiMain
@@ -717,11 +718,11 @@ class GuiDocEditor(QPlainTextEdit):
             self.copy()
         elif action == nwDocAction.PASTE:
             self.paste()
-        elif action == nwDocAction.EMPH:
+        elif action == nwDocAction.MD_ITALIC:
             self._toggleFormat(1, "_")
-        elif action == nwDocAction.STRONG:
+        elif action == nwDocAction.MD_BOLD:
             self._toggleFormat(2, "*")
-        elif action == nwDocAction.STRIKE:
+        elif action == nwDocAction.MD_STRIKE:
             self._toggleFormat(2, "~")
         elif action == nwDocAction.S_QUOTE:
             self._wrapSelection(self._typSQuoteO, self._typSQuoteC)
@@ -831,11 +832,11 @@ class GuiDocEditor(QPlainTextEdit):
             elif insert == nwDocInsert.QUOTE_RD:
                 text = self._typDQuoteC
             elif insert == nwDocInsert.SYNOPSIS:
-                text = "% Synopsis: "
+                text = "%Synopsis: "
                 newBlock = True
                 goAfter = True
             elif insert == nwDocInsert.SHORT:
-                text = "% Short: "
+                text = "%Short: "
                 newBlock = True
                 goAfter = True
             elif insert == nwDocInsert.NEW_PAGE:
@@ -850,18 +851,23 @@ class GuiDocEditor(QPlainTextEdit):
                 text = "[vspace:2]"
                 newBlock = True
                 goAfter = False
+            elif insert == nwDocInsert.LIPSUM:
+                text = GuiLipsum.getLipsum(self)
+                newBlock = True
+                goAfter = False
             else:
                 return False
         else:
             return False
 
-        if newBlock:
-            self.insertNewBlock(text, defaultAfter=goAfter)
-        else:
-            cursor = self.textCursor()
-            cursor.beginEditBlock()
-            cursor.insertText(text)
-            cursor.endEditBlock()
+        if text:
+            if newBlock:
+                self.insertNewBlock(text, defaultAfter=goAfter)
+            else:
+                cursor = self.textCursor()
+                cursor.beginEditBlock()
+                cursor.insertText(text)
+                cursor.endEditBlock()
 
         return True
 
@@ -1144,6 +1150,7 @@ class GuiDocEditor(QPlainTextEdit):
 
         # Execute the context menu
         ctxMenu.exec_(self.viewport().mapToGlobal(pos))
+        ctxMenu.deleteLater()
 
         return
 
@@ -2005,20 +2012,25 @@ class GuiDocEditor(QPlainTextEdit):
             cPos = cursor.position()
             bPos = cursor.block().position()
             bLen = cursor.block().length()
+            apos = nwUnicode.U_APOS + nwUnicode.U_RSQUO
 
-            # Scan backwards
+            # Scan backward
             sPos = cPos
             for i in range(cPos - bPos):
                 sPos = cPos - i - 1
-                if not self._qDocument.characterAt(sPos).isalnum():
+                cOne = self._qDocument.characterAt(sPos)
+                cTwo = self._qDocument.characterAt(sPos - 1)
+                if not (cOne.isalnum() or cOne in apos and cTwo.isalnum()):
                     sPos += 1
                     break
 
-            # Scan forwards
+            # Scan forward
             ePos = cPos
             for i in range(bPos + bLen - cPos):
                 ePos = cPos + i
-                if not self._qDocument.characterAt(ePos).isalnum():
+                cOne = self._qDocument.characterAt(ePos)
+                cTwo = self._qDocument.characterAt(ePos + 1)
+                if not (cOne.isalnum() or cOne in apos and cTwo.isalnum()):
                     break
 
             if ePos - sPos <= 0:
@@ -2225,39 +2237,65 @@ class GuiDocToolBar(QWidget):
         # General Buttons
         # ===============
 
-        self.tbMode = QToolButton(self)
-        self.tbMode.setToolTip(self.tr("Toggle Markdown or Shortcodes Mode"))
-        self.tbMode.setIconSize(iconSize)
-        self.tbMode.setCheckable(True)
-        self.tbMode.setChecked(CONFIG.useShortcodes)
-        self.tbMode.toggled.connect(self._toggleFormatMode)
+        self.tbBoldMD = QToolButton(self)
+        self.tbBoldMD.setIconSize(iconSize)
+        self.tbBoldMD.setToolTip(self.tr("Markdown Bold"))
+        self.tbBoldMD.clicked.connect(
+            lambda: self.requestDocAction.emit(nwDocAction.MD_BOLD)
+        )
+
+        self.tbItalicMD = QToolButton(self)
+        self.tbItalicMD.setIconSize(iconSize)
+        self.tbItalicMD.setToolTip(self.tr("Markdown Italic"))
+        self.tbItalicMD.clicked.connect(
+            lambda: self.requestDocAction.emit(nwDocAction.MD_ITALIC)
+        )
+
+        self.tbStrikeMD = QToolButton(self)
+        self.tbStrikeMD.setIconSize(iconSize)
+        self.tbStrikeMD.setToolTip(self.tr("Markdown Strikethrough"))
+        self.tbStrikeMD.clicked.connect(
+            lambda: self.requestDocAction.emit(nwDocAction.MD_STRIKE)
+        )
 
         self.tbBold = QToolButton(self)
         self.tbBold.setIconSize(iconSize)
-        self.tbBold.clicked.connect(self._formatBold)
+        self.tbBold.setToolTip(self.tr("Shortcode Bold"))
+        self.tbBold.clicked.connect(
+            lambda: self.requestDocAction.emit(nwDocAction.SC_BOLD)
+        )
 
         self.tbItalic = QToolButton(self)
         self.tbItalic.setIconSize(iconSize)
-        self.tbItalic.clicked.connect(self._formatItalic)
+        self.tbItalic.setToolTip(self.tr("Shortcode Italic"))
+        self.tbItalic.clicked.connect(
+            lambda: self.requestDocAction.emit(nwDocAction.SC_ITALIC)
+        )
 
         self.tbStrike = QToolButton(self)
         self.tbStrike.setIconSize(iconSize)
-        self.tbStrike.clicked.connect(self._formatStrike)
+        self.tbStrike.setToolTip(self.tr("Shortcode Strikethrough"))
+        self.tbStrike.clicked.connect(
+            lambda: self.requestDocAction.emit(nwDocAction.SC_STRIKE)
+        )
 
         self.tbUnderline = QToolButton(self)
         self.tbUnderline.setIconSize(iconSize)
+        self.tbUnderline.setToolTip(self.tr("Shortcode Underline"))
         self.tbUnderline.clicked.connect(
             lambda: self.requestDocAction.emit(nwDocAction.SC_ULINE)
         )
 
         self.tbSuperscript = QToolButton(self)
         self.tbSuperscript.setIconSize(iconSize)
+        self.tbSuperscript.setToolTip(self.tr("Shortcode Superscript"))
         self.tbSuperscript.clicked.connect(
             lambda: self.requestDocAction.emit(nwDocAction.SC_SUP)
         )
 
         self.tbSubscript = QToolButton(self)
         self.tbSubscript.setIconSize(iconSize)
+        self.tbSubscript.setToolTip(self.tr("Shortcode Subscript"))
         self.tbSubscript.clicked.connect(
             lambda: self.requestDocAction.emit(nwDocAction.SC_SUB)
         )
@@ -2266,7 +2304,10 @@ class GuiDocToolBar(QWidget):
         # ========
 
         self.outerBox = QVBoxLayout()
-        self.outerBox.addWidget(self.tbMode)
+        self.outerBox.addWidget(self.tbBoldMD)
+        self.outerBox.addWidget(self.tbItalicMD)
+        self.outerBox.addWidget(self.tbStrikeMD)
+        self.outerBox.addSpacing(cM)
         self.outerBox.addWidget(self.tbBold)
         self.outerBox.addWidget(self.tbItalic)
         self.outerBox.addWidget(self.tbStrike)
@@ -2294,8 +2335,9 @@ class GuiDocToolBar(QWidget):
         palette.setColor(QPalette.ColorRole.Text, QColor(*SHARED.theme.colText))
         self.setPalette(palette)
 
-        tPx = int(0.8*SHARED.theme.fontPixelSize)
-        self.tbMode.setIcon(SHARED.theme.getToggleIcon("fmt_mode", (tPx, tPx)))
+        self.tbBoldMD.setIcon(SHARED.theme.getIcon("fmt_bold-md"))
+        self.tbItalicMD.setIcon(SHARED.theme.getIcon("fmt_italic-md"))
+        self.tbStrikeMD.setIcon(SHARED.theme.getIcon("fmt_strike-md"))
         self.tbBold.setIcon(SHARED.theme.getIcon("fmt_bold"))
         self.tbItalic.setIcon(SHARED.theme.getIcon("fmt_italic"))
         self.tbStrike.setIcon(SHARED.theme.getIcon("fmt_strike"))
@@ -2305,40 +2347,6 @@ class GuiDocToolBar(QWidget):
 
         return
 
-    ##
-    #  Private Slots
-    ##
-
-    @pyqtSlot(bool)
-    def _toggleFormatMode(self, checked: bool) -> None:
-        """Toggle the formatting mode."""
-        CONFIG.useShortcodes = checked
-        return
-
-    @pyqtSlot()
-    def _formatBold(self):
-        """Call the bold format action."""
-        self.requestDocAction.emit(
-            nwDocAction.SC_BOLD if self.tbMode.isChecked() else nwDocAction.STRONG
-        )
-        return
-
-    @pyqtSlot()
-    def _formatItalic(self):
-        """Call the italic format action."""
-        self.requestDocAction.emit(
-            nwDocAction.SC_ITALIC if self.tbMode.isChecked() else nwDocAction.EMPH
-        )
-        return
-
-    @pyqtSlot()
-    def _formatStrike(self):
-        """Call the strikethrough format action."""
-        self.requestDocAction.emit(
-            nwDocAction.SC_STRIKE if self.tbMode.isChecked() else nwDocAction.STRIKE
-        )
-        return
-
 # END Class GuiDocToolBar
 
 

novelwriter/gui/dochighlight.py

@@ -3,10 +3,11 @@ novelWriter – GUI Syntax Highlighter
 ====================================
 
 File History:
-Created: 2019-04-06 [0.0.1]
+Created: 2019-04-06 [0.0.1] GuiDocHighlighter
+Created: 2023-09-10 [2.2b1] TextBlockData
 
 This file is a part of novelWriter
-Copyright 2018–2023, Veronica Berglyd Olsen
+Copyright 2018–2024, Veronica Berglyd Olsen
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

novelwriter/gui/docviewer.py

@@ -9,7 +9,7 @@ Created: 2020-06-09 [0.8]   GuiDocViewFooter
 Created: 2020-09-08 [1.0b1] GuiDocViewHistory
 
 This file is a part of novelWriter
-Copyright 2018–2023, Veronica Berglyd Olsen
+Copyright 2018–2024, Veronica Berglyd Olsen
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -46,7 +46,7 @@ from novelwriter.enum import nwItemType, nwDocAction, nwDocMode
 from novelwriter.error import logException
 from novelwriter.constants import nwUnicode
 from novelwriter.core.tohtml import ToHtml
-from novelwriter.extensions.wheeleventfilter import WheelEventFilter
+from novelwriter.extensions.eventfilters import WheelEventFilter
 
 if TYPE_CHECKING:  # pragma: no cover
     from novelwriter.guimain import GuiMain
@@ -378,33 +378,34 @@ class GuiDocViewer(QTextBrowser):
         userCursor = self.textCursor()
         userSelection = userCursor.hasSelection()
 
-        mnuContext = QMenu(self)
+        ctxMenu = QMenu(self)
 
         if userSelection:
-            mnuCopy = QAction(self.tr("Copy"), mnuContext)
+            mnuCopy = QAction(self.tr("Copy"), ctxMenu)
             mnuCopy.triggered.connect(lambda: self.docAction(nwDocAction.COPY))
-            mnuContext.addAction(mnuCopy)
+            ctxMenu.addAction(mnuCopy)
 
-            mnuContext.addSeparator()
+            ctxMenu.addSeparator()
 
-        mnuSelAll = QAction(self.tr("Select All"), mnuContext)
+        mnuSelAll = QAction(self.tr("Select All"), ctxMenu)
         mnuSelAll.triggered.connect(lambda: self.docAction(nwDocAction.SEL_ALL))
-        mnuContext.addAction(mnuSelAll)
+        ctxMenu.addAction(mnuSelAll)
 
-        mnuSelWord = QAction(self.tr("Select Word"), mnuContext)
+        mnuSelWord = QAction(self.tr("Select Word"), ctxMenu)
         mnuSelWord.triggered.connect(
             lambda: self._makePosSelection(QTextCursor.SelectionType.WordUnderCursor, point)
         )
-        mnuContext.addAction(mnuSelWord)
+        ctxMenu.addAction(mnuSelWord)
 
-        mnuSelPara = QAction(self.tr("Select Paragraph"), mnuContext)
+        mnuSelPara = QAction(self.tr("Select Paragraph"), ctxMenu)
         mnuSelPara.triggered.connect(
             lambda: self._makePosSelection(QTextCursor.SelectionType.BlockUnderCursor, point)
         )
-        mnuContext.addAction(mnuSelPara)
+        ctxMenu.addAction(mnuSelPara)
 
         # Open the context menu
-        mnuContext.exec_(self.viewport().mapToGlobal(point))
+        ctxMenu.exec_(self.viewport().mapToGlobal(point))
+        ctxMenu.deleteLater()
 
         return
 
@@ -861,8 +862,7 @@ class GuiDocViewFooter(QWidget):
         self._docHandle = None
 
         fPx = int(0.9*SHARED.theme.fontPixelSize)
-        bSp = CONFIG.pxInt(2)
-        hSp = CONFIG.pxInt(8)
+        hSp = CONFIG.pxInt(4)
 
         # Main Widget Settings
         self.setContentsMargins(0, 0, 0, 0)
@@ -872,64 +872,41 @@ class GuiDocViewFooter(QWidget):
         self.showHide = QToolButton(self)
         self.showHide.setToolButtonStyle(Qt.ToolButtonStyle.ToolButtonIconOnly)
         self.showHide.setIconSize(QSize(fPx, fPx))
-        self.showHide.setFixedSize(QSize(fPx, fPx))
         self.showHide.clicked.connect(lambda: self.docViewer.togglePanelVisibility.emit())
         self.showHide.setToolTip(self.tr("Show/Hide Viewer Panel"))
 
         # Show Comments
         self.showComments = QToolButton(self)
+        self.showComments.setText(self.tr("Comments"))
         self.showComments.setCheckable(True)
         self.showComments.setChecked(CONFIG.viewComments)
-        self.showComments.setToolButtonStyle(Qt.ToolButtonStyle.ToolButtonIconOnly)
+        self.showComments.setToolButtonStyle(Qt.ToolButtonStyle.ToolButtonTextBesideIcon)
         self.showComments.setIconSize(QSize(fPx, fPx))
-        self.showComments.setFixedSize(QSize(fPx, fPx))
         self.showComments.toggled.connect(self._doToggleComments)
         self.showComments.setToolTip(self.tr("Show Comments"))
 
         # Show Synopsis
         self.showSynopsis = QToolButton(self)
+        self.showSynopsis.setText(self.tr("Synopsis"))
         self.showSynopsis.setCheckable(True)
         self.showSynopsis.setChecked(CONFIG.viewSynopsis)
-        self.showSynopsis.setToolButtonStyle(Qt.ToolButtonStyle.ToolButtonIconOnly)
+        self.showSynopsis.setToolButtonStyle(Qt.ToolButtonStyle.ToolButtonTextBesideIcon)
         self.showSynopsis.setIconSize(QSize(fPx, fPx))
-        self.showSynopsis.setFixedSize(QSize(fPx, fPx))
         self.showSynopsis.toggled.connect(self._doToggleSynopsis)
         self.showSynopsis.setToolTip(self.tr("Show Synopsis Comments"))
 
-        # Labels
-        self.lblComments = QLabel(self.tr("Comments"))
-        self.lblComments.setBuddy(self.showComments)
-        self.lblComments.setIndent(0)
-        self.lblComments.setMargin(0)
-        self.lblComments.setContentsMargins(0, 0, 0, 0)
-        self.lblComments.setAutoFillBackground(True)
-        self.lblComments.setFixedHeight(fPx)
-        self.lblComments.setAlignment(Qt.AlignmentFlag.AlignLeft | Qt.AlignmentFlag.AlignTop)
-
-        self.lblSynopsis = QLabel(self.tr("Synopsis"))
-        self.lblSynopsis.setBuddy(self.showSynopsis)
-        self.lblSynopsis.setIndent(0)
-        self.lblSynopsis.setMargin(0)
-        self.lblSynopsis.setContentsMargins(0, 0, 0, 0)
-        self.lblSynopsis.setAutoFillBackground(True)
-        self.lblSynopsis.setFixedHeight(fPx)
-        self.lblSynopsis.setAlignment(Qt.AlignmentFlag.AlignLeft | Qt.AlignmentFlag.AlignTop)
-
         lblFont = self.font()
         lblFont.setPointSizeF(0.9*SHARED.theme.fontPointSize)
-        self.lblComments.setFont(lblFont)
-        self.lblSynopsis.setFont(lblFont)
+        self.showComments.setFont(lblFont)
+        self.showSynopsis.setFont(lblFont)
 
         # Assemble Layout
         self.outerBox = QHBoxLayout()
-        self.outerBox.setSpacing(bSp)
         self.outerBox.addWidget(self.showHide, 0)
         self.outerBox.addStretch(1)
         self.outerBox.addWidget(self.showComments, 0)
-        self.outerBox.addWidget(self.lblComments, 0)
-        self.outerBox.addSpacing(hSp)
         self.outerBox.addWidget(self.showSynopsis, 0)
-        self.outerBox.addWidget(self.lblSynopsis, 0)
+        self.outerBox.setSpacing(hSp)
         self.setLayout(self.outerBox)
 
         # Fix Margins and Size
@@ -983,8 +960,6 @@ class GuiDocViewFooter(QWidget):
         palette.setColor(QPalette.ColorRole.WindowText, QColor(*SHARED.theme.colText))
         palette.setColor(QPalette.ColorRole.Text, QColor(*SHARED.theme.colText))
         self.setPalette(palette)
-        self.lblComments.setPalette(palette)
-        self.lblSynopsis.setPalette(palette)
         return
 
     ##

novelwriter/gui/docviewerpanel.py

@@ -6,7 +6,7 @@ File History:
 Created: 2023-11-14 [2.2rc1] GuiDocViewerPanel
 
 This file is a part of novelWriter
-Copyright 2018–2023, Veronica Berglyd Olsen
+Copyright 2018–2024, Veronica Berglyd Olsen
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -57,7 +57,7 @@ class GuiDocViewerPanel(QWidget):
         self.tabBackRefs = _ViewPanelBackRefs(self)
 
         self.mainTabs = QTabWidget(self)
-        self.mainTabs.addTab(self.tabBackRefs, self.tr("Backreferences"))
+        self.mainTabs.addTab(self.tabBackRefs, self.tr("References"))
 
         self.kwTabs: dict[str, _ViewPanelKeyWords] = {}
         self.idTabs: dict[str, int] = {}
@@ -73,7 +73,7 @@ class GuiDocViewerPanel(QWidget):
         self.outerBox.setContentsMargins(0, 0, 0, 0)
 
         self.setLayout(self.outerBox)
-        self.updateTheme()
+        self.updateTheme(updateTabs=False)
 
         logger.debug("Ready: GuiDocViewerPanel")
 
@@ -83,7 +83,7 @@ class GuiDocViewerPanel(QWidget):
     #  Methods
     ##
 
-    def updateTheme(self) -> None:
+    def updateTheme(self, updateTabs: bool = True) -> None:
         """Update theme elements."""
         vPx = CONFIG.pxInt(4)
         lPx = CONFIG.pxInt(2)
@@ -102,6 +102,11 @@ class GuiDocViewerPanel(QWidget):
         self.mainTabs.setStyleSheet(styleSheet)
         self.updateHandle(self._lastHandle)
 
+        if updateTabs:
+            self.tabBackRefs.updateTheme()
+            for tab in self.kwTabs.values():
+                tab.updateTheme()
+
         return
 
     def openProjectTasks(self) -> None:
@@ -118,6 +123,7 @@ class GuiDocViewerPanel(QWidget):
         widths = {}
         for key, tab in self.kwTabs.items():
             widths[key] = tab.getColumnWidths()
+        logger.debug("Saving State: GuiDocViewerPanel")
         SHARED.project.options.setValue("GuiDocViewerPanel", "colWidths", widths)
         return
 
@@ -218,12 +224,14 @@ class _ViewPanelBackRefs(QTreeWidget):
         # Set Header Sizes
         treeHeader = self.header()
         treeHeader.setStretchLastSection(True)
+        treeHeader.setMinimumSectionSize(iPx + cMg)  # See Issue #1627
         treeHeader.setSectionResizeMode(self.C_DOC, QHeaderView.ResizeMode.ResizeToContents)
         treeHeader.setSectionResizeMode(self.C_EDIT, QHeaderView.ResizeMode.Fixed)
         treeHeader.setSectionResizeMode(self.C_VIEW, QHeaderView.ResizeMode.Fixed)
         treeHeader.setSectionResizeMode(self.C_TITLE, QHeaderView.ResizeMode.ResizeToContents)
         treeHeader.resizeSection(self.C_EDIT, iPx + cMg)
         treeHeader.resizeSection(self.C_VIEW, iPx + cMg)
+        treeHeader.setSectionsMovable(False)
 
         # Cache Icons Locally
         self._editIcon = SHARED.theme.getIcon("edit")
@@ -235,6 +243,16 @@ class _ViewPanelBackRefs(QTreeWidget):
 
         return
 
+    def updateTheme(self) -> None:
+        """Update theme elements."""
+        self._editIcon = SHARED.theme.getIcon("edit")
+        self._viewIcon = SHARED.theme.getIcon("view")
+        for i in range(self.topLevelItemCount()):
+            if item := self.topLevelItem(i):
+                item.setIcon(self.C_EDIT, self._editIcon)
+                item.setIcon(self.C_VIEW, self._viewIcon)
+        return
+
     def clearContent(self) -> None:
         """Clear the widget."""
         self.clear()
@@ -276,7 +294,7 @@ class _ViewPanelBackRefs(QTreeWidget):
     def _treeItemDoubleClicked(self, index: QModelIndex) -> None:
         """Emit follow tag signal on user double click."""
         tHandle = index.siblingAtColumn(self.C_DATA).data(self.D_HANDLE)
-        if index.column() == self.C_DOC:
+        if index.column() not in (self.C_EDIT, self.C_VIEW):
             self._parent.openDocumentRequest.emit(tHandle, nwDocMode.VIEW, "", True)
         return
 
@@ -299,10 +317,12 @@ class _ViewPanelBackRefs(QTreeWidget):
 
             trItem.setIcon(self.C_DOC, docIcon)
             trItem.setText(self.C_DOC, nwItem.itemName)
+            trItem.setToolTip(self.C_DOC, nwItem.itemName)
             trItem.setIcon(self.C_EDIT, self._editIcon)
             trItem.setIcon(self.C_VIEW, self._viewIcon)
-            trItem.setText(self.C_TITLE, hItem.title)
             trItem.setData(self.C_TITLE, Qt.ItemDataRole.DecorationRole, hDec)
+            trItem.setText(self.C_TITLE, hItem.title)
+            trItem.setToolTip(self.C_TITLE, hItem.title)
             trItem.setData(self.C_DATA, self.D_HANDLE, tHandle)
 
             if tKey not in self._treeMap:
@@ -316,13 +336,14 @@ class _ViewPanelBackRefs(QTreeWidget):
 
 class _ViewPanelKeyWords(QTreeWidget):
 
-    C_DATA  = 0
-    C_NAME  = 0
-    C_EDIT  = 1
-    C_VIEW  = 2
-    C_DOC   = 3
-    C_TITLE = 4
-    C_SHORT = 5
+    C_DATA   = 0
+    C_NAME   = 0
+    C_EDIT   = 1
+    C_VIEW   = 2
+    C_IMPORT = 3
+    C_DOC    = 4
+    C_TITLE  = 5
+    C_SHORT  = 6
 
     D_TAG = Qt.ItemDataRole.UserRole
 
@@ -330,13 +351,14 @@ class _ViewPanelKeyWords(QTreeWidget):
         super().__init__(parent=parent)
 
         self._parent = parent
+        self._class = itemClass
         self._treeMap: dict[str, QTreeWidgetItem] = {}
 
         iPx = SHARED.theme.baseIconSize
         cMg = CONFIG.pxInt(6)
 
         self.setHeaderLabels([
-            self.tr("Tag"), "", "", self.tr("Document"),
+            self.tr("Tag"), "", "", self.tr("Importance"), self.tr("Document"),
             self.tr("Heading"), self.tr("Short Description")
         ])
         self.setIndentation(0)
@@ -351,7 +373,7 @@ class _ViewPanelKeyWords(QTreeWidget):
         # Set Header Sizes
         treeHeader = self.header()
         treeHeader.setStretchLastSection(True)
-        treeHeader.setSectionResizeMode(self.C_NAME, QHeaderView.ResizeMode.ResizeToContents)
+        treeHeader.setMinimumSectionSize(iPx + cMg)  # See Issue #1627
         treeHeader.setSectionResizeMode(self.C_EDIT, QHeaderView.ResizeMode.Fixed)
         treeHeader.setSectionResizeMode(self.C_VIEW, QHeaderView.ResizeMode.Fixed)
         treeHeader.resizeSection(self.C_EDIT, iPx + cMg)
@@ -369,6 +391,17 @@ class _ViewPanelKeyWords(QTreeWidget):
 
         return
 
+    def updateTheme(self) -> None:
+        """Update theme elements."""
+        self._classIcon = SHARED.theme.getIcon(nwLabels.CLASS_ICON[self._class])
+        self._editIcon = SHARED.theme.getIcon("edit")
+        self._viewIcon = SHARED.theme.getIcon("view")
+        for i in range(self.topLevelItemCount()):
+            if item := self.topLevelItem(i):
+                item.setIcon(self.C_EDIT, self._editIcon)
+                item.setIcon(self.C_VIEW, self._viewIcon)
+        return
+
     def countEntries(self) -> int:
         """Return the number of items in the list."""
         return self.topLevelItemCount()
@@ -386,22 +419,30 @@ class _ViewPanelKeyWords(QTreeWidget):
             nwItem.itemType, nwItem.itemClass,
             nwItem.itemLayout, nwItem.mainHeading
         )
+        impLabel, impIcon = nwItem.getImportStatus(incIcon=True)
         iLevel = nwHeaders.H_LEVEL.get(hItem.level, 0) if nwItem.isDocumentLayout() else 5
         hDec = SHARED.theme.getHeaderDecorationNarrow(iLevel)
 
-        # This can not use a get call to the dictionary as that creates
-        # some weird issue with Qt, so we need to do this with an if
+        # This can not use a get call to the dictionary as that would create an
+        # instance of the QTreeWidgetItem, which has some weird side effects
         trItem = self._treeMap[tag] if tag in self._treeMap else QTreeWidgetItem()
 
-        trItem.setText(self.C_NAME, name)
         trItem.setIcon(self.C_NAME, self._classIcon)
+        trItem.setText(self.C_NAME, name)
+        trItem.setToolTip(self.C_NAME, name)
         trItem.setIcon(self.C_EDIT, self._editIcon)
         trItem.setIcon(self.C_VIEW, self._viewIcon)
+        trItem.setIcon(self.C_IMPORT, impIcon)
+        trItem.setText(self.C_IMPORT, impLabel)
+        trItem.setToolTip(self.C_IMPORT, impLabel)
         trItem.setIcon(self.C_DOC, docIcon)
         trItem.setText(self.C_DOC, nwItem.itemName)
-        trItem.setText(self.C_TITLE, hItem.title)
+        trItem.setToolTip(self.C_DOC, nwItem.itemName)
         trItem.setData(self.C_TITLE, Qt.ItemDataRole.DecorationRole, hDec)
+        trItem.setText(self.C_TITLE, hItem.title)
+        trItem.setToolTip(self.C_TITLE, hItem.title)
         trItem.setText(self.C_SHORT, hItem.synopsis)
+        trItem.setToolTip(self.C_SHORT, hItem.synopsis)
         trItem.setData(self.C_DATA, self.D_TAG, tag)
 
         if tag not in self._treeMap:
@@ -420,14 +461,18 @@ class _ViewPanelKeyWords(QTreeWidget):
 
     def setColumnWidths(self, widths: list[int]) -> None:
         """Set the column widths."""
-        if isinstance(widths, list) and len(widths) >= 2:
-            self.setColumnWidth(self.C_DOC, CONFIG.pxInt(checkInt(widths[0], 100)))
-            self.setColumnWidth(self.C_TITLE, CONFIG.pxInt(checkInt(widths[1], 100)))
+        if isinstance(widths, list) and len(widths) >= 4:
+            self.setColumnWidth(self.C_NAME, CONFIG.pxInt(checkInt(widths[0], 100)))
+            self.setColumnWidth(self.C_IMPORT, CONFIG.pxInt(checkInt(widths[1], 100)))
+            self.setColumnWidth(self.C_DOC, CONFIG.pxInt(checkInt(widths[2], 100)))
+            self.setColumnWidth(self.C_TITLE, CONFIG.pxInt(checkInt(widths[3], 100)))
         return
 
     def getColumnWidths(self) -> list[int]:
         """Get the widths of the user-adjustable columns."""
         return [
+            CONFIG.rpxInt(self.columnWidth(self.C_NAME)),
+            CONFIG.rpxInt(self.columnWidth(self.C_IMPORT)),
             CONFIG.rpxInt(self.columnWidth(self.C_DOC)),
             CONFIG.rpxInt(self.columnWidth(self.C_TITLE)),
         ]
@@ -450,7 +495,7 @@ class _ViewPanelKeyWords(QTreeWidget):
     def _treeItemDoubleClicked(self, index: QModelIndex) -> None:
         """Emit follow tag signal on user double click."""
         tag = index.siblingAtColumn(self.C_DATA).data(self.D_TAG)
-        if index.column() == self.C_NAME:
+        if index.column() not in (self.C_EDIT, self.C_VIEW):
             self._parent.loadDocumentTagRequest.emit(tag, nwDocMode.VIEW)
         return