frontengine 1.0.47__tar.gz → 1.0.48__tar.gz

{frontengine-1.0.47 → frontengine-1.0.48}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: frontengine
-Version: 1.0.47
+Version: 1.0.48
 Summary: FrontEngine is use-define frontview or only use like screen saver
 Author-email: JE-Chen <jechenmailman@gmail.com>
 Project-URL: Homepage, https://github.com/Intergration-Automation-Testing/FrontEngine
@@ -204,6 +204,21 @@ Four things on the **Stream** tab, for playing and for going live:
 
 ---
 
+## Signage, whiteboard and lip-sync
+
+- **Signage mode** (Settings) — rotate through a list of presets on a timer and
+  put the main window away, for a machine left running as a display. The
+  rotation wraps, so it keeps cycling.
+- **Whiteboard** (Presenting tab) — an infinite canvas: drag with the middle
+  button to pan, scroll to zoom, and save what you drew as an image. Strokes
+  live in canvas coordinates, so panning and zooming leaves them where they
+  belong.
+- **Pet lip-sync** — the pet can react to your **microphone** instead of your
+  speakers, so it moves while you talk. Like the speaker reaction this reads
+  only the meter — a number, not sound. Windows only.
+
+---
+
 ## Remote control
 
 From **Settings → Remote control**:

{frontengine-1.0.47 → frontengine-1.0.48}/README.md

@@ -180,6 +180,21 @@ Four things on the **Stream** tab, for playing and for going live:
 
 ---
 
+## Signage, whiteboard and lip-sync
+
+- **Signage mode** (Settings) — rotate through a list of presets on a timer and
+  put the main window away, for a machine left running as a display. The
+  rotation wraps, so it keeps cycling.
+- **Whiteboard** (Presenting tab) — an infinite canvas: drag with the middle
+  button to pan, scroll to zoom, and save what you drew as an image. Strokes
+  live in canvas coordinates, so panning and zooming leaves them where they
+  belong.
+- **Pet lip-sync** — the pet can react to your **microphone** instead of your
+  speakers, so it moves while you talk. Like the speaker reaction this reads
+  only the meter — a number, not sound. Windows only.
+
+---
+
 ## Remote control
 
 From **Settings → Remote control**:

frontengine-1.0.48/frontengine/show/canvas/whiteboard_widget.py

@@ -0,0 +1,243 @@
+"""
+無限畫布白板：可以一直往外畫、拖曳平移、滾輪縮放，最後存成圖片。
+
+和簡報分頁的塗鴉層不同的是，筆畫存的是「畫布座標」而不是螢幕座標，所以平移
+縮放之後線條還在它原本該在的地方——這正是「無限」的意思。
+
+An infinite whiteboard: keep drawing outwards, drag to pan, scroll to zoom, and
+save the result as an image.
+
+Unlike the presenting page's annotation layer, strokes are stored in canvas
+coordinates rather than screen ones, so panning and zooming leaves them where
+they belong - which is what makes it infinite.
+"""
+from __future__ import annotations
+
+from pathlib import Path
+from typing import Any, Dict, List, Optional, Tuple
+
+from PySide6.QtCore import QPoint, QPointF, QRectF, Qt
+from PySide6.QtGui import QColor, QImage, QPainter, QPen
+
+from frontengine.show.base_widget import BaseWidget
+from frontengine.show.window_helpers import apply_overlay_window_flags
+from frontengine.utils.logging.loggin_instance import front_engine_logger
+
+DEFAULT_COLOR = "#ffd54f"
+DEFAULT_WIDTH = 4
+MIN_ZOOM = 0.2
+MAX_ZOOM = 5.0
+ZOOM_STEP = 1.15
+_SAVE_MARGIN = 24
+
+
+def clamp_zoom(value: Any, fallback: float = 1.0) -> float:
+    """縮放倍率夾在看得清楚又不會迷路的範圍。"""
+    try:
+        return max(MIN_ZOOM, min(MAX_ZOOM, float(value)))
+    except (TypeError, ValueError):
+        return fallback
+
+
+def to_canvas(point: Tuple[float, float], offset: Tuple[float, float], zoom: float) -> Tuple[float, float]:
+    """螢幕座標 -> 畫布座標。"""
+    scale = clamp_zoom(zoom)
+    return ((point[0] - offset[0]) / scale, (point[1] - offset[1]) / scale)
+
+
+def to_screen(point: Tuple[float, float], offset: Tuple[float, float], zoom: float) -> Tuple[float, float]:
+    """畫布座標 -> 螢幕座標。"""
+    scale = clamp_zoom(zoom)
+    return (point[0] * scale + offset[0], point[1] * scale + offset[1])
+
+
+def content_bounds(strokes: List[Dict[str, Any]]) -> Optional[Tuple[float, float, float, float]]:
+    """
+    所有筆畫涵蓋的畫布範圍 (left, top, right, bottom)；沒有筆畫回傳 None。
+    存檔時用它決定要輸出多大，才不會存出一大片空白。
+    The canvas area the strokes cover, or None when there are none. Saving uses
+    it to size the image, so the result is not mostly blank.
+    """
+    points = [point for stroke in strokes for point in stroke.get("points", [])]
+    if not points:
+        return None
+    xs = [point[0] for point in points]
+    ys = [point[1] for point in points]
+    return (min(xs), min(ys), max(xs), max(ys))
+
+
+class WhiteboardWidget(BaseWidget):
+    """
+    無限畫布。筆畫以畫布座標保存，畫的時候才換算成螢幕座標。
+    """
+
+    def __init__(self, color: str = DEFAULT_COLOR, width: int = DEFAULT_WIDTH) -> None:
+        front_engine_logger.info("[WhiteboardWidget] Init")
+        super().__init__()
+        candidate = QColor(color)
+        self.color = candidate if candidate.isValid() else QColor(DEFAULT_COLOR)
+        self.pen_width = max(1, int(width))
+        self.opacity = 1.0
+        self.overlay_lockable = False
+        self.strokes: List[Dict[str, Any]] = []
+        self.zoom = 1.0
+        self.offset = [0.0, 0.0]
+        self._stroke: Optional[Dict[str, Any]] = None
+        self._pan_origin: Optional[QPoint] = None
+        apply_overlay_window_flags(self, show_on_bottom=False, allow_input=True)
+
+    # --- drawing ---------------------------------------------------------
+    def begin_stroke(self, point: QPoint) -> None:
+        """開始一筆。"""
+        self._stroke = {"color": self.color.name(), "width": self.pen_width,
+                        "points": [to_canvas((point.x(), point.y()), self.offset, self.zoom)]}
+
+    def extend_stroke(self, point: QPoint) -> None:
+        if self._stroke is not None:
+            self._stroke["points"].append(to_canvas((point.x(), point.y()), self.offset, self.zoom))
+            self.update()
+
+    def end_stroke(self) -> bool:
+        """
+        收筆。只有一個點的「筆畫」是誤點，丟掉不留。
+        Finish. A one-point stroke is a stray click and is discarded.
+        """
+        stroke, self._stroke = self._stroke, None
+        if stroke is None or len(stroke["points"]) < 2:
+            return False
+        self.strokes.append(stroke)
+        self.update()
+        return True
+
+    def undo(self) -> bool:
+        """收回最後一筆。"""
+        if not self.strokes:
+            return False
+        self.strokes.pop()
+        self.update()
+        return True
+
+    def clear(self) -> None:
+        self.strokes = []
+        self._stroke = None
+        self.update()
+
+    def set_pen(self, color: Optional[str] = None, width: Optional[int] = None) -> None:
+        if color is not None:
+            candidate = QColor(color)
+            if candidate.isValid():
+                self.color = candidate
+        if width is not None:
+            self.pen_width = max(1, int(width))
+
+    # --- navigating ------------------------------------------------------
+    def pan(self, dx: float, dy: float) -> None:
+        """平移畫布。"""
+        self.offset[0] += float(dx)
+        self.offset[1] += float(dy)
+        self.update()
+
+    def zoom_at(self, point: QPoint, factor: float) -> float:
+        """
+        以游標為中心縮放：游標底下的那一點在縮放前後要停在原地，
+        不然放大時畫面會整個跑掉。
+        Zoom around the cursor so whatever is under it stays put; otherwise the
+        view lurches away every time you zoom.
+        """
+        before = to_canvas((point.x(), point.y()), self.offset, self.zoom)
+        self.zoom = clamp_zoom(self.zoom * float(factor))
+        after = to_screen(before, self.offset, self.zoom)
+        self.offset[0] += point.x() - after[0]
+        self.offset[1] += point.y() - after[1]
+        self.update()
+        return self.zoom
+
+    def reset_view(self) -> None:
+        """回到原點與原始比例（筆畫都還在）。"""
+        self.zoom = 1.0
+        self.offset = [0.0, 0.0]
+        self.update()
+
+    # --- events ----------------------------------------------------------
+    def mousePressEvent(self, event) -> None:
+        if event.button() == Qt.MouseButton.LeftButton:
+            self.begin_stroke(event.position().toPoint())
+        elif event.button() == Qt.MouseButton.MiddleButton:
+            self._pan_origin = event.position().toPoint()
+        super().mousePressEvent(event)
+
+    def mouseMoveEvent(self, event) -> None:
+        point = event.position().toPoint()
+        if self._pan_origin is not None:
+            self.pan(point.x() - self._pan_origin.x(), point.y() - self._pan_origin.y())
+            self._pan_origin = point
+        else:
+            self.extend_stroke(point)
+        super().mouseMoveEvent(event)
+
+    def mouseReleaseEvent(self, event) -> None:
+        if event.button() == Qt.MouseButton.MiddleButton:
+            self._pan_origin = None
+        else:
+            self.end_stroke()
+        super().mouseReleaseEvent(event)
+
+    def wheelEvent(self, event) -> None:
+        step = ZOOM_STEP if event.angleDelta().y() > 0 else 1.0 / ZOOM_STEP
+        self.zoom_at(event.position().toPoint(), step)
+
+    # --- output ----------------------------------------------------------
+    def save_image(self, path: str) -> Optional[str]:
+        """
+        把所有筆畫存成一張圖（只涵蓋畫過的範圍）。沒有筆畫就不存，回傳 None。
+        Save the strokes as an image covering only the area drawn on. Nothing
+        drawn means nothing saved.
+        """
+        bounds = content_bounds(self.strokes)
+        if bounds is None:
+            return None
+        left, top, right, bottom = bounds
+        width = int(right - left) + _SAVE_MARGIN * 2
+        height = int(bottom - top) + _SAVE_MARGIN * 2
+        image = QImage(max(1, width), max(1, height), QImage.Format.Format_ARGB32)
+        image.fill(Qt.GlobalColor.transparent)
+        painter = QPainter(image)
+        painter.setRenderHint(QPainter.RenderHint.Antialiasing, True)
+        for stroke in self.strokes:
+            self._paint_stroke(painter, stroke,
+                               offset=(_SAVE_MARGIN - left, _SAVE_MARGIN - top), zoom=1.0)
+        painter.end()
+        target = Path(path)
+        try:
+            target.parent.mkdir(parents=True, exist_ok=True)
+            if not image.save(str(target)):
+                return None
+        except OSError as error:
+            front_engine_logger.warning(f"[WhiteboardWidget] save failed: {error!r}")
+            return None
+        front_engine_logger.info(f"[WhiteboardWidget] saved | {target}")
+        return str(target)
+
+    def _paint_stroke(self, painter: QPainter, stroke: Dict[str, Any],
+                      offset, zoom: float) -> None:
+        points = stroke.get("points", [])
+        if len(points) < 2:
+            return
+        pen = QPen(QColor(stroke.get("color", DEFAULT_COLOR)),
+                   max(1.0, float(stroke.get("width", DEFAULT_WIDTH)) * zoom))
+        pen.setCapStyle(Qt.PenCapStyle.RoundCap)
+        pen.setJoinStyle(Qt.PenJoinStyle.RoundJoin)
+        painter.setPen(pen)
+        previous = to_screen(points[0], offset, zoom)
+        for point in points[1:]:
+            current = to_screen(point, offset, zoom)
+            painter.drawLine(QPointF(*previous), QPointF(*current))
+            previous = current
+
+    def draw_content(self, painter: QPainter) -> None:
+        painter.setRenderHint(QPainter.RenderHint.Antialiasing, True)
+        painter.fillRect(QRectF(self.rect()), QColor(0, 0, 0, 120))
+        for stroke in self.strokes:
+            self._paint_stroke(painter, stroke, self.offset, self.zoom)
+        if self._stroke is not None:
+            self._paint_stroke(painter, self._stroke, self.offset, self.zoom)

frontengine-1.0.48/frontengine/ui/dialog/signage_dialog.py

@@ -0,0 +1,100 @@
+"""
+看板模式設定：依序輪播一組預設集，適合把機器擺著當展示螢幕。
+
+Signage settings: rotate through a set of presets, for a machine left running
+as a display.
+"""
+from __future__ import annotations
+
+from typing import Any, Dict, Optional
+
+from PySide6.QtWidgets import (
+    QCheckBox, QDialog, QDialogButtonBox, QGridLayout, QLabel, QPlainTextEdit, QSpinBox, QWidget,
+)
+
+from frontengine.user_setting.user_setting_file import user_setting_dict, write_user_setting
+from frontengine.utils.logging.loggin_instance import front_engine_logger
+from frontengine.utils.multi_language.language_wrapper import language_wrapper
+from frontengine.utils.signage.signage_service import (
+    DEFAULT_INTERVAL_MINUTES, MAX_INTERVAL_MINUTES, MIN_INTERVAL_MINUTES, clamp_interval,
+    normalize_playlist,
+)
+
+SETTING_KEY = "signage"
+DEFAULT_SETTINGS: Dict[str, Any] = {
+    "enabled": False, "presets": [], "interval_minutes": DEFAULT_INTERVAL_MINUTES,
+    "hide_window": True,
+}
+
+
+def _t(key: str, fallback: str) -> str:
+    return language_wrapper.language_word_dict.get(key, fallback)
+
+
+def current_settings() -> Dict[str, Any]:
+    """目前的看板設定（缺項目補預設值）。"""
+    stored = user_setting_dict.get(SETTING_KEY)
+    settings = dict(DEFAULT_SETTINGS)
+    if isinstance(stored, dict):
+        settings.update({key: stored[key] for key in DEFAULT_SETTINGS if key in stored})
+    settings["presets"] = normalize_playlist(settings.get("presets"))
+    settings["interval_minutes"] = clamp_interval(settings.get("interval_minutes"))
+    return settings
+
+
+class SignageDialog(QDialog):
+    """設定要輪播哪些預設集、多久換一次。"""
+
+    def __init__(self, parent: Optional[QWidget] = None) -> None:
+        front_engine_logger.info("[SignageDialog] Init")
+        super().__init__(parent)
+        self.setWindowTitle(_t("signage_title", "Signage mode"))
+        settings = current_settings()
+
+        self.enable_checkbox = QCheckBox(_t("signage_enable", "Rotate presets"))
+        self.enable_checkbox.setChecked(bool(settings.get("enabled")))
+        self.presets_label = QLabel(_t("signage_presets_label", "Presets, one per line:"))
+        self.presets_edit = QPlainTextEdit("\n".join(settings.get("presets", [])))
+        self.interval_label = QLabel(_t("signage_interval_label", "Change every (minutes)"))
+        self.interval_spinbox = QSpinBox()
+        self.interval_spinbox.setRange(MIN_INTERVAL_MINUTES, MAX_INTERVAL_MINUTES)
+        self.interval_spinbox.setValue(settings.get("interval_minutes"))
+        self.hide_checkbox = QCheckBox(
+            _t("signage_hide_window", "Hide the main window while rotating"))
+        self.hide_checkbox.setChecked(bool(settings.get("hide_window", True)))
+        self.hint_label = QLabel(
+            _t("signage_hint",
+               "Presets are saved from the Presets menu. The rotation wraps at the end, so a "
+               "machine left running keeps cycling."))
+        self.hint_label.setWordWrap(True)
+
+        self.button_box = QDialogButtonBox(
+            QDialogButtonBox.StandardButton.Ok | QDialogButtonBox.StandardButton.Cancel)
+        self.button_box.accepted.connect(self.accept)
+        self.button_box.rejected.connect(self.reject)
+
+        layout = QGridLayout(self)
+        layout.addWidget(self.enable_checkbox, 0, 0, 1, 2)
+        layout.addWidget(self.presets_label, 1, 0, 1, 2)
+        layout.addWidget(self.presets_edit, 2, 0, 1, 2)
+        layout.addWidget(self.interval_label, 3, 0)
+        layout.addWidget(self.interval_spinbox, 3, 1)
+        layout.addWidget(self.hide_checkbox, 4, 0, 1, 2)
+        layout.addWidget(self.hint_label, 5, 0, 1, 2)
+        layout.addWidget(self.button_box, 6, 0, 1, 2)
+
+    def settings(self) -> Dict[str, Any]:
+        """對話框上目前的設定。"""
+        return {
+            "enabled": self.enable_checkbox.isChecked(),
+            "presets": normalize_playlist(self.presets_edit.toPlainText()),
+            "interval_minutes": self.interval_spinbox.value(),
+            "hide_window": self.hide_checkbox.isChecked(),
+        }
+
+    def accept(self) -> None:
+        settings = self.settings()
+        user_setting_dict[SETTING_KEY] = settings
+        write_user_setting()
+        front_engine_logger.info(f"[SignageDialog] saved | {len(settings['presets'])} preset(s)")
+        super().accept()

{frontengine-1.0.47 → frontengine-1.0.48}/frontengine/ui/main_ui.py

@@ -53,6 +53,8 @@ from frontengine.ui.dialog.remote_control_dialog import (
     MIDI_KEY, current_bindings, remote_enabled,
 )
 from frontengine.ui.dialog.screen_privacy_dialog import current_settings as current_privacy_settings
+from frontengine.ui.dialog.signage_dialog import current_settings as current_signage_settings
+from frontengine.utils.signage.signage_service import SignageService
 from frontengine.utils.midi.midi_input import MidiInput, binding_key
 from frontengine.utils.remote.remote_server import RemoteServer
 from frontengine.ui.dialog.smart_pause_dialog import current_rules
@@ -235,6 +237,13 @@ class FrontEngineMainUI(QMainWindow):
         if user_setting_dict.get(MIDI_KEY):
             self.midi_input.start(user_setting_dict.get("midi_device") or 0)
 
+        # 看板模式：依序輪播預設集，主視窗可以收起來
+        # Signage mode: rotate presets, with the main window out of the way.
+        self.signage_service = SignageService(config_provider=current_signage_settings)
+        self.signage_service.preset_due.connect(lambda name: apply_named_preset(self, name))
+        if current_signage_settings().get("enabled"):
+            self.start_signage()
+
         # 分享畫面時把覆蓋層藏出擷取結果（自己仍看得到）
         # Hide the overlays from the capture while sharing; they stay on screen here.
         self.share_watch_service = ShareWatchService(config_provider=current_privacy_settings)
@@ -508,6 +517,18 @@ class FrontEngineMainUI(QMainWindow):
         if action:
             self._handle_hotkey(action)
 
+    def start_signage(self) -> Optional[str]:
+        """開始輪播；設定要求的話也把主視窗收起來。"""
+        first = self.signage_service.start()
+        if first is not None and current_signage_settings().get("hide_window", True):
+            self.hide()
+        return first
+
+    def stop_signage(self) -> None:
+        """停止輪播並把主視窗放回來。"""
+        self.signage_service.stop()
+        self.show()
+
     def _on_sharing_changed(self, sharing: bool, match: str) -> None:
         """
         偵測到會議程式開著／關掉時，自動把覆蓋層藏出擷取結果或放回去。
@@ -573,6 +594,7 @@ class FrontEngineMainUI(QMainWindow):
     # The background services to stop on close, outermost first.
     _CLOSING_SERVICES = (
         "preset_schedule_service", "theme_schedule_service", "usage_service",
+        "signage_service",
         "remote_server", "midi_input", "share_watch_service", "reminder_service",
         "app_profile_service", "smart_pause_service", "hotkey_service",
     )

{frontengine-1.0.47 → frontengine-1.0.48}/frontengine/ui/menu/settings_menu.py

@@ -12,6 +12,7 @@ from frontengine.ui.dialog.hotkey_settings_dialog import HotkeySettingsDialog
 from frontengine.ui.dialog.reminder_dialog import ReminderDialog
 from frontengine.ui.dialog.remote_control_dialog import RemoteControlDialog
 from frontengine.ui.dialog.screen_privacy_dialog import ScreenPrivacyDialog
+from frontengine.ui.dialog.signage_dialog import SignageDialog
 from frontengine.ui.dialog.smart_pause_dialog import SmartPauseDialog
 from frontengine.ui.dialog.usage_report_dialog import UsageReportDialog
 from frontengine.user_setting.user_setting_file import (
@@ -89,6 +90,11 @@ def build_settings_menu(ui: "FrontEngineMainUI") -> None:
     menu.addAction(reminder_action)
     ui.reminder_action = reminder_action
 
+    signage_action = QAction(_t("settings_menu_signage", "Signage mode..."), menu)
+    signage_action.triggered.connect(lambda: _open_signage_dialog(ui))
+    menu.addAction(signage_action)
+    ui.signage_action = signage_action
+
     remote_action = QAction(_t("settings_menu_remote", "Remote control..."), menu)
     remote_action.triggered.connect(lambda: _open_remote_dialog(ui))
     menu.addAction(remote_action)
@@ -127,6 +133,18 @@ def build_settings_menu(ui: "FrontEngineMainUI") -> None:
     menu.addAction(import_action)
 
 
+def _open_signage_dialog(ui: "FrontEngineMainUI") -> None:
+    """開看板設定；按下確定後立刻套用新的輪播狀態。"""
+    front_engine_logger.info("[SettingsMenu] open SignageDialog")
+    dialog = SignageDialog(ui)
+    if dialog.exec() != QDialog.DialogCode.Accepted:
+        return
+    if dialog.settings().get("enabled"):
+        ui.start_signage()
+    else:
+        ui.stop_signage()
+
+
 def _open_remote_dialog(ui: "FrontEngineMainUI") -> None:
     """開遙控設定，並把它接上 MIDI 的「學習」流程。"""
     front_engine_logger.info("[SettingsMenu] open RemoteControlDialog")

{frontengine-1.0.47 → frontengine-1.0.48}/frontengine/ui/page/pet/pet_setting_ui.py

@@ -21,6 +21,7 @@ from frontengine.ui.page.utils import (
     resolve_preferred_monitor,
 )
 from frontengine.user_setting.user_setting_file import add_recent_file
+from frontengine.utils.audio_meter.microphone_meter import microphone_level
 from frontengine.utils.audio_meter.screen_audio import audio_level_provider_for_screen
 from frontengine.utils.pet_chat.pet_chat_service import PetChatService
 from frontengine.utils.focus_timer.focus_timer import (
@@ -142,6 +143,12 @@ class PetSettingUI(QWidget):
         for label, value in (("0%", 0), ("25%", 25), ("50%", 50), ("75%", 75), ("100%", 100)):
             self.volume_combobox.addItem(label, value)
         self.volume_combobox.setCurrentText("100%")
+        self.audio_source_combobox = QComboBox()
+        self.audio_source_combobox.addItem(
+            language_wrapper.language_word_dict.get("pet_audio_speakers", "Speakers"), "speakers")
+        self.audio_source_combobox.addItem(
+            language_wrapper.language_word_dict.get("pet_audio_microphone", "Microphone"),
+            "microphone")
         self.audio_react_checkbox = QCheckBox(
             language_wrapper.language_word_dict.get("pet_audio_label", "React to audio"))
         self.drop_hint_label = QLabel(
@@ -185,6 +192,7 @@ class PetSettingUI(QWidget):
         self.grid_layout.addWidget(self.volume_label, 6, 2)
         self.grid_layout.addWidget(self.volume_combobox, 7, 2)
         self.grid_layout.addWidget(self.audio_react_checkbox, 7, 0)
+        self.grid_layout.addWidget(self.audio_source_combobox, 7, 1)
         self.grid_layout.addWidget(self.tag_checkbox, 7, 1)
         self.grid_layout.addWidget(self.speech_checkbox, 7, 2)
         self.grid_layout.addWidget(self.focus_label, 8, 0)
@@ -218,10 +226,7 @@ class PetSettingUI(QWidget):
             pet.set_chat_service(self.chat_service())
         geometry = self._target_geometry()
         if self.audio_react_checkbox.isChecked():
-            # 跟隨寵物所在螢幕的音源（比對不到就用系統預設輸出裝置）
-            # Follow the audio of the screen the pet lives on; default endpoint otherwise.
-            pet.set_audio_level_provider(
-                audio_level_provider_for_screen(geometry[1] if geometry is not None else None))
+            pet.set_audio_level_provider(self._audio_provider(geometry))
         pet.set_pet_window_flag()
         self.pet_list.append(pet)
         pet.show()
@@ -420,6 +425,20 @@ class PetSettingUI(QWidget):
         add_recent_file("pet", path)
         reload_recent_combobox(self.recent_files_combobox, "pet")
 
+    def _audio_provider(self, geometry):
+        """
+        寵物要跟著什麼聲音動：喇叭（跟隨牠所在螢幕的輸出裝置）或麥克風
+        （你說話時牠才動）。兩者都只讀電表數值，不擷取音訊內容。
+        What the pet reacts to: the speakers on its own screen, or the
+        microphone so it only moves while you talk. Both read a meter value and
+        capture no audio content.
+        """
+        if self.audio_source_combobox.currentData() == "microphone":
+            return microphone_level
+        # 跟隨寵物所在螢幕的音源（比對不到就用系統預設輸出裝置）
+        # Follow the audio of the screen the pet lives on; default endpoint otherwise.
+        return audio_level_provider_for_screen(geometry[1] if geometry is not None else None)
+
     def get_state(self) -> dict:
         return {
             "pet_image_path": self.pet_image_path,
@@ -433,6 +452,7 @@ class PetSettingUI(QWidget):
             "target_monitor": self.target_monitor_combobox.currentText(),
             "volume": self.volume_combobox.currentText(),
             "audio_react": self.audio_react_checkbox.isChecked(),
+            "audio_source": self.audio_source_combobox.currentData(),
             "tag": self.tag_checkbox.isChecked(),
             "speech": self.speech_checkbox.isChecked(),
             "chat": self.chat_checkbox.isChecked(),
@@ -444,6 +464,7 @@ class PetSettingUI(QWidget):
         """把預設集的內容還原到這一頁的控制項上。"""
         self._restore_media(state)
         apply_combobox_data_state(self.behaviour_combobox, self._behaviour_from(state))
+        apply_combobox_data_state(self.audio_source_combobox, state.get("audio_source"))
         apply_combobox_text_state(state, (
             (self.size_combobox, "size"),
             (self.speed_combobox, "speed"),

{frontengine-1.0.47 → frontengine-1.0.48}/frontengine/ui/page/presentation/presentation_setting_ui.py

@@ -11,9 +11,11 @@ from typing import List
 from PySide6.QtCore import Qt
 from PySide6.QtGui import QGuiApplication
 from PySide6.QtWidgets import (
+    QFileDialog,
     QCheckBox, QComboBox, QGridLayout, QLabel, QPushButton, QSlider, QWidget,
 )
 
+from frontengine.show.canvas.whiteboard_widget import WhiteboardWidget
 from frontengine.show.presentation.annotation_overlay import (
     PEN_COLORS, TOOL_ERASER, TOOL_HIGHLIGHTER, TOOL_PEN, AnnotationOverlay,
 )
@@ -36,6 +38,7 @@ class PresentationSettingUI(QWidget):
         self.grid_layout.setContentsMargins(0, 0, 0, 0)
 
         self.annotation_widget_list: List[AnnotationOverlay] = []
+        self.whiteboard_widget_list: List[WhiteboardWidget] = []
         self.cursor_widget_list: List[CursorEffectWidget] = []
         self.keystroke_widget_list: List[KeystrokeDisplayWidget] = []
         self.magnifier_widget_list: List[MagnifierWidget] = []
@@ -109,6 +112,12 @@ class PresentationSettingUI(QWidget):
         self.magnifier_button.clicked.connect(self.toggle_magnifier)
 
         # Shared
+        self.whiteboard_button = QPushButton(
+            language_wrapper.language_word_dict.get("whiteboard_start", "Whiteboard"))
+        self.whiteboard_button.clicked.connect(self.toggle_whiteboard)
+        self.whiteboard_save_button = QPushButton(
+            language_wrapper.language_word_dict.get("whiteboard_save", "Save whiteboard"))
+        self.whiteboard_save_button.clicked.connect(self.save_whiteboard)
         self.target_monitor_label = QLabel(
             language_wrapper.language_word_dict.get("target_monitor_label", "Target monitor"))
         self.target_monitor_combobox = build_target_monitor_combobox()
@@ -136,9 +145,11 @@ class PresentationSettingUI(QWidget):
         self.grid_layout.addWidget(self.magnifier_label, 6, 0)
         self.grid_layout.addWidget(self.magnifier_zoom_combobox, 6, 1)
         self.grid_layout.addWidget(self.magnifier_button, 6, 2)
-        self.grid_layout.addWidget(self.target_monitor_label, 7, 0)
-        self.grid_layout.addWidget(self.target_monitor_combobox, 7, 1)
-        self.grid_layout.addWidget(self.hint_label, 8, 0, 1, 3)
+        self.grid_layout.addWidget(self.whiteboard_button, 7, 0)
+        self.grid_layout.addWidget(self.whiteboard_save_button, 7, 1)
+        self.grid_layout.addWidget(self.target_monitor_label, 8, 0)
+        self.grid_layout.addWidget(self.target_monitor_combobox, 8, 1)
+        self.grid_layout.addWidget(self.hint_label, 9, 0, 1, 3)
 
     # --- shared ----------------------------------------------------------
     def target_screen(self):
@@ -331,6 +342,41 @@ class PresentationSettingUI(QWidget):
                 self.magnifier_widget_list.remove(widget)
 
     # --- preset state ----------------------------------------------------
+    # --- whiteboard ------------------------------------------------------
+    def toggle_whiteboard(self) -> None:
+        if self.whiteboard_widget_list:
+            self.stop_whiteboard()
+        else:
+            self.start_whiteboard()
+
+    def start_whiteboard(self) -> None:
+        """開一塊無限畫布（可平移縮放，畫過的東西留在畫布座標上）。"""
+        front_engine_logger.info("[PresentationSettingUI] start_whiteboard")
+        board = WhiteboardWidget(self.annotate_color_combobox.currentData(),
+                                 self.annotate_width_slider.value())
+        self._present(board)
+        self.whiteboard_widget_list.append(board)
+        self.whiteboard_button.setText(
+            language_wrapper.language_word_dict.get("whiteboard_stop", "Close whiteboard"))
+
+    def stop_whiteboard(self) -> None:
+        self._close_all(self.whiteboard_widget_list)
+        self.whiteboard_button.setText(
+            language_wrapper.language_word_dict.get("whiteboard_start", "Whiteboard"))
+
+    def save_whiteboard(self):
+        """把白板存成圖片；沒畫東西就不存。"""
+        for board in self.whiteboard_widget_list[:]:
+            try:
+                target = QFileDialog.getSaveFileName(
+                    self, language_wrapper.language_word_dict.get(
+                        "whiteboard_save", "Save whiteboard"), "whiteboard.png", "PNG (*.png)")[0]
+                if target:
+                    return board.save_image(target)
+            except RuntimeError:
+                self.whiteboard_widget_list.remove(board)
+        return None
+
     def get_state(self) -> dict:
         return {
             "annotate_tool": self.annotate_tool_combobox.currentData(),

{frontengine-1.0.47 → frontengine-1.0.48}/frontengine/user_setting/user_setting_file.py

@@ -54,6 +54,9 @@ user_setting_dict: Dict[str, Any] = {
     # Sticky note contents and positions, and whether to reopen them on launch.
     "sticky_notes": [],
     "sticky_notes_restore": False,
+    # 看板模式：依序輪播預設集（預設關閉）
+    # Signage mode: rotate through presets; off by default.
+    "signage": {"enabled": False, "presets": [], "interval_minutes": 5, "hide_window": True},
     # 手機遙控（會開一個本機網路埠，預設關閉）與 MIDI 綁定
     # The phone remote opens a local network port and is off by default;
     # plus the MIDI control bindings.