frontengine 1.0.4__tar.gz → 1.0.6__tar.gz

{frontengine-1.0.4 → frontengine-1.0.6}/PKG-INFO

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

@@ -1,10 +1,11 @@
 import random as _random_module
+from datetime import datetime
 from pathlib import Path
 from typing import Optional, Tuple
 
 from PySide6.QtCore import Qt, QRect, QTimer, Signal
-from PySide6.QtGui import QAction, QCursor, QMovie, QPainter, QPixmap, QTransform
-from PySide6.QtWidgets import QMenu, QMessageBox
+from PySide6.QtGui import QAction, QColor, QCursor, QFont, QFontMetrics, QMovie, QPainter, QPixmap, QTransform
+from PySide6.QtWidgets import QMenu, QMessageBox, QWidget
 
 from frontengine.show.base_widget import BaseWidget
 from frontengine.show.window_helpers import apply_overlay_window_flags
@@ -22,6 +23,131 @@ SURFACE_LEFT = "left"
 SURFACE_CEILING = "ceiling"
 SURFACE_RIGHT = "right"
 
+# 視覺狀態（決定顯示哪張精靈）/ Visual states (which sprite to show)
+STATE_WALK = "walk"
+STATE_IDLE = "idle"
+STATE_CLIMB = "climb"
+STATE_FALL = "fall"
+STATE_DRAG = "drag"
+
+# 動作包（資料夾）中，各狀態可接受的檔名（不含副檔名，先命中者為準）
+# Accepted file stems per state inside a pet pack folder (first match wins).
+_PACK_STATE_ALIASES = {
+    STATE_WALK: ("walk", "run", "move"),
+    STATE_IDLE: ("idle", "sit", "stand", "sleep"),
+    STATE_CLIMB: ("climb", "grab", "wall"),
+    STATE_FALL: ("fall", "jump"),
+    STATE_DRAG: ("drag", "pinch", "grabbed", "held"),
+}
+_PACK_EXTS = (".gif", ".webp", ".png", ".jpg", ".jpeg")
+
+
+def scan_pet_pack(folder: str) -> dict:
+    """
+    掃描動作包資料夾，回傳「視覺狀態 -> 圖片路徑」對應。非資料夾回傳空 dict。
+    Scan a pet-pack folder and return a ``state -> image path`` mapping.
+    Returns {} when `folder` is not a directory.
+    """
+    result: dict = {}
+    try:
+        folder_path = Path(folder)
+        if not folder_path.is_dir():
+            return result
+        by_stem = {
+            path.stem.lower(): path
+            for path in sorted(folder_path.iterdir())
+            if path.is_file() and path.suffix.lower() in _PACK_EXTS
+        }
+        for state, aliases in _PACK_STATE_ALIASES.items():
+            for alias in aliases:
+                if alias in by_stem:
+                    result[state] = str(by_stem[alias])
+                    break
+    except OSError:
+        pass
+    return result
+
+
+def derive_visual_state(dragging: bool, airborne: bool, surface: str, motion_state: str) -> str:
+    """依目前情形推導應顯示的視覺狀態 / Derive which sprite state to show."""
+    if dragging:
+        return STATE_DRAG
+    if airborne:
+        return STATE_FALL
+    if surface in (SURFACE_LEFT, SURFACE_RIGHT, SURFACE_CEILING):
+        return STATE_CLIMB
+    if surface == SURFACE_FLOOR and motion_state == "idle":
+        return STATE_IDLE
+    return STATE_WALK
+
+
+def message_bucket(hour: int) -> str:
+    """依小時回傳時段 / Time-of-day bucket for the given hour."""
+    hour = int(hour) % 24
+    if 5 <= hour < 12:
+        return "morning"
+    if 12 <= hour < 18:
+        return "afternoon"
+    if 18 <= hour < 22:
+        return "evening"
+    return "night"
+
+
+def pick_message(hour: int, rng, messages: dict) -> str:
+    """
+    依時段從對應句庫（加上通用句庫）隨機挑一句台詞；句庫皆空回傳空字串。
+    Pick a chatter line from the time bucket plus the generic pool. rng needs
+    a ``randrange`` method (injectable for tests).
+    """
+    pool = list(messages.get(message_bucket(hour), [])) + list(messages.get("any", []))
+    if not pool:
+        return ""
+    return pool[rng.randrange(len(pool))]
+
+
+class SpeechBubble(QWidget):
+    """寵物頭上的小對話泡泡，數秒後自動消失 / A small speech bubble that auto-hides."""
+
+    def __init__(self) -> None:
+        super().__init__()
+        self._text = ""
+        self._font = QFont()
+        self._font.setPointSize(11)
+        self.setAttribute(Qt.WidgetAttribute.WA_TranslucentBackground)
+        apply_overlay_window_flags(self, show_on_bottom=False, allow_input=False)
+        self._hide_timer = QTimer(self)
+        self._hide_timer.setSingleShot(True)
+        self._hide_timer.timeout.connect(self.hide)
+
+    def show_message(self, text: str, anchor: QWidget, duration_ms: int = 4000) -> None:
+        self._text = text
+        width = min(260, QFontMetrics(self._font).horizontalAdvance(text) + 28)
+        self.resize(max(60, width), 44)
+        self.reposition(anchor)
+        self.show()
+        self.raise_()
+        self.update()
+        self._hide_timer.start(max(500, int(duration_ms)))
+
+    def reposition(self, anchor: QWidget) -> None:
+        geo = anchor.frameGeometry()
+        self.move(geo.center().x() - self.width() // 2, geo.top() - self.height() - 6)
+
+    def paintEvent(self, event) -> None:
+        painter = QPainter(self)
+        painter.setRenderHint(QPainter.RenderHint.Antialiasing)
+        rect = self.rect().adjusted(1, 1, -1, -1)
+        painter.setBrush(QColor(255, 255, 240, 235))
+        painter.setPen(QColor(90, 90, 90))
+        painter.drawRoundedRect(rect, 8, 8)
+        painter.setPen(QColor(30, 30, 30))
+        painter.setFont(self._font)
+        painter.drawText(
+            rect.adjusted(8, 2, -8, -2),
+            int(Qt.AlignmentFlag.AlignCenter | Qt.TextFlag.TextWordWrap),
+            self._text,
+        )
+
 
 class PetMotion:
     """
@@ -260,30 +386,26 @@ class DesktopPetWidget(BaseWidget):
     clone_requested = Signal()
 
     def __init__(self, image_path: str, size: int = 128, speed: int = 3,
-                 behaviour: str = BEHAVIOUR_FLOOR, climb: bool = True):
+                 behaviour: str = BEHAVIOUR_FLOOR, climb: bool = True, talk: bool = True):
         front_engine_logger.info(
             f"[DesktopPetWidget] Init | path={image_path}, size={size}, speed={speed}, "
-            f"behaviour={behaviour}, climb={climb}"
+            f"behaviour={behaviour}, climb={climb}, talk={talk}"
         )
         super().__init__()
         self.opacity = 1.0
         self.pet_size: int = max(16, int(size))
         self.image_path: Path = Path(image_path)
-        self.movie: Optional[QMovie] = None
-        self.pixmap: Optional[QPixmap] = None
         self._dragging: bool = False
         self._drag_offset = None
         self._last_move_delta: Tuple[int, int] = (0, 0)
-
-        if self.image_path.exists() and self.image_path.is_file():
-            if self.image_path.suffix.lower() in (".gif", ".webp"):
-                self.movie = QMovie(str(self.image_path))
-                self.movie.frameChanged.connect(self.update)
-                self.movie.start()
-            else:
-                self.pixmap = QPixmap(str(self.image_path))
-        else:
-            front_engine_logger.error(f"[DesktopPetWidget] File not found: {self.image_path}")
+        # 視覺狀態 -> ("movie"|"pixmap", 物件) / state -> sprite
+        self._sprites: dict = {}
+        self._active = None
+        self._active_state = None
+
+        self._load_sprites(self.image_path)
+        if not self._sprites:
+            front_engine_logger.error(f"[DesktopPetWidget] No sprite found: {self.image_path}")
             message_box = QMessageBox(self)
             message_box.setText(language_wrapper.language_word_dict.get("pet_message_box_text", "Pet image not found"))
             message_box.show()
@@ -292,10 +414,21 @@ class DesktopPetWidget(BaseWidget):
         self.motion = PetMotion(
             0, 0, self.pet_size, self.pet_size, (0, 0, 1920, 1080), speed, behaviour, climb=climb
         )
+        self._set_active_sprite(STATE_WALK)
 
         self._timer = QTimer(self)
         self._timer.timeout.connect(self._on_tick)
 
+        # Speech bubbles / chatter
+        self._talk = bool(talk)
+        self._moved = False
+        self._chatter_rng = _random_module.SystemRandom()
+        self._messages = self._load_messages()
+        self._bubble = SpeechBubble()
+        self._chatter_timer = QTimer(self)
+        self._chatter_timer.setSingleShot(True)
+        self._chatter_timer.timeout.connect(self._on_chatter)
+
         self.menu = QMenu(self)
         self.clone_action = QAction(language_wrapper.language_word_dict.get("pet_clone", "Clone"), self)
         self.clone_action.triggered.connect(self.clone_requested.emit)
@@ -308,10 +441,53 @@ class DesktopPetWidget(BaseWidget):
         """寵物需接收滑鼠以便拖曳，故 allow_input=True 並置頂。"""
         apply_overlay_window_flags(self, show_on_bottom=False, allow_input=True)
 
+    def _load_sprite(self, path: str):
+        if Path(path).suffix.lower() in (".gif", ".webp"):
+            movie = QMovie(str(path))
+            movie.frameChanged.connect(self.update)
+            return ("movie", movie)
+        return ("pixmap", QPixmap(str(path)))
+
+    def _load_sprites(self, image_path: Path) -> None:
+        """單一檔 -> 所有狀態共用；資料夾 -> 依檔名對應各狀態。"""
+        if image_path.is_dir():
+            for state, path in scan_pet_pack(str(image_path)).items():
+                self._sprites[state] = self._load_sprite(path)
+        elif image_path.is_file():
+            self._sprites["default"] = self._load_sprite(str(image_path))
+
+    def _sprite_for(self, state: str):
+        if "default" in self._sprites:
+            return self._sprites["default"]
+        if state in self._sprites:
+            return self._sprites[state]
+        for fallback in (STATE_WALK, STATE_IDLE):
+            if fallback in self._sprites:
+                return self._sprites[fallback]
+        return next(iter(self._sprites.values()), None)
+
+    def _set_active_sprite(self, state: str) -> None:
+        sprite = self._sprite_for(state)
+        if sprite is None or sprite is self._active:
+            return
+        if self._active is not None and self._active[0] == "movie":
+            self._active[1].stop()
+        self._active = sprite
+        self._active_state = state
+        if sprite[0] == "movie":
+            sprite[1].start()
+        self.update()
+
+    def _visual_state(self) -> str:
+        return derive_visual_state(
+            self._dragging, self.motion._airborne, self.motion.surface, self.motion.state
+        )
+
     def _current_pixmap(self) -> Optional[QPixmap]:
-        if self.movie is not None:
-            return self.movie.currentPixmap()
-        return self.pixmap
+        if self._active is None:
+            return None
+        kind, obj = self._active
+        return obj.currentPixmap() if kind == "movie" else obj
 
     def draw_content(self, painter: QPainter) -> None:
         pixmap = self._current_pixmap()
@@ -329,28 +505,67 @@ class DesktopPetWidget(BaseWidget):
         self.motion.y = float(bottom - self.pet_size)
         self.move(int(self.motion.x), int(self.motion.y))
         self._timer.start(max(10, int(interval_ms)))
+        self._schedule_chatter()
+
+    def _load_messages(self) -> dict:
+        d = language_wrapper.language_word_dict
+
+        def lines(key: str, fallback: str) -> list:
+            return [part.strip() for part in str(d.get(key, fallback)).split("|") if part.strip()]
+
+        return {
+            "morning": lines("pet_chatter_morning", "Good morning!|Ready for the day?"),
+            "afternoon": lines("pet_chatter_afternoon", "Good afternoon!|Taking a break?"),
+            "evening": lines("pet_chatter_evening", "Good evening!|How was your day?"),
+            "night": lines("pet_chatter_night", "It's late - get some rest!|Still up?"),
+            "any": lines("pet_chatter_any", "Hi there!|(^_^)|Keep going!"),
+        }
+
+    def _schedule_chatter(self) -> None:
+        if self._talk:
+            self._chatter_timer.start(self._chatter_rng.randint(15000, 35000))
+
+    def _on_chatter(self) -> None:
+        self.say()
+        self._schedule_chatter()
+
+    def say(self, text: Optional[str] = None) -> None:
+        """顯示一句台詞（text 為 None 時依時段隨機挑）。"""
+        if not self._talk:
+            return
+        if text is None:
+            text = pick_message(datetime.now().hour, self._chatter_rng, self._messages)
+        if text:
+            self._bubble.show_message(text, self)
 
     def _on_tick(self) -> None:
         if self._dragging:
+            self._set_active_sprite(STATE_DRAG)
             return
         if self.motion.behaviour == BEHAVIOUR_CHASE:
             cursor = QCursor.pos()
             self.motion.set_target(cursor.x(), cursor.y())
         x, y = self.motion.step()
         self.move(x, y)
+        self._set_active_sprite(self._visual_state())
+        if self._bubble.isVisible():
+            self._bubble.reposition(self)
 
     # --- dragging + throwing ---
     def mousePressEvent(self, event) -> None:
         if event.button() == Qt.MouseButton.LeftButton:
             self._dragging = True
+            self._moved = False
             self._last_move_delta = (0, 0)
             self._drag_offset = event.globalPosition().toPoint() - self.frameGeometry().topLeft()
+            self._set_active_sprite(STATE_DRAG)
         super().mousePressEvent(event)
 
     def mouseMoveEvent(self, event) -> None:
         if self._dragging and self._drag_offset is not None:
             new_top_left = event.globalPosition().toPoint() - self._drag_offset
             self._last_move_delta = (new_top_left.x() - self.x(), new_top_left.y() - self.y())
+            self._moved = True
             self.move(new_top_left)
         super().mouseMoveEvent(event)
 
@@ -359,9 +574,12 @@ class DesktopPetWidget(BaseWidget):
             self._dragging = False
             self.motion.x = float(self.x())
             self.motion.y = float(self.y())
-            # Fling with the momentum of the last drag movement (floor mode).
-            if self.motion.behaviour == BEHAVIOUR_FLOOR:
-                self.motion.throw(self._last_move_delta[0], self._last_move_delta[1])
+            if self._moved:
+                # Fling with the momentum of the last drag movement (floor mode).
+                if self.motion.behaviour == BEHAVIOUR_FLOOR:
+                    self.motion.throw(self._last_move_delta[0], self._last_move_delta[1])
+            else:
+                self.say()  # a click (no drag) makes the pet talk
         super().mouseReleaseEvent(event)
 
     def contextMenuEvent(self, event) -> None:
@@ -370,6 +588,10 @@ class DesktopPetWidget(BaseWidget):
     def closeEvent(self, event) -> None:
         if self._timer.isActive():
             self._timer.stop()
-        if self.movie is not None:
-            self.movie.stop()
+        if self._chatter_timer.isActive():
+            self._chatter_timer.stop()
+        self._bubble.close()
+        for kind, obj in self._sprites.values():
+            if kind == "movie":
+                obj.stop()
         super().closeEvent(event)

{frontengine-1.0.4 → frontengine-1.0.6}/frontengine/ui/page/pet/pet_setting_ui.py

@@ -2,11 +2,11 @@ from typing import Optional
 
 from PySide6.QtGui import QGuiApplication
 from PySide6.QtWidgets import (
-    QWidget, QGridLayout, QLabel, QPushButton, QMessageBox, QComboBox, QCheckBox,
+    QWidget, QGridLayout, QLabel, QPushButton, QMessageBox, QComboBox, QCheckBox, QFileDialog,
 )
 
 from frontengine.show.pet.desktop_pet import (
-    DesktopPetWidget, BEHAVIOUR_FLOOR, BEHAVIOUR_WANDER, BEHAVIOUR_CHASE,
+    DesktopPetWidget, BEHAVIOUR_FLOOR, BEHAVIOUR_WANDER, BEHAVIOUR_CHASE, scan_pet_pack,
 )
 from frontengine.ui.dialog.choose_file_dialog import choose_pet
 from frontengine.ui.page.utils import (
@@ -38,6 +38,10 @@ class PetSettingUI(QWidget):
             language_wrapper.language_word_dict.get("pet_choose_file", "Choose pet sprite")
         )
         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...")
+        )
+        self.choose_pack_button.clicked.connect(self.choose_pack)
         self.ready_label = QLabel(language_wrapper.language_word_dict.get("Not Ready"))
 
         # Size
@@ -65,6 +69,8 @@ class PetSettingUI(QWidget):
         # Climb walls / ceiling (only meaningful in floor mode)
         self.climb_checkbox = QCheckBox(language_wrapper.language_word_dict.get("pet_climb_label", "Climb walls"))
         self.climb_checkbox.setChecked(True)
+        self.talk_checkbox = QCheckBox(language_wrapper.language_word_dict.get("pet_talk_label", "Speech bubbles"))
+        self.talk_checkbox.setChecked(True)
 
         # Start
         self.start_button = QPushButton(language_wrapper.language_word_dict.get("pet_start", "Spawn pet"))
@@ -81,6 +87,7 @@ class PetSettingUI(QWidget):
         # Layout
         self.grid_layout.addWidget(self.choose_file_button, 0, 0)
         self.grid_layout.addWidget(self.ready_label, 0, 1)
+        self.grid_layout.addWidget(self.choose_pack_button, 0, 2)
         self.grid_layout.addWidget(self.size_label, 1, 0)
         self.grid_layout.addWidget(self.size_combobox, 1, 1)
         self.grid_layout.addWidget(self.speed_label, 2, 0)
@@ -88,6 +95,7 @@ class PetSettingUI(QWidget):
         self.grid_layout.addWidget(self.behaviour_label, 3, 0)
         self.grid_layout.addWidget(self.behaviour_combobox, 3, 1)
         self.grid_layout.addWidget(self.climb_checkbox, 3, 2)
+        self.grid_layout.addWidget(self.talk_checkbox, 2, 2)
         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)
@@ -102,6 +110,7 @@ class PetSettingUI(QWidget):
             speed=int(self.speed_combobox.currentText()),
             behaviour=self.behaviour_combobox.currentData(),
             climb=self.climb_checkbox.isChecked(),
+            talk=self.talk_checkbox.isChecked(),
         )
         pet.clone_requested.connect(self._spawn_pet)
         pet.set_pet_window_flag()
@@ -132,6 +141,28 @@ class PetSettingUI(QWidget):
             add_recent_file("pet", self.pet_image_path)
             reload_recent_combobox(self.recent_files_combobox, "pet")
 
+    def choose_pack(self) -> None:
+        """選擇動作包資料夾（依 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...")
+        )
+        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_pack_empty", "No sprites (walk/idle/climb/fall/drag) found in that folder."),
+            )
+            return
+        self.pet_image_path = folder
+        self.ready_to_play = True
+        self.ready_label.setText(language_wrapper.language_word_dict.get("Ready"))
+        add_recent_file("pet", folder)
+        reload_recent_combobox(self.recent_files_combobox, "pet")
+
     def _apply_recent_file(self, _index: int = 0) -> None:
         path = self.recent_files_combobox.currentData()
         self.recent_files_combobox.setCurrentIndex(0)
@@ -156,6 +187,7 @@ class PetSettingUI(QWidget):
             "speed": self.speed_combobox.currentText(),
             "behaviour": self.behaviour_combobox.currentData(),
             "climb": self.climb_checkbox.isChecked(),
+            "talk": self.talk_checkbox.isChecked(),
         }
 
     def set_state(self, state: dict) -> None:
@@ -177,3 +209,5 @@ class PetSettingUI(QWidget):
                 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"]))

{frontengine-1.0.4 → frontengine-1.0.6}/frontengine/utils/multi_language/english.py

@@ -225,6 +225,14 @@ english_word_dict = {
     "pet_behaviour_chase": "Chase cursor",
     "pet_climb_label": "Climb walls",
     "pet_clone": "Clone",
+    "pet_choose_pack": "Choose pet pack...",
+    "pet_pack_empty": "No sprites (walk/idle/climb/fall/drag) found in that folder.",
+    "pet_talk_label": "Speech bubbles",
+    "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?",
+    "pet_chatter_night": "It's late - get some rest!|Still up?|Sweet dreams soon~",
+    "pet_chatter_any": "Hi there!|(^_^)|Keep going!|You've got this!",
     "pet_start": "Spawn pet",
     "pet_message_box_text": "Pet image not found",
 }

{frontengine-1.0.4 → frontengine-1.0.6}/frontengine/utils/multi_language/traditional_chinese.py

@@ -226,6 +226,14 @@ traditional_chinese_word_dict = {
     "pet_behaviour_chase": "追逐游標",
     "pet_climb_label": "攀爬牆壁",
     "pet_clone": "複製",
+    "pet_choose_pack": "選擇動作包資料夾...",
+    "pet_pack_empty": "該資料夾找不到精靈檔（walk/idle/climb/fall/drag）。",
+    "pet_talk_label": "對話泡泡",
+    "pet_chatter_morning": "早安！|新的一天開始囉！|準備好了嗎？",
+    "pet_chatter_afternoon": "午安！|要不要休息一下？|繼續加油！",
+    "pet_chatter_evening": "晚上好！|今天過得如何？|快完成了嗎？",
+    "pet_chatter_night": "很晚了，早點休息！|還沒睡嗎？|祝好夢～",
+    "pet_chatter_any": "嗨！|(^_^)|加油！|你可以的！",
     "pet_start": "召喚寵物",
     "pet_message_box_text": "找不到寵物圖片",
 }

{frontengine-1.0.4 → frontengine-1.0.6}/frontengine.egg-info/PKG-INFO

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

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