Remove redundant menu entries

novelwriter/gui/mainmenu.py

@@ -33,7 +33,7 @@ from PyQt5.QtCore import QUrl
 from PyQt5.QtGui import QDesktopServices
 from PyQt5.QtWidgets import QMenuBar, QAction
 
-from novelwriter.enum import nwItemType, nwItemClass, nwDocAction, nwDocInsert, nwWidget
+from novelwriter.enum import nwItemType, nwDocAction, nwDocInsert, nwWidget
 from novelwriter.constants import trConst, nwKeyWords, nwLabels, nwUnicode
 
 logger = logging.getLogger(__name__)
@@ -164,33 +164,6 @@ class GuiMainMenu(QMenuBar):
         # Project > Separator
         self.projMenu.addSeparator()
 
-        # Project > New Root
-        self.rootMenu = self.projMenu.addMenu(self.tr("Create Root Folder"))
-        self.rootItems = {}
-        self.rootItems[nwItemClass.NOVEL]     = QAction(self.tr("Novel Root"),     self.rootMenu)
-        self.rootItems[nwItemClass.PLOT]      = QAction(self.tr("Plot Root"),      self.rootMenu)
-        self.rootItems[nwItemClass.CHARACTER] = QAction(self.tr("Character Root"), self.rootMenu)
-        self.rootItems[nwItemClass.WORLD]     = QAction(self.tr("Location Root"),  self.rootMenu)
-        self.rootItems[nwItemClass.TIMELINE]  = QAction(self.tr("Timeline Root"),  self.rootMenu)
-        self.rootItems[nwItemClass.OBJECT]    = QAction(self.tr("Object Root"),    self.rootMenu)
-        self.rootItems[nwItemClass.ENTITY]    = QAction(self.tr("Entity Root"),    self.rootMenu)
-        self.rootItems[nwItemClass.CUSTOM]    = QAction(self.tr("Custom Root"),    self.rootMenu)
-        self.rootItems[nwItemClass.ARCHIVE]   = QAction(self.tr("Archive Root"),   self.rootMenu)
-        for n, itemClass in enumerate(self.rootItems.keys()):
-            self.rootItems[itemClass].triggered.connect(
-                lambda n, itemClass=itemClass: self._newTreeItem(nwItemType.ROOT, itemClass)
-            )
-            self.rootMenu.addAction(self.rootItems[itemClass])
-
-        # Project > New Folder
-        self.aCreateFolder = QAction(self.tr("Create Folder"), self)
-        self.aCreateFolder.setShortcut("Ctrl+Shift+N")
-        self.aCreateFolder.triggered.connect(lambda: self._newTreeItem(nwItemType.FOLDER))
-        self.projMenu.addAction(self.aCreateFolder)
-
-        # Project > Separator
-        self.projMenu.addSeparator()
-
         # Project > Edit
         self.aEditItem = QAction(self.tr("Edit Item"), self)
         self.aEditItem.setShortcuts(["Ctrl+E", "F2"])

novelwriter/gui/projtree.py

@@ -167,7 +167,7 @@ class GuiProjectToolBar(QToolBar):
         self.setStyleSheet("QToolBar {border: 0px;}")
 
         # Tree Label
-        self.projLabel = QLabel(self.tr("Project"))
+        self.projLabel = QLabel("<b>%s</b>" % self.tr("Project Content"))
         self.projLabel.setContentsMargins(0, 0, mPx, 0)
         self.projLabel.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding)
 
@@ -1235,14 +1235,6 @@ class GuiProjectTreeMenu(QMenu):
         self.toggleExp.triggered.connect(self._doToggleExported)
         self.addAction(self.toggleExp)
 
-        self.newFile = QAction(self.tr("New File"), self)
-        self.newFile.triggered.connect(self._doMakeFile)
-        self.addAction(self.newFile)
-
-        self.newFolder = QAction(self.tr("New Folder"), self)
-        self.newFolder.triggered.connect(self._doMakeFolder)
-        self.addAction(self.newFolder)
-
         self.deleteItem = QAction(self.tr("Delete Item"), self)
         self.deleteItem.triggered.connect(self._doDeleteItem)
         self.addAction(self.deleteItem)
@@ -1273,18 +1265,13 @@ class GuiProjectTreeMenu(QMenu):
 
         trashHandle = self.theTree.theProject.tree.trashRoot()
 
-        inTrash = self.theTree.theProject.tree.isTrash(theItem.itemHandle)
         isTrash = theItem.itemHandle == trashHandle and trashHandle is not None
         isFile = theItem.itemType == nwItemType.FILE
 
-        allowNew = not (isTrash or inTrash)
-
         self.editItem.setVisible(not isTrash)
         self.openItem.setVisible(isFile)
         self.viewItem.setVisible(isFile)
         self.toggleExp.setVisible(isFile)
-        self.newFile.setVisible(allowNew)
-        self.newFolder.setVisible(allowNew)
         self.deleteItem.setVisible(not isTrash)
         self.emptyTrash.setVisible(isTrash)
 
@@ -1318,22 +1305,6 @@ class GuiProjectTreeMenu(QMenu):
             self.theTree.theParent.editItem()
         return
 
-    @pyqtSlot()
-    def _doMakeFile(self):
-        """Forward the new file call to the project tree.
-        """
-        if self.theItem is not None:
-            self.theTree.newTreeItem(nwItemType.FILE)
-        return
-
-    @pyqtSlot()
-    def _doMakeFolder(self):
-        """Forward the new folder call to the project tree.
-        """
-        if self.theItem is not None:
-            self.theTree.newTreeItem(nwItemType.FOLDER)
-        return
-
     @pyqtSlot()
     def _doToggleExported(self):
         """Flip the isExported flag of the current item.