Merge pull request #666 from vkbo/ctrl_del

Change Delete Item Shortcut

docs/source/usage_interface.rst

@@ -377,7 +377,6 @@ Most features are available as keyboard shortcuts. These are as follows:
    ":kbd:`Ctrl`:kbd:`Z`",                "Undo latest changes."
    ":kbd:`Ctrl`:kbd:`F7`",               "Toggle spell checking."
    ":kbd:`Ctrl`:kbd:`F10`",              "Toggle automatic updating of project outline."
-   ":kbd:`Ctrl`:kbd:`Del`",              "If in the project tree, move a document to trash, or delete a folder."
    ":kbd:`Ctrl`:kbd:`'`",                "Wrap selected text, or word under cursor, in single quotes."
    ":kbd:`Ctrl`:kbd:`""`",               "Wrap selected text, or word under cursor, in double quotes."
    ":kbd:`Ctrl`:kbd:`Enter`",            "Open the tag or reference under the cursor in the Viewer."
@@ -395,6 +394,7 @@ Most features are available as keyboard shortcuts. These are as follows:
    ":kbd:`Ctrl`:kbd:`Shift`:kbd:`Z`",    "Alternative sequence for redo last undo."
    ":kbd:`Ctrl`:kbd:`Shift`:kbd:`Up`",   "Move item one step up in the project tree."
    ":kbd:`Ctrl`:kbd:`Shift`:kbd:`Down`", "Move item one step down in the project tree."
+   ":kbd:`Ctrl`:kbd:`Shift`:kbd:`Del`",  "If in the project tree, move a document to trash, or delete a folder."
    ":kbd:`F1`",                          "Open the documentation. This will either open the Qt Assistant, if available, or send you to the documentation website."
    ":kbd:`F2`",                          "If in the project tree, edit a document or folder settings. (Same as :kbd:`Ctrl`:kbd:`E`)"
    ":kbd:`F3`",                          "Find next occurrence of search word in current document. (Same as :kbd:`Ctrl`:kbd:`G`)"

nw/__init__.py

@@ -1,28 +1,27 @@
 # -*- coding: utf-8 -*-
-"""novelWriter Init
+"""
+novelWriter – Init File
+=======================
+Application initialisation
 
- novelWriter – Init File
+File History:
-=========================
+Created: 2018-09-22 [0.0.1]
- Application initialisation
 
- File History:
+This file is a part of novelWriter
- Created: 2018-09-22 [0.0.1]
+Copyright 2018–2021, Veronica Berglyd Olsen
 
- This file is a part of novelWriter
+This program is free software: you can redistribute it and/or modify
- Copyright 2018–2021, Veronica Berglyd Olsen
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
 
- This program is free software: you can redistribute it and/or modify
+This program is distributed in the hope that it will be useful, but
- it under the terms of the GNU General Public License as published by
+WITHOUT ANY WARRANTY; without even the implied warranty of
- the Free Software Foundation, either version 3 of the License, or
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- (at your option) any later version.
+General Public License for more details.
 
- This program is distributed in the hope that it will be useful, but
+You should have received a copy of the GNU General Public License
- WITHOUT ANY WARRANTY; without even the implied warranty of
+along with this program. If not, see <https://www.gnu.org/licenses/>.
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <https://www.gnu.org/licenses/>.
 """
 
 import sys

nw/gui/mainmenu.py

@@ -272,7 +272,7 @@ class GuiMainMenu(QMenuBar):
         # Project > Delete
         self.aDeleteItem = QAction("Delete Project Item", self)
         self.aDeleteItem.setStatusTip("Delete selected item")
-        self.aDeleteItem.setShortcut("Ctrl+Del")
+        self.aDeleteItem.setShortcut("Ctrl+Shift+Del")
         self.aDeleteItem.triggered.connect(lambda: self.theParent.treeView.deleteItem(None))
         self.projMenu.addAction(self.aDeleteItem)