novelWriter 2.7.4__py3-none-any.whl → 2.8b1__py3-none-any.whl

novelwriter/gui/search.py

@@ -20,7 +20,7 @@ General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program. If not, see <https://www.gnu.org/licenses/>.
-"""
+"""  # noqa
 from __future__ import annotations
 
 import logging
@@ -50,6 +50,7 @@ logger = logging.getLogger(__name__)
 
 
 class GuiProjectSearch(QWidget):
+    """GUI: Project Search Panel."""
 
     C_NAME   = 0
     C_RESULT = 0
@@ -106,7 +107,7 @@ class GuiProjectSearch(QWidget):
 
         # Search Box
         self.searchAction = QAction("", self)
-        self.searchAction.setIcon(SHARED.theme.getIcon("search", "blue"))
+        self.searchAction.setIcon(SHARED.theme.getIcon("search", "apply"))
         self.searchAction.triggered.connect(self._processSearch)
 
         self.searchText = QLineEdit(self)
@@ -151,14 +152,14 @@ class GuiProjectSearch(QWidget):
 
         logger.debug("Ready: GuiProjectSearch")
 
-        return
-
     ##
     #  Methods
     ##
 
     def updateTheme(self) -> None:
         """Update theme elements."""
+        logger.debug("Theme Update: GuiProjectSearch")
+
         palette = QApplication.palette()
         colBase = palette.base().color().name(QtHexArgb)
         colFocus = palette.highlight().color().name(QtHexArgb)
@@ -169,12 +170,10 @@ class GuiProjectSearch(QWidget):
             f"QLineEdit:focus {{border: 1px solid {colFocus};}} "
         )
 
-        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"))
-
-        return
+        self.searchAction.setIcon(SHARED.theme.getIcon("search", "apply"))
+        self.toggleCase.setIcon(SHARED.theme.getIcon("search_case", "tool"))
+        self.toggleWord.setIcon(SHARED.theme.getIcon("search_word", "tool"))
+        self.toggleRegEx.setIcon(SHARED.theme.getIcon("search_regex", "tool"))
 
     def processReturn(self) -> None:
         """Process a return keypress forwarded from the main GUI."""
@@ -189,7 +188,6 @@ class GuiProjectSearch(QWidget):
             self.openDocumentSelectRequest.emit(
                 str(data[0]), checkInt(data[1], -1), checkInt(data[2], -1), False
             )
-        return
 
     def beginSearch(self, text: str = "") -> None:
         """Focus the search box and select its text, if any."""
@@ -198,20 +196,17 @@ class GuiProjectSearch(QWidget):
         if text:
             self.searchText.setText(text.partition("\n")[0])
             self.searchText.selectAll()
-        return
 
     def closeProjectTasks(self) -> None:
         """Run close project tasks."""
         self._map = {}
         self.searchText.clear()
         self.searchResult.clear()
-        return
 
     def refreshCurrentSearch(self) -> None:
         """Refresh the search if there is one."""
         if self.searchResult.topLevelItemCount() > 0:
             self._processSearch()
-        return
 
     ##
     #  Events
@@ -238,7 +233,6 @@ class GuiProjectSearch(QWidget):
             self.searchText.setFocus()
         else:
             super().keyPressEvent(event)
-        return
 
     ##
     #  Public Slots
@@ -252,7 +246,6 @@ class GuiProjectSearch(QWidget):
             results, capped = self._search.searchText(SHARED.mainGui.docEditor.getText())
             self._displayResultSet(SHARED.project.tree[tHandle], results, capped)
             logger.debug("Updated search for '%s' in %.3f ms", tHandle, 1000*(time() - start))
-        return
 
     ##
     #  Private Slots
@@ -278,7 +271,6 @@ class GuiProjectSearch(QWidget):
             self._time = time()
             QApplication.restoreOverrideCursor()
         self._blocked = False
-        return
 
     @pyqtSlot()
     def _searchResultSelected(self) -> None:
@@ -288,7 +280,6 @@ class GuiProjectSearch(QWidget):
                 self.selectedItemChanged.emit(str(data[0]))
             elif data := items[0].data(0, self.D_HANDLE):
                 self.selectedItemChanged.emit(str(data))
-        return
 
     @pyqtSlot("QTreeWidgetItem*", int)
     def _searchResultDoubleClicked(self, item: QTreeWidgetItem, column: int) -> None:
@@ -297,28 +288,24 @@ class GuiProjectSearch(QWidget):
             self.openDocumentSelectRequest.emit(
                 str(data[0]), checkInt(data[1], -1), checkInt(data[2], -1), True
             )
-        return
 
     @pyqtSlot(bool)
     def _toggleCase(self, state: bool) -> None:
         """Enable/disable case sensitive mode."""
         CONFIG.searchProjCase = state
         self.refreshCurrentSearch()
-        return
 
     @pyqtSlot(bool)
     def _toggleWord(self, state: bool) -> None:
         """Enable/disable whole word search mode."""
         CONFIG.searchProjWord = state
         self.refreshCurrentSearch()
-        return
 
     @pyqtSlot(bool)
     def _toggleRegEx(self, state: bool) -> None:
         """Enable/disable regular expression search mode."""
         CONFIG.searchProjRegEx = state
         self.refreshCurrentSearch()
-        return
 
     ##
     #  Internal Functions
@@ -360,5 +347,3 @@ class GuiProjectSearch(QWidget):
                 self.searchResult.setFirstColumnSpanned(i, parent, True)
 
             QApplication.processEvents()
-
-        return

novelwriter/gui/sidebar.py

@@ -20,19 +20,20 @@ General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program. If not, see <https://www.gnu.org/licenses/>.
-"""
+"""  # noqa
 from __future__ import annotations
 
 import logging
 
 from typing import TYPE_CHECKING
 
-from PyQt6.QtCore import QEvent, QPoint, QSize, pyqtSignal
+from PyQt6.QtCore import QEvent, QPoint, pyqtSignal, pyqtSlot
 from PyQt6.QtWidgets import QMenu, QVBoxLayout, QWidget
 
-from novelwriter import SHARED
+from novelwriter import CONFIG, SHARED
 from novelwriter.common import qtLambda
-from novelwriter.enum import nwView
+from novelwriter.constants import nwLabels, trConst
+from novelwriter.enum import nwTheme, nwView
 from novelwriter.extensions.eventfilters import StatusTipFilter
 from novelwriter.extensions.modified import NIconToolButton
 from novelwriter.gui.theme import STYLES_BIG_TOOLBUTTON
@@ -44,6 +45,7 @@ logger = logging.getLogger(__name__)
 
 
 class GuiSideBar(QWidget):
+    """GUI: Main Window SideBar."""
 
     requestViewChange = pyqtSignal(nwView)
 
@@ -54,8 +56,7 @@ class GuiSideBar(QWidget):
 
         self.mainGui = mainGui
 
-        iPx = int(1.25*SHARED.theme.baseButtonHeight)
-        iSz = QSize(iPx, iPx)
+        iSz = SHARED.theme.sidebarIconSize
 
         self.setContentsMargins(0, 0, 0, 0)
         self.installEventFilter(StatusTipFilter(self.mainGui))
@@ -77,9 +78,9 @@ class GuiSideBar(QWidget):
         self.tbOutline.setToolTip("{0} [Ctrl+Shift+T]".format(self.tr("Novel Outline View")))
         self.tbOutline.clicked.connect(qtLambda(self.requestViewChange.emit, nwView.OUTLINE))
 
-        self.tbBuild = NIconToolButton(self, iSz)
-        self.tbBuild.setToolTip("{0} [F5]".format(self.tr("Build Manuscript")))
-        self.tbBuild.clicked.connect(self.mainGui.showBuildManuscriptDialog)
+        self.tbTheme = NIconToolButton(self, iSz)
+        self.tbTheme.setToolTip(self.tr("Switch Colour Theme"))
+        self.tbTheme.clicked.connect(self._cycleColurTheme)
 
         self.tbDetails = NIconToolButton(self, iSz)
         self.tbDetails.setToolTip("{0} [Shift+F6]".format(self.tr("Novel Details")))
@@ -89,6 +90,10 @@ class GuiSideBar(QWidget):
         self.tbStats.setToolTip("{0} [F6]".format(self.tr("Writing Statistics")))
         self.tbStats.clicked.connect(self.mainGui.showWritingStatsDialog)
 
+        self.tbBuild = NIconToolButton(self, iSz)
+        self.tbBuild.setToolTip("{0} [F5]".format(self.tr("Build Manuscript")))
+        self.tbBuild.clicked.connect(self.mainGui.showBuildManuscriptDialog)
+
         # Settings Menu
         self.tbSettings = NIconToolButton(self, iSz)
         self.tbSettings.setToolTip(self.tr("Settings"))
@@ -111,6 +116,7 @@ class GuiSideBar(QWidget):
         self.outerBox.addStretch(1)
         self.outerBox.addWidget(self.tbDetails)
         self.outerBox.addWidget(self.tbStats)
+        self.outerBox.addWidget(self.tbTheme)
         self.outerBox.addWidget(self.tbSettings)
         self.outerBox.setContentsMargins(0, 0, 0, 0)
         self.outerBox.setSpacing(6)
@@ -120,12 +126,11 @@ class GuiSideBar(QWidget):
 
         logger.debug("Ready: GuiSideBar")
 
-        return
-
     def updateTheme(self) -> None:
         """Initialise GUI elements that depend on specific settings."""
-        buttonStyle = SHARED.theme.getStyleSheet(STYLES_BIG_TOOLBUTTON)
+        logger.debug("Theme Update: GuiSideBar")
 
+        buttonStyle = SHARED.theme.getStyleSheet(STYLES_BIG_TOOLBUTTON)
         self.tbProject.setStyleSheet(buttonStyle)
         self.tbNovel.setStyleSheet(buttonStyle)
         self.tbSearch.setStyleSheet(buttonStyle)
@@ -133,18 +138,45 @@ class GuiSideBar(QWidget):
         self.tbBuild.setStyleSheet(buttonStyle)
         self.tbDetails.setStyleSheet(buttonStyle)
         self.tbStats.setStyleSheet(buttonStyle)
+        self.tbTheme.setStyleSheet(buttonStyle)
         self.tbSettings.setStyleSheet(buttonStyle)
 
-        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
+        self.tbProject.setThemeIcon("sb_project", "sidebar")
+        self.tbNovel.setThemeIcon("sb_novel", "sidebar")
+        self.tbSearch.setThemeIcon("sb_search", "sidebar")
+        self.tbOutline.setThemeIcon("sb_outline", "sidebar")
+        self.tbBuild.setThemeIcon("sb_build", "sidebar")
+        self.tbDetails.setThemeIcon("sb_details", "sidebar")
+        self.tbStats.setThemeIcon("sb_stats", "sidebar")
+        self.tbSettings.setThemeIcon("settings", "sidebar")
+
+        self._setThemeModeIcon()
+
+    ##
+    #  Private Slots
+    ##
+
+    @pyqtSlot()
+    def _cycleColurTheme(self) -> None:
+        """Go to nex colour theme."""
+        match CONFIG.themeMode:
+            case nwTheme.AUTO:
+                CONFIG.themeMode = nwTheme.LIGHT
+            case nwTheme.LIGHT:
+                CONFIG.themeMode = nwTheme.DARK
+            case nwTheme.DARK:
+                CONFIG.themeMode = nwTheme.AUTO
+        self.mainGui.checkThemeUpdate()
+        self._setThemeModeIcon()
+
+    ##
+    #  Internal Functions
+    ##
+
+    def _setThemeModeIcon(self) -> None:
+        """Set the theme button icon."""
+        self.tbTheme.setThemeIcon(nwLabels.THEME_MODE_ICON[CONFIG.themeMode], "sidebar")
+        self.tbTheme.setToolTip(trConst(nwLabels.THEME_MODE_LABEL[CONFIG.themeMode]))
 
 
 class _PopRightMenu(QMenu):

novelwriter/gui/statusbar.py

@@ -20,7 +20,7 @@ General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program. If not, see <https://www.gnu.org/licenses/>.
-"""
+"""  # noqa
 from __future__ import annotations
 
 import logging
@@ -41,6 +41,7 @@ logger = logging.getLogger(__name__)
 
 
 class GuiMainStatus(QStatusBar):
+    """GUI: Main Window Status Bar."""
 
     def __init__(self, parent: QWidget) -> None:
         super().__init__(parent=parent)
@@ -112,8 +113,6 @@ class GuiMainStatus(QStatusBar):
         self.updateTheme()
         self.clearStatus()
 
-        return
-
     def initSettings(self) -> None:
         """Apply user settings."""
         if CONFIG.useCharCount:
@@ -122,7 +121,6 @@ class GuiMainStatus(QStatusBar):
         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."""
@@ -132,10 +130,11 @@ class GuiMainStatus(QStatusBar):
         self.setProjectStatus(None)
         self.setDocumentStatus(None)
         self.updateTime()
-        return
 
     def updateTheme(self) -> None:
         """Update theme elements."""
+        logger.debug("Theme Update: GuiMainStatus")
+
         iPx = SHARED.theme.baseIconHeight
         self.langIcon.setPixmap(SHARED.theme.getPixmap("language", (iPx, iPx)))
         self.statsIcon.setPixmap(SHARED.theme.getPixmap("stats", (iPx, iPx)))
@@ -143,14 +142,12 @@ class GuiMainStatus(QStatusBar):
         self.idlePixmap = SHARED.theme.getPixmap("timer_off", (iPx, iPx))
         self.timeIcon.setPixmap(self.timePixmap)
 
-        colNone = SHARED.theme.getIconColor("default").darker(150)
-        colSaved = SHARED.theme.getIconColor("green").darker(150)
-        colUnsaved = SHARED.theme.getIconColor("red").darker(150)
+        colNone = SHARED.theme.getBaseColor("default")
+        colSaved = SHARED.theme.getBaseColor("green")
+        colUnsaved = SHARED.theme.getBaseColor("red")
         self.docIcon.setColors(colNone, colSaved, colUnsaved)
         self.projIcon.setColors(colNone, colSaved, colUnsaved)
 
-        return
-
     ##
     #  Setters
     ##
@@ -158,17 +155,14 @@ class GuiMainStatus(QStatusBar):
     def setRefTime(self, refTime: float) -> None:
         """Set the reference time for the status bar clock."""
         self._refTime = refTime
-        return
 
     def setProjectStatus(self, state: bool | None) -> None:
         """Set the project status colour icon."""
         self.projIcon.setState(state)
-        return
 
     def setDocumentStatus(self, state: bool | None) -> None:
         """Set the document status colour icon."""
         self.docIcon.setState(state)
-        return
 
     def setUserIdle(self, idle: bool) -> None:
         """Change the idle status icon."""
@@ -180,13 +174,11 @@ class GuiMainStatus(QStatusBar):
             else:
                 self.timeIcon.setPixmap(self.timePixmap)
             self._userIdle = idle
-        return
 
     def setProjectStats(self, pWC: int, sWC: int) -> None:
         """Update the current project statistics."""
         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:
         """Update the session clock."""
@@ -198,7 +190,6 @@ class GuiMainStatus(QStatusBar):
             else:
                 sessTime = round(time() - self._refTime)
             self.timeText.setText(formatTime(sessTime))
-        return
 
     ##
     #  Public Slots
@@ -209,7 +200,6 @@ class GuiMainStatus(QStatusBar):
         """Set the status bar message to display."""
         self.showMessage(message, nwConst.STATUS_MSG_TIMEOUT)
         QApplication.processEvents()
-        return
 
     @pyqtSlot(str, str)
     def setLanguage(self, language: str, provider: str) -> None:
@@ -220,19 +210,16 @@ class GuiMainStatus(QStatusBar):
         else:
             self.langText.setText(QLocale(language).nativeLanguageName().title())
             self.langText.setToolTip(f"{language} ({provider})" if provider else language)
-        return
 
     @pyqtSlot(bool)
     def updateProjectStatus(self, status: bool) -> None:
         """Update the project status."""
         self.setProjectStatus(not status)
-        return
 
     @pyqtSlot(bool)
     def updateDocumentStatus(self, status: bool) -> None:
         """Update the document status."""
         self.setDocumentStatus(not status)
-        return
 
     ##
     #  Private Slots
@@ -244,7 +231,6 @@ class GuiMainStatus(QStatusBar):
         state = not CONFIG.showSessionTime
         self.timeText.setVisible(state)
         CONFIG.showSessionTime = state
-        return
 
     ##
     #  Debug
@@ -279,4 +265,3 @@ class GuiMainStatus(QStatusBar):
         )
         self.showMessage(f"Debug [{stamp}] {message}", 6000)
         logger.debug("[MEMINFO] %s", message)
-        return