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

Merge branch 'main' into unicode_fix

Browse Source
This commit is contained in:
Veronica Berglyd Olsen
2025-07-09 12:49:08 +02:00
committed by GitHub
parent 58eda950f8 90860dbbf1
commit 4a04c24b62
7 changed files with 126 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
novelwriter/core/projectxml.py
+3 -3
View File
@@ -441,9 +441,9 @@ class ProjectXMLReader:
for xEntry in xItem:
if xEntry.tag == "entry":
key = xEntry.attrib.get("key", None)
red = checkInt(xEntry.attrib.get("red", 0), 0) # Deprecated in 1.5 R6
green = checkInt(xEntry.attrib.get("green", 0), 0) # Deprecated in 1.5 R6
blue = checkInt(xEntry.attrib.get("blue", 0), 0) # Deprecated in 1.5 R6
red = checkInt(xEntry.attrib.get("red", 0), 0) # Removed in 1.5 R6
green = checkInt(xEntry.attrib.get("green", 0), 0) # Removed in 1.5 R6
blue = checkInt(xEntry.attrib.get("blue", 0), 0) # Removed in 1.5 R6
color = xEntry.attrib.get("color") # Added in 1.5 R6
count = checkInt(xEntry.attrib.get("count", 0), 0)
shape = xEntry.attrib.get("shape", "")
novelwriter/core/status.py
+2 -1
View File
@@ -192,7 +192,8 @@ class NWStatus:
def refreshIcons(self) -> None:
"""Refresh all icons."""
for entry in self._store.values():
entry.color = SHARED.theme.parseColor(entry.theme)
if entry.theme != CUSTOM_COL:
entry.color = SHARED.theme.parseColor(entry.theme)
entry.icon = NWStatus.createIcon(self._height, entry.color, entry.shape)
return