novelWriter 2.6.3__py3-none-any.whl → 2.7rc1__py3-none-any.whl

novelwriter/gui/search.py

@@ -26,23 +26,26 @@ from __future__ import annotations
 import logging
 
 from time import time
+from typing import TYPE_CHECKING
 
-from PyQt5.QtCore import Qt, pyqtSignal, pyqtSlot
-from PyQt5.QtGui import QCursor, QKeyEvent
-from PyQt5.QtWidgets import (
+from PyQt6.QtCore import Qt, pyqtSignal, pyqtSlot
+from PyQt6.QtGui import QAction, QCursor, QKeyEvent, QPalette
+from PyQt6.QtWidgets import (
     QApplication, QFrame, QHBoxLayout, QLabel, QLineEdit, QToolBar,
     QTreeWidget, QTreeWidgetItem, QVBoxLayout, QWidget
 )
 
 from novelwriter import CONFIG, SHARED
-from novelwriter.common import checkInt, cssCol
+from novelwriter.common import checkInt, qtAddAction
 from novelwriter.core.coretools import DocSearch
-from novelwriter.core.item import NWItem
 from novelwriter.types import (
     QtAlignMiddle, QtAlignRight, QtHeaderStretch, QtHeaderToContents,
-    QtUserRole
+    QtHexArgb, QtUserRole
 )
 
+if TYPE_CHECKING:
+    from novelwriter.core.item import NWItem
+
 logger = logging.getLogger(__name__)
 
 
@@ -65,18 +68,20 @@ class GuiProjectSearch(QWidget):
 
         iPx = SHARED.theme.baseIconHeight
         iSz = SHARED.theme.baseIconSize
-        mPx = CONFIG.pxInt(2)
-        tPx = CONFIG.pxInt(4)
 
         self._time = time()
         self._search = DocSearch()
         self._blocked = False
         self._map: dict[str, tuple[int, float]] = {}
 
+        self.setContentsMargins(0, 0, 0, 0)
+        self.setBackgroundRole(QPalette.ColorRole.Base)
+        self.setAutoFillBackground(True)
+
         # Header
         self.viewLabel = QLabel(self.tr("Project Search"), self)
         self.viewLabel.setFont(SHARED.theme.guiFontB)
-        self.viewLabel.setContentsMargins(mPx, tPx, 0, mPx)
+        self.viewLabel.setContentsMargins(4, 4, 0, 2)
 
         # Options
         self.searchOpt = QToolBar(self)
@@ -84,30 +89,30 @@ class GuiProjectSearch(QWidget):
         self.searchOpt.setIconSize(iSz)
         self.searchOpt.setContentsMargins(0, 0, 0, 0)
 
-        self.toggleCase = self.searchOpt.addAction(self.tr("Case Sensitive"))
+        self.toggleCase = qtAddAction(self.searchOpt, self.tr("Case Sensitive"))
         self.toggleCase.setCheckable(True)
         self.toggleCase.setChecked(CONFIG.searchProjCase)
         self.toggleCase.toggled.connect(self._toggleCase)
 
-        self.toggleWord = self.searchOpt.addAction(self.tr("Whole Words Only"))
+        self.toggleWord = qtAddAction(self.searchOpt, self.tr("Whole Words Only"))
         self.toggleWord.setCheckable(True)
         self.toggleWord.setChecked(CONFIG.searchProjWord)
         self.toggleWord.toggled.connect(self._toggleWord)
 
-        self.toggleRegEx = self.searchOpt.addAction(self.tr("RegEx Mode"))
+        self.toggleRegEx = qtAddAction(self.searchOpt, self.tr("RegEx Mode"))
         self.toggleRegEx.setCheckable(True)
         self.toggleRegEx.setChecked(CONFIG.searchProjRegEx)
         self.toggleRegEx.toggled.connect(self._toggleRegEx)
 
         # Search Box
+        self.searchAction = QAction("", self)
+        self.searchAction.setIcon(SHARED.theme.getIcon("search", "blue"))
+        self.searchAction.triggered.connect(self._processSearch)
+
         self.searchText = QLineEdit(self)
         self.searchText.setPlaceholderText(self.tr("Search for"))
         self.searchText.setClearButtonEnabled(True)
-
-        self.searchAction = self.searchText.addAction(
-            SHARED.theme.getIcon("search"), QLineEdit.ActionPosition.TrailingPosition
-        )
-        self.searchAction.triggered.connect(self._processSearch)
+        self.searchText.addAction(self.searchAction, QLineEdit.ActionPosition.TrailingPosition)
 
         # Search Result
         self.searchResult = QTreeWidget(self)
@@ -120,11 +125,12 @@ class GuiProjectSearch(QWidget):
         self.searchResult.setAllColumnsShowFocus(True)
         self.searchResult.itemDoubleClicked.connect(self._searchResultDoubleClicked)
         self.searchResult.itemSelectionChanged.connect(self._searchResultSelected)
+        self.searchResult.setAccessibleName(self.viewLabel.text())
 
-        treeHeader = self.searchResult.header()
-        treeHeader.setStretchLastSection(False)
-        treeHeader.setSectionResizeMode(self.C_NAME, QtHeaderStretch)
-        treeHeader.setSectionResizeMode(self.C_COUNT, QtHeaderToContents)
+        if header := self.searchResult.header():
+            header.setStretchLastSection(False)
+            header.setSectionResizeMode(self.C_NAME, QtHeaderStretch)
+            header.setSectionResizeMode(self.C_COUNT, QtHeaderToContents)
 
         # Assemble
         self.headerBox = QHBoxLayout()
@@ -138,7 +144,7 @@ class GuiProjectSearch(QWidget):
         self.outerBox.addWidget(self.searchText, 0)
         self.outerBox.addWidget(self.searchResult, 1)
         self.outerBox.setContentsMargins(0, 0, 0, 0)
-        self.outerBox.setSpacing(mPx)
+        self.outerBox.setSpacing(2)
 
         self.setLayout(self.outerBox)
         self.updateTheme()
@@ -153,20 +159,17 @@ class GuiProjectSearch(QWidget):
 
     def updateTheme(self) -> None:
         """Update theme elements."""
-        bPx = CONFIG.pxInt(1)
-        mPx = CONFIG.pxInt(2)
-
-        qPalette = self.palette()
-        colBase = cssCol(qPalette.base().color())
-        colFocus = cssCol(qPalette.highlight().color())
+        palette = QApplication.palette()
+        colBase = palette.base().color().name(QtHexArgb)
+        colFocus = palette.highlight().color().name(QtHexArgb)
 
         self.setStyleSheet(
             "QToolBar {padding: 0; background: none;} "
-            f"QLineEdit {{border: {bPx}px solid {colBase}; padding: {mPx}px;}} "
-            f"QLineEdit:focus {{border: {bPx}px solid {colFocus};}} "
+            f"QLineEdit {{border: 1px solid {colBase}; padding: 2px;}} "
+            f"QLineEdit:focus {{border: 1px solid {colFocus};}} "
         )
 
-        self.searchAction.setIcon(SHARED.theme.getIcon("search"))
+        self.searchAction.setIcon(SHARED.theme.getIcon("search", "blue"))
         self.toggleCase.setIcon(SHARED.theme.getIcon("search_case"))
         self.toggleWord.setIcon(SHARED.theme.getIcon("search_word"))
         self.toggleRegEx.setIcon(SHARED.theme.getIcon("search_regex"))

novelwriter/gui/sidebar.py

@@ -27,18 +27,17 @@ import logging
 
 from typing import TYPE_CHECKING
 
-from PyQt5.QtCore import QEvent, QPoint, QSize, pyqtSignal
-from PyQt5.QtGui import QPalette
-from PyQt5.QtWidgets import QMenu, QVBoxLayout, QWidget
+from PyQt6.QtCore import QEvent, QPoint, QSize, pyqtSignal
+from PyQt6.QtWidgets import QMenu, QVBoxLayout, QWidget
 
-from novelwriter import CONFIG, SHARED
+from novelwriter import SHARED
 from novelwriter.common import qtLambda
 from novelwriter.enum import nwView
 from novelwriter.extensions.eventfilters import StatusTipFilter
 from novelwriter.extensions.modified import NIconToolButton
 from novelwriter.gui.theme import STYLES_BIG_TOOLBUTTON
 
-if TYPE_CHECKING:  # pragma: no cover
+if TYPE_CHECKING:
     from novelwriter.guimain import GuiMain
 
 logger = logging.getLogger(__name__)
@@ -114,7 +113,7 @@ class GuiSideBar(QWidget):
         self.outerBox.addWidget(self.tbStats)
         self.outerBox.addWidget(self.tbSettings)
         self.outerBox.setContentsMargins(0, 0, 0, 0)
-        self.outerBox.setSpacing(CONFIG.pxInt(6))
+        self.outerBox.setSpacing(6)
 
         self.setLayout(self.outerBox)
         self.updateTheme()
@@ -125,10 +124,6 @@ class GuiSideBar(QWidget):
 
     def updateTheme(self) -> None:
         """Initialise GUI elements that depend on specific settings."""
-        qPalette = self.palette()
-        qPalette.setBrush(QPalette.ColorRole.Window, qPalette.base())
-        self.setPalette(qPalette)
-
         buttonStyle = SHARED.theme.getStyleSheet(STYLES_BIG_TOOLBUTTON)
 
         self.tbProject.setStyleSheet(buttonStyle)
@@ -140,13 +135,13 @@ class GuiSideBar(QWidget):
         self.tbStats.setStyleSheet(buttonStyle)
         self.tbSettings.setStyleSheet(buttonStyle)
 
-        self.tbProject.setThemeIcon("view_editor")
-        self.tbNovel.setThemeIcon("view_novel")
-        self.tbSearch.setThemeIcon("view_search")
-        self.tbOutline.setThemeIcon("view_outline")
-        self.tbBuild.setThemeIcon("view_build")
-        self.tbDetails.setThemeIcon("proj_details")
-        self.tbStats.setThemeIcon("proj_stats")
+        self.tbProject.setThemeIcon("sb_project")
+        self.tbNovel.setThemeIcon("sb_novel")
+        self.tbSearch.setThemeIcon("sb_search")
+        self.tbOutline.setThemeIcon("sb_outline")
+        self.tbBuild.setThemeIcon("sb_build")
+        self.tbDetails.setThemeIcon("sb_details")
+        self.tbStats.setThemeIcon("sb_stats")
         self.tbSettings.setThemeIcon("settings")
 
         return
@@ -160,4 +155,4 @@ class _PopRightMenu(QMenu):
             if isinstance(parent := self.parent(), QWidget):
                 offset = QPoint(parent.width(), parent.height() - self.height())
                 self.move(parent.mapToGlobal(offset))
-        return super(_PopRightMenu, self).event(event)
+        return super().event(event)

novelwriter/gui/statusbar.py

@@ -28,12 +28,12 @@ import logging
 from datetime import datetime
 from time import time
 
-from PyQt5.QtCore import QLocale, pyqtSlot
-from PyQt5.QtWidgets import QApplication, QLabel, QStatusBar, QWidget
+from PyQt6.QtCore import QLocale, pyqtSlot
+from PyQt6.QtWidgets import QApplication, QLabel, QStatusBar, QWidget
 
 from novelwriter import CONFIG, SHARED
 from novelwriter.common import formatTime
-from novelwriter.constants import nwConst
+from novelwriter.constants import nwConst, nwLabels, nwStats, trStats
 from novelwriter.extensions.modified import NClickableLabel
 from novelwriter.extensions.statusled import StatusLED
 
@@ -56,13 +56,11 @@ class GuiMainStatus(QStatusBar):
         # Permanent Widgets
         # =================
 
-        xM = CONFIG.pxInt(8)
-
         # The Spell Checker Language
         self.langIcon = QLabel("", self)
         self.langText = QLabel(self.tr("None"), self)
         self.langIcon.setContentsMargins(0, 0, 0, 0)
-        self.langText.setContentsMargins(0, 0, xM, 0)
+        self.langText.setContentsMargins(0, 0, 8, 0)
         self.addPermanentWidget(self.langIcon)
         self.addPermanentWidget(self.langText)
 
@@ -70,7 +68,7 @@ class GuiMainStatus(QStatusBar):
         self.docIcon = StatusLED(iPx, iPx, self)
         self.docText = QLabel(self.tr("Editor"), self)
         self.docIcon.setContentsMargins(0, 0, 0, 0)
-        self.docText.setContentsMargins(0, 0, xM, 0)
+        self.docText.setContentsMargins(0, 0, 8, 0)
         self.addPermanentWidget(self.docIcon)
         self.addPermanentWidget(self.docText)
 
@@ -78,7 +76,7 @@ class GuiMainStatus(QStatusBar):
         self.projIcon = StatusLED(iPx, iPx, self)
         self.projText = QLabel(self.tr("Project"), self)
         self.projIcon.setContentsMargins(0, 0, 0, 0)
-        self.projText.setContentsMargins(0, 0, xM, 0)
+        self.projText.setContentsMargins(0, 0, 8, 0)
         self.addPermanentWidget(self.projIcon)
         self.addPermanentWidget(self.projText)
 
@@ -86,7 +84,7 @@ class GuiMainStatus(QStatusBar):
         self.statsIcon = QLabel(self)
         self.statsText = QLabel("", self)
         self.statsIcon.setContentsMargins(0, 0, 0, 0)
-        self.statsText.setContentsMargins(0, 0, xM, 0)
+        self.statsText.setContentsMargins(0, 0, 8, 0)
         self.addPermanentWidget(self.statsIcon)
         self.addPermanentWidget(self.statsText)
 
@@ -110,11 +108,22 @@ class GuiMainStatus(QStatusBar):
 
         logger.debug("Ready: GuiMainStatus")
 
+        self.initSettings()
         self.updateTheme()
         self.clearStatus()
 
         return
 
+    def initSettings(self) -> None:
+        """Apply user settings."""
+        if CONFIG.useCharCount:
+            self._trStatsCount = trStats(nwLabels.STATS_DISPLAY[nwStats.CHARS])
+            self._trStatsTip = self.tr("Total character count (session change)")
+        else:
+            self._trStatsCount = trStats(nwLabels.STATS_DISPLAY[nwStats.WORDS])
+            self._trStatsTip = self.tr("Total word count (session change)")
+        return
+
     def clearStatus(self) -> None:
         """Reset all widgets on the status bar to default values."""
         self.setRefTime(-1.0)
@@ -128,15 +137,15 @@ class GuiMainStatus(QStatusBar):
     def updateTheme(self) -> None:
         """Update theme elements."""
         iPx = SHARED.theme.baseIconHeight
-        self.langIcon.setPixmap(SHARED.theme.getPixmap("status_lang", (iPx, iPx)))
-        self.statsIcon.setPixmap(SHARED.theme.getPixmap("status_stats", (iPx, iPx)))
-        self.timePixmap = SHARED.theme.getPixmap("status_time", (iPx, iPx))
-        self.idlePixmap = SHARED.theme.getPixmap("status_idle", (iPx, iPx))
+        self.langIcon.setPixmap(SHARED.theme.getPixmap("language", (iPx, iPx)))
+        self.statsIcon.setPixmap(SHARED.theme.getPixmap("stats", (iPx, iPx)))
+        self.timePixmap = SHARED.theme.getPixmap("timer", (iPx, iPx))
+        self.idlePixmap = SHARED.theme.getPixmap("timer_off", (iPx, iPx))
         self.timeIcon.setPixmap(self.timePixmap)
 
-        colNone = SHARED.theme.statNone
-        colSaved = SHARED.theme.statSaved
-        colUnsaved = SHARED.theme.statUnsaved
+        colNone = SHARED.theme.getIconColor("default").darker(150)
+        colSaved = SHARED.theme.getIconColor("green").darker(150)
+        colUnsaved = SHARED.theme.getIconColor("red").darker(150)
         self.docIcon.setColors(colNone, colSaved, colUnsaved)
         self.projIcon.setColors(colNone, colSaved, colUnsaved)
 
@@ -175,11 +184,8 @@ class GuiMainStatus(QStatusBar):
 
     def setProjectStats(self, pWC: int, sWC: int) -> None:
         """Update the current project statistics."""
-        self.statsText.setText(self.tr("Words: {0} ({1})").format(f"{pWC:n}", f"{sWC:+n}"))
-        if CONFIG.incNotesWCount:
-            self.statsText.setToolTip(self.tr("Project word count (session change)"))
-        else:
-            self.statsText.setToolTip(self.tr("Novel word count (session change)"))
+        self.statsText.setText(self._trStatsCount.format(f"{pWC:n}", f"{sWC:+n}"))
+        self.statsText.setToolTip(self._trStatsTip)
         return
 
     def updateTime(self, idleTime: float = 0.0) -> None: