Improved light theme based on testing on Linux/Windows

2025-06-06 02:21:02 -04:00 · 2025-05-20 23:07:24 -04:00 · 2025-05-20 23:07:24 -04:00 · 1af938decd
commit 1af938decd
parent a4679be043
6 changed files with 114 additions and 34 deletions
--- a/NUSGet.py
+++ b/NUSGet.py
@ -130,8 +130,13 @@ class MainWindow(QMainWindow, Ui_MainWindow):
        self.ui.menuHelp.setWindowFlags(self.ui.menuHelp.windowFlags() | Qt.FramelessWindowHint)
        self.ui.menuHelp.setWindowFlags(self.ui.menuHelp.windowFlags() | Qt.NoDropShadowWindowHint)
        self.ui.menuHelp.setAttribute(Qt.WA_TranslucentBackground)
-        # Load the custom information icon.
-        icon = QIcon(os.path.join(os.path.dirname(__file__), "resources", "information.svg"))
+        # Save some light/dark theme values for later, including the appropriately colored info icon.
+        if is_dark_theme():
+            bg_color = "#2b2b2b"
+            icon = QIcon(os.path.join(os.path.dirname(__file__), "resources", "information_white.svg"))
+        else:
+            bg_color = "#e3e3e3"
+            icon = QIcon(os.path.join(os.path.dirname(__file__), "resources", "information_black.svg"))
        self.ui.actionAbout.setIcon(icon)
        self.ui.actionAbout_Qt.setIcon(icon)
        # Title tree loading code. Now powered by Models:tm:
@ -155,10 +160,6 @@ class MainWindow(QMainWindow, Ui_MainWindow):
            self.trees[tree].collapsed.connect(lambda: self.resize_tree(self.ui.platform_tabs.currentIndex()))
            # This stylesheet patch allows me to add the correct padding above the scrollbar so that it doesn't overlap
            # the QTreeView's header.
-            if is_dark_theme():
-                bg_color = "#2b2b2b"
-            else:
-                bg_color = "#e3e3e3"
            self.trees[tree].setStyleSheet(self.trees[tree].styleSheet() + f"""
                QTreeView QScrollBar::sub-line:vertical {{
                    border: 0;
--- a/qt/py/ui_AboutDialog.py
+++ b/qt/py/ui_AboutDialog.py
@ -17,28 +17,6 @@ class AboutNUSGet(QDialog):
        self.setFixedWidth(450)
        self.setFixedHeight(500)

-        # Set background color to match main app
-        self.setStyleSheet("""
-        QLabel[class="title"] {
-            font-size: 20px;
-            font-weight: bold;
-        }
-        QLabel[class="version"] {
-            font-size: 13px;
-            color: #aaaaaa;
-        }
-        QLabel[class="copyright"] {
-            font-size: 12px;
-            color: #888888;
-        }
-        QLabel[class="header"] {
-            font-size: 14px;
-            font-weight: bold;
-            border-bottom: 1px solid #444444;
-            padding-bottom: 4px;
-            margin-top: 8px;
-        }""")
-
        # Create main layout
        self.layout = QVBoxLayout()
        self.layout.setSpacing(4)
--- a/resources/information_black.svg
+++ b/resources/information_black.svg
@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="32"
+   height="32"
+   viewBox="0 0 32 32"
+   version="1.1"
+   id="svg1"
+   inkscape:version="1.4.1 (93de688d07, 2025-03-30)"
+   sodipodi:docname="information_black.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview1"
+     pagecolor="#ffffff"
+     bordercolor="#999999"
+     borderopacity="1"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:document-units="px"
+     inkscape:zoom="25.125"
+     inkscape:cx="16.139303"
+     inkscape:cy="16.835821"
+     inkscape:window-width="1920"
+     inkscape:window-height="1012"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer1" />
+  <defs
+     id="defs1" />
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       id="path1"
+       style="fill:#000000;stroke:#000000;stroke-width:1.306;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1;fill-opacity:1"
+       d="M 16 1.6523438 A 14.346852 14.346854 0 0 0 1.6523438 16 A 14.346852 14.346854 0 0 0 16 30.347656 A 14.346852 14.346854 0 0 0 30.347656 16 A 14.346852 14.346854 0 0 0 16 1.6523438 z M 15.992188 4.7265625 C 16.642424 4.7265625 17.197259 4.94079 17.65625 5.3710938 C 18.124803 5.8013975 18.359375 6.3235594 18.359375 6.9355469 C 18.359375 7.5475344 18.124803 8.0677432 17.65625 8.4980469 C 17.197259 8.9283506 16.642424 9.1445312 15.992188 9.1445312 C 15.341951 9.1445312 14.787116 8.9283506 14.328125 8.4980469 C 13.869134 8.0677432 13.640625 7.5475344 13.640625 6.9355469 C 13.640625 6.3235594 13.869134 5.8013975 14.328125 5.3710938 C 14.787116 4.94079 15.341951 4.7265625 15.992188 4.7265625 z M 13.841797 11.238281 L 18.144531 11.238281 L 18.144531 27.273438 L 13.841797 27.273438 L 13.841797 11.238281 z " />
+  </g>
+</svg>
--- a/resources/information_white.svg
+++ b/resources/information_white.svg
--- a/resources/style_dark.qss
+++ b/resources/style_dark.qss
@ -10,6 +10,33 @@ QMainWindow QLabel {
    color: #ffffff;
 }

+QDialog QLabel {
+    color: #ffffff;
+}
+
+QDialog QLabel[class="title"] {
+    font-size: 20px;
+    font-weight: bold;
+}
+
+QDialog QLabel[class="version"] {
+    font-size: 13px;
+    color: #aaaaaa;
+}
+
+QDialog QLabel[class="copyright"] {
+    font-size: 12px;
+    color: #888888;
+}
+
+QDialog QLabel[class="header"] {
+    font-size: 14px;
+    font-weight: bold;
+    border-bottom: 1px solid #444444;
+    padding-bottom: 4px;
+    margin-top: 8px;
+}
+
 QMenuBar {
    background-color: #2b2b2b;
 }
--- a/resources/style_light.qss
+++ b/resources/style_light.qss
@ -10,18 +10,46 @@ QMainWindow QLabel {
    color: #000000;
 }

+QDialog QLabel {
+    color: #000000;
+}
+
+QDialog QLabel[class="title"] {
+    font-size: 20px;
+    font-weight: bold;
+}
+
+QDialog QLabel[class="version"] {
+    font-size: 13px;
+    color: #777777;
+}
+
+QDialog QLabel[class="copyright"] {
+    font-size: 12px;
+    color: #444444;
+}
+
+QDialog QLabel[class="header"] {
+    font-size: 14px;
+    font-weight: bold;
+    border-bottom: 1px solid #111111;
+    padding-bottom: 4px;
+    margin-top: 8px;
+}
+
 QMenuBar {
-    background-color: #ffffff;
+    background-color: #e3e3e3;
+    color: #000000;
 }

 QMenuBar::item:selected {
-    background-color: rgba(60, 60, 60, 1);
-    color: white;
+    background-color: rgb(195, 195, 195);
+    color: #000000;
 }

 QMenuBar::item:pressed {
    background-color: #1a73e8;
-    color: #000000;
+    color: #ffffff;
 }

 QMenu {
@ -42,7 +70,7 @@ QMenu::item {

 QMenu::item:selected {
    background-color: #1a73e8;
-    color: #000000;
+    color: #ffffff;
 }

 QMenu::icon {
@ -107,7 +135,7 @@ QLineEdit:focus {
 QLineEdit:disabled {
    background-color: rgba(182, 182, 182, 0.5);
    border: 1px solid rgba(100, 100, 100, 0.3);
-    color: rgba(255, 255, 255, 0.3);
+    color: rgba(143, 143, 143, 0.3);
 }

 QTabWidget::pane {