From 1a47bbaf8c1f1bd95979e3cc109842c1ccc69fe0 Mon Sep 17 00:00:00 2001
From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com>
Date: Sat, 23 Apr 2022 15:53:14 +0200
Subject: [PATCH] Allow files to have child items

---
 novelwriter/gui/projtree.py |  9 ++---
 sample/nwProject.nwx        | 68 ++++++++++++++++++-------------------
 2 files changed, 36 insertions(+), 41 deletions(-)

diff --git a/novelwriter/gui/projtree.py b/novelwriter/gui/projtree.py
index 23238b84..c912bb18 100644
--- a/novelwriter/gui/projtree.py
+++ b/novelwriter/gui/projtree.py
@@ -793,17 +793,12 @@ class GuiProjectTree(QTreeWidget):
         # - Files can be moved anywhere
         # - Folders can only be moved within the same root folder
         # - Root folders cannot be moved at all
-        # - Items cannot be dropped on top of a file (moved inside)
 
         isFile = snItem.itemType == nwItemType.FILE
         isRoot = snItem.itemType == nwItemType.ROOT
-        onFile = dnItem.itemType == nwItemType.FILE
         inSame = snItem.itemRoot == dnItem.itemRoot
 
-        allowDrop  = inSame or isFile
-        allowDrop &= not (self.dropIndicatorPosition() == QAbstractItemView.OnItem and onFile)
-
-        if allowDrop and not isRoot:
+        if (inSame or isFile) and not isRoot:
             logger.debug("Drag'n'drop of item '%s' accepted", sHandle)
 
             wCount = int(sItem.data(self.C_COUNT, Qt.UserRole))
@@ -1057,7 +1052,7 @@ class GuiProjectTreeMenu(QMenu):
 
         trashHandle = self.theTree.theProject.projTree.trashRoot()
 
-        inTrash = theItem.itemParent == trashHandle and trashHandle is not None
+        inTrash = self.theTree.theProject.projTree.isTrash(theItem.itemHandle)
         isTrash = theItem.itemHandle == trashHandle and trashHandle is not None
         isFile = theItem.itemType == nwItemType.FILE
 
diff --git a/sample/nwProject.nwx b/sample/nwProject.nwx
index 23660870..6bb6fdd4 100644
--- a/sample/nwProject.nwx
+++ b/sample/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-17 19:05:24">
+<novelWriterXML appVersion="1.7-alpha0" hexVersion="0x010700a0" fileVersion="1.4" timeStamp="2022-04-23 15:51:36">
   <project>
     <name>Sample Project</name>
     <title>Sample Project</title>
     <author>Jane Smith</author>
     <author>Jay Doh</author>
-    <saveCount>1306</saveCount>
-    <autoCount>199</autoCount>
-    <editTime>65149</editTime>
+    <saveCount>1308</saveCount>
+    <autoCount>201</autoCount>
+    <editTime>65350</editTime>
   </project>
   <settings>
     <doBackup>False</doBackup>
@@ -54,47 +54,47 @@
       <name status="sc24b8f" import="ia857f0">Novel</name>
     </item>
     <item handle="53b69b83cdafc" parent="7031beac91f75" root="7031beac91f75" order="0" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta charCount="93" wordCount="19" paraCount="2" cursorPos="2"/>
+      <meta expanded="False" charCount="93" wordCount="19" paraCount="2" cursorPos="2"/>
       <name status="sc24b8f" import="ia857f0" exported="True">Title Page</name>
     </item>
     <item handle="974e400180a99" parent="7031beac91f75" root="7031beac91f75" order="1" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta charCount="186" wordCount="39" paraCount="2" cursorPos="212"/>
+      <meta expanded="False" charCount="186" wordCount="39" paraCount="2" cursorPos="212"/>
       <name status="sf12341" import="ia857f0" exported="True">Page</name>
     </item>
     <item handle="edca4be2fcaf8" parent="7031beac91f75" root="7031beac91f75" order="2" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta charCount="26" wordCount="6" paraCount="1" cursorPos="33"/>
+      <meta expanded="False" charCount="26" wordCount="6" paraCount="1" cursorPos="33"/>
       <name status="sf12341" import="ia857f0" exported="True">Part One</name>
     </item>
     <item handle="e7ded148d6e4a" parent="7031beac91f75" root="7031beac91f75" order="3" type="FOLDER" class="NOVEL">
       <meta expanded="True"/>
       <name status="s90e6c9" import="ia857f0">A Folder</name>
     </item>
-    <item handle="6a2d6d5f4f401" parent="e7ded148d6e4a" root="7031beac91f75" order="0" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta charCount="75" wordCount="14" paraCount="1" cursorPos="279"/>
-      <name status="sf24ce6" import="ia857f0" exported="True">Chapter One</name>
-    </item>
-    <item handle="636b6aa9b697b" parent="e7ded148d6e4a" root="7031beac91f75" order="1" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta charCount="2429" wordCount="432" paraCount="14" cursorPos="219"/>
-      <name status="s90e6c9" import="ia857f0" exported="True">Making a Scene</name>
-    </item>
-    <item handle="bc0cbd2a407f3" parent="e7ded148d6e4a" root="7031beac91f75" order="2" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta charCount="476" wordCount="93" paraCount="3" cursorPos="577"/>
-      <name status="s90e6c9" import="ia857f0" exported="True">Another Scene</name>
-    </item>
-    <item handle="ba8a28a246524" parent="e7ded148d6e4a" root="7031beac91f75" order="3" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta charCount="617" wordCount="101" paraCount="3" cursorPos="4"/>
+    <item handle="ba8a28a246524" parent="e7ded148d6e4a" root="7031beac91f75" order="0" type="FILE" class="NOVEL" layout="DOCUMENT">
+      <meta expanded="False" charCount="617" wordCount="101" paraCount="3" cursorPos="4"/>
       <name status="sf12341" import="ia857f0" exported="True">Interlude</name>
     </item>
-    <item handle="96b68994dfa3d" parent="e7ded148d6e4a" root="7031beac91f75" order="4" type="FILE" class="NOVEL" layout="NOTE">
-      <meta charCount="1692" wordCount="313" paraCount="6" cursorPos="1110"/>
+    <item handle="6a2d6d5f4f401" parent="e7ded148d6e4a" root="7031beac91f75" order="1" type="FILE" class="NOVEL" layout="DOCUMENT">
+      <meta expanded="True" charCount="75" wordCount="14" paraCount="1" cursorPos="279"/>
+      <name status="sf24ce6" import="ia857f0" exported="True">Chapter One</name>
+    </item>
+    <item handle="636b6aa9b697b" parent="6a2d6d5f4f401" root="7031beac91f75" order="0" type="FILE" class="NOVEL" layout="DOCUMENT">
+      <meta expanded="False" charCount="2429" wordCount="432" paraCount="14" cursorPos="219"/>
+      <name status="s90e6c9" import="ia857f0" exported="True">Making a Scene</name>
+    </item>
+    <item handle="bc0cbd2a407f3" parent="6a2d6d5f4f401" root="7031beac91f75" order="1" type="FILE" class="NOVEL" layout="DOCUMENT">
+      <meta expanded="False" charCount="476" wordCount="93" paraCount="3" cursorPos="577"/>
+      <name status="s90e6c9" import="ia857f0" exported="True">Another Scene</name>
+    </item>
+    <item handle="96b68994dfa3d" parent="e7ded148d6e4a" root="7031beac91f75" order="2" type="FILE" class="NOVEL" layout="NOTE">
+      <meta expanded="False" charCount="1692" wordCount="313" paraCount="6" cursorPos="1110"/>
       <name status="sd51c5b" import="ia857f0" exported="False">A Note on Structure</name>
     </item>
-    <item handle="88706ddc78b1b" parent="e7ded148d6e4a" root="7031beac91f75" order="5" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta charCount="139" wordCount="28" paraCount="1" cursorPos="343"/>
+    <item handle="88706ddc78b1b" parent="e7ded148d6e4a" root="7031beac91f75" order="3" type="FILE" class="NOVEL" layout="DOCUMENT">
+      <meta expanded="True" charCount="139" wordCount="28" paraCount="1" cursorPos="343"/>
       <name status="s90e6c9" import="ia857f0" exported="True">Chapter Two</name>
     </item>
-    <item handle="ae7339df26ded" parent="e7ded148d6e4a" root="7031beac91f75" order="6" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta charCount="189" wordCount="37" paraCount="1" cursorPos="224"/>
+    <item handle="ae7339df26ded" parent="88706ddc78b1b" root="7031beac91f75" order="0" type="FILE" class="NOVEL" layout="DOCUMENT">
+      <meta expanded="False" charCount="189" wordCount="37" paraCount="1" cursorPos="224"/>
       <name status="s90e6c9" import="ia857f0" exported="True">We Found John!</name>
     </item>
     <item handle="f6622b4617424" parent="None" root="f6622b4617424" order="1" type="ROOT" class="CHARACTER">
@@ -106,11 +106,11 @@
       <name status="sf12341" import="ia857f0">Main Characters</name>
     </item>
     <item handle="14298de4d9524" parent="f7e2d9f330615" root="f6622b4617424" order="0" type="FILE" class="CHARACTER" layout="NOTE">
-      <meta charCount="49" wordCount="9" paraCount="1" cursorPos="24"/>
+      <meta expanded="False" charCount="49" wordCount="9" paraCount="1" cursorPos="24"/>
       <name status="sf12341" import="icfb3a5" exported="True">John Smith</name>
     </item>
     <item handle="bb2c23b3c42cc" parent="f7e2d9f330615" root="f6622b4617424" order="1" type="FILE" class="CHARACTER" layout="NOTE">
-      <meta charCount="55" wordCount="9" paraCount="1" cursorPos="25"/>
+      <meta expanded="False" charCount="55" wordCount="9" paraCount="1" cursorPos="25"/>
       <name status="sf12341" import="i2d7a54" exported="True">Jane Smith</name>
     </item>
     <item handle="15c4492bd5107" parent="None" root="15c4492bd5107" order="2" type="ROOT" class="WORLD">
@@ -118,15 +118,15 @@
       <name status="sf12341" import="ia857f0">Locations</name>
     </item>
     <item handle="b3e74dbc1f584" parent="15c4492bd5107" root="15c4492bd5107" order="0" type="FILE" class="WORLD" layout="NOTE">
-      <meta charCount="76" wordCount="15" paraCount="1" cursorPos="20"/>
+      <meta expanded="False" charCount="76" wordCount="15" paraCount="1" cursorPos="20"/>
       <name status="sf12341" import="i56be10" exported="True">Earth</name>
     </item>
     <item handle="f1471bef9f2ae" parent="15c4492bd5107" root="15c4492bd5107" order="1" type="FILE" class="WORLD" layout="NOTE">
-      <meta charCount="115" wordCount="24" paraCount="1" cursorPos="133"/>
+      <meta expanded="False" charCount="115" wordCount="24" paraCount="1" cursorPos="133"/>
       <name status="sf12341" import="icfb3a5" exported="True">Space</name>
     </item>
     <item handle="5eaea4e8cdee8" parent="15c4492bd5107" root="15c4492bd5107" order="2" type="FILE" class="WORLD" layout="NOTE">
-      <meta charCount="28" wordCount="6" paraCount="1" cursorPos="45"/>
+      <meta expanded="False" charCount="28" wordCount="6" paraCount="1" cursorPos="45"/>
       <name status="sf12341" import="i2d7a54" exported="True">Mars</name>
     </item>
     <item handle="6827118336ac1" parent="None" root="6827118336ac1" order="3" type="ROOT" class="ARCHIVE">
@@ -138,7 +138,7 @@
       <name status="sf12341" import="ia857f0">Scenes</name>
     </item>
     <item handle="8a5deb88c0e97" parent="ae9bf3c3ea159" root="6827118336ac1" order="0" type="FILE" class="ARCHIVE" layout="DOCUMENT">
-      <meta charCount="315" wordCount="55" paraCount="1" cursorPos="322"/>
+      <meta expanded="False" charCount="315" wordCount="55" paraCount="1" cursorPos="322"/>
       <name status="s90e6c9" import="ia857f0" exported="True">Old File</name>
     </item>
     <item handle="98acd8c76c93a" parent="None" root="98acd8c76c93a" order="4" type="TRASH" class="TRASH">
@@ -146,7 +146,7 @@
       <name status="sf12341" import="ia857f0">Trash</name>
     </item>
     <item handle="b8136a5a774a0" parent="98acd8c76c93a" root="98acd8c76c93a" order="0" type="FILE" class="TRASH" layout="DOCUMENT">
-      <meta charCount="30" wordCount="6" paraCount="1" cursorPos="36"/>
+      <meta expanded="False" charCount="30" wordCount="6" paraCount="1" cursorPos="36"/>
       <name status="sf12341" import="ia857f0" exported="True">Delete Me!</name>
     </item>
   </content>