Merge branch 'vkbo:main' into theme_fixes

This commit is contained in:
Myian
2025-08-23 23:37:51 +02:00
committed by GitHub
5 changed files with 9 additions and 7 deletions
-1
View File
@@ -124,7 +124,6 @@ markers = [
"base: Base classes tests", "base: Base classes tests",
"core: Core classes tests", "core: Core classes tests",
"gui: GUI classes tests", "gui: GUI classes tests",
"serial",
] ]
[tool.coverage.run] [tool.coverage.run]
+1
View File
@@ -18,6 +18,7 @@ if __name__ == "__main__":
args = parser.parse_args() args = parser.parse_args()
env = os.environ.copy() env = os.environ.copy()
env["QT_SCALE_FACTOR"] = "1.0"
cmd = [sys.executable, "-m", "pytest", "-vv"] cmd = [sys.executable, "-m", "pytest", "-vv"]
if args.o: if args.o:
+3 -3
View File
@@ -10,9 +10,9 @@ synchronisation tools. All text is saved as plain text files with a meta data he
project structure is stored in a single project XML file, and other meta data is primarily saved as project structure is stored in a single project XML file, and other meta data is primarily saved as
JSON files. JSON files.
The application is written with Python 3 (3.10+) using Qt6 and PyQt6 (5.10+). It is developed on The application is written with Python 3 using Qt6 and PyQt6. It is developed on Linux, but should
Linux, but should in principle work fine on other operating systems as well as long as dependencies in principle work fine on other operating systems as well as long as dependencies are met. It is
are met. It is regularly tested on Debian and Ubuntu Linux, Windows, and MacOS. regularly tested on Debian and Ubuntu Linux, Windows, and MacOS.
novelWriter is developed and maintained by [Veronica Berglyd Olsen](https://github.com/vkbo). novelWriter is developed and maintained by [Veronica Berglyd Olsen](https://github.com/vkbo).
+1 -1
View File
@@ -1,6 +1,6 @@
novelWriter License novelWriter License
Copyright (C) 2018-2025 Veronica Berglyd Olsen Copyright (C) Veronica Berglyd Olsen and novelWriter contributors
License: GPL v3+ <https://www.gnu.org/licenses/gpl-3.0.html> License: GPL v3+ <https://www.gnu.org/licenses/gpl-3.0.html>
This program is free software: you can redistribute it and/or modify This program is free software: you can redistribute it and/or modify
+4 -2
View File
@@ -431,11 +431,13 @@ def testGuiTheme_LoadIcons():
assert qIcon.isNull() is False assert qIcon.isNull() is False
# Load it as a pixmap with a size # Load it as a pixmap with a size
# If this part of the test fails, you may need to set the
# environment variable: QT_SCALE_FACTOR=1
qPix = iconCache.getPixmap("add", (50, 50)) qPix = iconCache.getPixmap("add", (50, 50))
assert isinstance(qPix, QPixmap) assert isinstance(qPix, QPixmap)
assert qPix.isNull() is False assert qPix.isNull() is False
assert qPix.width() == 50 assert qPix.width() == 50, "If this fails, make sure QT_SCALE_FACTOR=1"
assert qPix.height() == 50 assert qPix.height() == 50, "If this fails, make sure QT_SCALE_FACTOR=1"
# Load app icon # Load app icon
qIcon = iconCache.getIcon("novelwriter") qIcon = iconCache.getIcon("novelwriter")