From 49ace054bdb1982c63dfa32a430eff525f771b9f Mon Sep 17 00:00:00 2001
From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com>
Date: Sun, 12 Jun 2022 20:18:24 +0200
Subject: [PATCH] Make options class handle enums, and add plot column to novel
 tree

---
 novelwriter/core/options.py  | 19 ++++++++++++++++++-
 novelwriter/gui/noveltree.py | 33 ++++++++++++++++-----------------
 2 files changed, 34 insertions(+), 18 deletions(-)

diff --git a/novelwriter/core/options.py b/novelwriter/core/options.py
index b3724047..d64970ae 100644
--- a/novelwriter/core/options.py
+++ b/novelwriter/core/options.py
@@ -28,6 +28,8 @@ import os
 import json
 import logging
 
+from enum import Enum
+
 from novelwriter.error import logException
 from novelwriter.common import checkBool, checkFloat, checkInt, checkString
 from novelwriter.constants import nwFiles
@@ -138,7 +140,10 @@ class OptionState():
         if group not in self._theState:
             self._theState[group] = {}
 
-        self._theState[group][name] = value
+        if isinstance(value, Enum):
+            self._theState[group][name] = value.name
+        else:
+            self._theState[group][name] = value
 
         return True
 
@@ -187,4 +192,16 @@ class OptionState():
                 return checkBool(self._theState[group].get(name, default), default)
         return default
 
+    def getEnum(self, group, name, lookup, default):
+        """Return the value mapped to an enum. Otherwise return the
+        default value
+        """
+        if issubclass(lookup, Enum):
+            if group in self._theState:
+                if name in self._theState[group]:
+                    value = self._theState[group][name]
+                    if value in lookup.__members__:
+                        return lookup[value]
+        return default
+
 # END Class OptionState
diff --git a/novelwriter/gui/noveltree.py b/novelwriter/gui/noveltree.py
index a23e1e9e..8bfd207a 100644
--- a/novelwriter/gui/noveltree.py
+++ b/novelwriter/gui/noveltree.py
@@ -49,6 +49,7 @@ class NovelColumnType(Enum):
     HIDDEN = 0
     POV    = 1
     FOCUS  = 2
+    PLOT   = 3
 
 # END Enum NovelColumnType
 
@@ -216,6 +217,9 @@ class GuiNovelToolBar(QWidget):
         self.mCol3.addAction(self.tr("Focus Character")).triggered.connect(
             lambda: self.novelView.novelTree.setLastColType(NovelColumnType.FOCUS)
         )
+        self.mCol3.addAction(self.tr("Novel Plot")).triggered.connect(
+            lambda: self.novelView.novelTree.setLastColType(NovelColumnType.PLOT)
+        )
 
         self.tbMore = QToolButton(self)
         self.tbMore.setToolTip(self.tr("More Options"))
@@ -306,6 +310,7 @@ class GuiNovelTree(QTreeWidget):
         # Cached i18n Strings
         self._povLabel = trConst(nwLabels.KEY_NAME[nwKeyWords.POV_KEY])
         self._focLabel = trConst(nwLabels.KEY_NAME[nwKeyWords.FOCUS_KEY])
+        self._pltLabel = trConst(nwLabels.KEY_NAME[nwKeyWords.PLOT_KEY])
 
         # Build GUI
         # =========
@@ -373,28 +378,17 @@ class GuiNovelTree(QTreeWidget):
     def loadOptions(self):
         """Load user options.
         """
-        try:
-            lastCol = NovelColumnType[self.theProject.options.getString(
-                "GuiNovelView", "lastCol", NovelColumnType.POV.name
-            )]
-        except Exception:
-            logger.error("Failed to load last column type from options")
-            return False
-
-        self._lastCol = lastCol
-        self.setColumnHidden(self.C_LAST, lastCol == NovelColumnType.HIDDEN)
-
+        self._lastCol = self.theProject.options.getEnum(
+            "GuiNovelView", "lastCol", NovelColumnType, NovelColumnType.POV
+        )
+        self.setColumnHidden(self.C_LAST, self._lastCol == NovelColumnType.HIDDEN)
         return True
 
     def saveOptions(self):
         """Save user options.
         """
-        try:
-            self.theProject.options.setValue("GuiNovelView", "lastCol", self._lastCol.name)
-        except Exception:
-            logger.error("Failed to save last column type to options")
-            return False
-        return True
+        self.theProject.options.setValue("GuiNovelView", "lastCol", self._lastCol)
+        return
 
     def refreshTree(self, rootHandle=None, overRide=False):
         """Called whenever the Novel tab is activated.
@@ -603,6 +597,11 @@ class GuiNovelTree(QTreeWidget):
                 newItem.setText(self.C_LAST, newText)
                 if newText:
                     newItem.setToolTip(self.C_LAST, f"{self._focLabel}: {newText}")
+            elif self._lastCol == NovelColumnType.PLOT:
+                newText = ", ".join(theRefs[nwKeyWords.PLOT_KEY])
+                newItem.setText(self.C_LAST, newText)
+                if newText:
+                    newItem.setToolTip(self.C_LAST, f"{self._pltLabel}: {newText}")
 
         return newItem