Begin work on adjusting stylings for Ubuntu 26.04, dark mode toggling.

.gitignore

@@ -7,4 +7,5 @@ scratch*.py
 *.log
 coverage.xml
 docs/_build/
-debian/files
+debian/files
+*.egg-info

faslr/__main__.py

@@ -30,6 +30,8 @@
 )
 
 from faslr.style.main import (
+    MAIN_WINDOW_BACKGROUND_COLOR_DARK,
+    MAIN_WINDOW_BACKGROUND_COLOR_LIGHT,
     MAIN_WINDOW_HEIGHT,
     MAIN_WINDOW_WIDTH,
     MAIN_WINDOW_TITLE
@@ -41,6 +43,11 @@
     QThreadPool
 )
 
+from PyQt6.QtGui import (
+    QGuiApplication,
+    QPalette
+)
+
 from PyQt6.QtWidgets import (
     QApplication,
     QMainWindow,
@@ -80,6 +87,8 @@ def __init__(
             MAIN_WINDOW_HEIGHT
         )
 
+        self.set_background_color(scheme=QGuiApplication.styleHints().colorScheme())
+
         self.setWindowTitle(MAIN_WINDOW_TITLE)
 
         self.layout = QVBoxLayout()
@@ -110,6 +119,8 @@ def __init__(
 
         self.auto_triangle = load_sample('us_industry_auto')
         self.xyz_triangle = load_sample('uspp_incr_case')
+
+        QGuiApplication.styleHints().colorSchemeChanged.connect(self.set_background_color)
         self.auto_tab = AnalysisTab(
             triangle=self.auto_triangle
         )
@@ -118,6 +129,7 @@ def __init__(
         )
 
         self.analysis_pane = QTabWidget()
+
         self.analysis_pane.setTabsClosable(True)
         self.analysis_pane.setMovable(True)
         self.analysis_pane.addTab(self.auto_tab, "Auto")
@@ -153,6 +165,19 @@ def __init__(
                 main_window=self
             )
 
+
+
+    def set_background_color(self, scheme: Qt.ColorScheme) -> None:
+        QApplication.setPalette(QApplication.style().standardPalette())
+
+        palette = self.palette()
+        if scheme == Qt.ColorScheme.Dark:
+            color = MAIN_WINDOW_BACKGROUND_COLOR_DARK
+        else:
+            color = MAIN_WINDOW_BACKGROUND_COLOR_LIGHT
+        palette.setColor(self.backgroundRole(), color)
+        self.setPalette(palette)
+
     def remove_tab(
             self,
             index: int

faslr/about.py

@@ -1,3 +1,5 @@
+from faslr.common.icon import InfoIcon
+
 from faslr.constants import (
     BUILD_VERSION,
     CURRENT_BRANCH,
@@ -11,8 +13,8 @@
     Qt
 )
 
-from PyQt6.QtSvgWidgets import (
-    QSvgWidget
+from PyQt6.QtGui import (
+    QGuiApplication, QPalette, QColor
 )
 
 from PyQt6.QtWidgets import (
@@ -40,30 +42,44 @@ def __init__(
 
         faslr_version = "FASLR v" + BUILD_VERSION
 
-        faslr_version_link = '<a href="https://github.com/casact/faslr" ' \
-                             'style="text-decoration:none; color:#000000">' + \
-                             faslr_version + '</a>'
+        faslr_version_link = "https://github.com/casact/faslr"
 
-        branch_link = '<a href="https://github.com/casact/faslr/tree/' + \
-                      CURRENT_BRANCH + '" ' \
-                      'style="text-decoration:none; color:#000000">' + \
-                      CURRENT_BRANCH + '</a>'
+        branch_link = "https://github.com/casact/faslr/tree/" + CURRENT_BRANCH
 
-        commit_link = '<a href="https://github.com/casact/faslr/commit/' + \
-                      CURRENT_COMMIT_LONG + '" ' \
-                      'style="text-decoration:none; color:#000000">' + \
-                      CURRENT_COMMIT + '</a>'
+        commit_link = "https://github.com/casact/faslr/commit/" + CURRENT_COMMIT_LONG
 
-        version_label = LinkLabel(faslr_version_link)
+        version_label = LinkLabel(
+            url=faslr_version_link,
+            label_text=faslr_version
+        )
 
-        branch_label = LinkLabel(branch_link)
-        commit_label = LinkLabel(commit_link)
+        branch_label = LinkLabel(
+            url=branch_link,
+            label_text=CURRENT_BRANCH
+        )
+
+        commit_label = LinkLabel(
+            url=commit_link,
+            label_text=CURRENT_COMMIT
+        )
 
-        gh_svg = InfoIcon(ICONS_PATH + "github.svg")
+        gh_svg = InfoIcon(
+            svg_path=ICONS_PATH + "github.svg",
+            width=24,
+            height=24
+        )
 
-        branch_svg = InfoIcon(OCTICONS_PATH + "git-branch-24.svg")
+        branch_svg = InfoIcon(
+            svg_path=OCTICONS_PATH + "git-branch-24.svg",
+            width=24,
+            height=24
+        )
 
-        commit_svg = InfoIcon(OCTICONS_PATH + "commit-24.svg")
+        commit_svg = InfoIcon(
+            OCTICONS_PATH + "commit-24.svg",
+            width=24,
+            height=24
+        )
 
         layout = QVBoxLayout()
 
@@ -99,22 +115,18 @@ def ok(self) -> None:
         self.close()
 
 
-class InfoIcon(QSvgWidget):
-    def __init__(
-            self,
-            svg_path: str
-    ):
-        super().__init__(svg_path)
-
-        self.setFixedSize(24, 24)
 
 
 class LinkLabel(QLabel):
     def __init__(
             self,
-            url: str
+            url: str,
+            label_text: str
     ):
-        super().__init__(url)
+        super().__init__()
+
+        self.url = url
+        self.label_text = label_text
 
         self.setTextFormat(Qt.TextFormat.RichText)
 
@@ -123,3 +135,19 @@ def __init__(
         )
 
         self.setOpenExternalLinks(True)
+        self.apply_theme(
+            scheme=QGuiApplication.styleHints().colorScheme()  # noqa
+        )
+
+        QGuiApplication.styleHints().colorSchemeChanged.connect(self.apply_theme)  # noqa
+
+
+    def apply_theme(self, scheme: Qt.ColorScheme):
+
+        if scheme == Qt.ColorScheme.Dark:
+            color = "#FFFFFF"
+        else:
+            color = "#000000"
+
+        self.setText(f'<a href="{self.url}" style="text-decoration:none; color:{color};">{self.label_text}</a>')
+

faslr/analysis.py

@@ -12,13 +12,21 @@
     VALUE_TYPES_COMBO_BOX_WIDTH
 )
 
+from faslr.style.analysis import (
+    qss_analysis_tab_palette,
+    qss_column_tab
+)
+
 from faslr.utilities.accessors import get_column
 
 from PyQt6.QtCore import (
     Qt
 )
 
-from PyQt6.QtGui import QColor
+from PyQt6.QtGui import (
+    QColor,
+    QGuiApplication
+)
 
 from PyQt6.QtWidgets import (
     QComboBox,
@@ -59,6 +67,7 @@ def __init__(
 
         self.triangle = triangle
         self.lob = lob
+        self.theme = QGuiApplication.styleHints().colorScheme()
 
         self.layout = QVBoxLayout()
 
@@ -89,11 +98,11 @@ def __init__(
 
         # Used to solve some issues with borders not appearing when there's only 1 tab.
         if column_count == 1:
-            bottom_border_width = 1
-            margin_top = "22"
+            self.bottom_border_width = "1"
+            self.margin_top = "22"
         else:
-            bottom_border_width = 0
-            margin_top = "0"
+            self.bottom_border_width = "0"
+            self.margin_top = "0"
 
         # For each chainladder column, we create a horizontal tab to the left.
         for i in self.column_list:
@@ -151,15 +160,6 @@ def __init__(
             triangle_model = TriangleModel(triangle_column, 'value')
             self.triangle_views[i].setModel(triangle_model)
 
-            # self.analysis_containers[i].setStyleSheet(
-            #     """
-            #     DiagnosticWidget {
-            #         border: 2px solid darkgrey;
-            #         background: rgb(230, 230, 230);
-            #     }
-            #     """
-            # )
-
             self.column_tab.addTab(self.analysis_containers[i], i)
 
         self.layout.addWidget(
@@ -170,55 +170,11 @@ def __init__(
 
         self.setLayout(self.layout)
 
-        self.column_tab.setStyleSheet(
-            """
-            QTabBar::tab:first {{
-                margin-top: 22px;
-                border-bottom: {}px solid darkgrey;
-            }}
-
-
-            QTabBar::tab {{
-              margin-top: {}px;
-              background: rgb(230, 230, 230);
-              border: 1px solid darkgrey;
-              border-bottom: 1px solid darkgrey;
-              padding: 5px;
-              padding-left: 10px;
-              height: 125px;
-              margin-right: 0px;
-              border-right: 0px;
-            }}
-
-            QTabBar::tab:selected {{
-              background: rgb(245, 245, 245);
-
-            }}
-
-            QTabWidget::pane {{
-              border: 1px solid darkgrey;
-            }}
-            """.format(
-                bottom_border_width,
-                margin_top
-            )
-        )
-
         self.setAutoFillBackground(True)
-        palette = self.palette()
-
-        palette.setColor(
-            self.backgroundRole(),
-            QColor.fromRgb(
-                240,
-                240,
-                240
-            )
-        )
-
-        self.setPalette(palette)
+        self.apply_theme(scheme=self.theme)
 
         self.value_box.currentTextChanged.connect(self.update_value_type) # noqa
+        QGuiApplication.styleHints().colorSchemeChanged.connect(self.apply_theme)
 
     def resizeEvent(self, event):
 
@@ -262,6 +218,25 @@ def update_value_type(self):
             else:
                 self.analysis_containers[tab_name].setCurrentIndex(1)
 
+    def apply_theme(self, scheme: Qt.ColorScheme):
+
+        self.column_tab.setStyleSheet(
+            qss_column_tab(
+                scheme=scheme,
+                bottom_border_width=self.bottom_border_width,
+                margin_top=self.margin_top
+            )
+        )
+
+        palette = self.palette()
+
+        qss_analysis_tab_palette(
+            scheme=scheme,
+            palette=palette,
+            role=self.backgroundRole()
+        )
+
+        self.setPalette(palette)
 
 class MackValuationModel(FAbstractTableModel):
     def __init__(