Merge branch 'main' into testing

nw/guimain.py

@@ -46,7 +46,7 @@ from nw.gui import (
     GuiProjectTree, GuiProjectWizard, GuiTheme, GuiWordList, GuiWritingStats
 )
 from nw.core import NWProject, NWDoc, NWIndex
-from nw.constants import nwItemType, nwItemClass, nwAlert, nwLists
+from nw.constants import nwItemType, nwItemClass, nwAlert, nwLists, nwWidget
 from nw.common import getGuiItem, hexToInt
 
 logger = logging.getLogger(__name__)
@@ -567,6 +567,10 @@ class GuiMain(QMainWindow):
             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()
@@ -813,10 +817,10 @@ class GuiMain(QMainWindow):
             return False
 
         if tHandle is None:
-            if self.treeView.hasFocus():
-                tHandle = self.treeView.getSelectedHandle()
-            elif self.docEditor.hasFocus():
+            if self.docEditor.anyFocus() or self.isFocusMode:
                 tHandle = self.docEditor.theHandle
+            else:
+                tHandle = self.treeView.getSelectedHandle()
 
         if tHandle is None:
             logger.warning("No item selected")
@@ -1176,18 +1180,18 @@ class GuiMain(QMainWindow):
 
         return True
 
-    def setFocus(self, paneNo):
+    def switchFocus(self, paneNo):
         """Switch focus between main GUI views.
         """
-        if paneNo == 1:
+        if paneNo == nwWidget.TREE:
             self.treeView.setFocus()
-        elif paneNo == 2:
+        elif paneNo == nwWidget.EDITOR:
             self.mainTabs.setCurrentWidget(self.splitDocs)
             self.docEditor.setFocus()
-        elif paneNo == 3:
+        elif paneNo == nwWidget.VIEWER:
             self.mainTabs.setCurrentWidget(self.splitDocs)
             self.docViewer.setFocus()
-        elif paneNo == 4:
+        elif paneNo == nwWidget.OUTLINE:
             self.mainTabs.setCurrentWidget(self.splitOutline)
             self.projView.setFocus()
         return
@@ -1224,6 +1228,7 @@ class GuiMain(QMainWindow):
         if self.isFocusMode:
             logger.debug("Activating Focus Mode")
             self.mainTabs.setCurrentWidget(self.splitDocs)
+            self.switchFocus(nwWidget.EDITOR)
         else:
             logger.debug("Deactivating Focus Mode")
 
@@ -1235,6 +1240,7 @@ class GuiMain(QMainWindow):
 
         hideDocFooter = self.isFocusMode and self.mainConf.hideFocusFooter
         self.docEditor.docFooter.setVisible(not hideDocFooter)
+        self.docEditor.docHeader.updateFocusMode()
 
         if self.splitView.isVisible():
             self.splitView.setVisible(False)
@@ -1272,11 +1278,12 @@ class GuiMain(QMainWindow):
         """
         # Project
         self.addAction(self.mainMenu.aSaveProject)
+        self.addAction(self.mainMenu.aEditItem)
         self.addAction(self.mainMenu.aExitNW)
 
         # Document
         self.addAction(self.mainMenu.aSaveDoc)
-        self.addAction(self.mainMenu.aFileDetails)
+        self.addAction(self.mainMenu.aCloseDoc)
 
         # Edit
         self.addAction(self.mainMenu.aEditUndo)
@@ -1320,6 +1327,13 @@ class GuiMain(QMainWindow):
         for mAction, _ in self.mainMenu.mInsKWItems.values():
             self.addAction(mAction)
 
+        # Search
+        self.addAction(self.mainMenu.aFind)
+        self.addAction(self.mainMenu.aReplace)
+        self.addAction(self.mainMenu.aFindNext)
+        self.addAction(self.mainMenu.aFindPrev)
+        self.addAction(self.mainMenu.aReplaceNext)
+
         # Format
         self.addAction(self.mainMenu.aFmtEmph)
         self.addAction(self.mainMenu.aFmtStrong)