novelWriter 2.2rc1__py3-none-any.whl → 2.3__py3-none-any.whl

novelwriter/gui/docviewerpanel.py

@@ -6,7 +6,7 @@ File History:
 Created: 2023-11-14 [2.2rc1] GuiDocViewerPanel
 
 This file is a part of novelWriter
-Copyright 2018–2023, Veronica Berglyd Olsen
+Copyright 2018–2024, 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
@@ -29,8 +29,8 @@ from enum import Enum
 
 from PyQt5.QtCore import QModelIndex, QSize, Qt, pyqtSignal, pyqtSlot
 from PyQt5.QtWidgets import (
-    QAbstractItemView, QFrame, QHeaderView, QTabWidget, QTreeWidget,
-    QTreeWidgetItem, QVBoxLayout, QWidget
+    QAbstractItemView, QFrame, QHeaderView, QMenu, QTabWidget, QToolButton,
+    QTreeWidget, QTreeWidgetItem, QVBoxLayout, QWidget
 )
 
 from novelwriter import CONFIG, SHARED
@@ -54,10 +54,24 @@ class GuiDocViewerPanel(QWidget):
 
         self._lastHandle = None
 
+        iPx = int(1.0*SHARED.theme.baseIconSize)
+
         self.tabBackRefs = _ViewPanelBackRefs(self)
 
+        self.optsMenu = QMenu(self)
+
+        self.aInactive = self.optsMenu.addAction(self.tr("Hide Inactive Tags"))
+        self.aInactive.setCheckable(True)
+        self.aInactive.toggled.connect(self._toggleHideInactive)
+
+        self.optsButton = QToolButton(self)
+        self.optsButton.setIconSize(QSize(iPx, iPx))
+        self.optsButton.setMenu(self.optsMenu)
+        self.optsButton.setPopupMode(QToolButton.ToolButtonPopupMode.InstantPopup)
+
         self.mainTabs = QTabWidget(self)
-        self.mainTabs.addTab(self.tabBackRefs, self.tr("Backreferences"))
+        self.mainTabs.addTab(self.tabBackRefs, self.tr("References"))
+        self.mainTabs.setCornerWidget(self.optsButton, Qt.Corner.TopLeftCorner)
 
         self.kwTabs: dict[str, _ViewPanelKeyWords] = {}
         self.idTabs: dict[str, int] = {}
@@ -73,7 +87,7 @@ class GuiDocViewerPanel(QWidget):
         self.outerBox.setContentsMargins(0, 0, 0, 0)
 
         self.setLayout(self.outerBox)
-        self.updateTheme()
+        self.updateTheme(updateTabs=False)
 
         logger.debug("Ready: GuiDocViewerPanel")
 
@@ -83,42 +97,57 @@ class GuiDocViewerPanel(QWidget):
     #  Methods
     ##
 
-    def updateTheme(self) -> None:
+    def updateTheme(self, updateTabs: bool = True) -> None:
         """Update theme elements."""
+        qPalette = self.palette()
+        mPx = CONFIG.pxInt(2)
         vPx = CONFIG.pxInt(4)
-        lPx = CONFIG.pxInt(2)
-        rPx = CONFIG.pxInt(14)
-        hCol = self.palette().highlight().color()
+        hPx = CONFIG.pxInt(8)
+        hCol = qPalette.highlight().color()
+        fCol = qPalette.text().color()
+
+        buttonStyle = (
+            "QToolButton {{padding: {0}px; margin: 0 0 {1}px 0; border: none; "
+            "background: transparent;}} "
+            "QToolButton:hover {{border: none; background: rgba({2}, {3}, {4}, 0.2);}} "
+            "QToolButton::menu-indicator {{image: none;}} "
+        ).format(mPx, mPx, fCol.red(), fCol.green(), fCol.blue())
+        self.optsButton.setIcon(SHARED.theme.getIcon("menu"))
+        self.optsButton.setStyleSheet(buttonStyle)
 
         styleSheet = (
-            "QTabWidget::pane {border: 0;} "
-            "QTabWidget QTabBar::tab {"
-            f"border: 0; padding: {vPx}px {rPx}px {vPx}px {lPx}px;"
-            "} "
-            "QTabWidget QTabBar::tab:selected {"
-            f"color: rgb({hCol.red()}, {hCol.green()}, {hCol.blue()});"
-            "} "
-        )
+            "QTabWidget::pane {{border: 0;}} "
+            "QTabWidget QTabBar::tab {{border: 0; padding: {0}px {1}px;}} "
+            "QTabWidget QTabBar::tab:selected {{color: rgb({2}, {3}, {4});}} "
+        ).format(vPx, hPx, hCol.red(), hCol.green(), hCol.blue())
         self.mainTabs.setStyleSheet(styleSheet)
         self.updateHandle(self._lastHandle)
 
+        if updateTabs:
+            self.tabBackRefs.updateTheme()
+            for tab in self.kwTabs.values():
+                tab.updateTheme()
+
         return
 
     def openProjectTasks(self) -> None:
         """Run open project tasks."""
-        widths = SHARED.project.options.getValue("GuiDocViewerPanel", "colWidths", {})
-        if isinstance(widths, dict):
-            for key, value in widths.items():
+        colWidths = SHARED.project.options.getValue("GuiDocViewerPanel", "colWidths", {})
+        hideInactive = SHARED.project.options.getBool("GuiDocViewerPanel", "hideInactive", False)
+        self.aInactive.setChecked(hideInactive)
+        if isinstance(colWidths, dict):
+            for key, value in colWidths.items():
                 if key in self.kwTabs and isinstance(value, list):
                     self.kwTabs[key].setColumnWidths(value)
         return
 
     def closeProjectTasks(self) -> None:
         """Run close project tasks."""
-        widths = {}
-        for key, tab in self.kwTabs.items():
-            widths[key] = tab.getColumnWidths()
-        SHARED.project.options.setValue("GuiDocViewerPanel", "colWidths", widths)
+        logger.debug("Saving State: GuiDocViewerPanel")
+        colWidths = {k: t.getColumnWidths() for k, t in self.kwTabs.items()}
+        hideInactive = self.aInactive.isChecked()
+        SHARED.project.options.setValue("GuiDocViewerPanel", "colWidths", colWidths)
+        SHARED.project.options.setValue("GuiDocViewerPanel", "hideInactive", hideInactive)
         return
 
     ##
@@ -136,9 +165,7 @@ class GuiDocViewerPanel(QWidget):
     @pyqtSlot()
     def indexHasAppeared(self) -> None:
         """Handle event when the index has appeared."""
-        for key, name, tClass, iItem, hItem in SHARED.project.index.getTagsData():
-            if tClass in self.kwTabs and iItem and hItem:
-                self.kwTabs[tClass].addUpdateEntry(key, name, iItem, hItem)
+        self._loadAllTags()
         self._updateTabVisibility()
         self.updateHandle(self._lastHandle)
         return
@@ -147,10 +174,15 @@ class GuiDocViewerPanel(QWidget):
     def projectItemChanged(self, tHandle: str) -> None:
         """Update meta data for project item."""
         self.tabBackRefs.refreshDocument(tHandle)
+        activeOnly = self.aInactive.isChecked()
         for key in SHARED.project.index.getDocumentTags(tHandle):
             name, tClass, iItem, hItem = SHARED.project.index.getSingleTag(key)
             if tClass in self.kwTabs and iItem and hItem:
-                self.kwTabs[tClass].addUpdateEntry(key, name, iItem, hItem)
+                if not activeOnly or (iItem and iItem.item.isActive):
+                    self.kwTabs[tClass].addUpdateEntry(key, name, iItem, hItem)
+                else:
+                    self.kwTabs[tClass].removeEntry(key)
+        self._updateTabVisibility()
         return
 
     @pyqtSlot(str)
@@ -176,6 +208,20 @@ class GuiDocViewerPanel(QWidget):
         self._updateTabVisibility()
         return
 
+    ##
+    #  Private Slots
+    ##
+
+    @pyqtSlot(bool)
+    def _toggleHideInactive(self, state: bool) -> None:
+        """Process toggling of active/inactive visibility."""
+        logger.debug("Setting inactive items to %s", "hidden" if state else "visible")
+        for cTab in self.kwTabs.values():
+            cTab.clearContent()
+        self._loadAllTags()
+        self._updateTabVisibility()
+        return
+
     ##
     #  Internal Functions
     ##
@@ -187,6 +233,14 @@ class GuiDocViewerPanel(QWidget):
                 self.mainTabs.setTabVisible(self.idTabs[tClass], cTab.countEntries() > 0)
         return
 
+    def _loadAllTags(self) -> None:
+        """Load all tags into the tabs."""
+        data = SHARED.project.index.getTagsData(activeOnly=self.aInactive.isChecked())
+        for key, name, tClass, iItem, hItem in data:
+            if tClass in self.kwTabs and iItem and hItem:
+                self.kwTabs[tClass].addUpdateEntry(key, name, iItem, hItem)
+        return
+
 # END Class GuiDocViewerPanel
 
 
@@ -218,12 +272,14 @@ class _ViewPanelBackRefs(QTreeWidget):
         # Set Header Sizes
         treeHeader = self.header()
         treeHeader.setStretchLastSection(True)
+        treeHeader.setMinimumSectionSize(iPx + cMg)  # See Issue #1627
         treeHeader.setSectionResizeMode(self.C_DOC, QHeaderView.ResizeMode.ResizeToContents)
         treeHeader.setSectionResizeMode(self.C_EDIT, QHeaderView.ResizeMode.Fixed)
         treeHeader.setSectionResizeMode(self.C_VIEW, QHeaderView.ResizeMode.Fixed)
         treeHeader.setSectionResizeMode(self.C_TITLE, QHeaderView.ResizeMode.ResizeToContents)
         treeHeader.resizeSection(self.C_EDIT, iPx + cMg)
         treeHeader.resizeSection(self.C_VIEW, iPx + cMg)
+        treeHeader.setSectionsMovable(False)
 
         # Cache Icons Locally
         self._editIcon = SHARED.theme.getIcon("edit")
@@ -235,6 +291,16 @@ class _ViewPanelBackRefs(QTreeWidget):
 
         return
 
+    def updateTheme(self) -> None:
+        """Update theme elements."""
+        self._editIcon = SHARED.theme.getIcon("edit")
+        self._viewIcon = SHARED.theme.getIcon("view")
+        for i in range(self.topLevelItemCount()):
+            if item := self.topLevelItem(i):
+                item.setIcon(self.C_EDIT, self._editIcon)
+                item.setIcon(self.C_VIEW, self._viewIcon)
+        return
+
     def clearContent(self) -> None:
         """Clear the widget."""
         self.clear()
@@ -276,7 +342,7 @@ class _ViewPanelBackRefs(QTreeWidget):
     def _treeItemDoubleClicked(self, index: QModelIndex) -> None:
         """Emit follow tag signal on user double click."""
         tHandle = index.siblingAtColumn(self.C_DATA).data(self.D_HANDLE)
-        if index.column() == self.C_DOC:
+        if index.column() not in (self.C_EDIT, self.C_VIEW):
             self._parent.openDocumentRequest.emit(tHandle, nwDocMode.VIEW, "", True)
         return
 
@@ -299,10 +365,12 @@ class _ViewPanelBackRefs(QTreeWidget):
 
             trItem.setIcon(self.C_DOC, docIcon)
             trItem.setText(self.C_DOC, nwItem.itemName)
+            trItem.setToolTip(self.C_DOC, nwItem.itemName)
             trItem.setIcon(self.C_EDIT, self._editIcon)
             trItem.setIcon(self.C_VIEW, self._viewIcon)
-            trItem.setText(self.C_TITLE, hItem.title)
             trItem.setData(self.C_TITLE, Qt.ItemDataRole.DecorationRole, hDec)
+            trItem.setText(self.C_TITLE, hItem.title)
+            trItem.setToolTip(self.C_TITLE, hItem.title)
             trItem.setData(self.C_DATA, self.D_HANDLE, tHandle)
 
             if tKey not in self._treeMap:
@@ -316,13 +384,14 @@ class _ViewPanelBackRefs(QTreeWidget):
 
 class _ViewPanelKeyWords(QTreeWidget):
 
-    C_DATA  = 0
-    C_NAME  = 0
-    C_EDIT  = 1
-    C_VIEW  = 2
-    C_DOC   = 3
-    C_TITLE = 4
-    C_SHORT = 5
+    C_DATA   = 0
+    C_NAME   = 0
+    C_EDIT   = 1
+    C_VIEW   = 2
+    C_IMPORT = 3
+    C_DOC    = 4
+    C_TITLE  = 5
+    C_SHORT  = 6
 
     D_TAG = Qt.ItemDataRole.UserRole
 
@@ -330,13 +399,14 @@ class _ViewPanelKeyWords(QTreeWidget):
         super().__init__(parent=parent)
 
         self._parent = parent
+        self._class = itemClass
         self._treeMap: dict[str, QTreeWidgetItem] = {}
 
         iPx = SHARED.theme.baseIconSize
         cMg = CONFIG.pxInt(6)
 
         self.setHeaderLabels([
-            self.tr("Tag"), "", "", self.tr("Document"),
+            self.tr("Tag"), "", "", self.tr("Importance"), self.tr("Document"),
             self.tr("Heading"), self.tr("Short Description")
         ])
         self.setIndentation(0)
@@ -351,7 +421,7 @@ class _ViewPanelKeyWords(QTreeWidget):
         # Set Header Sizes
         treeHeader = self.header()
         treeHeader.setStretchLastSection(True)
-        treeHeader.setSectionResizeMode(self.C_NAME, QHeaderView.ResizeMode.ResizeToContents)
+        treeHeader.setMinimumSectionSize(iPx + cMg)  # See Issue #1627
         treeHeader.setSectionResizeMode(self.C_EDIT, QHeaderView.ResizeMode.Fixed)
         treeHeader.setSectionResizeMode(self.C_VIEW, QHeaderView.ResizeMode.Fixed)
         treeHeader.resizeSection(self.C_EDIT, iPx + cMg)
@@ -369,6 +439,17 @@ class _ViewPanelKeyWords(QTreeWidget):
 
         return
 
+    def updateTheme(self) -> None:
+        """Update theme elements."""
+        self._classIcon = SHARED.theme.getIcon(nwLabels.CLASS_ICON[self._class])
+        self._editIcon = SHARED.theme.getIcon("edit")
+        self._viewIcon = SHARED.theme.getIcon("view")
+        for i in range(self.topLevelItemCount()):
+            if item := self.topLevelItem(i):
+                item.setIcon(self.C_EDIT, self._editIcon)
+                item.setIcon(self.C_VIEW, self._viewIcon)
+        return
+
     def countEntries(self) -> int:
         """Return the number of items in the list."""
         return self.topLevelItemCount()
@@ -386,22 +467,30 @@ class _ViewPanelKeyWords(QTreeWidget):
             nwItem.itemType, nwItem.itemClass,
             nwItem.itemLayout, nwItem.mainHeading
         )
+        impLabel, impIcon = nwItem.getImportStatus(incIcon=True)
         iLevel = nwHeaders.H_LEVEL.get(hItem.level, 0) if nwItem.isDocumentLayout() else 5
         hDec = SHARED.theme.getHeaderDecorationNarrow(iLevel)
 
-        # This can not use a get call to the dictionary as that creates
-        # some weird issue with Qt, so we need to do this with an if
+        # This can not use a get call to the dictionary as that would create an
+        # instance of the QTreeWidgetItem, which has some weird side effects
         trItem = self._treeMap[tag] if tag in self._treeMap else QTreeWidgetItem()
 
-        trItem.setText(self.C_NAME, name)
         trItem.setIcon(self.C_NAME, self._classIcon)
+        trItem.setText(self.C_NAME, name)
+        trItem.setToolTip(self.C_NAME, name)
         trItem.setIcon(self.C_EDIT, self._editIcon)
         trItem.setIcon(self.C_VIEW, self._viewIcon)
+        trItem.setIcon(self.C_IMPORT, impIcon)
+        trItem.setText(self.C_IMPORT, impLabel)
+        trItem.setToolTip(self.C_IMPORT, impLabel)
         trItem.setIcon(self.C_DOC, docIcon)
         trItem.setText(self.C_DOC, nwItem.itemName)
-        trItem.setText(self.C_TITLE, hItem.title)
+        trItem.setToolTip(self.C_DOC, nwItem.itemName)
         trItem.setData(self.C_TITLE, Qt.ItemDataRole.DecorationRole, hDec)
+        trItem.setText(self.C_TITLE, hItem.title)
+        trItem.setToolTip(self.C_TITLE, hItem.title)
         trItem.setText(self.C_SHORT, hItem.synopsis)
+        trItem.setToolTip(self.C_SHORT, hItem.synopsis)
         trItem.setData(self.C_DATA, self.D_TAG, tag)
 
         if tag not in self._treeMap:
@@ -420,14 +509,18 @@ class _ViewPanelKeyWords(QTreeWidget):
 
     def setColumnWidths(self, widths: list[int]) -> None:
         """Set the column widths."""
-        if isinstance(widths, list) and len(widths) >= 2:
-            self.setColumnWidth(self.C_DOC, CONFIG.pxInt(checkInt(widths[0], 100)))
-            self.setColumnWidth(self.C_TITLE, CONFIG.pxInt(checkInt(widths[1], 100)))
+        if isinstance(widths, list) and len(widths) >= 4:
+            self.setColumnWidth(self.C_NAME, CONFIG.pxInt(checkInt(widths[0], 100)))
+            self.setColumnWidth(self.C_IMPORT, CONFIG.pxInt(checkInt(widths[1], 100)))
+            self.setColumnWidth(self.C_DOC, CONFIG.pxInt(checkInt(widths[2], 100)))
+            self.setColumnWidth(self.C_TITLE, CONFIG.pxInt(checkInt(widths[3], 100)))
         return
 
     def getColumnWidths(self) -> list[int]:
         """Get the widths of the user-adjustable columns."""
         return [
+            CONFIG.rpxInt(self.columnWidth(self.C_NAME)),
+            CONFIG.rpxInt(self.columnWidth(self.C_IMPORT)),
             CONFIG.rpxInt(self.columnWidth(self.C_DOC)),
             CONFIG.rpxInt(self.columnWidth(self.C_TITLE)),
         ]
@@ -450,7 +543,7 @@ class _ViewPanelKeyWords(QTreeWidget):
     def _treeItemDoubleClicked(self, index: QModelIndex) -> None:
         """Emit follow tag signal on user double click."""
         tag = index.siblingAtColumn(self.C_DATA).data(self.D_TAG)
-        if index.column() == self.C_NAME:
+        if index.column() not in (self.C_EDIT, self.C_VIEW):
             self._parent.loadDocumentTagRequest.emit(tag, nwDocMode.VIEW)
         return
 

novelwriter/gui/editordocument.py

@@ -3,10 +3,10 @@ novelWriter – GUI Text Document
 ===============================
 
 File History:
-Created: 2023-09-07 [2.2b1]
+Created: 2023-09-07 [2.2b1] GuiTextDocument
 
 This file is a part of novelWriter
-Copyright 2018–2023, Veronica Berglyd Olsen
+Copyright 2018–2024, 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
@@ -50,7 +50,7 @@ class GuiTextDocument(QTextDocument):
 
         return
 
-    def __del__(self):  # pragma: no cover
+    def __del__(self) -> None:  # pragma: no cover
         logger.debug("Delete: GuiTextDocument")
         return
 

novelwriter/gui/itemdetails.py

@@ -3,10 +3,10 @@ novelWriter – GUI Item Details Panel
 ====================================
 
 File History:
-Created: 2019-04-24 [0.0.1]
+Created: 2019-04-24 [0.0.1] GuiItemDetails
 
 This file is a part of novelWriter
-Copyright 2018–2023, Veronica Berglyd Olsen
+Copyright 2018–2024, 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
@@ -239,9 +239,9 @@ class GuiItemDetails(QWidget):
         # Label
         # =====
 
-        theLabel = nwItem.itemName
-        if len(theLabel) > 100:
-            theLabel = theLabel[:96].rstrip()+" ..."
+        label = nwItem.itemName
+        if len(label) > 100:
+            label = label[:96].rstrip()+" ..."
 
         if nwItem.isFileType():
             if nwItem.isActive:
@@ -251,14 +251,14 @@ class GuiItemDetails(QWidget):
         else:
             self.labelIcon.setPixmap(SHARED.theme.getPixmap("noncheckable", (iPx, iPx)))
 
-        self.labelData.setText(theLabel)
+        self.labelData.setText(label)
 
         # Status
         # ======
 
-        theStatus, theIcon = nwItem.getImportStatus(incIcon=True)
-        self.statusIcon.setPixmap(theIcon.pixmap(iPx, iPx))
-        self.statusData.setText(theStatus)
+        status, icon = nwItem.getImportStatus(incIcon=True)
+        self.statusIcon.setPixmap(icon.pixmap(iPx, iPx))
+        self.statusData.setText(status)
 
         # Class
         # =====

novelwriter/gui/mainmenu.py

@@ -3,10 +3,10 @@ novelWriter – GUI Main Menu
 ===========================
 
 File History:
-Created: 2019-04-27 [0.0.1]
+Created: 2019-04-27 [0.0.1] GuiMainMenu
 
 This file is a part of novelWriter
-Copyright 2018–2023, Veronica Berglyd Olsen
+Copyright 2018–2024, 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
@@ -36,6 +36,7 @@ from novelwriter import CONFIG, SHARED
 from novelwriter.enum import nwDocAction, nwDocInsert, nwWidget
 from novelwriter.common import openExternalPath
 from novelwriter.constants import nwConst, trConst, nwKeyWords, nwLabels, nwUnicode
+from novelwriter.extensions.eventfilters import StatusTipFilter
 
 if TYPE_CHECKING:  # pragma: no cover
     from novelwriter.guimain import GuiMain
@@ -73,6 +74,8 @@ class GuiMainMenu(QMenuBar):
         self._buildToolsMenu()
         self._buildHelpMenu()
 
+        self.installEventFilter(StatusTipFilter(mainGui))
+
         logger.debug("Ready: GuiMainMenu")
 
         return
@@ -129,14 +132,10 @@ class GuiMainMenu(QMenuBar):
         # Project
         self.projMenu = self.addMenu(self.tr("&Project"))
 
-        # Project > New Project
-        self.aNewProject = self.projMenu.addAction(self.tr("New Project"))
-        self.aNewProject.triggered.connect(lambda: self.mainGui.newProject(None))
-
-        # Project > Open Project
-        self.aOpenProject = self.projMenu.addAction(self.tr("Open Project"))
+        # Project > Create or Open Project
+        self.aOpenProject = self.projMenu.addAction(self.tr("Create or Open Project"))
         self.aOpenProject.setShortcut("Ctrl+Shift+O")
-        self.aOpenProject.triggered.connect(lambda: self.mainGui.showProjectLoadDialog())
+        self.aOpenProject.triggered.connect(self.mainGui.showWelcomeDialog)
 
         # Project > Save Project
         self.aSaveProject = self.projMenu.addAction(self.tr("Save Project"))
@@ -154,12 +153,12 @@ class GuiMainMenu(QMenuBar):
         # Project > Project Settings
         self.aProjectSettings = self.projMenu.addAction(self.tr("Project Settings"))
         self.aProjectSettings.setShortcut("Ctrl+Shift+,")
-        self.aProjectSettings.triggered.connect(lambda: self.mainGui.showProjectSettingsDialog())
+        self.aProjectSettings.triggered.connect(self.mainGui.showProjectSettingsDialog)
 
-        # Project > Project Details
-        self.aProjectDetails = self.projMenu.addAction(self.tr("Project Details"))
-        self.aProjectDetails.setShortcut("Shift+F6")
-        self.aProjectDetails.triggered.connect(lambda: self.mainGui.showProjectDetailsDialog())
+        # Project > Novel Details
+        self.aNovelDetails = self.projMenu.addAction(self.tr("Novel Details"))
+        self.aNovelDetails.setShortcut("Shift+F6")
+        self.aNovelDetails.triggered.connect(self.mainGui.showNovelDetailsDialog)
 
         # Project > Separator
         self.projMenu.addSeparator()
@@ -231,7 +230,6 @@ class GuiMainMenu(QMenuBar):
 
         # Document > Import From File
         self.aImportFile = self.docuMenu.addAction(self.tr("Import Text from File"))
-        self.aImportFile.setShortcut("Ctrl+Shift+I")
         self.aImportFile.triggered.connect(lambda: self.mainGui.importDocument())
 
         return
@@ -566,7 +564,7 @@ class GuiMainMenu(QMenuBar):
 
         # Insert > Short Description Comment
         self.aInsShort = self.mInsComments.addAction(self.tr("Short Description Comment"))
-        self.aInsShort.setShortcut("Ctrl+K, U")
+        self.aInsShort.setShortcut("Ctrl+K, H")
         self.aInsShort.triggered.connect(
             lambda: self.requestDocInsert.emit(nwDocInsert.SHORT)
         )
@@ -593,8 +591,10 @@ class GuiMainMenu(QMenuBar):
         )
 
         # Insert > Placeholder Text
-        self.aLipsumText = self.mInsBreaks.addAction(self.tr("Placeholder Text"))
-        self.aLipsumText.triggered.connect(lambda: self.mainGui.showLoremIpsumDialog())
+        self.aLipsumText = self.insMenu.addAction(self.tr("Placeholder Text"))
+        self.aLipsumText.triggered.connect(
+            lambda: self.requestDocInsert.emit(nwDocInsert.LIPSUM)
+        )
 
         return
 
@@ -603,25 +603,25 @@ class GuiMainMenu(QMenuBar):
         # Format
         self.fmtMenu = self.addMenu(self.tr("&Format"))
 
-        # Format > Emphasis
-        self.aFmtEmph = self.fmtMenu.addAction(self.tr("Emphasis"))
-        self.aFmtEmph.setShortcut("Ctrl+I")
-        self.aFmtEmph.triggered.connect(
-            lambda: self.requestDocAction.emit(nwDocAction.EMPH)
+        # Format > Bold
+        self.aFmtBold = self.fmtMenu.addAction(self.tr("Bold"))
+        self.aFmtBold.setShortcut("Ctrl+B")
+        self.aFmtBold.triggered.connect(
+            lambda: self.requestDocAction.emit(nwDocAction.MD_BOLD)
         )
 
-        # Format > Strong Emphasis
-        self.aFmtStrong = self.fmtMenu.addAction(self.tr("Strong Emphasis"))
-        self.aFmtStrong.setShortcut("Ctrl+B")
-        self.aFmtStrong.triggered.connect(
-            lambda: self.requestDocAction.emit(nwDocAction.STRONG)
+        # Format > Italic
+        self.aFmtItalic = self.fmtMenu.addAction(self.tr("Italic"))
+        self.aFmtItalic.setShortcut("Ctrl+I")
+        self.aFmtItalic.triggered.connect(
+            lambda: self.requestDocAction.emit(nwDocAction.MD_ITALIC)
         )
 
         # Format > Strikethrough
         self.aFmtStrike = self.fmtMenu.addAction(self.tr("Strikethrough"))
         self.aFmtStrike.setShortcut("Ctrl+D")
         self.aFmtStrike.triggered.connect(
-            lambda: self.requestDocAction.emit(nwDocAction.STRIKE)
+            lambda: self.requestDocAction.emit(nwDocAction.MD_STRIKE)
         )
 
         # Edit > Separator
@@ -647,18 +647,18 @@ class GuiMainMenu(QMenuBar):
         # Shortcodes
         self.mShortcodes = self.fmtMenu.addMenu(self.tr("More Formats ..."))
 
-        # Shortcode Italic
-        self.aScItalic = self.mShortcodes.addAction(self.tr("Italics (Shortcode)"))
-        self.aScItalic.triggered.connect(
-            lambda: self.requestDocAction.emit(nwDocAction.SC_ITALIC)
-        )
-
         # Shortcode Bold
         self.aScBold = self.mShortcodes.addAction(self.tr("Bold (Shortcode)"))
         self.aScBold.triggered.connect(
             lambda: self.requestDocAction.emit(nwDocAction.SC_BOLD)
         )
 
+        # Shortcode Italic
+        self.aScItalic = self.mShortcodes.addAction(self.tr("Italics (Shortcode)"))
+        self.aScItalic.triggered.connect(
+            lambda: self.requestDocAction.emit(nwDocAction.SC_ITALIC)
+        )
+
         # Shortcode Strikethrough
         self.aScStrike = self.mShortcodes.addAction(self.tr("Strikethrough (Shortcode)"))
         self.aScStrike.triggered.connect(
@@ -780,6 +780,13 @@ class GuiMainMenu(QMenuBar):
             lambda: self.requestDocAction.emit(nwDocAction.BLOCK_COM)
         )
 
+        # Format > Ignore Text
+        self.aFmtIgnore = self.fmtMenu.addAction(self.tr("Toggle Ignore Text"))
+        self.aFmtIgnore.setShortcut("Ctrl+Shift+D")
+        self.aFmtIgnore.triggered.connect(
+            lambda: self.requestDocAction.emit(nwDocAction.BLOCK_IGN)
+        )
+
         # Format > Remove Block Format
         self.aFmtNoFormat = self.fmtMenu.addAction(self.tr("Remove Block Format"))
         self.aFmtNoFormat.setShortcuts(["Ctrl+0", "Ctrl+Shift+/"])
@@ -872,7 +879,7 @@ class GuiMainMenu(QMenuBar):
 
         # Tools > Project Word List
         self.aEditWordList = self.toolsMenu.addAction(self.tr("Project Word List"))
-        self.aEditWordList.triggered.connect(lambda: self.mainGui.showProjectWordListDialog())
+        self.aEditWordList.triggered.connect(self.mainGui.showProjectWordListDialog)
 
         # Tools > Add Dictionaries
         if CONFIG.osWindows or CONFIG.isDebug:
@@ -902,13 +909,13 @@ class GuiMainMenu(QMenuBar):
         # Tools > Writing Statistics
         self.aWritingStats = self.toolsMenu.addAction(self.tr("Writing Statistics"))
         self.aWritingStats.setShortcut("F6")
-        self.aWritingStats.triggered.connect(lambda: self.mainGui.showWritingStatsDialog())
+        self.aWritingStats.triggered.connect(self.mainGui.showWritingStatsDialog)
 
         # Tools > Preferences
         self.aPreferences = self.toolsMenu.addAction(self.tr("Preferences"))
         self.aPreferences.setShortcut("Ctrl+,")
         self.aPreferences.setMenuRole(QAction.PreferencesRole)
-        self.aPreferences.triggered.connect(lambda: self.mainGui.showPreferencesDialog())
+        self.aPreferences.triggered.connect(self.mainGui.showPreferencesDialog)
 
         return
 
@@ -920,12 +927,12 @@ class GuiMainMenu(QMenuBar):
         # Help > About
         self.aAboutNW = self.helpMenu.addAction(self.tr("About novelWriter"))
         self.aAboutNW.setMenuRole(QAction.AboutRole)
-        self.aAboutNW.triggered.connect(lambda: self.mainGui.showAboutNWDialog())
+        self.aAboutNW.triggered.connect(self.mainGui.showAboutNWDialog)
 
         # Help > About Qt5
         self.aAboutQt = self.helpMenu.addAction(self.tr("About Qt5"))
         self.aAboutQt.setMenuRole(QAction.AboutQtRole)
-        self.aAboutQt.triggered.connect(lambda: self.mainGui.showAboutQtDialog())
+        self.aAboutQt.triggered.connect(self.mainGui.showAboutQtDialog)
 
         # Help > Separator
         self.helpMenu.addSeparator()
@@ -956,13 +963,6 @@ class GuiMainMenu(QMenuBar):
         self.aWebsite = self.helpMenu.addAction(self.tr("The novelWriter Website"))
         self.aWebsite.triggered.connect(lambda: self._openWebsite(nwConst.URL_WEB))
 
-        # Help > Separator
-        self.helpMenu.addSeparator()
-
-        # Document > Check for Updates
-        self.aUpdates = self.helpMenu.addAction(self.tr("Check for New Release"))
-        self.aUpdates.triggered.connect(lambda: self.mainGui.showUpdatesDialog())
-
         return
 
 # END Class GuiMainMenu