Merge pull request #25 from Brain-Modulation-Lab/enh/group-flexible

enh: program choice improved and disabled electrode checkbox redefined

Author: Lucia-Poma

src/clinical_dbs_annotator/__main__.py

@@ -8,6 +8,7 @@
 import logging
 import sys
 
+import PySide6.QtSvg  # noqa: F401 - required to enable SVG rendering in QSS
 from PySide6.QtWidgets import QApplication
 
 from .logging_config import setup_logging

src/clinical_dbs_annotator/utils/theme_manager.py

@@ -94,13 +94,26 @@ def load_stylesheet(self, theme: Theme) -> str:
         Raises:
             FileNotFoundError: If stylesheet file doesn't exist
         """
+        import re
+
         path = self.get_theme_stylesheet_path(theme)
 
         if not os.path.exists(path):
             raise FileNotFoundError(f"Theme stylesheet not found: {path}")
 
         with open(path, encoding="utf-8") as f:
-            return f.read()
+            content = f.read()
+
+        base_dir = os.path.dirname(path)
+
+        def _resolve(match):
+            url = match.group(1).strip().strip("\"'")
+            if not os.path.isabs(url):
+                abs_url = os.path.normpath(os.path.join(base_dir, url))
+                return f"url({abs_url.replace(os.sep, '/')})"
+            return match.group(0)
+
+        return re.sub(r"url\(([^)]+)\)", _resolve, content)
 
     def apply_theme(self, theme: Theme, app: QApplication = None) -> None:
         """

src/clinical_dbs_annotator/views/step1_view.py

@@ -247,6 +247,12 @@ def _create_settings_group(self) -> QGroupBox:
         group_row = QGroupBox("Program")
         group_row_layout = QHBoxLayout()
         self.group_combo = QComboBox()
+        self.group_combo.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Fixed)
+        # Prevent focus rectangle on dropdown
+        self.group_combo.view().window().setAttribute(
+            Qt.WA_TranslucentBackground, False
+        )
+        self.group_combo.view().setStyleSheet("QAbstractItemView { outline: none; }")
         # Load program names from config
         program_config = get_program_config_manager()
         programs = program_config.get_all_programs()
@@ -258,10 +264,12 @@ def _create_settings_group(self) -> QGroupBox:
         edit_programs_btn = QPushButton()
         edit_programs_btn.setIcon(self._create_settings_icon())
         edit_programs_btn.setToolTip("Edit program names")
-        edit_programs_btn.setFixedSize(24, 24)
+        edit_programs_btn.setObjectName("programSettingsButton")
         edit_programs_btn.clicked.connect(self._edit_program_names)
         group_row_layout.addWidget(edit_programs_btn)
 
+        group_row_layout.addStretch()
+
         group_row.setLayout(group_row_layout)
 
         freq_limits = STIMULATION_LIMITS["frequency"]

src/clinical_dbs_annotator/views/step3_view.py

@@ -230,6 +230,12 @@ def _create_stimulation_params_group(self) -> QWidget:
         group_row = QGroupBox("Program")
         group_row_layout = QHBoxLayout()
         self.group_combo = QComboBox()
+        self.group_combo.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Fixed)
+        # Prevent focus rectangle on dropdown
+        self.group_combo.view().window().setAttribute(
+            Qt.WA_TranslucentBackground, False
+        )
+        self.group_combo.view().setStyleSheet("QAbstractItemView { outline: none; }")
         # Load program names from config
         program_config = get_program_config_manager()
         programs = program_config.get_all_programs()
@@ -241,10 +247,12 @@ def _create_stimulation_params_group(self) -> QWidget:
         edit_programs_btn = QPushButton()
         edit_programs_btn.setIcon(self._create_settings_icon())
         edit_programs_btn.setToolTip("Edit program names")
-        edit_programs_btn.setFixedSize(24, 24)
+        edit_programs_btn.setObjectName("programSettingsButton")
         edit_programs_btn.clicked.connect(self._edit_program_names)
         group_row_layout.addWidget(edit_programs_btn)
 
+        group_row_layout.addStretch()
+
         group_row.setLayout(group_row_layout)
 
         freq_limits = STIMULATION_LIMITS["frequency"]

src/logs/program_names.json

@@ -0,0 +1,5 @@
+{
+  "custom_programs": [
+    "Sleep settings"
+  ]
+}

styles/checkbox_check_dark.svg

@@ -64,6 +64,7 @@ QComboBox {
     padding: 6px 10px;
     font-size: 12px;
     font-weight: 500;
+    min-width: 120px;
 }
 
 QComboBox:hover {
@@ -101,12 +102,12 @@ QComboBox QAbstractItemView {
     selection-color: white;
     padding: 4px;
     font-size: 12px;
+    show-decoration-selected: 0;
 }
 
 QComboBox QAbstractItemView::item {
     background-color: #334155;
     padding: 8px 12px;
-    border-bottom: 1px solid #475569;
     min-height: 20px;
 }
 
@@ -117,6 +118,7 @@ QComboBox QAbstractItemView::item:hover {
 QComboBox QAbstractItemView::item:selected {
     background-color: #f59e0b;
     color: white;
+    border-radius: 4px;
 }
 
 
@@ -301,6 +303,19 @@ QGroupBox::title {
     background-color: #1e293b;
 }
 
+QGroupBox::indicator:unchecked {
+    border: 1px solid #64748b;
+    border-radius: 2px;
+    margin-top: 2px;
+}
+
+QGroupBox::indicator:checked {
+    border: 1px solid #64748b;
+    border-radius: 2px;
+    margin-top: 2px;
+    image: url(checkbox_check_dark.svg);
+}
+
 /* Horizontal Lines */
 QFrame[frameShape="4"] {
     background: #334155;
@@ -374,6 +389,26 @@ QPushButton#theme_toggle:pressed {
     background-color: #1e293b;
 }
 
+/* Program Settings Button - Square with same height as dropdown */
+QPushButton#programSettingsButton {
+    background-color: #334155;
+    border: 1px solid #475569;
+    border-radius: 4px;
+    width: 34px;
+    height: 34px;
+    padding: 0;
+    icon-size: 16px;
+}
+
+QPushButton#programSettingsButton:hover {
+    background-color: #475569;
+    border-color: #f59e0b;
+}
+
+QPushButton#programSettingsButton:pressed {
+    background-color: #1e293b;
+}
+
 /* Tooltips */
 QToolTip {
     background-color: #334155;

styles/checkbox_check_light.svg

@@ -64,6 +64,7 @@ QComboBox {
     padding: 6px 10px;
     font-size: 12px;
     font-weight: 500;
+    min-width: 120px;
 }
 
 QComboBox:hover {
@@ -91,11 +92,11 @@ QComboBox QAbstractItemView {
     selection-color: white;
     padding: 4px;
     font-size: 12px;
+    show-decoration-selected: 0;
 }
 
 QComboBox QAbstractItemView::item {
     padding: 8px 12px;
-    border-bottom: 1px solid #e2e8f0;
     min-height: 20px;
 }
 
@@ -106,6 +107,7 @@ QComboBox QAbstractItemView::item:hover {
 QComboBox QAbstractItemView::item:selected {
     background-color: #b45309;
     color: white;
+    border-radius: 4px;
 }
 
 /* MultiSelectComboBox - Enhanced styling */
@@ -152,6 +154,7 @@ MultiSelectComboBox QAbstractItemView {
     selection-color: white;
     padding: 4px;
     font-size: 12px;
+    show-decoration-selected: 0;
 }
 
 MultiSelectComboBox QAbstractItemView::item {
@@ -167,6 +170,7 @@ MultiSelectComboBox QAbstractItemView::item:hover {
 MultiSelectComboBox QAbstractItemView::item:selected {
     background-color: #b45309;
     color: white;
+    border-radius: 4px;
 }
 
 /* Buttons - Modern Flat Design */
@@ -318,6 +322,13 @@ QGroupBox::indicator:unchecked {
     margin-top: 2px;
 }
 
+QGroupBox::indicator:checked {
+    border: 1px solid #475569;
+    border-radius: 2px;
+    margin-top: 2px;
+    image: url(checkbox_check_light.svg);
+}
+
 /* Horizontal Lines */
 QFrame[frameShape="4"] {
     background: #cbd5e1;
@@ -382,6 +393,26 @@ QPushButton#theme_toggle {
     font-size: 14px;
 }
 
+/* Program Settings Button - Square with same height as dropdown */
+QPushButton#programSettingsButton {
+    background-color: #ffffff;
+    border: 1px solid #cbd5e1;
+    border-radius: 4px;
+    width: 34px;
+    height: 34px;
+    padding: 0;
+    icon-size: 16px;
+}
+
+QPushButton#programSettingsButton:hover {
+    background-color: #f1f5f9;
+    border-color: #b45309;
+}
+
+QPushButton#programSettingsButton:pressed {
+    background-color: #e2e8f0;
+}
+
 QPushButton#theme_toggle:hover {
     background-color: #f1f5f9;
     border-color: #94a3b8;

styles/dark_theme.qss

@@ -11,6 +11,8 @@
 from pathlib import Path
 from unittest.mock import patch
 
+import pandas as pd
+
 # Add src directory to path
 sys.path.insert(0, str(Path(__file__).parent.parent.parent / "src"))