Replace the edit item dialog

docs/source/usage_shortcuts.rst

@@ -25,7 +25,7 @@ The main shorcuts are as follows:
    ":kbd:`Alt`:kbd:`4`",                 "Switch focus to outline view. On Windows, use :kbd:`Ctrl`:kbd:`Alt`:kbd:`4`."
    ":kbd:`Alt`:kbd:`Left`",              "Move backward in the view history of the document viewer."
    ":kbd:`Alt`:kbd:`Right`",             "Move forward in the view history of the document viewer."
-   ":kbd:`Ctrl`:kbd:`.`",                "Open menu to correct word under cursor."
+   ":kbd:`Ctrl`:kbd:`.`",                "Open the context menu in the project tree or the document editor."
    ":kbd:`Ctrl`:kbd:`,`",                "Open the :guilabel:`Preferences` dialog."
    ":kbd:`Ctrl`:kbd:`/`",                "Toggle block format as comment."
    ":kbd:`Ctrl`:kbd:`0`",                "Remove block formatting for block under cursor."
@@ -42,7 +42,6 @@ The main shorcuts are as follows:
    ":kbd:`Ctrl`:kbd:`B`",                "Format selected text, or word under cursor, with strong emphasis (bold)."
    ":kbd:`Ctrl`:kbd:`C`",                "Copy selected text to clipboard."
    ":kbd:`Ctrl`:kbd:`D`",                "Strikethrough selected text, or word under cursor."
-   ":kbd:`Ctrl`:kbd:`E`",                "If in the project tree, edit a document or folder settings."
    ":kbd:`Ctrl`:kbd:`F`",                "Open the search bar and search for the selected word, if any is selected."
    ":kbd:`Ctrl`:kbd:`G`",                "Find next occurrence of search word in current document."
    ":kbd:`Ctrl`:kbd:`H`",                "Open the search and replace bar and search for the selected word, if any is selected. (On Mac, this is :kbd:`Cmd`:kbd:`=`.)"

novelwriter/dialogs/__init__.py

@@ -22,7 +22,7 @@
 from novelwriter.dialogs.about import GuiAbout
 from novelwriter.dialogs.docmerge import GuiDocMerge
 from novelwriter.dialogs.docsplit import GuiDocSplit
-from novelwriter.dialogs.itemeditor import GuiItemEditor
+from novelwriter.dialogs.editlabel import GuiEditLabel
 from novelwriter.dialogs.preferences import GuiPreferences
 from novelwriter.dialogs.projdetails import GuiProjectDetails
 from novelwriter.dialogs.projload import GuiProjectLoad
@@ -35,7 +35,7 @@
     "GuiAbout",
     "GuiDocMerge",
     "GuiDocSplit",
-    "GuiItemEditor",
+    "GuiEditLabel",
     "GuiPreferences",
     "GuiProjectDetails",
     "GuiProjectLoad",

novelwriter/dialogs/editlabel.py

@@ -0,0 +1,84 @@
+"""
+novelWriter – Edit Label Dialog
+===============================
+A simple dialog for editing a label
+
+File History:
+Created: 2022-06-11 [1.7b1]
+
+This file is a part of novelWriter
+Copyright 2018–2022, Veronica Berglyd Olsen
+
+This program is free software: you can redistribute it and/or modify
+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 distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+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 logging
+import novelwriter
+
+from PyQt5.QtWidgets import (
+    QDialog, QVBoxLayout, QLineEdit, QLabel, QDialogButtonBox, QHBoxLayout
+)
+
+logger = logging.getLogger(__name__)
+
+
+class GuiEditLabel(QDialog):
+
+    def __init__(self, parent, text=""):
+        QDialog.__init__(self, parent=parent)
+
+        self.setObjectName("GuiEditLabel")
+        self.setWindowTitle(self.tr("Item Label"))
+
+        mVd = novelwriter.CONFIG.pxInt(220)
+        mSp = novelwriter.CONFIG.pxInt(12)
+
+        # Item Label
+        self.labelValue = QLineEdit()
+        self.labelValue.setMinimumWidth(mVd)
+        self.labelValue.setMaxLength(200)
+        self.labelValue.setText(text)
+        self.labelValue.selectAll()
+
+        # Buttons
+        self.buttonBox = QDialogButtonBox(QDialogButtonBox.Ok | QDialogButtonBox.Cancel)
+        self.buttonBox.accepted.connect(self.accept)
+        self.buttonBox.rejected.connect(self.reject)
+
+        # Assemble
+        self.innerBox = QHBoxLayout()
+        self.innerBox.addWidget(QLabel(self.tr("Label")), 0)
+        self.innerBox.addWidget(self.labelValue, 1)
+        self.innerBox.setSpacing(mSp)
+
+        self.outerBox = QVBoxLayout()
+        self.outerBox.setSpacing(mSp)
+        self.outerBox.addLayout(self.innerBox, 1)
+        self.outerBox.addWidget(self.buttonBox, 0)
+
+        self.setLayout(self.outerBox)
+
+        return
+
+    @property
+    def itemLabel(self):
+        return self.labelValue.text()
+
+    @classmethod
+    def getLabel(cls, parent, text):
+        cls = GuiEditLabel(parent, text=text)
+        cls.exec_()
+        return cls.itemLabel, cls.result() == QDialog.Accepted
+
+# END Class GuiEditLabel

novelwriter/gui/doceditor.py

@@ -2746,7 +2746,7 @@ def updateFocusMode(self):
     def _editDocument(self):
         """Open the edit item dialog from the main GUI.
         """
-        self.mainGui.editItem(self._docHandle)
+        self.mainGui.editItemLabel(self._docHandle)
         return
 
     def _searchDocument(self):

novelwriter/gui/mainmenu.py

@@ -163,9 +163,9 @@ def _buildProjectMenu(self):
         self.projMenu.addSeparator()
 
         # Project > Edit
-        self.aEditItem = QAction(self.tr("Edit Item"), self)
-        self.aEditItem.setShortcuts(["Ctrl+E", "F2"])
-        self.aEditItem.triggered.connect(lambda: self.mainGui.editItem(None))
+        self.aEditItem = QAction(self.tr("Rename Item"), self)
+        self.aEditItem.setShortcuts(["F2"])
+        self.aEditItem.triggered.connect(lambda: self.mainGui.editItemLabel(None))
         self.projMenu.addAction(self.aEditItem)
 
         # Project > Delete