frontengine 1.0.48__tar.gz → 1.0.49__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: frontengine
-Version: 1.0.48
+Version: 1.0.49
 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

{frontengine-1.0.48 → frontengine-1.0.49}/frontengine/show/gaming/crosshair_widget.py

@@ -13,10 +13,10 @@ stacks windows and not something to work around.
 """
 from __future__ import annotations
 
-from typing import Tuple
+from typing import Any, Optional, Tuple
 
 from PySide6.QtCore import QPointF, Qt
-from PySide6.QtGui import QColor, QPainter, QPen
+from PySide6.QtGui import QColor, QPainter, QPen, QScreen
 
 from frontengine.show.base_widget import BaseWidget
 from frontengine.utils.logging.loggin_instance import front_engine_logger
@@ -35,13 +35,13 @@ MIN_SIZE = 4
 MAX_SIZE = 200
 
 
-def normalize_style(style) -> str:
+def normalize_style(style: Any) -> str:
     """把準星樣式正規化；不認得的一律當十字。"""
     name = str(style or "").strip().lower()
     return name if name in STYLES else STYLE_CROSS
 
 
-def clamp_size(value, fallback: int = DEFAULT_SIZE) -> int:
+def clamp_size(value: Any, fallback: int = DEFAULT_SIZE) -> int:
     """準星尺寸夾在看得見又不誇張的範圍。"""
     try:
         return max(MIN_SIZE, min(MAX_SIZE, int(value)))
@@ -49,7 +49,7 @@ def clamp_size(value, fallback: int = DEFAULT_SIZE) -> int:
         return fallback
 
 
-def clamp_thickness(value, fallback: int = DEFAULT_THICKNESS) -> int:
+def clamp_thickness(value: Any, fallback: int = DEFAULT_THICKNESS) -> int:
     """線寬夾在 1~12。"""
     try:
         return max(1, min(12, int(value)))
@@ -57,7 +57,7 @@ def clamp_thickness(value, fallback: int = DEFAULT_THICKNESS) -> int:
         return fallback
 
 
-def clamp_gap(value, size: int = DEFAULT_SIZE, fallback: int = DEFAULT_GAP) -> int:
+def clamp_gap(value: Any, size: int = DEFAULT_SIZE, fallback: int = DEFAULT_GAP) -> int:
     """
     中央空隙不能大到把準星吃光，所以上限跟著尺寸走。
     The centre gap cannot swallow the crosshair, so its ceiling follows the size.
@@ -100,7 +100,8 @@ class CrosshairWidget(BaseWidget):
         self.opacity = 1.0
         self.resize(self.size * 2 + 8, self.size * 2 + 8)
 
-    def set_crosshair(self, style=None, color=None, size=None,
+    def set_crosshair(self, style: Optional[str] = None, color: Optional[str] = None,
+                      size: Optional[int] = None,
                       thickness=None, gap=None) -> None:
         """一次改好幾項設定，改完立刻重畫。"""
         if style is not None:
@@ -119,7 +120,7 @@ class CrosshairWidget(BaseWidget):
         self.centre_on_screen()
         self.update()
 
-    def centre_on_screen(self, screen=None) -> None:
+    def centre_on_screen(self, screen: Optional[QScreen] = None) -> None:
         """擺到螢幕正中央（準星要對準的是畫面中心）。"""
         from PySide6.QtGui import QGuiApplication
 

{frontengine-1.0.48 → frontengine-1.0.49}/frontengine/show/teleprompter/teleprompter_widget.py

@@ -12,7 +12,7 @@ and it stops at the last line rather than snapping back to the top mid-read.
 """
 from __future__ import annotations
 
-from typing import List, Optional
+from typing import Any, List, Optional
 
 from PySide6.QtCore import Qt, QTimer
 from PySide6.QtGui import QColor, QFont, QFontMetrics, QPainter, QTransform
@@ -31,7 +31,7 @@ _TICK_MS = 33
 _SIDE_MARGIN = 40
 
 
-def clamp_speed(value, fallback: int = DEFAULT_SPEED) -> int:
+def clamp_speed(value: Any, fallback: int = DEFAULT_SPEED) -> int:
     """捲動速度夾在讀得完又跟得上的範圍。"""
     try:
         return max(MIN_SPEED, min(MAX_SPEED, int(value)))
@@ -39,7 +39,7 @@ def clamp_speed(value, fallback: int = DEFAULT_SPEED) -> int:
         return fallback
 
 
-def clamp_font_size(value, fallback: int = DEFAULT_FONT_SIZE) -> int:
+def clamp_font_size(value: Any, fallback: int = DEFAULT_FONT_SIZE) -> int:
     """字級夾在看得見的範圍。"""
     try:
         return max(MIN_FONT_SIZE, min(MAX_FONT_SIZE, int(value)))

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

@@ -2,7 +2,7 @@ import os
 import sys
 from os import getcwd
 from pathlib import Path
-from typing import Dict, Optional, Type
+from typing import Any, Dict, Optional, Type
 
 from PySide6.QtCore import QByteArray, QTimer, QCoreApplication
 from PySide6.QtGui import QIcon, Qt
@@ -74,6 +74,20 @@ from frontengine.utils.theme_schedule.theme_schedule_service import ThemeSchedul
 FrontEngine_EXTEND_TAB: Dict[str, Type[QWidget]] = {}
 
 
+def tray_can_restore_window(window: Any) -> bool:
+    """
+    系統匣能不能把主視窗叫回來。任何「把主視窗藏起來」的功能都得先問這件事，
+    不然藏掉的就是唯一能把該功能關掉的畫面。
+    Whether the tray can bring the main window back. Anything that hides the
+    window has to ask first: otherwise what it hides is the only screen that
+    can turn that same thing off.
+    """
+    tray = getattr(window, "system_tray", None)
+    return bool(ExtendSystemTray.isSystemTrayAvailable()
+                and getattr(window, "show_system_tray_ray", False)
+                and tray is not None and tray.isVisible())
+
+
 class FrontEngineMainUI(QMainWindow):
     """
     FrontEngine 主視窗
@@ -321,9 +335,10 @@ class FrontEngineMainUI(QMainWindow):
         """
         sources = (
             (self.screen_care_setting_ui, ("filter_widget_list", "ruler_widget_list",
-                                           "break_overlay_list")),
+                                           "break_overlay_list", "color_vision_widget_list")),
             (self.presentation_setting_ui, ("annotation_widget_list", "cursor_widget_list",
-                                            "keystroke_widget_list", "magnifier_widget_list")),
+                                            "keystroke_widget_list", "magnifier_widget_list",
+                                            "whiteboard_widget_list")),
             (self.focus_setting_ui, ("dim_widget_list", "mask_widget_list")),
         )
         for page, attributes in sources:
@@ -334,6 +349,12 @@ class FrontEngineMainUI(QMainWindow):
         # The wallpaper page keys its widgets by monitor, so hand over the values.
         self.control_center_ui.register_overlay_source(
             lambda: list(self.wallpaper_setting_ui.wallpaper_widgets.values()))
+        self.control_center_ui.register_overlay_source(
+            lambda: getattr(self.web_setting_ui, "dashboard_widgets", []))
+        # 批次關閉之後，沒有覆蓋層在聽就把全域輸入監聽收掉
+        # After a batch close nothing is listening, so drop the global input hook.
+        self.control_center_ui.register_cleanup(
+            self.presentation_setting_ui.release_input_watch)
         for attribute in ("spectrum_widget_list", "monitor_widget_list",
                           "now_playing_widget_list", "note_widget_list"):
             self.control_center_ui.register_overlay_source(
@@ -518,12 +539,28 @@ class FrontEngineMainUI(QMainWindow):
             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()
+            self._hide_for_signage()
         return first
 
+    def _hide_for_signage(self) -> None:
+        """
+        收起主視窗——但只在系統匣真的能把它叫回來的時候。沒有系統匣就等於
+        把唯一能關掉輪播的畫面藏起來，重開也只會再被藏一次，使用者就只能去
+        手動改設定檔了。
+        Put the main window away - but only when the tray can actually bring it
+        back. Without a tray this would hide the only screen that can turn the
+        rotation off, and restarting just hides it again, leaving the settings
+        file as the only way out.
+        """
+        if tray_can_restore_window(self):
+            self.hide()
+            return
+        front_engine_logger.info(
+            "[FrontEngineMainUI] signage kept the window visible: no tray to restore it from")
+
     def stop_signage(self) -> None:
         """停止輪播並把主視窗放回來。"""
         self.signage_service.stop()

{frontengine-1.0.48 → frontengine-1.0.49}/frontengine/ui/page/control_center/control_center_ui.py

@@ -1,3 +1,5 @@
+from typing import Callable
+
 from PySide6.QtCore import QTimer, Qt
 from PySide6.QtWidgets import (
     QComboBox, QGridLayout, QLabel, QPushButton, QScrollArea, QTextEdit, QWidget,
@@ -93,6 +95,7 @@ class ControlCenterUI(QWidget):
         # 其他分頁登記進來的覆蓋層來源（桌布、專注、護眼、簡報…）
         # Overlay sources registered by the other pages: wallpaper, focus, screen care, presenting.
         self._extra_overlay_sources: list = []
+        self._cleanup_callbacks: list = []
         self.low_power_button = self._create_button(
             "control_center_low_power_on", self.toggle_low_power)
         self._hidden_from_capture = False
@@ -190,19 +193,29 @@ class ControlCenterUI(QWidget):
         self.scene_setting_ui.close_scene()
 
     def clear_all(self) -> None:
+        """
+        關閉所有覆蓋層。先真的 close() 再清空清單：close() 會跑到 closeEvent，
+        計時器、媒體、全域監聽才停得掉；只丟掉 Python 參考做不到這件事，而且
+        對「其他分頁註冊進來的」覆蓋層根本沒作用——它們會留在螢幕上。
+        Close every overlay. Actually call close() before emptying the lists:
+        that runs closeEvent, which is what stops timers, releases media and
+        drops global listeners. Merely dropping a Python reference does none of
+        that, and for the overlays other pages registered it did nothing at all
+        - they stayed on screen.
+        """
         front_engine_logger.info("ControlCenterUI clear_all")
-        self.video_setting_ui.video_widget_list.clear()
-        self.image_setting_ui.image_widget_list.clear()
-        self.web_setting_ui.web_widget_list.clear()
-        self.gif_setting_ui.gif_widget_list.clear()
-        self.sound_player_setting_ui.sound_widget_list.clear()
-        self.text_setting_ui.text_widget_list.clear()
-        self.particle_setting_ui.particle_list.clear()
-        if self.pet_setting_ui is not None:
-            self.pet_setting_ui.pet_list.clear()
+        self._for_each_overlay(lambda widget: widget.close())
+        for widget_list in self._all_overlay_widget_lists():
+            widget_list.clear()
         self.scene_setting_ui.close_scene()
+        for callback in self._cleanup_callbacks:
+            try:
+                callback()
+            except Exception as error:
+                front_engine_logger.warning(
+                    f"[ControlCenterUI] cleanup failed: {error!r}")
 
-    def register_overlay_source(self, provider) -> None:
+    def register_overlay_source(self, provider: Callable[[], list]) -> None:
         """
         讓控制中心也管得到其他分頁開的覆蓋層。provider 是一個回傳 widget 清單
         的函式（每次都重新問，才拿得到當下還活著的那些）。
@@ -212,6 +225,16 @@ class ControlCenterUI(QWidget):
         """
         self._extra_overlay_sources.append(provider)
 
+    def register_cleanup(self, callback: Callable[[], None]) -> None:
+        """
+        批次關閉之後要順手收掉的東西。例如全域輸入監聽：覆蓋層都關掉了就
+        沒有東西需要它，繼續掛著只是白吃資源。
+        Something to release after a batch close - a global input listener,
+        say: with every overlay gone nothing needs it, and leaving it hooked
+        just costs for nothing.
+        """
+        self._cleanup_callbacks.append(callback)
+
     def _all_overlay_widget_lists(self) -> list:
         """回傳所有覆蓋層 widget 清單 / All overlay widget lists."""
         lists = [
@@ -231,11 +254,15 @@ class ControlCenterUI(QWidget):
             except Exception as error:  # pragma: no cover - defensive boundary
                 front_engine_logger.warning(f"[ControlCenterUI] overlay source failed: {error!r}")
                 continue
+            # 交回原本的清單物件（不是複本），死掉的參考才清得掉、
+            # 「全部關閉」也才真的能把它們清空。
+            # Hand back the provider's own list rather than a copy, so pruning
+            # a dead reference - and closing everything - reaches the real one.
             if widgets:
-                lists.append(list(widgets))
+                lists.append(widgets if isinstance(widgets, list) else list(widgets))
         return lists
 
-    def _for_each_overlay(self, action) -> None:
+    def _for_each_overlay(self, action: Callable[[QWidget], None]) -> None:
         """
         對每個仍存活的覆蓋層 widget 執行 action(widget)。手動關閉的覆蓋層因
         WA_DeleteOnClose 已被銷毀，其 Python 參考仍留在清單中，呼叫時會

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

@@ -6,7 +6,7 @@ The presentation page: screen annotation, cursor emphasis (ring, click ripple,
 spotlight), a keystroke display and a region magnifier. Everything except the
 annotation layer passes clicks straight through.
 """
-from typing import List
+from typing import List, Optional
 
 from PySide6.QtCore import Qt
 from PySide6.QtGui import QGuiApplication
@@ -181,7 +181,8 @@ class PresentationSettingUI(QWidget):
         if self.keystroke_widget_list or self.cursor_widget_list:
             self.input_watch.start()
 
-    def _release_input_watch(self) -> None:
+    def release_input_watch(self) -> None:
+        """沒有覆蓋層要聽了就收掉全域輸入監聽（批次關閉之後也會呼叫）。"""
         if not self.keystroke_widget_list and not self.cursor_widget_list:
             self.input_watch.stop()
 
@@ -250,7 +251,7 @@ class PresentationSettingUI(QWidget):
 
     def stop_cursor_effects(self) -> None:
         self._close_all(self.cursor_widget_list)
-        self._release_input_watch()
+        self.release_input_watch()
         self.cursor_button.setText(
             language_wrapper.language_word_dict.get("cursor_effect_start", "Turn cursor effects on"))
 
@@ -285,7 +286,7 @@ class PresentationSettingUI(QWidget):
 
     def stop_keystrokes(self) -> None:
         self._close_all(self.keystroke_widget_list)
-        self._release_input_watch()
+        self.release_input_watch()
         self.keystroke_button.setText(
             language_wrapper.language_word_dict.get("keystroke_start", "Show keystrokes"))
 
@@ -341,7 +342,6 @@ class PresentationSettingUI(QWidget):
             except RuntimeError:
                 self.magnifier_widget_list.remove(widget)
 
-    # --- preset state ----------------------------------------------------
     # --- whiteboard ------------------------------------------------------
     def toggle_whiteboard(self) -> None:
         if self.whiteboard_widget_list:
@@ -364,7 +364,7 @@ class PresentationSettingUI(QWidget):
         self.whiteboard_button.setText(
             language_wrapper.language_word_dict.get("whiteboard_start", "Whiteboard"))
 
-    def save_whiteboard(self):
+    def save_whiteboard(self) -> Optional[str]:
         """把白板存成圖片；沒畫東西就不存。"""
         for board in self.whiteboard_widget_list[:]:
             try:
@@ -377,6 +377,7 @@ class PresentationSettingUI(QWidget):
                 self.whiteboard_widget_list.remove(board)
         return None
 
+    # --- preset state ----------------------------------------------------
     def get_state(self) -> dict:
         return {
             "annotate_tool": self.annotate_tool_combobox.currentData(),

{frontengine-1.0.48 → frontengine-1.0.49}/frontengine/utils/remote/remote_server.py

@@ -24,7 +24,7 @@ import secrets
 import socket
 import threading
 from http.server import BaseHTTPRequestHandler, ThreadingHTTPServer
-from typing import Any, Dict, List, Optional, Tuple
+from typing import Any, Dict, Optional, Tuple
 from urllib.parse import parse_qs, urlparse
 
 from PySide6.QtCore import QObject, Signal
@@ -138,7 +138,6 @@ class RemoteServer(QObject):
         self._on_action = on_action
         self._server: Optional[ThreadingHTTPServer] = None
         self._thread: Optional[threading.Thread] = None
-        self.received: List[str] = []
 
     @property
     def running(self) -> bool:
@@ -192,7 +191,6 @@ class RemoteServer(QObject):
             return 403
         if not is_allowed(action):
             return 400
-        self.received.append(str(action))
         self.action_requested.emit(str(action))
         if self._on_action is not None:
             self._on_action(str(action))

{frontengine-1.0.48 → frontengine-1.0.49}/frontengine/utils/screen_privacy/capture_affinity.py

@@ -22,10 +22,13 @@ determined attacker, and it never hides the window from the person at the desk.
 from __future__ import annotations
 
 import sys
-from typing import Optional
+from typing import TYPE_CHECKING, Iterable, Optional
 
 from frontengine.utils.logging.loggin_instance import front_engine_logger
 
+if TYPE_CHECKING:  # 只為了型別標註，執行時不需要把 Qt 拉進這支純 ctypes 工具
+    from PySide6.QtWidgets import QWidget
+
 # WDA_NONE：正常擷取；WDA_EXCLUDEFROMCAPTURE：擷取時整片留白
 # WDA_NONE captures normally; WDA_EXCLUDEFROMCAPTURE comes out blank.
 WDA_NONE = 0x00000000
@@ -92,7 +95,7 @@ def is_excluded_from_capture(handle: int) -> Optional[bool]:
         return None
 
 
-def apply_to_widget(widget, excluded: bool) -> bool:
+def apply_to_widget(widget: Optional[QWidget], excluded: bool) -> bool:
     """
     對一個 Qt widget 套用擷取可見性。視窗還沒建立原生 handle 時回傳 False，
     呼叫端可以等 show() 之後再試一次。
@@ -108,7 +111,7 @@ def apply_to_widget(widget, excluded: bool) -> bool:
     return set_excluded_from_capture(handle, excluded)
 
 
-def apply_to_widgets(widgets, excluded: bool) -> int:
+def apply_to_widgets(widgets: Optional[Iterable[QWidget]], excluded: bool) -> int:
     """對一批 widget 套用，回傳成功的數量。"""
     applied = 0
     for widget in tuple(widgets or ()):

{frontengine-1.0.48 → frontengine-1.0.49}/frontengine/utils/virtual_camera/camera_feed.py

@@ -46,7 +46,7 @@ class VirtualCameraFeed(QObject):
             return None
         return screen.grabWindow(0, rect.x(), rect.y(), rect.width(), rect.height())
 
-    def set_grabber(self, grabber) -> None:
+    def set_grabber(self, grabber: Optional[Callable[[QRect], Optional[QPixmap]]]) -> None:
         self._grabber = grabber or self._default_grabber
 
     def start(self, region: QRect, fps: int) -> bool:

{frontengine-1.0.48 → frontengine-1.0.49}/frontengine/utils/virtual_camera/virtual_camera.py

@@ -15,7 +15,7 @@ False and the feature stays off; nothing is ever sent quietly.
 """
 from __future__ import annotations
 
-from typing import Optional, Tuple
+from typing import Any, Optional, Tuple
 
 import numpy
 
@@ -47,7 +47,7 @@ def available() -> bool:
     return _module() is not None
 
 
-def clamp_fps(value, fallback: int = DEFAULT_FPS) -> int:
+def clamp_fps(value: Any, fallback: int = DEFAULT_FPS) -> int:
     """每秒張數夾在驅動接受的範圍。"""
     try:
         return max(MIN_FPS, min(MAX_FPS, int(value)))
@@ -55,9 +55,9 @@ def clamp_fps(value, fallback: int = DEFAULT_FPS) -> int:
         return fallback
 
 
-def even_size(width, height) -> Tuple[int, int]:
+def even_size(width: Any, height: Any) -> Tuple[int, int]:
     """把尺寸調成偶數且不小於 2x2。"""
-    def fix(value, fallback):
+    def fix(value: Any, fallback: int) -> int:
         try:
             number = max(_SIZE_STEP, int(value))
         except (TypeError, ValueError):

{frontengine-1.0.48 → frontengine-1.0.49}/frontengine.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: frontengine
-Version: 1.0.48
+Version: 1.0.49
 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

{frontengine-1.0.48 → frontengine-1.0.49}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "frontengine"
-version = "1.0.48"
+version = "1.0.49"
 authors = [
     { name = "JE-Chen", email = "jechenmailman@gmail.com" },
 ]