Autosave rule edits and sort centered table controls

This commit is contained in:
AttilaNet
2026-11-08 10:28:55 +08:00
parent aa27b1673d
commit d0fd15c785
10 changed files with 402 additions and 54 deletions
+63 -24
View File
@@ -28,6 +28,7 @@ from .sessions import SessionStore, identity
from .inventory_gui import ITEM_TYPES, InventoryTable
from .ranch_gui import RanchView
from .policy_io import portable_policy, import_policy
from .table_widgets import table_item
APP_VERSION = "1.1.0"
@@ -99,11 +100,7 @@ def fill_table(widget, rows, sorting=True):
widget.setRowCount(len(rows))
for i, row in enumerate(rows):
for j, value in enumerate(row):
item = W.QTableWidgetItem()
if isinstance(value, (int, float)):
item.setData(C.Qt.ItemDataRole.DisplayRole, value)
else:
item.setText(str(value))
item = table_item(value, j)
widget.setItem(i, j, item)
widget.setSortingEnabled(sorting)
@@ -124,6 +121,7 @@ class Window(ActivityPages, W.QMainWindow):
self.pending_execute = False
self.close_after_job = False
self.closed = False
self.loading_config = False
self.connection_guard = None
self.login_guard = None
if not G.QFontDatabase.families():
@@ -217,7 +215,7 @@ class Window(ActivityPages, W.QMainWindow):
rule_note.setWordWrap(True)
egg_layout.addWidget(rule_note)
egg_buttons = W.QHBoxLayout()
for label, function in (("添加无库存蛋规则", self.add_egg_rule), ("保存规则", self.save_config), ("刷新背包", self.refresh)):
for label, function in (("添加无库存蛋规则", self.add_egg_rule), ("刷新背包", self.refresh)):
button = W.QPushButton(label)
button.clicked.connect(function)
egg_buttons.addWidget(button)
@@ -322,6 +320,7 @@ class Window(ActivityPages, W.QMainWindow):
self.install_refresh_menus()
self.tabs.currentChanged.connect(self.render_current_page)
self.interval.currentIndexChanged.connect(self.poll_interval_changed)
self.setup_autosave()
self.reload_saved_sessions()
self.timer = C.QTimer(self)
self.timer.timeout.connect(self.schedule)
@@ -338,10 +337,8 @@ class Window(ActivityPages, W.QMainWindow):
self.remember_password.setChecked(True)
show_password = W.QCheckBox("显示密码")
show_password.toggled.connect(lambda show: self.password.setEchoMode(W.QLineEdit.EchoMode.Normal if show else W.QLineEdit.EchoMode.Password))
save_login = W.QPushButton("保存登录信息")
save_login.clicked.connect(self.save_login_info)
login_options = W.QHBoxLayout()
for widget in (self.remember_password, show_password, save_login):
for widget in (self.remember_password, show_password):
login_options.addWidget(widget)
login_options.addStretch()
self.login_button = W.QPushButton("账号密码登录并获取区服")
@@ -445,9 +442,6 @@ class Window(ActivityPages, W.QMainWindow):
form.addRow(self.gift_status)
for widget in (self.gift_enabled, self.gift_liked_only):
widget.toggled.connect(self.update_gift_status)
save = W.QPushButton("保存设置")
save.clicked.connect(self.save_config)
form.addRow(save)
for label in tab.findChildren(W.QLabel):
label.setWordWrap(True)
form.setSizeConstraint(W.QLayout.SizeConstraint.SetMinimumSize)
@@ -531,11 +525,8 @@ class Window(ActivityPages, W.QMainWindow):
preset = W.QPushButton("绿色史莱姆金币预设(仅孵此蛋)")
preset.clicked.connect(self.gold_preset)
preset.setToolTip("只勾选绿色史莱姆:优先级1、派遣、低于1时补至10,莉莉托斯市场;保留4星以上/A资质。应用后仍需开始执行。")
save = W.QPushButton("保存当前配置")
save.clicked.connect(self.save_config)
bottom = W.QHBoxLayout()
bottom.addWidget(preset)
bottom.addWidget(save)
for label, function in (("导入策略…", self.import_policies), ("导出策略…", self.export_policies)):
button = W.QPushButton(label)
button.clicked.connect(function)
@@ -669,9 +660,9 @@ class Window(ActivityPages, W.QMainWindow):
self.collect.setChecked(True)
else:
self.collect.setChecked(True)
self.save_config(quiet=True)
self.settings_changed()
self.update_workflow_status()
self.statusBar().showMessage("孵蛋规则已保存;下一轮按新规则执行", 5000)
self.statusBar().showMessage("孵蛋规则已更新,将自动保存并应用", 5000)
def filter_inventory(self, category, text):
self.inventory_tables[category].set_filter(text, category)
@@ -681,7 +672,7 @@ class Window(ActivityPages, W.QMainWindow):
self.gift_items = rules
if rules[key]["enabled"]:
self.gift_enabled.setChecked(True)
self.save_config(quiet=True)
self.settings_changed()
self.update_gift_status()
def update_gift_status(self, *args):
@@ -704,7 +695,7 @@ class Window(ActivityPages, W.QMainWindow):
self.collect.setChecked(True)
else:
self.feed_targets.pop(mid, None)
self.save_config(quiet=True)
self.settings_changed()
self.update_target_status()
def monster_gift_changed(self, mid, enabled, priority):
@@ -713,7 +704,7 @@ class Window(ActivityPages, W.QMainWindow):
self.gift_enabled.setChecked(True)
else:
self.gift_targets.pop(mid, None)
self.save_config(quiet=True)
self.settings_changed()
self.update_gift_status()
def add_egg_rule(self):
@@ -1620,6 +1611,48 @@ class Window(ActivityPages, W.QMainWindow):
"yield_stars": [star for star, check in self.yield_stars.items() if check.isChecked()],
"interval": self.interval.currentData()}
def setup_autosave(self):
self.auto_save_timer = C.QTimer(self)
self.auto_save_timer.setSingleShot(True)
self.auto_save_timer.timeout.connect(self.persist_settings)
names = ("ranch_enabled", "strategy", "protect_star", "protect_quality", "target", "target_level", "room",
"coin_exp", "reserved_types", "reserve_eggs", "fill", "egg_order", "min_gold", "min_exp", "buy_eggs",
"buy_ten", "dispatch", "collect", "feed", "market", "egg_stock", "buy_batch", "keep_money", "daily_buy_money",
"hatch_max_star", "gift_enabled", "gift_liked_only", "quest_enabled", "quest_accept", "quest_city", "quest_items",
"quest_monsters", "quest_money", "quest_battles", "quest_reserves")
for name in names:
widget = getattr(self, name)
signal = (widget.toggled if isinstance(widget, W.QAbstractButton) else
widget.currentIndexChanged if isinstance(widget, W.QComboBox) else
widget.valueChanged if isinstance(widget, W.QAbstractSpinBox) else widget.textChanged)
signal.connect(self.settings_changed)
for widget in self.yield_stars.values():
widget.toggled.connect(self.settings_changed)
def settings_changed(self, *args):
if not self.closed and not self.loading_config and hasattr(self, "auto_save_timer"):
self.auto_save_timer.start(300)
def persist_settings(self):
if self.closed or self.loading_config:
return
value = self.save_config(quiet=True)
if value is None:
return
changed = any(asdict(getattr(self.engine, key)) != value[key]
for key in ("policy", "quest_policy", "daily_policy", "sweep_policy"))
self.engine.policy = Policy(**value["policy"])
self.engine.quest_policy = QuestPolicy(**value["quest_policy"])
self.engine.daily_policy = DailyPolicy(**value["daily_policy"])
self.engine.sweep_policy = SweepPolicy(**value["sweep_policy"])
if changed and self.monitoring and self.execute.isChecked():
if self.busy:
self.pending_execute = True
else:
self.next_poll = 0
self.arm_hatching()
self.statusBar().showMessage("规则已自动保存并应用", 3000)
def save_config(self, *args, quiet=False):
try:
value = self.config_value()
@@ -1629,8 +1662,9 @@ class Window(ActivityPages, W.QMainWindow):
temporary.replace(self.state / "settings.json")
if not quiet:
self.report("已保存当前角色的策略;会话单独加密保存")
except ValueError:
self.error("设置格式不正确,未保存")
return value
except (ValueError, OSError):
self.statusBar().showMessage("设置尚未保存,请检查输入格式及本地目录", 5000)
def export_policies(self):
path, _ = W.QFileDialog.getSaveFileName(self, "导出培养策略", "ranch-policies-1.1.0.json", "策略文件 (*.json)")
@@ -1664,6 +1698,9 @@ class Window(ActivityPages, W.QMainWindow):
path = self.state / "settings.json"
if value is None and not path.exists():
return
if hasattr(self, "auto_save_timer"):
self.auto_save_timer.stop()
self.loading_config = True
try:
if value is None:
value = json.loads(path.read_text(encoding="utf-8"))
@@ -1730,13 +1767,15 @@ class Window(ActivityPages, W.QMainWindow):
self.render_current_page()
except Exception:
self.report("旧设置无法读取,已使用默认设置")
finally:
self.loading_config = False
def closeEvent(self, event):
self.closed = True
self.timer.stop()
self.hatch_timer.stop()
if hasattr(self, "activity_save_timer"):
self.activity_save_timer.stop()
if hasattr(self, "auto_save_timer"):
self.auto_save_timer.stop()
if hasattr(self.eggs, "row_batch"):
self.eggs.row_batch.stop()
for name in ("map_render_timer", "monster_render_timer"):