Reproog/novelWriter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename the main GUi setFocus function so that it doesn't override the internal one

Browse Source
This commit is contained in:
Veronica K. B. Olsen
2021-03-22 18:35:02 +01:00
parent dbdb3931f4
commit 7dc184f05f
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nw/gui/mainmenu.py
+4 -4
View File
@@ -469,28 +469,28 @@ class GuiMainMenu(QMenuBar):
self.aFocusTree = QAction("Focus Project Tree", self) self.aFocusTree = QAction("Focus Project Tree", self)
self.aFocusTree.setStatusTip("Move focus to project tree") self.aFocusTree.setStatusTip("Move focus to project tree")
self.aFocusTree.setShortcut("Alt+1") 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) self.viewMenu.addAction(self.aFocusTree)
# View > Document Pane 1 # View > Document Pane 1
self.aFocusEditor = QAction("Focus Document Editor", self) self.aFocusEditor = QAction("Focus Document Editor", self)
self.aFocusEditor.setStatusTip("Move focus to left document pane") self.aFocusEditor.setStatusTip("Move focus to left document pane")
self.aFocusEditor.setShortcut("Alt+2") 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) self.viewMenu.addAction(self.aFocusEditor)
# View > Document Pane 2 # View > Document Pane 2
self.aFocusView = QAction("Focus Document Viewer", self) self.aFocusView = QAction("Focus Document Viewer", self)
self.aFocusView.setStatusTip("Move focus to right document pane") self.aFocusView.setStatusTip("Move focus to right document pane")
self.aFocusView.setShortcut("Alt+3") 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) self.viewMenu.addAction(self.aFocusView)
# View > Outline # View > Outline
self.aFocusOutline = QAction("Focus Outline", self) self.aFocusOutline = QAction("Focus Outline", self)
self.aFocusOutline.setStatusTip("Move focus to outline") self.aFocusOutline.setStatusTip("Move focus to outline")
self.aFocusOutline.setShortcut("Alt+4") 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) self.viewMenu.addAction(self.aFocusOutline)
# View > Separator # View > Separator
nw/guimain.py
+2 -2
View File
@@ -1177,7 +1177,7 @@ class GuiMain(QMainWindow):
return True return True
def setFocus(self, paneNo): def switchFocus(self, paneNo):
"""Switch focus between main GUI views. """Switch focus between main GUI views.
""" """
if paneNo == 1: if paneNo == 1:
@@ -1225,7 +1225,7 @@ class GuiMain(QMainWindow):
if self.isFocusMode: if self.isFocusMode:
logger.debug("Activating Focus Mode") logger.debug("Activating Focus Mode")
self.mainTabs.setCurrentWidget(self.splitDocs) self.mainTabs.setCurrentWidget(self.splitDocs)
self.setFocus(2) self.switchFocus(2)
else: else:
logger.debug("Deactivating Focus Mode") logger.debug("Deactivating Focus Mode")