novelWriter 2.5rc1__py3-none-any.whl → 2.5.1__py3-none-any.whl

novelwriter/guimain.py

@@ -189,9 +189,6 @@ class GuiMain(QMainWindow):
         self.splitView.setVisible(False)
         self.docEditor.closeSearch()
 
-        # Initialise the Project Tree
-        self.rebuildTrees()
-
         # Assemble Main Window Elements
         self.mainBox = QHBoxLayout()
         self.mainBox.addWidget(self.sideBar)
@@ -222,6 +219,8 @@ class GuiMain(QMainWindow):
         SHARED.projectStatusChanged.connect(self.mainStatus.updateProjectStatus)
         SHARED.projectStatusMessage.connect(self.mainStatus.setStatusMessage)
         SHARED.spellLanguageChanged.connect(self.mainStatus.setLanguage)
+        SHARED.statusLabelsChanged.connect(self.docViewerPanel.updateStatusLabels)
+        SHARED.statusLabelsChanged.connect(self.projView.refreshUserLabels)
 
         self.mainMenu.requestDocAction.connect(self._passDocumentAction)
         self.mainMenu.requestDocInsert.connect(self._passDocumentInsert)
@@ -461,7 +460,6 @@ class GuiMain(QMainWindow):
 
         # Update GUI
         self._updateWindowTitle(SHARED.project.data.name)
-        self.rebuildTrees()
         self.docEditor.toggleSpellCheck(SHARED.project.data.spellCheck)
         self.mainStatus.setRefTime(SHARED.project.projOpened)
         self.projView.openProjectTasks()
@@ -526,8 +524,14 @@ class GuiMain(QMainWindow):
                 self.novelView.setActiveHandle(None)
         return
 
-    def openDocument(self, tHandle: str | None, tLine: int | None = None,
-                     changeFocus: bool = True, doScroll: bool = False) -> bool:
+    def openDocument(
+        self,
+        tHandle: str | None,
+        tLine: int | None = None,
+        sTitle: str | None = None,
+        changeFocus: bool = True,
+        doScroll: bool = False
+    ) -> bool:
         """Open a specific document, optionally at a given line."""
         if not SHARED.hasProject:
             logger.error("No project open")
@@ -537,9 +541,12 @@ class GuiMain(QMainWindow):
             logger.debug("Requested item '%s' is not a document", tHandle)
             return False
 
+        if sTitle and tLine is None:
+            if hItem := SHARED.project.index.getItemHeading(tHandle, sTitle):
+                tLine = hItem.line
+
         self._changeView(nwView.EDITOR)
-        cHandle = self.docEditor.docHandle
-        if cHandle == tHandle:
+        if tHandle == self.docEditor.docHandle:
             self.docEditor.setCursorLine(tLine)
             if changeFocus:
                 self.docEditor.setFocus()
@@ -711,7 +718,6 @@ class GuiMain(QMainWindow):
         if SHARED.hasProject:
             tHandle = None
             sTitle = None
-            tLine = None
             if self.projView.treeHasFocus():
                 tHandle = self.projView.getSelectedHandle()
             elif self.novelView.treeHasFocus():
@@ -722,17 +728,9 @@ class GuiMain(QMainWindow):
                 logger.warning("No item selected")
                 return
 
-            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
+                self.openDocument(tHandle, sTitle=sTitle, changeFocus=False, doScroll=False)
 
-    def rebuildTrees(self) -> None:
-        """Rebuild the project tree."""
-        self.projView.populateTree()
         return
 
     def rebuildIndex(self, beQuiet: bool = False) -> None:
@@ -1006,32 +1004,48 @@ class GuiMain(QMainWindow):
     def _switchFocus(self, paneNo: nwFocus) -> None:
         """Switch focus between main GUI views."""
         if paneNo == nwFocus.TREE:
-            if self.projStack.currentWidget() is self.projView:
-                if self.projView.treeHasFocus():
-                    self._changeView(nwView.NOVEL)
-                    self.novelView.setTreeFocus()
-                else:
-                    self.projView.setTreeFocus()
-            elif self.projStack.currentWidget() is self.novelView:
-                if self.novelView.treeHasFocus():
-                    self._changeView(nwView.PROJECT)
-                    self.projView.setTreeFocus()
-                else:
-                    self.novelView.setTreeFocus()
+            # Decision Matrix
+            #  vM | vP | fP | vN | fN | Focus
+            # ----|----|----|----|----|---------
+            #  T  | T  | T  | F  | F  | Novel
+            #  T  | T  | F  | F  | F  | Project
+            #  T  | F  | F  | T  | T  | Project
+            #  T  | F  | F  | T  | F  | Novel
+            #  T  | F  | F  | F  | F  | Project
+            #  F  | T  | T  | F  | F  | Project
+            #  F  | T  | F  | F  | F  | Project
+            #  F  | F  | F  | T  | T  | Novel
+            #  F  | F  | F  | T  | F  | Novel
+            #  F  | F  | F  | F  | F  | Project
+
+            vM = self.mainStack.currentWidget() is self.splitMain
+            vP = self.projStack.currentWidget() is self.projView
+            vN = self.projStack.currentWidget() is self.novelView
+            fP = self.projView.treeHasFocus()
+            fN = self.novelView.treeHasFocus()
+
+            self._changeView(nwView.EDITOR)
+            if (vM and (vP and fP or vN and not fN)) or (not vM and vN):
+                self._changeView(nwView.NOVEL)
+                self.novelView.setTreeFocus()
             else:
                 self._changeView(nwView.PROJECT)
                 self.projView.setTreeFocus()
+
         elif paneNo == nwFocus.DOCUMENT:
             self._changeView(nwView.EDITOR)
-            if self.docEditor.anyFocus():
+            hasViewer = self.splitView.isVisible()
+            if hasViewer and self.docEditor.anyFocus():
                 self.docViewer.setFocus()
-            elif self.docViewer.anyFocus():
+            elif hasViewer and self.docViewer.anyFocus():
                 self.docEditor.setFocus()
             else:
                 self.docEditor.setFocus()
+
         elif paneNo == nwFocus.OUTLINE:
             self._changeView(nwView.OUTLINE)
             self.outlineView.setTreeFocus()
+
         return
 
     @pyqtSlot(bool, bool, bool, bool)
@@ -1077,15 +1091,13 @@ class GuiMain(QMainWindow):
 
         return
 
-    @pyqtSlot(bool)
-    def _processProjectSettingsChanges(self, rebuildTrees: bool) -> None:
+    @pyqtSlot()
+    def _processProjectSettingsChanges(self) -> None:
         """Refresh data dependent on project settings."""
         logger.debug("Applying new project settings")
         SHARED.updateSpellCheckLanguage()
         self.itemDetails.refreshDetails()
         self._updateWindowTitle(SHARED.project.data.name)
-        if rebuildTrees:
-            self.rebuildTrees()
         return
 
     @pyqtSlot()
@@ -1102,7 +1114,7 @@ class GuiMain(QMainWindow):
         tHandle, sTitle = self._getTagSource(tag)
         if tHandle is not None:
             if mode == nwDocMode.EDIT:
-                self.openDocument(tHandle)
+                self.openDocument(tHandle, sTitle=sTitle)
             elif mode == nwDocMode.VIEW:
                 self.viewDocument(tHandle=tHandle, sTitle=sTitle)
         return
@@ -1121,11 +1133,7 @@ class GuiMain(QMainWindow):
         """Handle an open document request."""
         if tHandle is not None:
             if mode == nwDocMode.EDIT:
-                tLine = None
-                hItem = SHARED.project.index.getItemHeading(tHandle, sTitle)
-                if hItem is not None:
-                    tLine = hItem.line
-                self.openDocument(tHandle, tLine=tLine, changeFocus=setFocus)
+                self.openDocument(tHandle, sTitle=sTitle, changeFocus=setFocus)
             elif mode == nwDocMode.VIEW:
                 self.viewDocument(tHandle=tHandle, sTitle=sTitle)
         return

novelwriter/shared.py

@@ -64,6 +64,7 @@ class SharedData(QObject):
     indexCleared = pyqtSignal()
     indexAvailable = pyqtSignal()
     mainClockTick = pyqtSignal()
+    statusLabelsChanged = pyqtSignal(str)
 
     def __init__(self) -> None:
         super().__init__()
@@ -309,6 +310,14 @@ class SharedData(QObject):
             self.indexAvailable.emit()
         return
 
+    def projectSingalProxy(self, data: dict) -> None:
+        """Emit signals on project data change."""
+        event = data.get("event")
+        logger.debug("Received '%s' event from project data", event)
+        if event == "statusLabels":
+            self.statusLabelsChanged.emit(data.get("kind", ""))
+        return
+
     ##
     #  Alert Boxes
     ##

novelwriter/tools/welcome.py

@@ -208,6 +208,7 @@ class GuiWelcome(NDialog):
         """Show the create new project page."""
         self.mainStack.setCurrentWidget(self.tabNew)
         self._setButtonVisibility()
+        self.tabNew.enterForm()
         return
 
     @pyqtSlot()
@@ -503,6 +504,8 @@ class _NewProjectPage(QWidget):
         self.scrollArea.setHorizontalScrollBarPolicy(Qt.ScrollBarPolicy.ScrollBarAsNeeded)
         self.scrollArea.setVerticalScrollBarPolicy(Qt.ScrollBarPolicy.ScrollBarAsNeeded)
 
+        self.enterForm = self.projectForm.enterForm
+
         # Assemble
         # ========
 
@@ -696,6 +699,12 @@ class _NewProjectForm(QWidget):
 
         return
 
+    def enterForm(self) -> None:
+        """Focus the project name field when entering the form."""
+        self.projName.setFocus()
+        self.projName.selectAll()
+        return
+
     def getProjectData(self) -> dict:
         """Collect form data and return it as a dictionary."""
         roots = []