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

novelwriter/guimain.py

@@ -30,41 +30,39 @@ from time import time
 from pathlib import Path
 from datetime import datetime
 
-from PyQt5.QtGui import QCloseEvent, QCursor, QIcon
 from PyQt5.QtCore import Qt, QTimer, pyqtSlot
+from PyQt5.QtGui import QCloseEvent, QCursor, QIcon
 from PyQt5.QtWidgets import (
-    QFileDialog, QHBoxLayout, QMainWindow, QMessageBox, QShortcut, QSplitter,
-    QStackedWidget, QVBoxLayout, QWidget, qApp
+    QApplication, QFileDialog, QHBoxLayout, QMainWindow, QMessageBox, QShortcut, QSplitter,
+    QStackedWidget, QVBoxLayout, QWidget
 )
 
 from novelwriter import CONFIG, SHARED, __hexversion__, __version__
+from novelwriter.common import formatFileFilter, formatVersion, hexToInt
 from novelwriter.constants import nwConst
-from novelwriter.gui.theme import GuiTheme
-from novelwriter.gui.sidebar import GuiSideBar
-from novelwriter.gui.outline import GuiOutlineView
-from novelwriter.gui.mainmenu import GuiMainMenu
-from novelwriter.gui.projtree import GuiProjectView
+from novelwriter.dialogs.about import GuiAbout
+from novelwriter.dialogs.preferences import GuiPreferences
+from novelwriter.dialogs.projectsettings import GuiProjectSettings
+from novelwriter.dialogs.wordlist import GuiWordList
+from novelwriter.enum import nwDocAction, nwDocInsert, nwDocMode, nwItemType, nwWidget, nwView
 from novelwriter.gui.doceditor import GuiDocEditor
 from novelwriter.gui.docviewer import GuiDocViewer
+from novelwriter.gui.docviewerpanel import GuiDocViewerPanel
+from novelwriter.gui.itemdetails import GuiItemDetails
+from novelwriter.gui.mainmenu import GuiMainMenu
 from novelwriter.gui.noveltree import GuiNovelView
+from novelwriter.gui.outline import GuiOutlineView
+from novelwriter.gui.projtree import GuiProjectView
+from novelwriter.gui.search import GuiProjectSearch
+from novelwriter.gui.sidebar import GuiSideBar
 from novelwriter.gui.statusbar import GuiMainStatus
-from novelwriter.gui.itemdetails import GuiItemDetails
-from novelwriter.gui.docviewerpanel import GuiDocViewerPanel
-from novelwriter.dialogs.about import GuiAbout
-from novelwriter.dialogs.wordlist import GuiWordList
-from novelwriter.dialogs.preferences import GuiPreferences
-from novelwriter.dialogs.projectsettings import GuiProjectSettings
-from novelwriter.tools.welcome import GuiWelcome
-from novelwriter.tools.manuscript import GuiManuscript
+from novelwriter.gui.theme import GuiTheme
 from novelwriter.tools.dictionaries import GuiDictionaries
+from novelwriter.tools.manuscript import GuiManuscript
 from novelwriter.tools.noveldetails import GuiNovelDetails
+from novelwriter.tools.welcome import GuiWelcome
 from novelwriter.tools.writingstats import GuiWritingStats
 
-from novelwriter.enum import (
-    nwDocAction, nwDocInsert, nwDocMode, nwItemType, nwWidget, nwView
-)
-from novelwriter.common import formatFileFilter, formatVersion, hexToInt
-
 logger = logging.getLogger(__name__)
 
 
@@ -104,9 +102,6 @@ class GuiMain(QMainWindow):
         # Initialise UserData Instance
         SHARED.initSharedData(self, GuiTheme())
 
-        # Core Settings
-        self.isFocusMode = False
-
         # Prepare Main Window
         self.resize(*CONFIG.mainWinSize)
         self._updateWindowTitle()
@@ -114,7 +109,7 @@ class GuiMain(QMainWindow):
         nwIcon = CONFIG.assetPath("icons") / "novelwriter.svg"
         self.nwIcon = QIcon(str(nwIcon)) if nwIcon.is_file() else QIcon()
         self.setWindowIcon(self.nwIcon)
-        qApp.setWindowIcon(self.nwIcon)
+        QApplication.setWindowIcon(self.nwIcon)
 
         # Build the GUI
         # =============
@@ -126,6 +121,7 @@ class GuiMain(QMainWindow):
         # Main GUI Elements
         self.mainStatus     = GuiMainStatus(self)
         self.projView       = GuiProjectView(self)
+        self.projSearch     = GuiProjectSearch(self)
         self.novelView      = GuiNovelView(self)
         self.docEditor      = GuiDocEditor(self)
         self.docViewer      = GuiDocViewer(self)
@@ -139,6 +135,7 @@ class GuiMain(QMainWindow):
         self.projStack = QStackedWidget(self)
         self.projStack.addWidget(self.projView)
         self.projStack.addWidget(self.novelView)
+        self.projStack.addWidget(self.projSearch)
         self.projStack.currentChanged.connect(self._projStackChanged)
 
         # Project Tree View
@@ -151,28 +148,36 @@ class GuiMain(QMainWindow):
         self.treePane.setLayout(self.treeBox)
 
         # Splitter : Document Viewer / Document Meta
-        self.splitView = QSplitter(Qt.Vertical, self)
+        self.splitView = QSplitter(Qt.Orientation.Vertical, self)
         self.splitView.addWidget(self.docViewer)
         self.splitView.addWidget(self.docViewerPanel)
         self.splitView.setHandleWidth(hWd)
         self.splitView.setOpaqueResize(False)
         self.splitView.setSizes(CONFIG.viewPanePos)
+        self.splitView.setCollapsible(0, False)
+        self.splitView.setCollapsible(1, False)
 
         # Splitter : Document Editor / Document Viewer
-        self.splitDocs = QSplitter(Qt.Horizontal, self)
+        self.splitDocs = QSplitter(Qt.Orientation.Horizontal, self)
         self.splitDocs.addWidget(self.docEditor)
         self.splitDocs.addWidget(self.splitView)
         self.splitDocs.setOpaqueResize(False)
         self.splitDocs.setHandleWidth(hWd)
+        self.splitDocs.setCollapsible(0, False)
+        self.splitDocs.setCollapsible(1, False)
 
         # Splitter : Project Tree / Document Area
-        self.splitMain = QSplitter(Qt.Horizontal)
+        self.splitMain = QSplitter(Qt.Orientation.Horizontal)
         self.splitMain.setContentsMargins(0, 0, 0, 0)
         self.splitMain.addWidget(self.treePane)
         self.splitMain.addWidget(self.splitDocs)
         self.splitMain.setOpaqueResize(False)
         self.splitMain.setHandleWidth(hWd)
         self.splitMain.setSizes(CONFIG.mainPanePos)
+        self.splitMain.setCollapsible(0, False)
+        self.splitMain.setCollapsible(0, False)
+        self.splitMain.setStretchFactor(1, 0)
+        self.splitMain.setStretchFactor(1, 1)
 
         # Main Stack : Editor / Outline
         self.mainStack = QStackedWidget(self)
@@ -180,31 +185,6 @@ class GuiMain(QMainWindow):
         self.mainStack.addWidget(self.outlineView)
         self.mainStack.currentChanged.connect(self._mainStackChanged)
 
-        # Indices of Splitter Widgets
-        self.idxTree         = self.splitMain.indexOf(self.treePane)
-        self.idxMain         = self.splitMain.indexOf(self.splitDocs)
-        self.idxEditor       = self.splitDocs.indexOf(self.docEditor)
-        self.idxViewer       = self.splitDocs.indexOf(self.splitView)
-        self.idxViewDoc      = self.splitView.indexOf(self.docViewer)
-        self.idxViewDocPanel = self.splitView.indexOf(self.docViewerPanel)
-
-        # Indices of Stack Widgets
-        self.idxEditorView  = self.mainStack.indexOf(self.splitMain)
-        self.idxOutlineView = self.mainStack.indexOf(self.outlineView)
-        self.idxProjView    = self.projStack.indexOf(self.projView)
-        self.idxNovelView   = self.projStack.indexOf(self.novelView)
-
-        # Splitter Behaviour
-        self.splitMain.setCollapsible(self.idxTree, False)
-        self.splitMain.setCollapsible(self.idxMain, False)
-        self.splitDocs.setCollapsible(self.idxEditor, False)
-        self.splitDocs.setCollapsible(self.idxViewer, False)
-        self.splitView.setCollapsible(self.idxViewDoc, False)
-        self.splitView.setCollapsible(self.idxViewDocPanel, False)
-
-        self.splitMain.setStretchFactor(self.idxTree, 0)
-        self.splitMain.setStretchFactor(self.idxMain, 1)
-
         # Editor / Viewer Default State
         self.splitView.setVisible(False)
         self.docEditor.closeSearch()
@@ -225,7 +205,7 @@ class GuiMain(QMainWindow):
         self.setMenuBar(self.mainMenu)
         self.setCentralWidget(self.mainWidget)
         self.setStatusBar(self.mainStatus)
-        self.setContextMenuPolicy(Qt.NoContextMenu)  # Issue #1147
+        self.setContextMenuPolicy(Qt.ContextMenuPolicy.NoContextMenu)  # Issue #1147
 
         # Connect Signals
         # ===============
@@ -233,20 +213,23 @@ class GuiMain(QMainWindow):
         SHARED.projectStatusChanged.connect(self.mainStatus.updateProjectStatus)
         SHARED.projectStatusMessage.connect(self.mainStatus.setStatusMessage)
         SHARED.spellLanguageChanged.connect(self.mainStatus.setLanguage)
+        SHARED.focusModeChanged.connect(self._focusModeChanged)
         SHARED.indexChangedTags.connect(self.docViewerPanel.updateChangedTags)
         SHARED.indexScannedText.connect(self.docViewerPanel.projectItemChanged)
         SHARED.indexScannedText.connect(self.projView.updateItemValues)
         SHARED.indexScannedText.connect(self.itemDetails.updateViewBox)
         SHARED.indexCleared.connect(self.docViewerPanel.indexWasCleared)
         SHARED.indexAvailable.connect(self.docViewerPanel.indexHasAppeared)
+        SHARED.mainClockTick.connect(self._timeTick)
 
         self.mainMenu.requestDocAction.connect(self._passDocumentAction)
         self.mainMenu.requestDocInsert.connect(self._passDocumentInsert)
         self.mainMenu.requestDocInsertText.connect(self._passDocumentInsert)
         self.mainMenu.requestDocKeyWordInsert.connect(self.docEditor.insertKeyWord)
         self.mainMenu.requestFocusChange.connect(self.switchFocus)
+        self.mainMenu.requestViewChange.connect(self._changeView)
 
-        self.sideBar.viewChangeRequested.connect(self._changeView)
+        self.sideBar.requestViewChange.connect(self._changeView)
 
         self.projView.selectedItemChanged.connect(self.itemDetails.updateViewBox)
         self.projView.openDocumentRequest.connect(self._openDocument)
@@ -263,6 +246,9 @@ class GuiMain(QMainWindow):
         self.novelView.selectedItemChanged.connect(self.itemDetails.updateViewBox)
         self.novelView.openDocumentRequest.connect(self._openDocument)
 
+        self.projSearch.openDocumentSelectRequest.connect(self._openDocumentSelection)
+        self.projSearch.selectedItemChanged.connect(self.itemDetails.updateViewBox)
+
         self.docEditor.editedStatusChanged.connect(self.mainStatus.updateDocumentStatus)
         self.docEditor.docCountsChanged.connect(self.itemDetails.updateCounts)
         self.docEditor.docCountsChanged.connect(self.projView.updateCounts)
@@ -275,9 +261,13 @@ class GuiMain(QMainWindow):
         self.docEditor.toggleFocusModeRequest.connect(self.toggleFocusMode)
         self.docEditor.requestProjectItemSelected.connect(self.projView.setSelectedHandle)
         self.docEditor.requestProjectItemRenamed.connect(self.projView.renameTreeItem)
+        self.docEditor.requestNewNoteCreation.connect(self.projView.createNewNote)
+        self.docEditor.docTextChanged.connect(self.projSearch.textChanged)
 
         self.docViewer.documentLoaded.connect(self.docViewerPanel.updateHandle)
         self.docViewer.loadDocumentTagRequest.connect(self._followTag)
+        self.docViewer.closeDocumentRequest.connect(self.closeDocViewer)
+        self.docViewer.reloadDocumentRequest.connect(self._reloadViewer)
         self.docViewer.togglePanelVisibility.connect(self._toggleViewerPanelVisibility)
         self.docViewer.requestProjectItemSelected.connect(self.projView.setSelectedHandle)
 
@@ -298,12 +288,6 @@ class GuiMain(QMainWindow):
         self.asDocTimer = QTimer(self)
         self.asDocTimer.timeout.connect(self._autoSaveDocument)
 
-        # Main Clock
-        self.mainTimer = QTimer(self)
-        self.mainTimer.setInterval(1000)
-        self.mainTimer.timeout.connect(self._timeTick)
-        self.mainTimer.start()
-
         # Shortcuts and Actions
         self._connectMenuActions()
 
@@ -344,7 +328,7 @@ class GuiMain(QMainWindow):
     def postLaunchTasks(self, cmdOpen: str | None) -> None:
         """Process tasks after the main window has been created."""
         if cmdOpen:
-            qApp.processEvents()
+            QApplication.processEvents()
             logger.info("Command line path: %s", cmdOpen)
             self.openProject(cmdOpen)
 
@@ -355,8 +339,8 @@ class GuiMain(QMainWindow):
         if hexToInt(CONFIG.lastNotes) < hexToInt(__hexversion__):
             CONFIG.lastNotes = __hexversion__
             trVersion = self.tr(
-                "You are now running novelWriter version {0}.".format(formatVersion(__version__))
-            )
+                "You are now running novelWriter version {0}."
+            ).format(formatVersion(__version__))
             trRelease = self.tr(
                 "Please check the {0}release notes{1} for further details."
             ).format(f"<a href='{nwConst.URL_RELEASES}'>", "</a>")
@@ -401,12 +385,13 @@ class GuiMain(QMainWindow):
         if saveOK:
             self.closeDocument()
             self.docViewer.clearNavHistory()
-            self.closeDocViewer(byUser=False)
+            self.closeViewerPanel(byUser=False)
 
             self.docViewerPanel.closeProjectTasks()
             self.outlineView.closeProjectTasks()
             self.novelView.closeProjectTasks()
             self.projView.closeProjectTasks()
+            self.projSearch.closeProjectTasks()
             self.itemDetails.clearDetails()
             self.mainStatus.clearStatus()
 
@@ -457,7 +442,7 @@ class GuiMain(QMainWindow):
                     "'{0}' ({1} {2}), last active on {3}."
                 ).format(
                     lockStatus[0], lockStatus[1], lockStatus[2],
-                    datetime.fromtimestamp(int(lockStatus[3])).strftime("%x %X")
+                    CONFIG.localDateTime(datetime.fromtimestamp(int(lockStatus[3])))
                 )
             except Exception:
                 lockDetails = ""
@@ -489,12 +474,12 @@ class GuiMain(QMainWindow):
                     break
 
         if lastEdited is not None:
-            qApp.processEvents()
+            QApplication.processEvents()
             self.openDocument(lastEdited, doScroll=True)
 
         lastViewed = SHARED.project.data.getLastHandle("viewer")
         if lastViewed is not None:
-            qApp.processEvents()
+            QApplication.processEvents()
             self.viewDocument(lastViewed)
 
         # Check if we need to rebuild the index
@@ -503,7 +488,7 @@ class GuiMain(QMainWindow):
             self.rebuildIndex()
 
         # Make sure the changed status is set to false on things opened
-        qApp.processEvents()
+        QApplication.processEvents()
         self.docEditor.setDocumentChanged(False)
         SHARED.project.setProjectChanged(False)
 
@@ -523,24 +508,19 @@ class GuiMain(QMainWindow):
     #  Document Actions
     ##
 
-    def closeDocument(self, beforeOpen: bool = False) -> bool:
+    def closeDocument(self, beforeOpen: bool = False) -> None:
         """Close the document and clear the editor and title field."""
-        if not SHARED.hasProject:
-            logger.error("No project open")
-            return False
-
-        # Disable focus mode if it is active
-        if self.isFocusMode:
-            self.toggleFocusMode()
-
-        self.docEditor.saveCursorPosition()
-        if self.docEditor.docChanged:
-            self.saveDocument()
-        self.docEditor.clearEditor()
-        if not beforeOpen:
-            self.novelView.setActiveHandle(None)
-
-        return True
+        if SHARED.hasProject:
+            # Disable focus mode if it is active
+            if SHARED.focusMode:
+                SHARED.setFocusMode(False)
+            self.docEditor.saveCursorPosition()
+            if self.docEditor.docChanged:
+                self.saveDocument()
+            self.docEditor.clearEditor()
+            if not beforeOpen:
+                self.novelView.setActiveHandle(None)
+        return
 
     def openDocument(self, tHandle: str | None, tLine: int | None = None,
                      changeFocus: bool = True, doScroll: bool = False) -> bool:
@@ -604,13 +584,12 @@ class GuiMain(QMainWindow):
 
         return False
 
-    def saveDocument(self) -> bool:
+    @pyqtSlot()
+    def saveDocument(self) -> None:
         """Save the current documents."""
-        if not SHARED.hasProject:
-            logger.error("No project open")
-            return False
-        self.docEditor.saveText()
-        return True
+        if SHARED.hasProject:
+            self.docEditor.saveText()
+        return
 
     def viewDocument(self, tHandle: str | None = None, sTitle: str | None = None) -> bool:
         """Load a document for viewing in the view panel."""
@@ -640,7 +619,8 @@ class GuiMain(QMainWindow):
         self._changeView(nwView.EDITOR)
 
         logger.debug("Viewing document with handle '%s'", tHandle)
-        if self.docViewer.loadText(tHandle):
+        updateHistory = tHandle != self.docViewer.docHandle
+        if self.docViewer.loadText(tHandle, updateHistory=updateHistory):
             if not self.splitView.isVisible():
                 cursorVisible = self.docEditor.cursorIsVisible()
                 bPos = self.splitMain.sizes()
@@ -657,7 +637,7 @@ class GuiMain(QMainWindow):
                     self.docEditor.ensureCursorVisibleNoCentre()
 
             if sTitle:
-                self.docViewer.navigateTo(f"#{sTitle}")
+                self.docViewer.navigateTo(f"#{tHandle}:{sTitle}")
 
         return True
 
@@ -713,80 +693,71 @@ class GuiMain(QMainWindow):
     #  Tree Item Actions
     ##
 
-    def openSelectedItem(self) -> bool:
+    @pyqtSlot()
+    def openSelectedItem(self) -> None:
         """Open the selected item from the tree that is currently
         active. It is not checked that the item is actually a document.
         That should be handled by the openDocument function.
         """
-        if not SHARED.hasProject:
-            logger.error("No project open")
-            return False
-
-        tHandle = None
-        sTitle = None
-        tLine = None
-        if self.projView.treeHasFocus():
-            tHandle = self.projView.getSelectedHandle()
-        elif self.novelView.treeHasFocus():
-            tHandle, sTitle = self.novelView.getSelectedHandle()
-        elif self.outlineView.treeHasFocus():
-            tHandle, sTitle = self.outlineView.getSelectedHandle()
-        else:
-            logger.warning("No item selected")
-            return False
-
-        if tHandle is not None and sTitle is not None:
-            hItem = SHARED.project.index.getItemHeader(tHandle, sTitle)
-            if hItem is not None:
-                tLine = hItem.line
+        if SHARED.hasProject:
+            tHandle = None
+            sTitle = None
+            tLine = None
+            if self.projView.treeHasFocus():
+                tHandle = self.projView.getSelectedHandle()
+            elif self.novelView.treeHasFocus():
+                tHandle, sTitle = self.novelView.getSelectedHandle()
+            elif self.outlineView.treeHasFocus():
+                tHandle, sTitle = self.outlineView.getSelectedHandle()
+            else:
+                logger.warning("No item selected")
+                return
 
-        if tHandle is not None:
-            self.openDocument(tHandle, tLine=tLine, changeFocus=False, doScroll=False)
+            if tHandle and sTitle:
+                if hItem := SHARED.project.index.getItemHeading(tHandle, sTitle):
+                    tLine = hItem.line
+            if tHandle:
+                self.openDocument(tHandle, tLine=tLine, changeFocus=False, doScroll=False)
 
-        return True
+        return
 
-    def editItemLabel(self, tHandle: str | None = None) -> bool:
+    def editItemLabel(self, tHandle: str | None = None) -> None:
         """Open the edit item dialog."""
-        if not SHARED.hasProject:
-            logger.error("No project open")
-            return False
-        if tHandle is None and (self.docEditor.anyFocus() or self.isFocusMode):
-            tHandle = self.docEditor.docHandle
-        self.projView.renameTreeItem(tHandle)
-        return True
+        if SHARED.hasProject:
+            if tHandle is None and (self.docEditor.anyFocus() or SHARED.focusMode):
+                tHandle = self.docEditor.docHandle
+            self.projView.renameTreeItem(tHandle)
+        return
 
     def rebuildTrees(self) -> None:
         """Rebuild the project tree."""
         self.projView.populateTree()
         return
 
-    def rebuildIndex(self, beQuiet: bool = False) -> bool:
+    def rebuildIndex(self, beQuiet: bool = False) -> None:
         """Rebuild the entire index."""
-        if not SHARED.hasProject:
-            logger.error("No project open")
-            return False
-
-        logger.info("Rebuilding index ...")
-        qApp.setOverrideCursor(QCursor(Qt.WaitCursor))
-        tStart = time()
+        if SHARED.hasProject:
+            logger.info("Rebuilding index ...")
+            QApplication.setOverrideCursor(QCursor(Qt.CursorShape.WaitCursor))
+            tStart = time()
 
-        self.projView.saveProjectTasks()
-        SHARED.project.index.rebuildIndex()
-        self.projView.populateTree()
-        self.novelView.refreshTree()
+            self.projView.saveProjectTasks()
+            SHARED.project.index.rebuildIndex()
+            self.projView.populateTree()
+            self.novelView.refreshTree()
 
-        tEnd = time()
-        self.mainStatus.setStatusMessage(
-            self.tr("Indexing completed in {0} ms").format(f"{(tEnd - tStart)*1000.0:.1f}")
-        )
-        self.docEditor.updateTagHighLighting()
-        self._updateStatusWordCount()
-        qApp.restoreOverrideCursor()
+            tEnd = time()
+            self.mainStatus.setStatusMessage(
+                self.tr("Indexing completed in {0} ms").format(f"{(tEnd - tStart)*1000.0:.1f}")
+            )
+            self.docEditor.updateTagHighLighting()
+            self._updateStatusWordCount()
+            QApplication.restoreOverrideCursor()
 
-        if not beQuiet:
-            SHARED.info(self.tr("The project index has been successfully rebuilt."))
+            if not beQuiet:
+                SHARED.info(self.tr("The project index has been successfully rebuilt."))
 
-        return True
+        return
 
     ##
     #  Main Dialogs
@@ -796,8 +767,8 @@ class GuiMain(QMainWindow):
     def showWelcomeDialog(self) -> None:
         """Open the welcome dialog."""
         dialog = GuiWelcome(self)
-        dialog.openProjectRequest.connect(self._openProject)
-        dialog.exec_()
+        dialog.openProjectRequest.connect(self._openProjectFromWelcome)
+        dialog.exec()
         return
 
     @pyqtSlot()
@@ -805,7 +776,7 @@ class GuiMain(QMainWindow):
         """Open the preferences dialog."""
         dialog = GuiPreferences(self)
         dialog.newPreferencesReady.connect(self._processConfigChanges)
-        dialog.exec_()
+        dialog.exec()
         return
 
     @pyqtSlot()
@@ -815,7 +786,7 @@ class GuiMain(QMainWindow):
         if SHARED.hasProject:
             dialog = GuiProjectSettings(self, gotoPage=focusTab)
             dialog.newProjectSettingsReady.connect(self._processProjectSettingsChanges)
-            dialog.exec_()
+            dialog.exec()
         return
 
     @pyqtSlot()
@@ -826,7 +797,7 @@ class GuiMain(QMainWindow):
             dialog.setModal(True)
             dialog.show()
             dialog.raise_()
-            qApp.processEvents()
+            QApplication.processEvents()
             dialog.updateValues()
         return
 
@@ -839,7 +810,7 @@ class GuiMain(QMainWindow):
             dialog.setModal(False)
             dialog.show()
             dialog.raise_()
-            qApp.processEvents()
+            QApplication.processEvents()
             dialog.loadContent()
         return
 
@@ -849,7 +820,7 @@ class GuiMain(QMainWindow):
         if SHARED.hasProject:
             dialog = GuiWordList(self)
             dialog.newWordListReady.connect(self._processWordListChanges)
-            dialog.exec_()
+            dialog.exec()
         return
 
     @pyqtSlot()
@@ -861,7 +832,7 @@ class GuiMain(QMainWindow):
             dialog.setModal(False)
             dialog.show()
             dialog.raise_()
-            qApp.processEvents()
+            QApplication.processEvents()
             dialog.populateGUI()
         return
 
@@ -872,7 +843,7 @@ class GuiMain(QMainWindow):
         dialog.setModal(True)
         dialog.show()
         dialog.raise_()
-        qApp.processEvents()
+        QApplication.processEvents()
         dialog.populateGUI()
         return
 
@@ -890,21 +861,20 @@ class GuiMain(QMainWindow):
         dialog.setModal(True)
         dialog.show()
         dialog.raise_()
-        qApp.processEvents()
+        QApplication.processEvents()
         if not dialog.initDialog():
             dialog.close()
             SHARED.error(self.tr("Could not initialise the dialog."))
         return
 
-    def reportConfErr(self) -> bool:
+    def reportConfErr(self) -> None:
         """Checks if the Config module has any errors to report, and let
         the user know if this is the case. The Config module caches
         errors since it is initialised before the GUI itself.
         """
         if CONFIG.hasError:
             SHARED.error(CONFIG.errorText())
-            return True
-        return False
+        return
 
     ##
     #  Main Window Actions
@@ -922,14 +892,15 @@ class GuiMain(QMainWindow):
 
         logger.info("Exiting novelWriter")
 
-        if not self.isFocusMode:
+        if not SHARED.focusMode:
             CONFIG.setMainPanePos(self.splitMain.sizes())
             CONFIG.setOutlinePanePos(self.outlineView.splitSizes())
             if self.docViewerPanel.isVisible():
                 CONFIG.setViewPanePos(self.splitView.sizes())
 
         CONFIG.showViewerPanel = self.docViewerPanel.isVisible()
-        if self.windowState() & Qt.WindowFullScreen != Qt.WindowFullScreen:
+        wFull = Qt.WindowState.WindowFullScreen
+        if self.windowState() & wFull != wFull:
             # Ignore window size if in full screen mode
             CONFIG.setMainWinSize(self.width(), self.height())
 
@@ -939,11 +910,11 @@ class GuiMain(QMainWindow):
         CONFIG.saveConfig()
         self.reportConfErr()
 
-        qApp.quit()
+        QApplication.quit()
 
         return True
 
-    def closeDocViewer(self, byUser: bool = True) -> bool:
+    def closeViewerPanel(self, byUser: bool = True) -> bool:
         """Close the document view panel."""
         self.docViewer.clearViewer()
         if byUser:
@@ -966,14 +937,14 @@ class GuiMain(QMainWindow):
 
     def toggleFullScreenMode(self) -> None:
         """Toggle full screen mode"""
-        self.setWindowState(self.windowState() ^ Qt.WindowFullScreen)
+        self.setWindowState(self.windowState() ^ Qt.WindowState.WindowFullScreen)
         return
 
     ##
     #  Events
     ##
 
-    def closeEvent(self, event: QCloseEvent):
+    def closeEvent(self, event: QCloseEvent) -> None:
         """Capture the closing event of the GUI and call the close
         function to handle all the close process steps.
         """
@@ -991,32 +962,40 @@ class GuiMain(QMainWindow):
         SHARED.project.data.setLastHandle(None, "editor")
         return
 
+    @pyqtSlot()
+    def closeDocViewer(self) -> None:
+        """Close the document viewer."""
+        self.closeViewerPanel()
+        SHARED.project.data.setLastHandle(None, "viewer")
+        return
+
     @pyqtSlot()
     def toggleFocusMode(self) -> None:
-        """Handle toggle focus mode. The Main GUI Focus Mode hides tree,
+        """Toggle focus mode."""
+        if self.docEditor.docHandle:
+            SHARED.setFocusMode(not SHARED.focusMode)
+        return
+
+    @pyqtSlot(bool)
+    def _focusModeChanged(self, focusMode: bool) -> None:
+        """Handle change of focus mode. The Main GUI Focus Mode hides tree,
         view, statusbar and menu.
         """
-        if self.docEditor.docHandle is None:
-            logger.error("No document open, so not activating Focus Mode")
-            return
-
-        self.isFocusMode = not self.isFocusMode
-        if self.isFocusMode:
+        if focusMode:
             logger.debug("Activating Focus Mode")
             self.switchFocus(nwWidget.EDITOR)
         else:
             logger.debug("Deactivating Focus Mode")
 
         cursorVisible = self.docEditor.cursorIsVisible()
-        isVisible = not self.isFocusMode
+        isVisible = not focusMode
         self.treePane.setVisible(isVisible)
         self.mainStatus.setVisible(isVisible)
         self.mainMenu.setVisible(isVisible)
         self.sideBar.setVisible(isVisible)
 
-        hideDocFooter = self.isFocusMode and CONFIG.hideFocusFooter
+        hideDocFooter = focusMode and CONFIG.hideFocusFooter
         self.docEditor.docFooter.setVisible(not hideDocFooter)
-        self.docEditor.docHeader.updateFocusMode()
 
         if self.splitView.isVisible():
             self.splitView.setVisible(False)
@@ -1025,7 +1004,6 @@ class GuiMain(QMainWindow):
 
         if cursorVisible:
             self.docEditor.ensureCursorVisibleNoCentre()
-
         return
 
     @pyqtSlot(nwWidget)
@@ -1038,12 +1016,15 @@ class GuiMain(QMainWindow):
                     self.novelView.setTreeFocus()
                 else:
                     self.projView.setTreeFocus()
-            else:
+            elif self.projStack.currentWidget() is self.novelView:
                 if self.novelView.treeHasFocus():
                     self._changeView(nwView.PROJECT)
                     self.projView.setTreeFocus()
                 else:
                     self.novelView.setTreeFocus()
+            else:
+                self._changeView(nwView.PROJECT)
+                self.projView.setTreeFocus()
         elif paneNo == nwWidget.EDITOR:
             self._changeView(nwView.EDITOR)
             self.docEditor.setFocus()
@@ -1076,7 +1057,7 @@ class GuiMain(QMainWindow):
 
         if theme:
             # We are doing this manually instead of connecting to
-            # qApp.paletteChanged since the processing order matters
+            # paletteChanged since the processing order matters
             SHARED.theme.loadTheme()
             self.docEditor.updateTheme()
             self.docViewer.updateTheme()
@@ -1084,6 +1065,7 @@ class GuiMain(QMainWindow):
             self.sideBar.updateTheme()
             self.projView.updateTheme()
             self.novelView.updateTheme()
+            self.projSearch.updateTheme()
             self.outlineView.updateTheme()
             self.itemDetails.updateTheme()
             self.mainStatus.updateTheme()
@@ -1132,10 +1114,12 @@ class GuiMain(QMainWindow):
         return
 
     @pyqtSlot(Path)
-    def _openProject(self, path: Path) -> None:
-        """Handle an open project request."""
-        qApp.processEvents()
+    def _openProjectFromWelcome(self, path: Path) -> None:
+        """Handle an open project request from the welcome dialog."""
+        QApplication.processEvents()
         self.openProject(path)
+        if not SHARED.hasProject:
+            self.showWelcomeDialog()
         return
 
     @pyqtSlot(str, nwDocMode, str, bool)
@@ -1144,7 +1128,7 @@ class GuiMain(QMainWindow):
         if tHandle is not None:
             if mode == nwDocMode.EDIT:
                 tLine = None
-                hItem = SHARED.project.index.getItemHeader(tHandle, sTitle)
+                hItem = SHARED.project.index.getItemHeading(tHandle, sTitle)
                 if hItem is not None:
                     tLine = hItem.line
                 self.openDocument(tHandle, tLine=tLine, changeFocus=setFocus)
@@ -1152,6 +1136,24 @@ class GuiMain(QMainWindow):
                 self.viewDocument(tHandle=tHandle, sTitle=sTitle)
         return
 
+    @pyqtSlot(str, int, int, bool)
+    def _openDocumentSelection(
+        self, tHandle: str, selStart: int, selLength: int, changeFocus: bool
+    ) -> None:
+        """Open a document and select a section of the text."""
+        if self.openDocument(tHandle, changeFocus=changeFocus):
+            self.docEditor.setCursorSelection(selStart, selLength)
+        return
+
+    @pyqtSlot()
+    def _reloadViewer(self) -> None:
+        """Reload the document in the viewer."""
+        if self.docEditor.docChanged and self.docEditor.docHandle == self.docViewer.docHandle:
+            # If the two panels have the same document, save any changes in the editor
+            self.saveDocument()
+        self.docViewer.reloadText()
+        return
+
     @pyqtSlot(nwView)
     def _changeView(self, view: nwView) -> None:
         """Handle the requested change of view from the GuiViewBar."""
@@ -1164,6 +1166,12 @@ class GuiMain(QMainWindow):
         elif view == nwView.NOVEL:
             self.mainStack.setCurrentWidget(self.splitMain)
             self.projStack.setCurrentWidget(self.novelView)
+        elif view == nwView.SEARCH:
+            self.mainStack.setCurrentWidget(self.splitMain)
+            self.projStack.setCurrentWidget(self.projSearch)
+            self.projSearch.beginSearch(
+                self.docEditor.getSelectedText() if self.docEditor.anyFocus() else ""
+            )
         elif view == nwView.OUTLINE:
             self.mainStack.setCurrentWidget(self.outlineView)
         return
@@ -1193,7 +1201,7 @@ class GuiMain(QMainWindow):
         return
 
     @pyqtSlot()
-    def _toggleViewerPanelVisibility(self):
+    def _toggleViewerPanelVisibility(self) -> None:
         """Toggle the visibility of the document viewer panel."""
         CONFIG.showViewerPanel = not CONFIG.showViewerPanel
         self.docViewerPanel.setVisible(CONFIG.showViewerPanel)
@@ -1202,16 +1210,15 @@ class GuiMain(QMainWindow):
     @pyqtSlot()
     def _timeTick(self) -> None:
         """Process time tick of the main timer."""
-        if not SHARED.hasProject:
-            return
-        currTime = time()
-        editIdle = currTime - self.docEditor.lastActive > CONFIG.userIdleTime
-        userIdle = qApp.applicationState() != Qt.ApplicationActive
-        self.mainStatus.setUserIdle(editIdle or userIdle)
-        SHARED.updateIdleTime(currTime, editIdle or userIdle)
-        self.mainStatus.updateTime(idleTime=SHARED.projectIdleTime)
-        if CONFIG.memInfo and int(currTime) % 5 == 0:  # pragma: no cover
-            self.mainStatus.memInfo()
+        if SHARED.hasProject:
+            currTime = time()
+            editIdle = currTime - self.docEditor.lastActive > CONFIG.userIdleTime
+            userIdle = QApplication.applicationState() != Qt.ApplicationState.ApplicationActive
+            self.mainStatus.setUserIdle(editIdle or userIdle)
+            SHARED.updateIdleTime(currTime, editIdle or userIdle)
+            self.mainStatus.updateTime(idleTime=SHARED.projectIdleTime)
+            if CONFIG.memInfo and int(currTime) % 5 == 0:  # pragma: no cover
+                self.mainStatus.memInfo()
         return
 
     @pyqtSlot()
@@ -1253,25 +1260,26 @@ class GuiMain(QMainWindow):
 
     @pyqtSlot()
     def _keyPressReturn(self) -> None:
-        """Forward the return/enter keypress to the function that opens
-        the currently selected item.
-        """
-        self.openSelectedItem()
+        """Process a return or enter keypress in the main window."""
+        if self.projStack.currentWidget() == self.projSearch:
+            self.projSearch.processReturn()
+        else:
+            self.openSelectedItem()
         return
 
     @pyqtSlot()
     def _keyPressEscape(self) -> None:
-        """Process escape keypress in the main window."""
-        if self.docEditor.docSearch.isVisible():
+        """Process an escape keypress in the main window."""
+        if self.docEditor.searchVisible():
             self.docEditor.closeSearch()
-        elif self.isFocusMode:
-            self.toggleFocusMode()
+        elif SHARED.focusMode:
+            SHARED.setFocusMode(False)
         return
 
     @pyqtSlot(int)
     def _mainStackChanged(self, index: int) -> None:
         """Process main window tab change."""
-        if index == self.idxOutlineView:
+        if self.mainStack.widget(index) == self.outlineView:
             if SHARED.hasProject:
                 self.outlineView.refreshTree()
         return
@@ -1280,9 +1288,10 @@ class GuiMain(QMainWindow):
     def _projStackChanged(self, index: int) -> None:
         """Process project view tab change."""
         sHandle = None
-        if index == self.idxProjView:
+        widget = self.projStack.widget(index)
+        if widget == self.projView:
             sHandle = self.projView.getSelectedHandle()
-        elif index == self.idxNovelView:
+        elif widget == self.novelView:
             sHandle, _ = self.novelView.getSelectedHandle()
         self.itemDetails.updateViewBox(sHandle)
         return