Reproog/novelWriter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix issues from merge from 2.6.3

Browse Source
This commit is contained in:
Veronica Berglyd Olsen
2025-02-16 21:54:25 +01:00
parent 1f14c55ce0
commit c377e2a26a
3 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
novelwriter/constants.py
+10 -10
View File
@@ -436,16 +436,16 @@ class nwLabels:
"Custom": (-1.0, -1.0), "Custom": (-1.0, -1.0),
} }
THEME_COLORS = { THEME_COLORS = {
"theme": QT_TRANSLATE_NOOP("Color", "Theme Colours"), "theme": QT_TRANSLATE_NOOP("Constant", "Theme Colours"),
"default": QT_TRANSLATE_NOOP("Color", "Foreground Colour"), "default": QT_TRANSLATE_NOOP("Constant", "Foreground Colour"),
"faded": QT_TRANSLATE_NOOP("Color", "Faded Colour"), "faded": QT_TRANSLATE_NOOP("Constant", "Faded Colour"),
"red": QT_TRANSLATE_NOOP("Color", "Red"), "red": QT_TRANSLATE_NOOP("Constant", "Red"),
"orange": QT_TRANSLATE_NOOP("Color", "Orange"), "orange": QT_TRANSLATE_NOOP("Constant", "Orange"),
"yellow": QT_TRANSLATE_NOOP("Color", "Yellow"), "yellow": QT_TRANSLATE_NOOP("Constant", "Yellow"),
"green": QT_TRANSLATE_NOOP("Color", "Green"), "green": QT_TRANSLATE_NOOP("Constant", "Green"),
"aqua": QT_TRANSLATE_NOOP("Color", "Aqua"), "aqua": QT_TRANSLATE_NOOP("Constant", "Aqua"),
"blue": QT_TRANSLATE_NOOP("Color", "Blue"), "blue": QT_TRANSLATE_NOOP("Constant", "Blue"),
"purple": QT_TRANSLATE_NOOP("Color", "Purple"), "purple": QT_TRANSLATE_NOOP("Constant", "Purple"),
} }
novelwriter/dialogs/projectsettings.py
+4 -3
View File
@@ -30,7 +30,7 @@ import logging
from pathlib import Path from pathlib import Path
from PyQt6.QtCore import Qt, pyqtSignal, pyqtSlot from PyQt6.QtCore import Qt, pyqtSignal, pyqtSlot
from PyQt6.QtGui import QAction, QCloseEvent, QColor from PyQt6.QtGui import QCloseEvent, QColor
from PyQt6.QtWidgets import ( from PyQt6.QtWidgets import (
QAbstractItemView, QApplication, QColorDialog, QDialogButtonBox, QAbstractItemView, QApplication, QColorDialog, QDialogButtonBox,
QFileDialog, QGridLayout, QHBoxLayout, QLineEdit, QMenu, QStackedWidget, QFileDialog, QGridLayout, QHBoxLayout, QLineEdit, QMenu, QStackedWidget,
@@ -38,7 +38,7 @@ from PyQt6.QtWidgets import (
) )
from novelwriter import CONFIG, SHARED 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.constants import nwLabels, trConst
from novelwriter.core.status import NWStatus, StatusEntry from novelwriter.core.status import NWStatus, StatusEntry
from novelwriter.enum import nwStatusShape from novelwriter.enum import nwStatusShape
@@ -404,7 +404,8 @@ class _StatusPage(NFixedPage):
if menu is not None: if menu is not None:
for shape, label in items.items(): for shape, label in items.items():
icon = NWStatus.createIcon(self._iPx, iColor, shape) 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)) action.triggered.connect(qtLambda(self._selectShape, shape))
menu.addAction(action) menu.addAction(action)
self._icons[shape] = icon self._icons[shape] = icon
sample/nwProject.nwx
+3 -3
View File
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='utf-8'?> <?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"> <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="2156" autoCount="281" editTime="95855"> <project id="e2be99af-f9bf-4403-857a-c3d1ac25abea" saveCount="2160" autoCount="281" editTime="95932">
<name>Sample Project</name> <name>Sample Project</name>
<author>Jane Smith</author> <author>Jane Smith</author>
</project> </project>
@@ -162,4 +162,4 @@
<name status="sf12341" import="ia857f0" active="yes">Delete Me!</name> <name status="sf12341" import="ia857f0" active="yes">Delete Me!</name>
</item> </item>
</content> </content>
</> </novelWriterXML>