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

novelwriter/gui/projtree.py

@@ -166,6 +166,7 @@ class GuiProjectView(QWidget):
 
     def openProjectTasks(self) -> None:
         """Run open project tasks."""
+        self.populateTree()
         self.projBar.buildQuickLinksMenu()
         self.projBar.setEnabled(True)
         return
@@ -213,7 +214,8 @@ class GuiProjectView(QWidget):
     @pyqtSlot(str)
     def updateItemValues(self, tHandle: str) -> None:
         """Update tree item."""
-        self.projTree.setTreeItemValues(tHandle)
+        if nwItem := SHARED.project.tree[tHandle]:
+            self.projTree.setTreeItemValues(nwItem)
         return
 
     @pyqtSlot(str)
@@ -242,6 +244,12 @@ class GuiProjectView(QWidget):
         self.projTree.createNewNote(tag, itemClass)
         return
 
+    @pyqtSlot(str)
+    def refreshUserLabels(self, kind: str) -> None:
+        """Refresh status or importance labels."""
+        self.projTree.refreshUserLabels(kind)
+        return
+
 
 class GuiProjectToolBar(QWidget):
 
@@ -792,11 +800,11 @@ class GuiProjectTree(QTreeWidget):
 
     def renameTreeItem(self, tHandle: str, name: str = "") -> None:
         """Open a dialog to edit the label of an item."""
-        if tItem := SHARED.project.tree[tHandle]:
-            newLabel, dlgOk = GuiEditLabel.getLabel(self, text=name or tItem.itemName)
+        if nwItem := SHARED.project.tree[tHandle]:
+            newLabel, dlgOk = GuiEditLabel.getLabel(self, text=name or nwItem.itemName)
             if dlgOk:
-                tItem.setName(newLabel)
-                self.setTreeItemValues(tHandle)
+                nwItem.setName(newLabel)
+                self.setTreeItemValues(nwItem)
                 self._alertTreeChange(tHandle, flush=False)
         return
 
@@ -1010,44 +1018,52 @@ class GuiProjectTree(QTreeWidget):
 
         return True
 
-    def setTreeItemValues(self, tHandle: str) -> None:
-        """Set the name and flag values for a tree item from a handle in
-        the project tree. Does not trigger a tree change as the data is
-        already coming from the project tree.
+    def refreshUserLabels(self, kind: str) -> None:
+        """Refresh status or importance labels."""
+        if kind == "s":
+            for nwItem in SHARED.project.tree:
+                if nwItem.isNovelLike():
+                    self.setTreeItemValues(nwItem)
+        elif kind == "i":
+            for nwItem in SHARED.project.tree:
+                if not nwItem.isNovelLike():
+                    self.setTreeItemValues(nwItem)
+        return
+
+    def setTreeItemValues(self, nwItem: NWItem | None) -> None:
+        """Set the name and flag values for a tree item in the project
+        tree. Does not trigger a tree change as the data is already
+        coming from project data.
         """
-        trItem = self._getTreeItem(tHandle)
-        nwItem = SHARED.project.tree[tHandle]
-        if trItem is None or nwItem is None:
-            return
-
-        itemStatus, statusIcon = nwItem.getImportStatus()
-        hLevel = nwItem.mainHeading
-        itemIcon = SHARED.theme.getItemIcon(
-            nwItem.itemType, nwItem.itemClass, nwItem.itemLayout, hLevel
-        )
+        if isinstance(nwItem, NWItem) and (trItem := self._getTreeItem(nwItem.itemHandle)):
+            itemStatus, statusIcon = nwItem.getImportStatus()
+            hLevel = nwItem.mainHeading
+            itemIcon = SHARED.theme.getItemIcon(
+                nwItem.itemType, nwItem.itemClass, nwItem.itemLayout, hLevel
+            )
 
-        trItem.setIcon(self.C_NAME, itemIcon)
-        trItem.setText(self.C_NAME, nwItem.itemName)
-        trItem.setIcon(self.C_STATUS, statusIcon)
-        trItem.setToolTip(self.C_STATUS, itemStatus)
+            trItem.setIcon(self.C_NAME, itemIcon)
+            trItem.setText(self.C_NAME, nwItem.itemName)
+            trItem.setIcon(self.C_STATUS, statusIcon)
+            trItem.setToolTip(self.C_STATUS, itemStatus)
 
-        if nwItem.isFileType():
-            iconName = "checked" if nwItem.isActive else "unchecked"
-            toolTip = self.trActive if nwItem.isActive else self.trInactive
-            trItem.setToolTip(self.C_ACTIVE, toolTip)
-        else:
-            iconName = "noncheckable"
+            if nwItem.isFileType():
+                iconName = "checked" if nwItem.isActive else "unchecked"
+                toolTip = self.trActive if nwItem.isActive else self.trInactive
+                trItem.setToolTip(self.C_ACTIVE, toolTip)
+            else:
+                iconName = "noncheckable"
 
-        trItem.setIcon(self.C_ACTIVE, SHARED.theme.getIcon(iconName))
+            trItem.setIcon(self.C_ACTIVE, SHARED.theme.getIcon(iconName))
 
-        if CONFIG.emphLabels and nwItem.isDocumentLayout():
-            trFont = trItem.font(self.C_NAME)
-            trFont.setBold(hLevel == "H1" or hLevel == "H2")
-            trFont.setUnderline(hLevel == "H1")
-            trItem.setFont(self.C_NAME, trFont)
+            if CONFIG.emphLabels and nwItem.isDocumentLayout():
+                trFont = trItem.font(self.C_NAME)
+                trFont.setBold(hLevel == "H1" or hLevel == "H2")
+                trFont.setUnderline(hLevel == "H1")
+                trItem.setFont(self.C_NAME, trFont)
 
-        # Emit Refresh Signal
-        self.itemRefreshed.emit(tHandle, nwItem, itemIcon)
+            # Emit Refresh Signal
+            self.itemRefreshed.emit(nwItem.itemHandle, nwItem, itemIcon)
 
         return
 
@@ -1353,7 +1369,8 @@ class GuiProjectTree(QTreeWidget):
                 SHARED.project.index.deleteHandle(mHandle)
             else:
                 SHARED.project.index.reIndexHandle(mHandle)
-            self.setTreeItemValues(mHandle)
+            if mItem := SHARED.project.tree[mHandle]:
+                self.setTreeItemValues(mItem)
 
         # Update word count
         self.propagateCount(tHandle, nwItemS.wordCount, countChildren=True)
@@ -1594,7 +1611,7 @@ class GuiProjectTree(QTreeWidget):
 
         self._treeMap[tHandle] = newItem
         self.propagateCount(tHandle, nwItem.wordCount, countChildren=True)
-        self.setTreeItemValues(tHandle)
+        self.setTreeItemValues(nwItem)
         newItem.setExpanded(nwItem.isExpanded)
 
         return newItem
@@ -1971,7 +1988,7 @@ class _TreeContextMenu(QMenu):
     def _toggleItemActive(self) -> None:
         """Toggle the active status of an item."""
         self._item.setActive(not self._item.isActive)
-        self.projTree.setTreeItemValues(self._handle)
+        self.projTree.setTreeItemValues(self._item)
         self.projTree._alertTreeChange(self._handle, flush=False)
         return
 
@@ -1984,14 +2001,14 @@ class _TreeContextMenu(QMenu):
         for tItem in self._items:
             if tItem and tItem.isFileType():
                 tItem.setActive(isActive)
-                self.projTree.setTreeItemValues(tItem.itemHandle)
+                self.projTree.setTreeItemValues(tItem)
                 self.projTree._alertTreeChange(tItem.itemHandle, flush=False)
         return
 
     def _changeItemStatus(self, key: str) -> None:
         """Set a new status value of an item."""
         self._item.setStatus(key)
-        self.projTree.setTreeItemValues(self._handle)
+        self.projTree.setTreeItemValues(self._item)
         self.projTree._alertTreeChange(self._handle, flush=False)
         return
 
@@ -2000,14 +2017,14 @@ class _TreeContextMenu(QMenu):
         for tItem in self._items:
             if tItem and tItem.isNovelLike():
                 tItem.setStatus(key)
-                self.projTree.setTreeItemValues(tItem.itemHandle)
+                self.projTree.setTreeItemValues(tItem)
                 self.projTree._alertTreeChange(tItem.itemHandle, flush=False)
         return
 
     def _changeItemImport(self, key: str) -> None:
         """Set a new importance value of an item."""
         self._item.setImport(key)
-        self.projTree.setTreeItemValues(self._handle)
+        self.projTree.setTreeItemValues(self._item)
         self.projTree._alertTreeChange(self._handle, flush=False)
         return
 
@@ -2016,7 +2033,7 @@ class _TreeContextMenu(QMenu):
         for tItem in self._items:
             if tItem and not tItem.isNovelLike():
                 tItem.setImport(key)
-                self.projTree.setTreeItemValues(tItem.itemHandle)
+                self.projTree.setTreeItemValues(tItem)
                 self.projTree._alertTreeChange(tItem.itemHandle, flush=False)
         return
 
@@ -2024,11 +2041,11 @@ class _TreeContextMenu(QMenu):
         """Set a new item layout value of an item."""
         if itemLayout == nwItemLayout.DOCUMENT and self._item.documentAllowed():
             self._item.setLayout(nwItemLayout.DOCUMENT)
-            self.projTree.setTreeItemValues(self._handle)
+            self.projTree.setTreeItemValues(self._item)
             self.projTree._alertTreeChange(self._handle, flush=False)
         elif itemLayout == nwItemLayout.NOTE:
             self._item.setLayout(nwItemLayout.NOTE)
-            self.projTree.setTreeItemValues(self._handle)
+            self.projTree.setTreeItemValues(self._item)
             self.projTree._alertTreeChange(self._handle, flush=False)
         return
 
@@ -2042,12 +2059,12 @@ class _TreeContextMenu(QMenu):
             if msgYes and itemLayout == nwItemLayout.DOCUMENT and self._item.documentAllowed():
                 self._item.setType(nwItemType.FILE)
                 self._item.setLayout(nwItemLayout.DOCUMENT)
-                self.projTree.setTreeItemValues(self._handle)
+                self.projTree.setTreeItemValues(self._item)
                 self.projTree._alertTreeChange(self._handle, flush=False)
             elif msgYes and itemLayout == nwItemLayout.NOTE:
                 self._item.setType(nwItemType.FILE)
                 self._item.setLayout(nwItemLayout.NOTE)
-                self.projTree.setTreeItemValues(self._handle)
+                self.projTree.setTreeItemValues(self._item)
                 self.projTree._alertTreeChange(self._handle, flush=False)
             else:
                 logger.info("Folder conversion cancelled")

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/manuscript.py

@@ -823,6 +823,7 @@ class _PreviewWidget(QTextBrowser):
 
         document.setDocumentMargin(CONFIG.getTextMargin())
         self.setDocument(document)
+        self.setTabStopDistance(CONFIG.getTabWidth())
 
         self._docTime = int(time())
         self._updateBuildAge()

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 = []