Make Resources() and actual singleton

This commit is contained in:
Christopher T. Johnson
2024-04-14 18:52:23 -04:00
parent b3ccaa5fc4
commit 1a206558e6

View File

@@ -42,39 +42,37 @@ class Resources:
if cls._instance: if cls._instance:
return cls._instance return cls._instance
cls._instance = super(Resources, cls).__new__(cls) cls._instance = super(Resources, cls).__new__(cls)
return cls._instance
def __init__(self) -> None:
super(Resources, self).__init__()
# #
# Fonts # Fonts
# #
self.headerFont = QFontDatabase.font("OpenDyslexic", None, 10) cls.headerFont = QFontDatabase.font("OpenDyslexic", None, 10)
self.headerFont.setPixelSize(48) cls.headerFont.setPixelSize(48)
self.labelFont = QFont(self.headerFont) cls.labelFont = QFont(cls.headerFont)
self.labelFont.setPixelSize(30) cls.labelFont.setPixelSize(30)
self.boldFont = QFont(self.headerFont) cls.boldFont = QFont(cls.headerFont)
self.boldFont.setPixelSize(20) cls.boldFont.setPixelSize(20)
self.textFont = QFont(self.boldFont) cls.textFont = QFont(cls.boldFont)
self.italicFont = QFont(self.boldFont) cls.italicFont = QFont(cls.boldFont)
self.capsFont = QFont(self.boldFont) cls.capsFont = QFont(cls.boldFont)
self.smallCapsFont = QFont(self.boldFont) cls.smallCapsFont = QFont(cls.boldFont)
self.headerFont.setWeight(QFont.Weight.Bold) cls.headerFont.setWeight(QFont.Weight.Bold)
self.boldFont.setBold(True) cls.boldFont.setBold(True)
self.italicFont.setItalic(True) cls.italicFont.setItalic(True)
self.capsFont.setCapitalization(QFont.Capitalization.AllUppercase) print(f"Resources().italicFont: {cls.italicFont.toString()}")
self.smallCapsFont.setCapitalization(QFont.Capitalization.SmallCaps) print(f"Resources().boldFont: {cls.boldFont.toString()}")
cls.capsFont.setCapitalization(QFont.Capitalization.AllUppercase)
cls.smallCapsFont.setCapitalization(QFont.Capitalization.SmallCaps)
self.phonicFont = QFontDatabase.font("Gentium", None, 10) cls.phonicFont = QFontDatabase.font("Gentium", None, 10)
self.phonicFont.setPixelSize(20) cls.phonicFont.setPixelSize(20)
# #
# colors # colors
# #
self.baseColor = QColor(Qt.GlobalColor.white) cls.baseColor = QColor(Qt.GlobalColor.white)
self.linkColor = QColor("#4a7d95") cls.linkColor = QColor("#4a7d95")
self.subduedColor = QColor(Qt.GlobalColor.gray) cls.subduedColor = QColor(Qt.GlobalColor.gray)
# #
# Setup the Network Manager # Setup the Network Manager
@@ -88,5 +86,5 @@ class Resources:
cacheDir = QDir(cacheDir.path() + QDir.separator() + "Troglodite") cacheDir = QDir(cacheDir.path() + QDir.separator() + "Troglodite")
netCache = QNetworkDiskCache() netCache = QNetworkDiskCache()
netCache.setCacheDirectory(cacheDir.path()) netCache.setCacheDirectory(cacheDir.path())
self.nam.setCache(netCache) cls.nam.setCache(netCache)
return return cls._instance