frontengine 1.0.66__tar.gz → 1.0.67__tar.gz

{frontengine-1.0.66 → frontengine-1.0.67}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: frontengine
-Version: 1.0.66
+Version: 1.0.67
 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.66 → frontengine-1.0.67}/frontengine/ui/page/gif/gif_setting_ui.py

@@ -14,6 +14,7 @@ from frontengine.ui.page.utils import (
     enable_file_drop,
     reload_recent_combobox,
     resolve_preferred_monitor,
+    resolve_span,
     show_on_primary_screen,
     show_on_selected_monitor,
 )
@@ -133,6 +134,7 @@ class GIFSettingUI(SettingPage):
                 widget, self.fullscreen_checkbox, monitor
             ),
             preferred_monitor_index=resolve_preferred_monitor(self.target_monitor_combobox),
+            span_all_screens=resolve_span(self.target_monitor_combobox),
         )
 
     def choose_and_copy_file_to_cwd_gif_dir_then_play(self) -> None:

{frontengine-1.0.66 → frontengine-1.0.67}/frontengine/ui/page/image/image_setting_ui.py

@@ -17,6 +17,7 @@ from frontengine.ui.page.utils import (
     list_media_files,
     reload_recent_combobox,
     resolve_preferred_monitor,
+    resolve_span,
     show_on_primary_screen,
     show_on_selected_monitor,
 )
@@ -155,6 +156,7 @@ class ImageSettingUI(SettingPage):
                 widget, self.fullscreen_checkbox, monitor
             ),
             preferred_monitor_index=resolve_preferred_monitor(self.target_monitor_combobox),
+            span_all_screens=resolve_span(self.target_monitor_combobox),
         )
         if slideshow:
             self._slideshow_timer.start(self._slideshow_interval_ms())

{frontengine-1.0.66 → frontengine-1.0.67}/frontengine/ui/page/particle/particle_setting_ui.py

@@ -15,6 +15,8 @@ from frontengine.ui.page.utils import (
     enable_file_drop,
     reload_recent_combobox,
     resolve_preferred_monitor,
+    resolve_span,
+    virtual_desktop_geometry,
 )
 from frontengine.user_setting.user_setting_file import add_recent_file
 from frontengine.utils.logging.loggin_instance import front_engine_logger
@@ -149,9 +151,19 @@ class ParticleSettingUI(SettingPage):
             message_box.exec()
             return
 
+        span = resolve_span(self.target_monitor_combobox)
+
         def factory(monitor):
-            target = monitor or QGuiApplication.primaryScreen()
-            geometry = target.availableGeometry()
+            # 粒子場的大小在建構時就固定了，所以橫跨模式必須拿整個桌面的尺寸來建，
+            # 不能建成單一螢幕大小再把視窗拉寬——那樣粒子只會落在其中一塊。
+            # The particle field is sized at construction, so spanning has to
+            # build it at the whole-desktop size. Building it screen-sized and
+            # then widening the window would leave the particles in one corner.
+            if span:
+                geometry = virtual_desktop_geometry()
+            else:
+                target = monitor or QGuiApplication.primaryScreen()
+                geometry = target.availableGeometry()
             return self._create_particle_widget(geometry.width(), geometry.height())
 
         def present_on_monitor(widget: ParticleOpenGLWidget, monitor, _idx: int) -> None:
@@ -166,6 +178,7 @@ class ParticleSettingUI(SettingPage):
             present_primary=lambda widget: widget.showMaximized(),
             present_on_monitor=present_on_monitor,
             preferred_monitor_index=resolve_preferred_monitor(self.target_monitor_combobox),
+            span_all_screens=resolve_span(self.target_monitor_combobox),
         )
 
     def choose_and_copy_file_to_cwd_image_dir_then_play(self) -> None:

{frontengine-1.0.66 → frontengine-1.0.67}/frontengine/ui/page/text/text_setting_ui.py

@@ -14,6 +14,7 @@ from frontengine.ui.page.utils import (
     build_target_monitor_combobox,
     dispatch_to_monitors,
     resolve_preferred_monitor,
+    resolve_span,
 )
 from frontengine.ui.page.layout_kit import SettingPage
 from frontengine.utils.logging.loggin_instance import front_engine_logger
@@ -322,4 +323,5 @@ class TextSettingUI(SettingPage):
             present_primary=lambda widget: widget.showFullScreen(),
             present_on_monitor=present_on_monitor,
             preferred_monitor_index=resolve_preferred_monitor(self.target_monitor_combobox),
+            span_all_screens=resolve_span(self.target_monitor_combobox),
         )

{frontengine-1.0.66 → frontengine-1.0.67}/frontengine/ui/page/utils.py

@@ -1,7 +1,7 @@
 from pathlib import Path
 from typing import Callable, Optional
 
-from PySide6.QtCore import QEvent, QObject
+from PySide6.QtCore import QEvent, QObject, QRect
 from PySide6.QtGui import QGuiApplication, QScreen
 from PySide6.QtWidgets import QCheckBox, QComboBox, QDialog, QGridLayout, QLabel, QPushButton, QWidget
 
@@ -96,6 +96,8 @@ def dispatch_to_monitors(
     present_primary: Callable[[QWidget], None],
     present_on_monitor: Callable[[QWidget, QScreen, int], None],
     preferred_monitor_index: Optional[int] = None,
+    span_all_screens: bool = False,
+    screens: Optional[list] = None,
 ) -> None:
     """
     Run the canonical monitor-dispatch flow the setting pages share:
@@ -108,7 +110,21 @@ def dispatch_to_monitors(
     monitor so the user is not prompted; out-of-range values fall back
     to the prompt flow.
     """
-    monitors = QGuiApplication.screens()
+    monitors = QGuiApplication.screens() if screens is None else screens
+
+    # 橫跨模式：一個覆蓋層蓋滿整個桌面，而不是每個螢幕各一個。要放在最前面判斷，
+    # 因為它和「問使用者要哪一個螢幕」是互斥的——已經選了全部就沒什麼好問的。
+    # Spanning: one overlay over the whole desktop rather than one per screen.
+    # It is decided first because it rules out asking which screen to use: the
+    # user has already said all of them.
+    if span_all_screens and len(monitors) > 1:
+        widget = factory(None)
+        geometry = virtual_desktop_geometry(monitors)
+        widget.setGeometry(geometry)
+        widget.show()
+        widget.raise_()
+        return
+
     if not show_all_screen and len(monitors) <= 1:
         widget = factory(None)
         present_primary(widget)
@@ -138,19 +154,56 @@ def dispatch_to_monitors(
         present_on_monitor(widget, monitor, index)
 
 
-def build_target_monitor_combobox() -> QComboBox:
+# 「橫跨所有螢幕」在下拉選單裡用這個值標記，和「第 N 個螢幕」的整數區分開。
+# The "span every screen" entry carries this instead of a monitor index.
+SPAN_ALL_DATA = "span"
+
+
+def virtual_desktop_geometry(screens=None) -> QRect:
+    """
+    所有螢幕聯集起來的矩形，也就是整個桌面的範圍。
+
+    橫跨模式要的是一個蓋滿這塊範圍的覆蓋層，而不是每個螢幕各一個。螢幕不一定排成
+    一直線也不一定同樣高，所以要用聯集而不是把寬度加起來。
+    The union of every screen: the whole desktop. Spanning wants one overlay
+    covering that, not one per screen. Screens are not necessarily in a row or
+    the same height, so this unites rather than summing widths.
+    """
+    geometry = QRect()
+    for screen in (QGuiApplication.screens() if screens is None else screens):
+        geometry = geometry.united(screen.geometry())
+    return geometry
+
+
+def build_target_monitor_combobox(screens=None) -> QComboBox:
     """
     Build a combobox listing the current monitors plus an initial "Ask"
     entry. Selection "Ask" (data=None) preserves today's prompt flow;
     selecting a monitor index pre-selects that screen.
+
+    多螢幕時多一個「橫跨所有螢幕」。只有一個螢幕時不提供——那和一般顯示完全一樣，
+    列出來只會讓人以為自己漏掉了什麼。
+    On a multi-monitor system there is also a "span every screen" entry. It is
+    not offered on a single screen, where it would do exactly what the normal
+    path does and only leave the user wondering what they missed.
     """
+    monitors = QGuiApplication.screens() if screens is None else screens
     combobox = QComboBox()
     combobox.addItem(language_wrapper.language_word_dict.get("target_monitor_ask", "Ask"), None)
-    for index, _ in enumerate(QGuiApplication.screens()):
+    for index, _ in enumerate(monitors):
         combobox.addItem(str(index), index)
+    if len(monitors) > 1:
+        combobox.addItem(
+            language_wrapper.language_word_dict.get("target_monitor_span", "Span all screens"),
+            SPAN_ALL_DATA)
     return combobox
 
 
+def resolve_span(combobox: Optional[QComboBox]) -> bool:
+    """使用者是不是選了「橫跨所有螢幕」。"""
+    return combobox is not None and combobox.currentData() == SPAN_ALL_DATA
+
+
 def resolve_preferred_monitor(combobox: Optional[QComboBox]) -> Optional[int]:
     """Return the selected monitor index, or None for the Ask entry."""
     if combobox is None:

{frontengine-1.0.66 → frontengine-1.0.67}/frontengine/ui/page/video/video_setting_ui.py

@@ -14,6 +14,7 @@ from frontengine.ui.page.utils import (
     enable_file_drop,
     reload_recent_combobox,
     resolve_preferred_monitor,
+    resolve_span,
     show_on_primary_screen,
     show_on_selected_monitor,
 )
@@ -154,6 +155,7 @@ class VideoSettingUI(SettingPage):
             present_primary=lambda widget: show_on_primary_screen(widget, self.fullscreen_checkbox),
             present_on_monitor=present_on_monitor,
             preferred_monitor_index=resolve_preferred_monitor(self.target_monitor_combobox),
+            span_all_screens=resolve_span(self.target_monitor_combobox),
         )
 
     def choose_and_copy_file_to_cwd_video_dir_then_play(self) -> None:

{frontengine-1.0.66 → frontengine-1.0.67}/frontengine/ui/page/web/web_setting_ui.py

@@ -12,6 +12,7 @@ from frontengine.ui.page.utils import (
     build_target_monitor_combobox,
     dispatch_to_monitors,
     resolve_preferred_monitor,
+    resolve_span,
 )
 from frontengine.utils.logging.loggin_instance import front_engine_logger
 from frontengine.utils.multi_language.language_wrapper import language_wrapper
@@ -303,4 +304,5 @@ class WEBSettingUI(SettingPage):
             present_primary=lambda widget: widget.showFullScreen(),
             present_on_monitor=present_on_monitor,
             preferred_monitor_index=resolve_preferred_monitor(self.target_monitor_combobox),
+            span_all_screens=resolve_span(self.target_monitor_combobox),
         )

{frontengine-1.0.66 → frontengine-1.0.67}/frontengine/utils/multi_language/english.py

@@ -46,6 +46,7 @@ english_word_dict = {
     "tools_shape": "Shape",
     "tools_name": "Name",
     "tools_saved": "Saved",
+    "target_monitor_span": "Span all screens",
     "tools_replicate_window": "Replicate a window...",
     "window_replica_title": "Replicate a window",
     "window_replica_refresh": "Refresh",

{frontengine-1.0.66 → frontengine-1.0.67}/frontengine/utils/multi_language/france.py

@@ -47,6 +47,7 @@ french_word_dict = {
     "tools_shape": "Forme",
     "tools_name": "Nom",
     "tools_saved": "Enregistrés",
+    "target_monitor_span": "Sur tous les écrans",
     "tools_replicate_window": "Dupliquer une fenêtre...",
     "window_replica_title": "Dupliquer une fenêtre",
     "window_replica_refresh": "Actualiser",

{frontengine-1.0.66 → frontengine-1.0.67}/frontengine/utils/multi_language/germany.py

@@ -47,6 +47,7 @@ germany_word_dict = {
     "tools_shape": "Form",
     "tools_name": "Name",
     "tools_saved": "Gespeichert",
+    "target_monitor_span": "Über alle Bildschirme",
     "tools_replicate_window": "Fenster duplizieren...",
     "window_replica_title": "Fenster duplizieren",
     "window_replica_refresh": "Aktualisieren",

{frontengine-1.0.66 → frontengine-1.0.67}/frontengine/utils/multi_language/italy.py

@@ -47,6 +47,7 @@ italian_word_dict = {
     "tools_shape": "Forma",
     "tools_name": "Nome",
     "tools_saved": "Salvati",
+    "target_monitor_span": "Su tutti gli schermi",
     "tools_replicate_window": "Duplica una finestra...",
     "window_replica_title": "Duplica una finestra",
     "window_replica_refresh": "Aggiorna",

{frontengine-1.0.66 → frontengine-1.0.67}/frontengine/utils/multi_language/russian.py

@@ -47,6 +47,7 @@ russian_word_dict = {
     "tools_shape": "Форма",
     "tools_name": "Имя",
     "tools_saved": "Сохранённые",
+    "target_monitor_span": "На все экраны",
     "tools_replicate_window": "Копия окна...",
     "window_replica_title": "Копия окна",
     "window_replica_refresh": "Обновить",

{frontengine-1.0.66 → frontengine-1.0.67}/frontengine/utils/multi_language/simplified_chinese.py

@@ -47,6 +47,7 @@ simplified_chinese_word_dict = {
     "tools_shape": "形状",
     "tools_name": "名称",
     "tools_saved": "已保存",
+    "target_monitor_span": "横跨所有屏幕",
     "tools_replicate_window": "窗口副本⋯",
     "window_replica_title": "窗口副本",
     "window_replica_refresh": "刷新",

{frontengine-1.0.66 → frontengine-1.0.67}/frontengine/utils/multi_language/traditional_chinese.py

@@ -47,6 +47,7 @@ traditional_chinese_word_dict = {
     "tools_shape": "形狀",
     "tools_name": "名稱",
     "tools_saved": "已儲存",
+    "target_monitor_span": "橫跨所有螢幕",
     "tools_replicate_window": "視窗複本⋯",
     "window_replica_title": "視窗複本",
     "window_replica_refresh": "重新整理",

{frontengine-1.0.66 → frontengine-1.0.67}/frontengine.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: frontengine
-Version: 1.0.66
+Version: 1.0.67
 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.66 → frontengine-1.0.67}/pyproject.toml

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