frontengine 1.0.20__tar.gz → 1.0.22__tar.gz

{frontengine-1.0.20 → frontengine-1.0.22}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: frontengine
-Version: 1.0.20
+Version: 1.0.22
 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.20 → frontengine-1.0.22}/frontengine/show/pet/desktop_pet.py

@@ -168,6 +168,46 @@ def idle_seconds():
         return None
 
 
+class PetTimeline:
+    """
+    寵物動作時間軸：一連串 (offset_seconds, action_dict)，依經過秒數依序觸發。
+    A scene-timeline of (offset_seconds, action_dict) events fired in order as
+    elapsed time passes. Events are sorted; pop_due advances an internal index.
+    """
+
+    def __init__(self, events) -> None:
+        self._events = sorted(list(events), key=lambda item: item[0])
+        self._index = 0
+
+    def __len__(self) -> int:
+        return len(self._events)
+
+    def reset(self) -> None:
+        self._index = 0
+
+    def pop_due(self, elapsed: float) -> list:
+        due = []
+        while self._index < len(self._events) and self._events[self._index][0] <= elapsed:
+            due.append(self._events[self._index][1])
+            self._index += 1
+        return due
+
+
+def parse_timeline(raw) -> list:
+    """把設定裡的 [{'at': 秒, ...}] 轉成 (offset, action_dict) 清單，忽略格式錯誤者。"""
+    events = []
+    if isinstance(raw, list):
+        for item in raw:
+            if not isinstance(item, dict) or "at" not in item:
+                continue
+            try:
+                offset = float(item["at"])
+            except (TypeError, ValueError):
+                continue
+            events.append((offset, item))
+    return events
+
+
 def pop_due_reminders(now, reminders):
     """
     依 now 分出已到期與未到期的提醒。reminders 為 (due_datetime, text) 清單。
@@ -797,7 +837,8 @@ class DesktopPetWidget(BaseWidget):
 
     def __init__(self, image_path: str, size: int = 128, speed: int = 3,
                  behaviour: str = BEHAVIOUR_FLOOR, climb: bool = True, talk: bool = True,
-                 sound_path: Optional[str] = None, sit_on_windows: bool = True):
+                 sound_path: Optional[str] = None, sit_on_windows: bool = True,
+                 volume: float = 1.0):
         front_engine_logger.info(
             f"[DesktopPetWidget] Init | path={image_path}, size={size}, speed={speed}, "
             f"behaviour={behaviour}, climb={climb}, talk={talk}, sound={sound_path}, "
@@ -842,6 +883,7 @@ class DesktopPetWidget(BaseWidget):
         self._hunger = PetHunger(user_setting_dict.get("pet_hunger", 70))
         self._hunger_warned = False
         self._messages = self._load_messages()
+        self._volume = max(0.0, min(1.0, float(volume)))
         self._sound: Optional[QSoundEffect] = None
         self._init_sound(sound_path)
         self._sit_on_windows = bool(sit_on_windows)
@@ -860,7 +902,10 @@ class DesktopPetWidget(BaseWidget):
         self._now_provider = datetime.now
         self._reminders: list = []
         self._reminder_timer = QTimer(self)
-        self._reminder_timer.timeout.connect(self._check_reminders)
+        self._reminder_timer.timeout.connect(self._on_schedule_tick)
+        # 場景時間軸 / Scene timeline of scheduled actions
+        self._timeline = PetTimeline(parse_timeline(user_setting_dict.get("pet_timeline", [])))
+        self._timeline_start = None
         self._bubble = SpeechBubble()
         self._chatter_timer = QTimer(self)
         self._chatter_timer.setSingleShot(True)
@@ -999,6 +1044,8 @@ class DesktopPetWidget(BaseWidget):
         self._timer.start(max(10, int(interval_ms)))
         self._schedule_chatter()
         self._reminder_timer.start(10000)
+        if self._timeline_start is None:
+            self._timeline_start = self._now_provider()
 
     def _load_messages(self) -> dict:
         d = language_wrapper.language_word_dict
@@ -1067,6 +1114,39 @@ class DesktopPetWidget(BaseWidget):
         self._reminders.append((due, str(text)))
         front_engine_logger.info(f"[DesktopPetWidget] reminder set | due={due}, text={text}")
 
+    def _on_schedule_tick(self) -> None:
+        self._check_reminders()
+        self._check_timeline()
+
+    def set_timeline(self, raw) -> None:
+        """設定場景時間軸並從現在起算 / Set the timeline and start its clock now."""
+        self._timeline = PetTimeline(parse_timeline(raw))
+        self._timeline_start = self._now_provider()
+
+    def _check_timeline(self) -> None:
+        if self._timeline is None or self._timeline_start is None or len(self._timeline) == 0:
+            return
+        elapsed = (self._now_provider() - self._timeline_start).total_seconds()
+        for action in self._timeline.pop_due(elapsed):
+            self._run_timeline_action(action)
+
+    def _run_timeline_action(self, action) -> None:
+        if not isinstance(action, dict):
+            return
+        if action.get("say"):
+            self.say(str(action["say"]))
+        if action.get("sleep"):
+            self.motion.sleep()
+        if action.get("wake"):
+            self.motion.wake()
+        if action.get("feed"):
+            self.feed()
+        if action.get("status"):
+            self.show_status()
+        behaviour = action.get("behaviour")
+        if behaviour in (BEHAVIOUR_FLOOR, BEHAVIOUR_WANDER, BEHAVIOUR_CHASE):
+            self.motion.behaviour = behaviour
+
     def _check_reminders(self) -> None:
         if not self._reminders:
             return
@@ -1101,6 +1181,7 @@ class DesktopPetWidget(BaseWidget):
         try:
             self._sound = QSoundEffect(self)
             self._sound.setSource(QUrl.fromLocalFile(str(path)))
+            self._sound.setVolume(self._volume)
         except Exception as error:  # pragma: no cover - audio backend guard
             front_engine_logger.warning(f"[DesktopPetWidget] sound load failed: {error!r}")
             self._sound = None

{frontengine-1.0.20 → frontengine-1.0.22}/frontengine/ui/page/pet/pet_setting_ui.py

@@ -11,8 +11,10 @@ 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 (
     build_recent_combobox,
+    build_target_monitor_combobox,
     enable_file_drop,
     reload_recent_combobox,
+    resolve_preferred_monitor,
 )
 from frontengine.user_setting.user_setting_file import add_recent_file
 from frontengine.utils.logging.loggin_instance import front_engine_logger
@@ -79,6 +81,16 @@ class PetSettingUI(QWidget):
         self.sit_checkbox = QCheckBox(language_wrapper.language_word_dict.get("pet_sit_label", "Sit on windows"))
         self.sit_checkbox.setChecked(True)
 
+        # Target monitor + sound volume
+        self.target_monitor_label = QLabel(
+            language_wrapper.language_word_dict.get("target_monitor_label", "Target monitor"))
+        self.target_monitor_combobox = build_target_monitor_combobox()
+        self.volume_label = QLabel(language_wrapper.language_word_dict.get("pet_volume_label", "Volume"))
+        self.volume_combobox = QComboBox()
+        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%")
+
         # Start
         self.start_button = QPushButton(language_wrapper.language_word_dict.get("pet_start", "Spawn pet"))
         self.start_button.clicked.connect(self.start_play_pet)
@@ -108,6 +120,10 @@ class PetSettingUI(QWidget):
         self.grid_layout.addWidget(self.start_button, 4, 0)
         self.grid_layout.addWidget(self.recent_files_label, 5, 0)
         self.grid_layout.addWidget(self.recent_files_combobox, 5, 1)
+        self.grid_layout.addWidget(self.target_monitor_label, 6, 0)
+        self.grid_layout.addWidget(self.target_monitor_combobox, 6, 1)
+        self.grid_layout.addWidget(self.volume_label, 6, 2)
+        self.grid_layout.addWidget(self.volume_combobox, 7, 2)
 
     def _spawn_pet(self) -> None:
         """建立、顯示並開始移動一隻寵物（供 Start 與右鍵複製共用）。"""
@@ -122,16 +138,30 @@ class PetSettingUI(QWidget):
             talk=self.talk_checkbox.isChecked(),
             sound_path=self.pet_sound_path,
             sit_on_windows=self.sit_checkbox.isChecked(),
+            volume=int(self.volume_combobox.currentData()) / 100.0,
         )
         pet.clone_requested.connect(self._spawn_pet)
         pet.set_peers_provider(lambda me=pet: self._peer_centers(me))
         pet.set_pet_window_flag()
         self.pet_list.append(pet)
-        screen = QGuiApplication.primaryScreen()
-        geometry = screen.availableGeometry() if screen is not None else None
         pet.show()
+        geometry = self._target_geometry()
         if geometry is not None:
-            pet.start_moving((geometry.left(), geometry.top(), geometry.right(), geometry.bottom()))
+            pet.setScreen(geometry[1])
+            bounds = geometry[0]
+            pet.start_moving((bounds.left(), bounds.top(), bounds.right(), bounds.bottom()))
+
+    def _target_geometry(self):
+        """回傳 (available_geometry, screen) 依所選目標螢幕，否則主螢幕。"""
+        screens = QGuiApplication.screens()
+        index = resolve_preferred_monitor(self.target_monitor_combobox)
+        if index is not None and 0 <= index < len(screens):
+            screen = screens[index]
+        else:
+            screen = QGuiApplication.primaryScreen()
+        if screen is None:
+            return None
+        return (screen.availableGeometry(), screen)
 
     def _peer_centers(self, me) -> list:
         """回傳其他仍存活寵物的中心座標（略過已被銷毀者）。"""
@@ -221,6 +251,8 @@ class PetSettingUI(QWidget):
             "talk": self.talk_checkbox.isChecked(),
             "sound": self.pet_sound_path,
             "sit": self.sit_checkbox.isChecked(),
+            "target_monitor": self.target_monitor_combobox.currentText(),
+            "volume": self.volume_combobox.currentText(),
         }
 
     def set_state(self, state: dict) -> None:
@@ -248,3 +280,11 @@ class PetSettingUI(QWidget):
             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)

{frontengine-1.0.20 → frontengine-1.0.22}/frontengine/user_setting/user_setting_file.py

@@ -42,6 +42,9 @@ user_setting_dict: Dict[str, Any] = {
     # 桌面寵物親密度（累積互動）
     # Desktop pet affection (accumulated interactions)
     "pet_affection": 0,
+    # 桌面寵物場景時間軸：[{"at": 秒, "say"/"sleep"/"feed"/"behaviour": ...}, ...]
+    # Desktop pet scene timeline of scheduled actions
+    "pet_timeline": [],
 }
 
 

{frontengine-1.0.20 → frontengine-1.0.22}/frontengine/utils/multi_language/english.py

@@ -246,6 +246,7 @@ english_word_dict = {
     "pet_pack_empty": "No sprites (walk/idle/sleep/climb/fall/drag) found in that folder.",
     "pet_talk_label": "Speech bubbles",
     "pet_sit_label": "Sit on windows",
+    "pet_volume_label": "Volume",
     "pet_chatter_morning": "Good morning!|Rise and shine!|Ready for the day?",
     "pet_chatter_afternoon": "Good afternoon!|Taking a break?|Keep it up!",
     "pet_chatter_evening": "Good evening!|How was your day?|Almost done?",

{frontengine-1.0.20 → frontengine-1.0.22}/frontengine/utils/multi_language/traditional_chinese.py

@@ -247,6 +247,7 @@ traditional_chinese_word_dict = {
     "pet_pack_empty": "該資料夾找不到精靈檔（walk/idle/sleep/climb/fall/drag）。",
     "pet_talk_label": "對話泡泡",
     "pet_sit_label": "站在視窗上",
+    "pet_volume_label": "音量",
     "pet_chatter_morning": "早安！|新的一天開始囉！|準備好了嗎？",
     "pet_chatter_afternoon": "午安！|要不要休息一下？|繼續加油！",
     "pet_chatter_evening": "晚上好！|今天過得如何？|快完成了嗎？",

{frontengine-1.0.20 → frontengine-1.0.22}/frontengine.egg-info/PKG-INFO

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

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