From 64da2793ac061e278319b3f6f17f7f0049909b96 Mon Sep 17 00:00:00 2001
From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com>
Date: Sat, 23 Apr 2022 15:38:53 +0200
Subject: [PATCH] Allow file items to save expanded status

---
 novelwriter/core/item.py                      |  3 +-
 tests/lipsum/nwProject.nwx                    | 36 +++++++++----------
 tests/minimal/nwProject.nwx                   | 12 +++----
 .../coreProject_NewCustomA_nwProject.nwx      | 28 +++++++--------
 .../coreProject_NewCustomB_nwProject.nwx      | 16 ++++-----
 .../coreProject_NewFile_nwProject.nwx         | 12 +++----
 .../coreProject_NewMinimal_nwProject.nwx      |  8 ++---
 .../coreProject_NewRoot_nwProject.nwx         |  8 ++---
 .../guiEditor_Main_Final_nwProject.nwx        | 16 ++++-----
 .../guiEditor_Main_Initial_nwProject.nwx      |  8 ++---
 .../guiProjSettings_Dialog_nwProject.nwx      |  8 ++---
 tests/test_core/test_core_item.py             |  5 +--
 tests/test_core/test_core_tree.py             | 12 +++----
 13 files changed, 86 insertions(+), 86 deletions(-)

diff --git a/novelwriter/core/item.py b/novelwriter/core/item.py
index f6d93b36..0aed8991 100644
--- a/novelwriter/core/item.py
+++ b/novelwriter/core/item.py
@@ -160,13 +160,12 @@ class NWItem():
             itemAttrib["layout"] = str(self._layout.name)
 
         metaAttrib = {}
+        metaAttrib["expanded"] = str(self._expanded)
         if self._type == nwItemType.FILE:
             metaAttrib["charCount"] = str(self._charCount)
             metaAttrib["wordCount"] = str(self._wordCount)
             metaAttrib["paraCount"] = str(self._paraCount)
             metaAttrib["cursorPos"] = str(self._cursorPos)
-        else:
-            metaAttrib["expanded"]  = str(self._expanded)
 
         nameAttrib = {}
         nameAttrib["status"] = str(self._status)
diff --git a/tests/lipsum/nwProject.nwx b/tests/lipsum/nwProject.nwx
index d8d7a49e..02e3df49 100644
--- a/tests/lipsum/nwProject.nwx
+++ b/tests/lipsum/nwProject.nwx
@@ -1,12 +1,12 @@
 <?xml version='1.0' encoding='utf-8'?>
-<novelWriterXML appVersion="1.7-alpha0" hexVersion="0x010700a0" fileVersion="1.4" timeStamp="2022-04-16 14:19:39">
+<novelWriterXML appVersion="1.7-alpha0" hexVersion="0x010700a0" fileVersion="1.4" timeStamp="2022-04-23 15:34:13">
   <project>
     <name>Lorem Ipsum</name>
     <title>Lorem Ipsum</title>
     <author>lipsum.com</author>
-    <saveCount>24</saveCount>
+    <saveCount>26</saveCount>
     <autoCount>24</autoCount>
-    <editTime>1856</editTime>
+    <editTime>1863</editTime>
   </project>
   <settings>
     <doBackup>False</doBackup>
@@ -49,19 +49,19 @@
       <name status="sbaa94f" import="i613591">Novel</name>
     </item>
     <item handle="7a992350f3eb6" parent="b3643d0f92e32" root="b3643d0f92e32" order="0" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta charCount="230" wordCount="40" paraCount="3" cursorPos="148"/>
+      <meta expanded="False" charCount="230" wordCount="40" paraCount="3" cursorPos="148"/>
       <name status="sedd043" import="i613591" exported="True">Lorem Ipsum</name>
     </item>
     <item handle="8c58a65414c23" parent="b3643d0f92e32" root="b3643d0f92e32" order="1" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta charCount="1058" wordCount="176" paraCount="2" cursorPos="43"/>
+      <meta expanded="False" charCount="1058" wordCount="176" paraCount="2" cursorPos="43"/>
       <name status="sedd043" import="i613591" exported="True">Front Matter</name>
     </item>
     <item handle="88d59a277361b" parent="b3643d0f92e32" root="b3643d0f92e32" order="2" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta charCount="584" wordCount="92" paraCount="1" cursorPos="4"/>
+      <meta expanded="False" charCount="584" wordCount="92" paraCount="1" cursorPos="4"/>
       <name status="s92a87b" import="i613591" exported="True">Prologue</name>
     </item>
     <item handle="db7e733775d4d" parent="b3643d0f92e32" root="b3643d0f92e32" order="3" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta charCount="35" wordCount="6" paraCount="1" cursorPos="42"/>
+      <meta expanded="False" charCount="35" wordCount="6" paraCount="1" cursorPos="42"/>
       <name status="sbaa94f" import="i613591" exported="True">Act One</name>
     </item>
     <item handle="45e6b01ca35c1" parent="b3643d0f92e32" root="b3643d0f92e32" order="4" type="FOLDER" class="NOVEL">
@@ -69,19 +69,19 @@
       <name status="s92a87b" import="i613591">Chapter One</name>
     </item>
     <item handle="fb609cd8319dc" parent="45e6b01ca35c1" root="b3643d0f92e32" order="0" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta charCount="419" wordCount="67" paraCount="1" cursorPos="56"/>
+      <meta expanded="False" charCount="419" wordCount="67" paraCount="1" cursorPos="56"/>
       <name status="s92a87b" import="i613591" exported="True">Chapter One</name>
     </item>
     <item handle="88243afbe5ed8" parent="45e6b01ca35c1" root="b3643d0f92e32" order="1" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta charCount="2758" wordCount="404" paraCount="4" cursorPos="1528"/>
+      <meta expanded="False" charCount="2758" wordCount="404" paraCount="4" cursorPos="1528"/>
       <name status="sedd043" import="i613591" exported="True">Scene One</name>
     </item>
     <item handle="f96ec11c6a3da" parent="45e6b01ca35c1" root="b3643d0f92e32" order="2" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta charCount="4043" wordCount="600" paraCount="6" cursorPos="2335"/>
+      <meta expanded="False" charCount="4043" wordCount="600" paraCount="6" cursorPos="2335"/>
       <name status="sedd043" import="i613591" exported="True">Scene Two</name>
     </item>
     <item handle="846352075de7d" parent="b3643d0f92e32" root="b3643d0f92e32" order="5" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta charCount="631" wordCount="109" paraCount="3" cursorPos="376"/>
+      <meta expanded="False" charCount="631" wordCount="109" paraCount="3" cursorPos="376"/>
       <name status="sbaa94f" import="i613591" exported="False">Interlude</name>
     </item>
     <item handle="6bd935d2490cd" parent="b3643d0f92e32" root="b3643d0f92e32" order="6" type="FOLDER" class="NOVEL">
@@ -89,19 +89,19 @@
       <name status="s92a87b" import="i613591">Chapter Two</name>
     </item>
     <item handle="441420a886d82" parent="6bd935d2490cd" root="b3643d0f92e32" order="0" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta charCount="477" wordCount="70" paraCount="1" cursorPos="56"/>
+      <meta expanded="False" charCount="477" wordCount="70" paraCount="1" cursorPos="56"/>
       <name status="s92a87b" import="i613591" exported="True">Chapter Two</name>
     </item>
     <item handle="eb103bc70c90c" parent="6bd935d2490cd" root="b3643d0f92e32" order="1" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta charCount="3006" wordCount="439" paraCount="4" cursorPos="57"/>
+      <meta expanded="False" charCount="3006" wordCount="439" paraCount="4" cursorPos="57"/>
       <name status="sedd043" import="i613591" exported="True">Scene Three</name>
     </item>
     <item handle="f8c0562e50f1b" parent="6bd935d2490cd" root="b3643d0f92e32" order="2" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta charCount="3839" wordCount="563" paraCount="6" cursorPos="56"/>
+      <meta expanded="False" charCount="3839" wordCount="563" paraCount="6" cursorPos="56"/>
       <name status="sedd043" import="i613591" exported="True">Scene Four</name>
     </item>
     <item handle="47666c91c7ccf" parent="6bd935d2490cd" root="b3643d0f92e32" order="3" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta charCount="3644" wordCount="543" paraCount="5" cursorPos="351"/>
+      <meta expanded="False" charCount="3644" wordCount="543" paraCount="5" cursorPos="351"/>
       <name status="sedd043" import="i613591" exported="True">Scene Five</name>
     </item>
     <item handle="67a8707f2f249" parent="None" root="67a8707f2f249" order="1" type="ROOT" class="CHARACTER">
@@ -109,7 +109,7 @@
       <name status="sbaa94f" import="i613591">Characters</name>
     </item>
     <item handle="4c4f28287af27" parent="67a8707f2f249" root="67a8707f2f249" order="0" type="FILE" class="CHARACTER" layout="NOTE">
-      <meta charCount="1864" wordCount="284" paraCount="3" cursorPos="1883"/>
+      <meta expanded="False" charCount="1864" wordCount="284" paraCount="3" cursorPos="1883"/>
       <name status="sbaa94f" import="i613591" exported="True">Mr. Nobody</name>
     </item>
     <item handle="6c6afb1247750" parent="None" root="6c6afb1247750" order="2" type="ROOT" class="PLOT">
@@ -117,7 +117,7 @@
       <name status="sbaa94f" import="i613591">Plot</name>
     </item>
     <item handle="2426c6f0ca922" parent="6c6afb1247750" root="6c6afb1247750" order="0" type="FILE" class="PLOT" layout="NOTE">
-      <meta charCount="1369" wordCount="195" paraCount="2" cursorPos="1387"/>
+      <meta expanded="False" charCount="1369" wordCount="195" paraCount="2" cursorPos="1387"/>
       <name status="sbaa94f" import="i613591" exported="True">Main</name>
     </item>
     <item handle="60bdf227455cc" parent="None" root="60bdf227455cc" order="3" type="ROOT" class="WORLD">
@@ -125,7 +125,7 @@
       <name status="sbaa94f" import="i613591">World</name>
     </item>
     <item handle="04468803b92e1" parent="60bdf227455cc" root="60bdf227455cc" order="0" type="FILE" class="WORLD" layout="NOTE">
-      <meta charCount="1770" wordCount="259" paraCount="3" cursorPos="1792"/>
+      <meta expanded="False" charCount="1770" wordCount="259" paraCount="3" cursorPos="1792"/>
       <name status="sbaa94f" import="i613591" exported="True">Ancient Europe</name>
     </item>
   </content>
diff --git a/tests/minimal/nwProject.nwx b/tests/minimal/nwProject.nwx
index 6945dc08..af7595a4 100644
--- a/tests/minimal/nwProject.nwx
+++ b/tests/minimal/nwProject.nwx
@@ -1,13 +1,13 @@
 <?xml version='1.0' encoding='utf-8'?>
-<novelWriterXML appVersion="1.7-alpha0" hexVersion="0x010700a0" fileVersion="1.4" timeStamp="2022-04-16 14:19:35">
+<novelWriterXML appVersion="1.7-alpha0" hexVersion="0x010700a0" fileVersion="1.4" timeStamp="2022-04-23 15:34:21">
   <project>
     <name>Test Minimal</name>
     <title>Minimal</title>
     <author>Jane Doe</author>
     <author>John Doh</author>
-    <saveCount>15</saveCount>
+    <saveCount>17</saveCount>
     <autoCount>2</autoCount>
-    <editTime>146</editTime>
+    <editTime>150</editTime>
   </project>
   <settings>
     <doBackup>True</doBackup>
@@ -47,7 +47,7 @@
       <name status="s72322d" import="iffcacb">Novel</name>
     </item>
     <item handle="a35baf2e93843" parent="a508bb932959c" root="a508bb932959c" order="0" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta charCount="28" wordCount="6" paraCount="1" cursorPos="33"/>
+      <meta expanded="False" charCount="28" wordCount="6" paraCount="1" cursorPos="33"/>
       <name status="s72322d" import="iffcacb" exported="True">Title Page</name>
     </item>
     <item handle="a6d311a93600a" parent="a508bb932959c" root="a508bb932959c" order="1" type="FOLDER" class="NOVEL">
@@ -55,11 +55,11 @@
       <name status="s72322d" import="iffcacb">New Chapter</name>
     </item>
     <item handle="f5ab3e30151e1" parent="a6d311a93600a" root="a508bb932959c" order="0" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta charCount="11" wordCount="2" paraCount="0" cursorPos="16"/>
+      <meta expanded="False" charCount="11" wordCount="2" paraCount="0" cursorPos="16"/>
       <name status="s72322d" import="iffcacb" exported="True">New Chapter</name>
     </item>
     <item handle="8c659a11cd429" parent="a6d311a93600a" root="a508bb932959c" order="1" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta charCount="9" wordCount="2" paraCount="0" cursorPos="15"/>
+      <meta expanded="False" charCount="9" wordCount="2" paraCount="0" cursorPos="15"/>
       <name status="s72322d" import="iffcacb" exported="True">New Scene</name>
     </item>
     <item handle="7695ce551d265" parent="None" root="7695ce551d265" order="1" type="ROOT" class="PLOT">
diff --git a/tests/reference/coreProject_NewCustomA_nwProject.nwx b/tests/reference/coreProject_NewCustomA_nwProject.nwx
index 8747363b..14abf9e2 100644
--- a/tests/reference/coreProject_NewCustomA_nwProject.nwx
+++ b/tests/reference/coreProject_NewCustomA_nwProject.nwx
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<novelWriterXML appVersion="1.7-alpha0" hexVersion="0x010700a0" fileVersion="1.4" timeStamp="2022-04-20 20:01:32">
+<novelWriterXML appVersion="1.7-alpha0" hexVersion="0x010700a0" fileVersion="1.4" timeStamp="2022-04-23 15:34:25">
   <project>
     <name>Test Custom</name>
     <title>Test Novel</title>
@@ -71,7 +71,7 @@
       <name status="s000008" import="i00000c">Entities</name>
     </item>
     <item handle="0000000000017" parent="0000000000010" root="0000000000010" order="0" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta charCount="0" wordCount="0" paraCount="0" cursorPos="0"/>
+      <meta expanded="False" charCount="0" wordCount="0" paraCount="0" cursorPos="0"/>
       <name status="s000008" import="i00000c" exported="True">Title Page</name>
     </item>
     <item handle="0000000000018" parent="0000000000010" root="0000000000010" order="0" type="FOLDER" class="NOVEL">
@@ -79,19 +79,19 @@
       <name status="s000008" import="i00000c">Chapter 1</name>
     </item>
     <item handle="0000000000019" parent="0000000000018" root="0000000000010" order="0" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta charCount="0" wordCount="0" paraCount="0" cursorPos="0"/>
+      <meta expanded="False" charCount="0" wordCount="0" paraCount="0" cursorPos="0"/>
       <name status="s000008" import="i00000c" exported="True">Chapter 1</name>
     </item>
     <item handle="000000000001a" parent="0000000000018" root="0000000000010" order="0" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta charCount="0" wordCount="0" paraCount="0" cursorPos="0"/>
+      <meta expanded="False" charCount="0" wordCount="0" paraCount="0" cursorPos="0"/>
       <name status="s000008" import="i00000c" exported="True">Scene 1.1</name>
     </item>
     <item handle="000000000001b" parent="0000000000018" root="0000000000010" order="0" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta charCount="0" wordCount="0" paraCount="0" cursorPos="0"/>
+      <meta expanded="False" charCount="0" wordCount="0" paraCount="0" cursorPos="0"/>
       <name status="s000008" import="i00000c" exported="True">Scene 1.2</name>
     </item>
     <item handle="000000000001c" parent="0000000000018" root="0000000000010" order="0" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta charCount="0" wordCount="0" paraCount="0" cursorPos="0"/>
+      <meta expanded="False" charCount="0" wordCount="0" paraCount="0" cursorPos="0"/>
       <name status="s000008" import="i00000c" exported="True">Scene 1.3</name>
     </item>
     <item handle="000000000001d" parent="0000000000010" root="0000000000010" order="0" type="FOLDER" class="NOVEL">
@@ -99,19 +99,19 @@
       <name status="s000008" import="i00000c">Chapter 2</name>
     </item>
     <item handle="000000000001e" parent="000000000001d" root="0000000000010" order="0" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta charCount="0" wordCount="0" paraCount="0" cursorPos="0"/>
+      <meta expanded="False" charCount="0" wordCount="0" paraCount="0" cursorPos="0"/>
       <name status="s000008" import="i00000c" exported="True">Chapter 2</name>
     </item>
     <item handle="000000000001f" parent="000000000001d" root="0000000000010" order="0" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta charCount="0" wordCount="0" paraCount="0" cursorPos="0"/>
+      <meta expanded="False" charCount="0" wordCount="0" paraCount="0" cursorPos="0"/>
       <name status="s000008" import="i00000c" exported="True">Scene 2.1</name>
     </item>
     <item handle="0000000000020" parent="000000000001d" root="0000000000010" order="0" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta charCount="0" wordCount="0" paraCount="0" cursorPos="0"/>
+      <meta expanded="False" charCount="0" wordCount="0" paraCount="0" cursorPos="0"/>
       <name status="s000008" import="i00000c" exported="True">Scene 2.2</name>
     </item>
     <item handle="0000000000021" parent="000000000001d" root="0000000000010" order="0" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta charCount="0" wordCount="0" paraCount="0" cursorPos="0"/>
+      <meta expanded="False" charCount="0" wordCount="0" paraCount="0" cursorPos="0"/>
       <name status="s000008" import="i00000c" exported="True">Scene 2.3</name>
     </item>
     <item handle="0000000000022" parent="0000000000010" root="0000000000010" order="0" type="FOLDER" class="NOVEL">
@@ -119,19 +119,19 @@
       <name status="s000008" import="i00000c">Chapter 3</name>
     </item>
     <item handle="0000000000023" parent="0000000000022" root="0000000000010" order="0" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta charCount="0" wordCount="0" paraCount="0" cursorPos="0"/>
+      <meta expanded="False" charCount="0" wordCount="0" paraCount="0" cursorPos="0"/>
       <name status="s000008" import="i00000c" exported="True">Chapter 3</name>
     </item>
     <item handle="0000000000024" parent="0000000000022" root="0000000000010" order="0" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta charCount="0" wordCount="0" paraCount="0" cursorPos="0"/>
+      <meta expanded="False" charCount="0" wordCount="0" paraCount="0" cursorPos="0"/>
       <name status="s000008" import="i00000c" exported="True">Scene 3.1</name>
     </item>
     <item handle="0000000000025" parent="0000000000022" root="0000000000010" order="0" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta charCount="0" wordCount="0" paraCount="0" cursorPos="0"/>
+      <meta expanded="False" charCount="0" wordCount="0" paraCount="0" cursorPos="0"/>
       <name status="s000008" import="i00000c" exported="True">Scene 3.2</name>
     </item>
     <item handle="0000000000026" parent="0000000000022" root="0000000000010" order="0" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta charCount="0" wordCount="0" paraCount="0" cursorPos="0"/>
+      <meta expanded="False" charCount="0" wordCount="0" paraCount="0" cursorPos="0"/>
       <name status="s000008" import="i00000c" exported="True">Scene 3.3</name>
     </item>
   </content>
diff --git a/tests/reference/coreProject_NewCustomB_nwProject.nwx b/tests/reference/coreProject_NewCustomB_nwProject.nwx
index 7f397e85..bca6ea80 100644
--- a/tests/reference/coreProject_NewCustomB_nwProject.nwx
+++ b/tests/reference/coreProject_NewCustomB_nwProject.nwx
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<novelWriterXML appVersion="1.7-alpha0" hexVersion="0x010700a0" fileVersion="1.4" timeStamp="2022-04-20 20:03:03">
+<novelWriterXML appVersion="1.7-alpha0" hexVersion="0x010700a0" fileVersion="1.4" timeStamp="2022-04-23 15:34:25">
   <project>
     <name>Test Custom</name>
     <title>Test Novel</title>
@@ -71,31 +71,31 @@
       <name status="s000008" import="i00000c">Entities</name>
     </item>
     <item handle="0000000000017" parent="0000000000010" root="0000000000010" order="0" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta charCount="0" wordCount="0" paraCount="0" cursorPos="0"/>
+      <meta expanded="False" charCount="0" wordCount="0" paraCount="0" cursorPos="0"/>
       <name status="s000008" import="i00000c" exported="True">Title Page</name>
     </item>
     <item handle="0000000000018" parent="0000000000010" root="0000000000010" order="0" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta charCount="0" wordCount="0" paraCount="0" cursorPos="0"/>
+      <meta expanded="False" charCount="0" wordCount="0" paraCount="0" cursorPos="0"/>
       <name status="s000008" import="i00000c" exported="True">Scene 1</name>
     </item>
     <item handle="0000000000019" parent="0000000000010" root="0000000000010" order="0" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta charCount="0" wordCount="0" paraCount="0" cursorPos="0"/>
+      <meta expanded="False" charCount="0" wordCount="0" paraCount="0" cursorPos="0"/>
       <name status="s000008" import="i00000c" exported="True">Scene 2</name>
     </item>
     <item handle="000000000001a" parent="0000000000010" root="0000000000010" order="0" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta charCount="0" wordCount="0" paraCount="0" cursorPos="0"/>
+      <meta expanded="False" charCount="0" wordCount="0" paraCount="0" cursorPos="0"/>
       <name status="s000008" import="i00000c" exported="True">Scene 3</name>
     </item>
     <item handle="000000000001b" parent="0000000000010" root="0000000000010" order="0" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta charCount="0" wordCount="0" paraCount="0" cursorPos="0"/>
+      <meta expanded="False" charCount="0" wordCount="0" paraCount="0" cursorPos="0"/>
       <name status="s000008" import="i00000c" exported="True">Scene 4</name>
     </item>
     <item handle="000000000001c" parent="0000000000010" root="0000000000010" order="0" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta charCount="0" wordCount="0" paraCount="0" cursorPos="0"/>
+      <meta expanded="False" charCount="0" wordCount="0" paraCount="0" cursorPos="0"/>
       <name status="s000008" import="i00000c" exported="True">Scene 5</name>
     </item>
     <item handle="000000000001d" parent="0000000000010" root="0000000000010" order="0" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta charCount="0" wordCount="0" paraCount="0" cursorPos="0"/>
+      <meta expanded="False" charCount="0" wordCount="0" paraCount="0" cursorPos="0"/>
       <name status="s000008" import="i00000c" exported="True">Scene 6</name>
     </item>
   </content>
diff --git a/tests/reference/coreProject_NewFile_nwProject.nwx b/tests/reference/coreProject_NewFile_nwProject.nwx
index 86f9cf11..d253ebcc 100644
--- a/tests/reference/coreProject_NewFile_nwProject.nwx
+++ b/tests/reference/coreProject_NewFile_nwProject.nwx
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<novelWriterXML appVersion="1.7-alpha0" hexVersion="0x010700a0" fileVersion="1.4" timeStamp="2022-04-20 20:09:19">
+<novelWriterXML appVersion="1.7-alpha0" hexVersion="0x010700a0" fileVersion="1.4" timeStamp="2022-04-23 15:34:25">
   <project>
     <name>New Project</name>
     <title></title>
@@ -57,7 +57,7 @@
       <name status="s000008" import="i00000c">World</name>
     </item>
     <item handle="0000000000014" parent="0000000000010" root="0000000000010" order="0" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta charCount="0" wordCount="0" paraCount="0" cursorPos="0"/>
+      <meta expanded="False" charCount="0" wordCount="0" paraCount="0" cursorPos="0"/>
       <name status="s000008" import="i00000c" exported="True">Title Page</name>
     </item>
     <item handle="0000000000015" parent="0000000000010" root="0000000000010" order="0" type="FOLDER" class="NOVEL">
@@ -65,19 +65,19 @@
       <name status="s000008" import="i00000c">New Chapter</name>
     </item>
     <item handle="0000000000016" parent="0000000000015" root="0000000000010" order="0" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta charCount="0" wordCount="0" paraCount="0" cursorPos="0"/>
+      <meta expanded="False" charCount="0" wordCount="0" paraCount="0" cursorPos="0"/>
       <name status="s000008" import="i00000c" exported="True">New Chapter</name>
     </item>
     <item handle="0000000000017" parent="0000000000015" root="0000000000010" order="0" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta charCount="0" wordCount="0" paraCount="0" cursorPos="0"/>
+      <meta expanded="False" charCount="0" wordCount="0" paraCount="0" cursorPos="0"/>
       <name status="s000008" import="i00000c" exported="True">New Scene</name>
     </item>
     <item handle="0000000000028" parent="31489056e0916" root="None" order="0" type="FILE" class="NO_CLASS" layout="NO_LAYOUT">
-      <meta charCount="0" wordCount="0" paraCount="0" cursorPos="0"/>
+      <meta expanded="False" charCount="0" wordCount="0" paraCount="0" cursorPos="0"/>
       <name status="None" import="None" exported="True">Hello</name>
     </item>
     <item handle="0000000000029" parent="71ee45a3c0db9" root="None" order="0" type="FILE" class="NO_CLASS" layout="NO_LAYOUT">
-      <meta charCount="0" wordCount="0" paraCount="0" cursorPos="0"/>
+      <meta expanded="False" charCount="0" wordCount="0" paraCount="0" cursorPos="0"/>
       <name status="None" import="None" exported="True">Jane</name>
     </item>
   </content>
diff --git a/tests/reference/coreProject_NewMinimal_nwProject.nwx b/tests/reference/coreProject_NewMinimal_nwProject.nwx
index 37a5428b..a6711a84 100644
--- a/tests/reference/coreProject_NewMinimal_nwProject.nwx
+++ b/tests/reference/coreProject_NewMinimal_nwProject.nwx
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<novelWriterXML appVersion="1.7-alpha0" hexVersion="0x010700a0" fileVersion="1.4" timeStamp="2022-04-20 20:00:23">
+<novelWriterXML appVersion="1.7-alpha0" hexVersion="0x010700a0" fileVersion="1.4" timeStamp="2022-04-23 15:34:25">
   <project>
     <name>New Project</name>
     <title></title>
@@ -57,7 +57,7 @@
       <name status="s000008" import="i00000c">World</name>
     </item>
     <item handle="0000000000014" parent="0000000000010" root="0000000000010" order="0" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta charCount="0" wordCount="0" paraCount="0" cursorPos="0"/>
+      <meta expanded="False" charCount="0" wordCount="0" paraCount="0" cursorPos="0"/>
       <name status="s000008" import="i00000c" exported="True">Title Page</name>
     </item>
     <item handle="0000000000015" parent="0000000000010" root="0000000000010" order="0" type="FOLDER" class="NOVEL">
@@ -65,11 +65,11 @@
       <name status="s000008" import="i00000c">New Chapter</name>
     </item>
     <item handle="0000000000016" parent="0000000000015" root="0000000000010" order="0" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta charCount="0" wordCount="0" paraCount="0" cursorPos="0"/>
+      <meta expanded="False" charCount="0" wordCount="0" paraCount="0" cursorPos="0"/>
       <name status="s000008" import="i00000c" exported="True">New Chapter</name>
     </item>
     <item handle="0000000000017" parent="0000000000015" root="0000000000010" order="0" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta charCount="0" wordCount="0" paraCount="0" cursorPos="0"/>
+      <meta expanded="False" charCount="0" wordCount="0" paraCount="0" cursorPos="0"/>
       <name status="s000008" import="i00000c" exported="True">New Scene</name>
     </item>
   </content>
diff --git a/tests/reference/coreProject_NewRoot_nwProject.nwx b/tests/reference/coreProject_NewRoot_nwProject.nwx
index 67c49f05..2ab62301 100644
--- a/tests/reference/coreProject_NewRoot_nwProject.nwx
+++ b/tests/reference/coreProject_NewRoot_nwProject.nwx
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<novelWriterXML appVersion="1.7-alpha0" hexVersion="0x010700a0" fileVersion="1.4" timeStamp="2022-04-20 20:04:09">
+<novelWriterXML appVersion="1.7-alpha0" hexVersion="0x010700a0" fileVersion="1.4" timeStamp="2022-04-23 15:34:25">
   <project>
     <name>New Project</name>
     <title></title>
@@ -57,7 +57,7 @@
       <name status="s000008" import="i00000c">World</name>
     </item>
     <item handle="0000000000014" parent="0000000000010" root="0000000000010" order="0" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta charCount="0" wordCount="0" paraCount="0" cursorPos="0"/>
+      <meta expanded="False" charCount="0" wordCount="0" paraCount="0" cursorPos="0"/>
       <name status="s000008" import="i00000c" exported="True">Title Page</name>
     </item>
     <item handle="0000000000015" parent="0000000000010" root="0000000000010" order="0" type="FOLDER" class="NOVEL">
@@ -65,11 +65,11 @@
       <name status="s000008" import="i00000c">New Chapter</name>
     </item>
     <item handle="0000000000016" parent="0000000000015" root="0000000000010" order="0" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta charCount="0" wordCount="0" paraCount="0" cursorPos="0"/>
+      <meta expanded="False" charCount="0" wordCount="0" paraCount="0" cursorPos="0"/>
       <name status="s000008" import="i00000c" exported="True">New Chapter</name>
     </item>
     <item handle="0000000000017" parent="0000000000015" root="0000000000010" order="0" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta charCount="0" wordCount="0" paraCount="0" cursorPos="0"/>
+      <meta expanded="False" charCount="0" wordCount="0" paraCount="0" cursorPos="0"/>
       <name status="s000008" import="i00000c" exported="True">New Scene</name>
     </item>
     <item handle="0000000000028" parent="None" root="0000000000028" order="0" type="ROOT" class="NOVEL">
diff --git a/tests/reference/guiEditor_Main_Final_nwProject.nwx b/tests/reference/guiEditor_Main_Final_nwProject.nwx
index 3900c6d2..61abe4f3 100644
--- a/tests/reference/guiEditor_Main_Final_nwProject.nwx
+++ b/tests/reference/guiEditor_Main_Final_nwProject.nwx
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='utf-8'?>
-<novelWriterXML appVersion="1.7-alpha0" hexVersion="0x010700a0" fileVersion="1.4" timeStamp="2022-04-20 21:23:06">
+<novelWriterXML appVersion="1.7-alpha0" hexVersion="0x010700a0" fileVersion="1.4" timeStamp="2022-04-23 15:34:36">
   <project>
     <name>New Project</name>
     <title></title>
     <saveCount>5</saveCount>
     <autoCount>2</autoCount>
-    <editTime>4</editTime>
+    <editTime>3</editTime>
   </project>
   <settings>
     <doBackup>True</doBackup>
@@ -45,7 +45,7 @@
       <name status="s000000" import="i000004">Novel</name>
     </item>
     <item handle="000000000000c" parent="0000000000008" root="0000000000008" order="0" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta charCount="11" wordCount="2" paraCount="0" cursorPos="0"/>
+      <meta expanded="False" charCount="11" wordCount="2" paraCount="0" cursorPos="0"/>
       <name status="s000000" import="i000004" exported="True">Title Page</name>
     </item>
     <item handle="000000000000d" parent="0000000000008" root="0000000000008" order="1" type="FOLDER" class="NOVEL">
@@ -53,11 +53,11 @@
       <name status="s000000" import="i000004">New Chapter</name>
     </item>
     <item handle="000000000000e" parent="000000000000d" root="0000000000008" order="0" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta charCount="11" wordCount="2" paraCount="0" cursorPos="0"/>
+      <meta expanded="False" charCount="11" wordCount="2" paraCount="0" cursorPos="0"/>
       <name status="s000000" import="i000004" exported="True">New Chapter</name>
     </item>
     <item handle="000000000000f" parent="000000000000d" root="0000000000008" order="1" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta charCount="612" wordCount="95" paraCount="10" cursorPos="768"/>
+      <meta expanded="False" charCount="612" wordCount="95" paraCount="10" cursorPos="768"/>
       <name status="s000000" import="i000004" exported="True">New Scene</name>
     </item>
     <item handle="0000000000009" parent="None" root="0000000000009" order="1" type="ROOT" class="PLOT">
@@ -65,7 +65,7 @@
       <name status="s000000" import="i000004">Plot</name>
     </item>
     <item handle="0000000000021" parent="0000000000009" root="0000000000009" order="0" type="FILE" class="PLOT" layout="NOTE">
-      <meta charCount="48" wordCount="10" paraCount="1" cursorPos="69"/>
+      <meta expanded="False" charCount="48" wordCount="10" paraCount="1" cursorPos="69"/>
       <name status="s000000" import="i000004" exported="True">New Note</name>
     </item>
     <item handle="000000000000a" parent="None" root="000000000000a" order="2" type="ROOT" class="CHARACTER">
@@ -73,7 +73,7 @@
       <name status="s000000" import="i000004">Characters</name>
     </item>
     <item handle="0000000000020" parent="000000000000a" root="000000000000a" order="0" type="FILE" class="CHARACTER" layout="NOTE">
-      <meta charCount="34" wordCount="8" paraCount="1" cursorPos="51"/>
+      <meta expanded="False" charCount="34" wordCount="8" paraCount="1" cursorPos="51"/>
       <name status="s000000" import="i000004" exported="True">New Note</name>
     </item>
     <item handle="000000000000b" parent="None" root="000000000000b" order="3" type="ROOT" class="WORLD">
@@ -81,7 +81,7 @@
       <name status="s000000" import="i000004">World</name>
     </item>
     <item handle="0000000000022" parent="000000000000b" root="000000000000b" order="0" type="FILE" class="WORLD" layout="NOTE">
-      <meta charCount="51" wordCount="9" paraCount="1" cursorPos="68"/>
+      <meta expanded="False" charCount="51" wordCount="9" paraCount="1" cursorPos="68"/>
       <name status="s000000" import="i000004" exported="True">New Note</name>
     </item>
     <item handle="0000000000024" parent="None" root="0000000000024" order="4" type="TRASH" class="TRASH">
diff --git a/tests/reference/guiEditor_Main_Initial_nwProject.nwx b/tests/reference/guiEditor_Main_Initial_nwProject.nwx
index 66a4c94e..1a5fd5be 100644
--- a/tests/reference/guiEditor_Main_Initial_nwProject.nwx
+++ b/tests/reference/guiEditor_Main_Initial_nwProject.nwx
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<novelWriterXML appVersion="1.7-alpha0" hexVersion="0x010700a0" fileVersion="1.4" timeStamp="2022-04-20 20:57:43">
+<novelWriterXML appVersion="1.7-alpha0" hexVersion="0x010700a0" fileVersion="1.4" timeStamp="2022-04-23 15:28:44">
   <project>
     <name>New Project</name>
     <title></title>
@@ -45,7 +45,7 @@
       <name status="s000000" import="i000004">Novel</name>
     </item>
     <item handle="000000000000c" parent="0000000000008" root="0000000000008" order="0" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta charCount="11" wordCount="2" paraCount="0" cursorPos="0"/>
+      <meta expanded="False" charCount="11" wordCount="2" paraCount="0" cursorPos="0"/>
       <name status="s000000" import="i000004" exported="True">Title Page</name>
     </item>
     <item handle="000000000000d" parent="0000000000008" root="0000000000008" order="1" type="FOLDER" class="NOVEL">
@@ -53,11 +53,11 @@
       <name status="s000000" import="i000004">New Chapter</name>
     </item>
     <item handle="000000000000e" parent="000000000000d" root="0000000000008" order="0" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta charCount="11" wordCount="2" paraCount="0" cursorPos="0"/>
+      <meta expanded="False" charCount="11" wordCount="2" paraCount="0" cursorPos="0"/>
       <name status="s000000" import="i000004" exported="True">New Chapter</name>
     </item>
     <item handle="000000000000f" parent="000000000000d" root="0000000000008" order="1" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta charCount="9" wordCount="2" paraCount="0" cursorPos="0"/>
+      <meta expanded="False" charCount="9" wordCount="2" paraCount="0" cursorPos="0"/>
       <name status="s000000" import="i000004" exported="True">New Scene</name>
     </item>
     <item handle="0000000000009" parent="None" root="0000000000009" order="1" type="ROOT" class="PLOT">
diff --git a/tests/reference/guiProjSettings_Dialog_nwProject.nwx b/tests/reference/guiProjSettings_Dialog_nwProject.nwx
index 77d01d45..326c63e5 100644
--- a/tests/reference/guiProjSettings_Dialog_nwProject.nwx
+++ b/tests/reference/guiProjSettings_Dialog_nwProject.nwx
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<novelWriterXML appVersion="1.7-alpha0" hexVersion="0x010700a0" fileVersion="1.4" timeStamp="2022-04-20 20:50:55">
+<novelWriterXML appVersion="1.7-alpha0" hexVersion="0x010700a0" fileVersion="1.4" timeStamp="2022-04-23 15:28:41">
   <project>
     <name>Project Name</name>
     <title>Project Title</title>
@@ -51,7 +51,7 @@
       <name status="s000000" import="i000004">Novel</name>
     </item>
     <item handle="000000000000c" parent="0000000000008" root="0000000000008" order="0" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta charCount="11" wordCount="2" paraCount="0" cursorPos="0"/>
+      <meta expanded="False" charCount="11" wordCount="2" paraCount="0" cursorPos="0"/>
       <name status="s000000" import="i000004" exported="True">Title Page</name>
     </item>
     <item handle="000000000000d" parent="0000000000008" root="0000000000008" order="1" type="FOLDER" class="NOVEL">
@@ -59,11 +59,11 @@
       <name status="s000000" import="i000004">New Chapter</name>
     </item>
     <item handle="000000000000e" parent="000000000000d" root="0000000000008" order="0" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta charCount="11" wordCount="2" paraCount="0" cursorPos="0"/>
+      <meta expanded="False" charCount="11" wordCount="2" paraCount="0" cursorPos="0"/>
       <name status="s000000" import="i000004" exported="True">New Chapter</name>
     </item>
     <item handle="000000000000f" parent="000000000000d" root="0000000000008" order="1" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta charCount="9" wordCount="2" paraCount="0" cursorPos="0"/>
+      <meta expanded="False" charCount="9" wordCount="2" paraCount="0" cursorPos="0"/>
       <name status="s000000" import="i000004" exported="True">New Scene</name>
     </item>
     <item handle="0000000000009" parent="None" root="0000000000009" order="1" type="ROOT" class="PLOT">
diff --git a/tests/test_core/test_core_item.py b/tests/test_core/test_core_item.py
index 572b31d7..dec95cd7 100644
--- a/tests/test_core/test_core_item.py
+++ b/tests/test_core/test_core_item.py
@@ -500,8 +500,9 @@ def testCoreItem_XMLPackUnpack(mockGUI, caplog, mockRnd):
     assert etree.tostring(xContent, pretty_print=False, encoding="utf-8") == (
         b'<content>'
         b'<item handle="0123456789abc" parent="0123456789abc" root="0123456789abc" order="1" '
-        b'type="FILE" class="NOVEL" layout="NOTE"><meta charCount="7" wordCount="5" paraCount="3" '
-        b'cursorPos="11"/><name status="None" import="%s" exported="False">A Name</name></item>'
+        b'type="FILE" class="NOVEL" layout="NOTE"><meta expanded="False" charCount="7" '
+        b'wordCount="5" paraCount="3" cursorPos="11"/><name status="None" import="%s" '
+        b'exported="False">A Name</name></item>'
         b'</content>'
     ) % bytes(importKeys[3], encoding="utf8")
 
diff --git a/tests/test_core/test_core_tree.py b/tests/test_core/test_core_tree.py
index c70cc4bb..e8734936 100644
--- a/tests/test_core/test_core_tree.py
+++ b/tests/test_core/test_core_tree.py
@@ -419,12 +419,12 @@ def testCoreTree_XMLPackUnpack(mockGUI, mockItems):
         b'type="FOLDER" class="NOVEL"><meta expanded="True"/><name status="s000000" '
         b'import="i000004">Act One</name></item>'
         b'<item handle="c000000000001" parent="b000000000001" root="a000000000001" order="0" '
-        b'type="FILE" class="NOVEL" layout="DOCUMENT"><meta charCount="300" wordCount="50" '
-        b'paraCount="2" cursorPos="0"/><name status="s000000" import="i000004" '
+        b'type="FILE" class="NOVEL" layout="DOCUMENT"><meta expanded="False" charCount="300" '
+        b'wordCount="50" paraCount="2" cursorPos="0"/><name status="s000000" import="i000004" '
         b'exported="True">Chapter One</name></item>'
         b'<item handle="c000000000002" parent="b000000000001" root="a000000000001" order="0" '
-        b'type="FILE" class="NOVEL" layout="DOCUMENT"><meta charCount="3000" wordCount="500" '
-        b'paraCount="20" cursorPos="0"/><name status="s000000" import="i000004" '
+        b'type="FILE" class="NOVEL" layout="DOCUMENT"><meta expanded="False" charCount="3000" '
+        b'wordCount="500" paraCount="20" cursorPos="0"/><name status="s000000" import="i000004" '
         b'exported="True">Scene One</name></item>'
         b'<item handle="a000000000002" parent="None" root="a000000000002" order="0" type="ROOT" '
         b'class="ARCHIVE"><meta expanded="False"/><name status="s000000" '
@@ -436,8 +436,8 @@ def testCoreTree_XMLPackUnpack(mockGUI, mockItems):
         b'class="CHARACTER"><meta expanded="True"/><name status="s000000" '
         b'import="i000004">Characters</name></item>'
         b'<item handle="b000000000002" parent="a000000000004" root="a000000000004" order="0" '
-        b'type="FILE" class="CHARACTER" layout="NOTE"><meta charCount="2000" wordCount="400" '
-        b'paraCount="16" cursorPos="0"/><name status="s000000" import="i000004" '
+        b'type="FILE" class="CHARACTER" layout="NOTE"><meta expanded="False" charCount="2000" '
+        b'wordCount="400" paraCount="16" cursorPos="0"/><name status="s000000" import="i000004" '
         b'exported="True">Jane Doe</name></item>'
         b'</content>'
         b'</novelWriterXML>'