Merge pull request #125 from Brain-Modulation-Lab/releasing-fix

RTD dark canvas, favicon, scale/preset sizing, update-now fix

Author: Lucia-Poma

CHANGELOG.md

@@ -9,6 +9,42 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
+- Dependency audit: pin ``uv>=0.11.15`` (GHSA-4gg8-gxpx-9rph); upgrade ``pip`` to
+  26.1.2 (PYSEC-2026-196, Briefcase transitive dep).
+
+## [0.4.0] - 2026-06-01
+
+### Changed
+
+- Step 1 clinical preset buttons scroll horizontally when they do not fit on one row.
+
+### Fixed
+
+- Wizard window: title-bar maximize and resize on steps 1+ (step 0 stays compact).
+- Step 1 initial settings: vertical scrollbar in its own column; no overlap with electrode canvases.
+
+## [0.4.0b2] - 2026-05-21
+
+### Added
+
+- Read the Docs: dark outer page background (matching the sidebar); browser tab
+  favicon uses the application icon.
+
+### Changed
+
+- Clinical and session preset pill buttons grow to fit their full label (theme
+  ``max-width`` cap removed).
+- Step 1 and Step 2 scale name/value fields widen as needed to show the full text.
+
+### Fixed
+
+- In-app **Update now** on Windows: keep the install script on disk until PowerShell
+  finishes (avoids a flash-and-close with no install) and pause the console when
+  the installer fails so the error message stays visible.
+- Step 1 clinical preset buttons disappearing after adding a preset in settings
+  (horizontal scroll strip sizing).
+- Step 3 session settings: external vertical scrollbar column (same layout as Step 1;
+  no overlap with electrode canvases).
 - Dependency audit: pin ``uv>=0.11.15`` (GHSA-4gg8-gxpx-9rph).
 
 ## [0.4.0] - 2026-06-01

docs/_static/custom.css

@@ -2,8 +2,25 @@
  * sphinx-rtd-theme caps main content at ~800px for readability.
  * Override so clinical screenshots and wide tables use the full viewport.
  */
+:root {
+  /* Match sphinx-rtd-theme sidebar (.wy-nav-side). */
+  --dbs-docs-canvas: #343131;
+}
+
+/* Dark outer canvas (same tone as the left navigation column). */
+html,
+body,
+.wy-body-for-nav,
+.wy-grid-for-nav,
+.wy-nav-content-wrap {
+  background: var(--dbs-docs-canvas);
+}
+
+/* Readable "window" for prose, screenshots, and tables. */
 .wy-nav-content {
   max-width: none;
+  background: #ffffff;
+  box-shadow: 0 0 18px rgba(0, 0, 0, 0.28);
 }
 
 .wy-nav-content-wrap {

docs/_static/favicon-32.png

@@ -58,6 +58,8 @@
 html_theme = "sphinx_rtd_theme"
 html_static_path = ["_static"]
 html_css_files = ["custom.css"]
+# Browser tab icon (same asset as the packaged Qt / Briefcase application).
+html_favicon = "_static/favicon.ico"
 
 html_theme_options = {
     "logo_only": False,

docs/_static/favicon.ico

@@ -144,7 +144,7 @@ quiet = false
 
 [tool.uv]
 exclude-newer = "1 week"
-exclude-newer-package = { lxml = false, idna = false }
+exclude-newer-package = { lxml = false, idna = false, pip = false }
 
 [tool.towncrier]
 package = "dbs_annotator"

docs/conf.py

@@ -16,6 +16,7 @@
     QLineEdit,
     QProgressBar,
     QPushButton,
+    QSizePolicy,
     QVBoxLayout,
     QWidget,
 )
@@ -24,6 +25,24 @@
 from ..utils import create_arrow_icon
 
 
+def line_edit_min_width_for_text(
+    edit: QLineEdit, text: str, *, floor: int, padding: int = 20
+) -> None:
+    """Ensure a line edit is wide enough to show *text* (or its placeholder)."""
+    sample = text.strip() or edit.placeholderText() or ""
+    width = edit.fontMetrics().horizontalAdvance(sample) + padding
+    edit.setMinimumWidth(max(floor, width))
+
+
+def push_button_min_width_for_label(
+    button: QPushButton, label: str, *, floor: int = 40, padding: int = 28
+) -> None:
+    """Ensure a pill-style button is wide enough for the full label."""
+    width = button.fontMetrics().horizontalAdvance(label) + padding
+    button.setMinimumWidth(max(floor, width))
+    button.setSizePolicy(QSizePolicy.Policy.Minimum, QSizePolicy.Policy.Fixed)
+
+
 def create_horizontal_line() -> QFrame:
     """
     Create a styled horizontal separator line.

pyproject.toml

@@ -31,6 +31,13 @@ def _install_script_url(filename: str) -> str:
     )
 
 
+def _install_script_dir() -> Path:
+    """Stable temp dir so the install script is not deleted before PowerShell starts."""
+    directory = Path(tempfile.gettempdir()) / "dbs_annotator_update"
+    directory.mkdir(parents=True, exist_ok=True)
+    return directory
+
+
 def _download_install_script(filename: str) -> Path:
     url = _install_script_url(filename)
     request = urllib.request.Request(
@@ -40,16 +47,47 @@ def _download_install_script(filename: str) -> Path:
     ctx = ssl.create_default_context(cafile=certifi.where())
     with urllib.request.urlopen(request, timeout=60, context=ctx) as response:
         data = response.read()
-    suffix = ".ps1" if filename.endswith(".ps1") else ".sh"
-    fd, path_str = tempfile.mkstemp(prefix="dbs_annotator_install_", suffix=suffix)
-    os.close(fd)
-    path = Path(path_str)
+    path = _install_script_dir() / filename
     path.write_bytes(data)
-    if suffix == ".sh":
+    if filename.endswith(".sh"):
         path.chmod(0o755)
     return path
 
 
+def _escape_ps_single_quoted(value: str) -> str:
+    return value.replace("'", "''")
+
+
+def _windows_powershell_command(
+    script: Path, tag: str, *, dry_run: bool = False
+) -> list[str]:
+    """Build a PowerShell invocation that keeps the console open on install failure."""
+    whatif = " -WhatIf" if dry_run else ""
+    ps = (
+        "$ErrorActionPreference = 'Stop'; "
+        f"try {{ & '{_escape_ps_single_quoted(script.as_posix())}' "
+        f"-VersionTag '{_escape_ps_single_quoted(tag)}' "
+        f"-GitHubRepository '{_escape_ps_single_quoted(RELEASES_GITHUB_REPO)}'{whatif} "
+        "} catch { "
+        "Write-Host $_.Exception.Message -ForegroundColor Red; "
+        "exit 1 "
+        "}; "
+        "if ($LASTEXITCODE -ne 0) { "
+        "Write-Host ''; "
+        "Write-Host 'Install did not finish (exit' $LASTEXITCODE ').'; "
+        "Read-Host 'Press Enter to close' "
+        "}"
+    )
+    return [
+        "powershell.exe",
+        "-NoProfile",
+        "-ExecutionPolicy",
+        "Bypass",
+        "-Command",
+        ps,
+    ]
+
+
 def automatic_update_supported() -> bool:
     """True on platforms where ``scripts/install.*`` can be launched."""
     return (
@@ -102,32 +140,12 @@ def launch_automatic_update(
 
 def _launch_windows(tag: str, *, dry_run: bool = False) -> tuple[bool, str]:
     script = _download_install_script("install.ps1")
-    try:
-        cmd = [
-            "powershell.exe",
-            "-NoProfile",
-            "-ExecutionPolicy",
-            "Bypass",
-            "-File",
-            str(script),
-            "-VersionTag",
-            tag,
-            "-GitHubRepository",
-            RELEASES_GITHUB_REPO,
-        ]
-        if dry_run:
-            cmd.append("-WhatIf")
-        subprocess.Popen(
-            cmd,
-            creationflags=_WINDOWS_NEW_CONSOLE,
-            close_fds=True,
-        )
-    finally:
-        if not dry_run:
-            try:
-                script.unlink(missing_ok=True)
-            except OSError:
-                pass
+    cmd = _windows_powershell_command(script, tag, dry_run=dry_run)
+    subprocess.Popen(
+        cmd,
+        creationflags=_WINDOWS_NEW_CONSOLE,
+        close_fds=True,
+    )
 
     if dry_run:
         return True, (

src/dbs_annotator/ui/widgets.py

@@ -57,6 +57,7 @@
     get_cathode_labels,
 )
 from ..ui.clinical_scales_settings_dialog import ClinicalScalesSettingsDialog
+from ..ui.widgets import line_edit_min_width_for_text, push_button_min_width_for_label
 from ..utils.program_config_manager import (
     ProgramConfigManager,
     get_program_config_manager,
@@ -1805,14 +1806,24 @@ def _add_clinical_scale_row(
 
         name_edit = QLineEdit()
         name_edit.setPlaceholderText(PLACEHOLDERS["scale_name"])
-        name_edit.setMaximumWidth(80)
         name_edit.setText(name)
+        line_edit_min_width_for_text(name_edit, name, floor=56)
+        name_edit.textChanged.connect(
+            lambda text, edit=name_edit: line_edit_min_width_for_text(
+                edit, text, floor=56
+            )
+        )
 
         score_edit = QLineEdit()
         score_edit.setPlaceholderText(PLACEHOLDERS["scale_score"])
-        score_edit.setMaximumWidth(50)
         score_edit.setValidator(QIntValidator())
         score_edit.setText(value)
+        line_edit_min_width_for_text(score_edit, value, floor=44)
+        score_edit.textChanged.connect(
+            lambda text, edit=score_edit: line_edit_min_width_for_text(
+                edit, text, floor=44
+            )
+        )
 
         btn = None
         if with_plus:
@@ -1908,14 +1919,39 @@ def _on_presets_changed(self, new_presets: dict[str, list[str]]):
                     # Preset was deleted - clear scales
                     self._apply_preset_scales([])
 
+    def _preset_buttons_content_size(self) -> QSize:
+        """Measure preset row size from buttons.
+
+        Container ``sizeHint()`` can be 0 immediately after a rebuild.
+        """
+        layout = self.preset_row_layout
+        if layout is None or not self.preset_buttons:
+            return QSize(0, 0)
+
+        margins = layout.contentsMargins()
+        spacing = layout.spacing()
+        width = margins.left() + margins.right()
+        height = margins.top() + margins.bottom()
+        for index, btn in enumerate(self.preset_buttons):
+            hint = btn.sizeHint()
+            width += hint.width()
+            height = max(height, hint.height() + margins.top() + margins.bottom())
+            if index > 0:
+                width += spacing
+        return QSize(width, height)
+
     def _update_preset_buttons_geometry(self) -> None:
         """Size the preset strip so horizontal scrolling appears when needed."""
         if not hasattr(self, "preset_scroll_content"):
             return
+        if self.preset_row_layout is not None:
+            self.preset_row_layout.activate()
+
+        measured = self._preset_buttons_content_size()
         self.preset_scroll_content.adjustSize()
         hint = self.preset_scroll_content.sizeHint()
-        width = max(hint.width(), 1)
-        content_height = max(hint.height(), 1)
+        width = max(measured.width(), hint.width(), 1)
+        content_height = max(measured.height(), hint.height(), 1)
         self.preset_scroll_content.setMinimumSize(width, content_height)
         self.preset_scroll_content.resize(width, content_height)
 
@@ -1953,10 +1989,13 @@ def _refresh_preset_buttons(self):
         for preset_name in ordered_names:
             btn = QPushButton(preset_name)
             btn.setObjectName(f"preset_{preset_name}")
+            push_button_min_width_for_label(btn, preset_name)
             self.preset_buttons.append(btn)
             preset_row.addWidget(btn)
 
-        self._update_preset_buttons_geometry()
+        # Defer sizing until Qt has laid out the new buttons; immediate sizeHint()
+        # on the scroll content is often 0 and collapses the strip to 1px wide.
+        QTimer.singleShot(0, self._update_preset_buttons_geometry)
 
         if hasattr(self, "on_add_callback") and hasattr(self, "on_remove_callback"):
             self._connect_preset_buttons()

src/dbs_annotator/utils/auto_update.py

@@ -26,6 +26,7 @@
 
 from ..config import PLACEHOLDERS, PRESET_BUTTONS
 from ..ui.session_scales_settings_dialog import SessionScalesSettingsDialog
+from ..ui.widgets import line_edit_min_width_for_text, push_button_min_width_for_label
 from ..utils.scale_preset_manager import get_scale_preset_manager
 from .base_view import BaseStepView
 
@@ -232,6 +233,7 @@ def _refresh_preset_buttons(self):
         for preset_name in ordered_names:
             btn = QPushButton(preset_name)
             btn.setObjectName(f"preset2_{preset_name}")
+            push_button_min_width_for_label(btn, preset_name)
             self.preset_buttons.append(btn)
             preset_row.insertWidget(insert_index, btn)
             insert_index += 1
@@ -406,18 +408,33 @@ def _add_session_scale_row(
 
         name_edit = QLineEdit()
         name_edit.setPlaceholderText(PLACEHOLDERS["scale_name"])
-        name_edit.setMaximumWidth(100)
         name_edit.setText(name)
+        line_edit_min_width_for_text(name_edit, name, floor=64)
+        name_edit.textChanged.connect(
+            lambda text, edit=name_edit: line_edit_min_width_for_text(
+                edit, text, floor=64
+            )
+        )
 
         scale1_edit = QLineEdit()
         scale1_edit.setPlaceholderText(PLACEHOLDERS["scale_min"])
-        scale1_edit.setMaximumWidth(40)
         scale1_edit.setText(minval)
+        line_edit_min_width_for_text(scale1_edit, minval, floor=40)
+        scale1_edit.textChanged.connect(
+            lambda text, edit=scale1_edit: line_edit_min_width_for_text(
+                edit, text, floor=40
+            )
+        )
 
         scale2_edit = QLineEdit()
         scale2_edit.setPlaceholderText(PLACEHOLDERS["scale_max"])
-        scale2_edit.setMaximumWidth(40)
         scale2_edit.setText(maxval)
+        line_edit_min_width_for_text(scale2_edit, maxval, floor=40)
+        scale2_edit.textChanged.connect(
+            lambda text, edit=scale2_edit: line_edit_min_width_for_text(
+                edit, text, floor=40
+            )
+        )
 
         if with_plus:
             btn = QPushButton("+")