remotedesktop 1.8.0__tar.gz → 1.9.1__tar.gz

{remotedesktop-1.8.0 → remotedesktop-1.9.1}/CLAUDE.md

@@ -76,6 +76,7 @@ Managed with `uv` (hatchling build backend, src layout):
 - **Auto-reconnect** (`app.py`): a session that *was connected* and drops retries `client.connect_to` with exponential backoff (base `reconnect_base_seconds=2.0` kwarg — tests inject ~0.05 — doubling to a 30 s cap), driven by a per-session single-shot QTimer. `ShareClient.connectionFailed` exists because **Qt emits `disconnected` only for sockets that reached ConnectedState** — refused/unreachable attempts fire `errorOccurred` with the socket back in UnconnectedState. The active-timer guard dedupes the errorOccurred+disconnected double-fire. Denial cancels until a manual activation; tab close/forget/quit cancel; retries bypass `_connect_session` on purpose (no perf reset, no tab steal, no inventory attempt spam). **Open session tabs persist** (`open_sessions` JSON in Settings, written on connect/rename/close) and are restored + reconnected at startup with `auto_reconnect` pre-armed, so a not-yet-available server is retried on the backoff loop; deliberately closed tabs are not restored. While no session exists, a non-closable "Server" placeholder tab (instructions) sits at index 0 and swaps with the first session's tab.
 - **Menus & shortcuts contract** (`app.py` `_build_menus`, `viewer.py`): File/View/Help menu bar; shortcuts Ctrl+W (close session tab), Ctrl+Q (quit), F5 (rescan), F11 (fullscreen). While a viewer shows a frame it **accepts `ShortcutOverride`** so every key forwards to the remote machine — **F11 is the single reserved local key**. Shortcut actions are also `addAction`-ed on the window so they fire with the menu bar hidden (fullscreen). Keep every menu/action as an attribute — PySide6 gives Python ownership of `addMenu`/`addAction` (and `QAction.menu()`) wrappers, and a GC'd local deletes the C++ object. Fullscreen hides menu/status bars, dock, and tab bar and restores them (including pre-fullscreen dock visibility) on exit; `closeEvent` exits fullscreen before persisting layout. Window geometry AND dock layout persist (`window_state.save_state`/`restore_state`, key `main_window_state`; the dock needs its objectName).
 - **Privacy toggles**: Preferences' "Sync clipboard" checkbox (`clipboard_sync_enabled`, default on) drives `ClipboardSync.enabled` — while off, local copies aren't sent and peer payloads aren't applied. View-only sharing is the "view" mode of the Screen sharing radios (`ShareServer.set_input_allowed` — a server-side drop, no wire change, that releases held input when switched off). Quitting with ≥1 viewer connected asks for confirmation (declining resets `_quitting`); restart shuts sharing down first so it never double-prompts.
+- **Screen capture** (`app.py`): the dock's "Screen capture" group (Copy / Save…, viewer-role UI hidden with the panel) and the matching File-menu actions (`copy_capture_action`/`save_capture_action`, same handlers) capture the current session tab's last frame at full server resolution (`ViewerWidget.frame_image()` — the lock overlay is display-only and never part of it). Copy goes through `ClipboardSync.copy_image`, which records the content signature *before* setting the clipboard so the capture is never echoed to peers, and works with sync disabled (the preference governs syncing, not local copies). Save is `QFileDialog.getSaveFileName` (tests monkeypatch it) defaulting to `Pictures\<server> <timestamp>.png`, PNG only. All four widgets enable only while the current tab shows a frame — `_update_capture_actions()`, called from tab change, `_on_frame` (unconditionally: auto-reconnect refills a cleared viewer without `_connect_session`), and every `viewer.clear` path (connect/denied/approval-pending/disconnect).
 - **Reduce visual effects while sharing** (`visual_effects.py`): animations/fades are a burst of changed frames for the lossless pipeline, so while the preference is on (default on, `reduce_effects_enabled`, `load_reduce_effects_enabled`) **and ≥1 viewer is connected**, `MainWindow` applies `VisualEffectsReducer` and restores it when the last viewer leaves (driven by `SharingTab.viewerCountChanged`; explicit safety-net restore in `closeEvent`). The reduced set: SPI_SETUIEFFECTS off, drop shadows off, client-area + min/max animations off, submenu delay lowered to 50 ms (never raised). All via `SystemParametersInfo` **without** SPIF_UPDATEINIFILE — session-scoped, never persisted, self-heals at logoff; knobs already at the reduced value are left untouched so the user's own choices are never "restored" over. The backend (`SpiBackend`) is injectable — **tests must always inject `FakeSpiBackend`** (the preference defaults on, so a real reducer in a test would change the host's actual Windows settings; `make_window` in `tests/test_main_window.py` injects it for every window test, and real-backend tests may only read).
 - **Theme preference** (`preferences.py`): a three-radio group in Preferences — follow the Windows light/dark setting (default) / Light / Dark — persisted as `THEME_KEY` (`"system"`/`"light"`/`"dark"`, `load_theme` falls back to system on junk). `apply_theme` drives `QStyleHints.setColorScheme` (`unsetColorScheme` for system, so OS-side switches keep applying); the radios apply live and `MainWindow.__init__` re-applies the persisted choice before building widgets. Tests that set a non-system theme must restore with `apply_theme(THEME_SYSTEM)` — the color scheme is process-global QApplication state.
 - **Two `PerformanceMonitor`s, never one**: `MainWindow.client_performance` (viewing sessions) and `server_performance` (the SharingTab's viewers). `ShareServer.close()` resets its monitor, so sharing a monitor across roles would wipe the other role's graphs. The Performance tab has "Client (viewer)"/"Server (sharing)" sub-tabs (`MainWindow.performance_pages`) — but only for roles that can produce data: the client sub-tab exists only with the viewer role, the server one only while actually serving (`_update_performance_tabs`, driven from the viewer toggle and `sharingChanged`; both off shows an enable-a-role hint). `PreferencesTab` takes the list of monitors and applies the history-window setting to all.

{remotedesktop-1.8.0 → remotedesktop-1.9.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: remotedesktop
-Version: 1.8.0
+Version: 1.9.1
 Summary: Remote desktop app for Windows computers on the same LAN, with autodiscovery. View other computers and optionally share this one — screen, keyboard, mouse, and clipboard, without RDP or Microsoft authentication.
 Project-URL: Homepage, https://github.com/jamesabel/remotedesktop
 Project-URL: Repository, https://github.com/jamesabel/remotedesktop
@@ -77,6 +77,7 @@ one-click *Forget* / *Revoke*, and the live connection log.
 - ⌨️🖱️ **Full input control** — mouse, wheel, and keyboard forwarding that is safe against interruptions: anything still held down is released on the server if the viewer loses focus or disconnects, so no stuck keys. Prefer eyes-only? Choose *Shared, view only* and sharing becomes view-only, switchable live.
 - 🖼️ **View your way** — each connection scales to fit or shows the remote screen at 1:1 pixels with panning, and F11 goes full screen. While you type into a remote session every key is forwarded — F11 is the one key that stays local.
 - 📋 **Two-way clipboard** — text and images copied on either machine appear on the other; a Preferences toggle turns syncing off entirely.
+- 📸 **Screen captures** — grab the remote screen at its full resolution and copy it to the clipboard or save it as a PNG, from the *Screen capture* panel buttons or the File menu.
 - 🔒 **TLS + approve-once pairing** — every connection is encrypted; the server user approves a new client once, after which it reconnects with a stored token and no prompt.
 - 📊 **Built-in performance monitoring** — live bandwidth and round-trip-time graphs with window statistics (mean/min/max/p99/jitter), plus a per-viewer table on the server.
 - 🔁 **Robust connections** — dead connections are detected within seconds, and dropped sessions reconnect automatically with backoff; a server restart heals by itself, no clicks needed. Connections that were open when the app closed are restored on the next start.

{remotedesktop-1.8.0 → remotedesktop-1.9.1}/readme.md

@@ -53,6 +53,7 @@ one-click *Forget* / *Revoke*, and the live connection log.
 - ⌨️🖱️ **Full input control** — mouse, wheel, and keyboard forwarding that is safe against interruptions: anything still held down is released on the server if the viewer loses focus or disconnects, so no stuck keys. Prefer eyes-only? Choose *Shared, view only* and sharing becomes view-only, switchable live.
 - 🖼️ **View your way** — each connection scales to fit or shows the remote screen at 1:1 pixels with panning, and F11 goes full screen. While you type into a remote session every key is forwarded — F11 is the one key that stays local.
 - 📋 **Two-way clipboard** — text and images copied on either machine appear on the other; a Preferences toggle turns syncing off entirely.
+- 📸 **Screen captures** — grab the remote screen at its full resolution and copy it to the clipboard or save it as a PNG, from the *Screen capture* panel buttons or the File menu.
 - 🔒 **TLS + approve-once pairing** — every connection is encrypted; the server user approves a new client once, after which it reconnects with a stored token and no prompt.
 - 📊 **Built-in performance monitoring** — live bandwidth and round-trip-time graphs with window statistics (mean/min/max/p99/jitter), plus a per-viewer table on the server.
 - 🔁 **Robust connections** — dead connections are detected within seconds, and dropped sessions reconnect automatically with backoff; a server restart heals by itself, no clicks needed. Connections that were open when the app closed are restored on the next start.

{remotedesktop-1.8.0 → remotedesktop-1.9.1}/src/remotedesktop/__init__.py

@@ -1,3 +1,3 @@
 """Remote desktop client/server for Windows computers on the same LAN."""
 
-__version__ = "1.8.0"
+__version__ = "1.9.1"

{remotedesktop-1.8.0 → remotedesktop-1.9.1}/src/remotedesktop/app.py

@@ -12,16 +12,19 @@ tray menu. Only one instance runs per user session (`single_instance`)."""
 
 import json
 import logging
+import re
 import sqlite3
 import sys
 import time
+from pathlib import Path
 
-from PySide6.QtCore import QObject, QProcess, Qt, QTimer, Signal
-from PySide6.QtGui import QCloseEvent, QKeySequence
+from PySide6.QtCore import QObject, QProcess, QStandardPaths, Qt, QTimer, Signal
+from PySide6.QtGui import QCloseEvent, QImage, QKeySequence
 from PySide6.QtNetwork import QNetworkInterface
 from PySide6.QtWidgets import (
     QApplication,
     QDockWidget,
+    QFileDialog,
     QFrame,
     QGroupBox,
     QHBoxLayout,
@@ -314,11 +317,35 @@ class MainWindow(QMainWindow):
         # through, and the roles are changed only in Preferences.
         self.client_role_button = self._make_role_button()
         self.server_role_button = self._make_role_button()
+        # Screen capture of the current session tab (the last received frame
+        # at the server's full resolution). Buttons live in the dock; the
+        # same handlers back the File-menu actions. Enabled only while the
+        # current tab shows a frame (_update_capture_actions).
+        self.copy_capture_button = QPushButton("Copy")
+        self.copy_capture_button.setToolTip(
+            "Copy a screen capture of the current session to the clipboard"
+        )
+        self.copy_capture_button.clicked.connect(self._copy_screen_capture)
+        self.save_capture_button = QPushButton("Save…")
+        self.save_capture_button.setToolTip(
+            "Save a screen capture of the current session to a file"
+        )
+        self.save_capture_button.clicked.connect(self._save_screen_capture)
+        # Nothing to capture until a session tab shows a frame.
+        self.copy_capture_button.setEnabled(False)
+        self.save_capture_button.setEnabled(False)
+        self._capture_group = QGroupBox("Screen capture")
+        # Stacked, not side by side: the dock is narrow and its width is
+        # what the panel/server list gets — height is the cheaper dimension.
+        capture_layout = QVBoxLayout(self._capture_group)
+        capture_layout.addWidget(self.copy_capture_button)
+        capture_layout.addWidget(self.save_capture_button)
         dock_body = QWidget()
         self._dock_layout = QVBoxLayout(dock_body)
         self._dock_layout.addWidget(self.client_role_button)
         self._dock_layout.addWidget(self.server_role_button)
         self._dock_layout.addWidget(self.discovery_panel)
+        self._dock_layout.addWidget(self._capture_group)
         # A permanent trailing spacer: it takes the leftover height while
         # the discovery panel is hidden (keeping the indicators pinned to
         # the top), and collapses to nothing while the panel is visible
@@ -326,6 +353,7 @@ class MainWindow(QMainWindow):
         self._dock_layout.addStretch(0)
         if not self._viewer_enabled:
             self.discovery_panel.hide()
+            self._capture_group.hide()
         self._update_dock_layout()
         # No title bar at all: the contents are self-explanatory, and the
         # View menu ("Panel") is the way to show or hide it — a blank header
@@ -417,6 +445,15 @@ class MainWindow(QMainWindow):
         self.close_tab_action.triggered.connect(self._close_current_session_tab)
         self.close_tab_action.setEnabled(False)  # startup tab is a fixed tab
         self._file_menu.addSeparator()
+        # Same handlers as the dock's Screen capture buttons; enabled state
+        # is kept in sync with them (_update_capture_actions).
+        self.copy_capture_action = self._file_menu.addAction("Copy screen &capture")
+        self.copy_capture_action.triggered.connect(self._copy_screen_capture)
+        self.copy_capture_action.setEnabled(False)
+        self.save_capture_action = self._file_menu.addAction("&Save screen capture…")
+        self.save_capture_action.triggered.connect(self._save_screen_capture)
+        self.save_capture_action.setEnabled(False)
+        self._file_menu.addSeparator()
         self.quit_action = self._file_menu.addAction("&Quit")
         self.quit_action.setShortcut(QKeySequence("Ctrl+Q"))
         self.quit_action.triggered.connect(self._quit)
@@ -537,7 +574,7 @@ class MainWindow(QMainWindow):
         """Give the dock's leftover height to the panel or the spacer."""
         panel_visible = self._viewer_enabled
         self._dock_layout.setStretch(2, 1 if panel_visible else 0)  # panel
-        self._dock_layout.setStretch(3, 0 if panel_visible else 1)  # spacer
+        self._dock_layout.setStretch(4, 0 if panel_visible else 1)  # spacer
 
     def _update_role_indicators(self) -> None:
         self.client_role_button.setChecked(self._viewer_enabled)
@@ -560,8 +597,10 @@ class MainWindow(QMainWindow):
             if placeholder_index != -1:
                 self._tabs.removeTab(placeholder_index)
             self.discovery_panel.hide()
+            self._capture_group.hide()
         else:
             self.discovery_panel.show()
+            self._capture_group.show()
             self._ensure_placeholder()
             self._tabs.setCurrentIndex(0)
             if self._auto_scan:
@@ -581,6 +620,74 @@ class MainWindow(QMainWindow):
         self.fullscreen_action.setEnabled(session is not None)
         self.actual_size_action.setEnabled(session is not None)
         self.actual_size_action.setChecked(session.actual_size if session else False)
+        self._update_capture_actions()
+
+    # ------------------------------------------------------ screen capture
+
+    def _update_capture_actions(self) -> None:
+        """Capture is possible while the current tab shows a frame; the dock
+        buttons and the File-menu actions enable and disable together."""
+        session = self._session_for_page(self._tabs.currentWidget())
+        available = session is not None and session.viewer.has_frame
+        for action in (
+            self.copy_capture_button,
+            self.save_capture_button,
+            self.copy_capture_action,
+            self.save_capture_action,
+        ):
+            action.setEnabled(available)
+
+    def _current_capture(self) -> tuple[ServerSession, QImage] | None:
+        """The current tab's session and its full-resolution frame, or None
+        (the handlers can fire with no frame via QAction.trigger())."""
+        session = self._session_for_page(self._tabs.currentWidget())
+        if session is None:
+            return None
+        image = session.viewer.frame_image()
+        if image is None:
+            return None
+        return session, image
+
+    def _copy_screen_capture(self) -> None:
+        capture = self._current_capture()
+        if capture is None:
+            return
+        session, image = capture
+        # copy_image does not echo to peers: sending the server a capture of
+        # its own screen (or spamming viewers) would be pure waste.
+        self._clipboard.copy_image(image)
+        self.log(
+            f"Screen capture of {session.name} "
+            f"({image.width()}x{image.height()}) copied to the clipboard"
+        )
+
+    def _save_screen_capture(self) -> None:
+        capture = self._current_capture()
+        if capture is None:
+            return
+        session, image = capture
+        # Default: Pictures\<server> 2026-07-20 143059.png (the server name
+        # is a hostname, but sanitize for safety — it came off the wire).
+        name = re.sub(r'[<>:"/\\|?*]', "_", session.name).strip() or "server"
+        stamp = time.strftime("%Y-%m-%d %H%M%S")
+        directory = QStandardPaths.writableLocation(
+            QStandardPaths.StandardLocation.PicturesLocation
+        )
+        default = str(Path(directory) / f"{name} {stamp}.png") if directory else f"{name} {stamp}.png"
+        path, _filter = QFileDialog.getSaveFileName(
+            self, "Save screen capture", default, "PNG image (*.png)"
+        )
+        if not path:
+            return  # cancelled
+        if not path.lower().endswith(".png"):
+            path += ".png"
+        if image.save(path, "PNG"):  # ty: ignore[no-matching-overload]
+            self.log(
+                f"Screen capture of {session.name} "
+                f"({image.width()}x{image.height()}) saved to {path}"
+            )
+        else:
+            self.log(f"Could not save the screen capture to {path}")
 
     def _close_current_session_tab(self) -> None:
         session = self._session_for_page(self._tabs.currentWidget())
@@ -1070,6 +1177,7 @@ class MainWindow(QMainWindow):
         if not any(s.connected for s in self._sessions if s is not session):
             self.client_performance.reset()
         session.viewer.clear(f"Connecting to {session.name} …")
+        self._update_capture_actions()  # cleared viewer; tab may already be current
         self._tabs.setCurrentWidget(session.page)
         self._set_session_status(
             session, f"Connecting to {session.name} ({session.key}) …"
@@ -1111,6 +1219,7 @@ class MainWindow(QMainWindow):
             f"Waiting for approval — someone at {session.name} "
             "must allow this connection"
         )
+        self._update_capture_actions()
         self._set_session_status(
             session,
             f"Waiting for the user on {session.name} to approve this computer …",
@@ -1178,6 +1287,7 @@ class MainWindow(QMainWindow):
         session.auto_reconnect = False
         self.client_inventory.record(session.key, "denied", name=session.name)
         session.viewer.clear(f"Connection denied: {reason}")
+        self._update_capture_actions()
         self._set_session_status(session, f"Denied by {session.name}: {reason}")
         self._update_window_title()
 
@@ -1191,6 +1301,7 @@ class MainWindow(QMainWindow):
             self.client_inventory.record(session.key, "disconnected", name=session.name)
             session.viewer.clear("Disconnected")
             self._set_session_status(session, f"Disconnected from {session.name}")
+        self._update_capture_actions()  # a cleared viewer has nothing to capture
         self._update_window_title()
         self._sessions_source.notify()
         if session.auto_reconnect and not session.denied and not self._quitting:
@@ -1273,6 +1384,9 @@ class MainWindow(QMainWindow):
             return
         session.frame_count += 1
         session.viewer.show_frame(image)
+        # Unconditional (not just the first frame): auto-reconnect refills a
+        # cleared viewer without passing through _connect_session.
+        self._update_capture_actions()
         self._set_session_status(
             session,
             f"Viewing {self._server_label(session)} — {image.width()}x{image.height()} — "

{remotedesktop-1.8.0 → remotedesktop-1.9.1}/src/remotedesktop/clipboard.py

@@ -69,6 +69,25 @@ class ClipboardSync(QObject):
             ).decode()
         self.changed.emit(payload)
 
+    def copy_image(self, image: QImage) -> None:
+        """Place an app-generated image (a screen capture) on the local
+        clipboard WITHOUT echoing it to peers: its signature is recorded
+        first, so the asynchronous dataChanged this set fires is ignored —
+        the same mechanism apply() uses. Sending a capture of the server's
+        own screen back to it would be pure waste.
+
+        Deliberately not gated on `enabled`: that preference governs
+        syncing, and this is a local copy.
+        """
+        if image.isNull():
+            return
+        self._last_signature = (None, _image_hash(image))
+        self._applying = True
+        try:
+            self._clipboard.setImage(image)
+        finally:
+            self._applying = False
+
     def apply(self, payload: dict) -> None:
         if not self.enabled:
             return  # peers may still send payloads; they are dropped locally

{remotedesktop-1.8.0 → remotedesktop-1.9.1}/src/remotedesktop/viewer.py

@@ -104,6 +104,12 @@ class ViewerWidget(QWidget):
     def has_frame(self) -> bool:
         return self._frame is not None
 
+    def frame_image(self) -> QImage | None:
+        """The most recent frame at the server's full resolution (what a
+        screen capture saves/copies), or None while nothing is shown. The
+        display-only lock overlay is never part of it."""
+        return self._frame.toImage() if self._frame is not None else None
+
     def set_actual_size(self, enabled: bool) -> None:
         """Toggle 1:1 device-pixel display (host provides the scrolling)."""
         if self._actual_size == enabled:

{remotedesktop-1.8.0 → remotedesktop-1.9.1}/tests/test_clipboard.py

@@ -157,6 +157,30 @@ def test_apply_image_payload_sets_clipboard_image(qapp):
     sync.apply(payload)
 
 
+def test_copy_image_sets_clipboard_without_echoing_to_peers(qapp):
+    clip = qapp.clipboard()
+    sync = ClipboardSync(clip)
+    emitted: list[dict] = []
+    sync.changed.connect(emitted.append)
+    sync.copy_image(_red_image())
+    for _ in range(10):
+        qapp.processEvents()
+    assert clip.image().pixelColor(0, 0).name() == "#ff0000"
+    # An app-generated copy (a screen capture) is never synced to peers.
+    assert emitted == []
+
+
+def test_copy_image_works_with_sync_disabled(qapp):
+    # The Preferences toggle governs syncing; a local capture copy is not sync.
+    clip = qapp.clipboard()
+    sync = ClipboardSync(clip)
+    sync.enabled = False
+    blue = QImage(4, 4, QImage.Format.Format_RGB32)
+    blue.fill(Qt.GlobalColor.blue)
+    sync.copy_image(blue)
+    assert clip.image().pixelColor(0, 0).name() == "#0000ff"
+
+
 def test_apply_ignores_garbage_payloads(qapp):
     clip = qapp.clipboard()
     clip.setText("before")

{remotedesktop-1.8.0 → remotedesktop-1.9.1}/tests/test_main_window.py

@@ -4,6 +4,7 @@ import socket
 import sys
 
 from PySide6.QtCore import QProcess, Qt
+from PySide6.QtGui import QImage
 from PySide6.QtWidgets import QApplication, QListWidgetItem, QMessageBox
 
 from remotedesktop import client as client_module
@@ -360,6 +361,117 @@ def test_forget_server_disconnects_and_forgets(qapp, credentials, tmp_path, monk
         server.close()
 
 
+def _capture_widgets(window):
+    return (
+        window.copy_capture_button,
+        window.save_capture_button,
+        window.copy_capture_action,
+        window.save_capture_action,
+    )
+
+
+def test_capture_buttons_and_actions_follow_frame_availability(qapp, credentials, tmp_path):
+    server = make_share_server(credentials, tmp_path)
+    window = make_window(tmp_path)
+    try:
+        assert not any(w.isEnabled() for w in _capture_widgets(window))
+        window._on_server_activated(ServerInfo(name="box", host="127.0.0.1", port=server.port))
+        session = window._sessions[0]
+        pump(qapp, lambda: session.viewer.has_frame)
+        assert all(w.isEnabled() for w in _capture_widgets(window))
+        server.close()  # dropping the connection clears the viewer again
+        pump(qapp, lambda: not session.viewer.has_frame)
+        assert not any(w.isEnabled() for w in _capture_widgets(window))
+    finally:
+        window.close()
+        server.close()
+
+
+def test_capture_group_hidden_without_the_viewer_role(qapp, credentials, tmp_path):
+    window = make_window(tmp_path, credentials, serving=True, viewer=False)
+    try:
+        assert window._capture_group.isHidden()
+    finally:
+        window.close()
+
+
+def test_copy_screen_capture_goes_through_clipboard_sync(qapp, credentials, tmp_path):
+    class RecordingSync:
+        def __init__(self):
+            self.images = []
+
+        def copy_image(self, image):
+            self.images.append(image)
+
+    server = make_share_server(credentials, tmp_path)
+    window = make_window(tmp_path)
+    try:
+        window._on_server_activated(ServerInfo(name="box", host="127.0.0.1", port=server.port))
+        session = window._sessions[0]
+        pump(qapp, lambda: session.viewer.has_frame)
+        # A recording stand-in, so the test never touches the OS clipboard.
+        recorder = RecordingSync()
+        window._clipboard = recorder
+        window.copy_capture_button.click()
+        assert len(recorder.images) == 1
+        assert recorder.images[0].size() == session.viewer.frame_image().size()
+        assert "copied to the clipboard" in window.connection_log.toPlainText()
+    finally:
+        window.close()
+        server.close()
+
+
+def test_save_screen_capture_writes_png(qapp, credentials, tmp_path, monkeypatch):
+    from PySide6.QtWidgets import QFileDialog
+
+    target = tmp_path / "capture.png"
+    dialogs = []
+    monkeypatch.setattr(
+        QFileDialog,
+        "getSaveFileName",
+        staticmethod(
+            lambda parent, title, default, filter: dialogs.append(default)
+            or (str(target), filter)
+        ),
+    )
+    server = make_share_server(credentials, tmp_path)
+    window = make_window(tmp_path)
+    try:
+        window._on_server_activated(ServerInfo(name="box", host="127.0.0.1", port=server.port))
+        session = window._sessions[0]
+        pump(qapp, lambda: session.viewer.has_frame)
+        window.save_capture_action.trigger()  # the menu path this time
+        assert target.exists()
+        saved = QImage(str(target))
+        assert saved.size() == session.viewer.frame_image().size()
+        # The server's reported name (its hostname, after the on-connect
+        # rename) seeds the default filename.
+        assert dialogs and session.name in dialogs[0]
+        assert f"saved to {target}" in window.connection_log.toPlainText()
+    finally:
+        window.close()
+        server.close()
+
+
+def test_save_screen_capture_cancelled_dialog_saves_nothing(qapp, credentials, tmp_path, monkeypatch):
+    from PySide6.QtWidgets import QFileDialog
+
+    monkeypatch.setattr(
+        QFileDialog, "getSaveFileName", staticmethod(lambda *a, **k: ("", ""))
+    )
+    server = make_share_server(credentials, tmp_path)
+    window = make_window(tmp_path)
+    try:
+        window._on_server_activated(ServerInfo(name="box", host="127.0.0.1", port=server.port))
+        session = window._sessions[0]
+        pump(qapp, lambda: session.viewer.has_frame)
+        window.save_capture_button.click()
+        assert "saved to" not in window.connection_log.toPlainText()
+    finally:
+        window.close()
+        server.close()
+
+
 def test_version_mismatch_warns_but_still_connects(qapp, credentials, tmp_path, monkeypatch):
     shown = []
     monkeypatch.setattr(QMessageBox, "show", lambda self: shown.append(self.windowTitle()))
@@ -1195,11 +1307,12 @@ def test_role_indicators_are_inert_buttons(qapp, credentials, tmp_path):
 
 
 def test_dock_keeps_indicators_at_the_top_in_both_roles(qapp, credentials, tmp_path):
-    # Layout indexes: 0/1 = indicator buttons, 2 = discovery panel, 3 = spacer.
+    # Layout indexes: 0/1 = indicator buttons, 2 = discovery panel,
+    # 3 = screen-capture group, 4 = spacer.
     window = make_window(tmp_path, credentials, serving=True, viewer=False)
     try:
         assert window._dock_layout.stretch(2) == 0  # hidden panel
-        assert window._dock_layout.stretch(3) == 1  # spacer pins buttons up
+        assert window._dock_layout.stretch(4) == 1  # spacer pins buttons up
         window.show()
         qapp.processEvents()
         # The two indicators sit adjacent at the top, not spread apart.
@@ -1211,14 +1324,14 @@ def test_dock_keeps_indicators_at_the_top_in_both_roles(qapp, credentials, tmp_p
     window = make_window(tmp_path, credentials, db_name="viewer.db")
     try:
         assert window._dock_layout.stretch(2) == 1  # panel takes the height
-        assert window._dock_layout.stretch(3) == 0
+        assert window._dock_layout.stretch(4) == 0
         # Live toggle off: the spacer takes over immediately (this was the
         # spaced-out bug — the spacer only existed for non-viewer startup).
         window.preferences_tab.viewer_checkbox.setChecked(False)
-        assert window._dock_layout.stretch(3) == 1
+        assert window._dock_layout.stretch(4) == 1
         window.preferences_tab.viewer_checkbox.setChecked(True)
         assert window._dock_layout.stretch(2) == 1
-        assert window._dock_layout.stretch(3) == 0
+        assert window._dock_layout.stretch(4) == 0
     finally:
         window.close()