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