LiquidGUI [1.3.0.0]

- Unified Labels class to handle Linux and Windows.

main.pyw

@@ -16,17 +16,15 @@ import common
 from MessageHandler import MessageHandler
 ## Platform Imports #########################################
 import globals
-from sys_vitals_helper import SysVitals_Helper
+from sys_vitals_helper import SysVitals_Helper, Component
+from styles import Labels
 if globals.os == "Windows":
     from LiquidCTL_Helper_Windows import LiquidCTL_Helper
-    from styles import Labels_Windows as Labels
     import win32mica # type: ignore
     import darkdetect # type: ignore
 elif globals.os == "Linux":
     from LiquidCTL_Helper_Linux import LiquidCTL_Helper
-    from styles import Labels_Linux as Labels
+
-    from pathlib import Path
-    from sys_vitals_helper import SysVitals_Helper, Component
 
 
 class MainWindow(QMainWindow):

styles/Labels.py

@@ -0,0 +1,46 @@
+from PySide6.QtWidgets import QLabel
+from PySide6.QtGui import QFont
+from PySide6.QtCore import Qt
+import globals
+
+def _set_os_family_font(ClassName: str):
+    _font = None
+
+    if globals.os == "Linux":
+        if ClassName == MainLabel.__name__ or SubLabel.__name__:
+            _font = "Noto Sans"
+        elif ClassName == SubLabelValue.__name__:
+            _font = "Noto Sans Mono"
+    elif globals.os == "Windows":
+        if ClassName == MainLabel.__name__ or SubLabel.__name__:
+            _font = "Calibri"
+        elif ClassName == SubLabelValue.__name__:
+            _font = "Cascadia Code"
+
+    return _font
+
+
+class MainLabel(QLabel):
+    def __init__(self):
+        super().__init__()
+        self.setAlignment(Qt.AlignmentFlag.AlignCenter)
+        self.setFont(QFont(_set_os_family_font(__class__.__name__),
+                          16,
+                          weight=QFont.Weight.ExtraBold))
+        
+class SubLabel(QLabel):
+    """ Formatting for sub-labels. """
+
+    def __init__(self, value):
+        super().__init__()
+        self.setFont(QFont(_set_os_family_font(__class__.__name__),
+                           12,
+                           weight=QFont.Weight.Thin))
+        self.setText(value)
+
+class SubLabelValue(QLabel):
+    """ Formatting for values. """
+    def __init__(self):
+        super().__init__()
+        self.setAlignment(Qt.AlignmentFlag.AlignRight)
+        self.setFont(QFont(_set_os_family_font(__class__.__name__), 8))

styles/Labels_Linux.py

@@ -1,27 +0,0 @@
-from PySide6.QtWidgets import QLabel
-from PySide6.QtGui import QFont
-from PySide6.QtCore import Qt
-
-class MainLabel(QLabel):
-    def __init__(self):
-        super().__init__()
-        self.setAlignment(Qt.AlignmentFlag.AlignCenter)
-        self.setFont(QFont("Noto Sans",
-                          16,
-                          weight=QFont.Weight.ExtraBold))
-class SubLabel(QLabel):
-    """ Formatting for sub-labels. """
-
-    def __init__(self, value):
-        super().__init__()
-        self.setFont(QFont("Noto Sans", 12, weight=QFont.Weight.Thin))
-        self.setText(value)
-class SubLabelValue(QLabel):
-    """ Formatting for values. """
-    def __init__(self):
-        super().__init__()
-        self.setAlignment(Qt.AlignmentFlag.AlignRight)
-        self.setFont(QFont("Noto Sans Mono", 8))
-
-
-

styles/Labels_Windows.py

@@ -1,27 +0,0 @@
-from PySide6.QtWidgets import QLabel
-from PySide6.QtGui import QFont
-from PySide6.QtCore import Qt
-
-class MainLabel(QLabel):
-    def __init__(self):
-        super().__init__()
-        self.setAlignment(Qt.AlignmentFlag.AlignCenter)
-        self.setFont(QFont("Calibri",
-                          14.5,
-                          weight=QFont.Weight.ExtraBold))
-class SubLabel(QLabel):
-    """ Formatting for sub-labels. """
-
-    def __init__(self, value):
-        super().__init__()
-        self.setFont(QFont("Calibri", 12, weight=QFont.Weight.Thin))
-        self.setText(value)
-class SubLabelValue(QLabel):
-    """ Formatting for values. """
-    def __init__(self):
-        super().__init__()
-        self.setAlignment(Qt.AlignmentFlag.AlignRight)
-        self.setFont(QFont("Cascadia Code", 8))
-
-
-