Merge branch 'main' into releasing-fix

Author: Lucia-Poma

CHANGELOG.md

@@ -7,6 +7,23 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Fixed
+
+- Dependency audit: pin ``uv>=0.11.15`` (GHSA-4gg8-gxpx-9rph).
+
+## [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

constraints-briefcase.txt

@@ -29,13 +29,13 @@ numpy==2.4.4
     #   pandas
 packaging==26.2
     # via matplotlib
-pandas==3.0.2
+pandas==3.0.3
     # via dbs-annotator
 pillow==12.2.0
     # via matplotlib
-pydantic==2.13.3
+pydantic==2.13.4
     # via dbs-annotator
-pydantic-core==2.46.3
+pydantic-core==2.46.4
     # via pydantic
 pyparsing==3.3.2
     # via matplotlib

pyproject.toml

@@ -23,10 +23,10 @@ classifiers = [
 dependencies = [
     "certifi>=2024.0.0",
     "tzdata>=2026.2",
-    "pandas>=2.1",
+    "pandas>=3.0.3",
     "python-docx>=1.1",
     "docx2pdf>=0.1.8",
-    "pydantic>=2.13.3",
+    "pydantic>=2.13.4",
     "pyside6>=6.11.0",
     "matplotlib>=3.10.9",
     "packaging>=26.2",
@@ -42,12 +42,13 @@ dev = [
     "ruff>=0.1.0",
     "pre-commit>=3.6",
     "pre-commit-uv>=4.2.1",
-    "ty>=0.0.29",
+    "uv>=0.11.15",
+    "ty>=0.0.35",
     "pandas-stubs>=3.0.0.260204",
     "pyside6-stubs>=6.7.3.0",
     "towncrier>=24.8.0",
 ]
-build = ["briefcase>=0.3.26"]
+build = ["briefcase>=0.4.2"]
 docs = [
     "sphinx>=9.0.4",
     "sphinx-rtd-theme>=3.1.0",
@@ -192,7 +193,7 @@ showcontent = true
 project_name = "DBSAnnotator"
 bundle = "ch.wysscenter.dbsannotator"
 # Briefcase requires a static version here even when [project] uses dynamic version
-version = "0.4.0b1"
+version = "0.4.0"
 license = { file = "LICENSE" }
 # Windows per-user install dir is %LOCALAPPDATA%\<author>\<formal_name>; must match
 # FS_ORG_NAME in dbs_annotator.config (Qt user data / lab convention).

src/dbs_annotator/__init__.py

@@ -5,7 +5,7 @@
 clinical data during Deep Brain Stimulation programming sessions.
 """
 
-__version__ = "0.4.0b1"
+__version__ = "0.4.0"
 __app_name__ = "DBS Annotator"
 
 from .config import APP_LEAD_AUTHOR

src/dbs_annotator/views/wizard_window.py

@@ -182,9 +182,6 @@ def _setup_window(self) -> None:
         self.setGeometry(x, y, width, height)
         self.setMinimumSize(WINDOW_MIN_SIZE["width"], WINDOW_MIN_SIZE["height"])
 
-        # Make window resizable
-        self.setWindowFlag(Qt.WindowType.WindowMaximizeButtonHint, True)
-
         # Set smaller size for step 0 (mode selection)
         self._update_window_size_for_step0()
 
@@ -866,49 +863,81 @@ def _update_window_size_for_step0(self) -> None:
         self.setGeometry(x, y, compact_width, compact_height)
         self.setMinimumSize(compact_width, compact_height)
         self.setMaximumSize(compact_width, compact_height)
+        self._refresh_title_bar_maximize(enabled=False)
 
-    def _update_window_size_for_main_workflow(self) -> None:
-        """Restore normal window size for main workflow (steps 1+)."""
-        # Restore normal size policies and remove fixed constraints from step0
-        if hasattr(self, "stack"):
-            self.stack.setSizePolicy(
-                QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Minimum
-            )
-            self.stack.setMaximumWidth(16777215)  # Remove fixed width
-            self.stack.setMaximumHeight(16777215)  # Remove fixed height
+    def _refresh_title_bar_maximize(self, *, enabled: bool) -> None:
+        """
+        Enable or disable the native title-bar maximize button.
+
+        On Windows, fixed min/max sizing (step 0) removes WS_MAXIMIZEBOX from the
+        native frame; ``setWindowFlag`` alone does not restore it — the frame must
+        be recreated with ``setWindowFlags`` and ``show()``.
+
+        All standard title-bar hints must be set explicitly; otherwise Windows may
+        drop the close or maximize button when the frame is recreated.
+        """
+        flags = (
+            Qt.WindowType.Window
+            | Qt.WindowType.WindowTitleHint
+            | Qt.WindowType.WindowSystemMenuHint
+            | Qt.WindowType.WindowMinimizeButtonHint
+            | Qt.WindowType.WindowCloseButtonHint
+        )
+        if enabled:
+            flags |= Qt.WindowType.WindowMaximizeButtonHint
+
+        geometry = self.geometry()
+        visible = self.isVisible()
+        self.setWindowFlags(flags)
+        if visible:
+            self.setGeometry(geometry)
+            self.show()
+
+    def _release_stack_size_constraints(self) -> None:
+        """Remove fixed sizes left over from step 0 so content can grow with the window."""
+        if not hasattr(self, "stack"):
+            return
+        self.stack.setSizePolicy(
+            QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Minimum
+        )
+        self.stack.setMinimumWidth(0)
+        self.stack.setMinimumHeight(0)
+        self.stack.setMaximumWidth(16777215)
+        self.stack.setMaximumHeight(16777215)
         if hasattr(self, "stack_scroll_area"):
             self.stack_scroll_area.setSizePolicy(
                 QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Expanding
             )
 
-        # Get original normal size
+    def _update_window_size_for_main_workflow(self) -> None:
+        """Restore normal window size for main workflow (steps 1+)."""
+        self._release_stack_size_constraints()
+
         screen = self.app.primaryScreen()
         rect = screen.availableGeometry()
         screen_width = rect.width()
         screen_height = rect.height()
 
-        # Calculate desired window size with ratio
+        min_width = min(WINDOW_MIN_SIZE["width"], screen_width)
+        min_height = min(WINDOW_MIN_SIZE["height"], screen_height)
+
         desired_width = int(screen_width * WINDOW_SIZE_RATIO["width"])
         desired_height = int(screen_height * WINDOW_SIZE_RATIO["height"])
+        width = max(desired_width, min_width)
+        height = max(desired_height, min_height)
 
-        # Apply minimum size constraints
-        width = max(desired_width, WINDOW_MIN_SIZE["width"])
-        height = max(desired_height, WINDOW_MIN_SIZE["height"])
-
-        # Center the normal window
         x = int((screen_width - width) / 2)
         y = int((screen_height - height) / 2)
 
-        # Reset constraints first to avoid min/max conflicts
+        # Reset constraints first to avoid min/max conflicts from step 0
         self.setMinimumSize(1, 1)
-        self.setMaximumSize(16777215, 16777215)  # Qt max size
+        self.setMaximumSize(16777215, 16777215)
 
-        # Apply new geometry and constraints (allow full maximization)
         self.setGeometry(x, y, width, height)
-        self.setMinimumSize(WINDOW_MIN_SIZE["width"], WINDOW_MIN_SIZE["height"])
-        self.setMaximumSize(
-            screen_width, screen_height
-        )  # Allow full screen maximization
+        self.setMinimumSize(min_width, min_height)
+        # No practical max cap — lets the title-bar maximize button work on Windows
+        self.setMaximumSize(16777215, 16777215)
+        self._refresh_title_bar_maximize(enabled=True)
 
         self._clamp_to_screen()