Merge branch 'main' into xml_rw_class

novelwriter/core/doctools.py

@@ -192,7 +192,7 @@ class DocSplitter:
         """An iterator that will write each document in the buffer, and
         return its new handle, parent handle, and sibling handle.
         """
-        if self._srcHandle is None:
+        if self._srcHandle is None or self._srcItem is None:
             return
 
         pHandle = self._parHandle
@@ -224,6 +224,10 @@ class DocSplitter:
             dHandle = self.theProject.newFile(docLabel, pHandle)
             hHandle[hLevel] = dHandle
 
+            newItem = self.theProject.tree[dHandle]
+            newItem.setStatus(self._srcItem.itemStatus)
+            newItem.setImport(self._srcItem.itemImport)
+
             outDoc = NWDoc(self.theProject, dHandle)
             status = outDoc.writeDocument("\n".join(docText))
             if not status:

novelwriter/core/status.py

@@ -30,7 +30,8 @@ import novelwriter
 
 from lxml import etree
 
-from PyQt5.QtGui import QIcon, QPixmap, QColor
+from PyQt5.QtGui import QIcon, QPainter, QPainterPath, QPixmap, QColor
+from PyQt5.QtCore import QRectF, Qt
 
 from novelwriter.common import checkInt, minmax, simplified
 
@@ -49,10 +50,15 @@ class NWStatus:
         self._reverse = {}
         self._default = None
 
-        self._iconSize = novelwriter.CONFIG.pxInt(32)
-        pixmap = QPixmap(self._iconSize, self._iconSize)
-        pixmap.fill(QColor(100, 100, 100))
-        self._defaultIcon = QIcon(pixmap)
+        self._iPX = novelwriter.CONFIG.pxInt(24)
+
+        pA = novelwriter.CONFIG.pxInt(2)
+        pB = novelwriter.CONFIG.pxInt(20)
+        pR = float(novelwriter.CONFIG.pxInt(4))
+        self._iconPath = QPainterPath()
+        self._iconPath.addRoundedRect(QRectF(pA, pA, pB, pB), pR, pR)
+
+        self._defaultIcon = self._createIcon([100, 100, 100])
 
         if self._type == self.STATUS:
             self._prefix = "s"
@@ -63,19 +69,16 @@ class NWStatus:
 
         return
 
-    def write(self, key, name, cols, count=None):
+    def write(self, key, name, col, count=None):
         """Add or update a status entry. If the key is invalid, a new
         key is generated.
         """
         if not self._isKey(key):
             key = self._newKey()
-        if not isinstance(cols, tuple):
-            cols = (100, 100, 100)
-        if len(cols) != 3:
-            cols = (100, 100, 100)
-
-        pixmap = QPixmap(self._iconSize, self._iconSize)
-        pixmap.fill(QColor(*cols))
+        if not isinstance(col, tuple):
+            col = (100, 100, 100)
+        if len(col) != 3:
+            col = (100, 100, 100)
 
         name = simplified(name)
         if count is None:
@@ -83,8 +86,8 @@ class NWStatus:
 
         self._store[key] = {
             "name": name,
-            "icon": QIcon(pixmap),
-            "cols": cols,
+            "icon": self._createIcon(col),
+            "cols": col,
             "count": count,
         }
         self._reverse[name] = key
@@ -267,6 +270,19 @@ class NWStatus:
                 return False
         return True
 
+    def _createIcon(self, col):
+        """Generate an icon for a status label.
+        """
+        pixmap = QPixmap(self._iPX, self._iPX)
+        pixmap.fill(Qt.transparent)
+
+        painter = QPainter(pixmap)
+        painter.setRenderHint(QPainter.Antialiasing)
+        painter.fillPath(self._iconPath, QColor(*col))
+        painter.end()
+
+        return QIcon(pixmap)
+
     ##
     #  Iterator Bits
     ##