From c377e2a26a7ca40a95f533597e1195a4675b0594 Mon Sep 17 00:00:00 2001
From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com>
Date: Sun, 16 Feb 2025 21:54:25 +0100
Subject: [PATCH] Fix issues from merge from 2.6.3

---
 novelwriter/constants.py               | 20 ++++++++++----------
 novelwriter/dialogs/projectsettings.py |  7 ++++---
 sample/nwProject.nwx                   |  6 +++---
 3 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/novelwriter/constants.py b/novelwriter/constants.py
index 3bf4e234..982e574d 100644
--- a/novelwriter/constants.py
+++ b/novelwriter/constants.py
@@ -436,16 +436,16 @@ class nwLabels:
         "Custom": (-1.0, -1.0),
     }
     THEME_COLORS = {
-        "theme":   QT_TRANSLATE_NOOP("Color", "Theme Colours"),
-        "default": QT_TRANSLATE_NOOP("Color", "Foreground Colour"),
-        "faded":   QT_TRANSLATE_NOOP("Color", "Faded Colour"),
-        "red":     QT_TRANSLATE_NOOP("Color", "Red"),
-        "orange":  QT_TRANSLATE_NOOP("Color", "Orange"),
-        "yellow":  QT_TRANSLATE_NOOP("Color", "Yellow"),
-        "green":   QT_TRANSLATE_NOOP("Color", "Green"),
-        "aqua":    QT_TRANSLATE_NOOP("Color", "Aqua"),
-        "blue":    QT_TRANSLATE_NOOP("Color", "Blue"),
-        "purple":  QT_TRANSLATE_NOOP("Color", "Purple"),
+        "theme":   QT_TRANSLATE_NOOP("Constant", "Theme Colours"),
+        "default": QT_TRANSLATE_NOOP("Constant", "Foreground Colour"),
+        "faded":   QT_TRANSLATE_NOOP("Constant", "Faded Colour"),
+        "red":     QT_TRANSLATE_NOOP("Constant", "Red"),
+        "orange":  QT_TRANSLATE_NOOP("Constant", "Orange"),
+        "yellow":  QT_TRANSLATE_NOOP("Constant", "Yellow"),
+        "green":   QT_TRANSLATE_NOOP("Constant", "Green"),
+        "aqua":    QT_TRANSLATE_NOOP("Constant", "Aqua"),
+        "blue":    QT_TRANSLATE_NOOP("Constant", "Blue"),
+        "purple":  QT_TRANSLATE_NOOP("Constant", "Purple"),
     }
 
 
diff --git a/novelwriter/dialogs/projectsettings.py b/novelwriter/dialogs/projectsettings.py
index 810df7a0..beaaf4ba 100644
--- a/novelwriter/dialogs/projectsettings.py
+++ b/novelwriter/dialogs/projectsettings.py
@@ -30,7 +30,7 @@ import logging
 from pathlib import Path
 
 from PyQt6.QtCore import Qt, pyqtSignal, pyqtSlot
-from PyQt6.QtGui import QAction, QCloseEvent, QColor
+from PyQt6.QtGui import QCloseEvent, QColor
 from PyQt6.QtWidgets import (
     QAbstractItemView, QApplication, QColorDialog, QDialogButtonBox,
     QFileDialog, QGridLayout, QHBoxLayout, QLineEdit, QMenu, QStackedWidget,
@@ -38,7 +38,7 @@ from PyQt6.QtWidgets import (
 )
 
 from novelwriter import CONFIG, SHARED
-from novelwriter.common import formatFileFilter, qtLambda, simplified
+from novelwriter.common import formatFileFilter, qtAddAction, qtLambda, simplified
 from novelwriter.constants import nwLabels, trConst
 from novelwriter.core.status import NWStatus, StatusEntry
 from novelwriter.enum import nwStatusShape
@@ -404,7 +404,8 @@ class _StatusPage(NFixedPage):
             if menu is not None:
                 for shape, label in items.items():
                     icon = NWStatus.createIcon(self._iPx, iColor, shape)
-                    action = QAction(icon, trConst(label))
+                    action = qtAddAction(menu, trConst(label))
+                    action.setIcon(icon)
                     action.triggered.connect(qtLambda(self._selectShape, shape))
                     menu.addAction(action)
                     self._icons[shape] = icon
diff --git a/sample/nwProject.nwx b/sample/nwProject.nwx
index 178acc44..cf19d5e5 100644
--- a/sample/nwProject.nwx
+++ b/sample/nwProject.nwx
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
-<novelWriterXML appVersion="2.7a3" hexVersion="0x020700a3" fileVersion="1.5" fileRevision="4" timeStamp="2025-02-04 13:53:28">
-  <project id="e2be99af-f9bf-4403-857a-c3d1ac25abea" saveCount="2156" autoCount="281" editTime="95855">
+<novelWriterXML appVersion="2.7a3" hexVersion="0x020700a3" fileVersion="1.5" fileRevision="4" timeStamp="2025-02-16 21:53:19">
+  <project id="e2be99af-f9bf-4403-857a-c3d1ac25abea" saveCount="2160" autoCount="281" editTime="95932">
     <name>Sample Project</name>
     <author>Jane Smith</author>
   </project>
@@ -162,4 +162,4 @@
       <name status="sf12341" import="ia857f0" active="yes">Delete Me!</name>
     </item>
   </content>
-</>
+</novelWriterXML>