From a2254512f76c0058e17b63d2457585d45775ae79 Mon Sep 17 00:00:00 2001
From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com>
Date: Sun, 3 Sep 2023 21:03:21 +0200
Subject: [PATCH 1/2] Fix minor issue with translation string
---
i18n/nw_base.ts | 18 +++++++++---------
novelwriter/tools/manuscript.py | 2 +-
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/i18n/nw_base.ts b/i18n/nw_base.ts
index 6db13f00..6ff40f90 100644
--- a/i18n/nw_base.ts
+++ b/i18n/nw_base.ts
@@ -4500,17 +4500,17 @@
-
+
Name
-
+
Selection
-
+
Title
@@ -4653,27 +4653,27 @@
_PreviewWidget
-
- Press the "Build Preview" button to generate ...
+
+ Press the "Preview" button to generate ...
-
+
Processing ...
-
+
Done
-
+
Unknown
-
+
Built
diff --git a/novelwriter/tools/manuscript.py b/novelwriter/tools/manuscript.py
index b0163806..3a8e2f91 100644
--- a/novelwriter/tools/manuscript.py
+++ b/novelwriter/tools/manuscript.py
@@ -655,7 +655,7 @@ class _PreviewWidget(QTextBrowser):
self.document().setDocumentMargin(CONFIG.getTextMargin())
self.setPlaceholderText(self.tr(
- "Press the \"Build Preview\" button to generate ..."
+ "Press the \"Preview\" button to generate ..."
))
self.setVerticalScrollBarPolicy(Qt.ScrollBarPolicy.ScrollBarAlwaysOn)
From a358a0007a3f34bf30ff00037f16dcc3981082af Mon Sep 17 00:00:00 2001
From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com>
Date: Sun, 3 Sep 2023 21:12:54 +0200
Subject: [PATCH 2/2] Fix writing stats font size issue (#1442)
---
novelwriter/tools/writingstats.py | 26 ++++++++++++--------------
1 file changed, 12 insertions(+), 14 deletions(-)
diff --git a/novelwriter/tools/writingstats.py b/novelwriter/tools/writingstats.py
index 74b11da7..cc43a510 100644
--- a/novelwriter/tools/writingstats.py
+++ b/novelwriter/tools/writingstats.py
@@ -30,7 +30,7 @@ from datetime import datetime
from typing import TYPE_CHECKING
from PyQt5.QtGui import QPixmap, QCursor
-from PyQt5.QtCore import Qt
+from PyQt5.QtCore import Qt, pyqtSlot
from PyQt5.QtWidgets import (
qApp, QDialog, QTreeWidget, QTreeWidgetItem, QDialogButtonBox, QGridLayout,
QLabel, QGroupBox, QMenu, QAction, QFileDialog, QSpinBox, QHBoxLayout
@@ -63,7 +63,7 @@ class GuiWritingStats(QDialog):
FMT_JSON = 0
FMT_CSV = 1
- def __init__(self, mainGui: GuiMain):
+ def __init__(self, mainGui: GuiMain) -> None:
super().__init__(parent=mainGui)
logger.debug("Create: GuiWritingStats")
@@ -294,11 +294,11 @@ class GuiWritingStats(QDialog):
return
- def __del__(self): # pragma: no cover
+ def __del__(self) -> None: # pragma: no cover
logger.debug("Delete: GuiWritingStats")
return
- def populateGUI(self):
+ def populateGUI(self) -> None:
"""Populate list box with data from the log file."""
qApp.setOverrideCursor(QCursor(Qt.WaitCursor))
self._loadLogFile()
@@ -310,7 +310,7 @@ class GuiWritingStats(QDialog):
# Slots
##
- def _doClose(self):
+ def _doClose(self) -> None:
"""Save the state of the window, clear cache, end close."""
self.logData = []
@@ -351,7 +351,7 @@ class GuiWritingStats(QDialog):
return
- def _saveData(self, dataFmt):
+ def _saveData(self, dataFmt: int) -> bool:
"""Save the content of the list box to a file."""
fileExt = ""
textFmt = ""
@@ -426,7 +426,7 @@ class GuiWritingStats(QDialog):
# Internal Functions
##
- def _loadLogFile(self):
+ def _loadLogFile(self) -> None:
"""Load the content of the log file into a buffer."""
logger.debug("Loading session log file")
@@ -473,10 +473,11 @@ class GuiWritingStats(QDialog):
return
##
- # Slots
+ # Private Slots
##
- def _updateListBox(self):
+ @pyqtSlot()
+ def _updateListBox(self) -> None:
"""Load/reload the content of the list box."""
self.listBox.clear()
self.timeFilter = 0.0
@@ -587,16 +588,13 @@ class GuiWritingStats(QDialog):
newItem.setFont(self.C_TIME, SHARED.theme.guiFontFixed)
newItem.setFont(self.C_LENGTH, SHARED.theme.guiFontFixed)
newItem.setFont(self.C_COUNT, SHARED.theme.guiFontFixed)
- if showIdleTime:
- newItem.setFont(self.C_IDLE, SHARED.theme.guiFontFixed)
- else:
- newItem.setFont(self.C_IDLE, SHARED.theme.guiFont)
+ newItem.setFont(self.C_IDLE, SHARED.theme.guiFontFixed)
self.listBox.addTopLevelItem(newItem)
self.timeFilter += sDiff
self.labelFilter.setText(formatTime(round(self.timeFilter)))
- return True
+ return
# END Class GuiWritingStats