From b50fb0b102b7f8a94d86ea01a592532630ca0b54 Mon Sep 17 00:00:00 2001
From: "Veronica K. B. Olsen" <code@vkbo.net>
Date: Fri, 10 May 2019 18:51:05 +0200
Subject: [PATCH] Commented out the non-functioning menu items, and commited
 the latest changes to the sample project

---
 nw/gui/mainmenu.py                            | 44 +++++++++----------
 .../sampleNovel/data_6/36b6aa9b697b_main.nwd  | 12 ++++-
 sample/sampleNovel/nwProject.nwx              | 21 ++++++---
 3 files changed, 48 insertions(+), 29 deletions(-)

diff --git a/nw/gui/mainmenu.py b/nw/gui/mainmenu.py
index a148e06e..fdd0c3a1 100644
--- a/nw/gui/mainmenu.py
+++ b/nw/gui/mainmenu.py
@@ -238,18 +238,18 @@ class GuiMainMenu(QMenuBar):
         menuItem.triggered.connect(self.theParent._previewDocument)
         self.docuMenu.addAction(menuItem)
 
-        # Document > Separator
-        self.docuMenu.addSeparator()
+        # # Document > Separator
+        # self.docuMenu.addSeparator()
 
-        # Document > Split
-        menuItem = QAction(QIcon.fromTheme("list-add"), "Split Document", self)
-        menuItem.setStatusTip("Split Selected Document")
-        self.docuMenu.addAction(menuItem)
+        # # Document > Split
+        # menuItem = QAction(QIcon.fromTheme("list-add"), "Split Document", self)
+        # menuItem.setStatusTip("Split Selected Document")
+        # self.docuMenu.addAction(menuItem)
 
-        # Document > Merge
-        menuItem = QAction(QIcon.fromTheme("list-remove"), "Merge Document", self)
-        menuItem.setStatusTip("Merge Selected Documents")
-        self.docuMenu.addAction(menuItem)
+        # # Document > Merge
+        # menuItem = QAction(QIcon.fromTheme("list-remove"), "Merge Document", self)
+        # menuItem.setStatusTip("Merge Selected Documents")
+        # self.docuMenu.addAction(menuItem)
 
         return
 
@@ -272,12 +272,12 @@ class GuiMainMenu(QMenuBar):
         menuItem.triggered.connect(lambda : self.theParent.setFocus(2))
         self.viewMenu.addAction(menuItem)
 
-        # View > Document Pane 2
-        menuItem = QAction(QIcon.fromTheme("go-last"), "Right Document Pane", self)
-        menuItem.setStatusTip("Move to Right Document Pane")
-        menuItem.setShortcut("Ctrl+3")
-        menuItem.triggered.connect(lambda : self.theParent.setFocus(3))
-        self.viewMenu.addAction(menuItem)
+        # # View > Document Pane 2
+        # menuItem = QAction(QIcon.fromTheme("go-last"), "Right Document Pane", self)
+        # menuItem.setStatusTip("Move to Right Document Pane")
+        # menuItem.setShortcut("Ctrl+3")
+        # menuItem.triggered.connect(lambda : self.theParent.setFocus(3))
+        # self.viewMenu.addAction(menuItem)
 
         return
 
@@ -407,13 +407,13 @@ class GuiMainMenu(QMenuBar):
         self.toolsMoveDown.triggered.connect(lambda : self._moveTreeItem(1))
         self.toolsMenu.addAction(self.toolsMoveDown)
 
-        # Tools > Separator
-        self.toolsMenu.addSeparator()
+        # # Tools > Separator
+        # self.toolsMenu.addSeparator()
 
-        # Tools > Settings
-        menuItem = QAction(QIcon.fromTheme("preferences-system"), "Preferences", self)
-        menuItem.setStatusTip("Preferences")
-        self.toolsMenu.addAction(menuItem)
+        # # Tools > Settings
+        # menuItem = QAction(QIcon.fromTheme("preferences-system"), "Preferences", self)
+        # menuItem.setStatusTip("Preferences")
+        # self.toolsMenu.addAction(menuItem)
 
         return
 
diff --git a/sample/sampleNovel/data_6/36b6aa9b697b_main.nwd b/sample/sampleNovel/data_6/36b6aa9b697b_main.nwd
index 0f9c32d2..8408e624 100644
--- a/sample/sampleNovel/data_6/36b6aa9b697b_main.nwd
+++ b/sample/sampleNovel/data_6/36b6aa9b697b_main.nwd
@@ -11,8 +11,16 @@ Some text here would look good as well, and maybe some "dialogue"?
 
 **Some Section**
 
-So, this is some text that we’ve been adding to this document. It is utterly meaningless text, but since this is just dummy text, that doesn’t really matter. The text is perfectly happy to live in this document regardless.
+So, this is some __text__ that we’ve been adding to this document. It is utterly meaningless text, _but_ since this is just dummy text, that doesn’t really matter. The text is perfectly happy to live in this document regardless.
+
+This paragraph is also meaningless. At least a bit.
+
+# 
+## 
+### 
+#### 
+##### 
+
 
-This paragraph is also meaningless. At least a bit. 
 
 
diff --git a/sample/sampleNovel/nwProject.nwx b/sample/sampleNovel/nwProject.nwx
index f82147c2..4021a961 100644
--- a/sample/sampleNovel/nwProject.nwx
+++ b/sample/sampleNovel/nwProject.nwx
@@ -1,12 +1,12 @@
 <?xml version='1.0' encoding='utf-8'?>
-<novelWriterXML appVersion="0.0.1" fileVersion="1.0" timeStamp="2019-05-04 23:57:20">
+<novelWriterXML appVersion="0.0.1" fileVersion="1.0" timeStamp="2019-05-10 18:35:23">
   <project>
     <name>Sample Project</name>
     <title>Sample Project</title>
     <author>Jane Smith</author>
     <author>Jay Doh</author>
   </project>
-  <content count="14">
+  <content count="15">
     <item handle="7031beac91f75" order="0" parent="None">
       <name>Novel</name>
       <type>ROOT</type>
@@ -50,9 +50,9 @@
       <status>1</status>
       <expanded>False</expanded>
       <layout>SCENE</layout>
-      <charCount>392</charCount>
-      <wordCount>70</wordCount>
-      <paraCount>4</paraCount>
+      <charCount>404</charCount>
+      <wordCount>71</wordCount>
+      <paraCount>5</paraCount>
     </item>
     <item handle="bc0cbd2a407f3" order="2" parent="e7ded148d6e4a">
       <name>New File</name>
@@ -137,5 +137,16 @@
       <wordCount>0</wordCount>
       <paraCount>0</paraCount>
     </item>
+    <item handle="879437bde105e" order="1" parent="f75dac270c2a7">
+      <name>New File</name>
+      <type>FILE</type>
+      <class>CHARACTER</class>
+      <status>0</status>
+      <expanded>False</expanded>
+      <layout>NOTE</layout>
+      <charCount>0</charCount>
+      <wordCount>0</wordCount>
+      <paraCount>0</paraCount>
+    </item>
   </content>
 </novelWriterXML>