feat: 关闭行为选择

Author: Windsland52

aao/app.py

@@ -388,6 +388,56 @@ def _poll_hotkeys(self) -> None:
     def set_log_handler(self, handler: QtLogHandler) -> None:
         self.farm_page.set_log_handler(handler)
 
+    def _get_close_action(self) -> str:
+        """点 X 时的行为：读 settings，无偏好则弹窗询问。
+
+        返回 "minimize" 或 "exit"。
+        """
+        from PySide6.QtWidgets import QCheckBox, QDialog, QHBoxLayout, QPushButton, QVBoxLayout
+
+        from aao.ui.settings_page import load_settings, save_settings
+
+        s = load_settings()
+        saved = s.get("close_action", "")  # "minimize" / "exit" / "" (每次问)
+        if saved in ("minimize", "exit"):
+            return saved
+
+        # 首次/未设偏好：弹自定义对话框
+        self._hide_overlay()
+        dlg = QDialog(self)
+        dlg.setWindowTitle("关闭窗口")
+        dl = QVBoxLayout(dlg)
+        btn_row = QHBoxLayout()
+        btn_exit = QPushButton("退出程序")
+        btn_minimize = QPushButton("最小化到托盘")
+        btn_row.addWidget(btn_exit)
+        btn_row.addWidget(btn_minimize)
+        dl.addLayout(btn_row)
+        chk = QCheckBox("不再询问（可在设置中修改）")
+        dl.addWidget(chk)
+
+        choice = "exit"
+
+        def _on_exit():
+            nonlocal choice
+            choice = "exit"
+            dlg.accept()
+
+        def _on_minimize():
+            nonlocal choice
+            choice = "minimize"
+            dlg.accept()
+
+        btn_exit.clicked.connect(_on_exit)
+        btn_minimize.clicked.connect(_on_minimize)
+        dlg.exec()
+        self._show_overlay()
+
+        if chk.isChecked():
+            s["close_action"] = choice
+            save_settings(s)
+        return choice
+
     def _restore_from_tray(self) -> None:
         """从托盘还原窗口。"""
         self.showNormal()
@@ -409,10 +459,15 @@ def _quit_from_tray(self) -> None:
 
     def closeEvent(self, event: QCloseEvent) -> None:  # noqa: D401
         if not self._force_quit:
-            # 普通关闭=隐藏到托盘（不退出，凹图可继续）
-            event.ignore()
-            self.hide()
-            self.tray.show_message("ArknightsAutoOperator", "已在后台运行，双击托盘图标恢复。")
+            # 点 X：按用户偏好退出或最小化
+            action = self._get_close_action()
+            if action == "minimize":
+                event.ignore()
+                self.hide()
+                self.tray.show_message("ArknightsAutoOperator", "已在后台运行，双击托盘图标恢复。")
+            else:
+                # 走真退出路径
+                self._force_quit = True
             return
         # 真退出（_quit_from_tray 已做清理，或窗口在可见时被强制关闭）
         self.hotkey_timer.stop()

aao/ui/settings_page.py

@@ -234,6 +234,14 @@ def _build_ui(self) -> None:
         rl.addLayout(btn_row)
         root.addWidget(res_box)
 
+        # --- 软件设置 ---
+        ui_box = QGroupBox("软件设置")
+        ui_form = QFormLayout(ui_box)
+        self.cb_close_action = QComboBox()
+        self.cb_close_action.addItems(["每次询问", "最小化到托盘", "退出程序"])
+        ui_form.addRow("关闭窗口时:", self.cb_close_action)
+        root.addWidget(ui_box)
+
         root.addStretch()
 
         # 日志
@@ -396,6 +404,8 @@ def _load(self) -> None:
         if s.get("port"):
             self.edit_port.setText(str(s["port"]))
         self.chk_api.setChecked(s.get("api", True))
+        close_map = {"": 0, "minimize": 1, "exit": 2}
+        self.cb_close_action.setCurrentIndex(close_map.get(s.get("close_action", ""), 0))
         if s.get("proxy"):
             self.edit_proxy.setText(str(s["proxy"]))
         if s.get("github_token_enc"):
@@ -420,6 +430,7 @@ def _on_save(self) -> None:
                 "port": port,
                 "api": self.chk_api.isChecked(),
                 "proxy": self.edit_proxy.text().strip(),
+                "close_action": ["", "minimize", "exit"][self.cb_close_action.currentIndex()],
             }
         )
         token = self.edit_github_token.text().strip()