feat: 重置窗口托盘菜单

Author: Windsland52

aao/app.py

@@ -162,6 +162,7 @@ def __init__(
         self._force_quit = False
         self.tray = TrayController(self)
         self.tray.show_requested.connect(self._restore_from_tray)
+        self.tray.reset_layout_requested.connect(self._reset_window_layout)
         self.tray.quit_requested.connect(self._quit_from_tray)
         self.tray.show()
 
@@ -513,6 +514,26 @@ def _restore_from_tray(self) -> None:
         self.raise_()
         self.activateWindow()
 
+    def _reset_window_layout(self) -> None:
+        """托盘菜单：重置主窗口位置/大小，并清除悬浮窗持久化布局。"""
+        from aao.ui import floating_state
+
+        floating_state.clear_all()
+        geo = self.screen().availableGeometry()
+        self.resize(860, 560)
+        self.move(geo.center().x() - self.width() // 2, geo.center().y() - self.height() // 2)
+        self._restore_from_tray()
+
+        margin = 20
+        if self.overlay is not None:
+            self.overlay.reset_layout(geo.right() - 170 - margin, geo.top() + margin)
+        log = getattr(self.farm_page, "_floating_log", None)
+        if log is not None:
+            x = geo.right() - 360 - margin
+            y = geo.top() + margin + (self.overlay.height() + 12 if self.overlay is not None else 0)
+            log.reset_layout(x, y)
+        self.tray.show_message("ArknightsAutoOperator", "已重置主窗口和悬浮窗布局。")
+
     def _quit_from_tray(self) -> None:
         """托盘「退出」：停所有 worker + 退出应用。"""
         self._force_quit = True

aao/measure/overlay.py

@@ -124,6 +124,12 @@ def paintEvent(self, _event: QPaintEvent) -> None:
         painter.setPen(border)
         painter.drawPath(path)
 
+    def reset_layout(self, x: int, y: int) -> None:
+        self._snap_follow = None
+        self.resize(170, 72)
+        self.move(x, y)
+        self._save_window_state()
+
     def on_state(self, state: dict) -> None:
         running = state.get("isRunning", False)
         cf = state.get("currentFrame")

aao/ui/floating_log_window.py

@@ -197,6 +197,12 @@ def _save_window_state(self) -> None:
             _WINDOW_ID, self._snap_follow.to_dict() if self._snap_follow is not None else None
         )
 
+    def reset_layout(self, x: int, y: int) -> None:
+        self._snap_follow = None
+        self.resize(360, 220)
+        self.move(x, y)
+        self._save_window_state()
+
     def set_always_on_top(self, enabled: bool) -> None:
         visible = self.isVisible()
         self.setWindowFlag(Qt.WindowType.WindowStaysOnTopHint, enabled)

aao/ui/floating_state.py

@@ -17,6 +17,12 @@
 from PySide6.QtWidgets import QWidget
 
 
+def clear_all() -> None:
+    s = _load_settings()
+    s.pop("floating_windows", None)
+    _save_settings(s)
+
+
 def load_state(window_id: str) -> dict[str, Any]:
     s = _load_settings()
     data = s.get("floating_windows", {})

aao/ui/tray.py

@@ -28,6 +28,7 @@ class TrayController(QObject):
 
     quit_requested = Signal()  # 用户点「退出」
     show_requested = Signal()  # 用户点「显示」/ 双击图标
+    reset_layout_requested = Signal()  # 重置主窗口 + 悬浮窗布局
 
     def __init__(self, parent: QWidget):
         super().__init__(parent)
@@ -37,9 +38,12 @@ def __init__(self, parent: QWidget):
         menu = QMenu(parent)
         act_show = QAction("显示窗口", parent)
         act_show.triggered.connect(self.show_requested.emit)
+        act_reset = QAction("重置窗口布局", parent)
+        act_reset.triggered.connect(self.reset_layout_requested.emit)
         act_quit = QAction("退出", parent)
         act_quit.triggered.connect(self.quit_requested.emit)
         menu.addAction(act_show)
+        menu.addAction(act_reset)
         menu.addSeparator()
         menu.addAction(act_quit)