From cf7e1da96aad29d52ccafc7eb6e5f19bda57a22a Mon Sep 17 00:00:00 2001
From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com>
Date: Sat, 16 Apr 2022 14:59:59 +0200
Subject: [PATCH] Fix display text issues in varuious GUI elements

---
 novelwriter/dialogs/itemeditor.py   | 30 ++++++++++++++++-------------
 novelwriter/dialogs/projsettings.py |  4 ++--
 novelwriter/gui/outlinedetails.py   |  4 +++-
 3 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/novelwriter/dialogs/itemeditor.py b/novelwriter/dialogs/itemeditor.py
index a39d93f4..84a0db14 100644
--- a/novelwriter/dialogs/itemeditor.py
+++ b/novelwriter/dialogs/itemeditor.py
@@ -75,11 +75,20 @@ class GuiItemEditor(QDialog):
         self.editStatus = QComboBox()
         self.editStatus.setMinimumWidth(mVd)
         if self.theItem.itemClass in nwLists.CLS_NOVEL:
-            for sLabel, _, _, sIcon in self.theProject.statusItems:
-                self.editStatus.addItem(sIcon, sLabel, sLabel)
+            for key, entry in self.theProject.statusItems.items():
+                self.editStatus.addItem(entry["icon"], entry["name"], key)
+
+            index = self.editStatus.findData(self.theItem.itemStatus)
+            if index != -1:
+                self.editStatus.setCurrentIndex(index)
+
         else:
-            for sLabel, _, _, sIcon in self.theProject.importItems:
-                self.editStatus.addItem(sIcon, sLabel, sLabel)
+            for key, entry in self.theProject.importItems.items():
+                self.editStatus.addItem(entry["icon"], entry["name"], key)
+
+            index = self.editStatus.findData(self.theItem.itemImport)
+            if index != -1:
+                self.editStatus.setCurrentIndex(index)
 
         # Item Layout
         self.editLayout = QComboBox()
@@ -97,6 +106,10 @@ class GuiItemEditor(QDialog):
             if itemLayout in validLayouts:
                 self.editLayout.addItem(trConst(nwLabels.LAYOUT_NAME[itemLayout]), itemLayout)
 
+        index = self.editLayout.findData(self.theItem.itemLayout)
+        if index != -1:
+            self.editLayout.setCurrentIndex(index)
+
         # Export Switch
         self.textExport = QLabel(self.tr("Include when building project"))
         self.editExport = QSwitch()
@@ -116,15 +129,6 @@ class GuiItemEditor(QDialog):
         self.editName.setText(self.theItem.itemName)
         self.editName.selectAll()
 
-        currStatus, _ = self.theItem.getImportStatus()
-        statusIdx = self.editStatus.findData(currStatus)
-        if statusIdx != -1:
-            self.editStatus.setCurrentIndex(statusIdx)
-
-        layoutIdx = self.editLayout.findData(self.theItem.itemLayout)
-        if layoutIdx != -1:
-            self.editLayout.setCurrentIndex(layoutIdx)
-
         ##
         #  Assemble
         ##
diff --git a/novelwriter/dialogs/projsettings.py b/novelwriter/dialogs/projsettings.py
index 260f8b10..9599cc92 100644
--- a/novelwriter/dialogs/projsettings.py
+++ b/novelwriter/dialogs/projsettings.py
@@ -294,8 +294,8 @@ class GuiProjectEditStatus(QWidget):
         self.listBox.setColumnWidth(self.COL_LABEL, wCol0)
         self.listBox.setIndentation(0)
 
-        for key, data in self.theStatus.items():
-            self._addItem(key, data["name"], data["cols"], data["count"])
+        for key, entry in self.theStatus.items():
+            self._addItem(key, entry["name"], entry["cols"], entry["count"])
 
         # List Controls
         # =============
diff --git a/novelwriter/gui/outlinedetails.py b/novelwriter/gui/outlinedetails.py
index cc97cdf5..b45c298f 100644
--- a/novelwriter/gui/outlinedetails.py
+++ b/novelwriter/gui/outlinedetails.py
@@ -291,8 +291,10 @@ class GuiOutlineDetails(QScrollArea):
             self.titleLabel.setText("<b>%s</b>" % self.tr("Title"))
         self.titleValue.setText(novIdx["title"])
 
+        itemStatus, _ = nwItem.getImportStatus()
+
         self.fileValue.setText(nwItem.itemName)
-        self.itemValue.setText(nwItem.itemStatus)
+        self.itemValue.setText(itemStatus)
 
         cC = checkInt(novIdx["cCount"], 0)
         wC = checkInt(novIdx["wCount"], 0)