From e64fb28d892953cb7695a11f7080dc62657684a9 Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Tue, 26 Mar 2024 00:29:58 +0100 Subject: [PATCH] Revert some timer changes --- novelwriter/shared.py | 14 ++++---------- novelwriter/tools/manuscript.py | 6 +++++- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/novelwriter/shared.py b/novelwriter/shared.py index 88b2e316..15b66a9e 100644 --- a/novelwriter/shared.py +++ b/novelwriter/shared.py @@ -63,7 +63,6 @@ class SharedData(QObject): indexCleared = pyqtSignal() indexAvailable = pyqtSignal() mainClockTick = pyqtSignal() - slowClockTick = pyqtSignal() def __init__(self) -> None: super().__init__() @@ -81,13 +80,9 @@ class SharedData(QObject): self._idleRefTime = time() self._focusMode = False - self._fClock = QTimer(self) - self._fClock.setInterval(1000) - self._fClock.timeout.connect(lambda: self.mainClockTick.emit()) - - self._sClock = QTimer(self) - self._sClock.setInterval(10000) - self._sClock.timeout.connect(lambda: self.slowClockTick.emit()) + self._clock = QTimer(self) + self._clock.setInterval(1000) + self._clock.timeout.connect(lambda: self.mainClockTick.emit()) return @@ -168,8 +163,7 @@ class SharedData(QObject): soon as the Main GUI is created to ensure the SHARED singleton has the properties needed for operation. """ - self._fClock.start() - self._sClock.start() + self._clock.start() self._gui = gui self._theme = theme self._resetProject() diff --git a/novelwriter/tools/manuscript.py b/novelwriter/tools/manuscript.py index fd62e34d..977a10be 100644 --- a/novelwriter/tools/manuscript.py +++ b/novelwriter/tools/manuscript.py @@ -794,7 +794,11 @@ class _PreviewWidget(QTextBrowser): self._updateDocMargins() self._updateBuildAge() - SHARED.slowClockTick.connect(self._updateBuildAge) + # Age Timer + self.ageTimer = QTimer(self) + self.ageTimer.setInterval(10000) + self.ageTimer.timeout.connect(self._updateBuildAge) + self.ageTimer.start() return