Add back extra column GUI handling

novelwriter/core/index.py

@@ -39,7 +39,7 @@ from novelwriter.common import isHandle, isItemClass, isTitleTag, jsonEncode
 from novelwriter.constants import nwFiles, nwKeyWords, nwStyles
 from novelwriter.core.indexdata import NOTE_TYPES, TT_NONE, IndexHeading, IndexNode, T_NoteTypes
 from novelwriter.core.novelmodel import NovelModel
-from novelwriter.enum import nwComment, nwItemClass, nwItemLayout, nwItemType
+from novelwriter.enum import nwComment, nwItemClass, nwItemLayout, nwItemType, nwNovelExtra
 from novelwriter.error import logException
 from novelwriter.text.comments import processComment
 from novelwriter.text.counting import standardCounter
@@ -92,6 +92,7 @@ class Index:
 
         # Models
         self._novelModels: dict[str, NovelModel] = {}
+        self._novelExtra = nwNovelExtra.HIDDEN
 
         # TimeStamps
         self._indexChange = 0.0
@@ -120,6 +121,15 @@ class Index:
             self._generateNovelModel(tHandle)
         return self._novelModels.get(tHandle)
 
+    ##
+    #  Setters
+    ##
+
+    def setNovelModelExtraColumn(self, extra: nwNovelExtra) -> None:
+        """Set the data content type of the novel model extra column."""
+        self._novelExtra = extra
+        return
+
     ##
     #  Public Methods
     ##
@@ -184,6 +194,7 @@ class Index:
             logger.info("Refreshing novel model '%s'", tHandle)
             model.beginResetModel()
             model.clear()
+            model.setExtraColumn(self._novelExtra)
             self._appendSubTreeToModel(tHandle, model)
             model.endResetModel()
         return
@@ -439,8 +450,9 @@ class Index:
         self._itemIndex.setHeadingCounts(tHandle, sTitle, cC, wC, pC)
         return
 
-    def _indexKeyword(self, tHandle: str, line: str, sTitle: str,
-                      itemClass: nwItemClass, tags: dict[str, bool]) -> None:
+    def _indexKeyword(
+        self, tHandle: str, line: str, sTitle: str, itemClass: nwItemClass, tags: dict[str, bool]
+    ) -> None:
         """Validate and save the information about a reference to a tag
         in another file, or the setting of a tag in the file. A record
         of active tags is updated so that no longer used tags can be
@@ -469,6 +481,7 @@ class Index:
         """Generate a novel model for a specific handle."""
         if (item := SHARED.project.tree[tHandle]) and item.isRootType() and item.isNovelLike():
             model = NovelModel()
+            model.setExtraColumn(self._novelExtra)
             self._appendSubTreeToModel(tHandle, model)
             self._novelModels[tHandle] = model
         return

novelwriter/core/novelmodel.py

@@ -25,12 +25,14 @@ from __future__ import annotations
 
 import logging
 
+from PyQt5.QtCore import QSize
 from PyQt6.QtCore import QAbstractTableModel, QModelIndex, Qt
 from PyQt6.QtGui import QIcon, QPixmap
 
 from novelwriter import SHARED
-from novelwriter.constants import nwStyles
+from novelwriter.constants import nwKeyWords, nwStyles
 from novelwriter.core.indexdata import IndexHeading, IndexNode
+from novelwriter.enum import nwNovelExtra
 from novelwriter.error import logException
 from novelwriter.types import QtAlignRight
 
@@ -50,26 +52,49 @@ T_NodeData = str | tuple[str, str] | QIcon | QPixmap | Qt.AlignmentFlag | None
 
 class NovelModel(QAbstractTableModel):
 
-    __slots__ = ("_rows", "_more", "_columns")
+    __slots__ = ("_rows", "_header", "_more", "_columns", "_extra")
 
     def __init__(self) -> None:
         super().__init__()
         self._rows: list[dict[int, T_NodeData]] = []
+        self._header: list[QSize] = []
         self._more = SHARED.theme.getIcon("more_arrow")
         self._columns = 3
+        self._extra = ""
         return
 
     def __del__(self) -> None:  # pragma: no cover
         logger.debug("Delete: NovelModel")
         return
 
+    ##
+    #  Properties
+    ##
+
+    @property
+    def columns(self) -> int:
+        """Return the number of columns."""
+        return self._columns
+
     ##
     #  Setters
     ##
 
-    def setExtraColumn(self, state: bool) -> None:
+    def setExtraColumn(self, extra: nwNovelExtra) -> None:
         """Set extra data column settings."""
-        self._columns = 4 if state else 3
+        match extra:
+            case nwNovelExtra.HIDDEN:
+                self._columns = 3
+                self._extra = ""
+            case nwNovelExtra.POV:
+                self._columns = 4
+                self._extra = nwKeyWords.POV_KEY
+            case nwNovelExtra.FOCUS:
+                self._columns = 4
+                self._extra = nwKeyWords.FOCUS_KEY
+            case nwNovelExtra.PLOT:
+                self._columns = 4
+                self._extra = nwKeyWords.PLOT_KEY
         return
 
     ##
@@ -183,13 +208,17 @@ class NovelModel(QAbstractTableModel):
     def _generateEntry(self, handle: str, key: str, heading: IndexHeading) -> dict:
         """Generate a cache entry."""
         iLevel = nwStyles.H_LEVEL.get(heading.level, 0)
-        more = self._columns - 1
         data = {}
         data[C_FACTOR*0 | R_TEXT] = heading.title
         data[C_FACTOR*0 | R_ICON] = SHARED.theme.getHeaderDecoration(iLevel)
         data[C_FACTOR*1 | R_TEXT] = f"{heading.mainCount:n}"
         data[C_FACTOR*1 | R_ALIGN] = QtAlignRight
-        data[C_FACTOR*more | R_ICON] = self._more
+        if self._columns == 3:
+            data[C_FACTOR*2 | R_ICON] = self._more
+        else:
+            data[C_FACTOR*2 | R_TIP] = "Hello World"
+            data[C_FACTOR*2 | R_TEXT] = "Hello World"
+            data[C_FACTOR*3 | R_ICON] = self._more
         data[R_HANDLE] = handle
         data[R_KEY] = key
         return data