novelWriter 2.4.3__py3-none-any.whl → 2.5b1__py3-none-any.whl

novelwriter/gui/projtree.py

@@ -30,34 +30,31 @@ import logging
 
 from enum import Enum
 from time import time
-from typing import TYPE_CHECKING
 
-from PyQt5.QtCore import QPoint, QTimer, Qt, pyqtSignal, pyqtSlot
-from PyQt5.QtGui import (
-    QDragEnterEvent, QDragMoveEvent, QDropEvent, QIcon, QMouseEvent, QPalette
-)
+from PyQt5.QtCore import QPoint, Qt, QTimer, pyqtSignal, pyqtSlot
+from PyQt5.QtGui import QDragEnterEvent, QDragMoveEvent, QDropEvent, QIcon, QMouseEvent, QPalette
 from PyQt5.QtWidgets import (
     QAbstractItemView, QAction, QDialog, QFrame, QHBoxLayout, QHeaderView,
-    QLabel, QMenu, QShortcut, QSizePolicy, QTreeWidget, QTreeWidgetItem,
-    QVBoxLayout, QWidget
+    QLabel, QMenu, QShortcut, QTreeWidget, QTreeWidgetItem, QVBoxLayout,
+    QWidget
 )
 
 from novelwriter import CONFIG, SHARED
 from novelwriter.common import minmax
-from novelwriter.constants import nwHeaders, nwUnicode, trConst, nwLabels
+from novelwriter.constants import nwHeaders, nwLabels, nwUnicode, trConst
 from novelwriter.core.coretools import DocDuplicator, DocMerger, DocSplitter
 from novelwriter.core.item import NWItem
 from novelwriter.dialogs.docmerge import GuiDocMerge
 from novelwriter.dialogs.docsplit import GuiDocSplit
 from novelwriter.dialogs.editlabel import GuiEditLabel
 from novelwriter.dialogs.projectsettings import GuiProjectSettings
-from novelwriter.enum import nwDocMode, nwItemType, nwItemClass, nwItemLayout
+from novelwriter.enum import nwDocMode, nwItemClass, nwItemLayout, nwItemType
 from novelwriter.extensions.modified import NIconToolButton
 from novelwriter.gui.theme import STYLES_MIN_TOOLBUTTON
-from novelwriter.types import QtAlignLeft, QtAlignRight, QtMouseLeft, QtMouseMiddle, QtUserRole
-
-if TYPE_CHECKING:  # pragma: no cover
-    from novelwriter.guimain import GuiMain
+from novelwriter.types import (
+    QtAlignLeft, QtAlignRight, QtMouseLeft, QtMouseMiddle, QtSizeExpanding,
+    QtUserRole
+)
 
 logger = logging.getLogger(__name__)
 
@@ -80,10 +77,8 @@ class GuiProjectView(QWidget):
     # Requests for the main GUI
     projectSettingsRequest = pyqtSignal(int)
 
-    def __init__(self, mainGui: GuiMain) -> None:
-        super().__init__(parent=mainGui)
-
-        self.mainGui = mainGui
+    def __init__(self, parent: QWidget) -> None:
+        super().__init__(parent=parent)
 
         # Build GUI
         self.projTree = GuiProjectTree(self)
@@ -248,8 +243,6 @@ class GuiProjectView(QWidget):
         self.projTree.createNewNote(tag, itemClass)
         return
 
-# END Class GuiProjectView
-
 
 class GuiProjectToolBar(QWidget):
 
@@ -262,7 +255,6 @@ class GuiProjectToolBar(QWidget):
 
         self.projView = projView
         self.projTree = projView.projTree
-        self.mainGui  = projView.mainGui
 
         iSz = SHARED.theme.baseIconSize
         mPx = CONFIG.pxInt(2)
@@ -274,7 +266,7 @@ class GuiProjectToolBar(QWidget):
         self.viewLabel = QLabel(self.tr("Project Content"), self)
         self.viewLabel.setFont(SHARED.theme.guiFontB)
         self.viewLabel.setContentsMargins(0, 0, 0, 0)
-        self.viewLabel.setSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Expanding)
+        self.viewLabel.setSizePolicy(QtSizeExpanding, QtSizeExpanding)
 
         # Quick Links
         self.mQuick = QMenu(self)
@@ -476,8 +468,6 @@ class GuiProjectToolBar(QWidget):
 
         return
 
-# END Class GuiProjectToolBar
-
 
 class GuiProjectTree(QTreeWidget):
 
@@ -498,7 +488,6 @@ class GuiProjectTree(QTreeWidget):
         logger.debug("Create: GuiProjectTree")
 
         self.projView = projView
-        self.mainGui  = projView.mainGui
 
         # Internal Variables
         self._treeMap: dict[str, QTreeWidgetItem] = {}
@@ -1009,8 +998,7 @@ class GuiProjectTree(QTreeWidget):
             trItemP.takeChild(tIndex)
 
             for dHandle in reversed(self.getTreeFromHandle(tHandle)):
-                if self.mainGui.docEditor.docHandle == dHandle:
-                    self.mainGui.closeDocument()
+                SHARED.closeDocument(dHandle)
                 SHARED.project.removeItem(dHandle)
                 self._treeMap.pop(dHandle, None)
 
@@ -1033,7 +1021,7 @@ class GuiProjectTree(QTreeWidget):
         if trItem is None or nwItem is None:
             return
 
-        itemStatus, statusIcon = nwItem.getImportStatus(incIcon=True)
+        itemStatus, statusIcon = nwItem.getImportStatus()
         hLevel = nwItem.mainHeading
         itemIcon = SHARED.theme.getItemIcon(
             nwItem.itemType, nwItem.itemClass, nwItem.itemLayout, hLevel
@@ -1409,7 +1397,7 @@ class GuiProjectTree(QTreeWidget):
         if not newFile:
             itemList.remove(tHandle)
 
-        dlgMerge = GuiDocMerge(self.mainGui, tHandle, itemList)
+        dlgMerge = GuiDocMerge(SHARED.mainGui, tHandle, itemList)
         dlgMerge.exec()
 
         if dlgMerge.result() == QDialog.DialogCode.Accepted:
@@ -1421,7 +1409,7 @@ class GuiProjectTree(QTreeWidget):
                 return False
 
             # Save the open document first, in case it's part of merge
-            self.mainGui.saveDocument()
+            SHARED.saveDocument()
 
             # Create merge object, and append docs
             docMerger = DocMerger(SHARED.project)
@@ -1450,7 +1438,8 @@ class GuiProjectTree(QTreeWidget):
             if newFile:
                 self.revealNewTreeItem(mHandle, nHandle=tHandle, wordCount=True)
 
-            self.mainGui.openDocument(mHandle, doScroll=True)
+            self.projView.openDocumentRequest.emit(mHandle, nwDocMode.EDIT, "", False)
+            self.projView.setSelectedHandle(mHandle, doScroll=True)
 
             if mrgData.get("moveToTrash", False):
                 for sHandle in reversed(mrgData.get("finalItems", [])):
@@ -1479,7 +1468,7 @@ class GuiProjectTree(QTreeWidget):
             logger.error("Only valid document items can be split")
             return False
 
-        dlgSplit = GuiDocSplit(self.mainGui, tHandle)
+        dlgSplit = GuiDocSplit(SHARED.mainGui, tHandle)
         dlgSplit.exec()
 
         if dlgSplit.result() == QDialog.DialogCode.Accepted:
@@ -1658,8 +1647,6 @@ class GuiProjectTree(QTreeWidget):
 
         return
 
-# END Class GuiProjectTree
-
 
 class _UpdatableMenu(QMenu):
 
@@ -1723,8 +1710,6 @@ class _UpdatableMenu(QMenu):
         self.menuItemTriggered.emit(str(action.data()))
         return
 
-# END Class _UpdatableMenu
-
 
 class _TreeContextMenu(QMenu):
 
@@ -1855,11 +1840,11 @@ class _TreeContextMenu(QMenu):
         if self._item.isNovelLike():
             menu = self.addMenu(self.tr("Set Status to ..."))
             current = self._item.itemStatus
-            for n, (key, entry) in enumerate(SHARED.project.data.itemStatus.items()):
-                name = entry["name"]
+            for n, (key, entry) in enumerate(SHARED.project.data.itemStatus.iterItems()):
+                name = entry.name
                 if not multi and current == key:
                     name += f" ({nwUnicode.U_CHECK})"
-                action = menu.addAction(entry["icon"], name)
+                action = menu.addAction(entry.icon, name)
                 if multi:
                     action.triggered.connect(lambda n, key=key: self._iterSetItemStatus(key))
                 else:
@@ -1872,11 +1857,11 @@ class _TreeContextMenu(QMenu):
         else:
             menu = self.addMenu(self.tr("Set Importance to ..."))
             current = self._item.itemImport
-            for n, (key, entry) in enumerate(SHARED.project.data.itemImport.items()):
-                name = entry["name"]
+            for n, (key, entry) in enumerate(SHARED.project.data.itemImport.iterItems()):
+                name = entry.name
                 if not multi and current == key:
                     name += f" ({nwUnicode.U_CHECK})"
-                action = menu.addAction(entry["icon"], name)
+                action = menu.addAction(entry.icon, name)
                 if multi:
                     action.triggered.connect(lambda n, key=key: self._iterSetItemImport(key))
                 else:
@@ -2076,5 +2061,3 @@ class _TreeContextMenu(QMenu):
             else:
                 logger.info("Folder conversion cancelled")
         return
-
-# END Class _TreeContextMenu

novelwriter/gui/search.py

@@ -259,7 +259,7 @@ class GuiProjectSearch(QWidget):
         if not self._blocked:
             QApplication.setOverrideCursor(QCursor(Qt.CursorShape.WaitCursor))
             start = time()
-            SHARED.mainGui.saveDocument()
+            SHARED.saveDocument()
             self._blocked = True
             self._map = {}
             self.searchResult.clear()
@@ -358,5 +358,3 @@ class GuiProjectSearch(QWidget):
             QApplication.processEvents()
 
         return
-
-# END Class GuiProjectSearch

novelwriter/gui/sidebar.py

@@ -27,8 +27,8 @@ import logging
 
 from typing import TYPE_CHECKING
 
-from PyQt5.QtGui import QPalette
 from PyQt5.QtCore import QEvent, QPoint, QSize, pyqtSignal
+from PyQt5.QtGui import QPalette
 from PyQt5.QtWidgets import QMenu, QVBoxLayout, QWidget
 
 from novelwriter import CONFIG, SHARED
@@ -58,7 +58,7 @@ class GuiSideBar(QWidget):
         iSz = QSize(iPx, iPx)
 
         self.setContentsMargins(0, 0, 0, 0)
-        self.installEventFilter(StatusTipFilter(mainGui))
+        self.installEventFilter(StatusTipFilter(self.mainGui))
 
         # Buttons
         self.tbProject = NIconToolButton(self, iSz)
@@ -150,8 +150,6 @@ class GuiSideBar(QWidget):
 
         return
 
-# END Class GuiSideBar
-
 
 class _PopRightMenu(QMenu):
 
@@ -162,5 +160,3 @@ class _PopRightMenu(QMenu):
                 offset = QPoint(parent.width(), parent.height() - self.height())
                 self.move(parent.mapToGlobal(offset))
         return super(_PopRightMenu, self).event(event)
-
-# END Class _PopRightMenu

novelwriter/gui/statusbar.py

@@ -27,26 +27,23 @@ import logging
 
 from datetime import datetime
 from time import time
-from typing import TYPE_CHECKING, Literal
+from typing import Literal
 
-from PyQt5.QtCore import pyqtSlot, QLocale
-from PyQt5.QtWidgets import QApplication, QStatusBar, QLabel
+from PyQt5.QtCore import QLocale, pyqtSlot
+from PyQt5.QtWidgets import QApplication, QLabel, QStatusBar, QWidget
 
 from novelwriter import CONFIG, SHARED
 from novelwriter.common import formatTime
 from novelwriter.constants import nwConst
 from novelwriter.extensions.statusled import StatusLED
 
-if TYPE_CHECKING:  # pragma: no cover
-    from novelwriter.guimain import GuiMain
-
 logger = logging.getLogger(__name__)
 
 
 class GuiMainStatus(QStatusBar):
 
-    def __init__(self, mainGui: GuiMain) -> None:
-        super().__init__(parent=mainGui)
+    def __init__(self, parent: QWidget) -> None:
+        super().__init__(parent=parent)
 
         logger.debug("Create: GuiMainStatus")
 
@@ -238,6 +235,7 @@ class GuiMainStatus(QStatusBar):
         before starting novelWriter.
         """
         import tracemalloc
+
         from collections import Counter
 
         widgets = QApplication.allWidgets()
@@ -264,5 +262,3 @@ class GuiMainStatus(QStatusBar):
             f" \u2013 Peak: {mem[1]:n}"
         ), 6000)
         return
-
-# END Class GuiMainStatus

novelwriter/gui/theme.py

@@ -46,12 +46,11 @@ STYLES_MIN_TOOLBUTTON = "minimalToolButton"
 STYLES_BIG_TOOLBUTTON = "bigToolButton"
 
 
-# =============================================================================================== #
-#  Gui Theme Class
-#  Handles the look and feel of novelWriter
-# =============================================================================================== #
-
 class GuiTheme:
+    """Gui Theme Class
+
+    Handles the look and feel of novelWriter.
+    """
 
     def __init__(self) -> None:
 
@@ -76,6 +75,7 @@ class GuiTheme:
         self.statUnsaved = QColor(0, 0, 0)
         self.statSaved   = QColor(0, 0, 0)
         self.helpText    = QColor(0, 0, 0)
+        self.errorText   = QColor(255, 0, 0)
 
         # Loaded Syntax Settings
         # ======================
@@ -97,11 +97,12 @@ class GuiTheme:
         self.colHeadH  = QColor(0, 0, 0)
         self.colEmph   = QColor(0, 0, 0)
         self.colDialN  = QColor(0, 0, 0)
-        self.colDialD  = QColor(0, 0, 0)
-        self.colDialS  = QColor(0, 0, 0)
+        self.colDialA  = QColor(0, 0, 0)
         self.colHidden = QColor(0, 0, 0)
+        self.colNote   = QColor(0, 0, 0)
         self.colCode   = QColor(0, 0, 0)
         self.colKey    = QColor(0, 0, 0)
+        self.colTag    = QColor(0, 0, 0)
         self.colVal    = QColor(0, 0, 0)
         self.colOpt    = QColor(0, 0, 0)
         self.colSpell  = QColor(0, 0, 0)
@@ -113,9 +114,6 @@ class GuiTheme:
         # Class Setup
         # ===========
 
-        # Init GUI Font
-        self._setGuiFont()
-
         # Load Themes
         self._guiPalette = QPalette()
         self._themeList: list[tuple[str, str]] = []
@@ -265,6 +263,7 @@ class GuiTheme:
         sec = "GUI"
         if parser.has_section(sec):
             self.helpText    = self._parseColour(parser, sec, "helptext")
+            self.errorText   = self._parseColour(parser, sec, "errortext")
             self.statNone    = self._parseColour(parser, sec, "statusnone")
             self.statUnsaved = self._parseColour(parser, sec, "statusunsaved")
             self.statSaved   = self._parseColour(parser, sec, "statussaved")
@@ -282,6 +281,10 @@ class GuiTheme:
             else:
                 helpLCol = backLNess + 0.65*(textLNess - backLNess)
             self.helpText = QColor.fromHsl(0, 0, int(255*helpLCol))
+            logger.debug(
+                "Computed help text colour: rgb(%d, %d, %d)",
+                self.helpText.red(), self.helpText.green(), self.helpText.blue()
+            )
 
         # Icons
         defaultIcons = "typicons_light" if backLNess >= 0.5 else "typicons_dark"
@@ -339,12 +342,13 @@ class GuiTheme:
             self.colHead   = self._parseColour(confParser, cnfSec, "headertext")
             self.colHeadH  = self._parseColour(confParser, cnfSec, "headertag")
             self.colEmph   = self._parseColour(confParser, cnfSec, "emphasis")
-            self.colDialN  = self._parseColour(confParser, cnfSec, "straightquotes")
-            self.colDialD  = self._parseColour(confParser, cnfSec, "doublequotes")
-            self.colDialS  = self._parseColour(confParser, cnfSec, "singlequotes")
+            self.colDialN  = self._parseColour(confParser, cnfSec, "dialog")
+            self.colDialA  = self._parseColour(confParser, cnfSec, "altdialog")
             self.colHidden = self._parseColour(confParser, cnfSec, "hidden")
+            self.colNote   = self._parseColour(confParser, cnfSec, "note")
             self.colCode   = self._parseColour(confParser, cnfSec, "shortcode")
             self.colKey    = self._parseColour(confParser, cnfSec, "keyword")
+            self.colTag    = self._parseColour(confParser, cnfSec, "tag")
             self.colVal    = self._parseColour(confParser, cnfSec, "value")
             self.colOpt    = self._parseColour(confParser, cnfSec, "optional")
             self.colSpell  = self._parseColour(confParser, cnfSec, "spellcheckline")
@@ -401,27 +405,7 @@ class GuiTheme:
         self.statUnsaved = QColor(200, 15, 39)
         self.statSaved   = QColor(2, 133, 37)
         self.helpText    = QColor(0, 0, 0)
-        return
-
-    def _setGuiFont(self) -> None:
-        """Update the GUI's font style from settings."""
-        font = QFont()
-        fontDB = QFontDatabase()
-        if CONFIG.guiFont not in fontDB.families():
-            if CONFIG.osWindows and "Arial" in fontDB.families():
-                # On Windows we default to Arial if possible
-                font.setFamily("Arial")
-                font.setPointSize(10)
-            else:
-                font = fontDB.systemFont(QFontDatabase.SystemFont.GeneralFont)
-            CONFIG.guiFont = font.family()
-            CONFIG.guiFontSize = font.pointSize()
-        else:
-            font.setFamily(CONFIG.guiFont)
-            font.setPointSize(CONFIG.guiFontSize)
-
-        QApplication.setFont(font)
-
+        self.errorText   = QColor(255, 0, 0)
         return
 
     def _listConf(self, targetDict: dict, checkDir: Path) -> bool:
@@ -480,12 +464,6 @@ class GuiTheme:
 
         return
 
-# End Class GuiTheme
-
-
-# =============================================================================================== #
-#  Icons Class
-# =============================================================================================== #
 
 class GuiIcons:
     """The icon class manages the content of the assets/icons folder,
@@ -523,9 +501,9 @@ class GuiIcons:
 
         # General Button Icons
         "add", "add_document", "backward", "bookmark", "browse", "checked", "close", "cross",
-        "document", "down", "edit", "export", "forward", "import", "list", "maximise", "menu",
-        "minimise", "more", "noncheckable", "open", "panel", "refresh", "remove", "revert",
-        "search_replace", "search", "settings", "star", "unchecked", "up", "view",
+        "document", "down", "edit", "export", "font", "forward", "import", "list", "maximise",
+        "menu", "minimise", "more", "noncheckable", "open", "panel", "quote", "refresh", "remove",
+        "revert", "search_replace", "search", "settings", "star", "unchecked", "up", "view",
 
         # Switches
         "sticky-on", "sticky-off",
@@ -793,12 +771,9 @@ class GuiIcons:
 
         return self._noIcon
 
-# END Class GuiIcons
-
 
-# =============================================================================================== #
-#  Module Functions
-# =============================================================================================== #
+# Module Functions
+# ================
 
 
 def _sortTheme(data: tuple[str, str]) -> str: