frontengine 1.0.40__tar.gz → 1.0.42__tar.gz

{frontengine-1.0.40 → frontengine-1.0.42}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: frontengine
-Version: 1.0.40
+Version: 1.0.42
 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.40 → frontengine-1.0.42}/frontengine/show/monitor/monitor_widget.py

@@ -92,7 +92,8 @@ class SystemMonitorWidget(BaseWidget):
         self._series: Dict[str, Deque[float]] = {
             key: deque(maxlen=self.history_length) for key, _label, _color in LINES
         }
-        self._latest: Dict[str, float] = {key: 0.0 for key, _label, _color in LINES}
+        self._latest: Dict[str, float] = dict.fromkeys(
+            (key for key, _label, _color in LINES), 0.0)
         self._font = QFont()
         self._font.setPointSize(9)
         self._timer = QTimer(self)

{frontengine-1.0.40 → frontengine-1.0.42}/frontengine/show/particle/particle_ui.py

@@ -1,7 +1,19 @@
 import random
 import sys
 
-from OpenGL.GL import *
+# 明確列出用到的 OpenGL 名稱。星號匯入會讓靜態檢查完全看不出哪些名字存在，
+# 也就是說整個檔案的「未定義名稱」檢查等於失效。
+# The OpenGL names this file uses, spelled out. A star import blinds static
+# analysis to what exists, which switches off undefined-name checking for the
+# whole file.
+from OpenGL.GL import (
+    GL_BLEND, GL_COLOR_BUFFER_BIT, GL_CULL_FACE, GL_DEPTH_BUFFER_BIT, GL_DEPTH_TEST,
+    GL_LINEAR, GL_MODELVIEW, GL_ONE_MINUS_SRC_ALPHA, GL_PROJECTION, GL_QUADS, GL_RGBA,
+    GL_SRC_ALPHA, GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_TEXTURE_MIN_FILTER,
+    GL_UNSIGNED_BYTE, glBegin, glBindTexture, glBlendFunc, glClear, glClearColor, glColor4f,
+    glDisable, glEnable, glEnd, glGenTextures, glLoadIdentity, glMatrixMode, glOrtho,
+    glTexCoord2f, glTexImage2D, glTexParameteri, glTranslatef, glVertex2f, glViewport,
+)
 from PySide6.QtCore import Qt, QTimer
 from PySide6.QtGui import QSurfaceFormat, QPixmap
 from PySide6.QtOpenGLWidgets import QOpenGLWidget

{frontengine-1.0.40 → frontengine-1.0.42}/frontengine/show/pet/desktop_pet.py

@@ -92,6 +92,12 @@ def scan_pet_pack(folder: str) -> dict:
 
 # 可以請寵物幫忙開啟的網址協定 / URL schemes the pet will open for you
 _WEB_SCHEMES = frozenset({"http", "https"})
+# 可以當寵物音效的副檔名。音效路徑可能來自匯入的預設集或 Workshop 內容，
+# 所以只認這幾種副檔名的既存檔案。
+# The suffixes accepted as a pet sound. The path can arrive from an imported
+# preset or Workshop content, so only an existing file with one of these is
+# honoured.
+_SOUND_SUFFIXES = (".wav", ".mp3", ".ogg", ".m4a", ".flac")
 
 
 # 拖進寵物的檔案分類 / What a file dropped onto the pet means
@@ -99,6 +105,24 @@ DROP_SPRITE = "sprite"  # 圖片或動作包 -> 換一套外觀
 DROP_FOOD = "food"      # 其他檔案 -> 當成食物餵給寵物
 
 
+def acceptable_sound(sound_path) -> Optional[Path]:
+    """
+    可以拿來當寵物音效的路徑，否則回傳 None。音效路徑可能來自匯入的預設集或
+    Workshop 內容（別人寫的資料），所以只接受「確實存在、副檔名是音訊」的檔案
+    ——不讓一份預設集指使程式去開任意檔案。
+    The path to use as a pet sound, or None. It can arrive from an imported
+    preset or from Workshop content - data someone else wrote - so only a file
+    that actually exists and carries an audio suffix is accepted: a preset does
+    not get to point this at any file it likes.
+    """
+    if not sound_path:
+        return None
+    path = Path(str(sound_path))
+    if path.is_file() and path.suffix.lower() in _SOUND_SUFFIXES:
+        return path
+    return None
+
+
 def classify_drop(path) -> Optional[str]:
     """
     判斷拖到寵物身上的檔案要換裝還是當食物；路徑無效或空資料夾回傳 None。
@@ -238,7 +262,7 @@ class PetTimeline:
     """
 
     def __init__(self, events) -> None:
-        self._events = sorted(list(events), key=lambda item: item[0])
+        self._events = sorted(events, key=lambda item: item[0])
         self._index = 0
 
     def __len__(self) -> int:
@@ -319,12 +343,13 @@ class PetTagGame:
     tick from outside.
     """
 
-    CATCH_DISTANCE = 60.0
-    FLEE_DISTANCE = 220.0
-    COOLDOWN_TICKS = 20
+    DEFAULT_CATCH_DISTANCE = 60.0
+    DEFAULT_FLEE_DISTANCE = 220.0
+    DEFAULT_COOLDOWN_TICKS = 20
 
-    def __init__(self, catch_distance: float = CATCH_DISTANCE, flee_distance: float = FLEE_DISTANCE,
-                 cooldown_ticks: int = COOLDOWN_TICKS) -> None:
+    def __init__(self, catch_distance: float = DEFAULT_CATCH_DISTANCE,
+                 flee_distance: float = DEFAULT_FLEE_DISTANCE,
+                 cooldown_ticks: int = DEFAULT_COOLDOWN_TICKS) -> None:
         self.catch_distance = float(catch_distance)
         self.flee_distance = float(flee_distance)
         self.cooldown_ticks = max(0, int(cooldown_ticks))
@@ -361,7 +386,7 @@ class PetTagGame:
             self.reset()
             return {}
         if self.it not in positions:
-            self.it = sorted(positions)[0]
+            self.it = min(positions)
             self._cooldown = self.cooldown_ticks
         # 冷卻期間只是跑給對方追，不換鬼；先判斷再遞減，冷卻 N 拍就真的保護 N 拍。
         # While cooling down nobody can be tagged; check before decrementing so a
@@ -801,7 +826,7 @@ class PetMotion:
                 self.vx = -abs(self.vx)
         return int(self.x), int(self.y)
 
-    def _step_fall(self, left, top, right, bottom, floor_y) -> Tuple[int, int]:
+    def _step_fall(self, left, top, right, bottom, _floor_y) -> Tuple[int, int]:
         """落下：撞牆/天花板反彈，並在越過視窗平台或螢幕地板時落地。"""
         prev_feet = self.y + self.height
         self.vy += self.GRAVITY
@@ -816,36 +841,48 @@ class PetMotion:
         if self.y <= top:
             self.y = float(top)
             self.vy = abs(self.vy) * self.WALL_DAMPING
-        new_feet = self.y + self.height
-        center_x = self.x + self.width / 2.0
+        land_feet, land_span = self._landing_for(prev_feet, self.y + self.height, bottom)
+        if land_feet is not None:
+            self._land_on(land_feet, land_span)
+        return int(self.x), int(self.y)
 
+    def _landing_for(self, prev_feet: float, new_feet: float, bottom: float):
+        """
+        這一步跨過了哪個落腳處：回傳 (腳底高度, 平台範圍)。平台優先於螢幕地板，
+        多個平台則取最高的那個；都沒跨過就回傳 (None, None)。
+        What this step crossed, as (feet height, platform span). A platform wins
+        over the screen floor, the highest platform wins among several, and
+        crossing nothing gives (None, None).
+        """
+        center_x = self.x + self.width / 2.0
         land_feet = None
         land_span = None
         for platform_left, platform_right, platform_y in self.platforms:
-            if platform_left <= center_x <= platform_right and prev_feet <= platform_y <= new_feet:
-                if land_feet is None or platform_y < land_feet:
-                    land_feet = float(platform_y)
-                    land_span = (float(platform_left), float(platform_right))
+            crossed = prev_feet <= platform_y <= new_feet
+            over_it = platform_left <= center_x <= platform_right
+            if crossed and over_it and (land_feet is None or platform_y < land_feet):
+                land_feet = float(platform_y)
+                land_span = (float(platform_left), float(platform_right))
         if prev_feet <= bottom <= new_feet and (land_feet is None or bottom < land_feet):
-            land_feet = float(bottom)
-            land_span = None
-
-        if land_feet is not None:
-            self.y = float(land_feet - self.height)
-            if abs(self.vy) > self.BOUNCE_THRESHOLD:
-                self.vy = -self.vy * self.BOUNCE_DAMPING
-            else:
-                self.vy = 0.0
-                self._airborne = False
-                self.surface = SURFACE_FLOOR
-                self.on_platform = land_span is not None
-                self.platform_span = land_span
-                self.ground_feet = land_feet
-                self.vx = float(self.speed) if self.vx >= 0 else float(-self.speed)
-                self._new_state(force_walk=True)
-        return int(self.x), int(self.y)
+            return (float(bottom), None)
+        return (land_feet, land_span)
+
+    def _land_on(self, land_feet: float, land_span) -> None:
+        """落地：還有力氣就彈起來，否則就站定並恢復走動。"""
+        self.y = float(land_feet - self.height)
+        if abs(self.vy) > self.BOUNCE_THRESHOLD:
+            self.vy = -self.vy * self.BOUNCE_DAMPING
+            return
+        self.vy = 0.0
+        self._airborne = False
+        self.surface = SURFACE_FLOOR
+        self.on_platform = land_span is not None
+        self.platform_span = land_span
+        self.ground_feet = land_feet
+        self.vx = float(self.speed) if self.vx >= 0 else float(-self.speed)
+        self._new_state(force_walk=True)
 
-    def _step_follow(self, left, top, right, bottom, floor_y) -> Tuple[int, int]:
+    def _step_follow(self, left, _top, right, _bottom, floor_y) -> Tuple[int, int]:
         """朝 follow_target_x 走過去；抵達附近即清除並恢復隨機行為。"""
         center_x = self.x + self.width / 2.0
         if abs(center_x - self.follow_target_x) <= self.speed + 2.0:
@@ -898,7 +935,7 @@ class PetMotion:
             self.vx = -abs(self.vx)
         return int(self.x), int(self.y)
 
-    def _step_climb(self, left, top, right, bottom, floor_y) -> Tuple[int, int]:
+    def _step_climb(self, left, top, right, _bottom, floor_y) -> Tuple[int, int]:
         """沿螢幕邊緣爬行；隨機放手則掉落 / Crawl the screen perimeter; may let go and fall."""
         if self._rng.random() < self.DROP_CHANCE:
             self.surface = SURFACE_FLOOR
@@ -1348,7 +1385,7 @@ class DesktopPetWidget(BaseWidget):
 
     def start_moving(self, bounds: Tuple[int, int, int, int], interval_ms: int = 33) -> None:
         front_engine_logger.info(f"[DesktopPetWidget] start_moving | bounds={bounds}")
-        left, top, right, bottom = bounds
+        left, _top, _right, bottom = bounds
         self.motion.set_bounds(bounds)
         self.motion.x = float(left)
         self.motion.y = float(bottom - self.pet_size)
@@ -1596,10 +1633,12 @@ class DesktopPetWidget(BaseWidget):
             self._pending_chat_reply = None
 
     def _init_sound(self, sound_path: Optional[str]) -> None:
-        if not sound_path:
-            return
-        path = Path(sound_path)
-        if not (path.exists() and path.is_file()):
+        """載入寵物音效（路徑先經過 acceptable_sound 檢查）。"""
+        path = acceptable_sound(sound_path)
+        if path is None:
+            if sound_path:
+                front_engine_logger.warning(
+                    f"[DesktopPetWidget] refusing sound path: {sound_path!r}")
             return
         try:
             self._sound = QSoundEffect(self)
@@ -1829,8 +1868,8 @@ class DesktopPetWidget(BaseWidget):
             event.acceptProposedAction()
 
     def dragMoveEvent(self, event) -> None:
-        if self._accepts_drop(event.mimeData()):
-            event.acceptProposedAction()
+        """拖曳過程中的判斷和進入時完全一樣，直接沿用同一套規則。"""
+        self.dragEnterEvent(event)
 
     def dropEvent(self, event) -> None:
         path = self.dropped_path(event.mimeData())

{frontengine-1.0.40 → frontengine-1.0.42}/frontengine/show/presentation/cursor_effects.py

@@ -121,7 +121,7 @@ class CursorEffectWidget(BaseWidget):
         except Exception:  # pragma: no cover - defensive around injected providers
             return
         self.cursor_point = QPoint(int(position.x()) - self.x(), int(position.y()) - self.y())
-        for ripple in list(self.ripples):
+        for ripple in self.ripples[:]:
             ripple["step"] += 1
             if ripple["step"] > RIPPLE_STEPS:
                 self.ripples.remove(ripple)

{frontengine-1.0.40 → frontengine-1.0.42}/frontengine/ui/dialog/choose_file_dialog.py

@@ -7,6 +7,12 @@ from frontengine.utils.logging.loggin_instance import front_engine_logger
 from frontengine.utils.multi_language.language_wrapper import language_wrapper
 
 
+# 動圖副檔名在多個選擇器裡重複出現
+# The animation suffixes repeat across several pickers.
+_GIF = ".gif"
+_WEBP = ".webp"
+
+
 def choose_file(
         trigger_ui: QWidget,
         file_filter: str,
@@ -50,7 +56,7 @@ def choose_gif(trigger_ui: QWidget) -> Optional[str]:
     return choose_file(
         trigger_ui,
         file_filter="GIF WEBP (*.gif;*.webp)",
-        extensions=[".gif", ".webp"],
+        extensions=[_GIF, _WEBP],
         warning_message=language_wrapper.language_word_dict.get("gif_setting_message_box")
     )
 
@@ -60,7 +66,7 @@ def choose_image(trigger_ui: QWidget) -> Optional[str]:
     return choose_file(
         trigger_ui,
         file_filter="Images (*.png;*.jpg;*.webp)",
-        extensions=[".png", ".jpg", ".webp"],
+        extensions=[".png", ".jpg", _WEBP],
         warning_message=language_wrapper.language_word_dict.get("image_setting_message_box")
     )
 
@@ -90,7 +96,7 @@ def choose_pet(trigger_ui: QWidget) -> Optional[str]:
     return choose_file(
         trigger_ui,
         file_filter="Pet sprite (*.gif;*.webp;*.png;*.jpg)",
-        extensions=[".gif", ".webp", ".png", ".jpg"],
+        extensions=[_GIF, _WEBP, ".png", ".jpg"],
         warning_message=language_wrapper.language_word_dict.get("gif_setting_message_box")
     )
 

{frontengine-1.0.40 → frontengine-1.0.42}/frontengine/ui/dialog/window_pin_dialog.py

@@ -119,7 +119,7 @@ class WindowPinDialog(QDialog):
         Release everything this dialog pinned and make it opaque again, so no
         other program is left stuck on top or faded after FrontEngine exits.
         """
-        for handle in list(self.pinned):
+        for handle in self.pinned[:]:
             window_pin.set_always_on_top(handle, False)
             window_pin.set_opacity(handle, window_pin.MAX_OPACITY_PERCENT)
         self.pinned.clear()

{frontengine-1.0.40 → frontengine-1.0.42}/frontengine/ui/menu/preset_menu.py

@@ -113,7 +113,7 @@ def _load_action(ui: "FrontEngineMainUI") -> Callable[[], None]:
             return
         try:
             data = PresetRepository().load(preset)
-        except (OSError, FileNotFoundError, ValueError) as error:
+        except (OSError, ValueError) as error:
             QMessageBox.warning(ui, title, str(error))
             return
         _apply_state(ui, data)
@@ -158,7 +158,7 @@ def _export_action(ui: "FrontEngineMainUI") -> Callable[[], None]:
             return
         try:
             PresetRepository().export_preset(preset, Path(destination))
-        except (OSError, FileNotFoundError, ValueError) as error:
+        except (OSError, ValueError) as error:
             QMessageBox.warning(ui, title, str(error))
             return
         QMessageBox.information(ui, title, _t("preset_exported", "Preset exported."))
@@ -177,7 +177,7 @@ def _import_action(ui: "FrontEngineMainUI") -> Callable[[], None]:
             return
         try:
             PresetRepository().import_preset(Path(source))
-        except (OSError, FileNotFoundError, ValueError) as error:
+        except (OSError, ValueError) as error:
             QMessageBox.warning(ui, title, str(error))
             return
         QMessageBox.information(ui, title, _t("preset_imported", "Preset imported."))
@@ -221,7 +221,7 @@ def apply_named_preset(ui: "FrontEngineMainUI", name: str) -> bool:
     front_engine_logger.info(f"[PresetMenu] apply_named_preset | name={name}")
     try:
         data = PresetRepository().load(name)
-    except (OSError, FileNotFoundError, ValueError) as error:
+    except (OSError, ValueError) as error:
         front_engine_logger.warning(f"[PresetMenu] preset '{name}' failed: {error!r}")
         return False
     _apply_state(ui, data)
@@ -272,7 +272,7 @@ def _export_package_action(ui: "FrontEngineMainUI") -> Callable[[], None]:
             return
         try:
             PresetRepository().export_package(preset, Path(destination))
-        except (OSError, FileNotFoundError, ValueError) as error:
+        except (OSError, ValueError) as error:
             QMessageBox.warning(ui, title, str(error))
             return
         QMessageBox.information(ui, title, _t("preset_exported", "Preset exported."))
@@ -291,7 +291,7 @@ def _import_package_action(ui: "FrontEngineMainUI") -> Callable[[], None]:
             return
         try:
             PresetRepository().import_package(Path(source))
-        except (OSError, FileNotFoundError, ValueError) as error:
+        except (OSError, ValueError) as error:
             QMessageBox.warning(ui, title, str(error))
             return
         QMessageBox.information(ui, title, _t("preset_imported", "Preset imported."))

{frontengine-1.0.40 → frontengine-1.0.42}/frontengine/ui/menu/settings_menu.py

@@ -233,7 +233,7 @@ def _import_settings(ui: "FrontEngineMainUI") -> None:
         return
     try:
         import_user_setting(Path(source))
-    except (OSError, FileNotFoundError, ValueError) as error:
+    except (OSError, ValueError) as error:
         QMessageBox.warning(ui, title, str(error))
         return
     # Hotkeys can be re-applied live; language/theme need a restart.

{frontengine-1.0.40 → frontengine-1.0.42}/frontengine/ui/page/focus/focus_setting_ui.py

@@ -136,7 +136,7 @@ class FocusSettingUI(QWidget):
             language_wrapper.language_word_dict.get("focus_dim_start", "Dim the background"))
 
     def _apply_dim_settings(self) -> None:
-        for widget in list(self.dim_widget_list):
+        for widget in self.dim_widget_list[:]:
             try:
                 widget.set_dim(self.dim_slider.value())
             except RuntimeError:
@@ -179,7 +179,7 @@ class FocusSettingUI(QWidget):
             return
         geometry = screen.geometry()
         bounds = (geometry.x(), geometry.y(), geometry.width(), geometry.height())
-        for widget in list(self.mask_widget_list):
+        for widget in self.mask_widget_list[:]:
             try:
                 widget.set_region(self.mask_region_combobox.currentData(),
                                   self.mask_percent_slider.value())

{frontengine-1.0.40 → frontengine-1.0.42}/frontengine/ui/page/image/image_setting_ui.py

@@ -208,7 +208,7 @@ class ImageSettingUI(QWidget):
             return
         self._slideshow_index = (self._slideshow_index + 1) % len(self._slideshow_paths)
         next_path = self._slideshow_paths[self._slideshow_index]
-        for widget in list(self.image_widget_list):
+        for widget in self.image_widget_list[:]:
             setter = getattr(widget, "set_image_path", None)
             if setter is None:
                 continue

{frontengine-1.0.40 → frontengine-1.0.42}/frontengine/ui/page/pet/pet_setting_ui.py

@@ -11,6 +11,9 @@ from frontengine.show.pet.desktop_pet import (
 )
 from frontengine.ui.dialog.choose_file_dialog import choose_pet, choose_wav_sound
 from frontengine.ui.page.utils import (
+    apply_checkbox_state,
+    apply_combobox_data_state,
+    apply_combobox_text_state,
     build_recent_combobox,
     build_target_monitor_combobox,
     enable_file_drop,
@@ -29,6 +32,12 @@ from frontengine.utils.multi_language.language_wrapper import language_wrapper
 _PET_EXTENSIONS = (".gif", ".webp", ".png", ".jpg")
 
 
+# 多處共用的英文備援字串（只有在翻譯缺漏時才會看到）
+# The English fallback shared by several call sites, seen only when a
+# translation is missing.
+_CHOOSE_PACK = "Choose pet pack..."
+
+
 class PetSettingUI(QWidget):
     def __init__(self):
         front_engine_logger.info("[PetSettingUI] Init")
@@ -61,7 +70,7 @@ class PetSettingUI(QWidget):
         )
         self.choose_file_button.clicked.connect(self.choose_and_play)
         self.choose_pack_button = QPushButton(
-            language_wrapper.language_word_dict.get("pet_choose_pack", "Choose pet pack...")
+            language_wrapper.language_word_dict.get("pet_choose_pack", _CHOOSE_PACK)
         )
         self.choose_pack_button.clicked.connect(self.choose_pack)
         self.choose_sound_button = QPushButton(
@@ -294,7 +303,7 @@ class PetSettingUI(QWidget):
     def _alive_pets(self) -> list:
         """回傳仍存活的寵物，並把已被銷毀者從清單移除。"""
         alive = []
-        for pet in list(self.pet_list):
+        for pet in self.pet_list[:]:
             try:
                 pet.center()
             except RuntimeError:
@@ -376,14 +385,14 @@ class PetSettingUI(QWidget):
         """選擇動作包資料夾（依 walk/idle/climb/fall/drag 檔名對應狀態）。"""
         front_engine_logger.info("[PetSettingUI] choose_pack")
         folder = QFileDialog.getExistingDirectory(
-            self, language_wrapper.language_word_dict.get("pet_choose_pack", "Choose pet pack...")
+            self, language_wrapper.language_word_dict.get("pet_choose_pack", _CHOOSE_PACK)
         )
         if not folder:
             return
         if not scan_pet_pack(folder):
             QMessageBox.warning(
                 self,
-                language_wrapper.language_word_dict.get("pet_choose_pack", "Choose pet pack..."),
+                language_wrapper.language_word_dict.get("pet_choose_pack", _CHOOSE_PACK),
                 language_wrapper.language_word_dict.get(
                     "pet_pack_empty", "No sprites (walk/idle/climb/fall/drag) found in that folder."),
             )
@@ -432,49 +441,45 @@ class PetSettingUI(QWidget):
         }
 
     def set_state(self, state: dict) -> None:
+        """把預設集的內容還原到這一頁的控制項上。"""
+        self._restore_media(state)
+        apply_combobox_data_state(self.behaviour_combobox, self._behaviour_from(state))
+        apply_combobox_text_state(state, (
+            (self.size_combobox, "size"),
+            (self.speed_combobox, "speed"),
+            (self.target_monitor_combobox, "target_monitor"),
+            (self.volume_combobox, "volume"),
+            (self.focus_minutes_combobox, "focus_minutes"),
+            (self.break_minutes_combobox, "break_minutes"),
+        ))
+        apply_checkbox_state(state, (
+            (self.climb_checkbox, "climb"),
+            (self.talk_checkbox, "talk"),
+            (self.sit_checkbox, "sit"),
+            (self.audio_react_checkbox, "audio_react"),
+            (self.tag_checkbox, "tag"),
+            (self.speech_checkbox, "speech"),
+            (self.chat_checkbox, "chat"),
+        ))
+
+    def _restore_media(self, state: dict) -> None:
+        """還原圖片與音效的路徑（有圖才算準備好可以放）。"""
         if state.get("pet_image_path"):
             self.pet_image_path = state["pet_image_path"]
             self.ready_to_play = True
             self.ready_label.setText(language_wrapper.language_word_dict.get("Ready"))
-        for combobox, key in ((self.size_combobox, "size"), (self.speed_combobox, "speed")):
-            if state.get(key) is not None:
-                index = combobox.findText(str(state[key]))
-                if index >= 0:
-                    combobox.setCurrentIndex(index)
-        behaviour = state.get("behaviour")
-        if behaviour is None and "gravity" in state:  # back-compat with old presets
-            behaviour = BEHAVIOUR_FLOOR if state.get("gravity") else BEHAVIOUR_WANDER
-        if behaviour is not None:
-            index = self.behaviour_combobox.findData(behaviour)
-            if index >= 0:
-                self.behaviour_combobox.setCurrentIndex(index)
-        if "climb" in state:
-            self.climb_checkbox.setChecked(bool(state["climb"]))
-        if "talk" in state:
-            self.talk_checkbox.setChecked(bool(state["talk"]))
         if state.get("sound"):
             self.pet_sound_path = str(state["sound"])
-        if "sit" in state:
-            self.sit_checkbox.setChecked(bool(state["sit"]))
-        if state.get("target_monitor") is not None:
-            index = self.target_monitor_combobox.findText(str(state["target_monitor"]))
-            if index >= 0:
-                self.target_monitor_combobox.setCurrentIndex(index)
-        if state.get("volume") is not None:
-            index = self.volume_combobox.findText(str(state["volume"]))
-            if index >= 0:
-                self.volume_combobox.setCurrentIndex(index)
-        if "audio_react" in state:
-            self.audio_react_checkbox.setChecked(bool(state["audio_react"]))
-        if "tag" in state:
-            self.tag_checkbox.setChecked(bool(state["tag"]))
-        if "speech" in state:
-            self.speech_checkbox.setChecked(bool(state["speech"]))
-        if "chat" in state:
-            self.chat_checkbox.setChecked(bool(state["chat"]))
-        for combobox, key in ((self.focus_minutes_combobox, "focus_minutes"),
-                              (self.break_minutes_combobox, "break_minutes")):
-            if state.get(key) is not None:
-                index = combobox.findText(str(state[key]))
-                if index >= 0:
-                    combobox.setCurrentIndex(index)
+
+    @staticmethod
+    def _behaviour_from(state: dict):
+        """
+        取出行為模式。舊的預設集只存了 gravity 布林值，這裡把它翻譯成對應的
+        行為，免得舊檔案還原後寵物不會動。
+        The behaviour to use. Older presets only stored a `gravity` flag, so it
+        is translated here rather than leaving an old file with no behaviour.
+        """
+        behaviour = state.get("behaviour")
+        if behaviour is None and "gravity" in state:
+            behaviour = BEHAVIOUR_FLOOR if state.get("gravity") else BEHAVIOUR_WANDER
+        return behaviour

{frontengine-1.0.40 → frontengine-1.0.42}/frontengine/ui/page/presentation/presentation_setting_ui.py

@@ -207,7 +207,7 @@ class PresentationSettingUI(QWidget):
             widget.clear()
 
     def _apply_annotation_settings(self) -> None:
-        for widget in list(self.annotation_widget_list):
+        for widget in self.annotation_widget_list[:]:
             try:
                 widget.set_tool(self.annotate_tool_combobox.currentData())
                 widget.set_pen(self.annotate_color_combobox.currentData(),
@@ -244,7 +244,7 @@ class PresentationSettingUI(QWidget):
             language_wrapper.language_word_dict.get("cursor_effect_start", "Turn cursor effects on"))
 
     def _apply_cursor_settings(self) -> None:
-        for widget in list(self.cursor_widget_list):
+        for widget in self.cursor_widget_list[:]:
             try:
                 widget.set_effects(
                     ring=self.cursor_ring_checkbox.isChecked(),
@@ -279,7 +279,7 @@ class PresentationSettingUI(QWidget):
             language_wrapper.language_word_dict.get("keystroke_start", "Show keystrokes"))
 
     def _on_key_pressed(self, keys) -> None:
-        for widget in list(self.keystroke_widget_list):
+        for widget in self.keystroke_widget_list[:]:
             try:
                 widget.push_keys(keys)
             except RuntimeError:
@@ -288,7 +288,7 @@ class PresentationSettingUI(QWidget):
     def _on_mouse_clicked(self, x: int, y: int) -> None:
         from PySide6.QtCore import QPoint
 
-        for widget in list(self.cursor_widget_list):
+        for widget in self.cursor_widget_list[:]:
             try:
                 widget.add_ripple(QPoint(int(x) - widget.x(), int(y) - widget.y()))
             except RuntimeError:
@@ -324,7 +324,7 @@ class PresentationSettingUI(QWidget):
             language_wrapper.language_word_dict.get("magnifier_start", "Turn magnifier on"))
 
     def _apply_magnifier_settings(self) -> None:
-        for widget in list(self.magnifier_widget_list):
+        for widget in self.magnifier_widget_list[:]:
             try:
                 widget.set_zoom(float(self.magnifier_zoom_combobox.currentText()))
             except RuntimeError:

{frontengine-1.0.40 → frontengine-1.0.42}/frontengine/ui/page/screen_care/screen_care_setting_ui.py

@@ -208,7 +208,7 @@ class ScreenCareSettingUI(QWidget):
 
     def _apply_filter_settings(self) -> None:
         """滑桿或顏色改變時即時套用到已開啟的濾鏡。"""
-        for widget in list(self.filter_widget_list):
+        for widget in self.filter_widget_list[:]:
             try:
                 widget.set_filter(
                     self.filter_color_combobox.currentData(), self.filter_strength_slider.value())
@@ -242,7 +242,7 @@ class ScreenCareSettingUI(QWidget):
             language_wrapper.language_word_dict.get("reading_ruler_start", "Turn ruler on"))
 
     def _apply_ruler_settings(self) -> None:
-        for widget in list(self.ruler_widget_list):
+        for widget in self.ruler_widget_list[:]:
             try:
                 widget.set_band(
                     int(self.ruler_band_combobox.currentText()), self.ruler_strength_slider.value())

{frontengine-1.0.40 → frontengine-1.0.42}/frontengine/ui/page/sound_player/sound_player_setting_ui.py

@@ -11,6 +11,11 @@ from frontengine.utils.logging.loggin_instance import front_engine_logger
 from frontengine.utils.multi_language.language_wrapper import language_wrapper
 
 
+# 四處共用的語系鍵
+# The language key shared by four call sites.
+_NOT_READY = "Not Ready"
+
+
 class SoundPlayerSettingUI(QWidget):
     def __init__(self):
         front_engine_logger.info("[SoundPlayerSettingUI] Init")
@@ -36,13 +41,13 @@ class SoundPlayerSettingUI(QWidget):
         self.choose_wav_file_button = QPushButton(
             language_wrapper.language_word_dict.get("sound_player_setting_choose_wav_file"))
         self.choose_wav_file_button.clicked.connect(self.choose_and_copy_wav_file_to_cwd_sound_dir_then_play)
-        self.wav_ready_label = QLabel(language_wrapper.language_word_dict.get("Not Ready"))
+        self.wav_ready_label = QLabel(language_wrapper.language_word_dict.get(_NOT_READY))
 
         # Choose general sound file
         self.choose_player_file_button = QPushButton(
             language_wrapper.language_word_dict.get("sound_player_setting_choose_sound_file"))
         self.choose_player_file_button.clicked.connect(self.choose_and_copy_sound_file_to_cwd_sound_dir_then_play)
-        self.player_ready_label = QLabel(language_wrapper.language_word_dict.get("Not Ready"))
+        self.player_ready_label = QLabel(language_wrapper.language_word_dict.get(_NOT_READY))
 
         # Start buttons
         self.start_wav_button = QPushButton(language_wrapper.language_word_dict.get("sound_player_setting_play_wav"))
@@ -91,7 +96,7 @@ class SoundPlayerSettingUI(QWidget):
 
     def choose_and_copy_wav_file_to_cwd_sound_dir_then_play(self) -> None:
         front_engine_logger.info("[SoundPlayerSettingUI] choose_and_copy_wav_file_to_cwd_sound_dir_then_play")
-        self.wav_ready_label.setText(language_wrapper.language_word_dict.get("Not Ready"))
+        self.wav_ready_label.setText(language_wrapper.language_word_dict.get(_NOT_READY))
         self.ready_to_play = False
         self.wav_sound_path = choose_wav_sound(self)
         if self.wav_sound_path:
@@ -100,7 +105,7 @@ class SoundPlayerSettingUI(QWidget):
 
     def choose_and_copy_sound_file_to_cwd_sound_dir_then_play(self) -> None:
         front_engine_logger.info("[SoundPlayerSettingUI] choose_and_copy_sound_file_to_cwd_sound_dir_then_play")
-        self.player_ready_label.setText(language_wrapper.language_word_dict.get("Not Ready"))
+        self.player_ready_label.setText(language_wrapper.language_word_dict.get(_NOT_READY))
         self.ready_to_play = False
         self.player_sound_path = choose_player_sound(self)
         if self.player_sound_path: