wip weakrefs to methods

.github/actions/bw_install/action.yml

@@ -62,4 +62,4 @@ runs:
         uv pip install --system -e ./ophyd_devices
         uv pip install --system -e ./bec/bec_lib[dev]
         uv pip install --system -e ./bec/bec_ipython_client
-        uv pip install --system -e ./bec_widgets[dev,qtermwidget]
+        uv pip install --system -e ./bec_widgets[dev,pyside6]

.github/scripts/aggregate_benchmarks.py

@@ -1,169 +0,0 @@
-##########################
-### AI-generated file. ###
-##########################
-
-"""Aggregate and merge benchmark JSON files.
-
-The workflow runs the same benchmark suite on multiple independent runners.
-This script reads every JSON file produced by those attempts, normalizes the
-contained benchmark values, and writes a compact mapping JSON where each value is
-the median across attempts. It can also merge independent hyperfine JSON files
-from one runner into a single hyperfine-style JSON file.
-"""
-
-from __future__ import annotations
-
-import argparse
-import json
-import statistics
-from pathlib import Path
-from typing import Any
-
-from compare_benchmarks import Benchmark, extract_benchmarks
-
-
-def collect_benchmarks(paths: list[Path]) -> dict[str, list[Benchmark]]:
-    """Collect benchmarks from multiple JSON files.
-
-    Args:
-        paths (list[Path]): Paths to hyperfine, pytest-benchmark, or compact
-            mapping JSON files.
-
-    Returns:
-        dict[str, list[Benchmark]]: Benchmarks grouped by benchmark name.
-    """
-
-    collected: dict[str, list[Benchmark]] = {}
-    for path in paths:
-        for name, benchmark in extract_benchmarks(path).items():
-            collected.setdefault(name, []).append(benchmark)
-    return collected
-
-
-def aggregate(collected: dict[str, list[Benchmark]]) -> dict[str, dict[str, object]]:
-    """Aggregate grouped benchmarks using the median value.
-
-    Args:
-        collected (dict[str, list[Benchmark]]): Benchmarks grouped by benchmark
-            name.
-
-    Returns:
-        dict[str, dict[str, object]]: Compact mapping JSON data. Each benchmark
-        contains ``value``, ``unit``, ``metric``, ``attempts``, and
-        ``attempt_values``.
-    """
-
-    aggregated: dict[str, dict[str, object]] = {}
-    for name, benchmarks in sorted(collected.items()):
-        values = [benchmark.value for benchmark in benchmarks]
-        unit = next((benchmark.unit for benchmark in benchmarks if benchmark.unit), "")
-        metric = next((benchmark.metric for benchmark in benchmarks if benchmark.metric), "value")
-        aggregated[name] = {
-            "value": statistics.median(values),
-            "unit": unit,
-            "metric": f"median-of-attempt-{metric}",
-            "attempts": len(values),
-            "attempt_values": values,
-        }
-    return aggregated
-
-
-def merge_hyperfine_results(paths: list[Path]) -> dict[str, Any]:
-    """Merge hyperfine result files.
-
-    Args:
-        paths (list[Path]): Hyperfine JSON files to merge.
-
-    Returns:
-        dict[str, Any]: Hyperfine-style JSON object containing all result rows.
-
-    Raises:
-        ValueError: If any file has no hyperfine ``results`` list.
-    """
-
-    merged: dict[str, Any] = {"results": []}
-    for path in paths:
-        data = json.loads(path.read_text(encoding="utf-8"))
-        results = data.get("results", []) if isinstance(data, dict) else None
-        if not isinstance(results, list):
-            raise ValueError(f"{path} has no hyperfine results list")
-        merged["results"].extend(results)
-    return merged
-
-
-def main_from_paths(input_dir: Path, output: Path) -> int:
-    """Aggregate all JSON files in a directory and write the result.
-
-    Args:
-        input_dir (Path): Directory containing benchmark JSON files.
-        output (Path): Path where the aggregate JSON should be written.
-
-    Returns:
-        int: Always ``0`` on success.
-
-    Raises:
-        ValueError: If no JSON files are found in ``input_dir``.
-    """
-
-    paths = sorted(input_dir.rglob("*.json"))
-    if not paths:
-        raise ValueError(f"No benchmark JSON files found in {input_dir}")
-
-    output.parent.mkdir(parents=True, exist_ok=True)
-    output.write_text(
-        json.dumps(aggregate(collect_benchmarks(paths)), indent=2, sort_keys=True) + "\n",
-        encoding="utf-8",
-    )
-    return 0
-
-
-def merge_from_paths(input_dir: Path, output: Path) -> int:
-    """Merge all hyperfine JSON files in a directory and write the result.
-
-    Args:
-        input_dir (Path): Directory containing hyperfine JSON files.
-        output (Path): Path where the merged JSON should be written.
-
-    Returns:
-        int: Always ``0`` on success.
-
-    Raises:
-        ValueError: If no JSON files are found in ``input_dir``.
-    """
-
-    paths = sorted(input_dir.glob("*.json"))
-    if not paths:
-        raise ValueError(f"No hyperfine JSON files found in {input_dir}")
-
-    output.parent.mkdir(parents=True, exist_ok=True)
-    output.write_text(
-        json.dumps(merge_hyperfine_results(paths), indent=2, sort_keys=True) + "\n",
-        encoding="utf-8",
-    )
-    return 0
-
-
-def main() -> int:
-    """Run the benchmark aggregation command line interface.
-
-    Returns:
-        int: Always ``0`` on success.
-    """
-
-    parser = argparse.ArgumentParser()
-    parser.add_argument(
-        "--mode",
-        choices=("aggregate", "merge-hyperfine"),
-        default="aggregate",
-        help="Operation to perform.",
-    )
-    parser.add_argument("--input-dir", required=True, type=Path)
-    parser.add_argument("--output", required=True, type=Path)
-    args = parser.parse_args()
-    if args.mode == "merge-hyperfine":
-        return merge_from_paths(input_dir=args.input_dir, output=args.output)
-    return main_from_paths(input_dir=args.input_dir, output=args.output)
-
-
-if __name__ == "__main__":
-    raise SystemExit(main())

.github/scripts/compare_benchmarks.py

@@ -1,454 +0,0 @@
-##########################
-### AI-generated file. ###
-##########################
-
-"""Compare benchmark JSON files and write a GitHub Actions summary.
-
-The script supports JSON emitted by hyperfine, JSON emitted by pytest-benchmark,
-and a compact mapping format generated by ``aggregate_benchmarks.py``. Timing
-formats prefer median values and fall back to mean values when median values are
-not present.
-"""
-
-from __future__ import annotations
-
-import argparse
-import json
-import math
-from dataclasses import dataclass
-from pathlib import Path
-from typing import Any
-
-
-@dataclass(frozen=True)
-class Benchmark:
-    """Normalized benchmark result.
-
-    Attributes:
-        name (str): Stable benchmark name used to match baseline and current results.
-        value (float): Numeric benchmark value used for comparison.
-        unit (str): Display unit for the value, for example ``"s"``.
-        metric (str): Source metric name, for example ``"median"`` or ``"mean"``.
-    """
-
-    name: str
-    value: float
-    unit: str
-    metric: str = "value"
-
-
-@dataclass(frozen=True)
-class Comparison:
-    """Comparison between one baseline benchmark and one current benchmark.
-
-    Attributes:
-        name (str): Benchmark name.
-        baseline (float): Baseline benchmark value.
-        current (float): Current benchmark value.
-        delta_percent (float): Percent change from baseline to current.
-        unit (str): Display unit for both values.
-        metric (str): Current result metric used for comparison.
-        regressed (bool): Whether the change exceeds the configured threshold in
-            the worse direction.
-        improved (bool): Whether the change exceeds the configured threshold in
-            the better direction.
-    """
-
-    name: str
-    baseline: float
-    current: float
-    delta_percent: float
-    unit: str
-    metric: str
-    regressed: bool
-    improved: bool
-
-
-def _read_json(path: Path) -> Any:
-    """Read JSON data from a file.
-
-    Args:
-        path (Path): Path to the JSON file.
-
-    Returns:
-        Any: Parsed JSON value.
-    """
-
-    with path.open("r", encoding="utf-8") as stream:
-        return json.load(stream)
-
-
-def _as_float(value: Any) -> float | None:
-    """Convert a value to a finite float.
-
-    Args:
-        value (Any): Value to convert.
-
-    Returns:
-        float | None: Converted finite float, or ``None`` if conversion fails.
-    """
-
-    try:
-        result = float(value)
-    except (TypeError, ValueError):
-        return None
-    if math.isfinite(result):
-        return result
-    return None
-
-
-def _extract_hyperfine(data: dict[str, Any]) -> dict[str, Benchmark]:
-    """Extract normalized benchmarks from hyperfine JSON.
-
-    Args:
-        data (dict[str, Any]): Parsed hyperfine JSON object.
-
-    Returns:
-        dict[str, Benchmark]: Benchmarks keyed by command name.
-    """
-
-    benchmarks: dict[str, Benchmark] = {}
-    for result in data.get("results", []):
-        if not isinstance(result, dict):
-            continue
-        name = str(result.get("command") or result.get("name") or "").strip()
-        metric = "median"
-        value = _as_float(result.get(metric))
-        if value is None:
-            metric = "mean"
-            value = _as_float(result.get(metric))
-        if name and value is not None:
-            benchmarks[name] = Benchmark(name=name, value=value, unit="s", metric=metric)
-    return benchmarks
-
-
-def _extract_pytest_benchmark(data: dict[str, Any]) -> dict[str, Benchmark]:
-    """Extract normalized benchmarks from pytest-benchmark JSON.
-
-    Args:
-        data (dict[str, Any]): Parsed pytest-benchmark JSON object.
-
-    Returns:
-        dict[str, Benchmark]: Benchmarks keyed by full benchmark name.
-    """
-
-    benchmarks: dict[str, Benchmark] = {}
-    for benchmark in data.get("benchmarks", []):
-        if not isinstance(benchmark, dict):
-            continue
-
-        name = str(benchmark.get("fullname") or benchmark.get("name") or "").strip()
-        stats = benchmark.get("stats", {})
-        value = None
-        metric = "median"
-        if isinstance(stats, dict):
-            value = _as_float(stats.get(metric))
-            if value is None:
-                metric = "mean"
-                value = _as_float(stats.get(metric))
-        if name and value is not None:
-            benchmarks[name] = Benchmark(name=name, value=value, unit="s", metric=metric)
-    return benchmarks
-
-
-def _extract_simple_mapping(data: dict[str, Any]) -> dict[str, Benchmark]:
-    """Extract normalized benchmarks from a compact mapping JSON object.
-
-    Args:
-        data (dict[str, Any]): Parsed mapping where each benchmark is either a
-            raw number or an object containing ``value``, ``unit``, and ``metric``.
-
-    Returns:
-        dict[str, Benchmark]: Benchmarks keyed by mapping key.
-    """
-
-    benchmarks: dict[str, Benchmark] = {}
-
-    for name, raw_value in data.items():
-        if name in {"version", "context", "commit", "timestamp"}:
-            continue
-
-        value = _as_float(raw_value)
-        unit = ""
-        metric = "value"
-        if value is None and isinstance(raw_value, dict):
-            value = _as_float(raw_value.get("value"))
-            unit = str(raw_value.get("unit") or "")
-            metric = str(raw_value.get("metric") or "value")
-
-        if value is not None:
-            benchmarks[str(name)] = Benchmark(name=str(name), value=value, unit=unit, metric=metric)
-
-    return benchmarks
-
-
-def extract_benchmarks(path: Path) -> dict[str, Benchmark]:
-    """Extract normalized benchmarks from a supported JSON file.
-
-    Args:
-        path (Path): Path to a hyperfine, pytest-benchmark, or compact mapping
-            JSON file.
-
-    Returns:
-        dict[str, Benchmark]: Normalized benchmarks keyed by name.
-
-    Raises:
-        ValueError: If the JSON root is not an object or no supported benchmark
-            entries can be extracted.
-    """
-
-    data = _read_json(path)
-    if not isinstance(data, dict):
-        raise ValueError(f"{path} must contain a JSON object")
-
-    extractors = (_extract_hyperfine, _extract_pytest_benchmark, _extract_simple_mapping)
-    for extractor in extractors:
-        benchmarks = extractor(data)
-        if benchmarks:
-            return benchmarks
-
-    raise ValueError(f"No supported benchmark entries found in {path}")
-
-
-def compare_benchmarks(
-    baseline: dict[str, Benchmark],
-    current: dict[str, Benchmark],
-    threshold_percent: float,
-    higher_is_better: bool,
-) -> tuple[list[Comparison], list[str], list[str]]:
-    """Compare baseline benchmarks with current benchmarks.
-
-    Args:
-        baseline (dict[str, Benchmark]): Baseline benchmarks keyed by name.
-        current (dict[str, Benchmark]): Current benchmarks keyed by name.
-        threshold_percent (float): Regression threshold in percent.
-        higher_is_better (bool): If ``True``, lower current values are treated as
-            regressions. If ``False``, higher current values are treated as
-            regressions.
-
-    Returns:
-        tuple[list[Comparison], list[str], list[str]]: Comparisons for common
-        benchmark names, names missing from current results, and names newly
-        present in current results.
-    """
-
-    comparisons: list[Comparison] = []
-    missing_in_current: list[str] = []
-    new_in_current: list[str] = []
-
-    for name, baseline_benchmark in sorted(baseline.items()):
-        current_benchmark = current.get(name)
-        if current_benchmark is None:
-            missing_in_current.append(name)
-            continue
-
-        if baseline_benchmark.value == 0:
-            delta_percent = 0.0
-        else:
-            delta_percent = (
-                (current_benchmark.value - baseline_benchmark.value)
-                / abs(baseline_benchmark.value)
-                * 100
-            )
-
-        if higher_is_better:
-            regressed = delta_percent <= -threshold_percent
-            improved = delta_percent >= threshold_percent
-        else:
-            regressed = delta_percent >= threshold_percent
-            improved = delta_percent <= -threshold_percent
-
-        comparisons.append(
-            Comparison(
-                name=name,
-                baseline=baseline_benchmark.value,
-                current=current_benchmark.value,
-                delta_percent=delta_percent,
-                unit=current_benchmark.unit or baseline_benchmark.unit,
-                metric=current_benchmark.metric,
-                regressed=regressed,
-                improved=improved,
-            )
-        )
-
-    for name in sorted(set(current) - set(baseline)):
-        new_in_current.append(name)
-
-    return comparisons, missing_in_current, new_in_current
-
-
-def _format_value(value: float, unit: str) -> str:
-    """Format a benchmark value for Markdown output.
-
-    Args:
-        value (float): Numeric benchmark value.
-        unit (str): Display unit.
-
-    Returns:
-        str: Formatted value with optional unit suffix.
-    """
-
-    suffix = f" {unit}" if unit else ""
-    return f"{value:.6g}{suffix}"
-
-
-def _format_status(comparison: Comparison) -> str:
-    """Format a comparison status for Markdown output."""
-
-    if comparison.regressed:
-        return ":red_circle: regressed"
-    if comparison.improved:
-        return ":green_circle: improved"
-    return "ok"
-
-
-def write_summary(
-    path: Path,
-    comparisons: list[Comparison],
-    missing_in_current: list[str],
-    new_in_current: list[str],
-    threshold_percent: float,
-    higher_is_better: bool,
-) -> None:
-    """Write a Markdown benchmark comparison summary.
-
-    Args:
-        path (Path): Path where the summary should be written.
-        comparisons (list[Comparison]): Comparison rows for matching benchmarks.
-        missing_in_current (list[str]): Baseline benchmark names missing from the
-            current result.
-        new_in_current (list[str]): Current benchmark names not present in the
-            baseline result.
-        threshold_percent (float): Regression threshold in percent.
-        higher_is_better (bool): Whether higher benchmark values are considered
-            better.
-    """
-
-    regressions = [comparison for comparison in comparisons if comparison.regressed]
-    improvements = [comparison for comparison in comparisons if comparison.improved]
-    direction = "higher is better" if higher_is_better else "lower is better"
-    sorted_comparisons = sorted(comparisons, key=lambda comparison: comparison.name)
-
-    lines = [
-        "<!-- bw-benchmark-comment -->",
-        "## Benchmark comparison",
-        "",
-        f"Threshold: {threshold_percent:g}% ({direction}).",
-        f"Result: {len(regressions)} regression(s), {len(improvements)} improvement(s) beyond threshold.",
-    ]
-    lines.append("")
-
-    if regressions:
-        lines.extend(
-            [
-                f"{len(regressions)} benchmark(s) regressed beyond the configured threshold.",
-                "",
-                "| Benchmark | Baseline | Current | Change |",
-                "| --- | ---: | ---: | ---: |",
-            ]
-        )
-        for comparison in regressions:
-            lines.append(
-                "| "
-                f"{comparison.name} | "
-                f"{_format_value(comparison.baseline, comparison.unit)} | "
-                f"{_format_value(comparison.current, comparison.unit)} | "
-                f"{comparison.delta_percent:+.2f}% |"
-            )
-    else:
-        lines.append("No benchmark regression exceeded the configured threshold.")
-
-    lines.append("")
-
-    if improvements:
-        lines.extend(
-            [
-                f"{len(improvements)} benchmark(s) improved beyond the configured threshold.",
-                "",
-                "| Benchmark | Baseline | Current | Change |",
-                "| --- | ---: | ---: | ---: |",
-            ]
-        )
-        for comparison in improvements:
-            lines.append(
-                "| "
-                f"{comparison.name} | "
-                f"{_format_value(comparison.baseline, comparison.unit)} | "
-                f"{_format_value(comparison.current, comparison.unit)} | "
-                f"{comparison.delta_percent:+.2f}% |"
-            )
-    else:
-        lines.append("No benchmark improvement exceeded the configured threshold.")
-
-    if sorted_comparisons:
-        lines.extend(
-            [
-                "",
-                "<details>",
-                "<summary>All benchmark results</summary>",
-                "",
-                "| Benchmark | Baseline | Current | Change | Status |",
-                "| --- | ---: | ---: | ---: | --- |",
-            ]
-        )
-        for comparison in sorted_comparisons:
-            lines.append(
-                "| "
-                f"{comparison.name} | "
-                f"{_format_value(comparison.baseline, comparison.unit)} | "
-                f"{_format_value(comparison.current, comparison.unit)} | "
-                f"{comparison.delta_percent:+.2f}% | "
-                f"{_format_status(comparison)} |"
-            )
-        lines.extend(["", "</details>"])
-
-    if missing_in_current:
-        lines.extend(["", "Missing benchmarks in the current run:"])
-        lines.extend(f"- `{name}`" for name in missing_in_current)
-
-    if new_in_current:
-        lines.extend(["", "New benchmarks in the current run:"])
-        lines.extend(f"- `{name}`" for name in new_in_current)
-
-    path.parent.mkdir(parents=True, exist_ok=True)
-    path.write_text("\n".join(lines) + "\n", encoding="utf-8")
-
-
-def main() -> int:
-    """Run the benchmark comparison command line interface.
-
-    Returns:
-        int: ``1`` when a regression exceeds the threshold, otherwise ``0``.
-    """
-
-    parser = argparse.ArgumentParser()
-    parser.add_argument("--baseline", required=True, type=Path)
-    parser.add_argument("--current", required=True, type=Path)
-    parser.add_argument("--summary", required=True, type=Path)
-    parser.add_argument("--threshold-percent", required=True, type=float)
-    parser.add_argument("--higher-is-better", action="store_true")
-    args = parser.parse_args()
-
-    baseline = extract_benchmarks(args.baseline)
-    current = extract_benchmarks(args.current)
-    comparisons, missing_in_current, new_in_current = compare_benchmarks(
-        baseline=baseline,
-        current=current,
-        threshold_percent=args.threshold_percent,
-        higher_is_better=args.higher_is_better,
-    )
-
-    write_summary(
-        path=args.summary,
-        comparisons=comparisons,
-        missing_in_current=missing_in_current,
-        new_in_current=new_in_current,
-        threshold_percent=args.threshold_percent,
-        higher_is_better=args.higher_is_better,
-    )
-
-    return 1 if any(comparison.regressed for comparison in comparisons) else 0
-
-
-if __name__ == "__main__":
-    raise SystemExit(main())

.github/scripts/run_benchmarks.sh

@@ -1,74 +0,0 @@
-#!/usr/bin/env bash
-
-##########################
-### AI-generated file. ###
-##########################
-
-set -euo pipefail
-
-mkdir -p benchmark-results
-benchmark_json="${BENCHMARK_JSON:-benchmark-results/current.json}"
-benchmark_root="$(dirname "$benchmark_json")"
-hyperfine_benchmark_dir="${BENCHMARK_HYPERFINE_DIR:-tests/benchmarks/hyperfine}"
-pytest_benchmark_dirs="${BENCHMARK_PYTEST_DIRS:-${BENCHMARK_PYTEST_DIR:-}}"
-benchmark_work_dir="$benchmark_root/raw-results"
-hyperfine_json_dir="$benchmark_work_dir/hyperfine"
-pytest_json="$benchmark_work_dir/pytest.json"
-
-shopt -s nullglob
-benchmark_scripts=()
-benchmark_scripts=("$hyperfine_benchmark_dir"/benchmark_*.sh)
-shopt -u nullglob
-
-pytest_dirs=()
-for pytest_benchmark_dir in $pytest_benchmark_dirs; do
-  if [ -d "$pytest_benchmark_dir" ]; then
-    pytest_dirs+=("$pytest_benchmark_dir")
-  else
-    echo "Pytest benchmark directory not found: $pytest_benchmark_dir" >&2
-    exit 1
-  fi
-done
-
-if [ "${#benchmark_scripts[@]}" -eq 0 ] && [ "${#pytest_dirs[@]}" -eq 0 ]; then
-  echo "No benchmark scripts or pytest benchmarks found" >&2
-  exit 1
-fi
-
-echo "Benchmark Python: $(command -v python)"
-python -c 'import sys; print(sys.version)'
-
-rm -rf "$benchmark_work_dir"
-mkdir -p "$hyperfine_json_dir"
-
-if [ "${#benchmark_scripts[@]}" -gt 0 ]; then
-  for benchmark_script in "${benchmark_scripts[@]}"; do
-    title="$(sed -n 's/^# BENCHMARK_TITLE:[[:space:]]*//p' "$benchmark_script" | head -n 1)"
-    if [ -z "$title" ]; then
-      title="$(basename "$benchmark_script" .sh)"
-    fi
-    benchmark_name="$(basename "$benchmark_script" .sh)"
-    benchmark_result_json="$hyperfine_json_dir/$benchmark_name.json"
-    echo "Preflight benchmark script: $benchmark_script"
-    bash "$benchmark_script"
-
-    hyperfine \
-      --show-output \
-      --warmup 1 \
-      --runs 5 \
-      --command-name "$title" \
-      --export-json "$benchmark_result_json" \
-      "bash $(printf "%q" "$benchmark_script")"
-  done
-fi
-
-if [ "${#pytest_dirs[@]}" -gt 0 ]; then
-  pytest \
-    -q "${pytest_dirs[@]}" \
-    --benchmark-only \
-    --benchmark-json "$pytest_json"
-fi
-
-python .github/scripts/aggregate_benchmarks.py \
-  --input-dir "$benchmark_work_dir" \
-  --output "$benchmark_json"

.github/scripts/run_with_bec_servers.py

@@ -1,125 +0,0 @@
-##########################
-### AI-generated file. ###
-##########################
-
-"""Run a command with BEC e2e services available."""
-
-from __future__ import annotations
-
-import argparse
-import os
-import shutil
-import subprocess
-import tempfile
-import time
-from pathlib import Path
-
-import bec_lib
-from bec_ipython_client import BECIPythonClient
-from bec_lib.redis_connector import RedisConnector
-from bec_lib.service_config import ServiceConfig, ServiceConfigModel
-from redis import Redis
-
-
-def _wait_for_redis(host: str, port: int) -> None:
-    client = Redis(host=host, port=port)
-    deadline = time.monotonic() + 10
-    while time.monotonic() < deadline:
-        try:
-            if client.ping():
-                return
-        except Exception:
-            time.sleep(0.1)
-    raise RuntimeError(f"Redis did not start on {host}:{port}")
-
-
-def _start_redis(files_path: Path, host: str, port: int) -> subprocess.Popen:
-    redis_server = shutil.which("redis-server")
-    if redis_server is None:
-        raise RuntimeError("redis-server executable not found")
-
-    return subprocess.Popen(
-        [
-            redis_server,
-            "--bind",
-            host,
-            "--port",
-            str(port),
-            "--save",
-            "",
-            "--appendonly",
-            "no",
-            "--dir",
-            str(files_path),
-        ]
-    )
-
-
-def _write_configs(files_path: Path, host: str, port: int) -> Path:
-    test_config = files_path / "test_config.yaml"
-    services_config = files_path / "services_config.yaml"
-
-    bec_lib_path = Path(bec_lib.__file__).resolve().parent
-    shutil.copyfile(bec_lib_path / "tests" / "test_config.yaml", test_config)
-
-    service_config = ServiceConfigModel(
-        redis={"host": host, "port": port}, file_writer={"base_path": str(files_path)}
-    )
-    services_config.write_text(service_config.model_dump_json(indent=4), encoding="utf-8")
-    return services_config
-
-
-def _load_demo_config(services_config: Path) -> None:
-    bec = BECIPythonClient(ServiceConfig(services_config), RedisConnector, forced=True)
-    bec.start()
-    try:
-        bec.config.load_demo_config()
-    finally:
-        bec.shutdown()
-        bec._client._reset_singleton()
-
-
-def main() -> int:
-    parser = argparse.ArgumentParser()
-    parser.add_argument("command", nargs=argparse.REMAINDER)
-    args = parser.parse_args()
-
-    if args.command[:1] == ["--"]:
-        args.command = args.command[1:]
-    if not args.command:
-        raise ValueError("No command provided")
-
-    host = "127.0.0.1"
-    port = 6379
-
-    with tempfile.TemporaryDirectory(prefix="bec-benchmark-") as tmp:
-        files_path = Path(tmp)
-        services_config = _write_configs(files_path, host, port)
-        redis_process = _start_redis(files_path, host, port)
-        processes = None
-        service_handler = None
-        try:
-            _wait_for_redis(host, port)
-
-            from bec_server.bec_server_utils.service_handler import ServiceHandler
-
-            service_handler = ServiceHandler(
-                bec_path=files_path, config_path=services_config, interface="subprocess"
-            )
-            processes = service_handler.start()
-            _load_demo_config(services_config)
-
-            env = os.environ.copy()
-            return subprocess.run(args.command, env=env, check=False).returncode
-        finally:
-            if service_handler is not None and processes is not None:
-                service_handler.stop(processes)
-            redis_process.terminate()
-            try:
-                redis_process.wait(timeout=10)
-            except subprocess.TimeoutExpired:
-                redis_process.kill()
-
-
-if __name__ == "__main__":
-    raise SystemExit(main())

.github/workflows/benchmark.yml

@@ -1,242 +0,0 @@
-name: BW Benchmarks
-
-on: [ workflow_call ]
-
-permissions:
-  contents: read
-
-env:
-  BENCHMARK_JSON: benchmark-results/current.json
-  BENCHMARK_BASELINE_JSON: gh-pages-benchmark-data/benchmarks/latest.json
-  BENCHMARK_SUMMARY: benchmark-results/summary.md
-  BENCHMARK_COMMAND: "bash .github/scripts/run_benchmarks.sh"
-  BENCHMARK_THRESHOLD_PERCENT: 20
-  BENCHMARK_HIGHER_IS_BETTER: false
-
-jobs:
-  benchmark_attempt:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    permissions:
-      contents: read
-    defaults:
-      run:
-        shell: bash -el {0}
-    strategy:
-      fail-fast: false
-      matrix:
-        attempt: [ 1, 2, 3 ]
-
-    env:
-      BENCHMARK_JSON: benchmark-results/current-${{ matrix.attempt }}.json
-      BEC_CORE_BRANCH: main
-      OPHYD_DEVICES_BRANCH: main
-      PLUGIN_REPO_BRANCH: main
-      BENCHMARK_PYTEST_DIRS: tests/unit_tests/benchmarks
-      QTWEBENGINE_DISABLE_SANDBOX: 1
-      QT_QPA_PLATFORM: "offscreen"
-
-    steps:
-      - name: Checkout BEC Widgets
-        uses: actions/checkout@v4
-        with:
-          repository: bec-project/bec_widgets
-          ref: ${{ github.event.pull_request.head.sha || github.sha }}
-
-      - name: Set up Conda
-        uses: conda-incubator/setup-miniconda@v3
-        with:
-          auto-update-conda: true
-          auto-activate-base: true
-          python-version: "3.11"
-
-      - name: Install system dependencies
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y libgl1 libegl1 x11-utils libxkbcommon-x11-0 libdbus-1-3 xvfb
-          sudo apt-get -y install libnss3 libxdamage1 libasound2t64 libatomic1 libxcursor1
-          sudo apt-get -y install ttyd hyperfine redis-server
-
-      - name: Install full e2e environment
-        run: |
-          echo -e "\033[35;1m Using branch $BEC_CORE_BRANCH of BEC CORE \033[0;m";
-          git clone --branch "$BEC_CORE_BRANCH" https://github.com/bec-project/bec.git
-          echo -e "\033[35;1m Using branch $OPHYD_DEVICES_BRANCH of OPHYD_DEVICES \033[0;m";
-          git clone --branch "$OPHYD_DEVICES_BRANCH" https://github.com/bec-project/ophyd_devices.git
-          export OHPYD_DEVICES_PATH=$PWD/ophyd_devices
-          echo -e "\033[35;1m Using branch $PLUGIN_REPO_BRANCH of bec_testing_plugin \033[0;m";
-          git clone --branch "$PLUGIN_REPO_BRANCH" https://github.com/bec-project/bec_testing_plugin.git
-          cd ./bec
-          conda create -q -n test-environment python=3.11
-          conda activate test-environment
-          source ./bin/install_bec_dev.sh -t
-          cd ../
-          python -m pip install -e ./ophyd_devices -e .[dev,pyside6] -e ./bec_testing_plugin pytest-benchmark
-
-          mkdir -p "$(dirname "$BENCHMARK_JSON")"
-          python .github/scripts/run_with_bec_servers.py -- bash -lc "$BENCHMARK_COMMAND"
-          test -s "$BENCHMARK_JSON"
-
-      - name: Upload benchmark artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: bw-benchmark-json-${{ matrix.attempt }}
-          path: ${{ env.BENCHMARK_JSON }}
-
-  benchmark:
-    needs: [ benchmark_attempt ]
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      issues: write
-      pull-requests: write
-
-    steps:
-      - name: Checkout BEC Widgets
-        uses: actions/checkout@v4
-        with:
-          repository: bec-project/bec_widgets
-          ref: ${{ github.event.pull_request.head.sha || github.sha }}
-
-      - name: Download benchmark attempts
-        uses: actions/download-artifact@v4
-        with:
-          pattern: bw-benchmark-json-*
-          path: benchmark-results/attempts
-          merge-multiple: true
-
-      - name: Aggregate benchmark attempts
-        run: |
-          python .github/scripts/aggregate_benchmarks.py \
-            --input-dir benchmark-results/attempts \
-            --output "$BENCHMARK_JSON"
-
-      - name: Upload aggregate benchmark artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: bw-benchmark-json
-          path: ${{ env.BENCHMARK_JSON }}
-
-      - name: Fetch gh-pages benchmark data
-        run: |
-          if git ls-remote --exit-code --heads origin gh-pages; then
-            git clone --depth=1 --branch gh-pages "$GITHUB_SERVER_URL/$GITHUB_REPOSITORY.git" gh-pages-benchmark-data
-          else
-            mkdir -p gh-pages-benchmark-data
-          fi
-
-      - name: Compare with latest gh-pages benchmark
-        id: compare
-        continue-on-error: true
-        run: |
-          if [ ! -s "$BENCHMARK_BASELINE_JSON" ]; then
-            mkdir -p "$(dirname "$BENCHMARK_SUMMARY")"
-            {
-              echo "<!-- bw-benchmark-comment -->"
-              echo "## Benchmark comparison"
-              echo
-              echo "No benchmark baseline was found on gh-pages."
-            } > "$BENCHMARK_SUMMARY"
-            exit 0
-          fi
-
-          args=(
-            --baseline "$BENCHMARK_BASELINE_JSON"
-            --current "$BENCHMARK_JSON"
-            --summary "$BENCHMARK_SUMMARY"
-            --threshold-percent "$BENCHMARK_THRESHOLD_PERCENT"
-          )
-
-          if [ "$BENCHMARK_HIGHER_IS_BETTER" = "true" ]; then
-            args+=(--higher-is-better)
-          fi
-
-          set +e
-          python .github/scripts/compare_benchmarks.py "${args[@]}"
-          status=$?
-          set -e
-
-          if [ ! -s "$BENCHMARK_SUMMARY" ]; then
-            mkdir -p "$(dirname "$BENCHMARK_SUMMARY")"
-            {
-              echo "<!-- bw-benchmark-comment -->"
-              echo "## Benchmark comparison"
-              echo
-              echo "Benchmark comparison failed before writing a summary."
-            } > "$BENCHMARK_SUMMARY"
-          fi
-
-          exit "$status"
-
-      - name: Find existing benchmark PR comment
-        if: github.event_name == 'pull_request'
-        id: fc
-        uses: peter-evans/find-comment@v3
-        with:
-          issue-number: ${{ github.event.pull_request.number }}
-          comment-author: github-actions[bot]
-          body-includes: "<!-- bw-benchmark-comment -->"
-
-      - name: Create or update benchmark PR comment
-        if: github.event_name == 'pull_request'
-        uses: peter-evans/create-or-update-comment@v5
-        with:
-          issue-number: ${{ github.event.pull_request.number }}
-          comment-id: ${{ steps.fc.outputs.comment-id }}
-          body-path: ${{ env.BENCHMARK_SUMMARY }}
-          edit-mode: replace
-
-      - name: Fail on benchmark regression
-        if: github.event_name == 'pull_request' && steps.compare.outcome == 'failure'
-        run: exit 1
-
-  publish:
-    needs: [ benchmark ]
-    if: github.event_name == 'push' && github.ref == 'refs/heads/main'
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-
-    steps:
-      - name: Checkout BEC Widgets
-        uses: actions/checkout@v4
-        with:
-          repository: bec-project/bec_widgets
-          ref: ${{ github.sha }}
-
-      - name: Download aggregate benchmark artifact
-        uses: actions/download-artifact@v4
-        with:
-          name: bw-benchmark-json
-          path: benchmark-results
-
-      - name: Verify aggregate benchmark artifact
-        run: test -s "$BENCHMARK_JSON"
-
-      - name: Prepare gh-pages for publishing
-        run: |
-          # Clean up any existing worktree/directory
-          if [ -d gh-pages-benchmark-data ]; then
-            git worktree remove gh-pages-benchmark-data --force || rm -rf gh-pages-benchmark-data
-          fi
-
-          if git ls-remote --exit-code --heads origin gh-pages; then
-            git fetch --depth=1 origin gh-pages
-            git worktree add gh-pages-benchmark-data FETCH_HEAD
-          else
-            git worktree add --detach gh-pages-benchmark-data
-            git -C gh-pages-benchmark-data checkout --orphan gh-pages
-            git -C gh-pages-benchmark-data rm -rf .
-          fi
-
-      - name: Publish benchmark data to gh-pages
-        working-directory: gh-pages-benchmark-data
-        run: |
-          mkdir -p benchmarks/history
-          cp "../$BENCHMARK_JSON" benchmarks/latest.json
-          cp "../$BENCHMARK_JSON" "benchmarks/history/${GITHUB_SHA}.json"
-          git config user.name "github-actions[bot]"
-          git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
-          git add benchmarks/latest.json "benchmarks/history/${GITHUB_SHA}.json"
-          git commit -m "Update BW benchmark data for ${GITHUB_SHA}" || exit 0
-          git push origin HEAD:gh-pages

.github/workflows/ci.yml

@@ -1,29 +1,24 @@
 name: Full CI
-on:
+on: 
   push:
   pull_request:
   workflow_dispatch:
     inputs:
       BEC_WIDGETS_BRANCH:
-        description: "Branch of BEC Widgets to install"
+        description: 'Branch of BEC Widgets to install'
         required: false
         type: string
       BEC_CORE_BRANCH:
-        description: "Branch of BEC Core to install"
+        description: 'Branch of BEC Core to install'
         required: false
         type: string
       OPHYD_DEVICES_BRANCH:
-        description: "Branch of Ophyd Devices to install"
+        description: 'Branch of Ophyd Devices to install'
         required: false
         type: string
 
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
-  cancel-in-progress: true
-
 permissions:
   pull-requests: write
-  contents: read
 
 jobs:
   check_pr_status:
@@ -34,15 +29,6 @@ jobs:
     if: needs.check_pr_status.outputs.branch-pr == ''
     uses: ./.github/workflows/formatter.yml
 
-  benchmark:
-    needs: [check_pr_status]
-    if: needs.check_pr_status.outputs.branch-pr == ''
-    permissions:
-      contents: write
-      issues: write
-      pull-requests: write
-    uses: ./.github/workflows/benchmark.yml
-
   unit-test:
     needs: [check_pr_status, formatter]
     if: needs.check_pr_status.outputs.branch-pr == ''
@@ -79,9 +65,9 @@ jobs:
     uses: ./.github/workflows/child_repos.yml
     with:
       BEC_CORE_BRANCH: ${{ inputs.BEC_CORE_BRANCH || 'main' }}
-      OPHYD_DEVICES_BRANCH: ${{ inputs.OPHYD_DEVICES_BRANCH || 'main'}}
+      OPHYD_DEVICES_BRANCH: ${{ inputs.OPHYD_DEVICES_BRANCH || 'main'}} 
       BEC_WIDGETS_BRANCH: ${{ inputs.BEC_WIDGETS_BRANCH || github.head_ref || github.sha }}
-
+  
   plugin_repos:
     needs: [check_pr_status, formatter]
     if: needs.check_pr_status.outputs.branch-pr == ''
@@ -91,4 +77,4 @@ jobs:
       BEC_WIDGETS_BRANCH: ${{ inputs.BEC_WIDGETS_BRANCH || github.head_ref || github.sha }}
 
     secrets:
-      GH_READ_TOKEN: ${{ secrets.GH_READ_TOKEN }}
+      GH_READ_TOKEN: ${{ secrets.GH_READ_TOKEN }}

.github/workflows/end2end-conda.yml

@@ -9,10 +9,10 @@ jobs:
         shell: bash -el {0}
 
     env:
-      CHILD_PIPELINE_BRANCH: main # Set the branch you want for ophyd_devices
-      BEC_CORE_BRANCH: main # Set the branch you want for bec
-      OPHYD_DEVICES_BRANCH: main # Set the branch you want for ophyd_devices
-      PLUGIN_REPO_BRANCH: main # Set the branch you want for the plugin repo
+      CHILD_PIPELINE_BRANCH: main  # Set the branch you want for ophyd_devices
+      BEC_CORE_BRANCH: main        # Set the branch you want for bec
+      OPHYD_DEVICES_BRANCH: main   # Set the branch you want for ophyd_devices
+      PLUGIN_REPO_BRANCH: main     # Set the branch you want for the plugin repo
       PROJECT_PATH: ${{ github.repository }}
       QTWEBENGINE_DISABLE_SANDBOX: 1
       QT_QPA_PLATFORM: "offscreen"
@@ -23,16 +23,15 @@ jobs:
       - name: Set up Conda
         uses: conda-incubator/setup-miniconda@v3
         with:
-          auto-update-conda: true
-          auto-activate-base: true
-          python-version: "3.11"
+            auto-update-conda: true
+            auto-activate-base: true
+            python-version: '3.11'
 
       - name: Install dependencies
         run: |
           sudo apt-get update
           sudo apt-get install -y libgl1 libegl1 x11-utils libxkbcommon-x11-0 libdbus-1-3 xvfb
           sudo apt-get -y install libnss3 libxdamage1 libasound2t64 libatomic1 libxcursor1
-          sudo apt-get -y install ttyd
 
       - name: Conda install and run pytest
         run: |
@@ -55,5 +54,5 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: pytest-logs
-          path: ./bec/logs/*.log
-          retention-days: 7
+          path: ./logs/*.log
+          retention-days: 7

.github/workflows/pytest-matrix.yml

@@ -1,25 +1,25 @@
 name: Run Pytest with different Python versions
-on:
+on: 
   workflow_call:
     inputs:
       pr_number:
-        description: "Pull request number"
+        description: 'Pull request number'
         required: false
         type: number
       BEC_CORE_BRANCH:
-        description: "Branch of BEC Core to install"
+        description: 'Branch of BEC Core to install'
         required: false
-        default: "main"
+        default: 'main'
         type: string
       OPHYD_DEVICES_BRANCH:
-        description: "Branch of Ophyd Devices to install"
+        description: 'Branch of Ophyd Devices to install'
         required: false
-        default: "main"
+        default: 'main'
         type: string
       BEC_WIDGETS_BRANCH:
-        description: "Branch of BEC Widgets to install"
+        description: 'Branch of BEC Widgets to install'
         required: false
-        default: "main"
+        default: 'main'
         type: string
 
 jobs:
@@ -30,14 +30,15 @@ jobs:
         python-version: ["3.11", "3.12", "3.13"]
 
     env:
-      BEC_WIDGETS_BRANCH: main # Set the branch you want for bec_widgets
-      BEC_CORE_BRANCH: main # Set the branch you want for bec
-      OPHYD_DEVICES_BRANCH: main # Set the branch you want for ophyd_devices
+      BEC_WIDGETS_BRANCH: main  # Set the branch you want for bec_widgets
+      BEC_CORE_BRANCH: main        # Set the branch you want for bec
+      OPHYD_DEVICES_BRANCH: main   # Set the branch you want for ophyd_devices
       PROJECT_PATH: ${{ github.repository }}
       QTWEBENGINE_DISABLE_SANDBOX: 1
       QT_QPA_PLATFORM: "offscreen"
 
     steps:
+
       - name: Checkout BEC Widgets
         uses: actions/checkout@v4
         with:
@@ -55,4 +56,4 @@ jobs:
       - name: Run Pytest
         run: |
           pip install pytest pytest-random-order
-          pytest -v --junitxml=report.xml --random-order --ignore=tests/unit_tests/benchmarks ./tests/unit_tests
+          pytest -v --junitxml=report.xml --random-order ./tests/unit_tests

.github/workflows/pytest.yml

@@ -1,30 +1,32 @@
 name: Run Pytest with Coverage
-on:
+on: 
   workflow_call:
     inputs:
       pr_number:
-        description: "Pull request number"
+        description: 'Pull request number'
         required: false
         type: number
       BEC_CORE_BRANCH:
-        description: "Branch of BEC Core to install"
+        description: 'Branch of BEC Core to install'
         required: false
-        default: "main"
+        default: 'main'
         type: string
       OPHYD_DEVICES_BRANCH:
-        description: "Branch of Ophyd Devices to install"
+        description: 'Branch of Ophyd Devices to install'
         required: false
-        default: "main"
+        default: 'main'
         type: string
       BEC_WIDGETS_BRANCH:
-        description: "Branch of BEC Widgets to install"
+        description: 'Branch of BEC Widgets to install'
         required: false
-        default: "main"
+        default: 'main'
         type: string
     secrets:
       CODECOV_TOKEN:
         required: true
 
+
+
 permissions:
   pull-requests: write
 
@@ -53,7 +55,7 @@ jobs:
 
       - name: Run Pytest with Coverage
         id: coverage
-        run: pytest --random-order --cov=bec_widgets --cov-config=pyproject.toml --cov-branch --cov-report=xml --no-cov-on-fail --ignore=tests/unit_tests/benchmarks tests/unit_tests/
+        run: pytest --random-order --cov=bec_widgets --cov-config=pyproject.toml --cov-branch --cov-report=xml --no-cov-on-fail tests/unit_tests/
 
       - name: Upload test artifacts
         uses: actions/upload-artifact@v4
@@ -67,4 +69,4 @@ jobs:
         uses: codecov/codecov-action@v5
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
-          slug: bec-project/bec_widgets
+          slug: bec-project/bec_widgets

.gitignore

@@ -177,6 +177,4 @@ cython_debug/
 #  be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
 #  and can be added to the global gitignore or merged into this file.  For a more nuclear
 #  option (not recommended) you can uncomment the following to ignore the entire idea folder.
-#.idea/
-#
-tombi.toml
+#.idea/

bec_widgets/__init__.py

@@ -1,13 +1,19 @@
+import os
+import sys
+
+import bec_widgets.widgets.containers.qt_ads as QtAds
+from bec_widgets.utils.bec_widget import BECWidget
+from bec_widgets.utils.error_popups import SafeProperty, SafeSlot
+
+if sys.platform.startswith("linux"):
+    qt_platform = os.environ.get("QT_QPA_PLATFORM", "")
+    if qt_platform != "offscreen":
+        os.environ["QT_QPA_PLATFORM"] = "xcb"
+
+# Default QtAds configuration
+QtAds.CDockManager.setConfigFlag(QtAds.CDockManager.eConfigFlag.FocusHighlighting, True)
+QtAds.CDockManager.setConfigFlag(
+    QtAds.CDockManager.eConfigFlag.RetainTabSizeWhenCloseButtonHidden, True
+)
+
 __all__ = ["BECWidget", "SafeSlot", "SafeProperty"]
-
-
-def __getattr__(name):
-    if name == "BECWidget":
-        from bec_widgets.utils.bec_widget import BECWidget
-
-        return BECWidget
-    if name in {"SafeSlot", "SafeProperty"}:
-        from bec_widgets.utils.error_popups import SafeProperty, SafeSlot
-
-        return {"SafeSlot": SafeSlot, "SafeProperty": SafeProperty}[name]
-    raise AttributeError(f"module {__name__!r} has no attribute {name!r}")

bec_widgets/applications/__init__.py

@@ -1,15 +0,0 @@
-import os
-import sys
-
-import bec_widgets.widgets.containers.qt_ads as QtAds
-
-if sys.platform.startswith("linux"):
-    qt_platform = os.environ.get("QT_QPA_PLATFORM", "")
-    if qt_platform != "offscreen":
-        os.environ["QT_QPA_PLATFORM"] = "xcb"
-
-# Default QtAds configuration
-QtAds.CDockManager.setConfigFlag(QtAds.CDockManager.eConfigFlag.FocusHighlighting, True)
-QtAds.CDockManager.setConfigFlag(
-    QtAds.CDockManager.eConfigFlag.RetainTabSizeWhenCloseButtonHidden, True
-)

bec_widgets/applications/bw_launch.py

@@ -1,42 +1,45 @@
 from __future__ import annotations
 
-from typing import Literal
-
 from bec_lib import bec_logger
 
+from bec_widgets.widgets.containers.advanced_dock_area.advanced_dock_area import AdvancedDockArea
 from bec_widgets.widgets.containers.auto_update.auto_updates import AutoUpdates
-from bec_widgets.widgets.containers.dock_area.dock_area import BECDockArea
 
 logger = bec_logger.logger
 
 
 def dock_area(
-    object_name: str | None = None, startup_profile: str | Literal["restore", "skip"] | None = None
-) -> BECDockArea:
+    object_name: str | None = None, profile: str | None = None, start_empty: bool = False
+) -> AdvancedDockArea:
     """
     Create an advanced dock area using Qt Advanced Docking System.
 
     Args:
         object_name(str): The name of the advanced dock area.
-        startup_profile(str | Literal["restore", "skip"] | None): Startup mode for
-            the workspace:
-              - None: start empty
-              - "restore": restore last used profile
-              - "skip": do not initialize profile state
-              - "<name>": load specific profile
+        profile(str|None): Optional profile to load; if None the "general" profile is used.
+        start_empty(bool): If True, start with an empty dock area when loading specified profile.
 
     Returns:
-        BECDockArea: The created advanced dock area.
+        AdvancedDockArea: The created advanced dock area.
 
+    Note:
+        The "general" profile is mandatory and will always exist. If manually deleted,
+        it will be automatically recreated.
     """
+    # Default to "general" profile when called from CLI without specifying a profile
+    effective_profile = profile if profile is not None else "general"
 
-    widget = BECDockArea(
+    widget = AdvancedDockArea(
         object_name=object_name,
+        restore_initial_profile=True,
         root_widget=True,
         profile_namespace="bec",
-        startup_profile=startup_profile,
+        init_profile=effective_profile,
+        start_empty=start_empty,
+    )
+    logger.info(
+        f"Created advanced dock area with profile: {effective_profile}, start_empty: {start_empty}"
     )
-    logger.info(f"Created advanced dock area with startup_profile: {startup_profile}")
     return widget
 
 
@@ -48,7 +51,7 @@ def auto_update_dock_area(object_name: str | None = None) -> AutoUpdates:
         object_name(str): The name of the dock area.
 
     Returns:
-        BECDockArea: The created dock area.
+        AdvancedDockArea: The created dock area.
     """
     _auto_update = AutoUpdates(object_name=object_name)
     return _auto_update

bec_widgets/applications/launch_window.py

@@ -20,19 +20,21 @@ from qtpy.QtWidgets import (
 )
 
 import bec_widgets
+from bec_widgets.cli.rpc.rpc_register import RPCRegister
 from bec_widgets.utils.bec_plugin_helper import get_all_plugin_widgets
 from bec_widgets.utils.container_utils import WidgetContainerUtils
 from bec_widgets.utils.error_popups import SafeSlot
 from bec_widgets.utils.name_utils import pascal_to_snake
 from bec_widgets.utils.plugin_utils import get_plugin_auto_updates
 from bec_widgets.utils.round_frame import RoundedFrame
-from bec_widgets.utils.rpc_register import RPCRegister
-from bec_widgets.utils.screen_utils import apply_window_geometry, centered_geometry_for_app
 from bec_widgets.utils.toolbars.toolbar import ModularToolBar
 from bec_widgets.utils.ui_loader import UILoader
+from bec_widgets.widgets.containers.advanced_dock_area.advanced_dock_area import AdvancedDockArea
+from bec_widgets.widgets.containers.advanced_dock_area.profile_utils import (
+    get_last_profile,
+    list_profiles,
+)
 from bec_widgets.widgets.containers.auto_update.auto_updates import AutoUpdates
-from bec_widgets.widgets.containers.dock_area.dock_area import BECDockArea
-from bec_widgets.widgets.containers.dock_area.profile_utils import get_last_profile, list_profiles
 from bec_widgets.widgets.containers.main_window.main_window import BECMainWindow, BECMainWindowNoRPC
 from bec_widgets.widgets.utility.visual.dark_mode_button.dark_mode_button import DarkModeButton
 
@@ -43,7 +45,6 @@ if TYPE_CHECKING:  # pragma: no cover
 
 logger = bec_logger.logger
 MODULE_PATH = os.path.dirname(bec_widgets.__file__)
-START_EMPTY_PROFILE_OPTION = "Start Empty (No Profile)"
 
 
 class LaunchTile(RoundedFrame):
@@ -77,28 +78,23 @@ class LaunchTile(RoundedFrame):
             circular_pixmap.fill(Qt.transparent)
 
             painter = QPainter(circular_pixmap)
-            painter.setRenderHints(QPainter.RenderHint.Antialiasing, True)
+            painter.setRenderHints(QPainter.Antialiasing, True)
             path = QPainterPath()
             path.addEllipse(0, 0, size, size)
             painter.setClipPath(path)
-            pixmap = pixmap.scaled(
-                size,
-                size,
-                Qt.AspectRatioMode.KeepAspectRatio,
-                Qt.TransformationMode.SmoothTransformation,
-            )
+            pixmap = pixmap.scaled(size, size, Qt.KeepAspectRatio, Qt.SmoothTransformation)
             painter.drawPixmap(0, 0, pixmap)
             painter.end()
 
             self.icon_label.setPixmap(circular_pixmap)
-        self.layout.addWidget(self.icon_label, alignment=Qt.AlignmentFlag.AlignCenter)
+        self.layout.addWidget(self.icon_label, alignment=Qt.AlignCenter)
 
         # Top label
         self.top_label = QLabel(top_label.upper())
         font_top = self.top_label.font()
         font_top.setPointSize(10)
         self.top_label.setFont(font_top)
-        self.layout.addWidget(self.top_label, alignment=Qt.AlignmentFlag.AlignCenter)
+        self.layout.addWidget(self.top_label, alignment=Qt.AlignCenter)
 
         # Main label
         self.main_label = QLabel(main_label)
@@ -108,7 +104,7 @@ class LaunchTile(RoundedFrame):
         font_main.setPointSize(14)
         font_main.setBold(True)
         self.main_label.setFont(font_main)
-        self.main_label.setAlignment(Qt.AlignmentFlag.AlignCenter)
+        self.main_label.setAlignment(Qt.AlignCenter)
 
         # Shrink font if the default would wrap on this platform / DPI
         content_width = (
@@ -124,13 +120,13 @@ class LaunchTile(RoundedFrame):
 
         self.layout.addWidget(self.main_label)
 
-        self.spacer_top = QSpacerItem(0, 10, QSizePolicy.Policy.Fixed, QSizePolicy.Policy.Fixed)
+        self.spacer_top = QSpacerItem(0, 10, QSizePolicy.Fixed, QSizePolicy.Fixed)
         self.layout.addItem(self.spacer_top)
 
         # Description
         self.description_label = QLabel(description)
         self.description_label.setWordWrap(True)
-        self.description_label.setAlignment(Qt.AlignmentFlag.AlignCenter)
+        self.description_label.setAlignment(Qt.AlignCenter)
         self.layout.addWidget(self.description_label)
 
         # Selector
@@ -140,14 +136,13 @@ class LaunchTile(RoundedFrame):
         else:
             self.selector = None
 
-        self.spacer_bottom = QSpacerItem(
-            0, 0, QSizePolicy.Policy.Fixed, QSizePolicy.Policy.Expanding
-        )
+        self.spacer_bottom = QSpacerItem(0, 0, QSizePolicy.Fixed, QSizePolicy.Expanding)
         self.layout.addItem(self.spacer_bottom)
 
         # Action button
         self.action_button = QPushButton("Open")
-        self.action_button.setStyleSheet("""
+        self.action_button.setStyleSheet(
+            """
         QPushButton {
             background-color: #007AFF;
             border: none;
@@ -159,8 +154,9 @@ class LaunchTile(RoundedFrame):
         QPushButton:hover {
             background-color: #005BB5;
         }
-        """)
-        self.layout.addWidget(self.action_button, alignment=Qt.AlignmentFlag.AlignCenter)
+        """
+        )
+        self.layout.addWidget(self.action_button, alignment=Qt.AlignCenter)
 
     def _fit_label_to_width(self, label: QLabel, max_width: int, min_pt: int = 10):
         """
@@ -183,14 +179,12 @@ class LaunchTile(RoundedFrame):
         metrics = QFontMetrics(font)
         label.setFont(font)
         label.setWordWrap(False)
-        label.setText(metrics.elidedText(label.text(), Qt.TextElideMode.ElideRight, max_width))
+        label.setText(metrics.elidedText(label.text(), Qt.ElideRight, max_width))
 
 
 class LaunchWindow(BECMainWindow):
     RPC = True
-    PLUGIN = False
     TILE_SIZE = (250, 300)
-    DEFAULT_LAUNCH_SIZE = (800, 600)
     USER_ACCESS = ["show_launcher", "hide_launcher"]
 
     def __init__(
@@ -215,7 +209,7 @@ class LaunchWindow(BECMainWindow):
         self.toolbar = ModularToolBar(parent=self)
         self.addToolBar(Qt.TopToolBarArea, self.toolbar)
         self.spacer = QWidget(self)
-        self.spacer.setSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Expanding)
+        self.spacer.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding)
         self.toolbar.addWidget(self.spacer)
         self.toolbar.addWidget(self.dark_mode_button)
 
@@ -324,7 +318,7 @@ class LaunchWindow(BECMainWindow):
         )
         tile.setFixedWidth(self.TILE_SIZE[0])
         tile.setMinimumHeight(self.TILE_SIZE[1])
-        tile.setSizePolicy(QSizePolicy.Policy.Fixed, QSizePolicy.Policy.MinimumExpanding)
+        tile.setSizePolicy(QSizePolicy.Fixed, QSizePolicy.MinimumExpanding)
         if action_button:
             tile.action_button.clicked.connect(action_button)
         if show_selector and selector_items:
@@ -353,7 +347,7 @@ class LaunchWindow(BECMainWindow):
     def _refresh_dock_area_profiles(self, preserve_selection: bool = True) -> None:
         """
         Refresh the dock-area profile selector, optionally preserving the selection.
-        Defaults to Start Empty when no valid selection can be preserved.
+        Sets the combobox to the last used profile or "general" if no selection preserved.
 
         Args:
             preserve_selection(bool): Whether to preserve the current selection or not.
@@ -368,10 +362,9 @@ class LaunchWindow(BECMainWindow):
         )
 
         profiles = list_profiles("bec")
-        selector_items = [START_EMPTY_PROFILE_OPTION, *profiles]
         selector.blockSignals(True)
         selector.clear()
-        for profile in selector_items:
+        for profile in profiles:
             selector.addItem(profile)
 
         if selected_text:
@@ -380,31 +373,21 @@ class LaunchWindow(BECMainWindow):
             if idx >= 0:
                 selector.setCurrentIndex(idx)
             else:
-                # Selection no longer exists, fall back to default startup selection.
+                # Selection no longer exists, fall back to last profile or "general"
                 self._set_selector_to_default_profile(selector, profiles)
         else:
-            # No selection to preserve, use default startup selection.
+            # No selection to preserve, use last profile or "general"
             self._set_selector_to_default_profile(selector, profiles)
         selector.blockSignals(False)
 
     def _set_selector_to_default_profile(self, selector: QComboBox, profiles: list[str]) -> None:
         """
-        Set the selector default.
-
-        Preference order:
-            1) Start Empty option (if available)
-            2) Last used profile
-            3) First available profile
+        Set the selector to the last used profile or "general" as fallback.
 
         Args:
             selector(QComboBox): The combobox to set.
             profiles(list[str]): List of available profiles.
         """
-        start_empty_idx = selector.findText(START_EMPTY_PROFILE_OPTION, Qt.MatchFlag.MatchExactly)
-        if start_empty_idx >= 0:
-            selector.setCurrentIndex(start_empty_idx)
-            return
-
         # Try to get last used profile
         last_profile = get_last_profile(namespace="bec")
         if last_profile and last_profile in profiles:
@@ -413,6 +396,13 @@ class LaunchWindow(BECMainWindow):
                 selector.setCurrentIndex(idx)
                 return
 
+        # Fall back to "general" profile
+        if "general" in profiles:
+            idx = selector.findText("general", Qt.MatchFlag.MatchExactly)
+            if idx >= 0:
+                selector.setCurrentIndex(idx)
+                return
+
         # If nothing else, select first item
         if selector.count() > 0:
             selector.setCurrentIndex(0)
@@ -438,9 +428,7 @@ class LaunchWindow(BECMainWindow):
         from bec_widgets.applications import bw_launch
 
         with RPCRegister.delayed_broadcast() as rpc_register:
-            if geometry is None and launch_script != "custom_ui_file":
-                geometry = self._default_launch_geometry()
-            existing_dock_areas = rpc_register.get_names_of_rpc_by_class_type(BECDockArea)
+            existing_dock_areas = rpc_register.get_names_of_rpc_by_class_type(AdvancedDockArea)
             if name is not None:
                 WidgetContainerUtils.raise_for_invalid_name(name)
                 # If name already exists, generate a unique one with counter suffix
@@ -463,13 +451,13 @@ class LaunchWindow(BECMainWindow):
 
             if launch_script == "auto_update":
                 auto_update = kwargs.pop("auto_update", None)
-                return self._launch_auto_update(auto_update, geometry=geometry)
+                return self._launch_auto_update(auto_update)
 
             if launch_script == "widget":
                 widget = kwargs.pop("widget", None)
                 if widget is None:
                     raise ValueError("Widget name must be provided.")
-                return self._launch_widget(widget, geometry=geometry)
+                return self._launch_widget(widget)
 
             launch = getattr(bw_launch, launch_script, None)
             if launch is None:
@@ -481,13 +469,13 @@ class LaunchWindow(BECMainWindow):
             logger.info(f"Created new dock area: {name}")
 
             if isinstance(result_widget, BECMainWindow):
-                apply_window_geometry(result_widget, geometry)
+                self._apply_window_geometry(result_widget, geometry)
                 result_widget.show()
             else:
                 window = BECMainWindowNoRPC()
                 window.setCentralWidget(result_widget)
                 window.setWindowTitle(f"BEC - {result_widget.objectName()}")
-                apply_window_geometry(window, geometry)
+                self._apply_window_geometry(window, geometry)
                 window.show()
             return result_widget
 
@@ -522,15 +510,14 @@ class LaunchWindow(BECMainWindow):
             window = BECMainWindow(object_name=filename)
             window.setCentralWidget(loaded)
 
+        QApplication.processEvents()
         window.setWindowTitle(f"BEC - {filename}")
-        apply_window_geometry(window, None)
+        self._apply_window_geometry(window, None)
         window.show()
         logger.info(f"Launched custom UI: {filename}, type: {type(window).__name__}")
         return window
 
-    def _launch_auto_update(
-        self, auto_update: str, geometry: tuple[int, int, int, int] | None = None
-    ) -> AutoUpdates:
+    def _launch_auto_update(self, auto_update: str) -> AutoUpdates:
         if auto_update in self.available_auto_updates:
             auto_update_cls = self.available_auto_updates[auto_update]
             window = auto_update_cls()
@@ -540,14 +527,13 @@ class LaunchWindow(BECMainWindow):
             window = AutoUpdates()
 
         window.resize(window.minimumSizeHint())
+        QApplication.processEvents()
         window.setWindowTitle(f"BEC - {window.objectName()}")
-        apply_window_geometry(window, geometry)
+        self._apply_window_geometry(window, None)
         window.show()
         return window
 
-    def _launch_widget(
-        self, widget: type[BECWidget], geometry: tuple[int, int, int, int] | None = None
-    ) -> QWidget:
+    def _launch_widget(self, widget: type[BECWidget]) -> QWidget:
         name = pascal_to_snake(widget.__name__)
 
         WidgetContainerUtils.raise_for_invalid_name(name)
@@ -556,11 +542,12 @@ class LaunchWindow(BECMainWindow):
 
         widget_instance = widget(root_widget=True, object_name=name)
         assert isinstance(widget_instance, QWidget)
+        QApplication.processEvents()
 
         window.setCentralWidget(widget_instance)
         window.resize(window.minimumSizeHint())
         window.setWindowTitle(f"BEC - {widget_instance.objectName()}")
-        apply_window_geometry(window, geometry)
+        self._apply_window_geometry(window, None)
         window.show()
         return window
 
@@ -591,14 +578,11 @@ class LaunchWindow(BECMainWindow):
         """
         tile = self.tiles.get("dock_area")
         if tile is None or tile.selector is None:
-            startup_profile = None
+            profile = None
         else:
             selection = tile.selector.currentText().strip()
-            if selection == START_EMPTY_PROFILE_OPTION:
-                startup_profile = None
-            else:
-                startup_profile = selection if selection else None
-        return self.launch("dock_area", startup_profile=startup_profile)
+            profile = selection if selection else None
+        return self.launch("dock_area", profile=profile)
 
     def _open_widget(self):
         """
@@ -611,9 +595,30 @@ class LaunchWindow(BECMainWindow):
             raise ValueError(f"Widget {widget} not found in available widgets.")
         return self.launch("widget", widget=self.available_widgets[widget])
 
-    def _default_launch_geometry(self) -> tuple[int, int, int, int] | None:
-        width, height = self.DEFAULT_LAUNCH_SIZE
-        return centered_geometry_for_app(width=width, height=height)
+    def _apply_window_geometry(
+        self, window: QWidget, geometry: tuple[int, int, int, int] | None
+    ) -> None:
+        """Apply a provided geometry or center the window with an 80% layout."""
+        if geometry is not None:
+            window.setGeometry(*geometry)
+            return
+        default_geometry = self._default_window_geometry(window)
+        if default_geometry is not None:
+            window.setGeometry(*default_geometry)
+        else:
+            window.resize(window.minimumSizeHint())
+
+    @staticmethod
+    def _default_window_geometry(window: QWidget) -> tuple[int, int, int, int] | None:
+        screen = window.screen() or QApplication.primaryScreen()
+        if screen is None:
+            return None
+        available = screen.availableGeometry()
+        width = int(available.width() * 0.8)
+        height = int(available.height() * 0.8)
+        x = available.x() + (available.width() - width) // 2
+        y = available.y() + (available.height() - height) // 2
+        return x, y, width, height
 
     @SafeSlot(popup_error=True)
     def _open_custom_ui_file(self):
@@ -660,19 +665,10 @@ class LaunchWindow(BECMainWindow):
         Check if the launcher is the last widget in the application.
         """
 
-        # get all parents of connections
-        for connection in connections.values():
-            try:
-                parent = connection.parent()
-                if parent is None and connection.objectName() != self.objectName():
-                    logger.info(
-                        f"Found non-launcher connection without parent: {connection.objectName()}"
-                    )
-                    return False
-            except Exception as e:
-                logger.error(f"Error getting parent of connection: {e}")
-                return False
-        return True
+        remaining_connections = [
+            connection for connection in connections.values() if connection.parent_id != self.gui_id
+        ]
+        return len(remaining_connections) <= 4
 
     def _turn_off_the_lights(self, connections: dict):
         """
@@ -704,7 +700,7 @@ class LaunchWindow(BECMainWindow):
         self.hide()
 
 
-if __name__ == "__main__":  # pragma: no cover
+if __name__ == "__main__":
     import sys
 
     from bec_widgets.utils.colors import apply_theme

bec_widgets/applications/main_app.py

@@ -1,29 +1,17 @@
-from bec_qthemes import material_icon
-from qtpy.QtGui import QAction  # type: ignore
 from qtpy.QtWidgets import QApplication, QHBoxLayout, QStackedWidget, QWidget
 
 from bec_widgets.applications.navigation_centre.reveal_animator import ANIMATION_DURATION
 from bec_widgets.applications.navigation_centre.side_bar import SideBar
 from bec_widgets.applications.navigation_centre.side_bar_components import NavigationItem
-from bec_widgets.applications.views.admin_view.admin_view import AdminView
 from bec_widgets.applications.views.developer_view.developer_view import DeveloperView
 from bec_widgets.applications.views.device_manager_view.device_manager_view import DeviceManagerView
-from bec_widgets.applications.views.dock_area_view.dock_area_view import DockAreaView
 from bec_widgets.applications.views.view import ViewBase, WaveformViewInline, WaveformViewPopup
 from bec_widgets.utils.colors import apply_theme
-from bec_widgets.utils.guided_tour import GuidedTour
-from bec_widgets.utils.name_utils import sanitize_namespace
-from bec_widgets.utils.screen_utils import (
-    apply_centered_size,
-    available_screen_geometry,
-    main_app_size_for_screen,
-)
+from bec_widgets.widgets.containers.advanced_dock_area.advanced_dock_area import AdvancedDockArea
 from bec_widgets.widgets.containers.main_window.main_window import BECMainWindow
 
 
 class BECMainApp(BECMainWindow):
-    RPC = False
-    PLUGIN = False
 
     def __init__(
         self,
@@ -55,58 +43,51 @@ class BECMainApp(BECMainWindow):
 
         self._add_views()
 
-        # Initialize guided tour
-        self.guided_tour = GuidedTour(self)
-        self._setup_guided_tour()
-
     def _add_views(self):
         self.add_section("BEC Applications", "bec_apps")
-        self.dock_area = DockAreaView(self)
+        self.ads = AdvancedDockArea(self, profile_namespace="bec", auto_profile_namespace=False)
+        self.ads.setObjectName("MainWorkspace")
         self.device_manager = DeviceManagerView(self)
-        # self.developer_view = DeveloperView(self) #TODO temporary disable until the bugs with BECShell are resolved
-        self.admin_view = AdminView(self)
+        self.developer_view = DeveloperView(self)
 
-        self.add_view(icon="widgets", title="Dock Area", widget=self.dock_area, mini_text="Docks")
+        self.add_view(
+            icon="widgets", title="Dock Area", id="dock_area", widget=self.ads, mini_text="Docks"
+        )
         self.add_view(
             icon="display_settings",
             title="Device Manager",
+            id="device_manager",
             widget=self.device_manager,
             mini_text="DM",
         )
-        # TODO temporary disable until the bugs with BECShell are resolved
-        # self.add_view(
-        #     icon="code_blocks",
-        #     title="IDE",
-        #     widget=self.developer_view,
-        #     mini_text="IDE",
-        #     exclusive=True,
-        # )
         self.add_view(
-            icon="admin_panel_settings",
-            title="Admin View",
-            widget=self.admin_view,
-            mini_text="Admin",
-            from_top=False,
+            icon="code_blocks",
+            title="IDE",
+            widget=self.developer_view,
+            id="developer_view",
+            exclusive=True,
         )
 
         if self._show_examples:
             self.add_section("Examples", "examples")
             waveform_view_popup = WaveformViewPopup(
-                parent=self, view_id="waveform_view_popup", title="Waveform Plot"
+                parent=self, id="waveform_view_popup", title="Waveform Plot"
             )
             waveform_view_stack = WaveformViewInline(
-                parent=self, view_id="waveform_view_stack", title="Waveform Plot"
+                parent=self, id="waveform_view_stack", title="Waveform Plot"
             )
 
             self.add_view(
                 icon="show_chart",
                 title="Waveform With Popup",
+                id="waveform_popup",
                 widget=waveform_view_popup,
                 mini_text="Popup",
             )
             self.add_view(
                 icon="show_chart",
                 title="Waveform InLine Stack",
+                id="waveform_stack",
                 widget=waveform_view_stack,
                 mini_text="Stack",
             )
@@ -114,9 +95,6 @@ class BECMainApp(BECMainWindow):
         self.set_current("dock_area")
         self.sidebar.add_dark_mode_item()
 
-        # Add guided tour to Help menu
-        self._add_guided_tour_to_menu()
-
     # --- Public API ------------------------------------------------------
     def add_section(self, title: str, id: str, position: int | None = None):
         return self.sidebar.add_section(title, id, position)
@@ -132,7 +110,7 @@ class BECMainApp(BECMainWindow):
         *,
         icon: str,
         title: str,
-        view_id: str | None = None,
+        id: str,
         widget: QWidget,
         mini_text: str | None = None,
         position: int | None = None,
@@ -146,8 +124,7 @@ class BECMainApp(BECMainWindow):
         Args:
             icon(str): Icon name for the nav item.
             title(str): Title for the nav item.
-            view_id(str, optional): Unique ID for the view/item. If omitted, uses mini_text;
-                if mini_text is also omitted, uses title.
+            id(str): Unique ID for the view/item.
             widget(QWidget): The widget to add to the stack.
             mini_text(str, optional): Short text for the nav item when sidebar is collapsed.
             position(int, optional): Position to insert the nav item.
@@ -160,11 +137,10 @@ class BECMainApp(BECMainWindow):
 
 
         """
-        resolved_id = sanitize_namespace(view_id or mini_text or title)
         item = self.sidebar.add_item(
             icon=icon,
             title=title,
-            id=resolved_id,
+            id=id,
             mini_text=mini_text,
             position=position,
             from_top=from_top,
@@ -174,15 +150,13 @@ class BECMainApp(BECMainWindow):
         # Wrap plain widgets into a ViewBase so enter/exit hooks are available
         if isinstance(widget, ViewBase):
             view_widget = widget
-            view_widget.view_id = resolved_id
+            view_widget.view_id = id
             view_widget.view_title = title
         else:
-            view_widget = ViewBase(content=widget, parent=self, view_id=resolved_id, title=title)
-
-        view_widget.change_object_name(resolved_id)
+            view_widget = ViewBase(content=widget, parent=self, id=id, title=title)
 
         idx = self.stack.addWidget(view_widget)
-        self._view_index[resolved_id] = idx
+        self._view_index[id] = idx
         return item
 
     def set_current(self, id: str) -> None:
@@ -191,12 +165,6 @@ class BECMainApp(BECMainWindow):
 
     # Internal: route sidebar selection to the stack
     def _on_view_selected(self, vid: str) -> None:
-        # Special handling for views that can not be switched to (e.g. dark mode toggle)
-        # Not registered as proper view with a stack index, so we ignore any logic below
-        # as it will anyways not result in a stack switch.
-        idx = self._view_index.get(vid)
-        if idx is None or not (0 <= idx < self.stack.count()):
-            return
         # Determine current view
         current_index = self.stack.currentIndex()
         current_view = (
@@ -222,160 +190,6 @@ class BECMainApp(BECMainWindow):
         if hasattr(new_view, "on_enter"):
             new_view.on_enter()
 
-    def _setup_guided_tour(self):
-        """
-        Setup the guided tour for the main application.
-        Registers key UI components and delegates to views for their internal components.
-        """
-        tour_steps = []
-
-        # --- General Layout Components ---
-
-        # Register the sidebar toggle button
-        toggle_step = self.guided_tour.register_widget(
-            widget=self.sidebar.toggle,
-            title="Sidebar Toggle",
-            text="Click this button to expand or collapse the sidebar. When expanded, you can see full navigation item titles and section names.",
-        )
-        tour_steps.append(toggle_step)
-
-        # Register the sidebar icons
-        sidebar_dock_area = self.sidebar.components.get("dock_area")
-        if sidebar_dock_area:
-            dock_step = self.guided_tour.register_widget(
-                widget=sidebar_dock_area,
-                title="Dock Area View",
-                text="Click here to access the Dock Area view, where you can manage and arrange your dockable panels.",
-            )
-            tour_steps.append(dock_step)
-
-        sidebar_device_manager = self.sidebar.components.get("device_manager")
-        if sidebar_device_manager:
-            device_manager_step = self.guided_tour.register_widget(
-                widget=sidebar_device_manager,
-                title="Device Manager View",
-                text="Click here to open the Device Manager view, where you can view and manage device configs.",
-            )
-            tour_steps.append(device_manager_step)
-
-        sidebar_developer_view = self.sidebar.components.get("developer_view")
-        if sidebar_developer_view:
-            developer_view_step = self.guided_tour.register_widget(
-                widget=sidebar_developer_view,
-                title="Developer View",
-                text="Click here to access the Developer view to write scripts and macros.",
-            )
-            tour_steps.append(developer_view_step)
-
-        # Register the dark mode toggle
-        dark_mode_item = self.sidebar.components.get("dark_mode")
-        if dark_mode_item:
-            dark_mode_step = self.guided_tour.register_widget(
-                widget=dark_mode_item,
-                title="Theme Toggle",
-                text="Switch between light and dark themes. The theme preference is saved and will be applied when you restart the application.",
-            )
-            tour_steps.append(dark_mode_step)
-
-        # Register the client info label
-        if hasattr(self, "_client_info_hover"):
-            client_info_step = self.guided_tour.register_widget(
-                widget=self._client_info_hover,
-                title="Client Status",
-                text="Displays status messages and information from the BEC Server.",
-            )
-            tour_steps.append(client_info_step)
-
-        # Register the scan progress bar if available
-        if hasattr(self, "_scan_progress_hover"):
-            progress_step = self.guided_tour.register_widget(
-                widget=self._scan_progress_hover,
-                title="Scan Progress",
-                text="Monitor the progress of ongoing scans. Hover over the progress bar to see detailed information including elapsed time and estimated completion.",
-            )
-            tour_steps.append(progress_step)
-
-        # Register the notification indicator in the status bar
-        if hasattr(self, "notification_indicator"):
-            notif_step = self.guided_tour.register_widget(
-                widget=self.notification_indicator,
-                title="Notification Center",
-                text="View system notifications, errors, and status updates. Click to filter notifications by type or expand to see all details.",
-            )
-            tour_steps.append(notif_step)
-
-        # --- View-Specific Components ---
-
-        # Register all views that can extend the tour
-        for view_id, view_index in self._view_index.items():
-            view_widget = self.stack.widget(view_index)
-            if not view_widget or not hasattr(view_widget, "register_tour_steps"):
-                continue
-
-            # Get the view's tour steps
-            view_tour = view_widget.register_tour_steps(self.guided_tour, self)
-            if view_tour is None:
-                if hasattr(view_widget.content, "register_tour_steps"):
-                    view_tour = view_widget.content.register_tour_steps(self.guided_tour, self)
-                if view_tour is None:
-                    continue
-
-            # Get the corresponding sidebar navigation item
-            nav_item = self.sidebar.components.get(view_id)
-            if not nav_item:
-                continue
-
-            # Use the view's title for the navigation button
-            nav_step = self.guided_tour.register_widget(
-                widget=nav_item,
-                title=view_tour.view_title,
-                text=f"Let's explore the features of the {view_tour.view_title}.",
-            )
-            tour_steps.append(nav_step)
-            tour_steps.extend(view_tour.step_ids)
-
-        # Create the tour with all registered steps
-        if tour_steps:
-            self.guided_tour.create_tour(tour_steps)
-
-    def start_guided_tour(self):
-        """
-        Public method to start the guided tour.
-        This can be called programmatically or connected to a menu/button action.
-        """
-        self.guided_tour.start_tour()
-
-    def _add_guided_tour_to_menu(self):
-        """
-        Add a 'Guided Tour' action to the Help menu.
-        """
-
-        # Find the Help menu
-        menu_bar = self.menuBar()
-        help_menu = None
-        for action in menu_bar.actions():
-            if action.text() == "Help":
-                help_menu = action.menu()
-                break
-
-        if help_menu:
-            # Add separator before the tour action
-            help_menu.addSeparator()
-
-            # Create and add the guided tour action
-            tour_action = QAction("Start Guided Tour", self)
-            tour_action.setIcon(material_icon("help"))
-            tour_action.triggered.connect(self.start_guided_tour)
-            tour_action.setShortcut("F1")  # Add keyboard shortcut
-            help_menu.addAction(tour_action)
-
-    def cleanup(self):
-        for view_id, idx in self._view_index.items():
-            view = self.stack.widget(idx)
-            view.close()
-            view.deleteLater()
-        super().cleanup()
-
 
 def main():  # pragma: no cover
     """
@@ -394,16 +208,28 @@ def main():  # pragma: no cover
     args, qt_args = parser.parse_known_args(sys.argv[1:])
 
     app = QApplication([sys.argv[0], *qt_args])
-    app.setApplicationName("BEC")
     apply_theme("dark")
     w = BECMainApp(show_examples=args.examples)
 
-    screen_geometry = available_screen_geometry()
-    if screen_geometry is not None:
-        width, height = main_app_size_for_screen(screen_geometry)
-        apply_centered_size(w, width, height, available=screen_geometry)
-    else:
-        w.resize(w.minimumSizeHint())
+    screen = app.primaryScreen()
+    screen_geometry = screen.availableGeometry()
+    screen_width = screen_geometry.width()
+    screen_height = screen_geometry.height()
+    # 70% of screen height, keep 16:9 ratio
+    height = int(screen_height * 0.9)
+    width = int(height * (16 / 9))
+
+    # If width exceeds screen width, scale down
+    if width > screen_width * 0.9:
+        width = int(screen_width * 0.9)
+        height = int(width / (16 / 9))
+
+    w.resize(width, height)
+
+    # Center the window on the screen
+    x = screen_geometry.x() + (screen_geometry.width() - width) // 2
+    y = screen_geometry.y() + (screen_geometry.height() - height) // 2
+    w.move(x, y)
 
     w.show()
 

bec_widgets/applications/navigation_centre/side_bar_components.py

@@ -127,10 +127,12 @@ class NavigationItem(QWidget):
         self._icon_size_expanded = QtCore.QSize(26, 26)
         self.icon_btn.setIconSize(self._icon_size_collapsed)
         # Remove QToolButton hover/pressed background/outline
-        self.icon_btn.setStyleSheet("""
+        self.icon_btn.setStyleSheet(
+            """
             QToolButton:hover { background: transparent; border: none; }
             QToolButton:pressed { background: transparent; border: none; }
-            """)
+            """
+        )
 
         # Mini label below icon
         self.mini_lbl = QLabel(self._mini_text, self)

bec_widgets/applications/views/admin_view/admin_view.py

@@ -1,35 +0,0 @@
-"""Module for Admin View."""
-
-from qtpy.QtWidgets import QWidget
-
-from bec_widgets.applications.views.view import ViewBase
-from bec_widgets.utils.error_popups import SafeSlot
-from bec_widgets.widgets.services.bec_atlas_admin_view.bec_atlas_admin_view import BECAtlasAdminView
-
-
-class AdminView(ViewBase):
-    """
-    A view for administrators to change the current active experiment, manage messaging
-    services, and more tasks reserved for users with admin privileges.
-    """
-
-    def __init__(
-        self,
-        parent: QWidget | None = None,
-        content: QWidget | None = None,
-        *,
-        view_id: str | None = None,
-        title: str | None = None,
-        **kwargs,
-    ):
-        super().__init__(parent=parent, content=content, view_id=view_id, title=title)
-        self.admin_widget = BECAtlasAdminView(parent=self)
-        self.set_content(self.admin_widget)
-
-    @SafeSlot()
-    def on_exit(self) -> None:
-        """Called before the view is hidden.
-
-        Default implementation does nothing. Override in subclasses.
-        """
-        self.admin_widget.logout()

bec_widgets/applications/views/developer_view/developer_view.py

@@ -1,7 +1,7 @@
 from qtpy.QtWidgets import QWidget
 
 from bec_widgets.applications.views.developer_view.developer_widget import DeveloperWidget
-from bec_widgets.applications.views.view import ViewBase, ViewTourSteps
+from bec_widgets.applications.views.view import ViewBase
 
 
 class DeveloperView(ViewBase):
@@ -14,89 +14,13 @@ class DeveloperView(ViewBase):
         parent: QWidget | None = None,
         content: QWidget | None = None,
         *,
-        view_id: str | None = None,
+        id: str | None = None,
         title: str | None = None,
-        **kwargs,
     ):
-        super().__init__(parent=parent, content=content, view_id=view_id, title=title, **kwargs)
+        super().__init__(parent=parent, content=content, id=id, title=title)
         self.developer_widget = DeveloperWidget(parent=self)
         self.set_content(self.developer_widget)
 
-    def register_tour_steps(self, guided_tour, main_app) -> ViewTourSteps | None:
-        """Register Developer View components with the guided tour.
-
-        Args:
-            guided_tour: The GuidedTour instance to register with.
-            main_app: The main application instance (for accessing set_current).
-
-        Returns:
-            ViewTourSteps | None: Model containing view title and step IDs.
-        """
-        step_ids = []
-        dev_widget = self.developer_widget
-
-        # IDE Toolbar
-        def get_ide_toolbar():
-            main_app.set_current("developer_view")
-            return (dev_widget.toolbar, None)
-
-        step_id = guided_tour.register_widget(
-            widget=get_ide_toolbar,
-            title="IDE Toolbar",
-            text="Quick access to save files, execute scripts, and configure IDE settings. Use the toolbar to manage your code and execution.",
-        )
-        step_ids.append(step_id)
-
-        # IDE Explorer
-        def get_ide_explorer():
-            main_app.set_current("developer_view")
-            return (dev_widget.explorer_dock.widget(), None)
-
-        step_id = guided_tour.register_widget(
-            widget=get_ide_explorer,
-            title="File Explorer",
-            text="Browse and manage your macro files. Create new files, open existing ones, and organize your scripts.",
-        )
-        step_ids.append(step_id)
-
-        # IDE Editor
-        def get_ide_editor():
-            main_app.set_current("developer_view")
-            return (dev_widget.monaco_dock.widget(), None)
-
-        step_id = guided_tour.register_widget(
-            widget=get_ide_editor,
-            title="Code Editor",
-            text="Write and edit Python code with syntax highlighting, auto-completion, and signature help. Monaco editor provides a modern coding experience.",
-        )
-        step_ids.append(step_id)
-
-        # IDE Console
-        def get_ide_console():
-            main_app.set_current("developer_view")
-            return (dev_widget.console_dock.widget(), None)
-
-        step_id = guided_tour.register_widget(
-            widget=get_ide_console,
-            title="BEC Shell Console",
-            text="Interactive Python console with BEC integration. Execute commands, test code snippets, and interact with the BEC system in real-time.",
-        )
-        step_ids.append(step_id)
-
-        # IDE Plotting Area
-        def get_ide_plotting():
-            main_app.set_current("developer_view")
-            return (dev_widget.plotting_ads, None)
-
-        step_id = guided_tour.register_widget(
-            widget=get_ide_plotting,
-            title="Plotting Area",
-            text="View plots and visualizations generated by your scripts. Arrange multiple plots in a flexible layout.",
-        )
-        step_ids.append(step_id)
-
-        return ViewTourSteps(view_title="Developer View", step_ids=step_ids)
-
 
 if __name__ == "__main__":
     import sys
@@ -126,11 +50,7 @@ if __name__ == "__main__":
     _app.resize(width, height)
     developer_view = DeveloperView()
     _app.add_view(
-        icon="code_blocks",
-        title="IDE",
-        widget=developer_view,
-        view_id="developer_view",
-        exclusive=True,
+        icon="code_blocks", title="IDE", widget=developer_view, id="developer_view", exclusive=True
     )
     _app.show()
     # developer_view.show()

bec_widgets/applications/views/developer_view/developer_widget.py

@@ -13,12 +13,12 @@ from bec_widgets.utils.error_popups import SafeSlot
 from bec_widgets.utils.toolbars.actions import MaterialIconAction
 from bec_widgets.utils.toolbars.bundles import ToolbarBundle
 from bec_widgets.utils.toolbars.toolbar import ModularToolBar
-from bec_widgets.widgets.containers.dock_area.basic_dock_area import DockAreaWidget
-from bec_widgets.widgets.containers.dock_area.dock_area import BECDockArea
+from bec_widgets.widgets.containers.advanced_dock_area.advanced_dock_area import AdvancedDockArea
+from bec_widgets.widgets.containers.advanced_dock_area.basic_dock_area import DockAreaWidget
 from bec_widgets.widgets.containers.qt_ads import CDockWidget
-from bec_widgets.widgets.editors.bec_console.bec_console import BecConsole, BECShell
 from bec_widgets.widgets.editors.monaco.monaco_dock import MonacoDock
 from bec_widgets.widgets.editors.monaco.monaco_widget import MonacoWidget
+from bec_widgets.widgets.editors.web_console.web_console import WebConsole
 from bec_widgets.widgets.utility.ide_explorer.ide_explorer import IDEExplorer
 
 
@@ -79,8 +79,6 @@ def markdown_to_html(md_text: str) -> str:
 
 
 class DeveloperWidget(DockAreaWidget):
-    RPC = False
-    PLUGIN = False
 
     def __init__(self, parent=None, **kwargs):
         super().__init__(parent=parent, variant="compact", **kwargs)
@@ -93,15 +91,14 @@ class DeveloperWidget(DockAreaWidget):
         # Initialize the widgets
         self.explorer = IDEExplorer(self)
         self.explorer.setObjectName("Explorer")
-
-        self.console = BECShell(self, rpc_exposed=False)
-        self.console.setObjectName("BEC Shell")
-        self.terminal = BecConsole(self, rpc_exposed=False)
+        self.console = WebConsole(self)
+        self.console.setObjectName("Console")
+        self.terminal = WebConsole(self, startup_cmd="")
         self.terminal.setObjectName("Terminal")
-        self.monaco = MonacoDock(self, rpc_exposed=False, rpc_passthrough_children=False)
+        self.monaco = MonacoDock(self)
         self.monaco.setObjectName("MonacoEditor")
         self.monaco.save_enabled.connect(self._on_save_enabled_update)
-        self.plotting_ads = BECDockArea(
+        self.plotting_ads = AdvancedDockArea(
             self,
             mode="plot",
             default_add_direction="bottom",
@@ -410,3 +407,23 @@ class DeveloperWidget(DockAreaWidget):
         """Clean up resources used by the developer widget."""
         self.delete_all()
         return super().cleanup()
+
+
+if __name__ == "__main__":
+    import sys
+
+    from bec_qthemes import apply_theme
+    from qtpy.QtWidgets import QApplication
+
+    from bec_widgets.applications.main_app import BECMainApp
+
+    app = QApplication(sys.argv)
+    apply_theme("dark")
+
+    _app = BECMainApp()
+    _app.show()
+    # developer_view.show()
+    # developer_view.setWindowTitle("Developer View")
+    # developer_view.resize(1920, 1080)
+    # developer_view.set_stretch(horizontal=[1, 3, 2], vertical=[5, 5]) #can be set during runtime
+    sys.exit(app.exec_())

bec_widgets/applications/views/device_manager_view/device_manager_dialogs/device_form_dialog.py

@@ -31,7 +31,7 @@ logger = bec_logger.logger
 class DeviceManagerOphydValidationDialog(QtWidgets.QDialog):
     """Popup dialog to test Ophyd device configurations interactively."""
 
-    def __init__(self, parent=None, config: dict | None = None):  # type: ignore
+    def __init__(self, parent=None, config: dict | None = None):  # type:ignore
         super().__init__(parent)
         self.setWindowTitle("Device Manager Ophyd Test")
         self._config_status = ConfigStatus.UNKNOWN.value
@@ -56,6 +56,8 @@ class DeviceManagerOphydValidationDialog(QtWidgets.QDialog):
         if device_name:
             self.device_manager_ophyd_test.add_device_to_keep_visible_after_validation(device_name)
 
+        self.device_manager_ophyd_test.change_device_configs([config], True, True)
+
         # Dialog Buttons: equal size, stacked horizontally
         button_box = QtWidgets.QDialogButtonBox(QtWidgets.QDialogButtonBox.StandardButton.Close)
         for button in button_box.buttons():
@@ -69,9 +71,6 @@ class DeviceManagerOphydValidationDialog(QtWidgets.QDialog):
         self._resize_dialog()
         self.finished.connect(self._finished)
 
-        # Add and test device config
-        self.device_manager_ophyd_test.change_device_configs([config], added=True, connect=True)
-
     def _resize_dialog(self):
         """Resize the dialog based on the screen size."""
         app: QtCore.QCoreApplication = QtWidgets.QApplication.instance()
@@ -133,7 +132,7 @@ class DeviceFormDialog(QtWidgets.QDialog):
     # validated: config_status, connection_status
     accepted_data = QtCore.Signal(dict, int, int, str, str)
 
-    def __init__(self, parent=None, add_btn_text: str = "Add Device"):  # type: ignore
+    def __init__(self, parent=None, add_btn_text: str = "Add Device"):  # type:ignore
         super().__init__(parent)
         # Track old device name if config is edited
         self._old_device_name: str = ""
@@ -176,17 +175,12 @@ class DeviceFormDialog(QtWidgets.QDialog):
         self.cancel_btn = QtWidgets.QPushButton("Cancel")
         self.reset_btn = QtWidgets.QPushButton("Reset Form")
 
-        btn_box = QtWidgets.QDialogButtonBox(self)
-        btn_box.addButton(self.cancel_btn, QtWidgets.QDialogButtonBox.ButtonRole.RejectRole)
-        btn_box.addButton(self.reset_btn, QtWidgets.QDialogButtonBox.ButtonRole.ActionRole)
-        btn_box.addButton(
-            self.test_connection_btn, QtWidgets.QDialogButtonBox.ButtonRole.ActionRole
-        )
-        btn_box.addButton(self.add_btn, QtWidgets.QDialogButtonBox.ButtonRole.AcceptRole)
-        for btn in btn_box.buttons():
+        btn_layout = QtWidgets.QHBoxLayout()
+        for btn in (self.cancel_btn, self.reset_btn, self.test_connection_btn, self.add_btn):
             btn.setSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Preferred)
-        layout.addWidget(btn_box)
-
+            btn_layout.addWidget(btn)
+        btn_box = QtWidgets.QGroupBox("Actions")
+        btn_box.setLayout(btn_layout)
         frame_layout.addWidget(btn_box)
 
         # Connect signals to explicit slots
@@ -291,7 +285,7 @@ class DeviceFormDialog(QtWidgets.QDialog):
         The dialog will be modal and prevent user interaction until validation is complete.
         """
         wait_dialog = QtWidgets.QProgressDialog(
-            "Validating config... please wait", None, 0, 0, parent=self
+            "Validating config… please wait", None, 0, 0, parent=self
         )
         wait_dialog.setWindowModality(QtCore.Qt.WindowModality.ApplicationModal)
         wait_dialog.setCancelButton(None)
@@ -374,7 +368,7 @@ class DeviceFormDialog(QtWidgets.QDialog):
         if not validate_name(config.get("name", "")):
             msg_box = self._create_warning_message_box(
                 "Invalid Device Name",
-                f"Device is invalid, cannot be empty or contain spaces. Please provide a valid name. {config.get('name', '')!r}",
+                f"Device is invalid, can not be empty with spaces. Please provide a valid name. {config.get('name', '')!r} ",
             )
             msg_box.exec()
             return

bec_widgets/applications/views/device_manager_view/device_manager_dialogs/upload_redis_dialog.py

@@ -4,7 +4,7 @@ from __future__ import annotations
 
 from enum import IntEnum
 from functools import partial
-from typing import TYPE_CHECKING, Any, List, Tuple
+from typing import TYPE_CHECKING, List, Tuple
 
 from bec_lib.logger import bec_logger
 from bec_qthemes import apply_theme, material_icon
@@ -513,8 +513,7 @@ class UploadRedisDialog(QtWidgets.QDialog):
                 [
                     detailed_text,
                     "These devices may not be reachable and disabled BEC upon loading the config.",
-                    "Consider validating these connections before proceeding.\n\n",
-                    "Continue anyway?",
+                    "Consider validating these connections before.",
                 ]
             )
             reply = QtWidgets.QMessageBox.critical(

bec_widgets/applications/views/device_manager_view/device_manager_display_widget.py

@@ -2,29 +2,18 @@ from __future__ import annotations
 
 import os
 from functools import partial
-from typing import TYPE_CHECKING, List, Literal, get_args
+from typing import List, Literal, get_args
 
 import yaml
 from bec_lib import config_helper
 from bec_lib.bec_yaml_loader import yaml_load
-from bec_lib.callback_handler import EventType
-from bec_lib.endpoints import MessageEndpoints
 from bec_lib.file_utils import DeviceConfigWriter
 from bec_lib.logger import bec_logger
-from bec_lib.messages import ConfigAction, ScanStatusMessage
+from bec_lib.messages import ConfigAction
 from bec_lib.plugin_helper import plugin_package_name, plugin_repo_path
-from bec_qthemes import apply_theme, material_icon
-from qtpy.QtCore import QMetaObject, Qt, QThreadPool, Signal
-from qtpy.QtGui import QColor
-from qtpy.QtWidgets import (
-    QApplication,
-    QFileDialog,
-    QMessageBox,
-    QPushButton,
-    QTextEdit,
-    QVBoxLayout,
-    QWidget,
-)
+from bec_qthemes import apply_theme
+from qtpy.QtCore import QMetaObject, QThreadPool, Signal
+from qtpy.QtWidgets import QFileDialog, QMessageBox, QTextEdit, QVBoxLayout, QWidget
 
 from bec_widgets.applications.views.device_manager_view.device_manager_dialogs import (
     ConfigChoiceDialog,
@@ -33,12 +22,11 @@ from bec_widgets.applications.views.device_manager_view.device_manager_dialogs i
 from bec_widgets.applications.views.device_manager_view.device_manager_dialogs.upload_redis_dialog import (
     UploadRedisDialog,
 )
-from bec_widgets.utils.colors import get_accent_colors
 from bec_widgets.utils.error_popups import SafeSlot
 from bec_widgets.utils.toolbars.actions import MaterialIconAction
 from bec_widgets.utils.toolbars.bundles import ToolbarBundle
 from bec_widgets.utils.toolbars.toolbar import ModularToolBar
-from bec_widgets.widgets.containers.dock_area.basic_dock_area import DockAreaWidget
+from bec_widgets.widgets.containers.advanced_dock_area.basic_dock_area import DockAreaWidget
 from bec_widgets.widgets.control.device_manager.components import (
     DeviceTable,
     DMConfigView,
@@ -50,16 +38,9 @@ from bec_widgets.widgets.control.device_manager.components.ophyd_validation.ophy
     ConfigStatus,
     ConnectionStatus,
 )
-from bec_widgets.widgets.progress.device_initialization_progress_bar.device_initialization_progress_bar import (
-    DeviceInitializationProgressBar,
-)
 from bec_widgets.widgets.services.device_browser.device_item.config_communicator import (
     CommunicateConfigAction,
 )
-from bec_widgets.widgets.utility.spinner.spinner import SpinnerWidget
-
-if TYPE_CHECKING:  # pragma: no cover
-    from bec_lib.client import BECClient
 
 logger = bec_logger.logger
 
@@ -70,84 +51,6 @@ _yes_no_question = partial(
 )
 
 
-class CustomBusyWidget(QWidget):
-    """Custom busy widget to show during device config upload."""
-
-    cancel_requested = Signal()
-
-    def __init__(self, parent=None, client: BECClient | None = None):
-        super().__init__(parent=parent)
-
-        # Widgets
-        self.progress = QWidget(parent=self)
-        self.progress_layout = QVBoxLayout(self.progress)
-        self.progress_layout.setContentsMargins(6, 6, 6, 6)
-        self.progress_inner = DeviceInitializationProgressBar(parent=self.progress, client=client)
-        self.progress_layout.addWidget(self.progress_inner)
-        self.progress.setMinimumWidth(320)
-
-        # Spinner
-        self.spinner = SpinnerWidget(parent=self)
-        scale = self._ui_scale()
-        spinner_size = int(scale * 0.12) if scale else 1
-        spinner_size = max(32, min(spinner_size, 96))
-        self.spinner.setFixedSize(spinner_size, spinner_size)
-
-        # Cancel button
-        self.cancel_button = QPushButton("Cancel Upload", parent=self)
-        self.cancel_button.setIcon(material_icon("cancel"))
-        self.cancel_button.clicked.connect(self.cancel_requested.emit)
-        button_height = int(spinner_size * 0.9)
-        button_height = max(36, min(button_height, 72))
-        aspect_ratio = 3.8  # width / height, visually stable for text buttons
-        button_width = int(button_height * aspect_ratio)
-        self.cancel_button.setFixedSize(button_width, button_height)
-        color = get_accent_colors()
-        self.cancel_button.setStyleSheet(f"""
-            QPushButton {{
-                background-color: {color.emergency.name()};
-                color: white;
-                font-weight: 600;
-                border-radius: 6px;
-            }}
-            """)
-
-        # Layout
-        content_layout = QVBoxLayout(self)
-        content_layout.setContentsMargins(24, 24, 24, 24)
-        content_layout.setSpacing(16)
-        content_layout.addStretch()
-        content_layout.addWidget(self.spinner, 0, Qt.AlignmentFlag.AlignHCenter)
-        content_layout.addWidget(self.progress, 0, Qt.AlignmentFlag.AlignHCenter)
-        content_layout.addStretch()
-        content_layout.addWidget(self.cancel_button, 0, Qt.AlignmentFlag.AlignHCenter)
-
-        if hasattr(color, "_colors"):
-            bg_color = color._colors.get("BG", None)
-        if bg_color is None:  # Fallback if missing
-            bg_color = QColor(50, 50, 50, 255)
-        self.setStyleSheet(f"""
-            background-color: {bg_color.name()};
-            border-radius: 12px;
-            """)
-
-    def _ui_scale(self) -> int:
-        parent = self.parent()
-        if not parent:
-            return 0
-        return min(parent.width(), parent.height())
-
-    def showEvent(self, event):
-        """Show event to start the spinner."""
-        super().showEvent(event)
-        self.spinner.start()
-
-    def hideEvent(self, event):
-        """Hide event to stop the spinner."""
-        super().hideEvent(event)
-        self.spinner.stop()
-
-
 class DeviceManagerDisplayWidget(DockAreaWidget):
     """Device Manager main display widget. This contains all sub-widgets and the toolbar."""
 
@@ -158,20 +61,10 @@ class DeviceManagerDisplayWidget(DockAreaWidget):
     def __init__(self, parent=None, *args, **kwargs):
         super().__init__(parent=parent, variant="compact", *args, **kwargs)
 
-        # State variable for config upload
-        self._config_upload_active: bool = False
-        self._config_in_sync: bool = False
-        scan_status = self.bec_dispatcher.client.connector.get(MessageEndpoints.scan_status())
-        initial_status = scan_status.status if scan_status is not None else "closed"
-        self._scan_is_running: bool = initial_status in ["open", "paused"]
-
         # Push to Redis dialog
         self._upload_redis_dialog: UploadRedisDialog | None = None
         self._dialog_validation_connection: QMetaObject.Connection | None = None
 
-        # NOTE: We need here a separate config helper instance to avoid conflicts with
-        # other communications to REDIS as uploading a config through a CommunicationConfigAction
-        # will block if we use the config_helper from self.client.config._config_helper
         self._config_helper = config_helper.ConfigHelper(self.client.connector)
         self._shared_selection = SharedSelectionSignal()
 
@@ -219,58 +112,19 @@ class DeviceManagerDisplayWidget(DockAreaWidget):
             ),
             (
                 self.device_table_view.device_config_in_sync_with_redis,
-                (self._update_config_in_sync,),
+                (self._update_config_enabled_button,),
             ),
             (self.device_table_view.device_row_dbl_clicked, (self._edit_device_action,)),
         ]:
             for slot in slots:
                 signal.connect(slot)
 
-        self._scan_status_callback_id = self.bec_dispatcher.client.callbacks.register(
-            EventType.SCAN_STATUS, self._update_scan_running
-        )
-
         # Add toolbar
         self._add_toolbar()
 
         # Build dock layout using shared helpers
         self._build_docks()
 
-    def cleanup(self):
-        self.bec_dispatcher.client.callbacks.remove(self._scan_status_callback_id)
-        super().cleanup()
-
-    def closeEvent(self, event):
-        """If config upload is active when application is exiting, cancel it."""
-        logger.info("Application is quitting, checking for active config upload...")
-        if self._config_upload_active:
-            logger.info("Application is quitting, cancelling active config upload...")
-            self._config_helper.send_config_request(
-                action="cancel", config=None, wait_for_response=True, timeout_s=10
-            )
-            logger.info("Config upload cancelled.")
-        super().closeEvent(event)
-
-    ##############################
-    ### Custom set busy widget ###
-    ##############################
-
-    def create_busy_state_widget(self) -> QWidget:
-        """Create a custom busy state widget for uploading device configurations."""
-        widget = CustomBusyWidget(parent=self, client=self.client)
-        widget.cancel_requested.connect(self._cancel_device_config_upload)
-        return widget
-
-    def _set_busy_wrapper(self, enabled: bool):
-        """Thin wrapper around set_busy to flip the state variable."""
-        self._busy_overlay.set_opacity(0.92)
-        self._config_upload_active = enabled
-        self.set_busy(enabled=enabled)
-
-    ##############################
-    ### Toolbar and Dock setup ###
-    ##############################
-
     def _add_toolbar(self):
         self.toolbar = ModularToolBar(self)
 
@@ -452,36 +306,6 @@ class DeviceManagerDisplayWidget(DockAreaWidget):
         # Add load config from plugin dir
         self.toolbar.add_bundle(table_bundle)
 
-    ######################################
-    ### Update button state management ###
-    ######################################
-
-    @SafeSlot(dict, dict)
-    def _update_scan_running(self, scan_info: dict, _: dict):
-        """disable editing when scans are running and enable editing when they are finished"""
-        msg = ScanStatusMessage.model_validate(scan_info)
-        self._scan_is_running = msg.status in ["open", "paused"]
-        self._update_config_enabled_button()
-
-    def _update_config_in_sync(self, in_sync: bool):
-        self._config_in_sync = in_sync
-        self._update_config_enabled_button()
-
-    def _update_config_enabled_button(self):
-        action = self.toolbar.components.get_action("update_config_redis")
-        enabled = not self._config_in_sync and not self._scan_is_running
-        action.action.setEnabled(enabled)
-        if enabled:  # button is enabled
-            action.action.setToolTip("Push current config to BEC Server")
-        elif self._scan_is_running:
-            action.action.setToolTip("Scan is currently running, config updates disabled.")
-        else:
-            action.action.setToolTip("Current config is in sync with BEC Server, updates disabled.")
-
-    #######################
-    ### Action Handlers ###
-    #######################
-
     @SafeSlot()
     @SafeSlot(bool)
     def _run_validate_connection(self, connect: bool = True):
@@ -498,6 +322,14 @@ class DeviceManagerDisplayWidget(DockAreaWidget):
         )
         self.request_ophyd_validation.emit(configs, True, connect)
 
+    def _update_config_enabled_button(self, enabled: bool):
+        action = self.toolbar.components.get_action("update_config_redis")
+        action.action.setEnabled(not enabled)
+        if enabled:
+            action.action.setToolTip("Push current config to BEC Server")
+        else:
+            action.action.setToolTip("Current config is in sync with BEC Server, button disabled.")
+
     @SafeSlot()
     def _load_file_action(self):
         """Action for the 'load' action to load a config from disk for the io_bundle of the toolbar."""
@@ -600,15 +432,17 @@ class DeviceManagerDisplayWidget(DockAreaWidget):
             "Do you really want to flush the current config in BEC Server?",
         )
         if reply == QMessageBox.StandardButton.Yes:
+            self.set_busy(enabled=True, text="Flushing configuration in BEC Server...")
             self.client.config.reset_config()
             logger.info("Successfully flushed configuration in BEC Server.")
+            self.set_busy(enabled=False)
             # Check if config is in sync, enable load redis button
             self.device_table_view.device_config_in_sync_with_redis.emit(
                 self.device_table_view._is_config_in_sync_with_redis()
             )
             validation_results = self.device_table_view.get_validation_results()
-            for config, config_status, connection_status in validation_results.values():
-                if connection_status == ConnectionStatus.CONNECTED.value:
+            for config, config_status, connnection_status in validation_results.values():
+                if connnection_status == ConnectionStatus.CONNECTED.value:
                     self.device_table_view.update_device_validation(
                         config, config_status, ConnectionStatus.CAN_CONNECT, ""
                     )
@@ -677,37 +511,12 @@ class DeviceManagerDisplayWidget(DockAreaWidget):
         comm.signals.done.connect(self._handle_push_complete_to_communicator)
         comm.signals.error.connect(self._handle_exception_from_communicator)
         threadpool.start(comm)
-        self._set_busy_wrapper(enabled=True)
-
-    def _cancel_device_config_upload(self):
-        """Cancel the device configuration upload process."""
-        threadpool = QThreadPool.globalInstance()
-        comm = CommunicateConfigAction(self._config_helper, None, {}, "cancel")
-        # Cancelling will raise an exception in the communicator, so we connect to the failure handler
-        comm.signals.error.connect(self._handle_cancel_config_upload_failed)
-        threadpool.start(comm)
-
-    def _handle_cancel_config_upload_failed(self, exception: Exception):
-        """Handle failure to cancel the config upload."""
-        self._set_busy_wrapper(enabled=False)
-
-        validation_results = self.device_table_view.get_validation_results()
-        devices_to_update = []
-        for config, config_status, connection_status in validation_results.values():
-            devices_to_update.append(
-                (config, config_status, ConnectionStatus.UNKNOWN.value, "Upload Cancelled")
-            )
-        # Rerun validation of all devices after cancellation
-        self.device_table_view.update_multiple_device_validations(devices_to_update)
-        self.ophyd_test_view.change_device_configs(
-            [cfg for cfg, _, _, _ in devices_to_update], added=True, skip_validation=False
-        )
-        # Config is in sync with BEC, so we update the state
-        self.device_table_view.device_config_in_sync_with_redis.emit(False)
+        self.set_busy(enabled=True, text="Uploading configuration to BEC Server...")
 
     def _handle_push_complete_to_communicator(self):
         """Handle completion of the config push to Redis."""
-        self._set_busy_wrapper(enabled=False)
+        self.set_busy(enabled=False)
+        self._update_validation_icons_after_upload()
 
     def _handle_exception_from_communicator(self, exception: Exception):
         """Handle exceptions from the config communicator."""
@@ -716,7 +525,29 @@ class DeviceManagerDisplayWidget(DockAreaWidget):
             "Error Uploading Config",
             f"An error occurred while uploading the configuration to BEC Server:\n{str(exception)}",
         )
-        self._set_busy_wrapper(enabled=False)
+        self.set_busy(enabled=False)
+        self._update_validation_icons_after_upload()
+
+    def _update_validation_icons_after_upload(self):
+        """Update validation icons after uploading config to Redis."""
+        if self.client.device_manager is None:
+            return
+        device_names_in_session = list(self.client.device_manager.devices.keys())
+        validation_results = self.device_table_view.get_validation_results()
+        devices_to_update = []
+        for config, config_status, connection_status in validation_results.values():
+            if config["name"] in device_names_in_session:
+                devices_to_update.append(
+                    (config, config_status, ConnectionStatus.CONNECTED.value, "")
+                )
+        # Update validation status in device table view
+        self.device_table_view.update_multiple_device_validations(devices_to_update)
+        # Remove devices from ophyd validation view
+        self.ophyd_test_view.change_device_configs(
+            [cfg for cfg, _, _, _ in devices_to_update], added=False, skip_validation=True
+        )
+        # Config is in sync with BEC, so we update the state
+        self.device_table_view.device_config_in_sync_with_redis.emit(True)
 
     @SafeSlot()
     def _save_to_disk_action(self):
@@ -782,7 +613,8 @@ class DeviceManagerDisplayWidget(DockAreaWidget):
     ):
         if old_device_name and old_device_name != data.get("name", ""):
             self.device_table_view.remove_device(old_device_name)
-        self._add_to_table_from_dialog(data, config_status, connection_status, msg, old_device_name)
+        self.device_table_view.update_device_configs([data], skip_validation=True)
+        self.device_table_view.update_device_validation(data, config_status, connection_status, msg)
 
     @SafeSlot(dict, int, int, str, str)
     def _add_to_table_from_dialog(
@@ -793,15 +625,8 @@ class DeviceManagerDisplayWidget(DockAreaWidget):
         msg: str,
         old_device_name: str = "",
     ):
-        if connection_status == ConnectionStatus.UNKNOWN.value:
-            self.device_table_view.update_device_configs([data], skip_validation=False)
-        else:  # Connection status was tested in dialog
-            # If device is connected, we remove it from the ophyd validation view
-            self.device_table_view.update_device_configs([data], skip_validation=True)
-            # Update validation status in device table view and ophyd validation view
-            self.ophyd_test_view._on_device_test_completed(
-                data, config_status, connection_status, msg
-            )
+        self.device_table_view.add_device_configs([data], skip_validation=True)
+        self.device_table_view.update_device_validation(data, config_status, connection_status, msg)
 
     @SafeSlot()
     def _remove_device_action(self):

bec_widgets/applications/views/device_manager_view/device_manager_view.py

@@ -1,12 +1,11 @@
 """Module for Device Manager View."""
 
-from qtpy.QtCore import QRect
 from qtpy.QtWidgets import QWidget
 
 from bec_widgets.applications.views.device_manager_view.device_manager_widget import (
     DeviceManagerWidget,
 )
-from bec_widgets.applications.views.view import ViewBase, ViewTourSteps
+from bec_widgets.applications.views.view import ViewBase
 from bec_widgets.utils.error_popups import SafeSlot
 
 
@@ -20,21 +19,11 @@ class DeviceManagerView(ViewBase):
         parent: QWidget | None = None,
         content: QWidget | None = None,
         *,
-        view_id: str | None = None,
+        id: str | None = None,
         title: str | None = None,
-        **kwargs,
     ):
-        super().__init__(
-            parent=parent,
-            content=content,
-            view_id=view_id,
-            title=title,
-            rpc_passthrough_children=False,
-            **kwargs,
-        )
-        self.device_manager_widget = DeviceManagerWidget(
-            parent=self, rpc_exposed=False, rpc_passthrough_children=False
-        )
+        super().__init__(parent=parent, content=content, id=id, title=title)
+        self.device_manager_widget = DeviceManagerWidget(parent=self)
         self.set_content(self.device_manager_widget)
 
     @SafeSlot()
@@ -45,110 +34,6 @@ class DeviceManagerView(ViewBase):
         """
         self.device_manager_widget.on_enter()
 
-    def register_tour_steps(self, guided_tour, main_app) -> ViewTourSteps | None:
-        """Register Device Manager components with the guided tour.
-
-        Args:
-            guided_tour: The GuidedTour instance to register with.
-            main_app: The main application instance (for accessing set_current).
-
-        Returns:
-            ViewTourSteps | None: Model containing view title and step IDs.
-        """
-        step_ids = []
-        dm_widget = self.device_manager_widget
-
-        # The device_manager_widget is not yet initialized, so we will register
-        # tour steps for its uninitialized state.
-
-        # Register Load Current Config button
-        def get_load_current():
-            main_app.set_current("device_manager")
-            if dm_widget._initialized is True:
-                return (None, None)
-            return (dm_widget.button_load_current_config, None)
-
-        step_id = guided_tour.register_widget(
-            widget=get_load_current,
-            title="Load Current Config",
-            text="Load the current device configuration from the BEC server.",
-        )
-        step_ids.append(step_id)
-
-        # Register Load Config From File button
-        def get_load_file():
-            main_app.set_current("device_manager")
-            if dm_widget._initialized is True:
-                return (None, None)
-            return (dm_widget.button_load_config_from_file, None)
-
-        step_id = guided_tour.register_widget(
-            widget=get_load_file,
-            title="Load Config From File",
-            text="Load a device configuration from a YAML file on disk.",
-        )
-        step_ids.append(step_id)
-
-        ## Register steps for the initialized state
-        # Register main device table
-        def get_device_table():
-            main_app.set_current("device_manager")
-            if dm_widget._initialized is False:
-                return (None, None)
-            return (dm_widget.device_manager_display.device_table_view, None)
-
-        step_id = guided_tour.register_widget(
-            widget=get_device_table,
-            title="Device Table",
-            text="This table displays the config that is prepared to be uploaded to the BEC server. It allows users to review and modify device config settings, and also validate them before uploading to the BEC server.",
-        )
-        step_ids.append(step_id)
-
-        col_text_mapping = {
-            0: "Shows if a device configuration is valid. Automatically validated when adding a new device.",
-            1: "Shows if a device is connectable. Validated on demand.",
-            2: "Device name, unique across all devices within a config.",
-            3: "Device class used to initialize the device on the BEC server.",
-            4: "Defines how BEC treats readings of the device during scans. The options are 'monitored', 'baseline', 'async', 'continuous' or 'on_demand'.",
-            5: "Defines how BEC reacts if a device readback fails. Options are 'raise', 'retry', or 'buffer'.",
-            6: "User-defined tags associated with the device.",
-            7: "A brief description of the device.",
-            8: "Device is enabled when the configuration is loaded.",
-            9: "Device is set to read-only.",
-            10: "This flag allows to configure if the 'trigger' method of the device is called during scans.",
-        }
-
-        # We have at least one device registered
-        def get_device_table_row(column: int):
-            main_app.set_current("device_manager")
-            if dm_widget._initialized is False:
-                return (None, None)
-            table = dm_widget.device_manager_display.device_table_view.table
-            header = table.horizontalHeader()
-            x = header.sectionViewportPosition(column)
-            table.horizontalScrollBar().setValue(x)
-            # Recompute after scrolling
-            x = header.sectionViewportPosition(column)
-            w = header.sectionSize(column)
-            h = header.height()
-            rect = QRect(x, 0, w, h)
-            top_left = header.viewport().mapTo(main_app, rect.topLeft())
-
-            return (QRect(top_left, rect.size()), col_text_mapping.get(column, ""))
-
-        for col, text in col_text_mapping.items():
-            step_id = guided_tour.register_widget(
-                widget=lambda col=col: get_device_table_row(col),
-                title=f"{dm_widget.device_manager_display.device_table_view.table.horizontalHeaderItem(col).text()}",
-                text=text,
-            )
-            step_ids.append(step_id)
-
-        if not step_ids:
-            return None
-
-        return ViewTourSteps(view_title="Device Manager", step_ids=step_ids)
-
 
 if __name__ == "__main__":  # pragma: no cover
     import sys
@@ -180,7 +65,7 @@ if __name__ == "__main__":  # pragma: no cover
     _app.add_view(
         icon="display_settings",
         title="Device Manager",
-        view_id="device_manager",
+        id="device_manager",
         widget=device_manager_view.device_manager_widget,
         mini_text="DM",
     )

bec_widgets/applications/views/device_manager_view/device_manager_widget.py

@@ -22,8 +22,8 @@ class DeviceManagerWidget(BECWidget, QtWidgets.QWidget):
 
     RPC = False
 
-    def __init__(self, parent=None, client=None, **kwargs):
-        super().__init__(parent=parent, client=client, **kwargs)
+    def __init__(self, parent=None, client=None):
+        super().__init__(parent=parent, client=client)
         self.stacked_layout = QtWidgets.QStackedLayout()
         self.stacked_layout.setContentsMargins(0, 0, 0, 0)
         self.stacked_layout.setSpacing(0)

bec_widgets/applications/views/dock_area_view/dock_area_view.py

@@ -1,31 +0,0 @@
-from qtpy.QtWidgets import QWidget
-
-from bec_widgets.applications.views.view import ViewBase
-from bec_widgets.widgets.containers.dock_area.dock_area import BECDockArea
-
-
-class DockAreaView(ViewBase):
-    """
-    Modular dock area view for arranging and managing multiple dockable widgets.
-    """
-
-    RPC_CONTENT_CLASS = BECDockArea
-
-    def __init__(
-        self,
-        parent: QWidget | None = None,
-        content: QWidget | None = None,
-        *,
-        view_id: str | None = None,
-        title: str | None = None,
-        **kwargs,
-    ):
-        super().__init__(parent=parent, content=content, view_id=view_id, title=title, **kwargs)
-        self.dock_area = BECDockArea(
-            self,
-            profile_namespace="bec",
-            auto_profile_namespace=False,
-            object_name="DockArea",
-            rpc_exposed=False,
-        )
-        self.set_content(self.dock_area)

bec_widgets/applications/views/view.py

@@ -2,8 +2,7 @@ from __future__ import annotations
 
 from typing import List
 
-from pydantic import BaseModel
-from qtpy.QtCore import QEventLoop
+from qtpy.QtCore import QEventLoop, Qt, QTimer
 from qtpy.QtWidgets import (
     QDialog,
     QDialogButtonBox,
@@ -12,31 +11,55 @@ from qtpy.QtWidgets import (
     QLabel,
     QMessageBox,
     QPushButton,
+    QSplitter,
     QStackedLayout,
     QVBoxLayout,
     QWidget,
 )
 
-from bec_widgets import BECWidget
 from bec_widgets.utils.error_popups import SafeSlot
 from bec_widgets.widgets.control.device_input.device_combobox.device_combobox import DeviceComboBox
 from bec_widgets.widgets.control.device_input.signal_combobox.signal_combobox import SignalComboBox
 from bec_widgets.widgets.plots.waveform.waveform import Waveform
 
 
-class ViewTourSteps(BaseModel):
-    """Model representing tour steps for a view.
-
-    Attributes:
-        view_title: The human-readable title of the view.
-        step_ids: List of registered step IDs in the order they should appear.
+def set_splitter_weights(splitter: QSplitter, weights: List[float]) -> None:
+    """
+    Apply initial sizes to a splitter using weight ratios, e.g. [1,3,2,1].
+    Works for horizontal or vertical splitters and sets matching stretch factors.
     """
 
-    view_title: str
-    step_ids: List[str]
+    def apply():
+        n = splitter.count()
+        if n == 0:
+            return
+        w = list(weights[:n]) + [1] * max(0, n - len(weights))
+        w = [max(0.0, float(x)) for x in w]
+        tot_w = sum(w)
+        if tot_w <= 0:
+            w = [1.0] * n
+            tot_w = float(n)
+        total_px = (
+            splitter.width()
+            if splitter.orientation() == Qt.Orientation.Horizontal
+            else splitter.height()
+        )
+        if total_px < 2:
+            QTimer.singleShot(0, apply)
+            return
+        sizes = [max(1, int(total_px * (wi / tot_w))) for wi in w]
+        diff = total_px - sum(sizes)
+        if diff != 0:
+            idx = max(range(n), key=lambda i: w[i])
+            sizes[idx] = max(1, sizes[idx] + diff)
+        splitter.setSizes(sizes)
+        for i, wi in enumerate(w):
+            splitter.setStretchFactor(i, max(1, int(round(wi * 100))))
+
+    QTimer.singleShot(0, apply)
 
 
-class ViewBase(BECWidget, QWidget):
+class ViewBase(QWidget):
     """Wrapper for a content widget used inside the main app's stacked view.
 
     Subclasses can implement `on_enter` and `on_exit` to run custom logic when the view becomes visible or is about to be hidden.
@@ -44,28 +67,21 @@ class ViewBase(BECWidget, QWidget):
     Args:
         content (QWidget): The actual view widget to display.
         parent (QWidget | None): Parent widget.
-        view_id (str | None): Optional view view_id, useful for debugging or introspection.
+        id (str | None): Optional view id, useful for debugging or introspection.
         title (str | None): Optional human-readable title.
     """
 
-    RPC = True
-    PLUGIN = False
-    USER_ACCESS = ["activate"]
-    RPC_CONTENT_CLASS: type[QWidget] | None = None
-    RPC_CONTENT_ATTR = "content"
-
     def __init__(
         self,
         parent: QWidget | None = None,
         content: QWidget | None = None,
         *,
-        view_id: str | None = None,
+        id: str | None = None,
         title: str | None = None,
-        **kwargs,
     ):
-        super().__init__(parent=parent, **kwargs)
+        super().__init__(parent=parent)
         self.content: QWidget | None = None
-        self.view_id = view_id
+        self.view_id = id
         self.view_title = title
 
         lay = QVBoxLayout(self)
@@ -99,40 +115,67 @@ class ViewBase(BECWidget, QWidget):
         """
         return True
 
-    @SafeSlot()
-    def activate(self) -> None:
-        """Switch the parent application to this view."""
-        if not self.view_id:
-            raise ValueError("Cannot switch view without a view_id.")
+    ####### Default view has to be done with setting up splitters ########
+    def set_default_view(self, horizontal_weights: list, vertical_weights: list):
+        """Apply initial weights to every horizontal and vertical splitter.
 
-        parent = self.parent()
-        while parent is not None:
-            if hasattr(parent, "set_current"):
-                parent.set_current(self.view_id)
-                return
-            parent = parent.parent()
-        raise RuntimeError("Could not find a parent application with set_current().")
-
-    def cleanup(self):
-        if self.content is not None:
-            self.content.close()
-            self.content.deleteLater()
-        super().cleanup()
-
-    def register_tour_steps(self, guided_tour, main_app) -> ViewTourSteps | None:
-        """Register this view's components with the guided tour.
-
-        Args:
-            guided_tour: The GuidedTour instance to register with.
-            main_app: The main application instance (for accessing set_current).
-
-        Returns:
-            ViewTourSteps | None: A model containing the view title and step IDs,
-                or None if this view has no tour steps.
-
-        Override this method in subclasses to register view-specific components.
+        Examples:
+            horizontal_weights = [1, 3, 2, 1]
+            vertical_weights   = [3, 7]  # top:bottom = 30:70
         """
-        return None
+        splitters_h = []
+        splitters_v = []
+        for splitter in self.findChildren(QSplitter):
+            if splitter.orientation() == Qt.Orientation.Horizontal:
+                splitters_h.append(splitter)
+            elif splitter.orientation() == Qt.Orientation.Vertical:
+                splitters_v.append(splitter)
+
+        def apply_all():
+            for s in splitters_h:
+                set_splitter_weights(s, horizontal_weights)
+            for s in splitters_v:
+                set_splitter_weights(s, vertical_weights)
+
+        QTimer.singleShot(0, apply_all)
+
+    def set_stretch(self, *, horizontal=None, vertical=None):
+        """Update splitter weights and re-apply to all splitters.
+
+        Accepts either a list/tuple of weights (e.g., [1,3,2,1]) or a role dict
+        for convenience: horizontal roles = {"left","center","right"},
+        vertical roles = {"top","bottom"}.
+        """
+
+        def _coerce_h(x):
+            if x is None:
+                return None
+            if isinstance(x, (list, tuple)):
+                return list(map(float, x))
+            if isinstance(x, dict):
+                return [
+                    float(x.get("left", 1)),
+                    float(x.get("center", x.get("middle", 1))),
+                    float(x.get("right", 1)),
+                ]
+            return None
+
+        def _coerce_v(x):
+            if x is None:
+                return None
+            if isinstance(x, (list, tuple)):
+                return list(map(float, x))
+            if isinstance(x, dict):
+                return [float(x.get("top", 1)), float(x.get("bottom", 1))]
+            return None
+
+        h = _coerce_h(horizontal)
+        v = _coerce_v(vertical)
+        if h is None:
+            h = [1, 1, 1]
+        if v is None:
+            v = [1, 1]
+        self.set_default_view(h, v)
 
 
 ####################################################################################################
@@ -160,17 +203,17 @@ class WaveformViewPopup(ViewBase):  # pragma: no cover
         self.device_edit.insertItem(0, "")
         self.device_edit.setEditable(True)
         self.device_edit.setCurrentIndex(0)
-        self.signal_edit = SignalComboBox(parent=self)
-        self.signal_edit.include_config_signals = False
-        self.signal_edit.insertItem(0, "")
-        self.signal_edit.setEditable(True)
-        self.device_edit.currentTextChanged.connect(self.signal_edit.set_device)
-        self.device_edit.device_reset.connect(self.signal_edit.reset_selection)
+        self.entry_edit = SignalComboBox(parent=self)
+        self.entry_edit.include_config_signals = False
+        self.entry_edit.insertItem(0, "")
+        self.entry_edit.setEditable(True)
+        self.device_edit.currentTextChanged.connect(self.entry_edit.set_device)
+        self.device_edit.device_reset.connect(self.entry_edit.reset_selection)
 
         form = QFormLayout()
         form.addRow(label)
         form.addRow("Device", self.device_edit)
-        form.addRow("Signal", self.signal_edit)
+        form.addRow("Signal", self.entry_edit)
 
         buttons = QDialogButtonBox(QDialogButtonBox.Ok | QDialogButtonBox.Cancel, parent=dialog)
         buttons.accepted.connect(dialog.accept)
@@ -182,7 +225,7 @@ class WaveformViewPopup(ViewBase):  # pragma: no cover
 
         if dialog.exec_() == QDialog.Accepted:
             self.waveform.plot(
-                device_y=self.device_edit.currentText(), signal_y=self.signal_edit.currentText()
+                y_name=self.device_edit.currentText(), y_entry=self.entry_edit.currentText()
             )
 
     @SafeSlot()
@@ -307,7 +350,7 @@ class WaveformViewInline(ViewBase):  # pragma: no cover
         dev = self.device_edit.currentText()
         sig = self.entry_edit.currentText()
         if dev and sig:
-            self.waveform.plot(device_y=dev, signal_y=sig)
+            self.waveform.plot(y_name=dev, y_entry=sig)
         self.stack.setCurrentIndex(1)
 
     def _show_waveform_without_changes(self):

bec_widgets/cli/__init__.py

@@ -1 +0,0 @@
-from bec_widgets.cli.rpc import rpc_base

bec_widgets/cli/client_utils.py

@@ -10,9 +10,9 @@ import threading
 import time
 from contextlib import contextmanager
 from threading import Lock
-from typing import TYPE_CHECKING, Callable, Literal, TypeAlias, cast
+from typing import TYPE_CHECKING, Literal, TypeAlias, cast
 
-from bec_lib.endpoints import EndpointInfo, MessageEndpoints
+from bec_lib.endpoints import MessageEndpoints
 from bec_lib.logger import bec_logger
 from bec_lib.utils.import_utils import lazy_import, lazy_import_from
 from rich.console import Console
@@ -232,11 +232,6 @@ class BECGuiClient(RPCBase):
         """The launcher object."""
         return RPCBase(gui_id=f"{self._gui_id}:launcher", parent=self, object_name="launcher")
 
-    def _safe_register_stream(self, endpoint: EndpointInfo, cb: Callable, **kwargs):
-        """Check if already registered for registration in idempotent functions."""
-        if not self._client.connector.any_stream_is_registered(endpoint, cb=cb):
-            self._client.connector.register(endpoint, cb=cb, **kwargs)
-
     def connect_to_gui_server(self, gui_id: str) -> None:
         """Connect to a GUI server"""
         # Unregister the old callback
@@ -252,9 +247,10 @@ class BECGuiClient(RPCBase):
         self._ipython_registry = {}
 
         # Register the new callback
-        self._safe_register_stream(
+        self._client.connector.register(
             MessageEndpoints.gui_registry_state(self._gui_id),
             cb=self._handle_registry_update,
+            parent=self,
             from_start=True,
         )
 
@@ -301,32 +297,14 @@ class BECGuiClient(RPCBase):
             return self._raise_all()
         return self._start(wait=wait)
 
-    def change_theme(self, theme: Literal["light", "dark"] | None = None) -> None:
-        """
-        Apply a GUI theme or toggle between dark and light.
-
-        Args:
-            theme(Literal["light", "dark"] | None): Theme to apply. If None, the current
-                theme is fetched from the GUI and toggled.
-        """
-        if not self._check_if_server_is_alive():
-            self._start(wait=True)
-
-        with wait_for_server(self):
-            if theme is None:
-                current_theme = self.launcher._run_rpc("fetch_theme")
-                next_theme = "light" if current_theme == "dark" else "dark"
-            else:
-                next_theme = theme
-            self.launcher._run_rpc("change_theme", theme=next_theme)
-
     def new(
         self,
         name: str | None = None,
         wait: bool = True,
         geometry: tuple[int, int, int, int] | None = None,
         launch_script: str = "dock_area",
-        startup_profile: str | Literal["restore", "skip"] | None = None,
+        profile: str | None = None,
+        start_empty: bool = False,
         **kwargs,
     ) -> client.AdvancedDockArea:
         """Create a new top-level dock area.
@@ -336,81 +314,48 @@ class BECGuiClient(RPCBase):
             wait(bool, optional): Whether to wait for the server to start. Defaults to True.
             geometry(tuple[int, int, int, int] | None): The geometry of the dock area (pos_x, pos_y, w, h).
             launch_script(str): The launch script to use. Defaults to "dock_area".
-            startup_profile(str | Literal["restore", "skip"] | None): Startup mode for
-                the dock area:
-                  - None: start in transient empty workspace
-                  - "restore": restore last-used profile
-                  - "skip": skip profile initialization
-                  - "<name>": load the named profile
+            profile(str | None): The profile name to load. If None, loads the "general" profile.
+                Use a profile name to load a specific saved profile.
+            start_empty(bool): If True, start with an empty dock area when loading specified profile.
             **kwargs: Additional keyword arguments passed to the dock area.
 
         Returns:
             client.AdvancedDockArea: The new dock area.
 
-        Examples:
-            >>> gui.new()  # Start with an empty unsaved workspace
-            >>> gui.new(startup_profile="restore")  # Restore last profile
-            >>> gui.new(startup_profile="my_profile")  # Load explicit profile
-        """
-        if "profile" in kwargs or "start_empty" in kwargs:
-            raise TypeError(
-                "gui.new() no longer accepts 'profile' or 'start_empty'. Use 'startup_profile' instead."
-            )
+        Note:
+            The "general" profile is mandatory and will always exist. If manually deleted,
+            it will be automatically recreated.
 
+        Examples:
+            >>> gui.new()  # Start with the "general" profile
+            >>> gui.new(profile="my_profile")  # Load specific profile, if profile does not exist, the new profile is created empty with specified name
+            >>> gui.new(start_empty=True)  # Start with "general" profile but empty dock area
+            >>> gui.new(profile="my_profile", start_empty=True)  # Start with "my_profile" profile but empty dock area
+        """
         if not self._check_if_server_is_alive():
             self.start(wait=True)
         if wait:
             with wait_for_server(self):
-                return self._new_impl(
-                    name=name,
-                    geometry=geometry,
+                widget = self.launcher._run_rpc(
+                    "launch",
                     launch_script=launch_script,
-                    startup_profile=startup_profile,
-                    **kwargs,
-                )
-        return self._new_impl(
-            name=name,
-            geometry=geometry,
-            launch_script=launch_script,
-            startup_profile=startup_profile,
-            **kwargs,
-        )
-
-    def _new_impl(
-        self,
-        *,
-        name: str | None,
-        geometry: tuple[int, int, int, int] | None,
-        launch_script: str,
-        startup_profile: str | Literal["restore", "skip"] | None,
-        **kwargs,
-    ):
-        if launch_script == "dock_area":
-            try:
-                return self.launcher._run_rpc(
-                    "system.launch_dock_area",
                     name=name,
                     geometry=geometry,
-                    startup_profile=startup_profile,
+                    profile=profile,
+                    start_empty=start_empty,
                     **kwargs,
-                )
-            except ValueError as exc:
-                error = str(exc)
-                if (
-                    "Unknown system RPC method: system.launch_dock_area" not in error
-                    and "has no attribute 'system.launch_dock_area'" not in error
-                ):
-                    raise
-                logger.debug("Server does not support system.launch_dock_area; using launcher RPC")
-
-        return self.launcher._run_rpc(
+                )  # pylint: disable=protected-access
+                return widget
+        widget = self.launcher._run_rpc(
             "launch",
             launch_script=launch_script,
             name=name,
             geometry=geometry,
-            startup_profile=startup_profile,
+            profile=profile,
+            start_empty=start_empty,
             **kwargs,
         )  # pylint: disable=protected-access
+        return widget
 
     def delete(self, name: str) -> None:
         """Delete a dock area and its parent window.
@@ -535,14 +480,20 @@ class BECGuiClient(RPCBase):
 
     def _start(self, wait: bool = False) -> None:
         self._killed = False
-        self._safe_register_stream(
-            MessageEndpoints.gui_registry_state(self._gui_id), cb=self._handle_registry_update
+        self._client.connector.register(
+            MessageEndpoints.gui_registry_state(self._gui_id),
+            cb=self._handle_registry_update,
+            parent=self,
         )
         return self._start_server(wait=wait)
 
-    def _handle_registry_update(self, msg: dict[str, GUIRegistryStateMessage]) -> None:
+    @staticmethod
+    def _handle_registry_update(
+        msg: dict[str, GUIRegistryStateMessage], parent: BECGuiClient
+    ) -> None:
         # This was causing a deadlock during shutdown, not sure why.
         # with self._lock:
+        self = parent
         self._server_registry = cast(dict[str, RegistryState], msg["data"].state)
         self._update_dynamic_namespace(self._server_registry)
 

bec_widgets/cli/generate_cli.py

@@ -7,7 +7,6 @@ import inspect
 import os
 import sys
 from pathlib import Path
-from typing import get_overloads
 
 import black
 import isort
@@ -19,6 +18,20 @@ from bec_widgets.utils.plugin_utils import BECClassContainer, get_custom_classes
 
 logger = bec_logger.logger
 
+if sys.version_info >= (3, 11):
+    from typing import get_overloads
+else:
+    print(
+        "Python version is less than 3.11, using dummy function for get_overloads. "
+        "If you want to use the real function 'typing.get_overloads()', please use Python 3.11 or later."
+    )
+
+    def get_overloads(_obj):
+        """
+        Dummy function for Python versions before 3.11.
+        """
+        return []
+
 
 class ClientGenerator:
     def __init__(self, base=False):
@@ -41,7 +54,7 @@ from __future__ import annotations
 from bec_lib.logger import bec_logger
 
 from bec_widgets.cli.rpc.rpc_base import RPCBase, rpc_call, rpc_timeout
-{"from bec_widgets.utils.bec_plugin_helper import get_plugin_client_module" if self._base else ""}
+{"from bec_widgets.utils.bec_plugin_helper import get_all_plugin_widgets, get_plugin_client_module" if self._base else ""}
 
 logger = bec_logger.logger
 
@@ -81,7 +94,7 @@ logger = bec_logger.logger
         if self._base:
             self.content += """
 class _WidgetsEnumType(str, enum.Enum):
-    \"\"\" Enum for the available widgets, to be generated programmatically  \"\"\"
+    \"\"\" Enum for the available widgets, to be generated programatically  \"\"\"
     ...
     """
 
@@ -98,19 +111,27 @@ _Widgets = {
             self.content += """
 
 try:
+    _plugin_widgets = get_all_plugin_widgets().as_dict()
     plugin_client = get_plugin_client_module()
+    Widgets = _WidgetsEnumType("Widgets", {name: name for name in _plugin_widgets} | _Widgets)
+
+    if (_overlap := _Widgets.keys() & _plugin_widgets.keys()) != set():
+        for _widget in _overlap:
+            logger.warning(f"Detected duplicate widget {_widget} in plugin repo file: {inspect.getfile(_plugin_widgets[_widget])} !")
     for plugin_name, plugin_class in inspect.getmembers(plugin_client, inspect.isclass):
         if issubclass(plugin_class, RPCBase) and plugin_class is not RPCBase:
-            if plugin_name not in _Widgets:
-                _Widgets[plugin_name] = plugin_name
             if plugin_name in globals():
+                conflicting_file = (
+                    inspect.getfile(_plugin_widgets[plugin_name])
+                    if plugin_name in _plugin_widgets
+                    else f"{plugin_client}"
+                )
                 logger.warning(
-                    f"Plugin widget {plugin_name} in {plugin_class._IMPORT_MODULE} conflicts with a built-in class!"
+                    f"Plugin widget {plugin_name} from {conflicting_file} conflicts with a built-in class!"
                 )
                 continue
-            else:
+            if plugin_name not in _overlap:
                 globals()[plugin_name] = plugin_class
-        Widgets = _WidgetsEnumType("Widgets", _Widgets)
 except ImportError as e:
     logger.error(f"Failed loading plugins: \\n{reduce(add, traceback.format_exception(e))}")
 """
@@ -125,8 +146,12 @@ except ImportError as e:
 
         class_name = cls.__name__
 
-        self.content += f"""
-class {class_name}(RPCBase):\n"""
+        if class_name == "BECDockArea":
+            self.content += f"""
+class {class_name}(RPCBase):"""
+        else:
+            self.content += f"""
+class {class_name}(RPCBase):"""
 
         if cls.__doc__:
             # We only want the first line of the docstring
@@ -137,11 +162,19 @@ class {class_name}(RPCBase):\n"""
             else:
                 class_docs = cls.__doc__.split("\n")[1]
             self.content += f"""
-    \"\"\"{class_docs}\"\"\"\n"""
-        user_access_entries = self._get_user_access_entries(cls)
-        self.content += f'    _IMPORT_MODULE="{cls.__module__}"\n'
-        for method_entry in user_access_entries:
-            method, obj, is_property_setter = self._resolve_method_object(cls, method_entry)
+    \"\"\"{class_docs}\"\"\"
+    """
+        if not cls.USER_ACCESS:
+            self.content += """...
+    """
+
+        for method in cls.USER_ACCESS:
+            is_property_setter = False
+            obj = getattr(cls, method, None)
+            if obj is None:
+                obj = getattr(cls, method.split(".setter")[0], None)
+                is_property_setter = True
+                method = method.split(".setter")[0]
             if obj is None:
                 raise AttributeError(
                     f"Method {method} not found in class {cls.__name__}. "
@@ -183,34 +216,6 @@ class {class_name}(RPCBase):\n"""
 {doc}
         \"\"\""""
 
-    @staticmethod
-    def _get_user_access_entries(cls) -> list[str]:
-        entries = list(getattr(cls, "USER_ACCESS", []))
-        content_cls = getattr(cls, "RPC_CONTENT_CLASS", None)
-        if content_cls is not None:
-            entries.extend(getattr(content_cls, "USER_ACCESS", []))
-        return list(dict.fromkeys(entries))
-
-    @staticmethod
-    def _resolve_method_object(cls, method_entry: str):
-        method_name = method_entry
-        is_property_setter = False
-
-        if method_entry.endswith(".setter"):
-            is_property_setter = True
-            method_name = method_entry.split(".setter")[0]
-
-        candidate_classes = [cls]
-        content_cls = getattr(cls, "RPC_CONTENT_CLASS", None)
-        if content_cls is not None:
-            candidate_classes.append(content_cls)
-
-        for candidate_cls in candidate_classes:
-            obj = getattr(candidate_cls, method_name, None)
-            if obj is not None:
-                return method_name, obj, is_property_setter
-        return method_name, None, is_property_setter
-
     def _rpc_call(self, timeout_info: dict[str, float | None]):
         """
         Decorator to mark a method as an RPC call.
@@ -286,8 +291,7 @@ def main():
 
     client_path = module_dir / client_subdir / "client.py"
 
-    packages = ("widgets", "applications") if module_name == "bec_widgets" else ("widgets",)
-    rpc_classes = get_custom_classes(module_name, packages=packages)
+    rpc_classes = get_custom_classes(module_name)
     logger.info(f"Obtained classes with RPC objects: {rpc_classes!r}")
 
     generator = ClientGenerator(base=module_name == "bec_widgets")

bec_widgets/cli/rpc/rpc_base.py

@@ -248,7 +248,9 @@ class RPCBase:
             self._rpc_response = None
             self._msg_wait_event.clear()
             self._client.connector.register(
-                MessageEndpoints.gui_instruction_response(request_id), cb=self._on_rpc_response
+                MessageEndpoints.gui_instruction_response(request_id),
+                cb=self._on_rpc_response,
+                parent=self,
             )
 
         self._client.connector.set_and_publish(MessageEndpoints.gui_instructions(receiver), rpc_msg)
@@ -274,10 +276,11 @@ class RPCBase:
             self._rpc_response = None
             return self._create_widget_from_msg_result(msg_result)
 
-    def _on_rpc_response(self, msg_obj: MessageObject) -> None:
+    @staticmethod
+    def _on_rpc_response(msg_obj: MessageObject, parent: RPCBase) -> None:
         msg = cast(messages.RequestResponseMessage, msg_obj.value)
-        self._rpc_response = msg
-        self._msg_wait_event.set()
+        parent._rpc_response = msg
+        parent._msg_wait_event.set()
 
     def _create_widget_from_msg_result(self, msg_result):
         if msg_result is None:
@@ -289,11 +292,6 @@ class RPCBase:
                 return {
                     key: self._create_widget_from_msg_result(val) for key, val in msg_result.items()
                 }
-            rpc_enabled = msg_result.get("__rpc__", True)
-            if rpc_enabled is False:
-                return None
-
-            msg_result = dict(msg_result)
             cls = msg_result.pop("widget_class", None)
             msg_result.pop("__rpc__", None)
 

bec_widgets/cli/rpc/rpc_register.py

@@ -5,13 +5,14 @@ from threading import RLock
 from typing import TYPE_CHECKING, Callable
 from weakref import WeakValueDictionary
 
-import shiboken6 as shb
 from bec_lib.logger import bec_logger
 from qtpy.QtCore import QObject
 
 if TYPE_CHECKING:  # pragma: no cover
     from bec_widgets.utils.bec_connector import BECConnector
     from bec_widgets.utils.bec_widget import BECWidget
+    from bec_widgets.widgets.containers.dock.dock import BECDock
+    from bec_widgets.widgets.containers.dock.dock_area import BECDockArea
 
 logger = bec_logger.logger
 
@@ -108,19 +109,11 @@ class RPCRegister:
             dict: A dictionary containing all the registered RPC objects.
         """
         with self._lock:
-            connections = {}
-            for gui_id, obj in self._rpc_register.items():
-                try:
-                    if not shb.isValid(obj):
-                        continue
-                    connections[gui_id] = obj
-                except Exception as e:
-                    logger.warning(f"Error checking validity of object {gui_id}: {e}")
-                    continue
+            connections = dict(self._rpc_register)
         return connections
 
     def get_names_of_rpc_by_class_type(
-        self, cls: type[BECWidget] | type[BECConnector]
+        self, cls: type[BECWidget] | type[BECConnector] | type[BECDock] | type[BECDockArea]
     ) -> list[str]:
         """Get all the names of the widgets.
 

bec_widgets/cli/rpc/rpc_widget_handler.py

@@ -32,8 +32,7 @@ class RPCWidgetHandler:
             None
         """
         self._widget_classes = (
-            get_custom_classes("bec_widgets", packages=("widgets", "applications"))
-            + get_all_plugin_widgets()
+            get_custom_classes("bec_widgets") + get_all_plugin_widgets()
         ).as_dict(IGNORE_WIDGETS)
 
     def create_widget(self, widget_type, **kwargs) -> BECWidget:

bec_widgets/cli/server.py

@@ -8,7 +8,6 @@ import sys
 from contextlib import redirect_stderr, redirect_stdout
 
 import darkdetect
-import shiboken6
 from bec_lib.logger import bec_logger
 from bec_lib.service_config import ServiceConfig
 from bec_qthemes import apply_theme
@@ -19,8 +18,8 @@ from qtpy.QtWidgets import QApplication
 
 import bec_widgets
 from bec_widgets.applications.launch_window import LaunchWindow
+from bec_widgets.cli.rpc.rpc_register import RPCRegister
 from bec_widgets.utils.bec_dispatcher import BECDispatcher
-from bec_widgets.utils.rpc_register import RPCRegister
 
 logger = bec_logger.logger
 
@@ -94,7 +93,6 @@ class GUIServer:
         """
         Run the GUI server.
         """
-        logger.info("Starting GUIServer", repr(self))
         self.app = QApplication(sys.argv)
         if darkdetect.isDark():
             apply_theme("dark")
@@ -103,11 +101,11 @@ class GUIServer:
 
         self.app.setApplicationName("BEC")
         self.app.gui_id = self.gui_id  # type: ignore
-        self.app.gui_server = self  # type: ignore # make server accessible from QApplication for getattr in widgets
         self.setup_bec_icon()
 
         service_config = self._get_service_config()
         self.dispatcher = BECDispatcher(config=service_config, gui_id=self.gui_id)
+        # self.dispatcher.start_cli_server(gui_id=self.gui_id)
 
         if self.gui_class:
             self.launcher_window = LaunchWindow(
@@ -120,7 +118,7 @@ class GUIServer:
         self.launcher_window.setAttribute(Qt.WA_ShowWithoutActivating)  # type: ignore
 
         self.app.aboutToQuit.connect(self.shutdown)
-        self.app.setQuitOnLastWindowClosed(True)
+        self.app.setQuitOnLastWindowClosed(False)
 
         def sigint_handler(*args):
             # display message, for people to let it terminate gracefully
@@ -129,7 +127,8 @@ class GUIServer:
             with RPCRegister.delayed_broadcast():
                 for widget in QApplication.instance().topLevelWidgets():  # type: ignore
                     widget.close()
-            self.shutdown()
+            if self.app:
+                self.app.quit()
 
         signal.signal(signal.SIGINT, sigint_handler)
         signal.signal(signal.SIGTERM, sigint_handler)
@@ -150,10 +149,9 @@ class GUIServer:
         self.app.setWindowIcon(icon)
 
     def shutdown(self):
-        logger.info("Shutdown GUIServer", repr(self))
-        if self.launcher_window and shiboken6.isValid(self.launcher_window):
-            self.launcher_window.close()
-            self.launcher_window.deleteLater()
+        """
+        Shutdown the GUI server.
+        """
         if pylsp_server.is_running():
             pylsp_server.stop()
         if self.dispatcher:

bec_widgets/examples/jupyter_console/jupyter_console_window.py

@@ -25,8 +25,8 @@ from qtpy.QtWidgets import (
     QWidget,
 )
 
+from bec_widgets.cli.rpc.rpc_widget_handler import widget_handler
 from bec_widgets.utils.colors import apply_theme
-from bec_widgets.utils.rpc_widget_handler import widget_handler
 from bec_widgets.utils.widget_io import WidgetHierarchy as wh
 from bec_widgets.widgets.editors.jupyter_console.jupyter_console import BECJupyterConsole
 

bec_widgets/tests/utils.py

@@ -1,7 +1,6 @@
 # pylint: skip-file
 from unittest.mock import MagicMock
 
-from bec_lib.config_helper import ConfigHelper
 from bec_lib.device import Device as BECDevice
 from bec_lib.device import Positioner as BECPositioner
 from bec_lib.device import ReadoutPriority
@@ -26,16 +25,6 @@ class FakeDevice(BECDevice):
             "readOnly": False,
             "name": self.name,
         }
-        self._info = {
-            "signals": {
-                self.name: {
-                    "kind_str": "hinted",
-                    "component_name": self.name,
-                    "obj_name": self.name,
-                    "signal_class": "Signal",
-                }
-            }
-        }
 
     @property
     def readout_priority(self):
@@ -220,9 +209,7 @@ class Device(FakeDevice):
 
 
 class DMMock:
-    def __init__(self, *args, **kwargs):
-        self._service = args[0]
-        self.config_helper = ConfigHelper(self._service.connector, self._service._service_name)
+    def __init__(self):
         self.devices = DeviceContainer()
         self.enabled_devices = [device for device in self.devices if device.enabled]
 
@@ -276,10 +263,6 @@ class DMMock:
             configs.append(device._config)
         return configs
 
-    def initialize(*_): ...
-
-    def shutdown(self): ...
-
 
 DEVICES = [
     FakePositioner("samx", limits=[-10, 10], read_value=2.0),

bec_widgets/utils/__init__.py

@@ -1 +1,13 @@
+from qtpy.QtWebEngineWidgets import QWebEngineView
 
+from .bec_connector import BECConnector, ConnectionConfig
+from .bec_dispatcher import BECDispatcher
+from .bec_table import BECTable
+from .colors import Colors
+from .container_utils import WidgetContainerUtils
+from .crosshair import Crosshair
+from .entry_validator import EntryValidator
+from .layout_manager import GridLayoutManager
+from .rpc_decorator import register_rpc_methods, rpc_public
+from .ui_loader import UILoader
+from .validator_delegate import DoubleValidationDelegate

bec_widgets/utils/bec_connector.py

@@ -1,34 +1,44 @@
 # pylint: disable = no-name-in-module,missing-module-docstring
 from __future__ import annotations
 
+import inspect
 import os
 import time
 import traceback
 import uuid
+import weakref
 from datetime import datetime
-from typing import TYPE_CHECKING, Optional
+from typing import TYPE_CHECKING, Callable, Final, Optional
+from weakref import WeakMethod, WeakValueDictionary
 
-import shiboken6 as shb
 from bec_lib.logger import bec_logger
 from bec_lib.utils.import_utils import lazy_import_from
-from pydantic import BaseModel, Field, field_validator
-from qtpy.QtCore import Property, QObject, QRunnable, QThreadPool, Signal
+from louie import saferef
+from pydantic import BaseModel, ConfigDict, Field, field_validator
+from qtpy.QtCore import QObject, QRunnable, QThreadPool, QTimer, Signal
 from qtpy.QtWidgets import QApplication
 
+from bec_widgets.cli.rpc.rpc_register import RPCRegister
 from bec_widgets.utils.error_popups import ErrorPopupUtility, SafeSlot
 from bec_widgets.utils.name_utils import sanitize_namespace
-from bec_widgets.utils.rpc_register import RPCRegister
 from bec_widgets.utils.widget_io import WidgetHierarchy
 from bec_widgets.utils.yaml_dialog import load_yaml, load_yaml_gui, save_yaml, save_yaml_gui
 
 if TYPE_CHECKING:  # pragma: no cover
     from bec_widgets.utils.bec_dispatcher import BECDispatcher
+    from bec_widgets.widgets.containers.dock import BECDock
 else:
     BECDispatcher = lazy_import_from("bec_widgets.utils.bec_dispatcher", ("BECDispatcher",))
 
 logger = bec_logger.logger
 
 
+class _NextSentinel(object): ...
+
+
+NEXT_SENTINEL: Final[_NextSentinel] = _NextSentinel()
+
+
 class ConnectionConfig(BaseModel):
     """Configuration for BECConnector mixin class"""
 
@@ -36,7 +46,7 @@ class ConnectionConfig(BaseModel):
     gui_id: Optional[str] = Field(
         default=None, validate_default=True, description="The GUI ID of the widget."
     )
-    model_config: dict = {"validate_assignment": True}
+    model_config: ConfigDict = {"validate_assignment": True}
 
     @field_validator("gui_id")
     @classmethod
@@ -77,7 +87,9 @@ class BECConnector:
     """Connection mixin class to handle BEC client and device manager"""
 
     USER_ACCESS = ["_config_dict", "_get_all_rpc", "_rpc_id"]
-    EXIT_HANDLERS = {}
+    EXIT_HANDLERS: WeakValueDictionary[int, Callable[[],]] = WeakValueDictionary()
+    _exit_handler: Callable[[],] | None = None
+    _method_handlers: set[Callable[[],]] = set()
     widget_removed = Signal()
     name_established = Signal(str)
 
@@ -88,8 +100,6 @@ class BECConnector:
         gui_id: str | None = None,
         object_name: str | None = None,
         root_widget: bool = False,
-        rpc_exposed: bool = True,
-        rpc_passthrough_children: bool = True,
         **kwargs,
     ):
         """
@@ -101,10 +111,6 @@ class BECConnector:
             gui_id(str, optional): The GUI ID.
             object_name(str, optional): The object name.
             root_widget(bool, optional): If set to True, the parent_id will be always set to None, thus enforcing that the widget is accessible as a root widget of the BECGuiClient object.
-            rpc_exposed(bool, optional): If set to False, this instance is excluded from RPC registry broadcast and CLI namespace discovery.
-            rpc_passthrough_children(bool, optional): Only relevant when ``rpc_exposed=False``.
-                If True, RPC-visible children rebind to the next visible ancestor.
-                If False (default), children stay hidden behind this widget.
             **kwargs:
         """
         # Extract object_name from kwargs to not pass it to Qt class
@@ -128,18 +134,13 @@ class BECConnector:
         self.client = self.bec_dispatcher.client if client is None else client
         self.rpc_register = RPCRegister()
 
-        if not self.client in BECConnector.EXIT_HANDLERS:
+        if not 0 in BECConnector.EXIT_HANDLERS.keys():
             # register function to clean connections at exit;
             # the function depends on BECClient, and BECDispatcher
             @SafeSlot()
             def terminate(client=self.client, dispatcher=self.bec_dispatcher):
-                app = QApplication.instance()
-                gui_server = getattr(app, "gui_server", None)
-                if gui_server and hasattr(gui_server, "shutdown"):
-                    gui_server.shutdown()
                 logger.info("Disconnecting", repr(dispatcher))
                 dispatcher.disconnect_all()
-                dispatcher.stop_cli_server()
 
                 try:  # shutdown ophyd threads if any
                     from ophyd._pyepics_shim import _dispatcher
@@ -154,8 +155,9 @@ class BECConnector:
                 logger.info("Shutting down BEC Client", repr(client))
                 client.shutdown()
 
-            BECConnector.EXIT_HANDLERS[self.client] = terminate
-            QApplication.instance().aboutToQuit.connect(terminate)
+            BECConnector._exit_handler = terminate  # type: ignore # keep a strong reference to the final cleanup
+            BECConnector._add_exit_handler(terminate, 0)
+            QApplication.instance().aboutToQuit.connect(self._run_exit_handlers)
 
         if config:
             self.config = config
@@ -167,7 +169,7 @@ class BECConnector:
             )
             self.config = ConnectionConfig(widget_class=self.__class__.__name__)
 
-        # If the gui_id is passed, it should be respected. However, this should be revisited since
+        # If the gui_id is passed, it should be respected. However, this should be revisted since
         # the gui_id has to be unique, and may no longer be.
         if gui_id:
             self.config.gui_id = gui_id
@@ -195,54 +197,64 @@ class BECConnector:
 
         # If set to True, the parent_id will be always set to None, thus enforcing that the widget is accessible as a root widget of the BECGuiClient object.
         self.root_widget = root_widget
-        # If set to False, this instance is not exposed through RPC at all.
-        self.rpc_exposed = bool(rpc_exposed)
-        # If True on a hidden parent (rpc_exposed=False), children can bubble up to
-        # the next visible RPC ancestor.
-        self.rpc_passthrough_children = bool(rpc_passthrough_children)
 
-        self._update_object_name()
+        QTimer.singleShot(0, self._update_object_name)
+
+    @classmethod
+    def _add_exit_handler(cls, handler: Callable, priority: int):
+        """Private to allow use of priority 0"""
+        if inspect.ismethod(handler):
+            _h = saferef.safe_ref(handler)
+
+            def handler():
+                if h := _h():
+                    h()
+
+            # cls._method_handlers.add(handler)  # hold any instance methods in safe refs
+
+        cls.EXIT_HANDLERS[priority] = handler
+
+    @classmethod
+    def add_exit_handler(cls, handler: Callable, priority: int | _NextSentinel = NEXT_SENTINEL):
+        """Add a handler to be called on the cleanup of the BEC Connector. Handlers are called in reverse order of their
+        priority - i.e. a higher number is higher priority. The BEC Connector's own cleanup will always be run last.
+        """
+        existing_priorities = set(cls.EXIT_HANDLERS.keys())
+        priority_modified = False
+        if isinstance(priority, _NextSentinel):
+            priority = max(existing_priorities) + 1
+        if priority < 1:
+            raise ValueError(
+                "Please use a priority greater than 1! Priority 0 is reserved for system cleanup."
+            )
+        if priority in cls.EXIT_HANDLERS.keys():
+            priority_modified = True
+            logger.warning(f"Priority {priority} already in use - using the next available:")
+        while priority in cls.EXIT_HANDLERS.keys():
+            priority += 1
+        if priority_modified:
+            logger.warning(f"Assigned priority {priority} for {handler}.")
+        cls._add_exit_handler(handler, priority)
+
+    @SafeSlot()
+    def _run_exit_handlers(self):
+        """Run all exit handlers from highest to lowest priority. Should be connected to AboutToQuit once and only once."""
+        handlers = list(
+            reversed(list(handler for _, handler in sorted(BECConnector.EXIT_HANDLERS.items())))
+        )
+        for handler in handlers:
+            handler()
 
     @property
     def parent_id(self) -> str | None:
         try:
             if self.root_widget:
                 return None
-            connector_parent = self._get_rpc_parent_ancestor()
+            connector_parent = WidgetHierarchy._get_becwidget_ancestor(self)
             return connector_parent.gui_id if connector_parent else None
         except:
             logger.error(f"Error getting parent_id for {self.__class__.__name__}")
 
-    def _get_rpc_parent_ancestor(self) -> BECConnector | None:
-        """
-        Find the nearest ancestor that is RPC-addressable.
-
-        Rules:
-          - If an ancestor has ``rpc_exposed=False``, it is an explicit visibility
-            boundary unless ``rpc_passthrough_children=True``.
-          - If an ancestor has ``RPC=False`` (but remains rpc_exposed), it is treated
-            as structural and children continue to the next ancestor.
-          - Lookup always happens through ``WidgetHierarchy.get_becwidget_ancestor``
-            so plain ``QWidget`` nodes between connectors are ignored.
-        """
-        current = self
-        while True:
-            parent = WidgetHierarchy.get_becwidget_ancestor(current)
-            if parent is None:
-                return None
-
-            if not getattr(parent, "rpc_exposed", True):
-                if getattr(parent, "rpc_passthrough_children", False):
-                    current = parent
-                    continue
-                return parent
-
-            if getattr(parent, "RPC", True):
-                return parent
-
-            current = parent
-        return None
-
     def change_object_name(self, name: str) -> None:
         """
         Change the object name of the widget. Unregister old name and register the new one.
@@ -252,7 +264,7 @@ class BECConnector:
         """
         self.rpc_register.remove_rpc(self)
         self.setObjectName(name.replace("-", "_").replace(" ", "_"))
-        self._update_object_name()
+        QTimer.singleShot(0, self._update_object_name)
 
     def _update_object_name(self) -> None:
         """
@@ -261,13 +273,11 @@ class BECConnector:
         """
         # 1) Enforce unique objectName among siblings with the same BECConnector parent
         self._enforce_unique_sibling_name()
-        # 2) Register the object for RPC unless instance-level exposure is disabled.
-        if getattr(self, "rpc_exposed", True):
-            self.rpc_register.add_rpc(self)
+        # 2) Register the object for RPC
+        self.rpc_register.add_rpc(self)
         try:
             self.name_established.emit(self.object_name)
-        except RuntimeError as e:
-            logger.warning(f"Error emitting name_established signal: {e}")
+        except RuntimeError:
             return
 
     def _enforce_unique_sibling_name(self):
@@ -278,20 +288,23 @@ class BECConnector:
           - If there's a nearest BECConnector parent, only compare with children of that parent.
           - If parent is None (i.e., top-level object), compare with all other top-level BECConnectors.
         """
-        if not shb.isValid(self):
-            return
-
-        parent_bec = WidgetHierarchy.get_becwidget_ancestor(self)
+        QApplication.sendPostedEvents()
+        parent_bec = WidgetHierarchy._get_becwidget_ancestor(self)
 
         if parent_bec:
             # We have a parent => only compare with siblings under that parent
-            siblings = [sib for sib in parent_bec.findChildren(BECConnector) if shb.isValid(sib)]
+            siblings = parent_bec.findChildren(BECConnector)
         else:
             # No parent => treat all top-level BECConnectors as siblings
-            # Use RPCRegister to avoid QApplication.allWidgets() during event processing.
-            connections = self.rpc_register.list_all_connections().values()
-            all_bec = [w for w in connections if isinstance(w, BECConnector) and shb.isValid(w)]
-            siblings = [w for w in all_bec if WidgetHierarchy.get_becwidget_ancestor(w) is None]
+            # 1) Gather all BECConnectors from QApplication
+            all_widgets = QApplication.allWidgets()
+            all_bec = [w for w in all_widgets if isinstance(w, BECConnector)]
+            # 2) "Top-level" means closest BECConnector parent is None
+            top_level_bec = [
+                w for w in all_bec if WidgetHierarchy._get_becwidget_ancestor(w) is None
+            ]
+            # 3) We are among these top-level siblings
+            siblings = top_level_bec
 
         # Collect used names among siblings
         used_names = {sib.objectName() for sib in siblings if sib is not self}
@@ -319,8 +332,6 @@ class BECConnector:
         Args:
             name (str): The new object name.
         """
-        # sanitize before setting to avoid issues with Qt object names and RPC namespaces
-        name = sanitize_namespace(name)
         super().setObjectName(name)
         self.object_name = name
         if self.rpc_register.object_is_registered(self):
@@ -399,7 +410,7 @@ class BECConnector:
         """
         self.config = config
 
-    # FIXME some thoughts are required to decide how this should work with rpc registry
+    # FIXME some thoughts are required to decide how thhis should work with rpc registry
     def apply_config(self, config: dict, generate_new_id: bool = True) -> None:
         """
         Apply the configuration to the widget.
@@ -417,7 +428,7 @@ class BECConnector:
         else:
             self.gui_id = self.config.gui_id
 
-    # FIXME some thoughts are required to decide how this should work with rpc registry
+    # FIXME some thoughts are required to decide how thhis should work with rpc registry
     def load_config(self, path: str | None = None, gui: bool = False):
         """
         Load the configuration of the widget from YAML.
@@ -528,62 +539,6 @@ class BECConnector:
         else:
             return self.config
 
-    def export_settings(self) -> dict:
-        """
-        Export the settings of the widget as dict.
-
-        Returns:
-            dict: The exported settings of the widget.
-        """
-
-        # We first get all qproperties that were defined in a bec_widgets class
-        objs = self._get_bec_meta_objects()
-        settings = {}
-        for prop_name in objs.keys():
-            try:
-                prop_value = getattr(self, prop_name)
-                settings[prop_name] = prop_value
-            except Exception as e:
-                logger.warning(
-                    f"Could not export property '{prop_name}' from '{self.__class__.__name__}': {e}"
-                )
-        return settings
-
-    def load_settings(self, settings: dict) -> None:
-        """
-        Load the settings of the widget from dict.
-
-        Args:
-            settings (dict): The settings to load into the widget.
-        """
-        objs = self._get_bec_meta_objects()
-        for prop_name, prop_value in settings.items():
-            if prop_name in objs:
-                try:
-                    setattr(self, prop_name, prop_value)
-                except Exception as e:
-                    logger.warning(
-                        f"Could not load property '{prop_name}' into '{self.__class__.__name__}': {e}"
-                    )
-
-    def _get_bec_meta_objects(self) -> dict:
-        """
-        Get BEC meta objects for the widget.
-
-        Returns:
-            dict: BEC meta objects.
-        """
-        if not isinstance(self, QObject):
-            return {}
-        objects = {}
-        for name, attr in vars(self.__class__).items():
-            if isinstance(attr, Property):
-                # Check if the property is a SafeProperty
-                is_safe_property = getattr(attr.fget, "__is_safe_getter__", False)
-                if is_safe_property:
-                    objects[name] = attr
-        return objects
-
 
 # --- Example usage of BECConnector: running a simple task ---
 if __name__ == "__main__":  # pragma: no cover

bec_widgets/utils/bec_dispatcher.py

@@ -123,16 +123,17 @@ class BECDispatcher:
         self._registered_slots: DefaultDict[Hashable, QtThreadSafeCallback] = (
             collections.defaultdict()
         )
+        self.client = client
 
-        if client is None:
-            if config is not None and not isinstance(config, ServiceConfig):
-                # config is supposed to be a path
-                config = ServiceConfig(config)
+        if self.client is None:
+            if config is not None:
+                if not isinstance(config, ServiceConfig):
+                    # config is supposed to be a path
+                    config = ServiceConfig(config)
             self.client = BECClient(
                 config=config, connector_cls=QtRedisConnector, name="BECWidgets"
             )
         else:
-            self.client = client
             if self.client.started:
                 # have to reinitialize client to use proper connector
                 logger.info("Shutting down BECClient to switch to QtRedisConnector")
@@ -175,15 +176,12 @@ class BECDispatcher:
             cb_info (dict | None): A dictionary containing information about the callback. Defaults to None.
         """
         qt_slot = QtThreadSafeCallback(cb=slot, cb_info=cb_info)
-        if not self.client.connector.any_stream_is_registered(topics, qt_slot):
-            if qt_slot not in self._registered_slots:
-                self._registered_slots[qt_slot] = qt_slot
-            qt_slot = self._registered_slots[qt_slot]
-            self.client.connector.register(topics, cb=qt_slot, **kwargs)
-            topics_str, _ = self.client.connector._convert_endpointinfo(topics)
-            qt_slot.topics.update(set(topics_str))
-        else:
-            logger.warning(f"Attempted to create duplicate stream subscription for {topics=}")
+        if qt_slot not in self._registered_slots:
+            self._registered_slots[qt_slot] = qt_slot
+        qt_slot = self._registered_slots[qt_slot]
+        self.client.connector.register(topics, cb=qt_slot, **kwargs)
+        topics_str, _ = self.client.connector._convert_endpointinfo(topics)
+        qt_slot.topics.update(set(topics_str))
 
     def disconnect_slot(
         self, slot: Callable, topics: EndpointInfo | str | list[EndpointInfo] | list[str]

bec_widgets/utils/bec_login.py

@@ -1,87 +0,0 @@
-"""
-Login dialog for user authentication.
-The Login Widget is styled in a Material Design style and emits
-the entered credentials through a signal for further processing.
-"""
-
-from qtpy.QtCore import Qt, Signal
-from qtpy.QtWidgets import QLabel, QLineEdit, QPushButton, QVBoxLayout, QWidget
-
-
-class BECLogin(QWidget):
-    """Login dialog for user authentication in Material Design style."""
-
-    credentials_entered = Signal(str, str)
-
-    def __init__(self, parent=None):
-        super().__init__(parent=parent)
-        # Only displayed if this widget as standalone widget, and not embedded in another widget
-        self.setWindowTitle("Login")
-
-        title = QLabel("Sign in", parent=self)
-        title.setAlignment(Qt.AlignmentFlag.AlignCenter)
-        title.setStyleSheet("""
-            #QLabel
-                {
-                    font-size: 18px;
-                    font-weight: 600;
-                }
-            """)
-
-        self.username = QLineEdit(parent=self)
-        self.username.setPlaceholderText("Username")
-
-        self.password = QLineEdit(parent=self)
-        self.password.setPlaceholderText("Password")
-        self.password.setEchoMode(QLineEdit.EchoMode.Password)
-
-        self.ok_btn = QPushButton("Sign in", parent=self)
-        self.ok_btn.setDefault(True)
-        self.ok_btn.clicked.connect(self._emit_credentials)
-        # If the user presses Enter in the password field, trigger the OK button click
-        self.password.returnPressed.connect(self.ok_btn.click)
-
-        # Build Layout
-        layout = QVBoxLayout(self)
-        layout.setContentsMargins(32, 32, 32, 32)
-        layout.setSpacing(16)
-
-        layout.addWidget(title)
-        layout.addSpacing(8)
-        layout.addWidget(self.username)
-        layout.addWidget(self.password)
-        layout.addSpacing(12)
-        layout.addWidget(self.ok_btn)
-
-        self.username.setFocus()
-
-        self.setStyleSheet("""
-            QLineEdit {
-                padding: 8px;
-            }
-            """)
-
-    def _clear_password(self):
-        """Clear the password field."""
-        self.password.clear()
-
-    def _emit_credentials(self):
-        """Emit credentials and clear the password field."""
-        self.credentials_entered.emit(self.username.text().strip(), self.password.text())
-        self._clear_password()
-
-
-if __name__ == "__main__":  # pragma: no cover
-    import sys
-
-    from bec_qthemes import apply_theme
-    from qtpy.QtWidgets import QApplication
-
-    app = QApplication(sys.argv)
-    apply_theme("light")
-
-    dialog = BECLogin()
-
-    dialog.credentials_entered.connect(lambda u, p: print(f"Username: {u}, Password: {p}"))
-    dialog.show()
-    sys.exit(app.exec_())

bec_widgets/utils/bec_widget.py

@@ -6,20 +6,17 @@ from typing import TYPE_CHECKING
 import shiboken6
 from bec_lib.logger import bec_logger
 from qtpy.QtCore import QBuffer, QByteArray, QIODevice, QObject, Qt
-from qtpy.QtGui import QFont, QPixmap
-from qtpy.QtWidgets import QApplication, QFileDialog, QLabel, QVBoxLayout, QWidget
+from qtpy.QtGui import QPixmap
+from qtpy.QtWidgets import QApplication, QFileDialog, QWidget
 
 import bec_widgets.widgets.containers.qt_ads as QtAds
+from bec_widgets.cli.rpc.rpc_register import RPCRegister
 from bec_widgets.utils.bec_connector import BECConnector, ConnectionConfig
-from bec_widgets.utils.busy_loader import install_busy_loader
 from bec_widgets.utils.error_popups import SafeConnect, SafeSlot
 from bec_widgets.utils.rpc_decorator import rpc_timeout
-from bec_widgets.utils.rpc_register import RPCRegister
 from bec_widgets.utils.widget_io import WidgetHierarchy
-from bec_widgets.widgets.utility.spinner.spinner import SpinnerWidget
 
 if TYPE_CHECKING:  # pragma: no cover
-    from bec_widgets.utils.busy_loader import BusyLoaderOverlay
     from bec_widgets.widgets.containers.dock import BECDock
 
 logger = bec_logger.logger
@@ -41,6 +38,7 @@ class BECWidget(BECConnector):
         gui_id: str | None = None,
         theme_update: bool = False,
         start_busy: bool = False,
+        busy_text: str = "Loading…",
         **kwargs,
     ):
         """
@@ -67,14 +65,18 @@ class BECWidget(BECConnector):
             self._connect_to_theme_change()
 
         # Initialize optional busy loader overlay utility (lazy by default)
-        self._busy_overlay: "BusyLoaderOverlay" | None = None
-        self._busy_state_widget: QWidget | None = None
-
+        self._busy_overlay = None
         self._loading = False
-        self._busy_overlay = self._install_busy_loader()
         if start_busy and isinstance(self, QWidget):
-            self._show_busy_overlay()
-            self._loading = True
+            try:
+                overlay = self._ensure_busy_overlay(busy_text=busy_text)
+                if overlay is not None:
+                    overlay.setGeometry(self.rect())
+                    overlay.raise_()
+                    overlay.show()
+                    self._loading = True
+            except Exception as exc:
+                logger.debug(f"Busy loader init skipped: {exc}")
 
     def _connect_to_theme_change(self):
         """Connect to the theme change signal."""
@@ -95,109 +97,48 @@ class BECWidget(BECConnector):
         self._update_overlay_theme(theme)
         self.apply_theme(theme)
 
-    def create_busy_state_widget(self) -> QWidget:
-        """
-        Method to create a custom busy state widget to be shown in the busy overlay.
-        Child classes should overrid this method to provide a custom widget if desired.
-
-        Returns:
-            QWidget: The custom busy state widget.
-
-        NOTE:
-            The implementation here is a SpinnerWidget with a "Loading..." label. This is the default
-            busy state widget for all BECWidgets. However, child classes with specific needs for the
-            busy state can easily overrite this method to provide a custom widget. The signature of
-            the method must be preserved to ensure compatibility with the busy overlay system. If
-            the widget provides a 'cleanup' method, it will be called when the overlay is cleaned up.
-
-            The widget may connect to the _busy_overlay signals foreground_color_changed and
-            scrim_color_changed to update its colors when the theme changes.
-        """
-
-        # Widget
-        class BusyStateWidget(QWidget):
-            def __init__(self, parent=None):
-                super().__init__(parent)
-                # label
-                label = QLabel("Loading...", self)
-                label.setAlignment(Qt.AlignHCenter | Qt.AlignVCenter)
-                f = QFont(label.font())
-                f.setBold(True)
-                f.setPointSize(f.pointSize() + 1)
-                label.setFont(f)
-
-                # spinner
-                spinner = SpinnerWidget(self)
-                spinner.setFixedSize(42, 42)
-
-                # Layout
-                lay = QVBoxLayout(self)
-                lay.setContentsMargins(24, 24, 24, 24)
-                lay.setSpacing(10)
-                lay.addStretch(1)
-                lay.addWidget(spinner, 0, Qt.AlignHCenter)
-                lay.addWidget(label, 0, Qt.AlignHCenter)
-                lay.addStretch(1)
-                self.setLayout(lay)
-
-            def showEvent(self, event):
-                """Show event to start the spinner."""
-                super().showEvent(event)
-                for child in self.findChildren(SpinnerWidget):
-                    child.start()
-
-            def hideEvent(self, event):
-                """Hide event to stop the spinner."""
-                super().hideEvent(event)
-                for child in self.findChildren(SpinnerWidget):
-                    child.stop()
-
-        widget = BusyStateWidget(self)
-        return widget
-
-    def _install_busy_loader(self) -> "BusyLoaderOverlay" | None:
-        """
-        Create the busy overlay on demand and cache it in _busy_overlay.
+    def _ensure_busy_overlay(self, *, busy_text: str = "Loading…"):
+        """Create the busy overlay on demand and cache it in _busy_overlay.
         Returns the overlay instance or None if not a QWidget.
         """
         if not isinstance(self, QWidget):
             return None
         overlay = getattr(self, "_busy_overlay", None)
         if overlay is None:
+            from bec_widgets.utils.busy_loader import install_busy_loader
 
-            overlay = install_busy_loader(target=self, start_loading=False)
+            overlay = install_busy_loader(self, text=busy_text, start_loading=False)
             self._busy_overlay = overlay
-
-        # Create and set the busy state widget
-        self._busy_state_widget = self.create_busy_state_widget()
-        self._busy_overlay.set_widget(self._busy_state_widget)
         return overlay
 
-    def _show_busy_overlay(self) -> None:
+    def _init_busy_loader(self, *, start_busy: bool = False, busy_text: str = "Loading…") -> None:
         """Create and attach the loading overlay to this widget if QWidget is present."""
         if not isinstance(self, QWidget):
             return
-        if self._busy_overlay is not None:
-            self._busy_overlay.setGeometry(self.rect())  # pylint: disable=no-member
+        self._ensure_busy_overlay(busy_text=busy_text)
+        if start_busy and self._busy_overlay is not None:
+            self._busy_overlay.setGeometry(self.rect())
             self._busy_overlay.raise_()
             self._busy_overlay.show()
 
-    def set_busy(self, enabled: bool) -> None:
+    def set_busy(self, enabled: bool, text: str | None = None) -> None:
         """
-        Set the busy state of the widget. This will show or hide the loading overlay, which will
-        block user interaction with the widget and show the busy_state_widget if provided. Per
-        default, the busy state widget is a spinner with "Loading..." text.
+        Enable/disable the loading overlay. Optionally update the text.
 
         Args:
-            enabled(bool): Whether to enable the busy state.
+            enabled(bool): Whether to enable the loading overlay.
+            text(str, optional): The text to display on the overlay. If None, the text is not changed.
         """
         if not isinstance(self, QWidget):
             return
-        # If not yet installed, install the busy overlay now together with the busy state widget
-        if self._busy_overlay is None:
-            self._busy_overlay = self._install_busy_loader()
+        if getattr(self, "_busy_overlay", None) is None:
+            self._ensure_busy_overlay(busy_text=text or "Loading…")
+        if text is not None:
+            self.set_busy_text(text)
         if enabled:
-            self._show_busy_overlay()
+            self._busy_overlay.setGeometry(self.rect())
+            self._busy_overlay.raise_()
+            self._busy_overlay.show()
         else:
             self._busy_overlay.hide()
         self._loading = bool(enabled)
@@ -211,6 +152,19 @@ class BECWidget(BECConnector):
         """
         return bool(getattr(self, "_loading", False))
 
+    def set_busy_text(self, text: str) -> None:
+        """
+        Update the text on the loading overlay.
+
+        Args:
+            text(str): The text to display on the overlay.
+        """
+        overlay = getattr(self, "_busy_overlay", None)
+        if overlay is None:
+            overlay = self._ensure_busy_overlay(busy_text=text)
+        if overlay is not None:
+            overlay.set_text(text)
+
     @SafeSlot(str)
     def apply_theme(self, theme: str):
         """
@@ -223,8 +177,8 @@ class BECWidget(BECConnector):
     def _update_overlay_theme(self, theme: str):
         try:
             overlay = getattr(self, "_busy_overlay", None)
-            if overlay is not None:
-                overlay._update_palette()
+            if overlay is not None and hasattr(overlay, "update_palette"):
+                overlay.update_palette()
         except Exception:
             logger.warning(f"Failed to apply theme {theme} to {self}")
 
@@ -350,13 +304,10 @@ class BECWidget(BECConnector):
                         self.removeEventFilter(filt)
                     except Exception as exc:
                         logger.warning(f"Failed to remove event filter from busy overlay: {exc}")
-
-                # Cleanup the overlay widget. This will call cleanup on the custom widget if present.
-
-                overlay.cleanup()
                 overlay.deleteLater()
             except Exception as exc:
                 logger.warning(f"Failed to delete busy overlay: {exc}")
+        self._busy_overlay = None
 
     def closeEvent(self, event):
         """Wrap the close even to ensure the rpc_register is cleaned up."""

bec_widgets/utils/busy_loader.py

@@ -1,8 +1,7 @@
 from __future__ import annotations
 
-from bec_lib.logger import bec_logger
-from qtpy.QtCore import QEvent, QObject, Qt, QTimer, Signal
-from qtpy.QtGui import QColor
+from qtpy.QtCore import QEvent, QObject, Qt, QTimer
+from qtpy.QtGui import QColor, QFont
 from qtpy.QtWidgets import (
     QApplication,
     QFrame,
@@ -14,10 +13,10 @@ from qtpy.QtWidgets import (
     QWidget,
 )
 
+from bec_widgets import BECWidget
 from bec_widgets.utils.colors import apply_theme
-from bec_widgets.utils.error_popups import SafeProperty
-
-logger = bec_logger.logger
+from bec_widgets.widgets.plots.waveform.waveform import Waveform
+from bec_widgets.widgets.utility.spinner.spinner import SpinnerWidget
 
 
 class _OverlayEventFilter(QObject):
@@ -29,10 +28,6 @@ class _OverlayEventFilter(QObject):
         self._overlay = overlay
 
     def eventFilter(self, obj, event):
-        if not hasattr(self, "_target") or self._target is None:
-            return False
-        if not hasattr(self, "_overlay") or self._overlay is None:
-            return False
         if obj is self._target and event.type() in (
             QEvent.Resize,
             QEvent.Show,
@@ -58,201 +53,132 @@ class BusyLoaderOverlay(QWidget):
         BusyLoaderOverlay: The overlay instance.
     """
 
-    foreground_color_changed = Signal(QColor)
-    scrim_color_changed = Signal(QColor)
-
-    def __init__(self, parent: QWidget, opacity: float = 0.35, **kwargs):
+    def __init__(self, parent: QWidget, text: str = "Loading…", opacity: float = 0.85, **kwargs):
         super().__init__(parent=parent, **kwargs)
-
         self.setAttribute(Qt.WA_StyledBackground, True)
         self.setAutoFillBackground(False)
         self.setAttribute(Qt.WA_TranslucentBackground, True)
         self._opacity = opacity
-        self._scrim_color = QColor(128, 128, 128, 110)
-        self._label_color = QColor(240, 240, 240)
-        self._filter: QObject | None = None
 
-        # Set Main Layout
-        layout = QVBoxLayout(self)
-        layout.setContentsMargins(24, 24, 24, 24)
-        layout.setSpacing(10)
-        self.setLayout(layout)
+        self._label = QLabel(text, self)
+        self._label.setAlignment(Qt.AlignHCenter | Qt.AlignVCenter)
+        f = QFont(self._label.font())
+        f.setBold(True)
+        f.setPointSize(f.pointSize() + 1)
+        self._label.setFont(f)
 
-        # Custom widget placeholder
-        self._custom_widget: QWidget | None = None
+        self._spinner = SpinnerWidget(self)
+        self._spinner.setFixedSize(42, 42)
+
+        lay = QVBoxLayout(self)
+        lay.setContentsMargins(24, 24, 24, 24)
+        lay.setSpacing(10)
+        lay.addStretch(1)
+        lay.addWidget(self._spinner, 0, Qt.AlignHCenter)
+        lay.addWidget(self._label, 0, Qt.AlignHCenter)
+        lay.addStretch(1)
 
-        # Add a frame around the content
         self._frame = QFrame(self)
         self._frame.setObjectName("busyFrame")
         self._frame.setAttribute(Qt.WA_TransparentForMouseEvents, True)
         self._frame.lower()
 
         # Defaults
-        self._update_palette()
+        self._scrim_color = QColor(0, 0, 0, 110)
+        self._label_color = QColor(240, 240, 240)
+        self.update_palette()
 
         # Start hidden; interactions beneath are blocked while visible
         self.hide()
 
-    @SafeProperty(QColor, notify=scrim_color_changed)
-    def scrim_color(self) -> QColor:
+    # --- API ---
+    def set_text(self, text: str):
         """
-        The overlay scrim color.
-        """
-        return self._scrim_color
-
-    @scrim_color.setter
-    def scrim_color(self, value: QColor):
-        if not isinstance(value, QColor):
-            raise TypeError("scrim_color must be a QColor")
-        self._scrim_color = value
-        self.update()
-
-    @SafeProperty(QColor, notify=foreground_color_changed)
-    def foreground_color(self) -> QColor:
-        """
-        The overlay foreground color (text, spinner).
-        """
-        return self._label_color
-
-    @foreground_color.setter
-    def foreground_color(self, value: QColor):
-        if not isinstance(value, QColor):
-            try:
-                color = QColor(value)
-                if not color.isValid():
-                    raise ValueError(f"Invalid color: {value}")
-            except Exception:
-                # pylint: disable=raise-missing-from
-                raise ValueError(f"Color {value} is invalid, cannot be converted to QColor")
-        self._label_color = value
-        self.update()
-
-    def set_filter(self, filt: _OverlayEventFilter):
-        """
-        Set an event filter to keep the overlay sized and stacked over its target.
+        Update the overlay text.
 
         Args:
-            filt(QObject): The event filter instance.
+            text(str): The text to display on the overlay.
         """
-        self._filter = filt
-        target = filt._target
-        if self.parent() != target:
-            logger.warning(f"Overlay parent {self.parent()} does not match filter target {target}")
-        target.installEventFilter(self._filter)
-
-    ######################
-    ### Public methods ###
-    ######################
-
-    def set_widget(self, widget: QWidget):
-        """
-        Set a custom widget as an overlay for the busy overlay.
-
-        Args:
-            widget(QWidget): The custom widget to display.
-        """
-        lay = self.layout()
-        if lay is None:
-            return
-        self._custom_widget = widget
-        lay.addWidget(widget, 0, Qt.AlignHCenter)
+        self._label.setText(text)
 
     def set_opacity(self, opacity: float):
         """
-        Set the overlay opacity. Only values between 0.0 and 1.0 are accepted. If a
-        value outside this range is provided, it will be clamped.
+        Set overlay opacity (0..1).
 
         Args:
             opacity(float): The opacity value between 0.0 (fully transparent) and 1.0 (fully opaque).
         """
         self._opacity = max(0.0, min(1.0, float(opacity)))
         # Re-apply alpha using the current theme color
-        base = self.scrim_color
-        base.setAlpha(int(255 * self._opacity))
-        self.scrim_color = base
-        self._update_palette()
+        if isinstance(self._scrim_color, QColor):
+            base = QColor(self._scrim_color)
+            base.setAlpha(int(255 * self._opacity))
+            self._scrim_color = base
+        self.update()
 
-    ##########################
-    ### Internal methods ###
-    ##########################
-
-    def _update_palette(self):
+    def update_palette(self):
         """
         Update colors from the current application theme.
         """
-        _app = QApplication.instance()
-        if hasattr(_app, "theme"):
-            theme = _app.theme  # type: ignore[attr-defined]
-            _bg = theme.color("BORDER")
-            _fg = theme.color("FG")
+        app = QApplication.instance()
+        if hasattr(app, "theme"):
+            theme = app.theme  # type: ignore[attr-defined]
+            self._bg = theme.color("BORDER")
+            self._fg = theme.color("FG")
+            self._primary = theme.color("PRIMARY")
         else:
             # Fallback neutrals
-            _bg = QColor(30, 30, 30)
-            _fg = QColor(230, 230, 230)
-
+            self._bg = QColor(30, 30, 30)
+            self._fg = QColor(230, 230, 230)
         # Semi-transparent scrim derived from bg
-        base = _bg if isinstance(_bg, QColor) else QColor(str(_bg))
-        base.setAlpha(int(255 * max(0.0, min(1.0, getattr(self, "_opacity", 0.35)))))
-        self.scrim_color = base
-        fg = _fg if isinstance(_fg, QColor) else QColor(str(_fg))
-        self.foreground_color = fg
-
-        # Set the frame style with updated foreground colors
-        r, g, b, a = base.getRgb()
+        self._scrim_color = QColor(self._bg)
+        self._scrim_color.setAlpha(int(255 * max(0.0, min(1.0, getattr(self, "_opacity", 0.35)))))
+        self._spinner.update()
+        fg_hex = self._fg.name() if isinstance(self._fg, QColor) else str(self._fg)
+        self._label.setStyleSheet(f"color: {fg_hex};")
         self._frame.setStyleSheet(
-            f"#busyFrame {{ border: 2px dashed {self.foreground_color.name()}; border-radius: 9px; background-color: rgba({r}, {g}, {b}, {a}); }}"
+            f"#busyFrame {{ border: 2px dashed {fg_hex}; border-radius: 9px; background-color: rgba(128, 128, 128, 110); }}"
         )
         self.update()
 
-    #############################
-    ### Custom Event Handlers ###
-    #############################
-
+    # --- QWidget overrides ---
     def showEvent(self, e):
-        # Call showEvent on custom widget if present
-        if self._custom_widget is not None:
-            self._custom_widget.showEvent(e)
+        self._spinner.start()
         super().showEvent(e)
 
     def hideEvent(self, e):
-        # Call hideEvent on custom widget if present
-        if self._custom_widget is not None:
-            self._custom_widget.hideEvent(e)
+        self._spinner.stop()
         super().hideEvent(e)
 
     def resizeEvent(self, e):
-        # Call resizeEvent on custom widget if present
-        if self._custom_widget is not None:
-            self._custom_widget.resizeEvent(e)
         super().resizeEvent(e)
         r = self.rect().adjusted(10, 10, -10, -10)
         self._frame.setGeometry(r)
 
-    # TODO should we have this cleanup here?
-    def cleanup(self):
-        """Cleanup resources used by the overlay."""
-        if self._custom_widget is not None:
-            if hasattr(self._custom_widget, "cleanup"):
-                self._custom_widget.cleanup()
+    def paintEvent(self, e):
+        super().paintEvent(e)
 
 
 def install_busy_loader(
-    target: QWidget, start_loading: bool = False, opacity: float = 0.35
+    target: QWidget, text: str = "Loading…", start_loading: bool = False, opacity: float = 0.35
 ) -> BusyLoaderOverlay:
     """
     Attach a BusyLoaderOverlay to `target` and keep it sized and stacked.
 
     Args:
         target(QWidget): The widget to overlay.
+        text(str): Initial text to display.
         start_loading(bool): If True, show the overlay immediately.
         opacity(float): Overlay opacity (0..1).
 
     Returns:
         BusyLoaderOverlay: The overlay instance.
     """
-    overlay = BusyLoaderOverlay(parent=target, opacity=opacity)
+    overlay = BusyLoaderOverlay(target, text=text, opacity=opacity)
     overlay.setGeometry(target.rect())
-    overlay.set_filter(_OverlayEventFilter(target=target, overlay=overlay))
+    filt = _OverlayEventFilter(target, overlay)
+    overlay._filter = filt  # type: ignore[attr-defined]
+    target.installEventFilter(filt)
     if start_loading:
         overlay.show()
     return overlay
@@ -261,63 +187,65 @@ def install_busy_loader(
 # --------------------------
 # Launchable demo
 # --------------------------
+class DemoWidget(BECWidget, QWidget):  # pragma: no cover
+    def __init__(self, parent=None):
+        super().__init__(
+            parent=parent, theme_update=True, start_busy=True, busy_text="Demo: Initializing…"
+        )
+
+        self._title = QLabel("Demo Content", self)
+        self._title.setAlignment(Qt.AlignCenter)
+        self._title.setFrameStyle(QFrame.Panel | QFrame.Sunken)
+        lay = QVBoxLayout(self)
+        lay.addWidget(self._title)
+        waveform = Waveform(self)
+        waveform.plot([1, 2, 3, 4, 5])
+        lay.addWidget(waveform, 1)
+
+        QTimer.singleShot(5000, self._ready)
+
+    def _ready(self):
+        self._title.setText("Ready ✓")
+        self.set_busy(False)
+
+
+class DemoWindow(QMainWindow):
+    def __init__(self):
+        super().__init__()
+        self.setWindowTitle("Busy Loader — BECWidget demo")
+
+        left = DemoWidget()
+        right = DemoWidget()
+
+        btn_on = QPushButton("Right → Loading")
+        btn_off = QPushButton("Right → Ready")
+        btn_text = QPushButton("Set custom text")
+        btn_on.clicked.connect(lambda: right.set_busy(True, "Fetching data…"))
+        btn_off.clicked.connect(lambda: right.set_busy(False))
+        btn_text.clicked.connect(lambda: right.set_busy_text("Almost there…"))
+
+        panel = QWidget()
+        prow = QVBoxLayout(panel)
+        prow.addWidget(btn_on)
+        prow.addWidget(btn_off)
+        prow.addWidget(btn_text)
+        prow.addStretch(1)
+
+        central = QWidget()
+        row = QHBoxLayout(central)
+        row.setContentsMargins(12, 12, 12, 12)
+        row.setSpacing(12)
+        row.addWidget(left, 1)
+        row.addWidget(right, 1)
+        row.addWidget(panel, 0)
+
+        self.setCentralWidget(central)
+        self.resize(900, 420)
+
+
 if __name__ == "__main__":  # pragma: no cover
     import sys
 
-    from bec_widgets.utils.bec_widget import BECWidget
-    from bec_widgets.widgets.plots.waveform.waveform import Waveform
-
-    class DemoWidget(BECWidget, QWidget):  # pragma: no cover
-        def __init__(self, parent=None, start_busy: bool = False):
-            super().__init__(parent=parent, theme_update=True, start_busy=start_busy)
-
-            self._title = QLabel("Demo Content", self)
-            self._title.setAlignment(Qt.AlignCenter)
-            self._title.setFrameStyle(QFrame.Panel | QFrame.Sunken)
-            lay = QVBoxLayout(self)
-            lay.addWidget(self._title)
-            waveform = Waveform(self)
-            waveform.plot([1, 2, 3, 4, 5])
-            lay.addWidget(waveform, 1)
-
-            QTimer.singleShot(5000, self._ready)
-
-        def _ready(self):
-            self._title.setText("Ready ✓")
-            self.set_busy(False)
-
-    class DemoWindow(QMainWindow):  # pragma: no cover
-        def __init__(self):
-            super().__init__()
-            self.setWindowTitle("Busy Loader — BECWidget demo")
-
-            left = DemoWidget(start_busy=True)
-            right = DemoWidget()
-
-            btn_on = QPushButton("Right → Loading")
-            btn_off = QPushButton("Right → Ready")
-            btn_text = QPushButton("Set custom text")
-            btn_on.clicked.connect(lambda: right.set_busy(True))
-            btn_off.clicked.connect(lambda: right.set_busy(False))
-
-            panel = QWidget()
-            prow = QVBoxLayout(panel)
-            prow.addWidget(btn_on)
-            prow.addWidget(btn_off)
-            prow.addWidget(btn_text)
-            prow.addStretch(1)
-
-            central = QWidget()
-            row = QHBoxLayout(central)
-            row.setContentsMargins(12, 12, 12, 12)
-            row.setSpacing(12)
-            row.addWidget(left, 1)
-            row.addWidget(right, 1)
-            row.addWidget(panel, 0)
-
-            self.setCentralWidget(central)
-            self.resize(900, 420)
-
     app = QApplication(sys.argv)
     apply_theme("light")
     w = DemoWindow()

bec_widgets/utils/colors.py

@@ -1,22 +1,17 @@
 from __future__ import annotations
 
 import re
-from functools import lru_cache
 from typing import Literal
 
 import numpy as np
 import pyqtgraph as pg
-from bec_lib import bec_logger
 from bec_qthemes import apply_theme as apply_theme_global
 from bec_qthemes._theme import AccentColors
 from pydantic_core import PydanticCustomError
-from pyqtgraph.graphicsItems.GradientEditorItem import Gradients
 from qtpy.QtCore import QEvent, QEventLoop
 from qtpy.QtGui import QColor
 from qtpy.QtWidgets import QApplication
 
-logger = bec_logger.logger
-
 
 def get_theme_name():
     if QApplication.instance() is None or not hasattr(QApplication.instance(), "theme"):
@@ -52,103 +47,12 @@ def apply_theme(theme: Literal["dark", "light"]):
     """
     Apply the theme via the global theming API. This updates QSS, QPalette, and pyqtgraph globally.
     """
-    logger.info(f"Applying theme: {theme}")
     process_all_deferred_deletes(QApplication.instance())
     apply_theme_global(theme)
     process_all_deferred_deletes(QApplication.instance())
 
 
 class Colors:
-    @staticmethod
-    def list_available_colormaps() -> list[str]:
-        """
-        List colormap names available via the pyqtgraph colormap registry.
-
-        Note: This does not include `GradientEditorItem` presets (used by HistogramLUT menus).
-        """
-
-        def _list(source: str | None = None) -> list[str]:
-            try:
-                return pg.colormap.listMaps() if source is None else pg.colormap.listMaps(source)
-            except Exception:  # pragma: no cover - backend may be missing
-                return []
-
-        return [*_list(None), *_list("matplotlib"), *_list("colorcet")]
-
-    @staticmethod
-    def list_available_gradient_presets() -> list[str]:
-        """
-        List `GradientEditorItem` preset names (HistogramLUT right-click menu entries).
-        """
-        from pyqtgraph.graphicsItems.GradientEditorItem import Gradients
-
-        return list(Gradients.keys())
-
-    @staticmethod
-    def canonical_colormap_name(color_map: str) -> str:
-        """
-        Return an available colormap/preset name if a case-insensitive match exists.
-        """
-        requested = (color_map or "").strip()
-        if not requested:
-            return requested
-
-        registry = Colors.list_available_colormaps()
-        presets = Colors.list_available_gradient_presets()
-        available = set(registry) | set(presets)
-
-        if requested in available:
-            return requested
-
-        # Case-insensitive match.
-        requested_lc = requested.casefold()
-
-        for name in available:
-            if name.casefold() == requested_lc:
-                return name
-
-        return requested
-
-    @staticmethod
-    def get_colormap(color_map: str) -> pg.ColorMap:
-        """
-        Resolve a string into a `pg.ColorMap` using either:
-        - the `pg.colormap` registry (optionally including matplotlib/colorcet backends), or
-        - `GradientEditorItem` presets (HistogramLUT right-click menu).
-        """
-        name = Colors.canonical_colormap_name(color_map)
-        if not name:
-            raise ValueError("Empty colormap name")
-
-        return Colors._get_colormap_cached(name)
-
-    @staticmethod
-    @lru_cache(maxsize=256)
-    def _get_colormap_cached(name: str) -> pg.ColorMap:
-        # 1) Registry/backends
-        try:
-            cmap = pg.colormap.get(name)
-            if cmap is not None:
-                return cmap
-        except Exception:
-            pass
-        for source in ("matplotlib", "colorcet"):
-            try:
-                cmap = pg.colormap.get(name, source=source)
-                if cmap is not None:
-                    return cmap
-            except Exception:
-                continue
-
-        # 2) Presets -> ColorMap
-
-        if name not in Gradients:
-            raise KeyError(f"Colormap '{name}' not found")
-
-        ge = pg.GradientEditorItem()
-        ge.loadPreset(name)
-
-        return ge.colorMap()
 
     @staticmethod
     def golden_ratio(num: int) -> list:
@@ -230,7 +134,7 @@ class Colors:
         if theme_offset < 0 or theme_offset > 1:
             raise ValueError("theme_offset must be between 0 and 1")
 
-        cmap = Colors.get_colormap(colormap)
+        cmap = pg.colormap.get(colormap)
         min_pos, max_pos = Colors.set_theme_offset(theme, theme_offset)
 
         # Generate positions that are evenly spaced within the acceptable range
@@ -278,7 +182,7 @@ class Colors:
             ValueError: If theme_offset is not between 0 and 1.
         """
 
-        cmap = Colors.get_colormap(colormap)
+        cmap = pg.colormap.get(colormap)
         phi = (1 + np.sqrt(5)) / 2  # Golden ratio
         golden_angle_conjugate = 1 - (1 / phi)  # Approximately 0.38196601125
 
@@ -544,103 +448,18 @@ class Colors:
         Raises:
             PydanticCustomError: If colormap is invalid.
         """
-        normalized = Colors.canonical_colormap_name(color_map)
-        try:
-            Colors.get_colormap(normalized)
-        except Exception as ext:
-            logger.warning(f"Colormap validation error: {ext}")
+        available_pg_maps = pg.colormap.listMaps()
+        available_mpl_maps = pg.colormap.listMaps("matplotlib")
+        available_mpl_colorcet = pg.colormap.listMaps("colorcet")
+
+        available_colormaps = available_pg_maps + available_mpl_maps + available_mpl_colorcet
+        if color_map not in available_colormaps:
             if return_error:
-                available_colormaps = sorted(
-                    set(Colors.list_available_colormaps())
-                    | set(Colors.list_available_gradient_presets())
-                )
                 raise PydanticCustomError(
                     "unsupported colormap",
-                    f"Colormap '{color_map}' not found in the current installation of pyqtgraph. Choose from the following: {available_colormaps}.",
+                    f"Colormap '{color_map}' not found in the current installation of pyqtgraph. Choose on the following: {available_colormaps}.",
                     {"wrong_value": color_map},
                 )
             else:
                 return False
-        return normalized
-
-    @staticmethod
-    def relative_luminance(color: QColor) -> float:
-        """
-        Calculate the relative luminance of a QColor according to WCAG 2.0 standards.
-        See https://www.w3.org/TR/WCAG21/#dfn-relative-luminance.
-
-        Args:
-            color(QColor): The color to calculate the relative luminance for.
-
-        Returns:
-            float: The relative luminance of the color.
-        """
-        r = color.red() / 255.0
-        g = color.green() / 255.0
-        b = color.blue() / 255.0
-
-        def adjust(c):
-            if c <= 0.03928:
-                return c / 12.92
-            return ((c + 0.055) / 1.055) ** 2.4
-
-        r = adjust(r)
-        g = adjust(g)
-        b = adjust(b)
-
-        return 0.2126 * r + 0.7152 * g + 0.0722 * b
-
-    @staticmethod
-    def _tint_strength(
-        accent: QColor, background: QColor, min_tint: float = 0.06, max_tint: float = 0.18
-    ) -> float:
-        """
-        Calculate the tint strength based on the contrast between the accent and background colors.
-        min_tint and max_tint define the range of tint strength and are empirically chosen.
-
-        Args:
-            accent(QColor): The accent color.
-            background(QColor): The background color.
-            min_tint(float): The minimum tint strength.
-            max_tint(float): The maximum tint strength.
-
-        Returns:
-            float: The tint strength between 0 and 1.
-        """
-        l_accent = Colors.relative_luminance(accent)
-        l_bg = Colors.relative_luminance(background)
-
-        contrast = abs(l_accent - l_bg)
-
-        # normalize contrast to a value between 0 and 1
-        t = min(contrast / 0.9, 1.0)
-        return min_tint + t * (max_tint - min_tint)
-
-    @staticmethod
-    def _blend(background: QColor, accent: QColor, t: float) -> QColor:
-        """
-        Blend two colors based on a tint strength t.
-        """
-        return QColor(
-            round(background.red() + (accent.red() - background.red()) * t),
-            round(background.green() + (accent.green() - background.green()) * t),
-            round(background.blue() + (accent.blue() - background.blue()) * t),
-            round(background.alpha() + (accent.alpha() - background.alpha()) * t),
-        )
-
-    @staticmethod
-    def subtle_background_color(accent: QColor, background: QColor) -> QColor:
-        """
-        Generate a subtle, contrast-safe background color derived from an accent color.
-
-        Args:
-            accent(QColor): The accent color.
-            background(QColor): The background color.
-        Returns:
-            QColor: The generated subtle background color.
-        """
-        if not accent.isValid() or not background.isValid():
-            return background
-
-        tint = Colors._tint_strength(accent, background)
-        return Colors._blend(background, accent, tint)
+        return color_map

bec_widgets/utils/container_utils.py

@@ -43,7 +43,7 @@ class WidgetContainerUtils:
         if list_of_names is None:
             list_of_names = []
         ii = 0
-        while ii < 1000:  # 1000 is arbitrary!
+        while ii < 1000:  # 1000 is arbritrary!
             name_candidate = f"{name}_{ii}"
             if name_candidate not in list_of_names:
                 return name_candidate

bec_widgets/utils/error_popups.py

@@ -1,38 +1,19 @@
 import functools
 import sys
 import traceback
-from typing import Any, Callable, Literal
 
 import shiboken6
 from bec_lib.logger import bec_logger
 from louie.saferef import safe_ref
 from qtpy.QtCore import Property, QObject, Qt, Signal, Slot
-from qtpy.QtWidgets import (
-    QApplication,
-    QLabel,
-    QMessageBox,
-    QPushButton,
-    QSpinBox,
-    QTabWidget,
-    QVBoxLayout,
-    QWidget,
-)
+from qtpy.QtWidgets import QApplication, QMessageBox, QPushButton, QVBoxLayout, QWidget
 
 logger = bec_logger.logger
 
 RAISE_ERROR_DEFAULT = False
 
 
-def SafeProperty(
-    prop_type,
-    *prop_args,
-    popup_error: bool = False,
-    default: Any = None,
-    auto_emit: bool = False,
-    emit_value: Literal["stored", "input"] | Callable[[object, object], object] = "stored",
-    emit_on_change: bool = True,
-    **prop_kwargs,
-):
+def SafeProperty(prop_type, *prop_args, popup_error: bool = False, default=None, **prop_kwargs):
     """
     Decorator to create a Qt Property with safe getter and setter so that
     Qt Designer won't crash if an exception occurs in either method.
@@ -41,15 +22,7 @@ def SafeProperty(
         prop_type: The property type (e.g., str, bool, int, custom classes, etc.)
         popup_error (bool): If True, show a popup for any error; otherwise, ignore or log silently.
         default: Any default/fallback value to return if the getter raises an exception.
-        auto_emit (bool): If True, automatically emit property_changed signal when setter is called.
-                         Requires the widget to have a property_changed signal (str, object).
-                         Note: This is different from Qt's 'notify' parameter which expects a Signal.
-        emit_value: Controls which value is emitted when auto_emit=True.
-            - "stored" (default): emit the value from the getter after setter runs
-            - "input": emit the raw setter input
-            - callable: called as emit_value(self_, value) after setter and must return the value to emit
-        emit_on_change (bool): If True, emit only when the stored value changes.
-        *prop_args, **prop_kwargs: Passed along to the underlying Qt Property constructor (check https://doc.qt.io/qt-6/properties.html).
+        *prop_args, **prop_kwargs: Passed along to the underlying Qt Property constructor.
 
     Usage:
         @SafeProperty(int, default=-1)
@@ -61,41 +34,6 @@ def SafeProperty(
         def some_value(self, val: int):
             # your setter logic
             ...
-
-        # With auto-emit for toolbar sync:
-        @SafeProperty(bool, auto_emit=True)
-        def fft(self) -> bool:
-            return self._fft
-
-        @fft.setter
-        def fft(self, value: bool):
-            self._fft = value
-            # property_changed.emit("fft", value) is called automatically
-
-        # With custom emit modes:
-        @SafeProperty(int, auto_emit=True, emit_value="stored")
-        def precision_stored(self) -> int:
-            return self._precision_stored
-
-        @precision_stored.setter
-        def precision_stored(self, value: int):
-            self._precision_stored = max(0, int(value))
-
-        @SafeProperty(int, auto_emit=True, emit_value="input")
-        def precision_input(self) -> int:
-            return self._precision_input
-
-        @precision_input.setter
-        def precision_input(self, value: int):
-            self._precision_input = max(0, int(value))
-
-    @SafeProperty(int, auto_emit=True, emit_value=lambda _self, v: int(v) * 10)
-    def precision_callable(self) -> int:
-        return self._precision_callable
-
-        @precision_callable.setter
-        def precision_callable(self, value: int):
-            self._precision_callable = max(0, int(value))
     """
 
     def decorator(py_getter):
@@ -115,8 +53,6 @@ def SafeProperty(
                 logger.error(f"SafeProperty error in GETTER of '{prop_name}':\n{error_msg}")
                 return default
 
-        safe_getter.__is_safe_getter__ = True  # type: ignore[attr-defined]
-
         class PropertyWrapper:
             """
             Intermediate wrapper used so that the user can optionally chain .setter(...).
@@ -132,42 +68,8 @@ def SafeProperty(
                 @functools.wraps(setter_func)
                 def safe_setter(self_, value):
                     try:
-                        before_value = None
-                        if auto_emit and emit_on_change:
-                            try:
-                                before_value = self.getter_func(self_)
-                            except Exception as e:
-                                logger.warning(
-                                    f"SafeProperty could not get 'before' value for change detection: {e}"
-                                )
-                                before_value = None
-
-                        result = setter_func(self_, value)
-
-                        # Auto-emit property_changed if auto_emit=True and signal exists
-                        if auto_emit and hasattr(self_, "property_changed"):
-                            prop_name = py_getter.__name__
-                            try:
-                                if callable(emit_value):
-                                    emit_payload = emit_value(self_, value)
-                                elif emit_value == "input":
-                                    emit_payload = value
-                                else:
-                                    emit_payload = self.getter_func(self_)
-
-                                if emit_on_change and before_value == emit_payload:
-                                    return result
-
-                                self_.property_changed.emit(prop_name, emit_payload)
-                            except Exception as notify_error:
-                                # Don't fail the setter if notification fails
-                                logger.warning(
-                                    f"SafeProperty auto_emit failed for '{prop_name}': {notify_error}"
-                                )
-
-                        return result
-                    except Exception as e:
-                        logger.warning(f"SafeProperty setter caught exception: {e}")
+                        return setter_func(self_, value)
+                    except Exception:
                         prop_name = f"{setter_func.__module__}.{setter_func.__qualname__}"
                         error_msg = traceback.format_exc()
 
@@ -433,100 +335,6 @@ def ErrorPopupUtility():
     return _popup_utility_instance
 
 
-class SafePropertyExampleWidget(QWidget):  # pragma: no cover
-    """
-    Example widget showcasing SafeProperty auto_emit modes.
-    """
-
-    property_changed = Signal(str, object)
-
-    def __init__(self):
-        super().__init__()
-        self.setWindowTitle("SafeProperty auto_emit example")
-        self._precision_stored = 0
-        self._precision_input = 0
-        self._precision_callable = 0
-
-        layout = QVBoxLayout(self)
-        self.status = QLabel("last emit: <none>", self)
-
-        self.spinbox_stored = QSpinBox(self)
-        self.spinbox_stored.setRange(-5, 10)
-        self.spinbox_stored.setValue(0)
-        self.label_stored = QLabel("stored emit: <none>", self)
-
-        self.spinbox_input = QSpinBox(self)
-        self.spinbox_input.setRange(-5, 10)
-        self.spinbox_input.setValue(0)
-        self.label_input = QLabel("input emit: <none>", self)
-
-        self.spinbox_callable = QSpinBox(self)
-        self.spinbox_callable.setRange(-5, 10)
-        self.spinbox_callable.setValue(0)
-        self.label_callable = QLabel("callable emit: <none>", self)
-
-        layout.addWidget(QLabel("stored emit (normalized value):", self))
-        layout.addWidget(self.spinbox_stored)
-        layout.addWidget(self.label_stored)
-
-        layout.addWidget(QLabel("input emit (raw setter input):", self))
-        layout.addWidget(self.spinbox_input)
-        layout.addWidget(self.label_input)
-
-        layout.addWidget(QLabel("callable emit (custom mapping):", self))
-        layout.addWidget(self.spinbox_callable)
-        layout.addWidget(self.label_callable)
-
-        layout.addWidget(self.status)
-
-        self.spinbox_stored.valueChanged.connect(self._on_spinbox_stored)
-        self.spinbox_input.valueChanged.connect(self._on_spinbox_input)
-        self.spinbox_callable.valueChanged.connect(self._on_spinbox_callable)
-        self.property_changed.connect(self._on_property_changed)
-
-    @SafeProperty(int, auto_emit=True, emit_value="stored", doc="Clamped precision value.")
-    def precision_stored(self) -> int:
-        return self._precision_stored
-
-    @precision_stored.setter
-    def precision_stored(self, value: int):
-        self._precision_stored = max(0, int(value))
-
-    @SafeProperty(int, auto_emit=True, emit_value="input", doc="Emit raw input value.")
-    def precision_input(self) -> int:
-        return self._precision_input
-
-    @precision_input.setter
-    def precision_input(self, value: int):
-        self._precision_input = max(0, int(value))
-
-    @SafeProperty(int, auto_emit=True, emit_value=lambda _self, v: int(v) * 10)
-    def precision_callable(self) -> int:
-        return self._precision_callable
-
-    @precision_callable.setter
-    def precision_callable(self, value: int):
-        self._precision_callable = max(0, int(value))
-
-    def _on_spinbox_stored(self, value: int):
-        self.precision_stored = value
-
-    def _on_spinbox_input(self, value: int):
-        self.precision_input = value
-
-    def _on_spinbox_callable(self, value: int):
-        self.precision_callable = value
-
-    def _on_property_changed(self, prop_name: str, value):
-        self.status.setText(f"last emit: {prop_name}={value}")
-        if prop_name == "precision_stored":
-            self.label_stored.setText(f"stored emit: {value}")
-        elif prop_name == "precision_input":
-            self.label_input.setText(f"input emit: {value}")
-        elif prop_name == "precision_callable":
-            self.label_callable.setText(f"callable emit: {value}")
-
-
 class ExampleWidget(QWidget):  # pragma: no cover
     """
     Example widget to demonstrate error handling with the ErrorPopupUtility.
@@ -581,10 +389,6 @@ class ExampleWidget(QWidget):  # pragma: no cover
 if __name__ == "__main__":  # pragma: no cover
 
     app = QApplication(sys.argv)
-    tabs = QTabWidget()
-    tabs.setWindowTitle("Error Popups & SafeProperty Examples")
-    tabs.addTab(ExampleWidget(), "Error Popups")
-    tabs.addTab(SafePropertyExampleWidget(), "SafeProperty auto_emit")
-    tabs.resize(420, 520)
-    tabs.show()
+    widget = ExampleWidget()
+    widget.show()
     sys.exit(app.exec_())

bec_widgets/utils/filter_io.py

@@ -7,7 +7,6 @@ from abc import ABC, abstractmethod
 from bec_lib.logger import bec_logger
 from qtpy.QtCore import QStringListModel
 from qtpy.QtWidgets import QComboBox, QCompleter, QLineEdit
-from typeguard import TypeCheckError
 
 from bec_widgets.utils.ophyd_kind_util import Kind
 
@@ -56,49 +55,6 @@ class WidgetFilterHandler(ABC):
         """
         # This method should be implemented in subclasses or extended as needed
 
-    def update_with_bec_signal_class(
-        self,
-        signal_class_filter: str | list[str],
-        client,
-        ndim_filter: int | list[int] | None = None,
-    ) -> list[tuple[str, str, dict]]:
-        """Update the selection based on signal classes using device_manager.get_bec_signals.
-
-        Args:
-            signal_class_filter (str|list[str]): List of signal class names to filter.
-            client: BEC client instance.
-            ndim_filter (int | list[int] | None): Filter signals by dimensionality.
-                If provided, only signals with matching ndim will be included.
-
-        Returns:
-            list[tuple[str, str, dict]]: A list of (device_name, signal_name, signal_config) tuples.
-        """
-        if not client or not hasattr(client, "device_manager"):
-            return []
-
-        try:
-            signals = client.device_manager.get_bec_signals(signal_class_filter)
-        except TypeCheckError as e:
-            logger.warning(f"Error retrieving signals: {e}")
-            return []
-
-        if ndim_filter is None:
-            return signals
-
-        if isinstance(ndim_filter, int):
-            ndim_filter = [ndim_filter]
-
-        filtered_signals = []
-        for device_name, signal_name, signal_config in signals:
-            ndim = None
-            if isinstance(signal_config, dict):
-                ndim = signal_config.get("describe", {}).get("signal_info", {}).get("ndim")
-
-            if ndim in ndim_filter:
-                filtered_signals.append((device_name, signal_name, signal_config))
-
-        return filtered_signals
-
 
 class LineEditFilterHandler(WidgetFilterHandler):
     """Handler for QLineEdit widget"""
@@ -299,32 +255,6 @@ class FilterIO:
             f"No matching handler for widget type: {type(widget)} in handler list {FilterIO._handlers}"
         )
 
-    @staticmethod
-    def update_with_signal_class(
-        widget, signal_class_filter: list[str], client, ndim_filter: int | list[int] | None = None
-    ) -> list[tuple[str, str, dict]]:
-        """
-        Update the selection based on signal classes using device_manager.get_bec_signals.
-
-        Args:
-            widget: Widget instance.
-            signal_class_filter (list[str]): List of signal class names to filter.
-            client: BEC client instance.
-            ndim_filter (int | list[int] | None): Filter signals by dimensionality.
-                If provided, only signals with matching ndim will be included.
-
-        Returns:
-            list[tuple[str, str, dict]]: A list of (device_name, signal_name, signal_config) tuples.
-        """
-        handler_class = FilterIO._find_handler(widget)
-        if handler_class:
-            return handler_class().update_with_bec_signal_class(
-                signal_class_filter=signal_class_filter, client=client, ndim_filter=ndim_filter
-            )
-        raise ValueError(
-            f"No matching handler for widget type: {type(widget)} in handler list {FilterIO._handlers}"
-        )
-
     @staticmethod
     def _find_handler(widget):
         """

bec_widgets/utils/forms_from_types/forms.py

@@ -106,9 +106,7 @@ class TypedForm(BECWidget, QWidget):
 
     def _add_griditem(self, item: FormItemSpec, row: int):
         grid = self._form_grid.layout()
-        # Use title from FieldInfo if available, otherwise use the property name
-        label_text = item.info.title if item.info.title else item.name
-        label = QLabel(parent=self._form_grid, text=label_text)
+        label = QLabel(parent=self._form_grid, text=item.name)
         label.setProperty("_model_field_name", item.name)
         label.setToolTip(item.info.description or item.name)
         grid.addWidget(label, row, 0)

bec_widgets/utils/forms_from_types/items.py

@@ -71,7 +71,7 @@ class FormItemSpec(BaseModel):
     """
     The specification for an item in a dynamically generated form. Uses a pydantic FieldInfo
     to store most annotation info, since one of the main purposes is to store data for
-    forms generated from pydantic models, but can also be composed from other sources or by hand.
+    forms genrated from pydantic models, but can also be composed from other sources or by hand.
     """
 
     model_config = ConfigDict(arbitrary_types_allowed=True)
@@ -192,7 +192,7 @@ class DynamicFormItem(QWidget):
     @abstractmethod
     def _add_main_widget(self) -> None:
         self._main_widget: QWidget
-        """Add the main data entry widget to self._main_widget and apply any
+        """Add the main data entry widget to self._main_widget and appply any
         constraints from the field info"""
 
     @SafeSlot()
@@ -231,8 +231,6 @@ class StrFormItem(DynamicFormItem):
     def __init__(self, parent: QWidget | None = None, *, spec: FormItemSpec) -> None:
         super().__init__(parent=parent, spec=spec)
         self._main_widget.textChanged.connect(self._value_changed)
-        if spec.info.description:
-            self._main_widget.setPlaceholderText(spec.info.description)
 
     def _add_main_widget(self) -> None:
         self._main_widget = QLineEdit()

bec_widgets/utils/fuzzy_search.py

@@ -1,35 +0,0 @@
-"""Module providing fuzzy search utilities for the BEC widgets."""
-
-from __future__ import annotations
-
-from typing import Any
-
-from thefuzz import fuzz
-
-FUZZY_SEARCH_THRESHOLD = 80
-
-
-def is_match(
-    text: str, row_data: dict[str, Any], relevant_keys: list[str], enable_fuzzy: bool
-) -> bool:
-    """
-    Check if the text matches any of the relevant keys in the row data.
-
-    Args:
-        text (str): The text to search for.
-        row_data (dict[str, Any]): The row data to search in.
-        relevant_keys (list[str]): The keys to consider for searching.
-        enable_fuzzy (bool): Whether to use fuzzy matching.
-    Returns:
-        bool: True if a match is found, False otherwise.
-    """
-    for key in relevant_keys:
-        data = str(row_data.get(key, "") or "")
-        if enable_fuzzy:
-            match_ratio = fuzz.partial_ratio(text.lower(), data.lower())
-            if match_ratio >= FUZZY_SEARCH_THRESHOLD:
-                return True
-        else:
-            if text.lower() in data.lower():
-                return True
-    return False

bec_widgets/utils/guided_tour.py

@@ -4,7 +4,7 @@ from __future__ import annotations
 
 import sys
 import weakref
-from typing import Callable, Dict, List, Literal, TypedDict
+from typing import Callable, Dict, List, TypedDict
 from uuid import uuid4
 
 import louie
@@ -12,18 +12,15 @@ from bec_lib.logger import bec_logger
 from bec_qthemes import material_icon
 from louie import saferef
 from qtpy.QtCore import QEvent, QObject, QRect, Qt, Signal
-from qtpy.QtGui import QAction, QColor, QKeySequence, QPainter, QPen, QShortcut
+from qtpy.QtGui import QAction, QColor, QPainter, QPen
 from qtpy.QtWidgets import (
-    QAbstractItemView,
     QApplication,
     QFrame,
     QHBoxLayout,
     QLabel,
     QMainWindow,
-    QMenu,
     QMenuBar,
     QPushButton,
-    QTableWidgetItem,
     QToolBar,
     QVBoxLayout,
     QWidget,
@@ -43,9 +40,9 @@ class TourStep(TypedDict):
     widget_ref: (
         louie.saferef.BoundMethodWeakref
         | weakref.ReferenceType[
-            QWidget | QAction | QRect | Callable[[], tuple[QWidget | QAction | QRect, str | None]]
+            QWidget | QAction | Callable[[], tuple[QWidget | QAction, str | None]]
         ]
-        | Callable[[], tuple[QWidget | QAction | QRect, str | None]]
+        | Callable[[], tuple[QWidget | QAction, str | None]]
         | None
     )
     text: str
@@ -67,13 +64,15 @@ class TutorialOverlay(QWidget):
         box = QFrame(self)
         app = QApplication.instance()
         bg_color = app.palette().window().color()
-        box.setStyleSheet(f"""
+        box.setStyleSheet(
+            f"""
             QFrame {{
                 background-color: {bg_color.name()};
                 border-radius: 8px;
                 padding: 8px;
             }}
-        """)
+        """
+        )
         layout = QVBoxLayout(box)
 
         # Top layout with close button (left) and step indicator (right)
@@ -104,12 +103,10 @@ class TutorialOverlay(QWidget):
         # Back button with material icon
         self.back_btn = QPushButton("Back")
         self.back_btn.setIcon(material_icon("arrow_back"))
-        self.back_btn.setToolTip("Press Backspace to go back")
 
         # Next button with material icon
         self.next_btn = QPushButton("Next")
         self.next_btn.setIcon(material_icon("arrow_forward"))
-        self.next_btn.setToolTip("Press Enter to continue")
 
         btn_layout.addStretch()
         btn_layout.addWidget(self.back_btn)
@@ -118,15 +115,6 @@ class TutorialOverlay(QWidget):
         layout.addLayout(top_layout)
         layout.addWidget(self.label)
         layout.addLayout(btn_layout)
-
-        # Escape closes the tour
-        QShortcut(QKeySequence(Qt.Key.Key_Escape), self, activated=self.close_btn.click)
-        # Enter and Return activates the next button
-        QShortcut(QKeySequence(Qt.Key.Key_Return), self, activated=self.next_btn.click)
-        QShortcut(QKeySequence(Qt.Key.Key_Enter), self, activated=self.next_btn.click)
-        # Map Backspace to the back button
-        QShortcut(QKeySequence(Qt.Key.Key_Backspace), self, activated=self.back_btn.click)
-
         return box
 
     def paintEvent(self, event):  # pylint: disable=unused-argument
@@ -235,9 +223,6 @@ class TutorialOverlay(QWidget):
         self.message_box.show()
         self.update()
 
-        # Update the focus policy of the buttons
-        self.back_btn.setEnabled(current_step > 1)
-
     def eventFilter(self, obj, event):
         if event.type() == QEvent.Type.Resize:
             self.setGeometry(obj.rect())
@@ -277,9 +262,7 @@ class GuidedTour(QObject):
     def register_widget(
         self,
         *,
-        widget: (
-            QWidget | QAction | QRect | Callable[[], tuple[QWidget | QAction | QRect, str | None]]
-        ),
+        widget: QWidget | QAction | Callable[[], tuple[QWidget | QAction, str | None]],
         text: str = "",
         title: str = "",
     ) -> str:
@@ -287,7 +270,7 @@ class GuidedTour(QObject):
         Register a widget with help text for tours.
 
         Args:
-            widget (QWidget | QAction | QRect | Callable[[], tuple[QWidget | QAction | QRect, str | None]]): The target widget or a callable that returns the widget and its help text.
+            widget (QWidget | QAction | Callable[[], tuple[QWidget | QAction, str | None]]): The target widget or a callable that returns the widget and its help text.
             text (str): The help text for the widget. This will be shown during the tour.
             title (str, optional): A title for the widget (defaults to its class name or action text).
 
@@ -310,9 +293,6 @@ class GuidedTour(QObject):
 
             widget_ref = _resolve_toolbar_button
             default_title = getattr(widget, "tooltip", "Toolbar Menu")
-        elif isinstance(widget, QRect):
-            widget_ref = widget
-            default_title = "Area"
         else:
             widget_ref = saferef.safe_ref(widget)
             default_title = widget.__class__.__name__ if hasattr(widget, "__class__") else "Widget"
@@ -347,14 +327,11 @@ class GuidedTour(QObject):
             if mb and mb not in menubars:
                 menubars.append(mb)
         menubars += [mb for mb in mw.findChildren(QMenuBar) if mb not in menubars]
-        menubars += [mb for mb in mw.findChildren(QMenu) if mb not in menubars]
-
         for mb in menubars:
             if action in mb.actions():
                 ar = mb.actionGeometry(action)
                 top_left = mb.mapTo(mw, ar.topLeft())
                 return QRect(top_left, ar.size())
-
         return None
 
     def unregister_widget(self, step_id: str) -> bool:
@@ -475,9 +452,9 @@ class GuidedTour(QObject):
 
         if self._current_index > 0:
             self._current_index -= 1
-            self._show_current_step(direction="prev")
+            self._show_current_step()
 
-    def _show_current_step(self, direction: Literal["next"] | Literal["prev"] = "next"):
+    def _show_current_step(self):
         """Display the current step."""
         if not self._active or not self.overlay:
             return
@@ -487,9 +464,7 @@ class GuidedTour(QObject):
 
         target, step_text = self._resolve_step_target(step)
         if target is None:
-            self._advance_past_invalid_step(
-                step_title, reason="Step target no longer exists.", direction=direction
-            )
+            self._advance_past_invalid_step(step_title, reason="Step target no longer exists.")
             return
 
         main_window = self.main_window
@@ -498,9 +473,7 @@ class GuidedTour(QObject):
             self.stop_tour()
             return
 
-        highlight_rect = self._get_highlight_rect(
-            main_window, target, step_title, direction=direction
-        )
+        highlight_rect = self._get_highlight_rect(main_window, target, step_title)
         if highlight_rect is None:
             return
 
@@ -510,6 +483,9 @@ class GuidedTour(QObject):
 
         self.overlay.show_step(highlight_rect, step_title, step_text, current_step, total_steps)
 
+        # Update button states
+        self.overlay.back_btn.setEnabled(self._current_index > 0)
+
         # Update next button text and state
         is_last_step = self._current_index >= len(self._tour_steps) - 1
         if is_last_step:
@@ -523,7 +499,7 @@ class GuidedTour(QObject):
 
         self.step_changed.emit(self._current_index + 1, len(self._tour_steps))
 
-    def _resolve_step_target(self, step: TourStep) -> tuple[QWidget | QAction | QRect | None, str]:
+    def _resolve_step_target(self, step: TourStep) -> tuple[QWidget | QAction | None, str]:
         """
         Resolve the target widget/action for the given step.
 
@@ -531,7 +507,7 @@ class GuidedTour(QObject):
             step(TourStep): The tour step to resolve.
 
         Returns:
-            tuple[QWidget | QAction | QRect | None, str]: The resolved target, optional QRect, and the step text.
+            tuple[QWidget | QAction | None, str]: The resolved target and the step text.
         """
         widget_ref = step.get("widget_ref")
         step_text = step.get("text", "")
@@ -544,7 +520,7 @@ class GuidedTour(QObject):
         if target is None:
             return None, step_text
 
-        if callable(target) and not isinstance(target, (QWidget, QAction, QRect)):
+        if callable(target) and not isinstance(target, (QWidget, QAction)):
             result = target()
             if isinstance(result, tuple):
                 target, alt_text = result
@@ -556,11 +532,7 @@ class GuidedTour(QObject):
         return target, step_text
 
     def _get_highlight_rect(
-        self,
-        main_window: QWidget,
-        target: QWidget | QAction | QRect,
-        step_title: str,
-        direction: Literal["next"] | Literal["prev"] = "next",
+        self, main_window: QWidget, target: QWidget | QAction, step_title: str
     ) -> QRect | None:
         """
         Get the QRect in main_window coordinates to highlight for the given target.
@@ -573,15 +545,12 @@ class GuidedTour(QObject):
         Returns:
             QRect | None: The rectangle to highlight, or None if not found/visible.
         """
-        if isinstance(target, QRect):
-            return target
         if isinstance(target, QAction):
             rect = self._action_highlight_rect(target)
             if rect is None:
                 self._advance_past_invalid_step(
                     step_title,
                     reason=f"Could not find visible widget or menu for QAction {target.text()!r}.",
-                    direction=direction,
                 )
                 return None
             return rect
@@ -590,60 +559,28 @@ class GuidedTour(QObject):
             if self._visible_check:
                 if not target.isVisible():
                     self._advance_past_invalid_step(
-                        step_title, reason=f"Widget {target!r} is not visible.", direction=direction
+                        step_title, reason=f"Widget {target!r} is not visible."
                     )
                     return None
             rect = target.rect()
             top_left = target.mapTo(main_window, rect.topLeft())
             return QRect(top_left, rect.size())
 
-        if isinstance(target, QTableWidgetItem):
-            # NOTE: On header items (which are also QTableWidgetItems), this does not work,
-            # Header items are just used as data containers by Qt, thus, we have to directly
-            # pass the QRect through the method (+ make sure the appropriate header section
-            # is visible). This can be handled in the callable method.)
-            table = target.tableWidget()
-
-            if self._visible_check:
-                if not table.isVisible():
-                    self._advance_past_invalid_step(
-                        step_title,
-                        reason=f"Table widget {table!r} is not visible.",
-                        direction=direction,
-                    )
-                    return None
-
-            # Table item
-            if table.item(target.row(), target.column()) == target:
-                table.scrollToItem(target, QAbstractItemView.ScrollHint.PositionAtCenter)
-                rect = table.visualItemRect(target)
-                top_left = table.viewport().mapTo(main_window, rect.topLeft())
-                return QRect(top_left, rect.size())
-
         self._advance_past_invalid_step(
-            step_title, reason=f"Unsupported step target type: {type(target)}", direction=direction
+            step_title, reason=f"Unsupported step target type: {type(target)}"
         )
         return None
 
-    def _advance_past_invalid_step(
-        self, step_title: str, *, reason: str, direction: Literal["next"] | Literal["prev"] = "next"
-    ):
+    def _advance_past_invalid_step(self, step_title: str, *, reason: str):
         """
         Skip the current step (or stop the tour) when the target cannot be visualised.
         """
-        logger.warning(f"{reason} Skipping step {step_title!r}.")
-        if direction == "next":
-            if self._current_index < len(self._tour_steps) - 1:
-                self._current_index += 1
-                self._show_current_step()
-            else:
-                self.stop_tour()
-        elif direction == "prev":
-            if self._current_index > 0:
-                self._current_index -= 1
-                self._show_current_step(direction="prev")
-            else:
-                self.stop_tour()
+        logger.warning("%s Skipping step %r.", reason, step_title)
+        if self._current_index < len(self._tour_steps) - 1:
+            self._current_index += 1
+            self._show_current_step()
+        else:
+            self.stop_tour()
 
     def get_registered_widgets(self) -> Dict[str, TourStep]:
         """Get all registered widgets."""
@@ -726,33 +663,8 @@ class MainWindow(QMainWindow):  # pragma: no cover
             title="Tools Menu",
         )
 
-        sub_menu_action = self.tools_menu_actions["notes"].action
-
-        def get_sub_menu_action():
-            # open the tools menu
-            menu_button = self.tools_menu_action._button_ref()
-            if menu_button:
-                menu_button.showMenu()
-
-            return (
-                self.tools_menu_action.actions["notes"].action,
-                "This action allows you to add notes.",
-            )
-
-        sub_menu = self.guided_help.register_widget(
-            widget=get_sub_menu_action,
-            text="This is a sub-action within the tools menu.",
-            title="Add Note Action",
-        )
-
         # Create tour from registered widgets
-        self.tour_step_ids = [
-            sub_menu,
-            primary_step,
-            secondary_step,
-            toolbar_action_step,
-            tools_menu_step,
-        ]
+        self.tour_step_ids = [primary_step, secondary_step, toolbar_action_step, tools_menu_step]
         widget_ids = self.tour_step_ids
         self.guided_help.create_tour(widget_ids)
 

bec_widgets/utils/help_inspector/help_inspector.py

@@ -129,7 +129,7 @@ class HelpInspector(BECWidget, QtWidgets.QWidget):
                 # TODO check what happens if the HELP Inspector itself is embedded in another BECWidget
                 # I suppose we would like to get the first ancestor that is a BECWidget, not the topmost one
                 if not isinstance(widget, BECWidget):
-                    widget = WidgetHierarchy.get_becwidget_ancestor(widget)
+                    widget = WidgetHierarchy._get_becwidget_ancestor(widget)
                 if widget:
                     if widget is self:
                         self._toggle_mode(False)

bec_widgets/utils/ophyd_kind_util.py

@@ -15,7 +15,7 @@ class Kind(IFBase):
     """
     This is used in the .kind attribute of all OphydObj (Signals, Devices).
 
-    A Device examines its components' .kind attribute to decide whether to
+    A Device examines its components' .kind atttribute to decide whether to
     traverse it in read(), read_configuration(), or neither. Additionally, if
     decides whether to include its name in `hints['fields']`.
     """

bec_widgets/utils/plugin_templates/plugin.template

@@ -22,7 +22,7 @@ class {plugin_name_pascal}Plugin(QDesignerCustomWidgetInterface):  # pragma: no
 
     def createWidget(self, parent):
         if parent is None:
-            return QWidget()
+           return QWidget()
         t = {plugin_name_pascal}(parent)
         return t
 

bec_widgets/utils/plugin_utils.py

@@ -7,9 +7,9 @@ from dataclasses import dataclass
 from typing import TYPE_CHECKING, Iterable
 
 from bec_lib.plugin_helper import _get_available_plugins
-from qtpy.QtWidgets import QWidget
+from qtpy.QtWidgets import QGraphicsWidget, QWidget
 
-from bec_widgets.utils.bec_connector import BECConnector
+from bec_widgets.utils import BECConnector
 from bec_widgets.utils.bec_widget import BECWidget
 
 if TYPE_CHECKING:  # pragma: no cover
@@ -166,17 +166,18 @@ class BECClassContainer:
         return [info.obj for info in self.collection]
 
 
-def _collect_classes_from_package(repo_name: str, package: str) -> BECClassContainer:
-    """Collect classes from a package subtree (for example ``widgets`` or ``applications``)."""
-    collection = BECClassContainer()
-    try:
-        anchor_module = importlib.import_module(f"{repo_name}.{package}")
-    except ModuleNotFoundError as exc:
-        # Some plugin repositories expose only one subtree. Skip gracefully if it does not exist.
-        if exc.name == f"{repo_name}.{package}":
-            return collection
-        raise
+def get_custom_classes(repo_name: str) -> BECClassContainer:
+    """
+    Get all RPC-enabled classes in the specified repository.
 
+    Args:
+        repo_name(str): The name of the repository.
+
+    Returns:
+        dict: A dictionary with keys "connector_classes" and "top_level_classes" and values as lists of classes.
+    """
+    collection = BECClassContainer()
+    anchor_module = importlib.import_module(f"{repo_name}.widgets")
     directory = os.path.dirname(anchor_module.__file__)
     for root, _, files in sorted(os.walk(directory)):
         for file in files:
@@ -184,13 +185,13 @@ def _collect_classes_from_package(repo_name: str, package: str) -> BECClassConta
                 continue
 
             path = os.path.join(root, file)
-            rel_dir = os.path.dirname(os.path.relpath(path, directory))
-            if rel_dir in ("", "."):
+            subs = os.path.dirname(os.path.relpath(path, directory)).split("/")
+            if len(subs) == 1 and not subs[0]:
                 module_name = file.split(".")[0]
             else:
-                module_name = ".".join(rel_dir.split(os.sep) + [file.split(".")[0]])
+                module_name = ".".join(subs + [file.split(".")[0]])
 
-            module = importlib.import_module(f"{repo_name}.{package}.{module_name}")
+            module = importlib.import_module(f"{repo_name}.widgets.{module_name}")
 
             for name in dir(module):
                 obj = getattr(module, name)
@@ -202,30 +203,12 @@ def _collect_classes_from_package(repo_name: str, package: str) -> BECClassConta
                         class_info.is_connector = True
                     if issubclass(obj, QWidget) or issubclass(obj, BECWidget):
                         class_info.is_widget = True
+                    if len(subs) == 1 and (
+                        issubclass(obj, QWidget) or issubclass(obj, QGraphicsWidget)
+                    ):
+                        class_info.is_top_level = True
                     if hasattr(obj, "PLUGIN") and obj.PLUGIN:
                         class_info.is_plugin = True
                     collection.add_class(class_info)
-    return collection
-
-
-def get_custom_classes(
-    repo_name: str, packages: tuple[str, ...] | None = None
-) -> BECClassContainer:
-    """
-    Get all relevant classes for RPC/CLI in the specified repository.
-
-    By default, discovery is limited to ``<repo>.widgets`` for backward compatibility.
-    Additional package subtrees (for example ``applications``) can be included explicitly.
-
-    Args:
-        repo_name(str): The name of the repository.
-        packages(tuple[str, ...] | None): Optional tuple of package names to scan. Defaults to ("widgets",) for backward compatibility.
-
-    Returns:
-        BECClassContainer: Container with collected class information.
-    """
-    selected_packages = packages or ("widgets",)
-    collection = BECClassContainer()
-    for package in selected_packages:
-        collection += _collect_classes_from_package(repo_name, package)
+
     return collection

bec_widgets/utils/reference_utils.py

@@ -1,6 +1,5 @@
 import os
 import sys
-from typing import Any
 
 from PIL import Image, ImageChops
 from qtpy.QtGui import QPixmap
@@ -41,7 +40,7 @@ def compare_images(image1_path: str, reference_image_path: str):
         raise ValueError("Images are different")
 
 
-def snap_and_compare(widget: Any, output_directory: str, suffix: str = ""):
+def snap_and_compare(widget: any, output_directory: str, suffix: str = ""):
     """
     Save a rendering of a widget and compare it to a reference image
 

bec_widgets/utils/round_frame.py

@@ -69,11 +69,13 @@ class RoundedFrame(QFrame):
         """
         Update the style of the frame based on the background color.
         """
-        self.setStyleSheet(f"""
+        self.setStyleSheet(
+            f"""
                 QFrame#roundedFrame {{
                     border-radius: {self._radius}px;
                 }}
-            """)
+            """
+        )
         self.apply_plot_widget_style()
 
     def apply_plot_widget_style(self, border: str = "none"):

bec_widgets/utils/rpc_server.py

@@ -1,27 +1,25 @@
 from __future__ import annotations
 
 import functools
+import time
 import traceback
 import types
 from contextlib import contextmanager
-from typing import TYPE_CHECKING, Callable, Literal, TypeVar
+from typing import TYPE_CHECKING, Callable, TypeVar
 
 from bec_lib.client import BECClient
 from bec_lib.endpoints import MessageEndpoints
 from bec_lib.logger import bec_logger
 from bec_lib.utils.import_utils import lazy_import
 from qtpy.QtCore import Qt, QTimer
-from qtpy.QtWidgets import QWidget
+from qtpy.QtWidgets import QApplication
 from redis.exceptions import RedisError
 
+from bec_widgets.cli.rpc.rpc_register import RPCRegister
+from bec_widgets.utils import BECDispatcher
 from bec_widgets.utils.bec_connector import BECConnector
-from bec_widgets.utils.bec_dispatcher import BECDispatcher
-from bec_widgets.utils.container_utils import WidgetContainerUtils
 from bec_widgets.utils.error_popups import ErrorPopupUtility
-from bec_widgets.utils.rpc_register import RPCRegister
-from bec_widgets.utils.screen_utils import apply_window_geometry
-from bec_widgets.widgets.containers.dock_area.dock_area import BECDockArea
-from bec_widgets.widgets.containers.main_window.main_window import BECMainWindow, BECMainWindowNoRPC
+from bec_widgets.widgets.containers.main_window.main_window import BECMainWindow
 
 if TYPE_CHECKING:  # pragma: no cover
     from bec_lib import messages
@@ -34,10 +32,6 @@ logger = bec_logger.logger
 T = TypeVar("T")
 
 
-class RegistryNotReadyError(Exception):
-    """Raised when trying to access an object from the RPC registry that is not yet registered."""
-
-
 @contextmanager
 def rpc_exception_hook(err_func):
     """This context replaces the popup message box for error display with a specific hook"""
@@ -61,19 +55,6 @@ def rpc_exception_hook(err_func):
         popup.custom_exception_hook = old_exception_hook
 
 
-class SingleshotRPCRepeat:
-
-    def __init__(self, max_delay: int = 2000):
-        self.max_delay = max_delay
-        self.accumulated_delay = 0
-
-    def __iadd__(self, delay: int):
-        self.accumulated_delay += delay
-        if self.accumulated_delay > self.max_delay:
-            raise RegistryNotReadyError("Max delay exceeded for RPC singleshot repeat")
-        return self
-
-
 class RPCServer:
 
     client: BECClient
@@ -105,7 +86,6 @@ class RPCServer:
         self._heartbeat_timer.start(200)
         self._registry_update_callbacks = []
         self._broadcasted_data = {}
-        self._rpc_singleshot_repeats: dict[str, SingleshotRPCRepeat] = {}
 
         self.status = messages.BECStatus.RUNNING
         logger.success(f"Server started with gui_id: {self.gui_id}")
@@ -118,22 +98,18 @@ class RPCServer:
         logger.debug(f"Received RPC instruction: {msg}, metadata: {metadata}")
         with rpc_exception_hook(functools.partial(self.send_response, request_id, False)):
             try:
+                obj = self.get_object_from_config(msg["parameter"])
                 method = msg["action"]
                 args = msg["parameter"].get("args", [])
                 kwargs = msg["parameter"].get("kwargs", {})
-                if method.startswith("system."):
-                    res = self.run_system_rpc(method, args, kwargs)
-                else:
-                    obj = self.get_object_from_config(msg["parameter"])
-                    res = self.run_rpc(obj, method, args, kwargs)
+                res = self.run_rpc(obj, method, args, kwargs)
             except Exception:
                 content = traceback.format_exc()
                 logger.error(f"Error while executing RPC instruction: {content}")
                 self.send_response(request_id, False, {"error": content})
             else:
                 logger.debug(f"RPC instruction executed successfully: {res}")
-                self._rpc_singleshot_repeats[request_id] = SingleshotRPCRepeat()
-                QTimer.singleShot(0, lambda: self.serialize_result_and_send(request_id, res))
+                self.send_response(request_id, True, {"result": res})
 
     def send_response(self, request_id: str, accepted: bool, msg: dict):
         self.client.connector.set_and_publish(
@@ -156,7 +132,7 @@ class RPCServer:
             if method == "raise" and hasattr(
                 obj, "setWindowState"
             ):  # special case for raising windows, should work even if minimized
-                # this is a special case for raising windows for gnome on Red Hat (RHEL) 9 systems where changing focus is suppressed by default
+                # this is a special case for raising windows for gnome on rethat 9 systems where changing focus is supressed by default
                 # The procedure is as follows:
                 # 1. Get the current window state to check if the window is minimized and remove minimized flag
                 # 2. Then in order to force gnome to raise the window, we set the window to stay on top temporarily
@@ -181,149 +157,24 @@ class RPCServer:
                 obj.show()
                 res = None
             else:
-                target_obj, method_obj = self._resolve_rpc_target(obj, method)
+                method_obj = getattr(obj, method)
                 # check if the method accepts args and kwargs
                 if not callable(method_obj):
                     if not args:
                         res = method_obj
                     else:
-                        setattr(target_obj, method, args[0])
+                        setattr(obj, method, args[0])
                         res = None
                 else:
                     res = method_obj(*args, **kwargs)
-        return res
 
-    def _resolve_rpc_target(self, obj, method: str) -> tuple[object, object]:
-        """
-        Resolve a method/property access target for RPC execution.
-
-        Primary target is the object itself. If not found there and the class defines
-        ``RPC_CONTENT_CLASS``, unresolved method names can be delegated to the content
-        widget referenced by ``RPC_CONTENT_ATTR`` (default ``content``), but only when
-        the method is explicitly listed in the content class ``USER_ACCESS``.
-        """
-        if hasattr(obj, method):
-            return obj, getattr(obj, method)
-
-        content_cls = getattr(type(obj), "RPC_CONTENT_CLASS", None)
-        if content_cls is None:
-            raise AttributeError(f"{type(obj).__name__} has no attribute '{method}'")
-
-        content_user_access = set()
-        for entry in getattr(content_cls, "USER_ACCESS", []):
-            if entry.endswith(".setter"):
-                content_user_access.add(entry.split(".setter")[0])
-            else:
-                content_user_access.add(entry)
-
-        if method not in content_user_access:
-            raise AttributeError(f"{type(obj).__name__} has no attribute '{method}'")
-
-        content_attr = getattr(type(obj), "RPC_CONTENT_ATTR", "content")
-        target_obj = getattr(obj, content_attr, None)
-        if target_obj is None:
-            raise AttributeError(
-                f"{type(obj).__name__} has no content target '{content_attr}' for RPC delegation"
-            )
-        if not isinstance(target_obj, content_cls):
-            raise AttributeError(
-                f"{type(obj).__name__}.{content_attr} is not instance of {content_cls.__name__}"
-            )
-        if not hasattr(target_obj, method):
-            raise AttributeError(f"{content_cls.__name__} has no attribute '{method}'")
-        return target_obj, getattr(target_obj, method)
-
-    def run_system_rpc(self, method: str, args: list, kwargs: dict):
-        if method == "system.launch_dock_area":
-            return self._launch_dock_area(*args, **kwargs)
-        if method == "system.list_capabilities":
-            return {"system.launch_dock_area": True}
-        raise ValueError(f"Unknown system RPC method: {method}")
-
-    @staticmethod
-    def _launch_dock_area(
-        name: str | None = None,
-        geometry: tuple[int, int, int, int] | None = None,
-        startup_profile: str | Literal["restore", "skip"] | None = None,
-    ) -> QWidget | None:
-        from bec_widgets.applications import bw_launch
-
-        with RPCRegister.delayed_broadcast() as rpc_register:
-            existing_dock_areas = rpc_register.get_names_of_rpc_by_class_type(BECDockArea)
-            if name is not None:
-                WidgetContainerUtils.raise_for_invalid_name(name)
-                if name in existing_dock_areas:
-                    name = WidgetContainerUtils.generate_unique_name(name, existing_dock_areas)
-            else:
-                name = WidgetContainerUtils.generate_unique_name("dock_area", existing_dock_areas)
-
-            result_widget = bw_launch.dock_area(object_name=name, startup_profile=startup_profile)
-            result_widget.window().setWindowTitle(f"BEC - {name}")
-
-            if isinstance(result_widget, BECMainWindow):
-                apply_window_geometry(result_widget, geometry)
-                result_widget.show()
-            else:
-                window = BECMainWindowNoRPC()
-                window.setCentralWidget(result_widget)
-                window.setWindowTitle(f"BEC - {result_widget.objectName()}")
-                apply_window_geometry(window, geometry)
-                window.show()
-            return result_widget
-
-    def serialize_result_and_send(self, request_id: str, res: object):
-        """
-        Serialize the result of an RPC call and send it back to the client.
-
-        Note: If the object is not yet registered in the RPC registry, this method
-        will retry serialization after a short delay, up to a maximum delay. In order
-        to avoid processEvents calls in the middle of serialization, QTimer.singleShot is used.
-        This allows the target event to 'float' to the next event loop iteration until the
-        object is registered.
-        The 'jump' to the next event loop is indicated by raising a RegistryNotReadyError, see
-        _serialize_bec_connector.
-
-        Args:
-            request_id (str): The ID of the request.
-            res (object): The result of the RPC call.
-        """
-        retry_delay = 100
-        try:
             if isinstance(res, list):
                 res = [self.serialize_object(obj) for obj in res]
             elif isinstance(res, dict):
                 res = {key: self.serialize_object(val) for key, val in res.items()}
             else:
                 res = self.serialize_object(res)
-        except RegistryNotReadyError:
-            try:
-                self._rpc_singleshot_repeats[request_id] += retry_delay
-                QTimer.singleShot(
-                    retry_delay, lambda: self.serialize_result_and_send(request_id, res)
-                )
-            except RegistryNotReadyError:
-                logger.error(
-                    f"Max delay exceeded for RPC request {request_id}, sending error response"
-                )
-                self.send_response(
-                    request_id,
-                    False,
-                    {
-                        "error": f"Max delay exceeded for RPC request {request_id}, object not registered in time."
-                    },
-                )
-                self._rpc_singleshot_repeats.pop(request_id, None)
-            return
-        except Exception as exc:
-            logger.error(f"Error while serializing RPC result: {exc}")
-            self.send_response(
-                request_id,
-                False,
-                {"error": f"Error while serializing RPC result: {exc}\n{traceback.format_exc()}"},
-            )
-        else:
-            self.send_response(request_id, True, {"result": res})
-        self._rpc_singleshot_repeats.pop(request_id, None)
+            return res
 
     def serialize_object(self, obj: T) -> None | dict | T:
         """
@@ -340,9 +191,6 @@ class RPCServer:
         # Respect RPC = False
         if getattr(obj, "RPC", True) is False:
             return None
-        # Respect rpc_exposed = False
-        if getattr(obj, "rpc_exposed", True) is False:
-            return None
         return self._serialize_bec_connector(obj, wait=True)
 
     def emit_heartbeat(self) -> None:
@@ -371,8 +219,6 @@ class RPCServer:
                 continue
             if not getattr(val, "RPC", True):
                 continue
-            if not getattr(val, "rpc_exposed", True):
-                continue
             data[key] = self._serialize_bec_connector(val)
         if self._broadcasted_data == data:
             return
@@ -410,8 +256,11 @@ class RPCServer:
         except Exception:
             container_proxy = None
 
-        if wait and not self.rpc_register.object_is_registered(connector):
-            raise RegistryNotReadyError(f"Connector {connector} not registered yet")
+        if wait:
+            while not self.rpc_register.object_is_registered(connector):
+                QApplication.processEvents()
+                logger.info(f"Waiting for {connector} to be registered...")
+                time.sleep(0.1)
 
         widget_class = getattr(connector, "rpc_widget_class", None)
         if not widget_class:
@@ -423,9 +272,23 @@ class RPCServer:
             "widget_class": widget_class,
             "config": config_dict,
             "container_proxy": container_proxy,
-            "__rpc__": getattr(connector, "rpc_exposed", True),
+            "__rpc__": True,
         }
 
+    @staticmethod
+    def _get_becwidget_ancestor(widget: QObject) -> BECConnector | None:
+        """
+        Traverse up the parent chain to find the nearest BECConnector.
+        Returns None if none is found.
+        """
+
+        parent = widget.parent()
+        while parent is not None:
+            if isinstance(parent, BECConnector):
+                return parent
+            parent = parent.parent()
+        return None
+
     # Suppose clients register callbacks to receive updates
     def add_registry_update_callback(self, cb: Callable) -> None:
         """
@@ -442,5 +305,5 @@ class RPCServer:
         self.status = messages.BECStatus.IDLE
         self._heartbeat_timer.stop()
         self.emit_heartbeat()
-        logger.info("Succeeded in shutting down CLI server")
+        logger.info("Succeded in shutting down CLI server")
         self.client.shutdown()

bec_widgets/utils/screen_utils.py

@@ -1,100 +0,0 @@
-from __future__ import annotations
-
-from typing import TYPE_CHECKING
-
-from qtpy.QtWidgets import QApplication, QWidget
-
-if TYPE_CHECKING:  # pragma: no cover
-    from qtpy.QtCore import QRect
-
-
-def available_screen_geometry(*, widget: QWidget | None = None) -> QRect | None:
-    """
-    Get the available geometry of the screen associated with the given widget or application.
-
-    Args:
-        widget(QWidget | None): The widget to get the screen from.
-    Returns:
-        QRect | None: The available geometry of the screen, or None if no screen is found.
-    """
-    screen = widget.screen() if widget is not None else None
-    if screen is None:
-        app = QApplication.instance()
-        screen = app.primaryScreen() if app is not None else None
-    if screen is None:
-        return None
-    return screen.availableGeometry()
-
-
-def centered_geometry(available: "QRect", width: int, height: int) -> tuple[int, int, int, int]:
-    """
-    Calculate centered geometry within the available rectangle.
-
-    Args:
-        available(QRect): The available rectangle to center within.
-        width(int): The desired width.
-        height(int): The desired height.
-
-    Returns:
-        tuple[int, int, int, int]: The (x, y, width, height) of the centered geometry.
-    """
-    x = available.x() + (available.width() - width) // 2
-    y = available.y() + (available.height() - height) // 2
-    return x, y, width, height
-
-
-def centered_geometry_for_app(width: int, height: int) -> tuple[int, int, int, int] | None:
-    available = available_screen_geometry()
-    if available is None:
-        return None
-    return centered_geometry(available, width, height)
-
-
-def scaled_centered_geometry_for_window(
-    window: QWidget, *, width_ratio: float = 0.8, height_ratio: float = 0.8
-) -> tuple[int, int, int, int] | None:
-    available = available_screen_geometry(widget=window)
-    if available is None:
-        return None
-    width = int(available.width() * width_ratio)
-    height = int(available.height() * height_ratio)
-    return centered_geometry(available, width, height)
-
-
-def apply_window_geometry(
-    window: QWidget,
-    geometry: tuple[int, int, int, int] | None,
-    *,
-    width_ratio: float = 0.8,
-    height_ratio: float = 0.8,
-) -> None:
-    if geometry is not None:
-        window.setGeometry(*geometry)
-        return
-    default_geometry = scaled_centered_geometry_for_window(
-        window, width_ratio=width_ratio, height_ratio=height_ratio
-    )
-    if default_geometry is not None:
-        window.setGeometry(*default_geometry)
-    else:
-        window.resize(window.minimumSizeHint())
-
-
-def main_app_size_for_screen(available: "QRect") -> tuple[int, int]:
-    height = int(available.height() * 0.9)
-    width = int(height * (16 / 9))
-    if width > available.width() * 0.9:
-        width = int(available.width() * 0.9)
-        height = int(width / (16 / 9))
-    return width, height
-
-
-def apply_centered_size(
-    window: QWidget, width: int, height: int, *, available: "QRect" | None = None
-) -> None:
-    if available is None:
-        available = available_screen_geometry(widget=window)
-    if available is None:
-        window.resize(width, height)
-        return
-    window.setGeometry(*centered_geometry(available, width, height))

bec_widgets/utils/toolbars/actions.py

@@ -26,7 +26,6 @@ from qtpy.QtWidgets import (
 )
 
 import bec_widgets
-from bec_widgets.utils.toolbars.splitter import ResizableSpacer
 from bec_widgets.widgets.control.device_input.base_classes.device_input_base import BECDeviceFilter
 from bec_widgets.widgets.control.device_input.device_combobox.device_combobox import DeviceComboBox
 
@@ -35,19 +34,16 @@ logger = bec_logger.logger
 MODULE_PATH = os.path.dirname(bec_widgets.__file__)
 
 
-def create_action_with_text(toolbar_action, toolbar: QToolBar, min_size: QSize | None = None):
+def create_action_with_text(toolbar_action, toolbar: QToolBar):
     """
     Helper function to create a toolbar button with text beside or under the icon.
 
     Args:
         toolbar_action(ToolBarAction): The toolbar action to create the button for.
         toolbar(ModularToolBar): The toolbar to add the button to.
-        min_size(QSize, optional): The minimum size for the button. Defaults to None.
     """
 
     btn = QToolButton(parent=toolbar)
-    if min_size is not None:
-        btn.setMinimumSize(min_size)
     if getattr(toolbar_action, "label_text", None):
         toolbar_action.action.setText(toolbar_action.label_text)
     if getattr(toolbar_action, "tooltip", None):
@@ -502,82 +498,6 @@ class WidgetAction(ToolBarAction):
         return max_width + 60
 
 
-class SplitterAction(ToolBarAction):
-    """
-    Action for adding a draggable splitter/spacer to the toolbar.
-
-    This creates a resizable spacer that allows users to control how much space
-    is allocated to toolbar sections before and after it. When dragged, it expands/contracts,
-    pushing other toolbar elements left or right.
-
-    Args:
-        orientation (Literal["horizontal", "vertical", "auto"]): The orientation of the splitter.
-        parent (QWidget): The parent widget.
-        initial_width (int): Fixed size of the spacer in pixels along the toolbar's orientation (default: 20).
-        min_width (int | None): Minimum size of the target widget along the orientation axis (width for horizontal, height for vertical). If ``None``, no minimum constraint is applied.
-        max_width (int | None): Maximum size of the target widget along the orientation axis (width for horizontal, height for vertical). If ``None``, no maximum constraint is applied.
-        target_widget (QWidget | None): Widget whose size (width or height, depending on orientation) is controlled by the spacer within the given min/max bounds.
-    """
-
-    def __init__(
-        self,
-        orientation: Literal["horizontal", "vertical", "auto"] = "auto",
-        parent=None,
-        initial_width=20,
-        min_width: int | None = None,
-        max_width: int | None = None,
-        target_widget=None,
-    ):
-        super().__init__(icon_path=None, tooltip="Drag to resize toolbar sections", checkable=False)
-        self.orientation = orientation
-        self.initial_width = initial_width
-        self.min_width = min_width
-        self.max_width = max_width
-        self._splitter_widget = None
-        self._target_widget = target_widget
-
-    def _resolve_orientation(self, toolbar: QToolBar) -> Literal["horizontal", "vertical"]:
-        if self.orientation in (None, "auto"):
-            return (
-                "horizontal" if toolbar.orientation() == Qt.Orientation.Horizontal else "vertical"
-            )
-        return self.orientation
-
-    def set_target_widget(self, widget):
-        """Set the target widget after creation."""
-        self._target_widget = widget
-        if self._splitter_widget:
-            self._splitter_widget.set_target_widget(widget)
-
-    def add_to_toolbar(self, toolbar: QToolBar, target: QWidget):
-        """
-        Adds the splitter/spacer to the toolbar.
-
-        Args:
-            toolbar (QToolBar): The toolbar to add the splitter to.
-            target (QWidget): The target widget for the action.
-        """
-
-        effective_orientation = self._resolve_orientation(toolbar)
-        self._splitter_widget = ResizableSpacer(
-            parent=target,
-            orientation=effective_orientation,
-            initial_width=self.initial_width,
-            min_target_size=self.min_width,
-            max_target_size=self.max_width,
-            target_widget=self._target_widget,
-        )
-        toolbar.addWidget(self._splitter_widget)
-        self.action = self._splitter_widget  # type: ignore
-
-    def cleanup(self):
-        """Clean up the splitter widget."""
-        if self._splitter_widget is not None:
-            self._splitter_widget.close()
-            self._splitter_widget.deleteLater()
-        return super().cleanup()
-
-
 class ExpandableMenuAction(ToolBarAction):
     """
     Action for an expandable menu in the toolbar.
@@ -602,14 +522,16 @@ class ExpandableMenuAction(ToolBarAction):
             button.setIcon(QIcon(self.icon_path))
         button.setText(self.tooltip)
         button.setPopupMode(QToolButton.ToolButtonPopupMode.InstantPopup)
-        button.setStyleSheet("""
+        button.setStyleSheet(
+            """
                    QToolButton {
                        font-size: 14px;
                    }
                    QMenu {
                        font-size: 14px;
                    }
-               """)
+               """
+        )
         menu = QMenu(button)
         for action_container in self.actions.values():
             action: QAction = action_container.action

bec_widgets/utils/toolbars/bundles.py

@@ -7,17 +7,10 @@ from weakref import ReferenceType
 import louie
 from bec_lib.logger import bec_logger
 from pydantic import BaseModel
-from qtpy.QtCore import Qt
-from qtpy.QtWidgets import QSizePolicy
 
-from bec_widgets.utils.toolbars.actions import SeparatorAction, SplitterAction, ToolBarAction
-
-DEFAULT_SIZE = 400
-MAX_SIZE = 10_000_000
+from bec_widgets.utils.toolbars.actions import SeparatorAction, ToolBarAction
 
 if TYPE_CHECKING:
-    from qtpy.QtWidgets import QWidget
-
     from bec_widgets.utils.toolbars.connections import BundleConnection
     from bec_widgets.utils.toolbars.toolbar import ModularToolBar
 
@@ -202,84 +195,6 @@ class ToolbarBundle:
         """
         self.add_action("separator")
 
-    def add_splitter(
-        self,
-        name: str = "splitter",
-        target_widget: QWidget | None = None,
-        initial_width: int = 10,
-        min_width: int | None = None,
-        max_width: int | None = None,
-        size_policy_expanding: bool = True,
-    ):
-        """
-        Adds a resizable splitter action to the bundle.
-
-        Args:
-            name (str): Unique identifier for the splitter action.
-            target_widget (QWidget, optional): The widget whose size (width for horizontal,
-                height for vertical orientation) will be controlled by the splitter. If None,
-                the splitter will not control any widget.
-            initial_width (int): The initial size of the splitter (width for horizontal,
-                height for vertical orientation).
-            min_width (int, optional): The minimum size the target widget can be resized to
-                (width for horizontal, height for vertical orientation). If None, the target
-                widget's minimum size hint in that orientation will be used.
-            max_width (int, optional): The maximum size the target widget can be resized to
-                (width for horizontal, height for vertical orientation). If None, the target
-                widget's maximum size hint in that orientation will be used.
-            size_policy_expanding (bool): If True, the size policy of the target_widget will be
-                set to Expanding in the appropriate orientation if it is not already set.
-        """
-
-        # Resolve effective bounds
-        eff_min = min_width if min_width is not None else None
-        eff_max = max_width if max_width is not None else None
-
-        is_horizontal = self.components.toolbar.orientation() == Qt.Orientation.Horizontal
-
-        if target_widget is not None:
-            # Use widget hints if bounds not provided
-            if eff_min is None:
-                eff_min = (
-                    target_widget.minimumWidth() if is_horizontal else target_widget.minimumHeight()
-                ) or 6
-            if eff_max is None:
-                mw = (
-                    target_widget.maximumWidth() if is_horizontal else target_widget.maximumHeight()
-                )
-                eff_max = mw if mw and mw < MAX_SIZE else DEFAULT_SIZE  # avoid "no limit"
-
-            # Adjust size policy if needed
-            if size_policy_expanding:
-                size_policy = target_widget.sizePolicy()
-
-                if is_horizontal:
-                    if size_policy.horizontalPolicy() not in (
-                        QSizePolicy.Policy.Expanding,
-                        QSizePolicy.Policy.MinimumExpanding,
-                    ):
-                        size_policy.setHorizontalPolicy(QSizePolicy.Policy.Expanding)
-                        target_widget.setSizePolicy(size_policy)
-                else:
-                    if size_policy.verticalPolicy() not in (
-                        QSizePolicy.Policy.Expanding,
-                        QSizePolicy.Policy.MinimumExpanding,
-                    ):
-                        size_policy.setVerticalPolicy(QSizePolicy.Policy.Expanding)
-                        target_widget.setSizePolicy(size_policy)
-
-        splitter_action = SplitterAction(
-            orientation="auto",
-            parent=self.components.toolbar,
-            initial_width=initial_width,
-            min_width=eff_min,
-            max_width=eff_max,
-            target_widget=target_widget,
-        )
-
-        self.components.add_safe(name, splitter_action)
-        self.add_action(name)
-
     def add_connection(self, name: str, connection):
         """
         Adds a connection to the bundle.

bec_widgets/utils/toolbars/connections.py

@@ -1,136 +1,18 @@
 from __future__ import annotations
 
 from abc import abstractmethod
-from typing import Callable
 
-from bec_lib.logger import bec_logger
 from qtpy.QtCore import QObject
 
-logger = bec_logger.logger
-
 
 class BundleConnection(QObject):
-    """
-    Base class for toolbar bundle connections.
-
-    Provides infrastructure for bidirectional property-toolbar synchronization:
-    - Toolbar actions → Widget properties (via action.triggered connections)
-    - Widget properties → Toolbar actions (via property_changed signal)
-    """
-
     bundle_name: str
 
-    def __init__(self, parent=None):
-        super().__init__(parent)
-        self._property_sync_methods: dict[str, Callable] = {}
-        self._property_sync_connected = False
-
-    def register_property_sync(self, prop_name: str, sync_method: Callable):
-        """
-        Register a method to synchronize toolbar state when a property changes.
-
-        This enables automatic toolbar updates when properties are set programmatically,
-        restored from QSettings, or changed via RPC.
-
-        Args:
-            prop_name: The property name to watch (e.g., "fft", "log", "x_grid")
-            sync_method: Method to call when property changes. Should accept the new value
-                        and update toolbar state (typically with signals blocked to prevent loops)
-
-        Example:
-            def _sync_fft_toolbar(self, value: bool):
-                self.fft_action.blockSignals(True)
-                self.fft_action.setChecked(value)
-                self.fft_action.blockSignals(False)
-
-            self.register_property_sync("fft", self._sync_fft_toolbar)
-        """
-        self._property_sync_methods[prop_name] = sync_method
-
-    def _resolve_action(self, action_like):
-        if hasattr(action_like, "action"):
-            return action_like.action
-        return action_like
-
-    def register_checked_action_sync(self, prop_name: str, action_like):
-        """
-        Register a property sync for a checkable QAction (or wrapper with .action).
-
-        This reduces boilerplate for simple boolean → checked state updates.
-        """
-        qt_action = self._resolve_action(action_like)
-
-        def _sync_checked(value):
-            qt_action.blockSignals(True)
-            try:
-                qt_action.setChecked(bool(value))
-            finally:
-                qt_action.blockSignals(False)
-
-        self.register_property_sync(prop_name, _sync_checked)
-
-    def connect_property_sync(self, target_widget):
-        """
-        Connect to target widget's property_changed signal for automatic toolbar sync.
-
-        Call this in your connect() method after registering all property syncs.
-
-        Args:
-            target_widget: The widget to monitor for property changes
-        """
-        if self._property_sync_connected:
-            return
-
-        if hasattr(target_widget, "property_changed"):
-            target_widget.property_changed.connect(self._on_property_changed)
-            self._property_sync_connected = True
-        else:
-            logger.warning(
-                f"{target_widget.__class__.__name__} does not have property_changed signal. "
-                "Property-toolbar sync will not work."
-            )
-
-    def disconnect_property_sync(self, target_widget):
-        """
-        Disconnect from target widget's property_changed signal.
-
-        Call this in your disconnect() method.
-
-        Args:
-            target_widget: The widget to stop monitoring
-        """
-        if not self._property_sync_connected:
-            return
-
-        if hasattr(target_widget, "property_changed"):
-            try:
-                target_widget.property_changed.disconnect(self._on_property_changed)
-            except (RuntimeError, TypeError):
-                # Signal already disconnected or connection doesn't exist
-                pass
-            self._property_sync_connected = False
-
-    def _on_property_changed(self, prop_name: str, value):
-        """
-        Internal handler for property changes.
-
-        Calls the registered sync method for the changed property.
-        """
-        if prop_name in self._property_sync_methods:
-            try:
-                self._property_sync_methods[prop_name](value)
-            except Exception as e:
-                logger.error(
-                    f"Error syncing toolbar for property '{prop_name}': {e}", exc_info=True
-                )
-
     @abstractmethod
     def connect(self):
         """
         Connects the bundle to the target widget or application.
         This method should be implemented by subclasses to define how the bundle interacts with the target.
-
-        Subclasses should call connect_property_sync(target_widget) if property sync is needed.
         """
 
     @abstractmethod
@@ -138,6 +20,4 @@ class BundleConnection(QObject):
         """
         Disconnects the bundle from the target widget or application.
         This method should be implemented by subclasses to define how to clean up connections.
-
-        Subclasses should call disconnect_property_sync(target_widget) if property sync was connected.
         """

bec_widgets/utils/toolbars/splitter.py

@@ -1,239 +0,0 @@
-"""
-Draggable splitter for toolbars to allow resizing of toolbar sections.
-"""
-
-from typing import Literal
-
-from bec_qthemes import material_icon
-from qtpy.QtCore import QPoint, QSize, Qt, Signal
-from qtpy.QtGui import QPainter
-from qtpy.QtWidgets import QSizePolicy, QWidget
-
-
-class ResizableSpacer(QWidget):
-    """
-    A resizable spacer widget for toolbars that can be dragged to expand/contract.
-
-    When connected to a widget, it controls that widget's size along the spacer's
-    orientation (maximum width for horizontal, maximum height for vertical),
-    ensuring the widget stays flush against the spacer with no gaps.
-
-    Args:
-        parent(QWidget | None): Parent widget.
-        orientation(Literal["horizontal", "vertical"]): Orientation of the spacer.
-        initial_width(int): Initial size of the spacer in pixels along the orientation
-            (width for horizontal, height for vertical).
-        min_target_size(int): Minimum size of the target widget when resized along the
-            orientation (width for horizontal, height for vertical).
-        max_target_size(int): Maximum size of the target widget when resized along the
-            orientation (width for horizontal, height for vertical).
-        target_widget: QWidget | None. The widget whose size along the orientation
-            is controlled by this spacer.
-    """
-
-    size_changed = Signal(int)
-
-    def __init__(
-        self,
-        parent=None,
-        orientation: Literal["horizontal", "vertical"] = "horizontal",
-        initial_width: int = 10,
-        min_target_size: int = 6,
-        max_target_size: int = 500,
-        target_widget: QWidget = None,
-    ):
-        from bec_widgets.utils.toolbars.bundles import DEFAULT_SIZE, MAX_SIZE
-
-        super().__init__(parent)
-        self._target_start_size = None
-        self.orientation = orientation
-        self._current_width = initial_width
-        self._min_width = min_target_size
-        self._max_width = max_target_size
-        self._dragging = False
-        self._drag_start_pos = QPoint()
-        self._target_widget = target_widget
-
-        # Determine bounds from kwargs or target hints
-        is_horizontal = orientation == "horizontal"
-        target_min = target_widget.minimumWidth() if (target_widget and is_horizontal) else 0
-        if target_widget and not is_horizontal:
-            target_min = target_widget.minimumHeight()
-        target_hint = target_widget.sizeHint().width() if (target_widget and is_horizontal) else 0
-        if target_widget and not is_horizontal:
-            target_hint = target_widget.sizeHint().height()
-        target_max_hint = (
-            target_widget.maximumWidth() if (target_widget and is_horizontal) else None
-        )
-        if target_widget and not is_horizontal:
-            target_max_hint = target_widget.maximumHeight()
-        self._min_target = min_target_size if min_target_size is not None else (target_min or 6)
-        self._max_target = (
-            max_target_size
-            if max_target_size is not None
-            else (
-                target_max_hint if target_max_hint and target_max_hint < MAX_SIZE else DEFAULT_SIZE
-            )
-        )
-
-        # Determine a reasonable base width and clamp to bounds
-        if target_widget:
-            current_size = target_widget.width() if is_horizontal else target_widget.height()
-            if current_size > 0:
-                self._base_width = current_size
-            elif target_min > 0:
-                self._base_width = target_min
-            elif target_hint > 0:
-                self._base_width = target_hint
-            else:
-                self._base_width = 240
-        else:
-            self._base_width = 240
-        self._base_width = max(self._min_target, min(self._max_target, self._base_width))
-
-        # Set size constraints - Fixed policy to prevent automatic resizing
-        # Match toolbar height for proper alignment
-        self._toolbar_height = 32  # Standard toolbar height
-
-        if orientation == "horizontal":
-            self.setFixedWidth(initial_width)
-            self.setFixedHeight(self._toolbar_height)
-            self.setCursor(Qt.CursorShape.SplitHCursor)
-        else:
-            self.setFixedHeight(initial_width)
-            self.setFixedWidth(self._toolbar_height)
-            self.setCursor(Qt.CursorShape.SplitVCursor)
-
-        self.setSizePolicy(QSizePolicy.Policy.Fixed, QSizePolicy.Policy.Fixed)
-
-        self.setStyleSheet("""
-            ResizableSpacer {
-                background-color: transparent;
-                margin: 0px;
-                padding: 0px;
-                border: none;
-            }
-            ResizableSpacer:hover {
-                background-color: rgba(100, 100, 200, 80);
-            }
-        """)
-
-        self.setContentsMargins(0, 0, 0, 0)
-
-        if self._target_widget:
-            size_policy = self._target_widget.sizePolicy()
-            if is_horizontal:
-                vertical_policy = size_policy.verticalPolicy()
-                self._target_widget.setSizePolicy(QSizePolicy.Policy.Fixed, vertical_policy)
-            else:
-                horizontal_policy = size_policy.horizontalPolicy()
-                self._target_widget.setSizePolicy(horizontal_policy, QSizePolicy.Policy.Fixed)
-
-        # Load Material icon based on orientation
-        icon_name = "more_vert" if orientation == "horizontal" else "more_horiz"
-        icon_size = 24
-        self._icon = material_icon(icon_name, size=(icon_size, icon_size), convert_to_pixmap=False)
-        self._icon_size = icon_size
-
-    def set_target_widget(self, widget):
-        """Set the widget whose size is controlled by this spacer."""
-        self._target_widget = widget
-        if widget:
-            is_horizontal = self.orientation == "horizontal"
-            target_min = widget.minimumWidth() if is_horizontal else widget.minimumHeight()
-            target_hint = widget.sizeHint().width() if is_horizontal else widget.sizeHint().height()
-            target_max_hint = widget.maximumWidth() if is_horizontal else widget.maximumHeight()
-            self._min_target = self._min_target or (target_min or 6)
-            self._max_target = (
-                self._max_target
-                if self._max_target is not None
-                else (target_max_hint if target_max_hint and target_max_hint < 10_000_000 else 400)
-            )
-            current_size = widget.width() if is_horizontal else widget.height()
-            if current_size is not None and current_size > 0:
-                base = current_size
-            elif target_min is not None and target_min > 0:
-                base = target_min
-            elif target_hint is not None and target_hint > 0:
-                base = target_hint
-            else:
-                base = self._base_width
-            base = max(self._min_target, min(self._max_target, base))
-            if is_horizontal:
-                widget.setFixedWidth(base)
-            else:
-                widget.setFixedHeight(base)
-
-    def get_target_widget(self):
-        """Get the widget whose size is controlled by this spacer."""
-        return self._target_widget
-
-    def sizeHint(self):
-        if self.orientation == "horizontal":
-            return QSize(self._current_width, self._toolbar_height)
-        else:
-            return QSize(self._toolbar_height, self._current_width)
-
-    def paintEvent(self, event):
-        painter = QPainter(self)
-        painter.setRenderHint(QPainter.RenderHint.Antialiasing)
-
-        # Draw the Material icon centered in the widget using stored icon size
-        x = (self.width() - self._icon_size) // 2
-        y = (self.height() - self._icon_size) // 2
-
-        self._icon.paint(painter, x, y, self._icon_size, self._icon_size)
-        painter.end()
-
-    def mousePressEvent(self, event):
-        if event.button() == Qt.MouseButton.LeftButton:
-            self._dragging = True
-            self._drag_start_pos = event.globalPos()
-            # Store target's current width if it exists
-            if self._target_widget:
-                if self.orientation == "horizontal":
-                    self._target_start_size = self._target_widget.width()
-                else:
-                    self._target_start_size = self._target_widget.height()
-
-                size_policy = self._target_widget.sizePolicy()
-                if self.orientation == "horizontal":
-                    vertical_policy = size_policy.verticalPolicy()
-                    self._target_widget.setSizePolicy(QSizePolicy.Policy.Fixed, vertical_policy)
-                    self._target_widget.setFixedWidth(self._target_start_size)
-                else:
-                    horizontal_policy = size_policy.horizontalPolicy()
-                    self._target_widget.setSizePolicy(horizontal_policy, QSizePolicy.Policy.Fixed)
-                    self._target_widget.setFixedHeight(self._target_start_size)
-
-            event.accept()
-
-    def mouseMoveEvent(self, event):
-        if self._dragging:
-            current_pos = event.globalPos()
-            delta = current_pos - self._drag_start_pos
-
-            if self.orientation == "horizontal":
-                delta_pixels = delta.x()
-            else:
-                delta_pixels = delta.y()
-
-            if self._target_widget:
-                new_target_size = self._target_start_size + delta_pixels
-                new_target_size = max(self._min_target, min(self._max_target, new_target_size))
-
-                if self.orientation == "horizontal":
-                    if new_target_size != self._target_widget.width():
-                        self._target_widget.setFixedWidth(new_target_size)
-                        self.size_changed.emit(new_target_size)
-                else:
-                    if new_target_size != self._target_widget.height():
-                        self._target_widget.setFixedHeight(new_target_size)
-                        self.size_changed.emit(new_target_size)
-
-            event.accept()
-
-    def mouseReleaseEvent(self, event):
-        if event.button() == Qt.MouseButton.LeftButton:
-            self._dragging = False
-            event.accept()

bec_widgets/utils/toolbars/toolbar.py

@@ -8,19 +8,10 @@ from typing import DefaultDict, Literal
 from bec_lib.logger import bec_logger
 from qtpy.QtCore import QSize, Qt, QTimer
 from qtpy.QtGui import QAction, QColor
-from qtpy.QtWidgets import (
-    QApplication,
-    QComboBox,
-    QLabel,
-    QMainWindow,
-    QMenu,
-    QToolBar,
-    QVBoxLayout,
-    QWidget,
-)
+from qtpy.QtWidgets import QApplication, QLabel, QMainWindow, QMenu, QToolBar, QVBoxLayout, QWidget
 
 from bec_widgets.utils.colors import apply_theme, get_theme_name
-from bec_widgets.utils.toolbars.actions import MaterialIconAction, ToolBarAction, WidgetAction
+from bec_widgets.utils.toolbars.actions import MaterialIconAction, ToolBarAction
 from bec_widgets.utils.toolbars.bundles import ToolbarBundle, ToolbarComponents
 from bec_widgets.utils.toolbars.connections import BundleConnection
 
@@ -291,7 +282,8 @@ class ModularToolBar(QToolBar):
         menu = QMenu(self)
         theme = get_theme_name()
         if theme == "dark":
-            menu.setStyleSheet("""
+            menu.setStyleSheet(
+                """
                 QMenu {
                     background-color: rgba(50, 50, 50, 0.9);
                     border: 1px solid rgba(255, 255, 255, 0.2);
@@ -299,10 +291,12 @@ class ModularToolBar(QToolBar):
                 QMenu::item:selected {
                     background-color: rgba(0, 0, 255, 0.2);
                 }
-            """)
+            """
+            )
         else:
             # Light theme styling
-            menu.setStyleSheet("""
+            menu.setStyleSheet(
+                """
                 QMenu {
                     background-color: rgba(255, 255, 255, 0.9);
                     border: 1px solid rgba(0, 0, 0, 0.2);
@@ -310,7 +304,8 @@ class ModularToolBar(QToolBar):
                 QMenu::item:selected {
                     background-color: rgba(0, 0, 255, 0.2);
                 }
-            """)
+            """
+            )
         for ii, bundle in enumerate(self.shown_bundles):
             self.handle_bundle_context_menu(menu, bundle)
             if ii < len(self.shown_bundles) - 1:
@@ -411,18 +406,9 @@ class ModularToolBar(QToolBar):
 
     def update_separators(self):
         """
-        Hide separators that are adjacent to another separator, splitters, or have no non-separator actions between them.
-        Splitters (ResizableSpacer) already provide visual separation, so we don't need separators next to them.
+        Hide separators that are adjacent to another separator or have no non-separator actions between them.
         """
-        from bec_widgets.utils.toolbars.splitter import ResizableSpacer
-
         toolbar_actions = self.actions()
-
-        # Helper function to check if a widget is a splitter
-        def is_splitter_widget(action):
-            widget = self.widgetForAction(action)
-            return widget is not None and isinstance(widget, ResizableSpacer)
-
         # First pass: set visibility based on surrounding non-separator actions.
         for i, action in enumerate(toolbar_actions):
             if not action.isSeparator():
@@ -437,32 +423,23 @@ class ModularToolBar(QToolBar):
                 if toolbar_actions[j].isVisible():
                     next_visible = toolbar_actions[j]
                     break
-
-            # Hide separator if adjacent to another separator, splitter, or at edges
-            if (
-                prev_visible is None
-                or prev_visible.isSeparator()
-                or is_splitter_widget(prev_visible)
-            ) and (
-                next_visible is None
-                or next_visible.isSeparator()
-                or is_splitter_widget(next_visible)
+            if (prev_visible is None or prev_visible.isSeparator()) and (
+                next_visible is None or next_visible.isSeparator()
             ):
                 action.setVisible(False)
             else:
                 action.setVisible(True)
-        # Second pass: ensure no two visible separators are adjacent, and no separators next to splitters.
+        # Second pass: ensure no two visible separators are adjacent.
         prev = None
         for action in toolbar_actions:
-            if action.isVisible():
-                if action.isSeparator():
-                    # Hide separator if previous visible item was a separator or splitter
-                    if prev and (prev.isSeparator() or is_splitter_widget(prev)):
-                        action.setVisible(False)
-                    else:
-                        prev = action
+            if action.isVisible() and action.isSeparator():
+                if prev and prev.isSeparator():
+                    action.setVisible(False)
                 else:
                     prev = action
+            else:
+                if action.isVisible():
+                    prev = action
 
         if not toolbar_actions:
             return
@@ -504,31 +481,12 @@ if __name__ == "__main__":  # pragma: no cover
             self.setWindowTitle("Toolbar / ToolbarBundle Demo")
             self.central_widget = QWidget()
             self.setCentralWidget(self.central_widget)
-            self.test_label = QLabel(text="Drag the splitter (⋮) to resize!")
+            self.test_label = QLabel(text="This is a test label.")
             self.central_widget.layout = QVBoxLayout(self.central_widget)
             self.central_widget.layout.addWidget(self.test_label)
 
             self.toolbar = ModularToolBar(parent=self)
             self.addToolBar(self.toolbar)
-
-            # Example: Bare combobox (no container). Give it a stable starting width
-            self.example_combo = QComboBox(parent=self)
-            self.example_combo.addItems(["device_1", "device_2", "device_3"])
-
-            self.toolbar.components.add_safe(
-                "example_combo", WidgetAction(widget=self.example_combo)
-            )
-
-            # Create a bundle with the combobox and a splitter
-            self.bundle_combo_splitter = ToolbarBundle("example_combo", self.toolbar.components)
-            self.bundle_combo_splitter.add_action("example_combo")
-            # Add splitter; target the bare widget
-            self.bundle_combo_splitter.add_splitter(
-                name="splitter_example", target_widget=self.example_combo, min_width=100
-            )
-
-            # Add other bundles
-            self.toolbar.add_bundle(self.bundle_combo_splitter)
             self.toolbar.add_bundle(performance_bundle(self.toolbar.components))
             self.toolbar.add_bundle(plot_export_bundle(self.toolbar.components))
             self.toolbar.connect_bundle(
@@ -544,9 +502,7 @@ if __name__ == "__main__":  # pragma: no cover
                     text_position="under",
                 ),
             )
-
-            # Show bundles - notice how performance and plot_export appear compactly after splitter!
-            self.toolbar.show_bundles(["example_combo", "performance", "plot_export"])
+            self.toolbar.show_bundles(["performance", "plot_export"])
             self.toolbar.get_bundle("performance").add_action("save")
             self.toolbar.get_bundle("performance").add_action("text")
             self.toolbar.refresh()

bec_widgets/utils/widget_highlighter.py

@@ -1,95 +0,0 @@
-from __future__ import annotations
-
-import shiboken6
-from qtpy.QtCore import QPropertyAnimation, QRect, QSequentialAnimationGroup, Qt
-from qtpy.QtWidgets import QFrame, QWidget
-
-
-class WidgetHighlighter:
-    """
-    Utility that highlights widgets by drawing a temporary frame around them.
-    """
-
-    def __init__(
-        self,
-        *,
-        frame_parent: QWidget | None = None,
-        window_flags: Qt.WindowType | Qt.WindowFlags = Qt.WindowType.Tool
-        | Qt.WindowType.FramelessWindowHint
-        | Qt.WindowType.WindowStaysOnTopHint,
-        style_sheet: str = "border: 2px solid #FF00FF; border-radius: 6px; background: transparent;",
-    ) -> None:
-        self._frame_parent = frame_parent
-        self._window_flags = window_flags
-        self._style_sheet = style_sheet
-        self._frame: QFrame | None = None
-        self._animation_group: QSequentialAnimationGroup | None = None
-
-    def highlight(self, widget: QWidget | None) -> None:
-        """
-        Highlight the given widget with a pulsing frame.
-        """
-        if widget is None or not shiboken6.isValid(widget):
-            return
-
-        frame = self._ensure_frame()
-        frame.hide()
-
-        geom = widget.frameGeometry()
-        top_left = widget.mapToGlobal(widget.rect().topLeft())
-        frame.setGeometry(top_left.x(), top_left.y(), geom.width(), geom.height())
-        frame.setWindowOpacity(1.0)
-        frame.show()
-
-        start_rect = QRect(
-            top_left.x() - 5, top_left.y() - 5, geom.width() + 10, geom.height() + 10
-        )
-
-        pulse = QPropertyAnimation(frame, b"geometry", frame)
-        pulse.setDuration(300)
-        pulse.setStartValue(start_rect)
-        pulse.setEndValue(QRect(top_left.x(), top_left.y(), geom.width(), geom.height()))
-
-        fade = QPropertyAnimation(frame, b"windowOpacity", frame)
-        fade.setDuration(2000)
-        fade.setStartValue(1.0)
-        fade.setEndValue(0.0)
-        fade.finished.connect(frame.hide)
-
-        if self._animation_group is not None:
-            old_group = self._animation_group
-            self._animation_group = None
-            old_group.stop()
-            old_group.deleteLater()
-
-        animation = QSequentialAnimationGroup(frame)
-        animation.addAnimation(pulse)
-        animation.addAnimation(fade)
-        animation.start()
-
-        self._animation_group = animation
-
-    def cleanup(self) -> None:
-        """
-        Delete the highlight frame and cancel pending animations.
-        """
-        if self._animation_group is not None:
-            self._animation_group.stop()
-            self._animation_group.deleteLater()
-            self._animation_group = None
-        if self._frame is not None:
-            self._frame.hide()
-            self._frame.deleteLater()
-            self._frame = None
-
-    @property
-    def frame(self) -> QFrame | None:
-        """Return the currently allocated highlight frame (if any)."""
-        return self._frame
-
-    def _ensure_frame(self) -> QFrame:
-        if self._frame is None:
-            self._frame = QFrame(self._frame_parent, self._window_flags)
-            self._frame.setAttribute(Qt.WidgetAttribute.WA_TransparentForMouseEvents)
-            self._frame.setStyleSheet(self._style_sheet)
-        return self._frame

bec_widgets/utils/widget_io.py

@@ -2,12 +2,10 @@
 from __future__ import annotations
 
 from abc import ABC, abstractmethod
-from dataclasses import dataclass
 from typing import TYPE_CHECKING, Type, TypeVar, cast
 
 import shiboken6 as shb
 from bec_lib import bec_logger
-from qtpy.QtCore import Qt
 from qtpy.QtWidgets import (
     QApplication,
     QCheckBox,
@@ -26,21 +24,13 @@ from qtpy.QtWidgets import (
 from bec_widgets.widgets.utility.toggle.toggle import ToggleSwitch
 
 if TYPE_CHECKING:  # pragma: no cover
-    from bec_widgets.utils.bec_connector import BECConnector
+    from bec_widgets.utils import BECConnector
 
 logger = bec_logger.logger
 
 TAncestor = TypeVar("TAncestor", bound=QWidget)
 
 
-@dataclass(frozen=True)
-class WidgetTreeNode:
-    widget: QWidget
-    parent: QWidget | None
-    depth: int
-    prefix: str
-
-
 class WidgetHandler(ABC):
     """Abstract base class for all widget handlers."""
 
@@ -330,72 +320,6 @@ class WidgetIO:
 
 
 class WidgetHierarchy:
-    @staticmethod
-    def iter_widget_tree(widget: QWidget, *, exclude_internal_widgets: bool = True):
-        """
-        Yield WidgetTreeNode entries for the widget hierarchy.
-        """
-        visited: set[int] = set()
-        yield from WidgetHierarchy._iter_widget_tree_nodes(
-            widget, None, exclude_internal_widgets, visited, [], 0
-        )
-
-    @staticmethod
-    def _iter_widget_tree_nodes(
-        widget: QWidget,
-        parent: QWidget | None,
-        exclude_internal_widgets: bool,
-        visited: set[int],
-        branch_flags: list[bool],
-        depth: int,
-    ):
-        if widget is None or not shb.isValid(widget):
-            return
-        widget_id = id(widget)
-        if widget_id in visited:
-            return
-        visited.add(widget_id)
-
-        prefix = WidgetHierarchy._build_prefix(branch_flags)
-        yield WidgetTreeNode(widget=widget, parent=parent, depth=depth, prefix=prefix)
-
-        children = WidgetHierarchy._filtered_children(widget, exclude_internal_widgets)
-        for idx, child in enumerate(children):
-            is_last = idx == len(children) - 1
-            yield from WidgetHierarchy._iter_widget_tree_nodes(
-                child,
-                widget,
-                exclude_internal_widgets,
-                visited,
-                branch_flags + [is_last],
-                depth + 1,
-            )
-
-    @staticmethod
-    def _build_prefix(branch_flags: list[bool]) -> str:
-        if not branch_flags:
-            return ""
-        parts: list[str] = []
-        for flag in branch_flags[:-1]:
-            parts.append("   " if flag else "│  ")
-        parts.append("└─ " if branch_flags[-1] else "├─ ")
-        return "".join(parts)
-
-    @staticmethod
-    def _filtered_children(widget: QWidget, exclude_internal_widgets: bool) -> list[QWidget]:
-        children: list[QWidget] = []
-        for child in widget.findChildren(QWidget, options=Qt.FindDirectChildrenOnly):
-            if not shb.isValid(child):
-                continue
-            if (
-                exclude_internal_widgets
-                and isinstance(widget, QComboBox)
-                and child.__class__.__name__ in ["QFrame", "QBoxLayout", "QListView"]
-            ):
-                continue
-            children.append(child)
-        return children
-
     @staticmethod
     def print_widget_hierarchy(
         widget,
@@ -418,36 +342,55 @@ class WidgetHierarchy:
             only_bec_widgets(bool, optional): Whether to print only widgets that are instances of BECWidget.
             show_parent(bool, optional): Whether to display which BECWidget is the parent of each discovered BECWidget.
         """
-        from bec_widgets.utils.bec_connector import BECConnector
+        from bec_widgets.utils import BECConnector
         from bec_widgets.widgets.plots.waveform.waveform import Waveform
 
-        for node in WidgetHierarchy.iter_widget_tree(
-            widget, exclude_internal_widgets=exclude_internal_widgets
-        ):
-            current = node.widget
-            is_bec = isinstance(current, BECConnector)
-            if only_bec_widgets and not is_bec:
+        # 1) Filter out widgets that are not BECConnectors (if 'only_bec_widgets' is True)
+        is_bec = isinstance(widget, BECConnector)
+        if only_bec_widgets and not is_bec:
+            return
+
+        # 2) Determine and print the parent's info (closest BECConnector)
+        parent_info = ""
+        if show_parent and is_bec:
+            ancestor = WidgetHierarchy._get_becwidget_ancestor(widget)
+            if ancestor:
+                parent_label = ancestor.objectName() or ancestor.__class__.__name__
+                parent_info = f" parent={parent_label}"
+            else:
+                parent_info = " parent=None"
+
+        widget_info = f"{widget.__class__.__name__} ({widget.objectName()}){parent_info}"
+        print(prefix + widget_info)
+
+        # 3) If it's a Waveform, explicitly print the curves
+        if isinstance(widget, Waveform):
+            for curve in widget.curves:
+                curve_prefix = prefix + "  └─ "
+                print(
+                    f"{curve_prefix}{curve.__class__.__name__} ({curve.objectName()}) "
+                    f"parent={widget.objectName()}"
+                )
+
+        # 4) Recursively handle each child if:
+        #    - It's a QWidget
+        #    - It is a BECConnector (or we don't care about filtering)
+        #    - Its closest BECConnector parent is the current widget
+        for child in widget.findChildren(QWidget):
+            if only_bec_widgets and not isinstance(child, BECConnector):
                 continue
 
-            parent_info = ""
-            if show_parent and is_bec:
-                ancestor = WidgetHierarchy.get_becwidget_ancestor(current)
-                if ancestor:
-                    parent_label = ancestor.objectName() or ancestor.__class__.__name__
-                    parent_info = f" parent={parent_label}"
-                else:
-                    parent_info = " parent=None"
-
-            widget_info = f"{current.__class__.__name__} ({current.objectName()}){parent_info}"
-            print(node.prefix + widget_info)
-
-            if isinstance(current, Waveform):
-                for curve in current.curves:
-                    curve_prefix = node.prefix + "   "
-                    print(
-                        f"{curve_prefix}└─ {curve.__class__.__name__} ({curve.objectName()}) "
-                        f"parent={current.objectName()}"
-                    )
+            # if WidgetHierarchy._get_becwidget_ancestor(child) == widget:
+            child_prefix = prefix + "  └─ "
+            WidgetHierarchy.print_widget_hierarchy(
+                child,
+                indent=indent + 1,
+                grab_values=grab_values,
+                prefix=child_prefix,
+                exclude_internal_widgets=exclude_internal_widgets,
+                only_bec_widgets=only_bec_widgets,
+                show_parent=show_parent,
+            )
 
     @staticmethod
     def print_becconnector_hierarchy_from_app():
@@ -468,7 +411,7 @@ class WidgetHierarchy:
 
         from qtpy.QtWidgets import QApplication
 
-        from bec_widgets.utils.bec_connector import BECConnector
+        from bec_widgets.utils import BECConnector
         from bec_widgets.widgets.plots.plot_base import PlotBase
 
         # 1) Gather ALL QWidget-based BECConnector objects
@@ -487,7 +430,7 @@ class WidgetHierarchy:
         # 3) Build a map of (closest BECConnector parent) -> list of children
         parent_map = defaultdict(list)
         for w in bec_widgets:
-            parent_bec = WidgetHierarchy.get_becwidget_ancestor(w)
+            parent_bec = WidgetHierarchy._get_becwidget_ancestor(w)
             parent_map[parent_bec].append(w)
 
         # 4) Define a recursive printer to show each object's children
@@ -524,17 +467,12 @@ class WidgetHierarchy:
             print_tree(root, prefix="   ")
 
     @staticmethod
-    def get_becwidget_ancestor(widget):
+    def _get_becwidget_ancestor(widget):
         """
         Traverse up the parent chain to find the nearest BECConnector.
-
-        Args:
-            widget: Starting widget to find the ancestor for.
-
-        Returns:
-            The nearest ancestor that is a BECConnector, or None if not found.
+        Returns None if none is found.
         """
-        from bec_widgets.utils.bec_connector import BECConnector
+        from bec_widgets.utils import BECConnector
 
         # Guard against deleted/invalid Qt wrappers
         if not shb.isValid(widget):
@@ -636,13 +574,13 @@ class WidgetHierarchy:
         Return all BECConnector instances whose closest BECConnector ancestor is the given widget,
         including the widget itself if it is a BECConnector.
         """
-        from bec_widgets.utils.bec_connector import BECConnector
+        from bec_widgets.utils import BECConnector
 
         connectors: list[BECConnector] = []
         if isinstance(widget, BECConnector):
             connectors.append(widget)
         for child in widget.findChildren(BECConnector):
-            if WidgetHierarchy.get_becwidget_ancestor(child) is widget:
+            if WidgetHierarchy._get_becwidget_ancestor(child) is widget:
                 connectors.append(child)
         return connectors
 
@@ -664,7 +602,7 @@ class WidgetHierarchy:
             return None
 
         try:
-            from bec_widgets.utils.bec_connector import BECConnector  # local import to avoid cycles
+            from bec_widgets.utils import BECConnector  # local import to avoid cycles
 
             is_bec_target = False
             if isinstance(ancestor_class, str):
@@ -673,7 +611,7 @@ class WidgetHierarchy:
                 is_bec_target = issubclass(ancestor_class, BECConnector)
 
             if is_bec_target:
-                ancestor = WidgetHierarchy.get_becwidget_ancestor(widget)
+                ancestor = WidgetHierarchy._get_becwidget_ancestor(widget)
                 return cast(TAncestor, ancestor)
         except Exception as e:
             logger.error(f"Error importing BECConnector: {e}")

bec_widgets/widgets/containers/advanced_dock_area/advanced_dock_area.py

@@ -5,7 +5,7 @@ from typing import Literal, Mapping, Sequence
 
 import slugify
 from bec_lib import bec_logger
-from qtpy.QtCore import Signal
+from qtpy.QtCore import QTimer, Signal
 from qtpy.QtGui import QPixmap
 from qtpy.QtWidgets import (
     QApplication,
@@ -19,11 +19,10 @@ from qtpy.QtWidgets import (
 
 import bec_widgets.widgets.containers.qt_ads as QtAds
 from bec_widgets import BECWidget, SafeProperty, SafeSlot
-from bec_widgets.applications.views.view import ViewTourSteps
-from bec_widgets.utils.bec_dispatcher import BECDispatcher
+from bec_widgets.cli.rpc.rpc_widget_handler import widget_handler
+from bec_widgets.utils import BECDispatcher
 from bec_widgets.utils.colors import apply_theme
 from bec_widgets.utils.rpc_decorator import rpc_timeout
-from bec_widgets.utils.rpc_widget_handler import widget_handler
 from bec_widgets.utils.toolbars.actions import (
     ExpandableMenuAction,
     MaterialIconAction,
@@ -32,36 +31,38 @@ from bec_widgets.utils.toolbars.actions import (
 from bec_widgets.utils.toolbars.bundles import ToolbarBundle
 from bec_widgets.utils.toolbars.toolbar import ModularToolBar
 from bec_widgets.utils.widget_state_manager import WidgetStateManager
-from bec_widgets.widgets.containers.dock_area.basic_dock_area import DockAreaWidget
-from bec_widgets.widgets.containers.dock_area.profile_utils import (
+from bec_widgets.widgets.containers.advanced_dock_area.basic_dock_area import DockAreaWidget
+from bec_widgets.widgets.containers.advanced_dock_area.profile_utils import (
     SETTINGS_KEYS,
-    baseline_profile_candidates,
+    default_profile_candidates,
     delete_profile_files,
     get_last_profile,
     is_profile_read_only,
     is_quick_select,
     list_profiles,
     list_quick_profiles,
-    load_baseline_profile_screenshot,
-    load_runtime_profile_screenshot,
+    load_default_profile_screenshot,
+    load_user_profile_screenshot,
     now_iso_utc,
-    open_baseline_settings,
-    open_runtime_settings,
+    open_default_settings,
+    open_user_settings,
     profile_origin,
     profile_origin_display,
     read_manifest,
-    restore_runtime_from_baseline,
-    runtime_profile_candidates,
+    restore_user_from_default,
     set_last_profile,
     set_quick_select,
+    user_profile_candidates,
     write_manifest,
 )
-from bec_widgets.widgets.containers.dock_area.settings.dialogs import (
+from bec_widgets.widgets.containers.advanced_dock_area.settings.dialogs import (
     RestoreProfileDialog,
     SaveProfileDialog,
 )
-from bec_widgets.widgets.containers.dock_area.settings.workspace_manager import WorkSpaceManager
-from bec_widgets.widgets.containers.dock_area.toolbar_components.workspace_actions import (
+from bec_widgets.widgets.containers.advanced_dock_area.settings.workspace_manager import (
+    WorkSpaceManager,
+)
+from bec_widgets.widgets.containers.advanced_dock_area.toolbar_components.workspace_actions import (
     WorkspaceConnection,
     workspace_bundle,
 )
@@ -69,17 +70,17 @@ from bec_widgets.widgets.containers.main_window.main_window import BECMainWindow
 from bec_widgets.widgets.containers.qt_ads import CDockWidget
 from bec_widgets.widgets.control.device_control.positioner_box import PositionerBox, PositionerBox2D
 from bec_widgets.widgets.control.scan_control import ScanControl
-from bec_widgets.widgets.editors.bec_console.bec_console import BecConsole, BECShell
+from bec_widgets.widgets.editors.web_console.web_console import WebConsole
 from bec_widgets.widgets.plots.heatmap.heatmap import Heatmap
 from bec_widgets.widgets.plots.image.image import Image
 from bec_widgets.widgets.plots.motor_map.motor_map import MotorMap
 from bec_widgets.widgets.plots.multi_waveform.multi_waveform import MultiWaveform
 from bec_widgets.widgets.plots.scatter_waveform.scatter_waveform import ScatterWaveform
 from bec_widgets.widgets.plots.waveform.waveform import Waveform
-from bec_widgets.widgets.progress.ring_progress_bar.ring_progress_bar import RingProgressBar
+from bec_widgets.widgets.progress.ring_progress_bar import RingProgressBar
 from bec_widgets.widgets.services.bec_queue.bec_queue import BECQueue
 from bec_widgets.widgets.services.bec_status_box.bec_status_box import BECStatusBox
-from bec_widgets.widgets.utility.logpanel.logpanel import LogPanel
+from bec_widgets.widgets.utility.logpanel import LogPanel
 from bec_widgets.widgets.utility.visual.dark_mode_button.dark_mode_button import DarkModeButton
 
 logger = bec_logger.logger
@@ -87,10 +88,9 @@ logger = bec_logger.logger
 _PROFILE_NAMESPACE_UNSET = object()
 
 PROFILE_STATE_KEYS = {key: SETTINGS_KEYS[key] for key in ("geom", "state", "ads_state")}
-StartupProfile = Literal["restore", "skip"] | str | None
 
 
-class BECDockArea(DockAreaWidget):
+class AdvancedDockArea(DockAreaWidget):
     RPC = True
     PLUGIN = False
     USER_ACCESS = [
@@ -108,7 +108,6 @@ class BECDockArea(DockAreaWidget):
         "list_profiles",
         "save_profile",
         "load_profile",
-        "restore_baseline_profile",
         "delete_profile",
     ]
 
@@ -126,7 +125,9 @@ class BECDockArea(DockAreaWidget):
         instance_id: str | None = None,
         auto_save_upon_exit: bool = True,
         enable_profile_management: bool = True,
-        startup_profile: StartupProfile = "restore",
+        restore_initial_profile: bool = True,
+        init_profile: str | None = None,
+        start_empty: bool = False,
         **kwargs,
     ):
         self._profile_namespace_hint = profile_namespace
@@ -135,9 +136,14 @@ class BECDockArea(DockAreaWidget):
         self._instance_id = slugify.slugify(instance_id, separator="_") if instance_id else None
         self._auto_save_upon_exit = auto_save_upon_exit
         self._profile_management_enabled = enable_profile_management
-        self._startup_profile = self._normalize_startup_profile(startup_profile)
+        self._restore_initial_profile = restore_initial_profile
+        self._init_profile = init_profile
+        self._start_empty = start_empty
         super().__init__(
-            parent, default_add_direction=default_add_direction, title="BEC Dock Area", **kwargs
+            parent,
+            default_add_direction=default_add_direction,
+            title="Advanced Dock Area",
+            **kwargs,
         )
 
         # Initialize mode property first (before toolbar setup)
@@ -157,16 +163,14 @@ class BECDockArea(DockAreaWidget):
         self._root_layout.insertWidget(0, self.toolbar)
 
         # Populate and hook the workspace combo
+        self._refresh_workspace_list()
         self._current_profile_name = None
-        self._empty_profile_active = False
-        self._empty_profile_consumed = False
         self._pending_autosave_skip: tuple[str, str] | None = None
         self._exit_snapshot_written = False
-        self._refresh_workspace_list()
 
         # State manager
         self.state_manager = WidgetStateManager(
-            self, serialize_from_root=True, root_id="BECDockArea"
+            self, serialize_from_root=True, root_id="AdvancedDockArea"
         )
 
         # Developer mode state
@@ -174,81 +178,84 @@ class BECDockArea(DockAreaWidget):
         # Initialize default editable state based on current lock
         self._set_editable(True)  # default to editable; will sync toolbar toggle below
 
+        if self._ensure_initial_profile():
+            self._refresh_workspace_list()
+
         # Apply the requested mode after everything is set up
         self.mode = mode
-        self._fetch_initial_profile()
+        if self._restore_initial_profile:
+            self._fetch_initial_profile()
 
-    @staticmethod
-    def _normalize_startup_profile(startup_profile: StartupProfile) -> StartupProfile:
+    def _ensure_initial_profile(self) -> bool:
         """
-        Normalize startup profile values.
-        """
-        if startup_profile == "":
-            return None
-        return startup_profile
+        Ensure the "general" workspace profile always exists for the current namespace.
+        The "general" profile is mandatory and will be recreated if deleted.
+        If list_profile fails due to file permission or corrupted profiles, no action taken.
 
-    def _resolve_restore_startup_profile(self) -> str | None:
+        Returns:
+            bool: True if a profile was created, False otherwise.
         """
-        Resolve the profile name when startup profile is set to "restore".
-        """
-        combo = self.toolbar.components.get_action("workspace_combo").widget
         namespace = self.profile_namespace
+        try:
+            existing_profiles = list_profiles(namespace)
+        except Exception as exc:  # pragma: no cover - defensive guard
+            logger.warning(f"Unable to enumerate profiles for namespace '{namespace}': {exc}")
+            return False
 
-        instance_id = self._last_profile_instance_id()
-        if instance_id:
-            inst_profile = get_last_profile(
-                namespace=namespace, instance=instance_id, allow_namespace_fallback=False
-            )
-            if inst_profile and self._profile_exists(inst_profile, namespace):
-                return inst_profile
+        # Always ensure "general" profile exists
+        name = "general"
+        if name in existing_profiles:
+            return False
 
-        last = get_last_profile(namespace=namespace)
-        if last and self._profile_exists(last, namespace):
-            return last
+        logger.info(
+            f"Profile '{name}' not found in namespace '{namespace}'. Creating mandatory '{name}' workspace."
+        )
 
-        combo_text = combo.currentText().strip()
-        if combo_text and self._profile_exists(combo_text, namespace):
-            return combo_text
-
-        return None
+        self._write_profile_settings(name, namespace, save_preview=False)
+        set_quick_select(name, True, namespace=namespace)
+        set_last_profile(name, namespace=namespace, instance=self._last_profile_instance_id())
+        return True
 
     def _fetch_initial_profile(self):
-        startup_profile = self._startup_profile
+        # Restore last-used profile if available; otherwise fall back to combo selection
+        combo = self.toolbar.components.get_action("workspace_combo").widget
+        namespace = self.profile_namespace
+        init_profile = None
 
-        if startup_profile == "skip":
-            logger.debug("Skipping startup profile initialization.")
-            return
-
-        if startup_profile == "restore":
-            restored = self._resolve_restore_startup_profile()
-            if restored:
-                self._load_initial_profile(restored)
-                return
-            self._start_empty_workspace()
-            return
-
-        if startup_profile is None:
-            self._start_empty_workspace()
-            return
-
-        self._load_initial_profile(startup_profile)
+        # First priority: use init_profile if explicitly provided
+        if self._init_profile:
+            init_profile = self._init_profile
+        else:
+            # Try to restore from last used profile
+            instance_id = self._last_profile_instance_id()
+            if instance_id:
+                inst_profile = get_last_profile(
+                    namespace=namespace, instance=instance_id, allow_namespace_fallback=False
+                )
+                if inst_profile and self._profile_exists(inst_profile, namespace):
+                    init_profile = inst_profile
+            if not init_profile:
+                last = get_last_profile(namespace=namespace)
+                if last and self._profile_exists(last, namespace):
+                    init_profile = last
+                else:
+                    text = combo.currentText()
+                    init_profile = text if text else None
+            if not init_profile:
+                # Fall back to "general" profile which is guaranteed to exist
+                if self._profile_exists("general", namespace):
+                    init_profile = "general"
+        if init_profile:
+            # Defer initial load to the event loop so child widgets exist before state restore.
+            QTimer.singleShot(0, lambda: self._load_initial_profile(init_profile))
 
     def _load_initial_profile(self, name: str) -> None:
-        """Load the initial profile."""
-        self.load_profile(name)
-        if not self._empty_profile_active:
-            self._set_workspace_combo_text_silent(name)
-
-    def _start_empty_workspace(self) -> None:
-        """
-        Initialize the dock area in transient empty-profile mode.
-        """
-        if (
-            getattr(self, "_current_profile_name", None) is None
-            and not self._empty_profile_consumed
-        ):
-            self.delete_all()
-            self._enter_empty_profile_state()
+        """Load the initial profile after construction when the event loop is running."""
+        self.load_profile(name, start_empty=self._start_empty)
+        combo = self.toolbar.components.get_action("workspace_combo").widget
+        combo.blockSignals(True)
+        combo.setCurrentText(name)
+        combo.blockSignals(False)
 
     def _customize_dock(self, dock: CDockWidget, widget: QWidget) -> None:
         prefs = getattr(dock, "_dock_preferences", {}) or {}
@@ -299,7 +306,7 @@ class BECDockArea(DockAreaWidget):
                 or a sequence of button names to hide.
             show_settings_action(bool | None): Control whether a dock settings/property action should
                 be installed. Defaults to ``False`` for the basic dock area; subclasses
-                such as `BECDockArea` override the default to ``True``.
+                such as `AdvancedDockArea` override the default to ``True``.
             promote_central(bool): When True, promote the created dock to be the dock manager's
                 central widget (useful for editor stacks or other root content).
             object_name(str | None): Optional object name to assign to the created widget.
@@ -370,11 +377,10 @@ class BECDockArea(DockAreaWidget):
                 "Add Circular ProgressBar",
                 "RingProgressBar",
             ),
-            "terminal": (BecConsole.ICON_NAME, "Add Terminal", "BecConsole"),
-            "bec_shell": (BECShell.ICON_NAME, "Add BEC Shell", "BECShell"),
+            "terminal": (WebConsole.ICON_NAME, "Add Terminal", "WebConsole"),
+            "bec_shell": (WebConsole.ICON_NAME, "Add BEC Shell", "WebConsole"),
             "log_panel": (LogPanel.ICON_NAME, "Add LogPanel - Disabled", "LogPanel"),
             "sbb_monitor": ("train", "Add SBB Monitor", "SBBMonitor"),
-            "log_panel": (LogPanel.ICON_NAME, "Add LogPanel", "LogPanel"),
         }
 
         # Create expandable menu actions (original behavior)
@@ -486,14 +492,19 @@ class BECDockArea(DockAreaWidget):
             # first two items not needed for this part
             for key, (_, _, widget_type) in mapping.items():
                 act = menu.actions[key].action
-                if key == "terminal":
+                if widget_type == "LogPanel":
+                    act.setEnabled(False)  # keep disabled per issue #644
+                elif key == "terminal":
                     act.triggered.connect(
                         lambda _, t=widget_type: self.new(widget=t, closable=True, startup_cmd=None)
                     )
                 elif key == "bec_shell":
                     act.triggered.connect(
                         lambda _, t=widget_type: self.new(
-                            widget=t, closable=True, show_settings_action=False
+                            widget=t,
+                            closable=True,
+                            startup_cmd=f"bec --gui-id {self.bec_dispatcher.cli_server.gui_id}",
+                            show_settings_action=True,
                         )
                     )
                 else:
@@ -507,7 +518,10 @@ class BECDockArea(DockAreaWidget):
             for action_id, (_, _, widget_type) in mapping.items():
                 flat_action_id = f"flat_{action_id}"
                 flat_action = self.toolbar.components.get_action(flat_action_id).action
-                flat_action.triggered.connect(lambda _, t=widget_type: self.new(t))
+                if widget_type == "LogPanel":
+                    flat_action.setEnabled(False)  # keep disabled per issue #644
+                else:
+                    flat_action.triggered.connect(lambda _, t=widget_type: self.new(t))
 
         _connect_flat_actions(self._ACTION_MAPPINGS["menu_plots"])
         _connect_flat_actions(self._ACTION_MAPPINGS["menu_devices"])
@@ -589,13 +603,20 @@ class BECDockArea(DockAreaWidget):
 
     @property
     def profile_namespace(self) -> str | None:
-        """Namespace used to scope runtime/baseline profile files for this dock area."""
+        """Namespace used to scope user/default profile files for this dock area."""
         return self._resolve_profile_namespace()
 
+    def _active_profile_name_or_default(self) -> str:
+        name = getattr(self, "_current_profile_name", None)
+        if not name:
+            name = "general"
+            self._current_profile_name = name
+        return name
+
     def _profile_exists(self, name: str, namespace: str | None) -> bool:
         return any(
-            os.path.exists(path) for path in runtime_profile_candidates(name, namespace)
-        ) or any(os.path.exists(path) for path in baseline_profile_candidates(name, namespace))
+            os.path.exists(path) for path in user_profile_candidates(name, namespace)
+        ) or any(os.path.exists(path) for path in default_profile_candidates(name, namespace))
 
     def _write_snapshot_to_settings(self, settings, save_preview: bool = True) -> None:
         """
@@ -621,34 +642,35 @@ class BECDockArea(DockAreaWidget):
         name: str,
         namespace: str | None,
         *,
-        write_baseline: bool = True,
-        write_runtime: bool = True,
+        write_default: bool = True,
+        write_user: bool = True,
         save_preview: bool = True,
     ) -> None:
         """
-        Write profile settings to baseline and/or runtime settings files.
+        Write profile settings to default and/or user settings files.
 
         Args:
             name: The profile name.
             namespace: The profile namespace.
-            write_baseline: Whether to write to the baseline settings file.
-            write_runtime: Whether to write to the runtime settings file.
+            write_default: Whether to write to the default settings file.
+            write_user: Whether to write to the user settings file.
             save_preview: Whether to save a screenshot preview.
         """
+        if write_default:
+            ds = open_default_settings(name, namespace=namespace)
+            self._write_snapshot_to_settings(ds, save_preview=save_preview)
+            if not ds.value(SETTINGS_KEYS["created_at"], ""):
+                ds.setValue(SETTINGS_KEYS["created_at"], now_iso_utc())
+            if not ds.value(SETTINGS_KEYS["is_quick_select"], None):
+                ds.setValue(SETTINGS_KEYS["is_quick_select"], True)
 
-        def _write_settings(open_settings) -> None:
-            settings = open_settings(name, namespace=namespace)
-            self._write_snapshot_to_settings(settings, save_preview=save_preview)
-            if not settings.value(SETTINGS_KEYS["created_at"], ""):
-                settings.setValue(SETTINGS_KEYS["created_at"], now_iso_utc())
-            if not settings.value(SETTINGS_KEYS["is_quick_select"], None):
-                settings.setValue(SETTINGS_KEYS["is_quick_select"], True)
-
-        if write_baseline:
-            _write_settings(open_baseline_settings)
-
-        if write_runtime:
-            _write_settings(open_runtime_settings)
+        if write_user:
+            us = open_user_settings(name, namespace=namespace)
+            self._write_snapshot_to_settings(us, save_preview=save_preview)
+            if not us.value(SETTINGS_KEYS["created_at"], ""):
+                us.setValue(SETTINGS_KEYS["created_at"], now_iso_utc())
+            if not us.value(SETTINGS_KEYS["is_quick_select"], None):
+                us.setValue(SETTINGS_KEYS["is_quick_select"], True)
 
     def _finalize_profile_change(self, name: str, namespace: str | None) -> None:
         """
@@ -658,34 +680,12 @@ class BECDockArea(DockAreaWidget):
             name: The profile name.
             namespace: The profile namespace.
         """
-        self._empty_profile_active = False
-        self._empty_profile_consumed = True
         self._current_profile_name = name
         self.profile_changed.emit(name)
         set_last_profile(name, namespace=namespace, instance=self._last_profile_instance_id())
         combo = self.toolbar.components.get_action("workspace_combo").widget
         combo.refresh_profiles(active_profile=name)
 
-    def _set_workspace_combo_text_silent(self, text: str) -> None:
-        combo = self.toolbar.components.get_action("workspace_combo").widget
-        was_blocked = combo.blockSignals(True)
-        try:
-            combo.setCurrentText(text)
-        finally:
-            combo.blockSignals(was_blocked)
-
-    def _enter_empty_profile_state(self) -> None:
-        """
-        Switch to the transient empty workspace state.
-
-        In this mode there is no active profile name, the toolbar shows an
-        explicit blank profile entry, and no autosave on shutdown is performed.
-        """
-        self._empty_profile_active = True
-        self._current_profile_name = None
-        self._pending_autosave_skip = None
-        self._refresh_workspace_list()
-
     @SafeSlot()
     def list_profiles(self) -> list[str]:
         """
@@ -710,10 +710,10 @@ class BECDockArea(DockAreaWidget):
         Save the current workspace profile.
 
         On first save of a given name:
-          - writes a baseline copy to profiles/baseline/<name>.ini with created_at
-          - writes a runtime copy to profiles/runtime/<name>.ini with created_at
-        On subsequent saves:
-          - updates both the baseline and runtime copies so restore uses the latest snapshot.
+          - writes a default copy to states/default/<name>.ini with tag=default and created_at
+          - writes a user copy   to states/user/<name>.ini    with tag=user    and created_at
+        On subsequent saves of user-owned profiles:
+          - updates both the default and user copies so restore uses the latest snapshot.
         Read-only bundled profiles cannot be overwritten.
 
         Args:
@@ -777,7 +777,7 @@ class BECDockArea(DockAreaWidget):
             overwrite_existing = origin == "settings"
 
         origin_before_save = profile_origin(name, namespace=namespace)
-        overwrite_baseline = overwrite_existing and origin_before_save == "settings"
+        overwrite_default = overwrite_existing and origin_before_save == "settings"
 
         # Display saving placeholder in toolbar
         workspace_combo = self.toolbar.components.get_action("workspace_combo").widget
@@ -786,12 +786,12 @@ class BECDockArea(DockAreaWidget):
         workspace_combo.setCurrentIndex(0)
         workspace_combo.blockSignals(False)
 
-        # Write to baseline and/or runtime settings
-        should_write_baseline = overwrite_baseline or not any(
-            os.path.exists(path) for path in baseline_profile_candidates(name, namespace)
+        # Write to default and/or user settings
+        should_write_default = overwrite_default or not any(
+            os.path.exists(path) for path in default_profile_candidates(name, namespace)
         )
         self._write_profile_settings(
-            name, namespace, write_baseline=should_write_baseline, write_runtime=True
+            name, namespace, write_default=should_write_default, write_user=True
         )
 
         set_quick_select(name, quickselect, namespace=namespace)
@@ -801,6 +801,7 @@ class BECDockArea(DockAreaWidget):
             self._pending_autosave_skip = (current_profile, name)
         else:
             self._pending_autosave_skip = None
+        workspace_combo.setCurrentText(name)
         self._finalize_profile_change(name, namespace)
 
     @SafeSlot()
@@ -818,27 +819,20 @@ class BECDockArea(DockAreaWidget):
         """
         self.save_profile(name, show_dialog=True)
 
-    @SafeSlot()
     @SafeSlot(str)
     @SafeSlot(str, bool)
     @rpc_timeout(None)
-    def load_profile(self, name: str | None = None, restore_baseline: bool = False):
+    def load_profile(self, name: str | None = None, start_empty: bool = False):
         """
         Load a workspace profile.
 
-        Before switching, persist the current profile to the runtime copy.
-        Prefer loading the runtime copy; fall back to the baseline copy. When
-        ``restore_baseline`` is True, first overwrite the runtime copy with the
-        baseline profile and then load it.
+        Before switching, persist the current profile to the user copy.
+        Prefer loading the user copy; fall back to the default copy.
 
         Args:
             name (str | None): The name of the profile to load. If None, prompts the user.
-            restore_baseline (bool): If True, restore the runtime copy from the
-                baseline before loading. Defaults to False.
+            start_empty (bool): If True, load a profile without any widgets. Danger of overwriting the dynamic state of that profile.
         """
-        if name == "":
-            return
-
         if not name:  # Gui fallback if the name is not provided
             name, ok = QInputDialog.getText(
                 self, "Load Workspace", "Enter the name of the workspace profile to load:"
@@ -853,17 +847,14 @@ class BECDockArea(DockAreaWidget):
             if skip_pair and skip_pair == (prev_name, name):
                 self._pending_autosave_skip = None
             else:
-                us_prev = open_runtime_settings(prev_name, namespace=namespace)
+                us_prev = open_user_settings(prev_name, namespace=namespace)
                 self._write_snapshot_to_settings(us_prev, save_preview=True)
 
-        if restore_baseline:
-            restore_runtime_from_baseline(name, namespace=namespace)
-
         settings = None
-        if any(os.path.exists(path) for path in runtime_profile_candidates(name, namespace)):
-            settings = open_runtime_settings(name, namespace=namespace)
-        elif any(os.path.exists(path) for path in baseline_profile_candidates(name, namespace)):
-            settings = open_baseline_settings(name, namespace=namespace)
+        if any(os.path.exists(path) for path in user_profile_candidates(name, namespace)):
+            settings = open_user_settings(name, namespace=namespace)
+        elif any(os.path.exists(path) for path in default_profile_candidates(name, namespace)):
+            settings = open_default_settings(name, namespace=namespace)
         if settings is None:
             logger.warning(f"Profile '{name}' not found in namespace '{namespace}'. Creating new.")
             self.delete_all()
@@ -873,6 +864,10 @@ class BECDockArea(DockAreaWidget):
         # Clear existing docks and remove all widgets
         self.delete_all()
 
+        if start_empty:
+            self._finalize_profile_change(name, namespace)
+            return
+
         # Rebuild widgets and restore states
         for item in read_manifest(settings):
             obj_name = item["object_name"]
@@ -905,36 +900,32 @@ class BECDockArea(DockAreaWidget):
 
     @SafeSlot()
     @SafeSlot(str)
-    @SafeSlot(str, bool)
-    @rpc_timeout(None)
-    def restore_baseline_profile(self, name: str | None = None, show_dialog: bool = False):
+    def restore_user_profile_from_default(self, name: str | None = None):
         """
-        Overwrite the runtime copy of *name* with the baseline.
+        Overwrite the user copy of *name* with the default baseline.
         If *name* is None, target the currently active profile.
 
         Args:
             name (str | None): The name of the profile to restore. If None, uses the current profile.
-            show_dialog (bool): If True, ask for confirmation before restoring.
         """
         target = name or getattr(self, "_current_profile_name", None)
         if not target:
             return
         namespace = self.profile_namespace
 
-        if show_dialog:
-            current_pixmap = None
-            if self.isVisible():
-                current_pixmap = QPixmap()
-                ba = bytes(self.screenshot_bytes())
-                current_pixmap.loadFromData(ba)
-            if current_pixmap is None or current_pixmap.isNull():
-                current_pixmap = load_runtime_profile_screenshot(target, namespace=namespace)
-            baseline_pixmap = load_baseline_profile_screenshot(target, namespace=namespace)
+        current_pixmap = None
+        if self.isVisible():
+            current_pixmap = QPixmap()
+            ba = bytes(self.screenshot_bytes())
+            current_pixmap.loadFromData(ba)
+        if current_pixmap is None or current_pixmap.isNull():
+            current_pixmap = load_user_profile_screenshot(target, namespace=namespace)
+        default_pixmap = load_default_profile_screenshot(target, namespace=namespace)
 
-            if not RestoreProfileDialog.confirm(self, current_pixmap, baseline_pixmap):
-                return
+        if not RestoreProfileDialog.confirm(self, current_pixmap, default_pixmap):
+            return
 
-        restore_runtime_from_baseline(target, namespace=namespace)
+        restore_user_from_default(target, namespace=namespace)
         self.delete_all()
         self.load_profile(target)
 
@@ -1022,36 +1013,25 @@ class BECDockArea(DockAreaWidget):
         """
         combo = self.toolbar.components.get_action("workspace_combo").widget
         active_profile = getattr(self, "_current_profile_name", None)
-        empty_profile_active = bool(getattr(self, "_empty_profile_active", False))
         namespace = self.profile_namespace
         if hasattr(combo, "set_quick_profile_provider"):
             combo.set_quick_profile_provider(lambda ns=namespace: list_quick_profiles(namespace=ns))
         if hasattr(combo, "refresh_profiles"):
-            if empty_profile_active:
-                combo.refresh_profiles(active_profile, show_empty_profile=True)
-            else:
-                combo.refresh_profiles(active_profile)
+            combo.refresh_profiles(active_profile)
         else:
             # Fallback for regular QComboBox
             combo.blockSignals(True)
             combo.clear()
             quick_profiles = list_quick_profiles(namespace=namespace)
-            items = [""] if empty_profile_active else []
-            items.extend(quick_profiles)
+            items = list(quick_profiles)
             if active_profile and active_profile not in items:
                 items.insert(0, active_profile)
             combo.addItems(items)
-            if empty_profile_active:
-                idx = combo.findText("")
-                if idx >= 0:
-                    combo.setCurrentIndex(idx)
-            elif active_profile:
+            if active_profile:
                 idx = combo.findText(active_profile)
                 if idx >= 0:
                     combo.setCurrentIndex(idx)
-            if empty_profile_active:
-                combo.setToolTip("Unsaved empty workspace")
-            elif active_profile and active_profile not in quick_profiles:
+            if active_profile and active_profile not in quick_profiles:
                 combo.setToolTip("Active profile is not in quick select")
             else:
                 combo.setToolTip("")
@@ -1069,7 +1049,7 @@ class BECDockArea(DockAreaWidget):
         manage_action = self.toolbar.components.get_action("manage_workspaces").action
         if self.manage_dialog is None or not self.manage_dialog.isVisible():
             self.manage_widget = WorkSpaceManager(
-                self, target_widget=self, active_profile=self._current_profile_name
+                self, target_widget=self, default_profile=self._current_profile_name
             )
             self.manage_dialog = QDialog(modal=False)
 
@@ -1156,50 +1136,14 @@ class BECDockArea(DockAreaWidget):
             logger.info("ADS prepare_for_shutdown: skipping (already handled or destroyed)")
             return
 
-        if getattr(self, "_empty_profile_active", False):
-            logger.info("ADS prepare_for_shutdown: skipping autosave for unsaved empty workspace")
-            self._exit_snapshot_written = True
-            return
-
-        name = getattr(self, "_current_profile_name", None)
-        if not name:
-            logger.info("ADS prepare_for_shutdown: skipping autosave (no active profile)")
-            self._exit_snapshot_written = True
-            return
+        name = self._active_profile_name_or_default()
 
         namespace = self.profile_namespace
-        settings = open_runtime_settings(name, namespace=namespace)
+        settings = open_user_settings(name, namespace=namespace)
         self._write_snapshot_to_settings(settings)
         set_last_profile(name, namespace=namespace, instance=self._last_profile_instance_id())
         self._exit_snapshot_written = True
 
-    def register_tour_steps(self, guided_tour, main_app):
-        """Register Dock Area components with the guided tour.
-
-        Args:
-            guided_tour: The GuidedTour instance to register with.
-            main_app: The main application instance (for accessing set_current).
-
-        Returns:
-            ViewTourSteps | None: Model containing view title and step IDs.
-        """
-
-        step_ids = []
-
-        # Register Dock Area toolbar
-        def get_dock_toolbar():
-            main_app.set_current("dock_area")
-            return (self.toolbar, None)
-
-        step_id = guided_tour.register_widget(
-            widget=get_dock_toolbar,
-            title="Dock Area Toolbar",
-            text="Use this toolbar to add widgets, manage workspaces, save and load profiles, and control the layout of your workspace.",
-        )
-        step_ids.append(step_id)
-
-        return ViewTourSteps(view_title="Dock Area Workspace", step_ids=step_ids)
-
     def cleanup(self):
         """
         Cleanup the dock area.
@@ -1223,7 +1167,7 @@ if __name__ == "__main__":  # pragma: no cover
     dispatcher = BECDispatcher(gui_id="ads")
     window = BECMainWindowNoRPC()
 
-    ads = BECDockArea(mode="creator", enable_profile_management=True, root_widget=True)
+    ads = AdvancedDockArea(mode="creator", enable_profile_management=True, root_widget=True)
 
     window.setCentralWidget(ads)
     window.show()

bec_widgets/widgets/containers/advanced_dock_area/basic_dock_area.py

@@ -6,16 +6,15 @@ from typing import Any, Callable, Literal, Mapping, Sequence, cast
 
 from bec_lib import bec_logger
 from bec_qthemes import material_icon
-from qtpy.QtCore import QByteArray, QSettings, QSize, Qt, QTimer
+from qtpy.QtCore import QByteArray, QSettings, Qt, QTimer
 from qtpy.QtGui import QIcon
 from qtpy.QtWidgets import QApplication, QDialog, QVBoxLayout, QWidget
 from shiboken6 import isValid
 
 import bec_widgets.widgets.containers.qt_ads as QtAds
 from bec_widgets import BECWidget, SafeSlot
-from bec_widgets.utils.bec_connector import BECConnector
+from bec_widgets.cli.rpc.rpc_widget_handler import widget_handler
 from bec_widgets.utils.property_editor import PropertyEditor
-from bec_widgets.utils.rpc_widget_handler import widget_handler
 from bec_widgets.utils.toolbars.actions import MaterialIconAction
 from bec_widgets.widgets.containers.qt_ads import (
     CDockAreaWidget,
@@ -113,7 +112,6 @@ class DockAreaWidget(BECWidget, QWidget):
         )
 
         self._root_layout.addWidget(self.dock_manager, 1)
-        self._install_manager_parent_guards()
 
     ################################################################################
     # Dock Utility Helpers
@@ -256,54 +254,6 @@ class DockAreaWidget(BECWidget, QWidget):
 
         return lambda dock: self._default_close_handler(dock, widget)
 
-    def _install_manager_parent_guards(self) -> None:
-        """
-        Track ADS structural changes so drag/drop-created tab areas keep stable parenting.
-        """
-        self.dock_manager.dockAreaCreated.connect(self._normalize_all_dock_parents)
-        self.dock_manager.dockWidgetAdded.connect(self._normalize_all_dock_parents)
-        self.dock_manager.stateRestored.connect(self._normalize_all_dock_parents)
-        self.dock_manager.restoringState.connect(self._normalize_all_dock_parents)
-        self.dock_manager.focusedDockWidgetChanged.connect(self._normalize_all_dock_parents)
-        self._normalize_all_dock_parents()
-
-    def _iter_all_dock_areas(self) -> list[CDockAreaWidget]:
-        """Return all dock areas from all known dock containers."""
-        areas: list[CDockAreaWidget] = []
-        for i in range(self.dock_manager.dockAreaCount()):
-            area = self.dock_manager.dockArea(i)
-            if area is None or not isValid(area):
-                continue
-            areas.append(area)
-        return areas
-
-    def _connect_dock_area_parent_guards(self) -> None:
-        """Bind area-level tab/view events to parent normalization."""
-        for area in self._iter_all_dock_areas():
-            try:
-                area.currentChanged.connect(
-                    self._normalize_all_dock_parents, Qt.ConnectionType.UniqueConnection
-                )
-                area.viewToggled.connect(
-                    self._normalize_all_dock_parents, Qt.ConnectionType.UniqueConnection
-                )
-            except TypeError:
-                area.currentChanged.connect(self._normalize_all_dock_parents)
-                area.viewToggled.connect(self._normalize_all_dock_parents)
-
-    def _normalize_all_dock_parents(self, *_args) -> None:
-        """
-        Ensure each dock has a stable parent after tab switches, re-docking, or restore.
-        """
-        self._connect_dock_area_parent_guards()
-        for dock in self.dock_list():
-            if dock is None or not isValid(dock):
-                continue
-            area_widget = dock.dockAreaWidget()
-            target_parent = area_widget if area_widget is not None else self.dock_manager
-            if dock.parent() is not target_parent:
-                dock.setParent(target_parent)
-
     def _make_dock(
         self,
         widget: QWidget,
@@ -352,13 +302,6 @@ class DockAreaWidget(BECWidget, QWidget):
 
         dock = CDockWidget(self.dock_manager, widget.objectName(), self)
         dock.setWidget(widget)
-        widget_min_size = widget.minimumSize()
-        widget_min_hint = widget.minimumSizeHint()
-        dock_min_size = QSize(
-            max(widget_min_size.width(), widget_min_hint.width()),
-            max(widget_min_size.height(), widget_min_hint.height()),
-        )
-        dock.setMinimumSize(dock_min_size)
         dock._dock_preferences = dict(dock_preferences or {})
         dock.setFeature(CDockWidget.DockWidgetFeature.DockWidgetDeleteOnClose, True)
         dock.setFeature(CDockWidget.DockWidgetFeature.CustomCloseHandling, True)
@@ -381,9 +324,7 @@ class DockAreaWidget(BECWidget, QWidget):
         if hasattr(widget, "widget_removed"):
             widget.widget_removed.connect(on_widget_destroyed)
 
-        dock.setMinimumSizeHintMode(
-            CDockWidget.eMinimumSizeHintMode.MinimumSizeHintFromDockWidgetMinimumSize
-        )
+        dock.setMinimumSizeHintMode(CDockWidget.eMinimumSizeHintMode.MinimumSizeHintFromDockWidget)
         dock_area_widget = None
         if tab_with is not None:
             if not isValid(tab_with):
@@ -406,7 +347,6 @@ class DockAreaWidget(BECWidget, QWidget):
                 self._apply_floating_state_to_dock(dock, floating_state)
         if resolved_icon is not None:
             dock.setIcon(resolved_icon)
-        self._normalize_all_dock_parents()
         return dock
 
     def _delete_dock(self, dock: CDockWidget) -> None:
@@ -1249,7 +1189,8 @@ class DockAreaWidget(BECWidget, QWidget):
                     if button is not None:
                         button.setVisible(bool(visible))
 
-        apply()
+        # single shot to ensure dock is fully initialized, as widgets with their own dock manager can take a moment to initialize
+        QTimer.singleShot(0, apply)
 
     def set_central_dock(self, dock: CDockWidget | QWidget | str) -> None:
         """
@@ -1315,7 +1256,7 @@ class DockAreaWidget(BECWidget, QWidget):
                 or a sequence of button names to hide.
             show_settings_action(bool | None): Control whether a dock settings/property action should
                 be installed. Defaults to ``False`` for the basic dock area; subclasses
-                such as `BECDockArea` override the default to ``True``.
+                such as `AdvancedDockArea` override the default to ``True``.
             promote_central(bool): When True, promote the created dock to be the dock manager's
                 central widget (useful for editor stacks or other root content).
             dock_icon(QIcon | None): Optional icon applied to the dock via ``CDockWidget.setIcon``.
@@ -1361,7 +1302,11 @@ class DockAreaWidget(BECWidget, QWidget):
                 apply_widget_icon=apply_widget_icon,
             )
 
-            self._create_dock_from_spec(spec)
+            def _on_name_established(_name: str) -> None:
+                # Defer creation so BECConnector sibling name enforcement has completed.
+                QTimer.singleShot(0, lambda: self._create_dock_from_spec(spec))
+
+            widget.name_established.connect(_on_name_established)
             return widget
 
         spec = self._build_creation_spec(
@@ -1385,40 +1330,37 @@ class DockAreaWidget(BECWidget, QWidget):
         dock = self._create_dock_from_spec(spec)
         return dock if return_dock else widget
 
+    def _iter_all_docks(self) -> list[CDockWidget]:
+        """Return all docks, including those hosted in floating containers."""
+        docks = list(self.dock_manager.dockWidgets())
+        seen = {id(d) for d in docks}
+        for container in self.dock_manager.floatingWidgets():
+            if container is None:
+                continue
+            for dock in container.dockWidgets():
+                if dock is None:
+                    continue
+                if id(dock) in seen:
+                    continue
+                docks.append(dock)
+                seen.add(id(dock))
+        return docks
+
     def dock_map(self) -> dict[str, CDockWidget]:
         """Return the dock widgets map as dictionary with names as keys."""
-        return self.dock_manager.dockWidgetsMap()
+        return {dock.objectName(): dock for dock in self._iter_all_docks() if dock.objectName()}
 
     def dock_list(self) -> list[CDockWidget]:
         """Return the list of dock widgets."""
-        return list(self.dock_map().values())
+        return self._iter_all_docks()
 
-    def widget_map(self, bec_widgets_only: bool = True) -> dict[str, QWidget]:
-        """
-        Return a dictionary mapping widget names to their corresponding widgets.
+    def widget_map(self) -> dict[str, QWidget]:
+        """Return a dictionary mapping widget names to their corresponding widgets."""
+        return {dock.objectName(): dock.widget() for dock in self.dock_list()}
 
-        Args:
-            bec_widgets_only(bool): If True, only include widgets that are BECConnector instances.
-        """
-
-        widgets: dict[str, QWidget] = {}
-        for dock in self.dock_list():
-            widget = dock.widget()
-            if not isinstance(widget, QWidget):
-                continue
-            if bec_widgets_only and not isinstance(widget, BECConnector):
-                continue
-            widgets[dock.objectName()] = widget
-        return widgets
-
-    def widget_list(self, bec_widgets_only: bool = True) -> list[QWidget]:
-        """
-        Return a list of widgets contained in the dock area.
-
-        Args:
-            bec_widgets_only(bool): If True, only include widgets that are BECConnector instances.
-        """
-        return list(self.widget_map(bec_widgets_only=bec_widgets_only).values())
+    def widget_list(self) -> list[QWidget]:
+        """Return a list of all widgets contained in the dock area."""
+        return [dock.widget() for dock in self.dock_list() if isinstance(dock.widget(), QWidget)]
 
     @SafeSlot()
     def attach_all(self):
@@ -1469,7 +1411,7 @@ class DockAreaWidget(BECWidget, QWidget):
 if __name__ == "__main__":  # pragma: no cover
     import sys
 
-    from qtpy.QtWidgets import QLabel, QMainWindow, QPushButton
+    from qtpy.QtWidgets import QApplication, QLabel, QMainWindow, QPushButton
 
     from bec_widgets.utils.colors import apply_theme
 

bec_widgets/widgets/containers/advanced_dock_area/profile_utils.py

@@ -1,14 +1,10 @@
 """
-Utilities for managing BECDockArea profiles stored in INI files.
+Utilities for managing AdvancedDockArea profiles stored in INI files.
 
 Policy:
-- All created/modified profiles are stored under the BEC settings root:
-  <base_path>/profiles/{baseline,runtime}
-- Bundled read-only baselines are discovered in BW core profiles and plugin
-  bec_widgets/profiles but never written to.
-- Lookup order when reading: runtime → settings baseline → app or plugin bundled baseline.
-- Legacy settings paths profiles/{default,user} are read through a thin segment
-  alias layer and copied to the canonical location on first access.
+- All created/modified profiles are stored under the BEC settings root: <base_path>/profiles/{default,user}
+- Bundled read-only defaults are discovered in BW core states/default and plugin bec_widgets/profiles but never written to.
+- Lookup order when reading: user → settings default → app or plugin bundled default.
 """
 
 from __future__ import annotations
@@ -36,22 +32,16 @@ logger = bec_logger.logger
 MODULE_PATH = os.path.dirname(os.path.dirname(os.path.dirname(__file__)))
 
 ProfileOrigin = Literal["module", "plugin", "settings", "unknown"]
-ProfileSegment = Literal["baseline", "runtime"]
-
-_PROFILE_SEGMENT_ALIASES: dict[ProfileSegment, tuple[str, str]] = {
-    "baseline": ("baseline", "default"),
-    "runtime": ("runtime", "user"),
-}
 
 
 def module_profiles_dir() -> str:
     """
-    Return the built-in BECDockArea profiles directory bundled with the module.
+    Return the built-in AdvancedDockArea profiles directory bundled with the module.
 
     Returns:
         str: Absolute path of the read-only module profiles directory.
     """
-    return os.path.join(MODULE_PATH, "containers", "dock_area", "profiles")
+    return os.path.join(MODULE_PATH, "containers", "advanced_dock_area", "profiles")
 
 
 @lru_cache(maxsize=1)
@@ -125,12 +115,12 @@ def _settings_profiles_root() -> str:
         str: Absolute path to the profiles root. The directory is created if missing.
     """
     client = BECClient()
-    bec_widgets_settings = client._service_config.config.get("widgets_settings")
+    bec_widgets_settings = client._service_config.config.get("bec_widgets_settings")
     bec_widgets_setting_path = (
         bec_widgets_settings.get("base_path") if bec_widgets_settings else None
     )
     default_path = os.path.join(bec_widgets_setting_path, "profiles")
-    root = os.path.expanduser(os.environ.get("BECWIDGETS_PROFILE_DIR", default_path))
+    root = os.environ.get("BECWIDGETS_PROFILE_DIR", default_path)
     os.makedirs(root, exist_ok=True)
     return root
 
@@ -140,7 +130,7 @@ def _profiles_dir(segment: str, namespace: str | None) -> str:
     Build (and ensure) the directory that holds profiles for a namespace segment.
 
     Args:
-        segment (str): Profile segment directory name.
+        segment (str): Either ``"user"`` or ``"default"``.
         namespace (str | None): Optional namespace label to scope profiles.
 
     Returns:
@@ -148,180 +138,162 @@ def _profiles_dir(segment: str, namespace: str | None) -> str:
     """
     base = os.path.join(_settings_profiles_root(), segment)
     ns = slugify.slugify(namespace, separator="_") if namespace else None
-    path = os.path.expanduser(os.path.join(base, ns) if ns else base)
+    path = os.path.join(base, ns) if ns else base
     os.makedirs(path, exist_ok=True)
     return path
 
 
-def _candidate_namespaces(namespace: str | None) -> list[str | None]:
+def _user_path_candidates(name: str, namespace: str | None) -> list[str]:
+    """
+    Generate candidate user-profile paths honoring namespace fallbacks.
+
+    Args:
+        name (str): Profile name without extension.
+        namespace (str | None): Optional namespace label.
+
+    Returns:
+        list[str]: Ordered list of candidate user profile paths (.ini files).
+    """
     ns = slugify.slugify(namespace, separator="_") if namespace else None
+    primary = os.path.join(_profiles_dir("user", ns), f"{name}.ini")
     if not ns:
-        return [None]
-    return [ns, None]
+        return [primary]
+    legacy = os.path.join(_profiles_dir("user", None), f"{name}.ini")
+    return [primary, legacy] if legacy != primary else [primary]
 
 
-def _segment_profile_path(segment_name: str, name: str, namespace: str | None) -> str:
-    return os.path.join(_profiles_dir(segment_name, namespace), f"{name}.ini")
-
-
-def _canonical_profile_path(segment: ProfileSegment, name: str, namespace: str | None) -> str:
-    return _segment_profile_path(_PROFILE_SEGMENT_ALIASES[segment][0], name, namespace)
-
-
-def _segment_path_candidates(
-    segment: ProfileSegment,
-    name: str,
-    namespace: str | None,
-    *,
-    include_legacy: bool = True,
-    migrate_legacy: bool = True,
-) -> list[str]:
+def _default_path_candidates(name: str, namespace: str | None) -> list[str]:
     """
-    Generate profile candidates for a canonical segment.
+    Generate candidate default-profile paths honoring namespace fallbacks.
 
-    Canonical baseline/runtime files are always preferred. Namespace fallback
-    files and legacy default/user files are copied to the primary canonical path
-    when the primary file does not exist.
+    Args:
+        name (str): Profile name without extension.
+        namespace (str | None): Optional namespace label.
+
+    Returns:
+        list[str]: Ordered list of candidate default profile paths (.ini files).
     """
-    canonical = [
-        _segment_profile_path(_PROFILE_SEGMENT_ALIASES[segment][0], name, ns)
-        for ns in _candidate_namespaces(namespace)
-    ]
-    legacy = []
-    if include_legacy:
-        legacy = [
-            _segment_profile_path(_PROFILE_SEGMENT_ALIASES[segment][1], name, ns)
-            for ns in _candidate_namespaces(namespace)
-        ]
-
-    primary_canonical = canonical[0]
-    if migrate_legacy and not os.path.exists(primary_canonical):
-        canonical_src = next((path for path in canonical[1:] if os.path.exists(path)), None)
-        if canonical_src:
-            os.makedirs(os.path.dirname(primary_canonical), exist_ok=True)
-            shutil.copy2(canonical_src, primary_canonical)
-        elif include_legacy:
-            legacy_src = next((path for path in legacy if os.path.exists(path)), None)
-            if legacy_src:
-                os.makedirs(os.path.dirname(primary_canonical), exist_ok=True)
-                shutil.copy2(legacy_src, primary_canonical)
-
-    return list(dict.fromkeys(canonical + legacy))
+    ns = slugify.slugify(namespace, separator="_") if namespace else None
+    primary = os.path.join(_profiles_dir("default", ns), f"{name}.ini")
+    if not ns:
+        return [primary]
+    legacy = os.path.join(_profiles_dir("default", None), f"{name}.ini")
+    return [primary, legacy] if legacy != primary else [primary]
 
 
-def baseline_profiles_dir(namespace: str | None = None) -> str:
+def default_profiles_dir(namespace: str | None = None) -> str:
     """
-    Return the directory that stores baseline profiles for the namespace.
+    Return the directory that stores default profiles for the namespace.
 
     Args:
         namespace (str | None, optional): Namespace label. Defaults to ``None``.
 
     Returns:
-        str: Absolute path to the baseline profile directory.
+        str: Absolute path to the default profile directory.
     """
-    return _profiles_dir("baseline", namespace)
+    return _profiles_dir("default", namespace)
 
 
-def runtime_profiles_dir(namespace: str | None = None) -> str:
+def user_profiles_dir(namespace: str | None = None) -> str:
     """
-    Return the directory that stores runtime profiles for the namespace.
+    Return the directory that stores user profiles for the namespace.
 
     Args:
         namespace (str | None, optional): Namespace label. Defaults to ``None``.
 
     Returns:
-        str: Absolute path to the runtime profile directory.
+        str: Absolute path to the user profile directory.
     """
-    return _profiles_dir("runtime", namespace)
+    return _profiles_dir("user", namespace)
 
 
-def baseline_profile_path(name: str, namespace: str | None = None) -> str:
+def default_profile_path(name: str, namespace: str | None = None) -> str:
     """
-    Compute the canonical baseline profile path for a profile name.
+    Compute the canonical default profile path for a profile name.
 
     Args:
         name (str): Profile name without extension.
         namespace (str | None, optional): Namespace label. Defaults to ``None``.
 
     Returns:
-        str: Absolute path to the baseline profile file (.ini).
+        str: Absolute path to the default profile file (.ini).
     """
-    return _canonical_profile_path("baseline", name, namespace)
+    return _default_path_candidates(name, namespace)[0]
 
 
-def runtime_profile_path(name: str, namespace: str | None = None) -> str:
+def user_profile_path(name: str, namespace: str | None = None) -> str:
     """
-    Compute the canonical runtime profile path for a profile name.
+    Compute the canonical user profile path for a profile name.
 
     Args:
         name (str): Profile name without extension.
         namespace (str | None, optional): Namespace label. Defaults to ``None``.
 
     Returns:
-        str: Absolute path to the runtime profile file (.ini).
+        str: Absolute path to the user profile file (.ini).
     """
-    return _canonical_profile_path("runtime", name, namespace)
+    return _user_path_candidates(name, namespace)[0]
 
 
-def runtime_profile_candidates(name: str, namespace: str | None = None) -> list[str]:
+def user_profile_candidates(name: str, namespace: str | None = None) -> list[str]:
     """
-    List all runtime profile path candidates for a profile name.
+    List all user profile path candidates for a profile name.
 
     Args:
         name (str): Profile name without extension.
         namespace (str | None, optional): Namespace label. Defaults to ``None``.
 
     Returns:
-        list[str]: De-duplicated list of candidate runtime profile paths.
+        list[str]: De-duplicated list of candidate user profile paths.
     """
-    return _segment_path_candidates("runtime", name, namespace)
+    return list(dict.fromkeys(_user_path_candidates(name, namespace)))
 
 
-def baseline_profile_candidates(name: str, namespace: str | None = None) -> list[str]:
+def default_profile_candidates(name: str, namespace: str | None = None) -> list[str]:
     """
-    List all baseline profile path candidates for a profile name.
+    List all default profile path candidates for a profile name.
 
     Args:
         name (str): Profile name without extension.
         namespace (str | None, optional): Namespace label. Defaults to ``None``.
 
     Returns:
-        list[str]: De-duplicated list of candidate baseline profile paths.
+        list[str]: De-duplicated list of candidate default profile paths.
     """
-    return _segment_path_candidates("baseline", name, namespace)
+    return list(dict.fromkeys(_default_path_candidates(name, namespace)))
 
 
-def _existing_runtime_settings(name: str, namespace: str | None = None) -> QSettings | None:
+def _existing_user_settings(name: str, namespace: str | None = None) -> QSettings | None:
     """
-    Resolve the first existing runtime profile settings object.
+    Resolve the first existing user profile settings object.
 
     Args:
         name (str): Profile name without extension.
         namespace (str | None, optional): Namespace label to search. Defaults to ``None``.
 
     Returns:
-        QSettings | None: Config for the first existing runtime profile candidate, or ``None``
+        QSettings | None: Config for the first existing user profile candidate, or ``None``
             when no files are present.
     """
-    for path in runtime_profile_candidates(name, namespace):
+    for path in user_profile_candidates(name, namespace):
         if os.path.exists(path):
             return QSettings(path, QSettings.IniFormat)
     return None
 
 
-def _existing_baseline_settings(name: str, namespace: str | None = None) -> QSettings | None:
+def _existing_default_settings(name: str, namespace: str | None = None) -> QSettings | None:
     """
-    Resolve the first existing baseline profile settings object.
+    Resolve the first existing default profile settings object.
 
     Args:
         name (str): Profile name without extension.
         namespace (str | None, optional): Namespace label to search. Defaults to ``None``.
 
     Returns:
-        QSettings | None: Config for the first existing baseline profile candidate, or ``None``
+        QSettings | None: Config for the first existing default profile candidate, or ``None``
             when no files are present.
     """
-    for path in baseline_profile_candidates(name, namespace):
+    for path in default_profile_candidates(name, namespace):
         if os.path.exists(path):
             return QSettings(path, QSettings.IniFormat)
     return None
@@ -375,7 +347,7 @@ def profile_origin(name: str, namespace: str | None = None) -> ProfileOrigin:
     plugin_path = plugin_profile_path(name)
     if plugin_path and os.path.exists(plugin_path):
         return "plugin"
-    for path in runtime_profile_candidates(name, namespace) + baseline_profile_candidates(
+    for path in user_profile_candidates(name, namespace) + default_profile_candidates(
         name, namespace
     ):
         if os.path.exists(path):
@@ -434,8 +406,8 @@ def delete_profile_files(name: str, namespace: str | None = None) -> bool:
     read_only = is_profile_read_only(name, namespace)
 
     removed = False
-    # Always allow removing runtime copies; keep baseline copies for read-only origins.
-    for path in set(runtime_profile_candidates(name, namespace)):
+    # Always allow removing user copies; keep default copies for read-only origins.
+    for path in set(user_profile_candidates(name, namespace)):
         try:
             os.remove(path)
             removed = True
@@ -443,7 +415,7 @@ def delete_profile_files(name: str, namespace: str | None = None) -> bool:
             continue
 
     if not read_only:
-        for path in set(baseline_profile_candidates(name, namespace)):
+        for path in set(default_profile_candidates(name, namespace)):
             try:
                 os.remove(path)
                 removed = True
@@ -471,7 +443,7 @@ SETTINGS_KEYS = {
 
 def list_profiles(namespace: str | None = None) -> list[str]:
     """
-    Enumerate all known profile names, syncing bundled baselines when missing locally.
+    Enumerate all known profile names, syncing bundled defaults when missing locally.
 
     Args:
         namespace (str | None, optional): Namespace label scoped to the profile set.
@@ -487,27 +459,16 @@ def list_profiles(namespace: str | None = None) -> list[str]:
             return set()
         return {os.path.splitext(f)[0] for f in os.listdir(directory) if f.endswith(".ini")}
 
-    settings_dirs = {baseline_profiles_dir(namespace), runtime_profiles_dir(namespace)}
+    settings_dirs = {default_profiles_dir(namespace), user_profiles_dir(namespace)}
     if ns:
-        settings_dirs.add(baseline_profiles_dir(None))
-        settings_dirs.add(runtime_profiles_dir(None))
-
-    for segment in ("baseline", "runtime"):
-        for legacy_dir in [
-            _profiles_dir(_PROFILE_SEGMENT_ALIASES[segment][1], item)
-            for item in _candidate_namespaces(namespace)
-        ]:
-            settings_dirs.add(legacy_dir)
+        settings_dirs.add(default_profiles_dir(None))
+        settings_dirs.add(user_profiles_dir(None))
 
     settings_names: set[str] = set()
     for directory in settings_dirs:
         settings_names |= _collect_from(directory)
 
-    for name in sorted(settings_names):
-        runtime_profile_candidates(name, namespace)
-        baseline_profile_candidates(name, namespace)
-
-    # Also consider read-only baselines from core module and beamline plugin repositories
+    # Also consider read-only defaults from core module and beamline plugin repositories
     read_only_sources: dict[str, tuple[str, str]] = {}
     sources: list[tuple[str, str | None]] = [
         ("module", module_profiles_dir()),
@@ -523,17 +484,17 @@ def list_profiles(namespace: str | None = None) -> list[str]:
             read_only_sources.setdefault(name, (origin, os.path.join(directory, filename)))
 
     for name, (_origin, src) in sorted(read_only_sources.items()):
-        # Ensure a copy in the namespace-specific settings baseline directory.
-        dst_baseline = baseline_profile_path(name, namespace)
-        if not os.path.exists(dst_baseline):
-            os.makedirs(os.path.dirname(dst_baseline), exist_ok=True)
-            shutil.copy2(src, dst_baseline)
-        # Ensure a runtime copy exists to allow edits in the writable settings area.
-        dst_runtime = runtime_profile_path(name, namespace)
-        if not os.path.exists(dst_runtime):
-            os.makedirs(os.path.dirname(dst_runtime), exist_ok=True)
-            shutil.copy2(src, dst_runtime)
-            s = open_runtime_settings(name, namespace)
+        # Ensure a copy in the namespace-specific settings default directory
+        dst_default = default_profile_path(name, namespace)
+        if not os.path.exists(dst_default):
+            os.makedirs(os.path.dirname(dst_default), exist_ok=True)
+            shutil.copyfile(src, dst_default)
+        # Ensure a user copy exists to allow edits in the writable settings area
+        dst_user = user_profile_path(name, namespace)
+        if not os.path.exists(dst_user):
+            os.makedirs(os.path.dirname(dst_user), exist_ok=True)
+            shutil.copyfile(src, dst_user)
+            s = open_user_settings(name, namespace)
             if s.value(SETTINGS_KEYS["created_at"], "") == "":
                 s.setValue(SETTINGS_KEYS["created_at"], now_iso_utc())
 
@@ -543,34 +504,32 @@ def list_profiles(namespace: str | None = None) -> list[str]:
     return sorted(settings_names)
 
 
-def open_baseline_settings(name: str, namespace: str | None = None) -> QSettings:
+def open_default_settings(name: str, namespace: str | None = None) -> QSettings:
     """
-    Open (and create if necessary) the baseline profile settings file.
+    Open (and create if necessary) the default profile settings file.
 
     Args:
         name (str): Profile name without extension.
         namespace (str | None, optional): Namespace label. Defaults to ``None``.
 
     Returns:
-        QSettings: Settings instance targeting the baseline profile file.
+        QSettings: Settings instance targeting the default profile file.
     """
-    baseline_profile_candidates(name, namespace)
-    return QSettings(baseline_profile_path(name, namespace), QSettings.IniFormat)
+    return QSettings(default_profile_path(name, namespace), QSettings.IniFormat)
 
 
-def open_runtime_settings(name: str, namespace: str | None = None) -> QSettings:
+def open_user_settings(name: str, namespace: str | None = None) -> QSettings:
     """
-    Open (and create if necessary) the runtime profile settings file.
+    Open (and create if necessary) the user profile settings file.
 
     Args:
         name (str): Profile name without extension.
         namespace (str | None, optional): Namespace label. Defaults to ``None``.
 
     Returns:
-        QSettings: Settings instance targeting the runtime profile file.
+        QSettings: Settings instance targeting the user profile file.
     """
-    runtime_profile_candidates(name, namespace)
-    return QSettings(runtime_profile_path(name, namespace), QSettings.IniFormat)
+    return QSettings(user_profile_path(name, namespace), QSettings.IniFormat)
 
 
 def _app_settings() -> QSettings:
@@ -800,26 +759,26 @@ def read_manifest(settings: QSettings) -> list[dict]:
     return items
 
 
-def restore_runtime_from_baseline(name: str, namespace: str | None = None) -> None:
+def restore_user_from_default(name: str, namespace: str | None = None) -> None:
     """
-    Copy the baseline profile to the runtime profile, preserving quick-select flag.
+    Copy the default profile to the user profile, preserving quick-select flag.
 
     Args:
         name(str): Profile name without extension.
         namespace(str | None, optional): Namespace label. Defaults to ``None``.
     """
     src = None
-    for candidate in baseline_profile_candidates(name, namespace):
+    for candidate in default_profile_candidates(name, namespace):
         if os.path.exists(candidate):
             src = candidate
             break
     if not src:
         return
-    dst = runtime_profile_path(name, namespace)
+    dst = user_profile_path(name, namespace)
     preserve_quick_select = is_quick_select(name, namespace)
     os.makedirs(os.path.dirname(dst), exist_ok=True)
     shutil.copyfile(src, dst)
-    s = open_runtime_settings(name, namespace)
+    s = open_user_settings(name, namespace)
     if not s.value(SETTINGS_KEYS["created_at"], ""):
         s.setValue(SETTINGS_KEYS["created_at"], now_iso_utc())
     if preserve_quick_select:
@@ -837,9 +796,9 @@ def is_quick_select(name: str, namespace: str | None = None) -> bool:
     Returns:
         bool: True if quick-select is enabled for the profile.
     """
-    s = _existing_runtime_settings(name, namespace)
+    s = _existing_user_settings(name, namespace)
     if s is None:
-        s = _existing_baseline_settings(name, namespace)
+        s = _existing_default_settings(name, namespace)
     if s is None:
         return False
     return s.value(SETTINGS_KEYS["is_quick_select"], False, type=bool)
@@ -854,13 +813,13 @@ def set_quick_select(name: str, enabled: bool, namespace: str | None = None) ->
         enabled(bool): True to enable quick-select, False to disable.
         namespace(str | None, optional): Namespace label. Defaults to ``None``.
     """
-    s = open_runtime_settings(name, namespace)
+    s = open_user_settings(name, namespace)
     s.setValue(SETTINGS_KEYS["is_quick_select"], bool(enabled))
 
 
 def list_quick_profiles(namespace: str | None = None) -> list[str]:
     """
-    List only profiles that have quick-select enabled (runtime wins over baseline).
+    List only profiles that have quick-select enabled (user wins over default).
 
     Args:
         namespace(str | None, optional): Namespace label. Defaults to ``None``.
@@ -950,8 +909,8 @@ class ProfileInfo(BaseModel):
     is_quick_select: bool = False
     widget_count: int = 0
     size_kb: int = 0
-    runtime_path: str = ""
-    baseline_path: str = ""
+    user_path: str = ""
+    default_path: str = ""
     origin: ProfileOrigin = "unknown"
     is_read_only: bool = False
 
@@ -965,19 +924,19 @@ def get_profile_info(name: str, namespace: str | None = None) -> ProfileInfo:
         namespace (str | None, optional): Namespace label. Defaults to ``None``.
 
     Returns:
-        ProfileInfo: Structured profile metadata, preferring the runtime copy when present.
+        ProfileInfo: Structured profile metadata, preferring the user copy when present.
     """
-    runtime_paths = runtime_profile_candidates(name, namespace)
-    baseline_paths = baseline_profile_candidates(name, namespace)
-    r_path = next((p for p in runtime_paths if os.path.exists(p)), runtime_paths[0])
-    b_path = next((p for p in baseline_paths if os.path.exists(p)), baseline_paths[0])
+    user_paths = user_profile_candidates(name, namespace)
+    default_paths = default_profile_candidates(name, namespace)
+    u_path = next((p for p in user_paths if os.path.exists(p)), user_paths[0])
+    d_path = next((p for p in default_paths if os.path.exists(p)), default_paths[0])
     origin = profile_origin(name, namespace)
     read_only = origin in {"module", "plugin"}
-    prefer_runtime = os.path.exists(r_path)
-    if prefer_runtime:
-        s = QSettings(r_path, QSettings.IniFormat)
-    elif os.path.exists(b_path):
-        s = QSettings(b_path, QSettings.IniFormat)
+    prefer_user = os.path.exists(u_path)
+    if prefer_user:
+        s = QSettings(u_path, QSettings.IniFormat)
+    elif os.path.exists(d_path):
+        s = QSettings(d_path, QSettings.IniFormat)
     else:
         s = None
     if s is None:
@@ -998,14 +957,14 @@ def get_profile_info(name: str, namespace: str | None = None) -> ProfileInfo:
             is_quick_select=False,
             widget_count=0,
             size_kb=0,
-            runtime_path=r_path,
-            baseline_path=b_path,
+            user_path=u_path,
+            default_path=d_path,
             origin=origin,
             is_read_only=read_only,
         )
 
     created = s.value(SETTINGS_KEYS["created_at"], "", type=str) or now_iso_utc()
-    src_path = r_path if prefer_runtime else b_path
+    src_path = u_path if prefer_user else d_path
     modified = _file_modified_iso(src_path)
     count = _manifest_count(s)
     try:
@@ -1031,8 +990,8 @@ def get_profile_info(name: str, namespace: str | None = None) -> ProfileInfo:
         is_quick_select=is_quick_select(name, namespace),
         widget_count=count,
         size_kb=size_kb,
-        runtime_path=r_path,
-        baseline_path=b_path,
+        user_path=u_path,
+        default_path=d_path,
         origin=origin,
         is_read_only=read_only,
     )
@@ -1040,7 +999,7 @@ def get_profile_info(name: str, namespace: str | None = None) -> ProfileInfo:
 
 def load_profile_screenshot(name: str, namespace: str | None = None) -> QPixmap | None:
     """
-    Load the stored screenshot pixmap for a profile from settings (runtime preferred).
+    Load the stored screenshot pixmap for a profile from settings (user preferred).
 
     Args:
         name (str): Profile name without extension.
@@ -1049,17 +1008,17 @@ def load_profile_screenshot(name: str, namespace: str | None = None) -> QPixmap
     Returns:
         QPixmap | None: Screenshot pixmap or ``None`` if unavailable.
     """
-    s = _existing_runtime_settings(name, namespace)
+    s = _existing_user_settings(name, namespace)
     if s is None:
-        s = _existing_baseline_settings(name, namespace)
+        s = _existing_default_settings(name, namespace)
     if s is None:
         return None
     return _load_screenshot_from_settings(s)
 
 
-def load_baseline_profile_screenshot(name: str, namespace: str | None = None) -> QPixmap | None:
+def load_default_profile_screenshot(name: str, namespace: str | None = None) -> QPixmap | None:
     """
-    Load the screenshot from the baseline profile copy, if available.
+    Load the screenshot from the default profile copy, if available.
 
     Args:
         name (str): Profile name without extension.
@@ -1068,15 +1027,15 @@ def load_baseline_profile_screenshot(name: str, namespace: str | None = None) ->
     Returns:
         QPixmap | None: Screenshot pixmap or ``None`` if unavailable.
     """
-    s = _existing_baseline_settings(name, namespace)
+    s = _existing_default_settings(name, namespace)
     if s is None:
         return None
     return _load_screenshot_from_settings(s)
 
 
-def load_runtime_profile_screenshot(name: str, namespace: str | None = None) -> QPixmap | None:
+def load_user_profile_screenshot(name: str, namespace: str | None = None) -> QPixmap | None:
     """
-    Load the screenshot from the runtime profile copy, if available.
+    Load the screenshot from the user profile copy, if available.
 
     Args:
         name (str): Profile name without extension.
@@ -1085,7 +1044,7 @@ def load_runtime_profile_screenshot(name: str, namespace: str | None = None) ->
     Returns:
         QPixmap | None: Screenshot pixmap or ``None`` if unavailable.
     """
-    s = _existing_runtime_settings(name, namespace)
+    s = _existing_user_settings(name, namespace)
     if s is None:
         return None
     return _load_screenshot_from_settings(s)

bec_widgets/widgets/containers/advanced_dock_area/settings/dialogs.py

@@ -160,7 +160,7 @@ class SaveProfileDialog(QDialog):
                 self,
                 "Read-only profile",
                 (
-                    f"'{name}' is a baseline profile provided by {provider} and cannot be overwritten.\n"
+                    f"'{name}' is a default profile provided by {provider} and cannot be overwritten.\n"
                     "Please choose a different name."
                 ),
             )
@@ -179,7 +179,7 @@ class SaveProfileDialog(QDialog):
                 "Overwrite profile",
                 (
                     f"A profile named '{name}' already exists.\n\n"
-                    "Overwriting will update both the runtime profile and its restore baseline.\n"
+                    "Overwriting will update both the saved profile and its restore default.\n"
                     "Do you want to continue?"
                 ),
                 QMessageBox.StandardButton.Yes | QMessageBox.StandardButton.No,
@@ -257,24 +257,21 @@ class PreviewPanel(QGroupBox):
 
 class RestoreProfileDialog(QDialog):
     """
-    Confirmation dialog that previews the current runtime screenshot against the baseline.
+    Confirmation dialog that previews the current profile screenshot against the default baseline.
     """
 
     def __init__(
-        self,
-        parent: QWidget | None,
-        current_pixmap: QPixmap | None,
-        baseline_pixmap: QPixmap | None,
+        self, parent: QWidget | None, current_pixmap: QPixmap | None, default_pixmap: QPixmap | None
     ):
         super().__init__(parent)
-        self.setWindowTitle("Restore Profile to Baseline")
+        self.setWindowTitle("Restore Profile to Default")
         self.setModal(True)
         self.resize(880, 480)
 
         layout = QVBoxLayout(self)
 
         info_label = QLabel(
-            "Restoring will discard your runtime layout and replace it with the baseline profile."
+            "Restoring will discard your custom layout and replace it with the default profile."
         )
         info_label.setWordWrap(True)
         layout.addWidget(info_label)
@@ -283,7 +280,7 @@ class RestoreProfileDialog(QDialog):
         layout.addLayout(preview_row)
 
         current_preview = PreviewPanel("Current", current_pixmap, self)
-        baseline_preview = PreviewPanel("Baseline", baseline_pixmap, self)
+        default_preview = PreviewPanel("Default", default_pixmap, self)
 
         # Equal expansion left/right
         preview_row.addWidget(current_preview, 1)
@@ -295,7 +292,7 @@ class RestoreProfileDialog(QDialog):
         arrow_label.setSizePolicy(QSizePolicy.Fixed, QSizePolicy.Expanding)
         preview_row.addWidget(arrow_label)
 
-        preview_row.addWidget(baseline_preview, 1)
+        preview_row.addWidget(default_preview, 1)
 
         # Enforce equal stretch for both previews
         preview_row.setStretch(0, 1)
@@ -303,7 +300,7 @@ class RestoreProfileDialog(QDialog):
         preview_row.setStretch(2, 1)
 
         warn_label = QLabel(
-            "This action cannot be undone. Do you want to restore the baseline layout now?"
+            "This action cannot be undone. Do you want to restore the default layout now?"
         )
         warn_label.setWordWrap(True)
         layout.addWidget(warn_label)
@@ -327,7 +324,7 @@ class RestoreProfileDialog(QDialog):
 
     @staticmethod
     def confirm(
-        parent: QWidget | None, current_pixmap: QPixmap | None, baseline_pixmap: QPixmap | None
+        parent: QWidget | None, current_pixmap: QPixmap | None, default_pixmap: QPixmap | None
     ) -> bool:
-        dialog = RestoreProfileDialog(parent, current_pixmap, baseline_pixmap)
+        dialog = RestoreProfileDialog(parent, current_pixmap, default_pixmap)
         return dialog.exec() == QDialog.Accepted

bec_widgets/widgets/containers/advanced_dock_area/settings/workspace_manager.py

@@ -28,7 +28,7 @@ from qtpy.QtWidgets import (
 
 from bec_widgets import BECWidget, SafeSlot
 from bec_widgets.utils.colors import get_accent_colors
-from bec_widgets.widgets.containers.dock_area.profile_utils import (
+from bec_widgets.widgets.containers.advanced_dock_area.profile_utils import (
     get_profile_info,
     is_quick_select,
     list_profiles,
@@ -48,7 +48,7 @@ class WorkSpaceManager(BECWidget, QWidget):
     HEADERS = ["Actions", "Profile", "Author"]
 
     def __init__(
-        self, parent=None, target_widget=None, active_profile: str | None = None, **kwargs
+        self, parent=None, target_widget=None, default_profile: str | None = None, **kwargs
     ):
         super().__init__(parent=parent, **kwargs)
         self.target_widget = target_widget
@@ -59,13 +59,13 @@ class WorkSpaceManager(BECWidget, QWidget):
         self._init_ui()
         if self.target_widget is not None and hasattr(self.target_widget, "profile_changed"):
             self.target_widget.profile_changed.connect(self.on_profile_changed)
-        if active_profile is not None:
-            self._select_by_name(active_profile)
-            self._show_profile_details(active_profile)
+        if default_profile is not None:
+            self._select_by_name(default_profile)
+            self._show_profile_details(default_profile)
 
     def _init_ui(self):
         self.root_layout = QHBoxLayout(self)
-        self.splitter = QSplitter(Qt.Orientation.Horizontal, self)
+        self.splitter = QSplitter(Qt.Horizontal, self)
         self.root_layout.addWidget(self.splitter)
 
         # Init components
@@ -89,9 +89,7 @@ class WorkSpaceManager(BECWidget, QWidget):
         left_panel.setMinimumWidth(220)
 
         # Make the screenshot preview expand to fill remaining space
-        self.screenshot_label.setSizePolicy(
-            QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Expanding
-        )
+        self.screenshot_label.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding)
 
         self.right_box = QGroupBox("Profile Screenshot Preview", self)
         right_col = QVBoxLayout(self.right_box)
@@ -252,8 +250,8 @@ class WorkSpaceManager(BECWidget, QWidget):
             ("Quick select", "Yes" if info.is_quick_select else "No"),
             ("Widgets", str(info.widget_count)),
             ("Size (KB)", str(info.size_kb)),
-            ("Runtime path", info.runtime_path or ""),
-            ("Baseline path", info.baseline_path or ""),
+            ("User path", info.user_path or ""),
+            ("Default path", info.default_path or ""),
         ]
         for k, v in entries:
             self.profile_details_tree.addTopLevelItem(QTreeWidgetItem([k, v]))
@@ -332,7 +330,7 @@ class WorkSpaceManager(BECWidget, QWidget):
             return
 
         self.target_widget.save_profile_dialog()
-        # BECDockArea will emit profile_changed which will trigger table refresh,
+        # AdvancedDockArea will emit profile_changed which will trigger table refresh,
         # but ensure the UI stays in sync even if the signal is delayed.
         self.render_table()
         current = getattr(self.target_widget, "_current_profile_name", None)

bec_widgets/widgets/containers/advanced_dock_area/toolbar_components/workspace_actions.py

@@ -10,7 +10,7 @@ from bec_widgets import SafeSlot
 from bec_widgets.utils.toolbars.actions import MaterialIconAction, WidgetAction
 from bec_widgets.utils.toolbars.bundles import ToolbarBundle, ToolbarComponents
 from bec_widgets.utils.toolbars.connections import BundleConnection
-from bec_widgets.widgets.containers.dock_area.profile_utils import list_quick_profiles
+from bec_widgets.widgets.containers.advanced_dock_area.profile_utils import list_quick_profiles
 
 
 class ProfileComboBox(QComboBox):
@@ -24,30 +24,24 @@ class ProfileComboBox(QComboBox):
     def set_quick_profile_provider(self, provider: Callable[[], list[str]]) -> None:
         self._quick_provider = provider
 
-    def _refresh_profiles(
-        self, current_text: str, active_profile: str | None = None, show_empty_profile: bool = False
-    ) -> None:
+    def refresh_profiles(self, active_profile: str | None = None):
+        """
+        Refresh the profile list and ensure the active profile is visible.
+
+        Args:
+            active_profile(str | None): The currently active profile name.
+        """
+
+        current_text = active_profile or self.currentText()
+        self.blockSignals(True)
         self.clear()
 
         quick_profiles = self._quick_provider()
         quick_set = set(quick_profiles)
 
-        items: list[str] = []
-        if show_empty_profile:
-            items.append("")
-
+        items = list(quick_profiles)
         if active_profile and active_profile not in quick_set:
-            items.append(active_profile)
-
-        for profile in quick_profiles:
-            if profile not in items:
-                items.append(profile)
-
-        if active_profile and active_profile not in quick_set:
-            # keep active profile at the top when not in quick list
-            items.remove(active_profile)
-            insert_pos = 1 if show_empty_profile else 0
-            items.insert(insert_pos, active_profile)
+            items.insert(0, active_profile)
 
         for profile in items:
             self.addItem(profile)
@@ -58,15 +52,6 @@ class ProfileComboBox(QComboBox):
             self.setItemData(idx, None, Qt.ItemDataRole.ToolTipRole)
             self.setItemData(idx, None, Qt.ItemDataRole.ForegroundRole)
 
-            if profile == "":
-                self.setItemData(idx, "Unsaved empty workspace", Qt.ItemDataRole.ToolTipRole)
-                if active_profile is None:
-                    font = QFont(self.font())
-                    font.setItalic(True)
-                    self.setItemData(idx, font, Qt.ItemDataRole.FontRole)
-                    self.setCurrentIndex(idx)
-                continue
-
             if active_profile and profile == active_profile:
                 tooltip = "Active workspace profile"
                 if profile not in quick_set:
@@ -84,52 +69,27 @@ class ProfileComboBox(QComboBox):
                 self.setItemData(idx, "Not in quick select", Qt.ItemDataRole.ToolTipRole)
 
         # Restore selection if possible
-        if show_empty_profile and active_profile is None:
-            empty_idx = self.findText("")
-            if empty_idx >= 0:
-                self.setCurrentIndex(empty_idx)
-        else:
-            index = self.findText(current_text)
-            if index >= 0:
-                self.setCurrentIndex(index)
+        index = self.findText(current_text)
+        if index >= 0:
+            self.setCurrentIndex(index)
 
+        self.blockSignals(False)
         if active_profile and self.currentText() != active_profile:
             idx = self.findText(active_profile)
             if idx >= 0:
                 self.setCurrentIndex(idx)
-        if show_empty_profile and self.currentText() == "":
-            self.setToolTip("Unsaved empty workspace")
-        elif active_profile and active_profile not in quick_set:
+        if active_profile and active_profile not in quick_set:
             self.setToolTip("Active profile is not in quick select")
         else:
             self.setToolTip("")
 
-    def refresh_profiles(
-        self, active_profile: str | None = None, show_empty_profile: bool = False
-    ) -> None:
-        """
-        Refresh the profile list and ensure the active profile is visible.
-
-        Args:
-            active_profile(str | None): The currently active profile name.
-            show_empty_profile(bool): If True, show an explicit empty unsaved workspace entry.
-        """
-
-        current_text = active_profile or self.currentText()
-        was_blocked = self.blockSignals(True)
-        try:
-            self._refresh_profiles(current_text, active_profile, show_empty_profile)
-        finally:
-            self.blockSignals(was_blocked)
-
 
 def workspace_bundle(components: ToolbarComponents, enable_tools: bool = True) -> ToolbarBundle:
     """
-    Creates a workspace toolbar bundle for BECDockArea.
+    Creates a workspace toolbar bundle for AdvancedDockArea.
 
     Args:
         components (ToolbarComponents): The components to be added to the bundle.
-        enable_tools(bool): If True, show the workspace management tools; otherwise, only show the profile combo.
 
     Returns:
         ToolbarBundle: The workspace toolbar bundle.
@@ -151,15 +111,15 @@ def workspace_bundle(components: ToolbarComponents, enable_tools: bool = True) -
     components.get_action("save_workspace").action.setVisible(enable_tools)
 
     components.add_safe(
-        "reset_baseline_workspace",
+        "reset_default_workspace",
         MaterialIconAction(
             icon_name="undo",
-            tooltip="Restore Baseline Profile",
+            tooltip="Refresh Current Workspace",
             checkable=False,
             parent=components.toolbar,
         ),
     )
-    components.get_action("reset_baseline_workspace").action.setVisible(enable_tools)
+    components.get_action("reset_default_workspace").action.setVisible(enable_tools)
 
     components.add_safe(
         "manage_workspaces",
@@ -172,14 +132,14 @@ def workspace_bundle(components: ToolbarComponents, enable_tools: bool = True) -
     bundle = ToolbarBundle("workspace", components)
     bundle.add_action("workspace_combo")
     bundle.add_action("save_workspace")
-    bundle.add_action("reset_baseline_workspace")
+    bundle.add_action("reset_default_workspace")
     bundle.add_action("manage_workspaces")
     return bundle
 
 
 class WorkspaceConnection(BundleConnection):
     """
-    Connection class for workspace actions in BECDockArea.
+    Connection class for workspace actions in AdvancedDockArea.
     """
 
     def __init__(self, components: ToolbarComponents, target_widget=None):
@@ -202,9 +162,9 @@ class WorkspaceConnection(BundleConnection):
             self.target_widget.load_profile
         )
 
-        reset_action = self.components.get_action("reset_baseline_workspace").action
+        reset_action = self.components.get_action("reset_default_workspace").action
         if reset_action.isVisible():
-            reset_action.triggered.connect(self._reset_workspace_to_baseline)
+            reset_action.triggered.connect(self._reset_workspace_to_default)
 
         manage_action = self.components.get_action("manage_workspaces").action
         if manage_action.isVisible():
@@ -221,9 +181,9 @@ class WorkspaceConnection(BundleConnection):
             self.target_widget.load_profile
         )
 
-        reset_action = self.components.get_action("reset_baseline_workspace").action
+        reset_action = self.components.get_action("reset_default_workspace").action
         if reset_action.isVisible():
-            reset_action.triggered.disconnect(self._reset_workspace_to_baseline)
+            reset_action.triggered.disconnect(self._reset_workspace_to_default)
 
         manage_action = self.components.get_action("manage_workspaces").action
         if manage_action.isVisible():
@@ -231,8 +191,8 @@ class WorkspaceConnection(BundleConnection):
         self._connected = False
 
     @SafeSlot()
-    def _reset_workspace_to_baseline(self):
+    def _reset_workspace_to_default(self):
         """
         Refreshes the current workspace.
         """
-        self.target_widget.restore_baseline_profile(show_dialog=True)
+        self.target_widget.restore_user_profile_from_default()

bec_widgets/widgets/containers/auto_update/auto_updates.py

@@ -7,7 +7,7 @@ from bec_lib.logger import bec_logger
 from bec_lib.messages import ScanStatusMessage
 
 from bec_widgets.utils.error_popups import SafeSlot
-from bec_widgets.widgets.containers.dock_area.dock_area import BECDockArea
+from bec_widgets.widgets.containers.advanced_dock_area.advanced_dock_area import AdvancedDockArea
 from bec_widgets.widgets.containers.main_window.main_window import BECMainWindow
 from bec_widgets.widgets.containers.qt_ads import CDockWidget
 
@@ -37,16 +37,16 @@ class AutoUpdates(BECMainWindow):
     ):
         super().__init__(parent=parent, gui_id=gui_id, window_title=window_title, **kwargs)
 
-        self.dock_area = BECDockArea(
+        self.dock_area = AdvancedDockArea(
             parent=self,
             object_name="dock_area",
             enable_profile_management=False,
-            startup_profile="skip",
+            restore_initial_profile=False,
         )
         self.setCentralWidget(self.dock_area)
         self._auto_update_selected_device: str | None = None
 
-        self._default_dock = None  # type: ignore
+        self._default_dock = None  # type:ignore
         self.current_widget: BECWidget | None = None
         self.dock_name = None
         self._enabled = True
@@ -63,7 +63,7 @@ class AutoUpdates(BECMainWindow):
         Disconnect all connections for the auto updates.
         """
         self.bec_dispatcher.disconnect_slot(
-            self._on_scan_status, MessageEndpoints.scan_status()  # type: ignore
+            self._on_scan_status, MessageEndpoints.scan_status()  # type:ignore
         )
 
     @property
@@ -244,10 +244,10 @@ class AutoUpdates(BECMainWindow):
         wf = self.set_dock_to_widget("Waveform")
 
         # Get the scan report devices reported by the scan
-        dev_x = info.scan_report_devices[0]  # type: ignore
+        dev_x = info.scan_report_devices[0]  # type:ignore
 
         # For the y axis, get the selected device
-        dev_y = self.get_selected_device(info.readout_priority["monitored"])  # type: ignore
+        dev_y = self.get_selected_device(info.readout_priority["monitored"])  # type:ignore
         if not dev_y:
             return
 
@@ -256,8 +256,8 @@ class AutoUpdates(BECMainWindow):
         # as the label and title
         wf.clear_all()
         wf.plot(
-            device_x=dev_x,
-            device_y=dev_y,
+            x_name=dev_x,
+            y_name=dev_y,
             label=f"Scan {info.scan_number} - {dev_y}",
             title=f"Scan {info.scan_number}",
             x_label=dev_x,
@@ -265,7 +265,7 @@ class AutoUpdates(BECMainWindow):
         )
 
         logger.info(
-            f"Auto Update [simple_line_scan]: Started plot with: device_x={dev_x}, device_y={dev_y}"
+            f"Auto Update [simple_line_scan]: Started plot with: x_name={dev_x}, y_name={dev_y}"
         )
 
     def simple_grid_scan(self, info: ScanStatusMessage) -> None:
@@ -279,8 +279,8 @@ class AutoUpdates(BECMainWindow):
         scatter = self.set_dock_to_widget("ScatterWaveform")
 
         # Get the scan report devices reported by the scan
-        dev_x, dev_y = info.scan_report_devices[0], info.scan_report_devices[1]  # type: ignore
-        dev_z = self.get_selected_device(info.readout_priority["monitored"])  # type: ignore
+        dev_x, dev_y = info.scan_report_devices[0], info.scan_report_devices[1]  # type:ignore
+        dev_z = self.get_selected_device(info.readout_priority["monitored"])  # type:ignore
 
         if None in (dev_x, dev_y, dev_z):
             return
@@ -288,14 +288,11 @@ class AutoUpdates(BECMainWindow):
         # Clear the scatter waveform widget and plot the data
         scatter.clear_all()
         scatter.plot(
-            device_x=dev_x,
-            device_y=dev_y,
-            device_z=dev_z,
-            label=f"Scan {info.scan_number} - {dev_z}",
+            x_name=dev_x, y_name=dev_y, z_name=dev_z, label=f"Scan {info.scan_number} - {dev_z}"
         )
 
         logger.info(
-            f"Auto Update [simple_grid_scan]: Started plot with: device_x={dev_x}, device_y={dev_y}, device_z={dev_z}"
+            f"Auto Update [simple_grid_scan]: Started plot with: x_name={dev_x}, y_name={dev_y}, z_name={dev_z}"
         )
 
     def best_effort(self, info: ScanStatusMessage) -> None:
@@ -309,8 +306,8 @@ class AutoUpdates(BECMainWindow):
         # If the scan report devices are empty, there is nothing we can do
         if not info.scan_report_devices:
             return
-        dev_x = info.scan_report_devices[0]  # type: ignore
-        dev_y = self.get_selected_device(info.readout_priority["monitored"])  # type: ignore
+        dev_x = info.scan_report_devices[0]  # type:ignore
+        dev_y = self.get_selected_device(info.readout_priority["monitored"])  # type:ignore
         if not dev_y:
             return
 
@@ -320,17 +317,15 @@ class AutoUpdates(BECMainWindow):
         # Clear the waveform widget and plot the data
         wf.clear_all()
         wf.plot(
-            device_x=dev_x,
-            device_y=dev_y,
+            x_name=dev_x,
+            y_name=dev_y,
             label=f"Scan {info.scan_number} - {dev_y}",
             title=f"Scan {info.scan_number}",
             x_label=dev_x,
             y_label=dev_y,
         )
 
-        logger.info(
-            f"Auto Update [best_effort]: Started plot with: device_x={dev_x}, device_y={dev_y}"
-        )
+        logger.info(f"Auto Update [best_effort]: Started plot with: x_name={dev_x}, y_name={dev_y}")
 
     #######################################################################
     ################# GUI Callbacks #######################################

bec_widgets/widgets/containers/explorer/explorer.py

@@ -101,12 +101,14 @@ class Explorer(BECWidget, QWidget):
         palette = get_theme_palette()
         separator_color = palette.mid().color()
 
-        self.splitter.setStyleSheet(f"""
+        self.splitter.setStyleSheet(
+            f"""
             QSplitter::handle {{
                 height: 0.1px;
                 background-color: rgba({separator_color.red()}, {separator_color.green()}, {separator_color.blue()}, 60);
             }}
-        """)
+        """
+        )
 
     def _update_spacer(self) -> None:
         """Update the spacer size based on section states"""

bec_widgets/widgets/containers/explorer/script_tree_widget.py

@@ -63,7 +63,7 @@ class ScriptTreeWidget(QWidget):
         layout.setSpacing(0)
 
         # Create tree view
-        self.tree = QTreeView(parent=self)
+        self.tree = QTreeView()
         self.tree.setHeaderHidden(True)
         self.tree.setRootIsDecorated(True)
 
@@ -71,12 +71,12 @@ class ScriptTreeWidget(QWidget):
         self.tree.setMouseTracking(True)
 
         # Create file system model
-        self.model = QFileSystemModel(parent=self)
+        self.model = QFileSystemModel()
         self.model.setNameFilters(["*.py"])
         self.model.setNameFilterDisables(False)
 
         # Create proxy model to filter out underscore directories
-        self.proxy_model = QSortFilterProxyModel(parent=self)
+        self.proxy_model = QSortFilterProxyModel()
         self.proxy_model.setFilterRegularExpression(QRegularExpression("^[^_].*"))
         self.proxy_model.setSourceModel(self.model)
         self.tree.setModel(self.proxy_model)

bec_widgets/widgets/containers/layout_manager/layout_manager.py

@@ -22,7 +22,7 @@ from qtpy.QtWidgets import (
 )
 from typeguard import typechecked
 
-from bec_widgets.utils.rpc_widget_handler import widget_handler
+from bec_widgets.cli.rpc.rpc_widget_handler import widget_handler
 
 
 class LayoutManagerWidget(QWidget):

bec_widgets/widgets/containers/main_window/addons/hover_widget.py

@@ -1,83 +1,27 @@
 import sys
 
-from qtpy import QtGui, QtWidgets
 from qtpy.QtCore import QPoint, Qt
-from qtpy.QtWidgets import (
-    QApplication,
-    QFrame,
-    QHBoxLayout,
-    QLabel,
-    QProgressBar,
-    QVBoxLayout,
-    QWidget,
-)
+from qtpy.QtWidgets import QApplication, QHBoxLayout, QLabel, QProgressBar, QVBoxLayout, QWidget
 
 
 class WidgetTooltip(QWidget):
     """Frameless, always-on-top window that behaves like a tooltip."""
 
     def __init__(self, content: QWidget) -> None:
-        super().__init__(
-            None,
-            Qt.WindowType.ToolTip
-            | Qt.WindowType.FramelessWindowHint
-            | Qt.WindowType.WindowStaysOnTopHint,
-        )
-        self.setAttribute(Qt.WidgetAttribute.WA_ShowWithoutActivating)
-        self.setAttribute(Qt.WidgetAttribute.WA_TranslucentBackground)
+        super().__init__(None, Qt.ToolTip | Qt.FramelessWindowHint | Qt.WindowStaysOnTopHint)
+        self.setAttribute(Qt.WA_ShowWithoutActivating)
         self.setMouseTracking(True)
         self.content = content
 
         layout = QVBoxLayout(self)
-        layout.setContentsMargins(14, 14, 14, 14)
-
-        self._card = QFrame(self)
-        self._card.setObjectName("WidgetTooltipCard")
-        card_layout = QVBoxLayout(self._card)
-        card_layout.setContentsMargins(12, 10, 12, 10)
-        card_layout.addWidget(self.content)
-
-        shadow = QtWidgets.QGraphicsDropShadowEffect(self._card)
-        shadow.setBlurRadius(18)
-        shadow.setOffset(0, 2)
-        shadow.setColor(QtGui.QColor(0, 0, 0, 140))
-        self._card.setGraphicsEffect(shadow)
-
-        layout.addWidget(self._card)
-        self.apply_theme()
+        layout.setContentsMargins(6, 6, 6, 6)
+        layout.addWidget(self.content)
         self.adjustSize()
 
     def leaveEvent(self, _event) -> None:
         self.hide()
 
-    def apply_theme(self) -> None:
-        palette = QApplication.palette()
-        base = palette.color(QtGui.QPalette.ColorRole.Base)
-        text = palette.color(QtGui.QPalette.ColorRole.Text)
-        border = palette.color(QtGui.QPalette.ColorRole.Mid)
-        background = QtGui.QColor(base)
-        background.setAlpha(242)
-        self._card.setStyleSheet(f"""
-            QFrame#WidgetTooltipCard {{
-                background: {background.name(QtGui.QColor.NameFormat.HexArgb)};
-                border: 1px solid {border.name()};
-                border-radius: 12px;
-            }}
-            QFrame#WidgetTooltipCard QLabel {{
-                color: {text.name()};
-                background: transparent;
-            }}
-            """)
-
     def show_above(self, global_pos: QPoint, offset: int = 8) -> None:
-        """
-        Show the tooltip above a global position, adjusting to stay within screen bounds.
-
-        Args:
-            global_pos(QPoint): The global position to show above.
-            offset(int, optional): The vertical offset from the global position. Defaults to 8 pixels.
-        """
-        self.apply_theme()
         self.adjustSize()
         screen = QApplication.screenAt(global_pos) or QApplication.primaryScreen()
         screen_geo = screen.availableGeometry()
@@ -86,43 +30,11 @@ class WidgetTooltip(QWidget):
         x = global_pos.x() - geom.width() // 2
         y = global_pos.y() - geom.height() - offset
 
-        self._navigate_screen_coordinates(screen_geo, geom, x, y)
-
-    def show_near(self, global_pos: QPoint, offset: QPoint | None = None) -> None:
-        """
-        Show the tooltip near a global position, adjusting to stay within screen bounds.
-        By default, it will try to show below and to the right of the position,
-        but if that would cause it to go off-screen, it will flip to the other side.
-
-        Args:
-            global_pos(QPoint): The global position to show near.
-            offset(QPoint, optional): The offset from the global position. Defaults to QPoint(12, 16).
-        """
-
-        self.apply_theme()
-        self.adjustSize()
-        offset = offset or QPoint(12, 16)
-        screen = QApplication.screenAt(global_pos) or QApplication.primaryScreen()
-        screen_geo = screen.availableGeometry()
-        geom = self.geometry()
-
-        x = global_pos.x() + offset.x()
-        y = global_pos.y() + offset.y()
-
-        if x + geom.width() > screen_geo.right():
-            x = global_pos.x() - geom.width() - abs(offset.x())
-        if y + geom.height() > screen_geo.bottom():
-            y = global_pos.y() - geom.height() - abs(offset.y())
-
-        self._navigate_screen_coordinates(screen_geo, geom, x, y)
-
-    def _navigate_screen_coordinates(self, screen_geo, geom, x, y):
         x = max(screen_geo.left(), min(x, screen_geo.right() - geom.width()))
         y = max(screen_geo.top(), min(y, screen_geo.bottom() - geom.height()))
 
         self.move(x, y)
         self.show()
-        self.raise_()
 
 
 class HoverWidget(QWidget):

bec_widgets/widgets/containers/main_window/addons/notification_center/notification_banner.py

@@ -28,7 +28,7 @@ from qtpy.QtCore import QObject, QTimer
 from qtpy.QtWidgets import QApplication, QFrame, QMainWindow, QScrollArea, QWidget
 
 from bec_widgets import SafeProperty, SafeSlot
-from bec_widgets.utils.bec_connector import BECConnector
+from bec_widgets.utils import BECConnector
 from bec_widgets.utils.colors import apply_theme
 from bec_widgets.utils.widget_io import WidgetIO
 
@@ -134,13 +134,15 @@ class NotificationToast(QFrame):
         bg.setAlphaF(0.30)
         icon_bg = bg.name(QtGui.QColor.HexArgb)
         icon_btn.setFixedSize(40, 40)
-        icon_btn.setStyleSheet(f"""
+        icon_btn.setStyleSheet(
+            f"""
             QToolButton {{
                 background: {icon_bg};
                 border: none;
                 border-radius: 20px;   /* perfect circle */
             }}
-            """)
+            """
+        )
 
         title_lbl = QtWidgets.QLabel(self._title)
 
@@ -325,13 +327,15 @@ class NotificationToast(QFrame):
         bg = QtGui.QColor(SEVERITY[value.value]["color"])
         bg.setAlphaF(0.30)
         icon_bg = bg.name(QtGui.QColor.HexArgb)
-        self._icon_btn.setStyleSheet(f"""
+        self._icon_btn.setStyleSheet(
+            f"""
             QToolButton {{
                 background: {icon_bg};
                 border: none;
                 border-radius: 20px;
             }}
-            """)
+            """
+        )
         self.apply_theme(self._theme)
         # keep injected gradient in sync
         if getattr(self, "_hg_enabled", False):
@@ -387,7 +391,8 @@ class NotificationToast(QFrame):
             card_bg.setAlphaF(0.88)
             btn_hover = self._accent_color.name()
 
-        self.setStyleSheet(f"""
+        self.setStyleSheet(
+            f"""
             #NotificationToast {{
                 background: {card_bg.name(QtGui.QColor.HexArgb)};
                 border-radius: 12px;
@@ -401,15 +406,18 @@ class NotificationToast(QFrame):
                 font-size: 14px;
             }}
             #NotificationToast QPushButton:hover {{ color: {btn_hover}; }}
-            """)
+            """
+        )
         # traceback panel colours
         trace_bg = "#1e1e1e" if theme == "dark" else "#f0f0f0"
-        self.trace_view.setStyleSheet(f"""
+        self.trace_view.setStyleSheet(
+            f"""
             background:{trace_bg};
             color:{palette['body']};
             border:none;
             border-radius:8px;
-            """)
+            """
+        )
 
         # icon glyph vs badge background: darker badge, lighter icon in light mode
         icon_fg = "#ffffff" if theme == "light" else self._accent_color.name()
@@ -430,13 +438,15 @@ class NotificationToast(QFrame):
         else:
             badge_bg.setAlphaF(0.30)
         icon_bg = badge_bg.name(QtGui.QColor.HexArgb)
-        self._icon_btn.setStyleSheet(f"""
+        self._icon_btn.setStyleSheet(
+            f"""
             QToolButton {{
                 background: {icon_bg};
                 border: none;
                 border-radius: 20px;
             }}
-            """)
+            """
+        )
 
         # stronger accent wash in light mode, slightly stronger in dark too
         self._accent_alpha = 110 if theme == "light" else 60
@@ -583,7 +593,8 @@ class NotificationCentre(QScrollArea):
         self.setWidgetResizable(True)
         # transparent background so only the toast cards are visible
         self.setAttribute(QtCore.Qt.WA_TranslucentBackground, True)
-        self.setStyleSheet("""
+        self.setStyleSheet(
+            """
             #NotificationCentre { background: transparent; }
             #NotificationCentre QScrollBar:vertical {
                 background: transparent;
@@ -599,7 +610,8 @@ class NotificationCentre(QScrollArea):
             #NotificationCentre QScrollBar::sub-line:vertical { height: 0; }
             #NotificationCentre QScrollBar::add-page:vertical,
             #NotificationCentre QScrollBar::sub-page:vertical { background: transparent; }
-            """)
+            """
+        )
         self.setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOff)
         self.setFrameShape(QtWidgets.QFrame.NoFrame)
         self.setFixedWidth(fixed_width)
@@ -946,7 +958,8 @@ class NotificationIndicator(QWidget):
         self._group.buttonToggled.connect(self._button_toggled)
 
         # minimalistic look: no frames or backgrounds on the buttons
-        self.setStyleSheet("""
+        self.setStyleSheet(
+            """
             QToolButton {
                 border: none;
                 background: transparent;
@@ -957,7 +970,8 @@ class NotificationIndicator(QWidget):
                 background: rgba(255, 255, 255, 40);
                 font-weight: 600;
             }
-            """)
+            """
+        )
 
         # initial state: none checked (auto‑dismiss behaviour)
         for k in kinds:

bec_widgets/widgets/containers/main_window/main_window.py

@@ -1,8 +1,8 @@
 from __future__ import annotations
 
 import os
+from typing import TYPE_CHECKING
 
-from bec_lib import bec_logger
 from bec_lib.endpoints import MessageEndpoints
 from qtpy.QtCore import QEvent, QSize, Qt, QTimer
 from qtpy.QtGui import QAction, QActionGroup, QIcon
@@ -18,10 +18,10 @@ from qtpy.QtWidgets import (
 )
 
 import bec_widgets
+from bec_widgets.utils import UILoader
 from bec_widgets.utils.bec_widget import BECWidget
 from bec_widgets.utils.colors import apply_theme
 from bec_widgets.utils.error_popups import SafeSlot
-from bec_widgets.utils.ui_loader import UILoader
 from bec_widgets.widgets.containers.main_window.addons.hover_widget import HoverWidget
 from bec_widgets.widgets.containers.main_window.addons.notification_center.notification_banner import (
     BECNotificationBroker,
@@ -31,17 +31,12 @@ from bec_widgets.widgets.containers.main_window.addons.notification_center.notif
 from bec_widgets.widgets.containers.main_window.addons.scroll_label import ScrollLabel
 from bec_widgets.widgets.containers.main_window.addons.web_links import BECWebLinksMixin
 from bec_widgets.widgets.progress.scan_progressbar.scan_progressbar import ScanProgressBar
-from bec_widgets.widgets.utility.widget_hierarchy_tree.widget_hierarchy_tree import (
-    WidgetHierarchyDialog,
-)
 
 MODULE_PATH = os.path.dirname(bec_widgets.__file__)
 
 # Ensure the application does not use the native menu bar on macOS to be consistent with linux development.
 QApplication.setAttribute(Qt.ApplicationAttribute.AA_DontUseNativeMenuBar, True)
 
-logger = bec_logger.logger
-
 
 class BECMainWindow(BECWidget, QMainWindow):
     RPC = True
@@ -54,16 +49,14 @@ class BECMainWindow(BECWidget, QMainWindow):
 
         self.app = QApplication.instance()
         self.status_bar = self.statusBar()
-        self._launcher_window = None
         self.setWindowTitle(window_title)
         self.setAttribute(Qt.WidgetAttribute.WA_DeleteOnClose, True)
 
         # Notification Centre overlay
         self.notification_centre = NotificationCentre(parent=self)  # Notification layer
-        self.notification_broker = BECNotificationBroker(parent=self)
+        self.notification_broker = BECNotificationBroker()
         self._nc_margin = 16
         self._position_notification_centre()
-        self._widget_hierarchy_dialog: WidgetHierarchyDialog | None = None
 
         # Init ui
         self._init_ui()
@@ -196,18 +189,14 @@ class BECMainWindow(BECWidget, QMainWindow):
     def _add_scan_progress_bar(self):
 
         # Setting HoverWidget for the scan progress bar - minimal and full version
-        self._scan_progress_bar_simple = ScanProgressBar(
-            self, one_line_design=True, rpc_exposed=False, rpc_passthrough_children=False
-        )
+        self._scan_progress_bar_simple = ScanProgressBar(self, one_line_design=True)
         self._scan_progress_bar_simple.show_elapsed_time = False
         self._scan_progress_bar_simple.show_remaining_time = False
         self._scan_progress_bar_simple.show_source_label = False
         self._scan_progress_bar_simple.progressbar.label_template = ""
         self._scan_progress_bar_simple.progressbar.setFixedHeight(self.SCAN_PROGRESS_HEIGHT)
         self._scan_progress_bar_simple.progressbar.setFixedWidth(self.SCAN_PROGRESS_WIDTH)
-        self._scan_progress_bar_full = ScanProgressBar(
-            self, rpc_exposed=False, rpc_passthrough_children=False
-        )
+        self._scan_progress_bar_full = ScanProgressBar(self)
         self._scan_progress_hover = HoverWidget(
             self, simple=self._scan_progress_bar_simple, full=self._scan_progress_bar_full
         )
@@ -265,7 +254,7 @@ class BECMainWindow(BECWidget, QMainWindow):
         self.ui = loader.loader(ui_file)
         self.setCentralWidget(self.ui)
 
-    def fetch_theme(self) -> str:
+    def _fetch_theme(self) -> str:
         return self.app.theme.theme
 
     def _get_launcher_from_qapp(self):
@@ -286,16 +275,6 @@ class BECMainWindow(BECWidget, QMainWindow):
         Show the launcher if it exists.
         """
         launcher = self._get_launcher_from_qapp()
-        if launcher is None:
-            from bec_widgets.applications.launch_window import LaunchWindow
-
-            cli_server = getattr(self.bec_dispatcher, "cli_server", None)
-            if cli_server is None:
-                logger.warning("Cannot open launcher: CLI server is not available.")
-                return
-            launcher = LaunchWindow(gui_id=f"{cli_server.gui_id}:launcher")
-            launcher.setAttribute(Qt.WA_ShowWithoutActivating)  # type: ignore[arg-type]
-            self._launcher_window = launcher
         if launcher:
             launcher.show()
             launcher.activateWindow()
@@ -333,11 +312,6 @@ class BECMainWindow(BECWidget, QMainWindow):
         light_theme_action.triggered.connect(lambda: self.change_theme("light"))
         dark_theme_action.triggered.connect(lambda: self.change_theme("dark"))
 
-        theme_menu.addSeparator()
-        widget_tree_action = QAction("Show Widget Hierarchy", self)
-        widget_tree_action.triggered.connect(self._show_widget_hierarchy_dialog)
-        theme_menu.addAction(widget_tree_action)
-
         # Set the default theme
         if hasattr(self.app, "theme") and self.app.theme:
             theme_name = self.app.theme.theme.lower()
@@ -421,23 +395,7 @@ class BECMainWindow(BECWidget, QMainWindow):
             return True
         return super().event(event)
 
-    def _show_widget_hierarchy_dialog(self):
-        if self._widget_hierarchy_dialog is None:
-            dialog = WidgetHierarchyDialog(root_widget=None, parent=self)
-            dialog.setAttribute(Qt.WidgetAttribute.WA_DeleteOnClose, True)
-            dialog.destroyed.connect(lambda: setattr(self, "_widget_hierarchy_dialog", None))
-            self._widget_hierarchy_dialog = dialog
-        self._widget_hierarchy_dialog.refresh()
-        self._widget_hierarchy_dialog.show()
-        self._widget_hierarchy_dialog.raise_()
-        self._widget_hierarchy_dialog.activateWindow()
-
     def cleanup(self):
-        # Widget hierarchy dialog cleanup
-        if self._widget_hierarchy_dialog is not None:
-            self._widget_hierarchy_dialog.close()
-            self._widget_hierarchy_dialog = None
-
         # Timer cleanup
         if hasattr(self, "_client_info_expire_timer") and self._client_info_expire_timer.isActive():
             self._client_info_expire_timer.stop()

bec_widgets/widgets/control/device_control/positioner_box/_base/__init__.py

@@ -0,0 +1,3 @@
+from .positioner_box_base import PositionerBoxBase
+
+__ALL__ = ["PositionerBoxBase"]

bec_widgets/widgets/control/device_control/positioner_box/_base/positioner_box_base.py

@@ -14,10 +14,10 @@ from qtpy.QtWidgets import (
     QLineEdit,
     QPushButton,
     QVBoxLayout,
-    QWidget,
 )
 
 from bec_widgets.utils.bec_widget import BECWidget
+from bec_widgets.utils.compact_popup import CompactPopupWidget
 from bec_widgets.widgets.control.device_control.position_indicator.position_indicator import (
     PositionIndicator,
 )
@@ -43,7 +43,7 @@ class DeviceUpdateUIComponents(TypedDict):
     units: QLabel
 
 
-class PositionerBoxBase(BECWidget, QWidget):
+class PositionerBoxBase(BECWidget, CompactPopupWidget):
     """Contains some core logic for positioner box widgets"""
 
     current_path = ""
@@ -57,10 +57,7 @@ class PositionerBoxBase(BECWidget, QWidget):
             parent: The parent widget.
             device (Positioner): The device to control.
         """
-        super().__init__(parent=parent, **kwargs)
-        self.main_layout = QVBoxLayout(self)
-        self.main_layout.setContentsMargins(0, 0, 0, 0)
-        self.main_layout.setSpacing(0)
+        super().__init__(parent=parent, layout=QVBoxLayout, **kwargs)
         self._dialog = None
         self.get_bec_shortcuts()
 
@@ -126,7 +123,7 @@ class PositionerBoxBase(BECWidget, QWidget):
             queue="emergency",
             metadata={"RID": request_id, "response": False},
         )
-        self.client.connector.send(MessageEndpoints.scan_queue_request(self.client.username), msg)
+        self.client.connector.send(MessageEndpoints.scan_queue_request(), msg)
 
     # pylint: disable=unused-argument
     def _on_device_readback(
@@ -176,9 +173,11 @@ class PositionerBoxBase(BECWidget, QWidget):
             if is_moving:
                 spinner.start()
                 spinner.setToolTip("Device is moving")
+                self.set_global_state("warning")
             else:
                 spinner.stop()
                 spinner.setToolTip("Device is idle")
+                self.set_global_state("success")
         else:
             spinner.setVisible(False)
 
@@ -197,8 +196,9 @@ class PositionerBoxBase(BECWidget, QWidget):
             pos = (readback_val - limits[0]) / (limits[1] - limits[0])
             position_indicator.set_value(pos)
 
-    @staticmethod
-    def _update_limits_ui(limits: tuple[float, float], position_indicator, setpoint_validator):
+    def _update_limits_ui(
+        self, limits: tuple[float, float], position_indicator, setpoint_validator
+    ):
         if limits is not None and limits[0] != limits[1]:
             position_indicator.setToolTip(f"Min: {limits[0]}, Max: {limits[1]}")
             setpoint_validator.setRange(limits[0], limits[1])
@@ -223,9 +223,8 @@ class PositionerBoxBase(BECWidget, QWidget):
         self.bec_dispatcher.disconnect_slot(slot, MessageEndpoints.device_readback(old_device))
         self.bec_dispatcher.connect_slot(slot, MessageEndpoints.device_readback(new_device))
 
-    @staticmethod
-    def _toggle_enable_buttons(ui: DeviceUpdateUIComponents, enable: bool) -> None:
-        """Toggle enable/disable on available buttons
+    def _toggle_enable_buttons(self, ui: DeviceUpdateUIComponents, enable: bool) -> None:
+        """Toogle enable/disable on available buttons
 
         Args:
             enable (bool): Enable buttons

bec_widgets/widgets/control/device_control/positioner_box/positioner_box/positioner_box.py

@@ -7,16 +7,16 @@ import os
 from bec_lib.device import Positioner
 from bec_lib.logger import bec_logger
 from bec_qthemes import material_icon
-from qtpy.QtCore import Qt, Signal
+from qtpy.QtCore import Signal
 from qtpy.QtGui import QDoubleValidator
 from qtpy.QtWidgets import QDoubleSpinBox
 
+from bec_widgets.utils import UILoader
 from bec_widgets.utils.colors import apply_theme, get_accent_colors
 from bec_widgets.utils.error_popups import SafeProperty, SafeSlot
-from bec_widgets.utils.ui_loader import UILoader
-from bec_widgets.widgets.control.device_control.positioner_box.positioner_box_base import (
+from bec_widgets.widgets.control.device_control.positioner_box._base import PositionerBoxBase
+from bec_widgets.widgets.control.device_control.positioner_box._base.positioner_box_base import (
     DeviceUpdateUIComponents,
-    PositionerBoxBase,
 )
 
 logger = bec_logger.logger
@@ -63,16 +63,9 @@ class PositionerBox(PositionerBoxBase):
 
         self.ui = UILoader(self).loader(os.path.join(self.current_path, self.ui_file))
 
-        self.main_layout.addWidget(self.ui)
-        self.main_layout.setSpacing(0)
-        self.main_layout.setContentsMargins(0, 0, 0, 0)
-        self.main_layout.setAlignment(Qt.AlignmentFlag.AlignVCenter | Qt.AlignmentFlag.AlignHCenter)
-        ui_min_size = self.ui.minimumSize()
-        ui_min_hint = self.ui.minimumSizeHint()
-        self.setMinimumSize(
-            max(ui_min_size.width(), ui_min_hint.width()),
-            max(ui_min_size.height(), ui_min_hint.height()),
-        )
+        self.addWidget(self.ui)
+        self.layout.setSpacing(0)
+        self.layout.setContentsMargins(0, 0, 0, 0)
 
         # fix the size of the device box
         db = self.ui.device_box
@@ -115,6 +108,8 @@ class PositionerBox(PositionerBoxBase):
             return
         old_device = self._device
         self._device = value
+        if not self.label:
+            self.label = value
         self.device_changed.emit(old_device, value)
 
     @SafeProperty(bool)

bec_widgets/widgets/control/device_control/positioner_box/positioner_box_2d/positioner_box_2d.py

@@ -12,12 +12,12 @@ from qtpy.QtCore import Signal
 from qtpy.QtGui import QDoubleValidator
 from qtpy.QtWidgets import QDoubleSpinBox
 
+from bec_widgets.utils import UILoader
 from bec_widgets.utils.colors import apply_theme
 from bec_widgets.utils.error_popups import SafeProperty, SafeSlot
-from bec_widgets.utils.ui_loader import UILoader
-from bec_widgets.widgets.control.device_control.positioner_box.positioner_box_base import (
+from bec_widgets.widgets.control.device_control.positioner_box._base import PositionerBoxBase
+from bec_widgets.widgets.control.device_control.positioner_box._base.positioner_box_base import (
     DeviceUpdateUIComponents,
-    PositionerBoxBase,
 )
 
 logger = bec_logger.logger
@@ -96,9 +96,9 @@ class PositionerBox2D(PositionerBoxBase):
 
     def connect_ui(self):
         """Connect the UI components to signals, data, or routines"""
-        self.main_layout.addWidget(self.ui)
-        self.main_layout.setSpacing(0)
-        self.main_layout.setContentsMargins(0, 0, 0, 0)
+        self.addWidget(self.ui)
+        self.layout.setSpacing(0)
+        self.layout.setContentsMargins(0, 0, 0, 0)
 
         def _init_ui(val: QDoubleValidator, device_id: DeviceId):
             ui = self._device_ui_components_hv(device_id)
@@ -200,6 +200,7 @@ class PositionerBox2D(PositionerBoxBase):
             return
         old_device = self._device_hor
         self._device_hor = value
+        self.label = f"{self._device_hor}, {self._device_ver}"
         self.device_changed_hor.emit(old_device, value)
         self._init_device(self.device_hor, self.position_update_hor.emit, self.update_limits_hor)
 
@@ -219,6 +220,7 @@ class PositionerBox2D(PositionerBoxBase):
             return
         old_device = self._device_ver
         self._device_ver = value
+        self.label = f"{self._device_hor}, {self._device_ver}"
         self.device_changed_ver.emit(old_device, value)
         self._init_device(self.device_ver, self.position_update_ver.emit, self.update_limits_ver)
 

bec_widgets/widgets/control/device_control/positioner_box/positioner_control_line/positioner_control_line.py

@@ -1,8 +1,6 @@
 import os
 
 from bec_lib.device import Positioner
-from qtpy.QtCore import Qt
-from qtpy.QtWidgets import QSizePolicy
 
 from bec_widgets.widgets.control.device_control.positioner_box import PositionerBox
 
@@ -24,82 +22,7 @@ class PositionerControlLine(PositionerBox):
             device (Positioner): The device to control.
         """
         self.current_path = os.path.dirname(__file__)
-        self._indicator_switch_width = 0
-        self._horizontal_indicator_width = 0
-        self._vertical_indicator_width = 15
-        self._indicator_thickness = 10
-        self._indicator_is_horizontal = False
-        self._line_height = self.dimensions[0]
         super().__init__(parent=parent, device=device, *args, **kwargs)
-        self._configure_line_layout()
-        self._update_indicator_orientation()
-
-    def _configure_line_layout(self):
-        device_box = self.ui.device_box
-        indicator = self.ui.position_indicator
-
-        self.main_layout.setAlignment(Qt.AlignmentFlag(0))
-        self.setSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Fixed)
-        self.ui.setSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Fixed)
-        device_box.setSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Fixed)
-
-        self._line_height = max(
-            self.dimensions[0],
-            self.ui.minimumSizeHint().height(),
-            self.ui.sizeHint().height(),
-            device_box.minimumSizeHint().height(),
-            device_box.sizeHint().height(),
-        )
-        device_box.setFixedHeight(self._line_height)
-        device_box.setMinimumWidth(self.dimensions[1])
-        device_box.setMaximumWidth(16777215)
-        self.setFixedHeight(self._line_height)
-        self.setMinimumWidth(self.dimensions[1])
-
-        self.ui.verticalLayout.setContentsMargins(0, 0, 0, 0)
-        self.ui.verticalLayout.setSpacing(0)
-        self.ui.readback.setMaximumWidth(16777215)
-        self.ui.setpoint.setMaximumWidth(16777215)
-        self.ui.step_size.setMaximumWidth(16777215)
-
-        indicator_hint = indicator.minimumSizeHint()
-        step_hint = self.ui.step_size.sizeHint()
-        self._indicator_thickness = max(indicator_hint.height(), 10)
-        self._vertical_indicator_width = max(indicator.minimumWidth(), 15)
-        self._horizontal_indicator_width = max(90, step_hint.width())
-        base_width = max(device_box.minimumSizeHint().width(), self.dimensions[1])
-        self._indicator_switch_width = (
-            base_width - self._vertical_indicator_width + self._horizontal_indicator_width
-        )
-
-    def resizeEvent(self, event):
-        super().resizeEvent(event)
-        self._update_indicator_orientation()
-
-    def _update_indicator_orientation(self):
-        if not hasattr(self, "ui"):
-            return
-
-        indicator = self.ui.position_indicator
-        available_width = self.ui.device_box.width() or self.width() or self.dimensions[1]
-        should_use_horizontal = available_width >= self._indicator_switch_width
-        if should_use_horizontal == self._indicator_is_horizontal:
-            return
-
-        self._indicator_is_horizontal = should_use_horizontal
-        indicator.vertical = not should_use_horizontal
-
-        if should_use_horizontal:
-            indicator.setMinimumSize(self._horizontal_indicator_width, self._indicator_thickness)
-            indicator.setMaximumHeight(self._indicator_thickness)
-            indicator.setMaximumWidth(16777215)
-            indicator.setSizePolicy(QSizePolicy.Policy.MinimumExpanding, QSizePolicy.Policy.Fixed)
-        else:
-            indicator.setMinimumSize(self._vertical_indicator_width, self._indicator_thickness)
-            indicator.setMaximumSize(self._vertical_indicator_width, 16777215)
-            indicator.setSizePolicy(QSizePolicy.Policy.Fixed, QSizePolicy.Policy.Preferred)
-
-        indicator.updateGeometry()
 
 
 if __name__ == "__main__":  # pragma: no cover

bec_widgets/widgets/control/device_control/positioner_box/positioner_control_line/positioner_control_line.ui

@@ -2,18 +2,12 @@
 <ui version="4.0">
  <class>Form</class>
  <widget class="QWidget" name="Form">
-  <property name="sizePolicy">
-   <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-    <horstretch>0</horstretch>
-    <verstretch>0</verstretch>
-   </sizepolicy>
-  </property>
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>592</width>
-    <height>76</height>
+    <width>612</width>
+    <height>91</height>
    </rect>
   </property>
   <property name="minimumSize">
@@ -32,29 +26,8 @@
    <string>Form</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
-   <property name="spacing">
-    <number>0</number>
-   </property>
-   <property name="leftMargin">
-    <number>0</number>
-   </property>
-   <property name="topMargin">
-    <number>0</number>
-   </property>
-   <property name="rightMargin">
-    <number>0</number>
-   </property>
-   <property name="bottomMargin">
-    <number>0</number>
-   </property>
    <item>
     <widget class="QGroupBox" name="device_box">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
      <property name="title">
       <string>Device Name</string>
      </property>
@@ -254,12 +227,12 @@
  <customwidgets>
   <customwidget>
    <class>PositionIndicator</class>
-   <extends></extends>
+   <extends>QWidget</extends>
    <header>position_indicator</header>
   </customwidget>
   <customwidget>
    <class>SpinnerWidget</class>
-   <extends></extends>
+   <extends>QWidget</extends>
    <header>spinner_widget</header>
   </customwidget>
  </customwidgets>

bec_widgets/widgets/control/device_control/positioner_group/positioner_group.py

@@ -27,13 +27,30 @@ class PositionerGroupBox(QGroupBox):
         self.layout().setContentsMargins(0, 0, 0, 0)
         self.layout().setSpacing(0)
         self.widget = PositionerBox(self, dev_name)
+        self.widget.compact_view = True
+        self.widget.expand_popup = False
         self.layout().addWidget(self.widget)
         self.widget.position_update.connect(self._on_position_update)
+        self.widget.expand.connect(self._on_expand)
         self.setTitle(self.device_name)
         self.widget.force_update_readback()
 
+    def _on_expand(self, expand):
+        if expand:
+            self.setTitle("")
+            self.setFlat(True)
+        else:
+            self.setTitle(self.device_name)
+            self.setFlat(False)
+
     def _on_position_update(self, pos: float):
         self.position_update.emit(pos)
+        precision = getattr(self.widget.dev[self.widget.device], "precision", 8)
+        try:
+            precision = int(precision)
+        except (TypeError, ValueError):
+            precision = int(8)
+        self.widget.label = f"{pos:.{precision}f}"
 
     def close(self):
         self.widget.close()

bec_widgets/widgets/control/device_input/base_classes/device_input_base.py

@@ -7,7 +7,7 @@ from bec_lib.device import Signal as BECSignal
 from bec_lib.logger import bec_logger
 from pydantic import field_validator
 
-from bec_widgets.utils.bec_connector import ConnectionConfig
+from bec_widgets.utils import ConnectionConfig
 from bec_widgets.utils.bec_widget import BECWidget
 from bec_widgets.utils.error_popups import SafeProperty, SafeSlot
 from bec_widgets.utils.filter_io import FilterIO
@@ -32,7 +32,6 @@ class DeviceInputConfig(ConnectionConfig):
     default: str | None = None
     arg_name: str | None = None
     apply_filter: bool = True
-    signal_class_filter: list[str] = []
 
     @field_validator("device_filter")
     @classmethod
@@ -126,13 +125,11 @@ class DeviceInputBase(BECWidget):
         current_device = WidgetIO.get_value(widget=self, as_string=True)
         self.config.device_filter = self.device_filter
         self.config.readout_filter = self.readout_filter
-        self.config.signal_class_filter = self.signal_class_filter
         if self.apply_filter is False:
             return
         all_dev = self.dev.enabled_devices
-        devs = self._filter_devices_by_signal_class(all_dev)
         # Filter based on device class
-        devs = [dev for dev in devs if self._check_device_filter(dev)]
+        devs = [dev for dev in all_dev if self._check_device_filter(dev)]
         # Filter based on readout priority
         devs = [dev for dev in devs if self._check_readout_filter(dev)]
         self.devices = [device.name for device in devs]
@@ -193,27 +190,6 @@ class DeviceInputBase(BECWidget):
         self.config.apply_filter = value
         self.update_devices_from_filters()
 
-    @SafeProperty("QStringList")
-    def signal_class_filter(self) -> list[str]:
-        """
-        Get the signal class filter for devices.
-
-        Returns:
-            list[str]: List of signal class names used for filtering devices.
-        """
-        return self.config.signal_class_filter
-
-    @signal_class_filter.setter
-    def signal_class_filter(self, value: list[str] | None):
-        """
-        Set the signal class filter and update the device list.
-
-        Args:
-            value (list[str] | None): List of signal class names to filter by.
-        """
-        self.config.signal_class_filter = value or []
-        self.update_devices_from_filters()
-
     @SafeProperty(bool)
     def filter_to_device(self):
         """Include devices in filters."""
@@ -403,20 +379,6 @@ class DeviceInputBase(BECWidget):
         """
         return all(isinstance(device, self._device_handler[entry]) for entry in self.device_filter)
 
-    def _filter_devices_by_signal_class(
-        self, devices: list[Device | BECSignal | ComputedSignal | Positioner]
-    ) -> list[Device | BECSignal | ComputedSignal | Positioner]:
-        """Filter devices by signal class, if a signal class filter is set."""
-        if not self.config.signal_class_filter:
-            return devices
-        if not self.client or not hasattr(self.client, "device_manager"):
-            return []
-        signals = FilterIO.update_with_signal_class(
-            widget=self, signal_class_filter=self.config.signal_class_filter, client=self.client
-        )
-        allowed_devices = {device_name for device_name, _, _ in signals}
-        return [dev for dev in devices if dev.name in allowed_devices]
-
     def _check_readout_filter(
         self, device: Device | BECSignal | ComputedSignal | Positioner
     ) -> bool:

bec_widgets/widgets/control/device_input/base_classes/device_signal_input_base.py

@@ -3,10 +3,10 @@ from bec_lib.device import Signal
 from bec_lib.logger import bec_logger
 from qtpy.QtCore import Property
 
-from bec_widgets.utils.bec_connector import ConnectionConfig
+from bec_widgets.utils import ConnectionConfig
 from bec_widgets.utils.bec_widget import BECWidget
 from bec_widgets.utils.error_popups import SafeSlot
-from bec_widgets.utils.filter_io import FilterIO
+from bec_widgets.utils.filter_io import FilterIO, LineEditFilterHandler
 from bec_widgets.utils.ophyd_kind_util import Kind
 from bec_widgets.utils.widget_io import WidgetIO
 
@@ -17,8 +17,6 @@ class DeviceSignalInputBaseConfig(ConnectionConfig):
     """Configuration class for DeviceSignalInputBase."""
 
     signal_filter: str | list[str] | None = None
-    signal_class_filter: list[str] | None = None
-    ndim_filter: int | list[int] | None = None
     default: str | None = None
     arg_name: str | None = None
     device: str | None = None
@@ -266,7 +264,6 @@ class DeviceSignalInputBase(BECWidget):
 
         Args:
             device(str): Device to validate.
-            raise_on_false(bool): Raise ValueError if device is not found.
         """
         if device in self.dev:
             return True

bec_widgets/widgets/control/device_input/device_combobox/device_combobox.py

@@ -1,6 +1,7 @@
 from bec_lib.callback_handler import EventType
 from bec_lib.device import ReadoutPriority
 from qtpy.QtCore import QSize, Signal, Slot
+from qtpy.QtGui import QPainter, QPaintEvent, QPen
 from qtpy.QtWidgets import QComboBox, QSizePolicy
 
 from bec_widgets.utils.colors import get_accent_colors
@@ -26,12 +27,12 @@ class DeviceComboBox(DeviceInputBase, QComboBox):
         available_devices: List of available devices, if passed, it sets apply filters to false and device/readout priority filters will not be applied.
         default: Default device name.
         arg_name: Argument name, can be used for the other widgets which has to call some other function in bec using correct argument names.
-        signal_class_filter: List of signal classes to filter the devices by. Only devices with signals of these classes will be shown.
     """
 
+    USER_ACCESS = ["set_device", "devices"]
+
     ICON_NAME = "list_alt"
     PLUGIN = True
-    RPC = False
 
     device_selected = Signal(str)
     device_reset = Signal()
@@ -50,7 +51,6 @@ class DeviceComboBox(DeviceInputBase, QComboBox):
         available_devices: list[str] | None = None,
         default: str | None = None,
         arg_name: str | None = None,
-        signal_class_filter: list[str] | None = None,
         **kwargs,
     ):
         super().__init__(parent=parent, client=client, gui_id=gui_id, config=config, **kwargs)
@@ -63,7 +63,6 @@ class DeviceComboBox(DeviceInputBase, QComboBox):
         self._is_valid_input = False
         self._accent_colors = get_accent_colors()
         self._set_first_element_as_empty = False
-
         # We do not consider the config that is passed here, this produced problems
         # with QtDesigner, since config and input arguments may differ and resolve properly
         # Implementing this logic and config recoverage is postponed.
@@ -86,10 +85,6 @@ class DeviceComboBox(DeviceInputBase, QComboBox):
         # Device filter default is None
         if device_filter is not None:
             self.set_device_filter(device_filter)
-
-        if signal_class_filter is not None:
-            self.signal_class_filter = signal_class_filter
-
         # Set default device if passed
         if default is not None:
             self.set_device(default)
@@ -186,70 +181,21 @@ class DeviceComboBox(DeviceInputBase, QComboBox):
             device = self.itemData(idx)[0]  # type: ignore[assignment]
         return super().validate_device(device)
 
-    @property
-    def is_valid_input(self) -> bool:
-        """Whether the current text represents a valid device selection."""
-        return self._is_valid_input
-
 
 if __name__ == "__main__":  # pragma: no cover
     # pylint: disable=import-outside-toplevel
-    from qtpy.QtWidgets import (
-        QApplication,
-        QCheckBox,
-        QHBoxLayout,
-        QLabel,
-        QLineEdit,
-        QVBoxLayout,
-        QWidget,
-    )
+    from qtpy.QtWidgets import QApplication, QVBoxLayout, QWidget
 
     from bec_widgets.utils.colors import apply_theme
 
     app = QApplication([])
     apply_theme("dark")
     widget = QWidget()
-    widget.setWindowTitle("DeviceComboBox demo")
-    layout = QVBoxLayout(widget)
-
-    layout.addWidget(QLabel("Device filter controls"))
-    controls = QHBoxLayout()
-    layout.addLayout(controls)
-
-    class_input = QLineEdit()
-    class_input.setPlaceholderText("signal_class_filter (comma-separated), e.g. AsyncSignal")
-    controls.addWidget(class_input)
-
-    filter_device = QCheckBox("Device")
-    filter_positioner = QCheckBox("Positioner")
-    filter_signal = QCheckBox("Signal")
-    filter_computed = QCheckBox("ComputedSignal")
-    controls.addWidget(filter_device)
-    controls.addWidget(filter_positioner)
-    controls.addWidget(filter_signal)
-    controls.addWidget(filter_computed)
-
+    widget.setFixedSize(200, 200)
+    layout = QVBoxLayout()
+    widget.setLayout(layout)
     combo = DeviceComboBox()
-    combo.set_first_element_as_empty = True
+    combo.devices = ["samx", "dev1", "dev2", "dev3", "dev4"]
     layout.addWidget(combo)
-
-    def _apply_filters():
-        raw = class_input.text().strip()
-        if raw:
-            combo.signal_class_filter = [entry.strip() for entry in raw.split(",") if entry.strip()]
-        else:
-            combo.signal_class_filter = []
-        combo.filter_to_device = filter_device.isChecked()
-        combo.filter_to_positioner = filter_positioner.isChecked()
-        combo.filter_to_signal = filter_signal.isChecked()
-        combo.filter_to_computed_signal = filter_computed.isChecked()
-
-    class_input.textChanged.connect(_apply_filters)
-    filter_device.toggled.connect(_apply_filters)
-    filter_positioner.toggled.connect(_apply_filters)
-    filter_signal.toggled.connect(_apply_filters)
-    filter_computed.toggled.connect(_apply_filters)
-    _apply_filters()
-
     widget.show()
     app.exec_()

bec_widgets/widgets/control/device_input/device_line_edit/device_line_edit.py

@@ -31,11 +31,12 @@ class DeviceLineEdit(DeviceInputBase, QLineEdit):
         arg_name: Argument name, can be used for the other widgets which has to call some other function in bec using correct argument names.
     """
 
+    USER_ACCESS = ["set_device", "devices", "_is_valid_input"]
+
     device_selected = Signal(str)
     device_config_update = Signal()
 
     PLUGIN = True
-    RPC = False
     ICON_NAME = "edit_note"
 
     def __init__(

bec_widgets/widgets/control/device_input/signal_combobox/signal_combobox.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
-from qtpy.QtCore import QSize, Qt, Signal
+from bec_lib.device import Positioner
+from qtpy.QtCore import QSize, Signal
 from qtpy.QtWidgets import QComboBox, QSizePolicy
 
 from bec_widgets.utils.error_popups import SafeProperty, SafeSlot
@@ -21,27 +22,18 @@ class SignalComboBox(DeviceSignalInputBase, QComboBox):
         client: BEC client object.
         config: Device input configuration.
         gui_id: GUI ID.
-        device: Device name to filter signals from.
-        signal_filter: Signal filter, list of signal kinds from ophyd Kind enum. Check DeviceSignalInputBase for more details.
-        signal_class_filter: List of signal classes to filter the signals by. Only signals of these classes will be shown.
-        ndim_filter: Dimensionality filter, int or list of ints to filter signals by their number of dimensions. If signal do not support ndim, it will be included in the selection anyway.
+        device_filter: Device filter, name of the device class from BECDeviceFilter and BECReadoutPriority. Check DeviceInputBase for more details.
         default: Default device name.
         arg_name: Argument name, can be used for the other widgets which has to call some other function in bec using correct argument names.
-        store_signal_config: Whether to store the full signal config in the combobox item data.
-        require_device: If True, signals are only shown/validated when a device is set.
-    Signals:
-        device_signal_changed: Emitted when the current text represents a valid signal selection.
-        signal_reset: Emitted when validation fails and the selection should be treated as cleared.
     """
 
-    USER_ACCESS = ["set_signal", "set_device", "signals", "get_signal_name"]
+    USER_ACCESS = ["set_signal", "set_device", "signals"]
 
     ICON_NAME = "list_alt"
     PLUGIN = True
-    RPC = False
+    RPC = True
 
     device_signal_changed = Signal(str)
-    signal_reset = Signal()
 
     def __init__(
         self,
@@ -50,13 +42,9 @@ class SignalComboBox(DeviceSignalInputBase, QComboBox):
         config: DeviceSignalInputBaseConfig | None = None,
         gui_id: str | None = None,
         device: str | None = None,
-        signal_filter: list[Kind] | None = None,
-        signal_class_filter: list[str] | None = None,
-        ndim_filter: int | list[int] | None = None,
+        signal_filter: str | list[str] | None = None,
         default: str | None = None,
         arg_name: str | None = None,
-        store_signal_config: bool = True,
-        require_device: bool = False,
         **kwargs,
     ):
         super().__init__(parent=parent, client=client, gui_id=gui_id, config=config, **kwargs)
@@ -69,64 +57,26 @@ class SignalComboBox(DeviceSignalInputBase, QComboBox):
         self.setSizePolicy(QSizePolicy.Preferred, QSizePolicy.Fixed)
         self.setMinimumSize(QSize(100, 0))
         self._set_first_element_as_empty = True
-        self._signal_class_filter = signal_class_filter or []
-        self._store_signal_config = store_signal_config
-        self.config.ndim_filter = ndim_filter or None
-        self._require_device = require_device
-        self._is_valid_input = False
-
-        # Note: Runtime arguments (e.g. device, default, arg_name) intentionally take
-        # precedence over values from the passed-in config. Full reconciliation and
-        # restoration of state between designer-provided config and runtime arguments
-        # is not yet implemented, as earlier attempts caused issues with QtDesigner.
+        # We do not consider the config that is passed here, this produced problems
+        # with QtDesigner, since config and input arguments may differ and resolve properly
+        # Implementing this logic and config recoverage is postponed.
         self.currentTextChanged.connect(self.on_text_changed)
-
-        # Kind filtering is always applied; class filtering is additive. If signal_filter is None,
-        # we default to hinted+normal, even when signal_class_filter is empty or None. To disable
-        # kinds, pass an explicit signal_filter or toggle include_* after init.
         if signal_filter is not None:
             self.set_filter(signal_filter)
         else:
             self.set_filter([Kind.hinted, Kind.normal, Kind.config])
-
         if device is not None:
             self.set_device(device)
         if default is not None:
             self.set_signal(default)
 
-    @SafeSlot(str)
-    def set_device(self, device: str | None):
-        """
-        Set the device. When signal_class_filter is active, ensures base-class
-        logic runs and then refreshes the signal list to show only signals from
-        that device matching the signal class filter.
-
-        Args:
-            device(str): device name.
-        """
-        super().set_device(device)
-
-        if self._signal_class_filter:
-            # Refresh the signal list to show only this device's signals
-            self.update_signals_from_signal_classes()
-
     @SafeSlot()
     @SafeSlot(dict, dict)
     def update_signals_from_filters(
         self, content: dict | None = None, metadata: dict | None = None
     ):
-        """Update the filters for the combobox.
-        When signal_class_filter is active, skip the normal Kind-based filtering.
-
-        Args:
-            content (dict | None): Content dictionary from BEC event.
-            metadata (dict | None): Metadata dictionary from BEC event.
-        """
+        """Update the filters for the combobox"""
         super().update_signals_from_filters(content, metadata)
-
-        if self._signal_class_filter:
-            self.update_signals_from_signal_classes()
-            return
         # pylint: disable=protected-access
         if FilterIO._find_handler(self) is ComboBoxFilterHandler:
             if len(self._config_signals) > 0:
@@ -168,63 +118,6 @@ class SignalComboBox(DeviceSignalInputBase, QComboBox):
             if self.count() > 0 and self.itemText(0) == "":
                 self.removeItem(0)
 
-    @SafeProperty("QStringList")
-    def signal_class_filter(self) -> list[str]:
-        """
-        Get the list of signal classes to filter.
-
-        Returns:
-            list[str]: List of signal class names to filter.
-        """
-        return self._signal_class_filter
-
-    @signal_class_filter.setter
-    def signal_class_filter(self, value: list[str] | None):
-        """
-        Set the signal class filter.
-
-        Args:
-            value (list[str] | None): List of signal class names to filter, or None/empty
-                to disable class-based filtering and revert to the default behavior.
-        """
-        normalized_value = value or []
-        self._signal_class_filter = normalized_value
-        self.config.signal_class_filter = normalized_value
-        if self._signal_class_filter:
-            self.update_signals_from_signal_classes()
-        else:
-            self.update_signals_from_filters()
-
-    @SafeProperty(int)
-    def ndim_filter(self) -> int:
-        """Dimensionality filter for signals."""
-        return self.config.ndim_filter if isinstance(self.config.ndim_filter, int) else -1
-
-    @ndim_filter.setter
-    def ndim_filter(self, value: int):
-        self.config.ndim_filter = None if value < 0 else value
-        if self._signal_class_filter:
-            self.update_signals_from_signal_classes(ndim_filter=self.config.ndim_filter)
-
-    @SafeProperty(bool)
-    def require_device(self) -> bool:
-        """
-        If True, signals are only shown/validated when a device is set.
-
-        Note:
-            This property affects list rebuilding only when a signal_class_filter
-            is active. Without a signal class filter, the available signals are
-            managed by the standard Kind-based filtering.
-        """
-        return self._require_device
-
-    @require_device.setter
-    def require_device(self, value: bool):
-        self._require_device = value
-        # Rebuild list when toggled, but only when using signal_class_filter
-        if self._signal_class_filter:
-            self.update_signals_from_signal_classes()
-
     def set_to_obj_name(self, obj_name: str) -> bool:
         """
         Set the combobox to the object name of the signal.
@@ -255,109 +148,6 @@ class SignalComboBox(DeviceSignalInputBase, QComboBox):
                 return True
         return False
 
-    def get_signal_name(self) -> str:
-        """
-        Get the signal name from the combobox.
-
-        Returns:
-            str: The signal name.
-        """
-        signal_name = self.currentText()
-        index = self.findText(signal_name)
-        if index == -1:
-            return signal_name
-
-        signal_info = self.itemData(index)
-        if signal_info:
-            signal_name = signal_info.get("obj_name", signal_name)
-
-        return signal_name if signal_name else ""
-
-    def get_signal_config(self) -> dict | None:
-        """
-        Get the signal config from the combobox for the currently selected signal.
-
-        Returns:
-            dict | None: The signal configuration dictionary or None if not available.
-        """
-        if not self._store_signal_config:
-            return None
-
-        index = self.currentIndex()
-        if index == -1:
-            return None
-
-        signal_info = self.itemData(index)
-        return signal_info if signal_info else None
-
-    def update_signals_from_signal_classes(self, ndim_filter: int | list[int] | None = None):
-        """
-        Update the combobox with signals filtered by signal classes and optionally by ndim.
-        Uses device_manager.get_bec_signals() to retrieve signals.
-        If a device is set, only shows signals from that device.
-
-        Args:
-            ndim_filter (int | list[int] | None): Filter signals by dimensionality.
-                If provided, only signals with matching ndim will be included.
-                Can be a single int or a list of ints. Use None to include all dimensions.
-                If not provided, uses the previously set ndim_filter.
-        """
-        if not self._signal_class_filter:
-            return
-
-        if self._require_device and not self._device:
-            self.clear()
-            self._signals = []
-            FilterIO.set_selection(widget=self, selection=self._signals)
-            return
-
-        # Update stored ndim_filter if a new one is provided
-        if ndim_filter is not None:
-            self.config.ndim_filter = ndim_filter
-
-        self.clear()
-
-        # Get signals with ndim filtering applied at the FilterIO level
-        signals = FilterIO.update_with_signal_class(
-            widget=self,
-            signal_class_filter=self._signal_class_filter,
-            client=self.client,
-            ndim_filter=self.config.ndim_filter,  # Pass ndim_filter to FilterIO
-        )
-
-        # Track signals for validation and FilterIO selection
-        self._signals = []
-
-        for device_name, signal_name, signal_config in signals:
-            # Filter by device if one is set
-            if self._device and device_name != self._device:
-                continue
-            if self._signal_filter:
-                kind_str = signal_config.get("kind_str")
-                if kind_str is not None and kind_str not in {
-                    kind.name for kind in self._signal_filter
-                }:
-                    continue
-
-            # Get storage_name for tooltip
-            storage_name = signal_config.get("storage_name", "")
-
-            # Store the full signal config as item data if requested
-            if self._store_signal_config:
-                self.addItem(signal_name, signal_config)
-            else:
-                self.addItem(signal_name)
-
-            # Track for validation
-            self._signals.append(signal_name)
-
-            # Set tooltip to storage_name (Qt.ToolTipRole = 3)
-            if storage_name:
-                self.setItemData(self.count() - 1, storage_name, Qt.ItemDataRole.ToolTipRole)
-
-        # Keep FilterIO selection in sync for validate_signal
-        FilterIO.set_selection(widget=self, selection=self._signals)
-
     @SafeSlot()
     def reset_selection(self):
         """Reset the selection of the combobox."""
@@ -368,44 +158,22 @@ class SignalComboBox(DeviceSignalInputBase, QComboBox):
 
     @SafeSlot(str)
     def on_text_changed(self, text: str):
-        """Validate and emit only when the signal is valid.
+        """Slot for text changed. If a device is selected and the signal is changed and valid it emits a signal.
         For a positioner, the readback value has to be renamed to the device name.
-        When using signal_class_filter, device validation is skipped.
+
+        Args:
+            text (str): Text in the combobox.
         """
-        self.check_validity(text)
-
-    def check_validity(self, input_text: str) -> None:
-        """Check if the current value is a valid signal and emit only when valid."""
-        if self._signal_class_filter:
-            if self._require_device and (not self._device or not input_text):
-                is_valid = False
-            else:
-                is_valid = self.validate_signal(input_text)
-        else:
-            if self._require_device and not self.validate_device(self._device):
-                is_valid = False
-            else:
-                is_valid = self.validate_device(self._device) and self.validate_signal(input_text)
-
-        if is_valid:
-            self._is_valid_input = True
-            self.device_signal_changed.emit(input_text)
-            self.setStyleSheet("border: 1px solid transparent;")
-        else:
-            self._is_valid_input = False
-            self.signal_reset.emit()
-            if self.isEnabled():
-                self.setStyleSheet("border: 1px solid red;")
+        if self.validate_device(self.device) is False:
+            return
+        if self.validate_signal(text) is False:
+            return
+        self.device_signal_changed.emit(text)
 
     @property
     def selected_signal_comp_name(self) -> str:
         return dict(self.signals).get(self.currentText(), {}).get("component_name", "")
 
-    @property
-    def is_valid_input(self) -> bool:
-        """Whether the current text represents a valid signal selection."""
-        return self._is_valid_input
-
 
 if __name__ == "__main__":  # pragma: no cover
     # pylint: disable=import-outside-toplevel
@@ -419,14 +187,7 @@ if __name__ == "__main__":  # pragma: no cover
     widget.setFixedSize(200, 200)
     layout = QVBoxLayout()
     widget.setLayout(layout)
-    box = SignalComboBox(
-        device="waveform",
-        signal_class_filter=["AsyncSignal", "AsyncMultiSignal"],
-        ndim_filter=[1, 2],
-        store_signal_config=True,
-        signal_filter=[Kind.hinted, Kind.normal, Kind.config],
-    )  # change signal filter class to test
-    box.setEditable(True)
+    box = SignalComboBox(device="samx")
     layout.addWidget(box)
     widget.show()
     app.exec_()

bec_widgets/widgets/control/device_input/signal_line_edit/signal_line_edit.py

@@ -29,7 +29,7 @@ class SignalLineEdit(DeviceSignalInputBase, QLineEdit):
     device_signal_changed = Signal(str)
 
     PLUGIN = True
-    RPC = False
+    RPC = True
     ICON_NAME = "vital_signs"
 
     def __init__(

bec_widgets/widgets/control/device_manager/components/_util.py

@@ -1,7 +1,7 @@
 import json
 from typing import Any, Callable, Generator, Iterable, TypeVar
 
-from bec_lib.utils.json_extended import ExtendedEncoder
+from bec_lib.utils.json import ExtendedEncoder
 from qtpy.QtCore import QByteArray, QMimeData, QObject, Signal  # type: ignore
 from qtpy.QtWidgets import QListWidgetItem
 

bec_widgets/widgets/control/device_manager/components/available_device_resources/available_device_group.py

@@ -51,7 +51,8 @@ class _DeviceEntryWidget(QFrame):
         self.setToolTip(self._rich_text())
 
     def _rich_text(self):
-        return dedent(f"""
+        return dedent(
+            f"""
         <b><u><h2> {self._device_spec.name}: </h2></u></b>
         <table>
         <tr><td> description: </td><td><i> {self._device_spec.description}  </i></td></tr>
@@ -59,7 +60,8 @@ class _DeviceEntryWidget(QFrame):
         <tr><td> enabled:     </td><td><i> {self._device_spec.enabled}      </i></td></tr>
         <tr><td> read only:   </td><td><i> {self._device_spec.readOnly}     </i></td></tr>
         </table>
-        """)
+        """
+        )
 
     def setup_title_layout(self, device_spec: HashableDevice):
         self._title_layout = QHBoxLayout()

bec_widgets/widgets/control/device_manager/components/available_device_resources/available_device_group_ui.py

@@ -13,7 +13,7 @@ if TYPE_CHECKING:
     from .available_device_group import AvailableDeviceGroup
 
 
-class _DeviceListWidget(QListWidget):
+class _DeviceListWiget(QListWidget):
 
     def _item_iter(self):
         return (self.item(i) for i in range(self.count()))
@@ -44,7 +44,7 @@ class Ui_AvailableDeviceGroup(object):
         self.n_included.setObjectName("n_included")
         title_layout.addWidget(self.n_included)
 
-        self.device_list = _DeviceListWidget(AvailableDeviceGroup)
+        self.device_list = _DeviceListWiget(AvailableDeviceGroup)
         self.device_list.setSelectionMode(QListWidget.SelectionMode.ExtendedSelection)
         self.device_list.setObjectName("device_list")
         self.device_list.setFrameStyle(0)

bec_widgets/widgets/control/device_manager/components/available_device_resources/device_resource_backend.py

@@ -34,13 +34,13 @@ class HashModel(str, Enum):
 class DeviceResourceBackend(Protocol):
     @property
     def tag_groups(self) -> dict[str, set[HashableDevice]]:
-        """A dictionary of all available devices separated by tag groups. The same device may
+        """A dictionary of all availble devices separated by tag groups. The same device may
         appear more than once (in different groups)."""
         ...
 
     @property
     def all_devices(self) -> set[HashableDevice]:
-        """A set of all available devices. The same device may not appear more than once."""
+        """A set of all availble devices. The same device may not appear more than once."""
         ...
 
     @property