novelWriter 2.2b1__py3-none-any.whl → 2.2rc1__py3-none-any.whl

novelwriter/gui/sidebar.py

@@ -67,7 +67,7 @@ class GuiSideBar(QWidget):
         self.tbNovel.clicked.connect(lambda: self.viewChangeRequested.emit(nwView.NOVEL))
 
         self.tbOutline = QToolButton(self)
-        self.tbOutline.setToolTip(f"{0} [Ctrl+Shift+T]".format(self.tr("Novel Outline View")))
+        self.tbOutline.setToolTip("{0} [Ctrl+Shift+T]".format(self.tr("Novel Outline View")))
         self.tbOutline.setIconSize(iconSize)
         self.tbOutline.clicked.connect(lambda: self.viewChangeRequested.emit(nwView.OUTLINE))
 
@@ -111,7 +111,7 @@ class GuiSideBar(QWidget):
         self.outerBox.addWidget(self.tbDetails)
         self.outerBox.addWidget(self.tbStats)
         self.outerBox.addWidget(self.tbSettings)
-        self.outerBox.setContentsMargins(0, 0, CONFIG.pxInt(2), 0)
+        self.outerBox.setContentsMargins(0, 0, 0, 0)
         self.outerBox.setSpacing(CONFIG.pxInt(4))
 
         self.setLayout(self.outerBox)
@@ -131,7 +131,7 @@ class GuiSideBar(QWidget):
         buttonStyle = (
             "QToolButton {{padding: {0}px; border: none; background: transparent;}} "
             "QToolButton:hover {{border: none; background: rgba({1},{2},{3},0.2);}}"
-        ).format(CONFIG.pxInt(4), fadeCol.red(), fadeCol.green(), fadeCol.blue())
+        ).format(CONFIG.pxInt(6), fadeCol.red(), fadeCol.green(), fadeCol.blue())
         buttonStyleMenu = f"{buttonStyle} QToolButton::menu-indicator {{image: none;}}"
 
         self.tbProject.setIcon(SHARED.theme.getIcon("view_editor"))

novelwriter/gui/statusbar.py

@@ -97,7 +97,7 @@ class GuiMainStatus(QStatusBar):
         self.addPermanentWidget(self.statsText)
 
         # The Session Clock
-        # Set the mimimum width so the label doesn't rescale every second
+        # Set the minimum width so the label doesn't rescale every second
         self.timeIcon = QLabel()
         self.timeText = QLabel("")
         self.timeText.setToolTip(self.tr("Session Time"))

novelwriter/gui/theme.py

@@ -133,6 +133,7 @@ class GuiTheme:
         self.getToggleIcon = self.iconCache.getToggleIcon
         self.loadDecoration = self.iconCache.loadDecoration
         self.getHeaderDecoration = self.iconCache.getHeaderDecoration
+        self.getHeaderDecorationNarrow = self.iconCache.getHeaderDecorationNarrow
 
         # Extract Other Info
         self.guiDPI = qApp.primaryScreen().logicalDotsPerInchX()
@@ -464,8 +465,8 @@ class GuiIcons:
 
         # General Button Icons
         "add", "backward", "bookmark", "browse", "checked", "close", "cross", "down", "edit",
-        "export", "forward", "maximise", "menu", "minimise", "noncheckable", "reference",
-        "refresh", "remove", "revert", "search_replace", "search", "settings", "unchecked", "up",
+        "export", "forward", "maximise", "menu", "minimise", "noncheckable", "panel", "refresh",
+        "remove", "revert", "search_replace", "search", "settings", "unchecked", "up", "view",
 
         # Switches
         "sticky-on", "sticky-off",
@@ -473,6 +474,8 @@ class GuiIcons:
 
         # Decorations
         "deco_doc_h0", "deco_doc_h1", "deco_doc_h2", "deco_doc_h3", "deco_doc_h4", "deco_doc_more",
+        "deco_doc_h0_n", "deco_doc_h1_n", "deco_doc_h2_n", "deco_doc_h3_n", "deco_doc_h4_n",
+        "deco_doc_nt_n",
     }
 
     TOGGLE_ICON_KEYS = {
@@ -493,6 +496,7 @@ class GuiIcons:
         self._qIcons: dict[str, QIcon] = {}
         self._themeMap: dict[str, Path] = {}
         self._headerDec: list[QPixmap] = []
+        self._headerDecNarrow: list[QPixmap] = []
 
         # Icon Theme Path
         self._confName = "icons.conf"
@@ -580,6 +584,7 @@ class GuiIcons:
             self._qIcons[iconKey] = qIcon
 
         self._headerDec = []
+        self._headerDecNarrow = []
 
         return True
 
@@ -680,6 +685,20 @@ class GuiIcons:
             ]
         return self._headerDec[minmax(hLevel, 0, 4)]
 
+    def getHeaderDecorationNarrow(self, hLevel: int) -> QPixmap:
+        """Get the narrow decoration for a specific header level."""
+        if not self._headerDecNarrow:
+            iPx = self.mainTheme.baseIconSize
+            self._headerDecNarrow = [
+                self.loadDecoration("deco_doc_h0_n", h=iPx),
+                self.loadDecoration("deco_doc_h1_n", h=iPx),
+                self.loadDecoration("deco_doc_h2_n", h=iPx),
+                self.loadDecoration("deco_doc_h3_n", h=iPx),
+                self.loadDecoration("deco_doc_h4_n", h=iPx),
+                self.loadDecoration("deco_doc_nt_n", h=iPx),
+            ]
+        return self._headerDecNarrow[minmax(hLevel, 0, 5)]
+
     ##
     #  Internal Functions
     ##

novelwriter/guimain.py

@@ -44,10 +44,11 @@ from novelwriter.gui.outline import GuiOutlineView
 from novelwriter.gui.mainmenu import GuiMainMenu
 from novelwriter.gui.projtree import GuiProjectView
 from novelwriter.gui.doceditor import GuiDocEditor
-from novelwriter.gui.docviewer import GuiDocViewDetails, GuiDocViewer
+from novelwriter.gui.docviewer import GuiDocViewer
 from novelwriter.gui.noveltree import GuiNovelView
 from novelwriter.gui.statusbar import GuiMainStatus
 from novelwriter.gui.itemdetails import GuiItemDetails
+from novelwriter.gui.docviewerpanel import GuiDocViewerPanel
 from novelwriter.dialogs.about import GuiAbout
 from novelwriter.dialogs.updates import GuiUpdates
 from novelwriter.dialogs.projload import GuiProjectLoad
@@ -58,6 +59,7 @@ from novelwriter.dialogs.projsettings import GuiProjectSettings
 from novelwriter.tools.lipsum import GuiLipsum
 from novelwriter.tools.manuscript import GuiManuscript
 from novelwriter.tools.projwizard import GuiProjectWizard
+from novelwriter.tools.dictionaries import GuiDictionaries
 from novelwriter.tools.writingstats import GuiWritingStats
 from novelwriter.core.coretools import ProjectBuilder
 
@@ -133,16 +135,16 @@ class GuiMain(QMainWindow):
         hWd = CONFIG.pxInt(4)
 
         # Main GUI Elements
-        self.mainStatus  = GuiMainStatus(self)
-        self.projView    = GuiProjectView(self)
-        self.novelView   = GuiNovelView(self)
-        self.docEditor   = GuiDocEditor(self)
-        self.viewMeta    = GuiDocViewDetails(self)
-        self.docViewer   = GuiDocViewer(self)
-        self.itemDetails = GuiItemDetails(self)
-        self.outlineView = GuiOutlineView(self)
-        self.mainMenu    = GuiMainMenu(self)
-        self.sideBar     = GuiSideBar(self)
+        self.mainStatus     = GuiMainStatus(self)
+        self.projView       = GuiProjectView(self)
+        self.novelView      = GuiNovelView(self)
+        self.docEditor      = GuiDocEditor(self)
+        self.docViewer      = GuiDocViewer(self)
+        self.docViewerPanel = GuiDocViewerPanel(self)
+        self.itemDetails    = GuiItemDetails(self)
+        self.outlineView    = GuiOutlineView(self)
+        self.mainMenu       = GuiMainMenu(self)
+        self.sideBar        = GuiSideBar(self)
 
         # Project Tree Stack
         self.projStack = QStackedWidget(self)
@@ -162,7 +164,7 @@ class GuiMain(QMainWindow):
         # Splitter : Document Viewer / Document Meta
         self.splitView = QSplitter(Qt.Vertical, self)
         self.splitView.addWidget(self.docViewer)
-        self.splitView.addWidget(self.viewMeta)
+        self.splitView.addWidget(self.docViewerPanel)
         self.splitView.setHandleWidth(hWd)
         self.splitView.setOpaqueResize(False)
         self.splitView.setSizes(CONFIG.viewPanePos)
@@ -190,12 +192,12 @@ class GuiMain(QMainWindow):
         self.mainStack.currentChanged.connect(self._mainStackChanged)
 
         # Indices of Splitter Widgets
-        self.idxTree     = self.splitMain.indexOf(self.treePane)
-        self.idxMain     = self.splitMain.indexOf(self.splitDocs)
-        self.idxEditor   = self.splitDocs.indexOf(self.docEditor)
-        self.idxViewer   = self.splitDocs.indexOf(self.splitView)
-        self.idxViewDoc  = self.splitView.indexOf(self.docViewer)
-        self.idxViewMeta = self.splitView.indexOf(self.viewMeta)
+        self.idxTree         = self.splitMain.indexOf(self.treePane)
+        self.idxMain         = self.splitMain.indexOf(self.splitDocs)
+        self.idxEditor       = self.splitDocs.indexOf(self.docEditor)
+        self.idxViewer       = self.splitDocs.indexOf(self.splitView)
+        self.idxViewDoc      = self.splitView.indexOf(self.docViewer)
+        self.idxViewDocPanel = self.splitView.indexOf(self.docViewerPanel)
 
         # Indices of Stack Widgets
         self.idxEditorView  = self.mainStack.indexOf(self.splitMain)
@@ -209,7 +211,7 @@ class GuiMain(QMainWindow):
         self.splitDocs.setCollapsible(self.idxEditor, False)
         self.splitDocs.setCollapsible(self.idxViewer, False)
         self.splitView.setCollapsible(self.idxViewDoc, False)
-        self.splitView.setCollapsible(self.idxViewMeta, False)
+        self.splitView.setCollapsible(self.idxViewDocPanel, False)
 
         self.splitMain.setStretchFactor(self.idxTree, 0)
         self.splitMain.setStretchFactor(self.idxMain, 1)
@@ -242,6 +244,12 @@ class GuiMain(QMainWindow):
         SHARED.projectStatusChanged.connect(self.mainStatus.updateProjectStatus)
         SHARED.projectStatusMessage.connect(self.mainStatus.setStatusMessage)
         SHARED.spellLanguageChanged.connect(self.mainStatus.setLanguage)
+        SHARED.indexChangedTags.connect(self.docViewerPanel.updateChangedTags)
+        SHARED.indexScannedText.connect(self.docViewerPanel.projectItemChanged)
+        SHARED.indexScannedText.connect(self.projView.updateItemValues)
+        SHARED.indexScannedText.connect(self.itemDetails.updateViewBox)
+        SHARED.indexCleared.connect(self.docViewerPanel.indexWasCleared)
+        SHARED.indexAvailable.connect(self.docViewerPanel.indexHasAppeared)
 
         self.mainMenu.requestDocAction.connect(self._passDocumentAction)
         self.mainMenu.requestDocInsert.connect(self._passDocumentInsert)
@@ -257,6 +265,7 @@ class GuiMain(QMainWindow):
         self.projView.treeItemChanged.connect(self.docEditor.updateDocInfo)
         self.projView.treeItemChanged.connect(self.docViewer.updateDocInfo)
         self.projView.treeItemChanged.connect(self.itemDetails.updateViewBox)
+        self.projView.treeItemChanged.connect(self.docViewerPanel.projectItemChanged)
         self.projView.rootFolderChanged.connect(self.outlineView.updateRootItem)
         self.projView.rootFolderChanged.connect(self.novelView.updateRootItem)
         self.projView.rootFolderChanged.connect(self.projView.updateRootItem)
@@ -275,8 +284,16 @@ class GuiMain(QMainWindow):
         self.docEditor.spellCheckStateChanged.connect(self.mainMenu.setSpellCheckState)
         self.docEditor.closeDocumentRequest.connect(self.closeDocEditor)
         self.docEditor.toggleFocusModeRequest.connect(self.toggleFocusMode)
+        self.docEditor.requestProjectItemSelected.connect(self.projView.setSelectedHandle)
+        self.docEditor.requestProjectItemRenamed.connect(self.projView.renameTreeItem)
 
+        self.docViewer.documentLoaded.connect(self.docViewerPanel.updateHandle)
         self.docViewer.loadDocumentTagRequest.connect(self._followTag)
+        self.docViewer.togglePanelVisibility.connect(self._toggleViewerPanelVisibility)
+        self.docViewer.requestProjectItemSelected.connect(self.projView.setSelectedHandle)
+
+        self.docViewerPanel.loadDocumentTagRequest.connect(self._followTag)
+        self.docViewerPanel.openDocumentRequest.connect(self._openDocument)
 
         self.outlineView.loadDocumentTagRequest.connect(self._followTag)
         self.outlineView.openDocumentRequest.connect(self._openDocument)
@@ -327,12 +344,12 @@ class GuiMain(QMainWindow):
 
         logger.debug("Ready: GUI")
 
-        if __hexversion__[-2] == "a" and logger.getEffectiveLevel() > logging.DEBUG:
-            SHARED.warn(self.tr(
+        if __hexversion__[-2] == "a" and not CONFIG.isDebug:
+            SHARED.warn(
                 "You are running an untested development version of novelWriter. "
-                "Please be careful when working on a live project "
+                "Please be careful when you are working on live projects "
                 "and make sure you take regular backups."
-            ))
+            )
 
         logger.info("novelWriter is ready ...")
         self.mainStatus.setStatusMessage(self.tr("novelWriter is ready ..."))
@@ -437,6 +454,7 @@ class GuiMain(QMainWindow):
             self.docViewer.clearNavHistory()
             self.closeDocViewer(byUser=False)
 
+            self.docViewerPanel.closeProjectTasks()
             self.outlineView.closeProjectTasks()
             self.novelView.closeProjectTasks()
             self.projView.clearProjectView()
@@ -510,6 +528,7 @@ class GuiMain(QMainWindow):
         self.projView.openProjectTasks()
         self.novelView.openProjectTasks()
         self.outlineView.openProjectTasks()
+        self.docViewerPanel.openProjectTasks()
         self._updateStatusWordCount()
 
         # Restore previously open documents, if any
@@ -675,13 +694,19 @@ class GuiMain(QMainWindow):
         logger.debug("Viewing document with handle '%s'", tHandle)
         if self.docViewer.loadText(tHandle):
             if not self.splitView.isVisible():
+                cursorVisible = self.docEditor.cursorIsVisible()
                 bPos = self.splitMain.sizes()
                 self.splitView.setVisible(True)
                 vPos = [0, 0]
                 vPos[0] = int(bPos[1]/2)
                 vPos[1] = bPos[1] - vPos[0]
                 self.splitDocs.setSizes(vPos)
-                self.viewMeta.setVisible(CONFIG.showRefPanel)
+                self.docViewerPanel.setVisible(CONFIG.showViewerPanel)
+
+                # Since editor width changes, we need to make sure we
+                # restore cursor visibility in the editor. See #1302
+                if cursorVisible:
+                    self.docEditor.ensureCursorVisibleNoCentre()
 
             if sTitle:
                 self.docViewer.navigateTo(f"#{sTitle}")
@@ -782,11 +807,9 @@ class GuiMain(QMainWindow):
         if not SHARED.hasProject:
             logger.error("No project open")
             return False
-
         if tHandle is None and (self.docEditor.anyFocus() or self.isFocusMode):
             tHandle = self.docEditor.docHandle
         self.projView.renameTreeItem(tHandle)
-
         return True
 
     def rebuildTrees(self) -> None:
@@ -877,6 +900,7 @@ class GuiMain(QMainWindow):
                 SHARED.theme.loadTheme()
                 self.docEditor.updateTheme()
                 self.docViewer.updateTheme()
+                self.docViewerPanel.updateTheme()
                 self.sideBar.updateTheme()
                 self.projView.updateTheme()
                 self.novelView.updateTheme()
@@ -1047,6 +1071,20 @@ class GuiMain(QMainWindow):
 
         return
 
+    @pyqtSlot()
+    def showDictionariesDialog(self) -> None:
+        """Show the download dictionaries dialog."""
+        dlgDicts = GuiDictionaries(self)
+        dlgDicts.setModal(True)
+        dlgDicts.show()
+        dlgDicts.raise_()
+        qApp.processEvents()
+        if not dlgDicts.initDialog():
+            dlgDicts.close()
+            SHARED.error(self.tr("Could not initialise the dialog."))
+
+        return
+
     def reportConfErr(self) -> bool:
         """Checks if the Config module has any errors to report, and let
         the user know if this is the case. The Config module caches
@@ -1076,10 +1114,10 @@ class GuiMain(QMainWindow):
         if not self.isFocusMode:
             CONFIG.setMainPanePos(self.splitMain.sizes())
             CONFIG.setOutlinePanePos(self.outlineView.splitSizes())
-            if self.viewMeta.isVisible():
+            if self.docViewerPanel.isVisible():
                 CONFIG.setViewPanePos(self.splitView.sizes())
 
-        CONFIG.showRefPanel = self.viewMeta.isVisible()
+        CONFIG.showViewerPanel = self.docViewerPanel.isVisible()
         if self.windowState() & Qt.WindowFullScreen != Qt.WindowFullScreen:
             # Ignore window size if in full screen mode
             CONFIG.setMainWinSize(self.width(), self.height())
@@ -1101,11 +1139,18 @@ class GuiMain(QMainWindow):
             # Only reset the last handle if the user called this
             SHARED.project.data.setLastHandle(None, "viewer")
 
+        cursorVisible = self.docEditor.cursorIsVisible()
+
         # Hide the panel
         bPos = self.splitMain.sizes()
         self.splitView.setVisible(False)
         self.splitDocs.setSizes([bPos[1], 0])
 
+        # Since editor width changes, we need to make sure we restore
+        # cursor visibility in the editor. See #1302
+        if cursorVisible:
+            self.docEditor.ensureCursorVisibleNoCentre()
+
         return not self.splitView.isVisible()
 
     def toggleFullScreenMode(self) -> None:
@@ -1121,10 +1166,7 @@ class GuiMain(QMainWindow):
         """Capture the closing event of the GUI and call the close
         function to handle all the close process steps.
         """
-        if self.closeMain():
-            event.accept()
-        else:
-            event.ignore()
+        event.accept() if self.closeMain() else event.ignore()
         return
 
     ##
@@ -1154,6 +1196,7 @@ class GuiMain(QMainWindow):
         else:
             logger.debug("Deactivating Focus Mode")
 
+        cursorVisible = self.docEditor.cursorIsVisible()
         isVisible = not self.isFocusMode
         self.treePane.setVisible(isVisible)
         self.mainStatus.setVisible(isVisible)
@@ -1169,6 +1212,9 @@ class GuiMain(QMainWindow):
         elif self.docViewer.docHandle is not None:
             self.splitView.setVisible(True)
 
+        if cursorVisible:
+            self.docEditor.ensureCursorVisibleNoCentre()
+
         return
 
     @pyqtSlot(nwWidget)
@@ -1267,6 +1313,13 @@ class GuiMain(QMainWindow):
             self.docEditor.insertText(content)
         return
 
+    @pyqtSlot()
+    def _toggleViewerPanelVisibility(self):
+        """Toggle the visibility of the document viewer panel."""
+        CONFIG.showViewerPanel = not CONFIG.showViewerPanel
+        self.docViewerPanel.setVisible(CONFIG.showViewerPanel)
+        return
+
     @pyqtSlot()
     def _timeTick(self) -> None:
         """Process time tick of the main timer."""
@@ -1408,6 +1461,7 @@ class GuiMain(QMainWindow):
         self.addAction(self.mainMenu.aInsTimes)
         self.addAction(self.mainMenu.aInsDivide)
         self.addAction(self.mainMenu.aInsSynopsis)
+        self.addAction(self.mainMenu.aInsShort)
 
         for mAction, _ in self.mainMenu.mInsKWItems.values():
             self.addAction(mAction)

novelwriter/shared.py

@@ -52,6 +52,10 @@ class SharedData(QObject):
     projectStatusChanged = pyqtSignal(bool)
     projectStatusMessage = pyqtSignal(str)
     spellLanguageChanged = pyqtSignal(str, str)
+    indexScannedText = pyqtSignal(str)
+    indexChangedTags = pyqtSignal(list, list)
+    indexCleared = pyqtSignal()
+    indexAvailable = pyqtSignal()
 
     def __init__(self) -> None:
         super().__init__()
@@ -171,7 +175,7 @@ class SharedData(QObject):
         return
 
     def updateSpellCheckLanguage(self, reload: bool = False) -> None:
-        """Update the active spell check langauge from settings."""
+        """Update the active spell check language from settings."""
         from novelwriter import CONFIG
         language = self.project.data.spellLang or CONFIG.spellLanguage
         if language != self.spelling.spellLanguage or reload:
@@ -210,6 +214,24 @@ class SharedData(QObject):
         QThreadPool.globalInstance().start(runnable, priority=priority)
         return
 
+    ##
+    #  Signal Proxy
+    ##
+
+    def indexSignalProxy(self, data: dict) -> None:
+        """Emit signals on behalf of the index."""
+        event = data.get("event")
+        logger.debug("Received '%s' event from the index", event)
+        if event == "updateTags":
+            self.indexChangedTags.emit(data.get("updated", []), data.get("deleted", []))
+        elif event == "scanText":
+            self.indexScannedText.emit(data.get("handle", ""))
+        elif event == "clearIndex":
+            self.indexCleared.emit()
+        elif event == "buildIndex":
+            self.indexAvailable.emit()
+        return
+
     ##
     #  Alert Boxes
     ##