Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	apps/gui/src/app_window.py

apps/gui/src/gui/block_table.py

@@ -36,28 +36,33 @@ _BG: dict[str, QColor] = {
 # because they need to be clearly visible on any background.
 _STYLESHEET = """
 QTableWidget {
-    gridline-color: palette(mid);
+    gridline-color: #333355;
     font-size: 12px;
+    background: #16162a;
+    color: #ddddff;
+    border: 1px solid #2a2a4a;
 }
 QTableWidget::item {
     padding: 2px 4px;
 }
 QTableWidget::item:selected {
-    background-color: #1565c0;
+    background-color: #e65100;
     color: #ffffff;
 }
 QTableWidget::item:hover:!selected {
-    background-color: rgba(144, 202, 249, 60);
+    background-color: #252545;
 }
 QHeaderView::section {
+    background: #252535;
+    color: #aaaaaa;
     border: none;
-    border-bottom: 1px solid palette(mid);
-    border-right:  1px solid palette(mid);
+    border-bottom: 1px solid #333355;
+    border-right:  1px solid #333355;
     padding: 4px 6px;
     font-weight: bold;
 }
 QScrollBar:horizontal, QScrollBar:vertical {
-    background: palette(alternateBase);
+    background: #16162a;
 }
 """
 

apps/gui/src/gui/plot_panel.py

@@ -91,8 +91,8 @@ class PlotPanel(QWidget):
         _dark = system_is_dark()
         pg.setConfigOptions(
             antialias=True,
-            background=QColor("#1e1e1e") if _dark else QColor("#ffffff"),
-            foreground="w" if _dark else "k",
+            background=QColor("#1a1a2e") if _dark else QColor("#f0f0f8"),
+            foreground=QColor("#ddddff") if _dark else QColor("#1a1a2e"),
         )
 
         root = QVBoxLayout(self)
@@ -103,7 +103,7 @@ class PlotPanel(QWidget):
         self._btn_bar = QWidget()
         self._btn_bar.setObjectName("PlotBtnBar")
         self._btn_bar.setStyleSheet(
-            "#PlotBtnBar { border-bottom: 1px solid palette(mid); }"
+            "#PlotBtnBar { background: #16162a; border-bottom: 1px solid #333355; }"
         )
         self._btn_lay = QHBoxLayout(self._btn_bar)
         self._btn_lay.setContentsMargins(6, 3, 6, 3)
@@ -434,15 +434,16 @@ class PlotPanel(QWidget):
         btn.setFixedHeight(20)
         btn.setStyleSheet(
             f"QPushButton {{"
-            f"  color: palette(mid); font-size: 11px;"
+            f"  color: #666688; font-size: 11px;"
             f"  padding: 0px 7px;"
-            f"  border: 1px solid palette(mid);"
+            f"  border: 1px solid #333355;"
             f"  border-radius: 3px;"
+            f"  background: #1e1e38;"
             f"}}"
             f"QPushButton:checked {{"
             f"  color: {color}; font-weight: bold;"
             f"  border-color: {color};"
-            f"  background: palette(alternateBase);"
+            f"  background: #16162a;"
             f"}}"
         )
         btn.toggled.connect(lambda checked, k=key: self._on_row_toggle(k, checked))
@@ -469,15 +470,16 @@ class PlotPanel(QWidget):
         btn.setFixedHeight(20)
         btn.setStyleSheet(
             f"QPushButton {{"
-            f"  color: palette(mid); font-size: 11px;"
+            f"  color: #666688; font-size: 11px;"
             f"  padding: 0px 7px;"
-            f"  border: 1px solid palette(mid);"
+            f"  border: 1px solid #333355;"
             f"  border-radius: 3px;"
+            f"  background: #1e1e38;"
             f"}}"
             f"QPushButton:checked {{"
             f"  color: {color}; font-weight: bold;"
             f"  border-color: {color};"
-            f"  background: palette(alternateBase);"
+            f"  background: #16162a;"
             f"}}"
         )
         btn.toggled.connect(

apps/gui/src/gui/scheme_panel.py

@@ -139,22 +139,22 @@ class SchemePanel(QWidget):
         """
         if system_is_dark():
             return {
-                "bg":          QColor("#1e1e1e"),
-                "text":        QColor("#e4e4e4"),
-                "tick":        QColor("#888888"),
-                "border":      QColor("#454545"),
-                "placeholder": QColor("#606060"),
-                "ph_bg":       QColor("#262626"),
-                "sel_border":  QColor("#e4e4e4"),
+                "bg":          QColor("#1a1a2e"),
+                "text":        QColor("#ddddff"),
+                "tick":        QColor("#666688"),
+                "border":      QColor("#333355"),
+                "placeholder": QColor("#555577"),
+                "ph_bg":       QColor("#16162a"),
+                "sel_border":  QColor("#f0c040"),
             }
         return {
-            "bg":          QColor("#ffffff"),
-            "text":        QColor("#333333"),
-            "tick":        QColor("#555555"),
-            "border":      QColor("#cccccc"),
-            "placeholder": QColor("#9e9e9e"),
-            "ph_bg":       QColor("#f5f5f5"),
-            "sel_border":  QColor("#000000"),
+            "bg":          QColor("#f0f0f8"),
+            "text":        QColor("#1a1a2e"),
+            "tick":        QColor("#555577"),
+            "border":      QColor("#aaaacc"),
+            "placeholder": QColor("#7777aa"),
+            "ph_bg":       QColor("#e8e8f8"),
+            "sel_border":  QColor("#e65100"),
         }
 
     # -- painting -------------------------------------------------------------

apps/gui/src/tabs/fid_tab.py

@@ -114,7 +114,7 @@ class FidTab(QWidget):
         bar = QWidget()
         bar.setObjectName("FidToolBar")
         bar.setStyleSheet(
-            "#FidToolBar { background: palette(window); border-bottom: 1px solid palette(mid); }"
+            "#FidToolBar { background: #16162a; border-bottom: 1px solid #333355; }"
         )
         lay = QHBoxLayout(bar)
         lay.setContentsMargins(6, 4, 6, 4)

apps/gui/src/tabs/scanner_tab.py

@@ -308,7 +308,7 @@ class ScannerTab(QWidget):
         seq_lay = QVBoxLayout(seq_grp)
         self._seq_info_label = QLabel("No sequence loaded")
         self._seq_info_label.setWordWrap(True)
-        self._seq_info_label.setStyleSheet("color: palette(mid); font-style: italic;")
+        self._seq_info_label.setStyleSheet("color: #666688; font-style: italic;")
         self._seq_info_label.setFont(QFont("Courier New", 8))
         seq_lay.addWidget(self._seq_info_label)
         lay.addWidget(seq_grp)
@@ -319,7 +319,7 @@ class ScannerTab(QWidget):
         self._job_label = QLabel("- no job -")
         self._job_label.setFont(QFont("Courier New", 8))
         self._job_label.setWordWrap(True)
-        self._job_label.setStyleSheet("color: palette(mid);")
+        self._job_label.setStyleSheet("color: #666688;")
         job_lay.addWidget(self._job_label)
         lay.addWidget(job_grp)
 

apps/gui/src/tabs/seq_interp_tab.py

@@ -126,7 +126,7 @@ class SeqInterpTab(QWidget):
         bar = QWidget()
         bar.setObjectName("ButtonBar")
         bar.setStyleSheet(
-            "#ButtonBar { background: palette(window); border-bottom: 1px solid palette(mid); }"
+            "#ButtonBar { background: #16162a; border-bottom: 1px solid #333355; }"
         )
         lay = QHBoxLayout(bar)
         lay.setContentsMargins(6, 4, 6, 4)
@@ -181,7 +181,7 @@ class SeqInterpTab(QWidget):
         bar = QWidget()
         bar.setObjectName("SeqStatus")
         bar.setStyleSheet(
-            "#SeqStatus { background: palette(window); border-bottom: 1px solid palette(mid); }"
+            "#SeqStatus { background: #16162a; border-bottom: 1px solid #333355; }"
         )
         lay = QHBoxLayout(bar)
         lay.setContentsMargins(8, 2, 8, 2)
@@ -251,7 +251,7 @@ class SeqInterpTab(QWidget):
         self._warn_list.setFont(QFont("Arial", 9))
         self._warn_list.setMaximumHeight(110)
         self._warn_list.setStyleSheet(
-            "QListWidget { color: palette(text); background: palette(alternateBase); } "
+            "QListWidget { color: #ddddff; background: #16162a; border: 1px solid #2a2a4a; } "
             "QListWidget::item { padding: 2px; }"
         )
         warn_lay.addWidget(self._warn_list)

apps/gui/src/tabs/spectroscopy_tab.py

@@ -164,8 +164,8 @@ class SpectroscopyTab(QWidget):
         bar.setObjectName("SpecToolBar")
         bar.setStyleSheet(
             "#SpecToolBar {"
-            "  background: palette(window);"
-            "  border-bottom: 1px solid palette(mid);"
+            "  background: #16162a;"
+            "  border-bottom: 1px solid #333355;"
             "}"
         )
         lay = QHBoxLayout(bar)
@@ -356,8 +356,8 @@ class SpectroscopyTab(QWidget):
         _dark = system_is_dark()
         pg.setConfigOptions(
             antialias=True,
-            background=QColor("#1e1e1e") if _dark else QColor("#ffffff"),
-            foreground="w" if _dark else "k",
+            background=QColor("#1a1a2e") if _dark else QColor("#f0f0f8"),
+            foreground=QColor("#ddddff") if _dark else QColor("#1a1a2e"),
         )
         _cross = pg.mkPen(
             "#ffffff50" if _dark else "#00000050", width=1, style=Qt.DashLine
@@ -854,9 +854,9 @@ class SpectroscopyTab(QWidget):
         dark = system_is_dark()
         label = pg.TextItem(
             anchor=(0, 1),
-            color="#f5f6fa" if dark else "#111111",
-            fill=pg.mkBrush(18, 18, 28, 170) if dark else pg.mkBrush(255, 255, 255, 170),
-            border=pg.mkPen("#ffffff40" if dark else "#00000030"),
+            color="#ddddff" if dark else "#1a1a2e",
+            fill=pg.mkBrush(26, 26, 46, 200) if dark else pg.mkBrush(240, 240, 248, 200),
+            border=pg.mkPen("#f0c04060" if dark else "#1a1a2e30"),
         )
         label.setFont(QFont("Courier New", 8))
         label.setVisible(False)