From 7dc184f05f2f2641bb0255fd5cd9b69a4a192f7f Mon Sep 17 00:00:00 2001
From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com>
Date: Mon, 22 Mar 2021 18:35:02 +0100
Subject: [PATCH] Rename the main GUi setFocus function so that it doesn't
 override the internal one

---
 nw/gui/mainmenu.py | 8 ++++----
 nw/guimain.py      | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/nw/gui/mainmenu.py b/nw/gui/mainmenu.py
index 1673387c..40b3fcff 100644
--- a/nw/gui/mainmenu.py
+++ b/nw/gui/mainmenu.py
@@ -469,28 +469,28 @@ class GuiMainMenu(QMenuBar):
         self.aFocusTree = QAction("Focus Project Tree", self)
         self.aFocusTree.setStatusTip("Move focus to project tree")
         self.aFocusTree.setShortcut("Alt+1")
-        self.aFocusTree.triggered.connect(lambda: self.theParent.setFocus(1))
+        self.aFocusTree.triggered.connect(lambda: self.theParent.switchFocus(1))
         self.viewMenu.addAction(self.aFocusTree)
 
         # View > Document Pane 1
         self.aFocusEditor = QAction("Focus Document Editor", self)
         self.aFocusEditor.setStatusTip("Move focus to left document pane")
         self.aFocusEditor.setShortcut("Alt+2")
-        self.aFocusEditor.triggered.connect(lambda: self.theParent.setFocus(2))
+        self.aFocusEditor.triggered.connect(lambda: self.theParent.switchFocus(2))
         self.viewMenu.addAction(self.aFocusEditor)
 
         # View > Document Pane 2
         self.aFocusView = QAction("Focus Document Viewer", self)
         self.aFocusView.setStatusTip("Move focus to right document pane")
         self.aFocusView.setShortcut("Alt+3")
-        self.aFocusView.triggered.connect(lambda: self.theParent.setFocus(3))
+        self.aFocusView.triggered.connect(lambda: self.theParent.switchFocus(3))
         self.viewMenu.addAction(self.aFocusView)
 
         # View > Outline
         self.aFocusOutline = QAction("Focus Outline", self)
         self.aFocusOutline.setStatusTip("Move focus to outline")
         self.aFocusOutline.setShortcut("Alt+4")
-        self.aFocusOutline.triggered.connect(lambda: self.theParent.setFocus(4))
+        self.aFocusOutline.triggered.connect(lambda: self.theParent.switchFocus(4))
         self.viewMenu.addAction(self.aFocusOutline)
 
         # View > Separator
diff --git a/nw/guimain.py b/nw/guimain.py
index b3c7b25e..4edd38d7 100644
--- a/nw/guimain.py
+++ b/nw/guimain.py
@@ -1177,7 +1177,7 @@ class GuiMain(QMainWindow):
 
         return True
 
-    def setFocus(self, paneNo):
+    def switchFocus(self, paneNo):
         """Switch focus between main GUI views.
         """
         if paneNo == 1:
@@ -1225,7 +1225,7 @@ class GuiMain(QMainWindow):
         if self.isFocusMode:
             logger.debug("Activating Focus Mode")
             self.mainTabs.setCurrentWidget(self.splitDocs)
-            self.setFocus(2)
+            self.switchFocus(2)
         else:
             logger.debug("Deactivating Focus Mode")