Autosave rule edits and sort centered table controls
This commit is contained in:
@@ -11,6 +11,9 @@
|
|||||||
下拉框默认加宽,表格中的操作、市场和难度列同步留足宽度;弹出列表按最长选项展开,并为滚动条预留宽度。
|
下拉框默认加宽,表格中的操作、市场和难度列同步留足宽度;弹出列表按最长选项展开,并为滚动条预留宽度。
|
||||||
超过屏幕宽度的文字可横向滚动。
|
超过屏幕宽度的文字可横向滚动。
|
||||||
下拉框收起时悬停可查看完整选项,动态加载的区服、市场和魔物名称会重新计算宽度。
|
下拉框收起时悬停可查看完整选项,动态加载的区服、市场和魔物名称会重新计算宽度。
|
||||||
|
规则修改后自动保存并应用,无需点击保存按钮;连续输入会合并保存,尚未完整的输入不会覆盖已保存配置。
|
||||||
|
勾选状态、优先级、孵出后的处理方式及保留数量都支持点击表头排序;刷新后保留排序,排序不改变策略优先级。
|
||||||
|
表格中的编号和名称靠左,星级、数量、优先级等内容及勾选框居中显示。
|
||||||
|
|
||||||
## 当前功能
|
## 当前功能
|
||||||
|
|
||||||
@@ -57,7 +60,7 @@
|
|||||||
默认未登录,使用本地示例数据。顶部账号页签用于切换账号,“新增账号页签”用于登录另一账号。
|
默认未登录,使用本地示例数据。顶部账号页签用于切换账号,“新增账号页签”用于登录另一账号。
|
||||||
|
|
||||||
1. 在“登录”页填写第一弹渠道账号和密码,点击“账号密码登录并获取区服”。
|
1. 在“登录”页填写第一弹渠道账号和密码,点击“账号密码登录并获取区服”。
|
||||||
默认勾选“记住账号和密码”;编辑完、点击登录或关闭窗口时自动保存,也可点击“保存登录信息”。
|
默认勾选“记住账号和密码”;编辑完、点击登录或关闭窗口时自动保存。
|
||||||
密码保存在本机加密文件 `local_state/ranch_helper/credentials.json`,重启自动填回,不再自动清空。
|
密码保存在本机加密文件 `local_state/ranch_helper/credentials.json`,重启自动填回,不再自动清空。
|
||||||
2. 从“官方返回的区服 / 已有角色”选择区服,点击“进入选中区服”。
|
2. 从“官方返回的区服 / 已有角色”选择区服,点击“进入选中区服”。
|
||||||
登录中心取自 APK,游戏服务器地址取自选中区服的 `gameServerAddress`。
|
登录中心取自 APK,游戏服务器地址取自选中区服的 `gameServerAddress`。
|
||||||
@@ -213,7 +216,7 @@
|
|||||||
- 自定义表:`typeId, sell_money, sell_exp, time_total`(秒),可只提供部分
|
- 自定义表:`typeId, sell_money, sell_exp, time_total`(秒),可只提供部分
|
||||||
覆盖列;中文列名“编号、派遣金币、强化经验、孵化秒数”也支持。
|
覆盖列;中文列名“编号、派遣金币、强化经验、孵化秒数”也支持。
|
||||||
- 测试:`python -m unittest discover -s ranch_assistant/tests -v`。
|
- 测试:`python -m unittest discover -s ranch_assistant/tests -v`。
|
||||||
- 135 项本地测试通过,覆盖登录、会话隔离、请求计数、成长同步、孵蛋与补货、批量喂养、派遣、赠礼、委托、扫荡和每日奖励。
|
- 140 项本地测试通过,覆盖登录、会话隔离、请求计数、成长同步、孵蛋与补货、批量喂养、派遣、赠礼、委托、扫荡和每日奖励。
|
||||||
新增牧场树形/平铺切换、分组数量与空位、刷新保留折叠和控件、4S保留条件、随机刷新间隔及到期独立同步的回归测试。
|
新增牧场树形/平铺切换、分组数量与空位、刷新保留折叠和控件、4S保留条件、随机刷新间隔及到期独立同步的回归测试。
|
||||||
双账号与大量库存的界面响应继续通过测试;测试使用本地模拟数据和模拟服务,不操作真实账号库存。
|
双账号与大量库存的界面响应继续通过测试;测试使用本地模拟数据和模拟服务,不操作真实账号库存。
|
||||||
- 网络写请求发生异常后不会直接重试,以免重复消耗魔物或物品。
|
- 网络写请求发生异常后不会直接重试,以免重复消耗魔物或物品。
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ from .maps import stages
|
|||||||
from .native_widgets import ComboBox, IntegerInput, RowBatch
|
from .native_widgets import ComboBox, IntegerInput, RowBatch
|
||||||
from .presentation import map_source
|
from .presentation import map_source
|
||||||
from .sweeping import SweepPolicy
|
from .sweeping import SweepPolicy
|
||||||
|
from .table_widgets import SORT_ROLE, TreeItem, bind_controls, set_value, table_item
|
||||||
|
|
||||||
|
|
||||||
def number(value, maximum=9999):
|
def number(value, maximum=9999):
|
||||||
@@ -63,6 +64,8 @@ class ActivityPages:
|
|||||||
self.maps_tree.setUniformRowHeights(False)
|
self.maps_tree.setUniformRowHeights(False)
|
||||||
self.maps_tree.setEditTriggers(W.QAbstractItemView.EditTrigger.NoEditTriggers)
|
self.maps_tree.setEditTriggers(W.QAbstractItemView.EditTrigger.NoEditTriggers)
|
||||||
self.maps_tree.itemChanged.connect(self.map_item_changed)
|
self.maps_tree.itemChanged.connect(self.map_item_changed)
|
||||||
|
self.maps_tree.sortByColumn(1, C.Qt.SortOrder.AscendingOrder)
|
||||||
|
self.maps_tree.setSortingEnabled(True)
|
||||||
for col, width in enumerate((100, 82, 160, 130, 70, 210, 120, 340, 100, 92)):
|
for col, width in enumerate((100, 82, 160, 130, 70, 210, 120, 340, 100, 92)):
|
||||||
self.maps_tree.setColumnWidth(col, width)
|
self.maps_tree.setColumnWidth(col, width)
|
||||||
layout.addWidget(self.maps_tree, 1)
|
layout.addWidget(self.maps_tree, 1)
|
||||||
@@ -81,24 +84,22 @@ class ActivityPages:
|
|||||||
return SweepPolicy(self.map_enabled.isChecked(), copy.deepcopy(self.map_rules), self.map_keep_ti.value(), self.map_team.currentData())
|
return SweepPolicy(self.map_enabled.isChecked(), copy.deepcopy(self.map_rules), self.map_keep_ti.value(), self.map_team.currentData())
|
||||||
|
|
||||||
def activity_settings_changed(self, *args):
|
def activity_settings_changed(self, *args):
|
||||||
if self.closed:
|
if self.closed or self.loading_config:
|
||||||
return
|
return
|
||||||
# Stop takes effect immediately, even if the current request is in flight.
|
# Stop takes effect immediately, even if the current request is in flight.
|
||||||
if hasattr(self, "map_enabled") and not self.map_enabled.isChecked():
|
if hasattr(self, "map_enabled") and not self.map_enabled.isChecked():
|
||||||
self.engine.sweep_policy.enabled = False
|
self.engine.sweep_policy.enabled = False
|
||||||
if hasattr(self, "daily_enabled") and not self.daily_enabled.isChecked():
|
if hasattr(self, "daily_enabled") and not self.daily_enabled.isChecked():
|
||||||
self.engine.daily_policy.enabled = False
|
self.engine.daily_policy.enabled = False
|
||||||
if hasattr(self, "default_config"):
|
self.settings_changed()
|
||||||
if not hasattr(self, "activity_save_timer"):
|
|
||||||
self.activity_save_timer = C.QTimer(self)
|
|
||||||
self.activity_save_timer.setSingleShot(True)
|
|
||||||
self.activity_save_timer.timeout.connect(lambda: self.save_config(quiet=True))
|
|
||||||
self.activity_save_timer.start(350)
|
|
||||||
|
|
||||||
def map_item_changed(self, item, column):
|
def map_item_changed(self, item, column):
|
||||||
key = item.data(0, C.Qt.ItemDataRole.UserRole)
|
key = item.data(0, C.Qt.ItemDataRole.UserRole)
|
||||||
if key and column == 0:
|
if key and column == 0:
|
||||||
self.map_rule_changed(key, enabled=item.checkState(0) == C.Qt.CheckState.Checked)
|
enabled = item.checkState(0) == C.Qt.CheckState.Checked
|
||||||
|
if self.map_rules.get(key, {}).get("enabled", False) != enabled:
|
||||||
|
self.map_rule_changed(key, enabled=enabled)
|
||||||
|
item.setData(0, SORT_ROLE, int(enabled))
|
||||||
|
|
||||||
def map_rule_changed(self, key, **changes):
|
def map_rule_changed(self, key, **changes):
|
||||||
self.map_rules[key] = {"enabled": False, "level": "3", "limit": 3} | self.map_rules.get(key, {}) | changes
|
self.map_rules[key] = {"enabled": False, "level": "3", "limit": 3} | self.map_rules.get(key, {}) | changes
|
||||||
@@ -141,6 +142,7 @@ class ActivityPages:
|
|||||||
wanted = {row[0] for row in visible}
|
wanted = {row[0] for row in visible}
|
||||||
operations = [("remove", key) for key in self._map_items if key not in wanted] + [("row", row) for row in visible]
|
operations = [("remove", key) for key in self._map_items if key not in wanted] + [("row", row) for row in visible]
|
||||||
first_render = not self.maps_tree.topLevelItemCount()
|
first_render = not self.maps_tree.topLevelItemCount()
|
||||||
|
self.maps_tree.setSortingEnabled(False)
|
||||||
def apply(operation):
|
def apply(operation):
|
||||||
kind, data = operation
|
kind, data = operation
|
||||||
blocker = C.QSignalBlocker(self.maps_tree)
|
blocker = C.QSignalBlocker(self.maps_tree)
|
||||||
@@ -152,13 +154,13 @@ class ActivityPages:
|
|||||||
first = options[0]
|
first = options[0]
|
||||||
city = self._map_cities.get(first.city)
|
city = self._map_cities.get(first.city)
|
||||||
if city is None:
|
if city is None:
|
||||||
city = W.QTreeWidgetItem(self.maps_tree, [first.city_name])
|
city = TreeItem(self.maps_tree, [first.city_name])
|
||||||
city.setFirstColumnSpanned(True)
|
city.setFirstColumnSpanned(True)
|
||||||
city.setExpanded(first_render or bool(query))
|
city.setExpanded(first_render or bool(query))
|
||||||
self._map_cities[first.city] = city
|
self._map_cities[first.city] = city
|
||||||
item = self._map_items.get(key)
|
item = self._map_items.get(key)
|
||||||
if item is None:
|
if item is None:
|
||||||
item = W.QTreeWidgetItem(city)
|
item = TreeItem(city)
|
||||||
item.setData(0, C.Qt.ItemDataRole.UserRole, key)
|
item.setData(0, C.Qt.ItemDataRole.UserRole, key)
|
||||||
difficulty = ComboBox()
|
difficulty = ComboBox()
|
||||||
difficulty.currentIndexChanged.connect(lambda index, key=key, widget=difficulty: self.map_rule_changed(key, level=widget.currentData()))
|
difficulty.currentIndexChanged.connect(lambda index, key=key, widget=difficulty: self.map_rule_changed(key, level=widget.currentData()))
|
||||||
@@ -172,10 +174,11 @@ class ActivityPages:
|
|||||||
str(chosen.stamina) + (" / " + chosen.tickets if chosen.tickets else ""), chosen.drops, "", str(self.engine.sweeper.used(snapshot, chosen))]
|
str(chosen.stamina) + (" / " + chosen.tickets if chosen.tickets else ""), chosen.drops, "", str(self.engine.sweeper.used(snapshot, chosen))]
|
||||||
for col, text in enumerate(values):
|
for col, text in enumerate(values):
|
||||||
if item.text(col) != text:
|
if item.text(col) != text:
|
||||||
item.setText(col, text)
|
set_value(item, col, text)
|
||||||
if col in (5, 6, 7):
|
if col in (5, 6, 7):
|
||||||
item.setToolTip(col, text)
|
item.setToolTip(col, text)
|
||||||
item.setCheckState(0, C.Qt.CheckState.Checked if rule.get("enabled") else C.Qt.CheckState.Unchecked)
|
item.setCheckState(0, C.Qt.CheckState.Checked if rule.get("enabled") else C.Qt.CheckState.Unchecked)
|
||||||
|
item.setData(0, SORT_ROLE, int(bool(rule.get("enabled"))))
|
||||||
flags = item.flags()
|
flags = item.flags()
|
||||||
item.setFlags(flags | C.Qt.ItemFlag.ItemIsUserCheckable if any(s.unlocked and s.open for s in options) else flags & ~C.Qt.ItemFlag.ItemIsUserCheckable)
|
item.setFlags(flags | C.Qt.ItemFlag.ItemIsUserCheckable if any(s.unlocked and s.open for s in options) else flags & ~C.Qt.ItemFlag.ItemIsUserCheckable)
|
||||||
difficulty = self.maps_tree.itemWidget(item, 3)
|
difficulty = self.maps_tree.itemWidget(item, 3)
|
||||||
@@ -193,13 +196,13 @@ class ActivityPages:
|
|||||||
block_limit = C.QSignalBlocker(limit)
|
block_limit = C.QSignalBlocker(limit)
|
||||||
if not limit.hasFocus():
|
if not limit.hasFocus():
|
||||||
limit.setValue(rule.get("limit", 3))
|
limit.setValue(rule.get("limit", 3))
|
||||||
|
bind_controls(self.maps_tree, item, {3: difficulty, 8: limit})
|
||||||
def finish():
|
def finish():
|
||||||
for cid, city in list(self._map_cities.items()):
|
for cid, city in list(self._map_cities.items()):
|
||||||
if not city.childCount():
|
if not city.childCount():
|
||||||
self.maps_tree.takeTopLevelItem(self.maps_tree.indexOfTopLevelItem(city))
|
self.maps_tree.takeTopLevelItem(self.maps_tree.indexOfTopLevelItem(city))
|
||||||
del self._map_cities[cid]
|
del self._map_cities[cid]
|
||||||
else:
|
self.maps_tree.setSortingEnabled(True)
|
||||||
city.sortChildren(1, C.Qt.SortOrder.AscendingOrder)
|
|
||||||
self.map_render_timer.start(operations, apply, finish)
|
self.map_render_timer.start(operations, apply, finish)
|
||||||
pending = self.engine.sweeper.state.get("pending")
|
pending = self.engine.sweeper.state.get("pending")
|
||||||
self.maps_summary.setText(f"已解锁 {sum(s.unlocked for s in all_rows)} 个难度;显示 {len(visible)} 关;勾选 {sum(bool(r.get('enabled')) for r in self.map_rules.values())} 关。" +
|
self.maps_summary.setText(f"已解锁 {sum(s.unlocked for s in all_rows)} 个难度;显示 {len(visible)} 关;勾选 {sum(bool(r.get('enabled')) for r in self.map_rules.values())} 关。" +
|
||||||
@@ -261,12 +264,14 @@ class ActivityPages:
|
|||||||
|
|
||||||
def render_daily(self):
|
def render_daily(self):
|
||||||
rows = entries(self.catalog, self.engine.snapshot, self.engine.daily_ledger)
|
rows = entries(self.catalog, self.engine.snapshot, self.engine.daily_ledger)
|
||||||
|
self.daily_table.setSortingEnabled(False)
|
||||||
self.daily_table.setRowCount(len(rows))
|
self.daily_table.setRowCount(len(rows))
|
||||||
for i, row in enumerate(rows):
|
for i, row in enumerate(rows):
|
||||||
for j, text in enumerate((row.name, row.status, row.reward)):
|
for j, text in enumerate((row.name, row.status, row.reward)):
|
||||||
item = W.QTableWidgetItem(text)
|
item = table_item(text, j)
|
||||||
item.setToolTip(text)
|
item.setToolTip(text)
|
||||||
self.daily_table.setItem(i, j, item)
|
self.daily_table.setItem(i, j, item)
|
||||||
|
self.daily_table.setSortingEnabled(True)
|
||||||
|
|
||||||
def claim_daily(self):
|
def claim_daily(self):
|
||||||
if self.busy:
|
if self.busy:
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
import json
|
import json
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
from PySide6 import QtCore as C, QtGui as G, QtWidgets as W
|
from PySide6 import QtCore as C, QtGui as G, QtWidgets as W
|
||||||
|
from .table_widgets import table_item
|
||||||
|
|
||||||
|
|
||||||
class DebugWindow(W.QDialog):
|
class DebugWindow(W.QDialog):
|
||||||
@@ -51,7 +52,7 @@ class DebugWindow(W.QDialog):
|
|||||||
if event["kind"] == "error" and event.get("scope") == "local":
|
if event["kind"] == "error" and event.get("scope") == "local":
|
||||||
values[2] = "本地错误"
|
values[2] = "本地错误"
|
||||||
for index, value in enumerate(values):
|
for index, value in enumerate(values):
|
||||||
self.rows.setItem(row, index, W.QTableWidgetItem(str(value)))
|
self.rows.setItem(row, index, table_item(value, index))
|
||||||
# Follow the newest record unless the user is inspecting an older row.
|
# Follow the newest record unless the user is inspecting an older row.
|
||||||
if row == 0 or self.rows.currentRow() in (-1, row - 1) or event["kind"] == "error":
|
if row == 0 or self.rows.currentRow() in (-1, row - 1) or event["kind"] == "error":
|
||||||
self.rows.selectRow(row)
|
self.rows.selectRow(row)
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ from dataclasses import asdict
|
|||||||
from PySide6 import QtCore as C, QtWidgets as W
|
from PySide6 import QtCore as C, QtWidgets as W
|
||||||
from .model import EggRule, duration
|
from .model import EggRule, duration
|
||||||
from .native_widgets import ComboBox, IntegerInput, RowBatch
|
from .native_widgets import ComboBox, IntegerInput, RowBatch
|
||||||
|
from .table_widgets import CenteredCheckBox, bind_controls, set_value, table_item
|
||||||
|
|
||||||
|
|
||||||
class EggTable(W.QTableWidget):
|
class EggTable(W.QTableWidget):
|
||||||
@@ -60,12 +61,17 @@ class EggTable(W.QTableWidget):
|
|||||||
values = [data.get("name", key), data.get("star", "?"), group["count"], "", "", "", "", "", "",
|
values = [data.get("name", key), data.get("star", "?"), group["count"], "", "", "", "", "", "",
|
||||||
duration(total), money, exp, round(money * 3600 / total, 2), round(exp * 3600 / total, 2), ", ".join(group["ids"])]
|
duration(total), money, exp, round(money * 3600 / total, 2), round(exp * 3600 / total, 2), ", ".join(group["ids"])]
|
||||||
for j, value in enumerate(values):
|
for j, value in enumerate(values):
|
||||||
item = W.QTableWidgetItem()
|
item = self.item(i, j)
|
||||||
item.setData(C.Qt.ItemDataRole.DisplayRole, value)
|
if item is None:
|
||||||
|
item = table_item(value, j)
|
||||||
|
self.setItem(i, j, item)
|
||||||
|
else:
|
||||||
|
set_value(item, j, value)
|
||||||
|
if j == 1:
|
||||||
|
item.setTextAlignment(C.Qt.AlignmentFlag.AlignCenter)
|
||||||
if j == 0:
|
if j == 0:
|
||||||
item.setData(C.Qt.ItemDataRole.UserRole, key)
|
item.setData(C.Qt.ItemDataRole.UserRole, key)
|
||||||
item.setToolTip(f"魔物编号 {key}")
|
item.setToolTip(f"魔物编号 {key}")
|
||||||
self.setItem(i, j, item)
|
|
||||||
existing = self.cellWidget(i, 3)
|
existing = self.cellWidget(i, 3)
|
||||||
if existing and existing.property("egg_type_id") == key:
|
if existing and existing.property("egg_type_id") == key:
|
||||||
controls = [self.cellWidget(i, col) for col in range(3, 9)]
|
controls = [self.cellWidget(i, col) for col in range(3, 9)]
|
||||||
@@ -76,8 +82,9 @@ class EggTable(W.QTableWidget):
|
|||||||
control.setValue(rule[field])
|
control.setValue(rule[field])
|
||||||
controls[2].setCurrentIndex(max(0, controls[2].findData(rule["action"])))
|
controls[2].setCurrentIndex(max(0, controls[2].findData(rule["action"])))
|
||||||
controls[5].setCurrentIndex(max(0, controls[5].findData(rule["market_id"])))
|
controls[5].setCurrentIndex(max(0, controls[5].findData(rule["market_id"])))
|
||||||
|
bind_controls(self, i, dict(zip(range(3, 9), controls)))
|
||||||
return
|
return
|
||||||
enabled = W.QCheckBox()
|
enabled = CenteredCheckBox()
|
||||||
enabled.setProperty("egg_type_id", key)
|
enabled.setProperty("egg_type_id", key)
|
||||||
enabled.setChecked(rule["enabled"])
|
enabled.setChecked(rule["enabled"])
|
||||||
priority, below, target = IntegerInput(), IntegerInput(), IntegerInput()
|
priority, below, target = IntegerInput(), IntegerInput(), IntegerInput()
|
||||||
@@ -85,7 +92,6 @@ class EggTable(W.QTableWidget):
|
|||||||
(target, max(1, rule["refill_below"]), 1000, rule["refill_target"])):
|
(target, max(1, rule["refill_below"]), 1000, rule["refill_target"])):
|
||||||
control.setRange(low, high)
|
control.setRange(low, high)
|
||||||
control.setValue(value)
|
control.setValue(value)
|
||||||
control.setFixedWidth(76)
|
|
||||||
priority.setToolTip("数字越小,孵化优先级越高")
|
priority.setToolTip("数字越小,孵化优先级越高")
|
||||||
below.setToolTip("可用蛋少于此数量时补货;0表示不自动补货")
|
below.setToolTip("可用蛋少于此数量时补货;0表示不自动补货")
|
||||||
target.setToolTip("补货希望达到的可用蛋数量;市场随机出蛋,实际结果由服务器决定")
|
target.setToolTip("补货希望达到的可用蛋数量;市场随机出蛋,实际结果由服务器决定")
|
||||||
@@ -119,6 +125,7 @@ class EggTable(W.QTableWidget):
|
|||||||
control.valueChanged.connect(commit)
|
control.valueChanged.connect(commit)
|
||||||
action.currentIndexChanged.connect(commit)
|
action.currentIndexChanged.connect(commit)
|
||||||
market.currentIndexChanged.connect(commit)
|
market.currentIndexChanged.connect(commit)
|
||||||
|
bind_controls(self, i, dict(zip(range(3, 9), controls.values())))
|
||||||
def finish():
|
def finish():
|
||||||
self.setSortingEnabled(True)
|
self.setSortingEnabled(True)
|
||||||
self.updating = False
|
self.updating = False
|
||||||
|
|||||||
+63
-24
@@ -28,6 +28,7 @@ from .sessions import SessionStore, identity
|
|||||||
from .inventory_gui import ITEM_TYPES, InventoryTable
|
from .inventory_gui import ITEM_TYPES, InventoryTable
|
||||||
from .ranch_gui import RanchView
|
from .ranch_gui import RanchView
|
||||||
from .policy_io import portable_policy, import_policy
|
from .policy_io import portable_policy, import_policy
|
||||||
|
from .table_widgets import table_item
|
||||||
|
|
||||||
APP_VERSION = "1.1.0"
|
APP_VERSION = "1.1.0"
|
||||||
|
|
||||||
@@ -99,11 +100,7 @@ def fill_table(widget, rows, sorting=True):
|
|||||||
widget.setRowCount(len(rows))
|
widget.setRowCount(len(rows))
|
||||||
for i, row in enumerate(rows):
|
for i, row in enumerate(rows):
|
||||||
for j, value in enumerate(row):
|
for j, value in enumerate(row):
|
||||||
item = W.QTableWidgetItem()
|
item = table_item(value, j)
|
||||||
if isinstance(value, (int, float)):
|
|
||||||
item.setData(C.Qt.ItemDataRole.DisplayRole, value)
|
|
||||||
else:
|
|
||||||
item.setText(str(value))
|
|
||||||
widget.setItem(i, j, item)
|
widget.setItem(i, j, item)
|
||||||
widget.setSortingEnabled(sorting)
|
widget.setSortingEnabled(sorting)
|
||||||
|
|
||||||
@@ -124,6 +121,7 @@ class Window(ActivityPages, W.QMainWindow):
|
|||||||
self.pending_execute = False
|
self.pending_execute = False
|
||||||
self.close_after_job = False
|
self.close_after_job = False
|
||||||
self.closed = False
|
self.closed = False
|
||||||
|
self.loading_config = False
|
||||||
self.connection_guard = None
|
self.connection_guard = None
|
||||||
self.login_guard = None
|
self.login_guard = None
|
||||||
if not G.QFontDatabase.families():
|
if not G.QFontDatabase.families():
|
||||||
@@ -217,7 +215,7 @@ class Window(ActivityPages, W.QMainWindow):
|
|||||||
rule_note.setWordWrap(True)
|
rule_note.setWordWrap(True)
|
||||||
egg_layout.addWidget(rule_note)
|
egg_layout.addWidget(rule_note)
|
||||||
egg_buttons = W.QHBoxLayout()
|
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 = W.QPushButton(label)
|
||||||
button.clicked.connect(function)
|
button.clicked.connect(function)
|
||||||
egg_buttons.addWidget(button)
|
egg_buttons.addWidget(button)
|
||||||
@@ -322,6 +320,7 @@ class Window(ActivityPages, W.QMainWindow):
|
|||||||
self.install_refresh_menus()
|
self.install_refresh_menus()
|
||||||
self.tabs.currentChanged.connect(self.render_current_page)
|
self.tabs.currentChanged.connect(self.render_current_page)
|
||||||
self.interval.currentIndexChanged.connect(self.poll_interval_changed)
|
self.interval.currentIndexChanged.connect(self.poll_interval_changed)
|
||||||
|
self.setup_autosave()
|
||||||
self.reload_saved_sessions()
|
self.reload_saved_sessions()
|
||||||
self.timer = C.QTimer(self)
|
self.timer = C.QTimer(self)
|
||||||
self.timer.timeout.connect(self.schedule)
|
self.timer.timeout.connect(self.schedule)
|
||||||
@@ -338,10 +337,8 @@ class Window(ActivityPages, W.QMainWindow):
|
|||||||
self.remember_password.setChecked(True)
|
self.remember_password.setChecked(True)
|
||||||
show_password = W.QCheckBox("显示密码")
|
show_password = W.QCheckBox("显示密码")
|
||||||
show_password.toggled.connect(lambda show: self.password.setEchoMode(W.QLineEdit.EchoMode.Normal if show else W.QLineEdit.EchoMode.Password))
|
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()
|
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.addWidget(widget)
|
||||||
login_options.addStretch()
|
login_options.addStretch()
|
||||||
self.login_button = W.QPushButton("账号密码登录并获取区服")
|
self.login_button = W.QPushButton("账号密码登录并获取区服")
|
||||||
@@ -445,9 +442,6 @@ class Window(ActivityPages, W.QMainWindow):
|
|||||||
form.addRow(self.gift_status)
|
form.addRow(self.gift_status)
|
||||||
for widget in (self.gift_enabled, self.gift_liked_only):
|
for widget in (self.gift_enabled, self.gift_liked_only):
|
||||||
widget.toggled.connect(self.update_gift_status)
|
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):
|
for label in tab.findChildren(W.QLabel):
|
||||||
label.setWordWrap(True)
|
label.setWordWrap(True)
|
||||||
form.setSizeConstraint(W.QLayout.SizeConstraint.SetMinimumSize)
|
form.setSizeConstraint(W.QLayout.SizeConstraint.SetMinimumSize)
|
||||||
@@ -531,11 +525,8 @@ class Window(ActivityPages, W.QMainWindow):
|
|||||||
preset = W.QPushButton("绿色史莱姆金币预设(仅孵此蛋)")
|
preset = W.QPushButton("绿色史莱姆金币预设(仅孵此蛋)")
|
||||||
preset.clicked.connect(self.gold_preset)
|
preset.clicked.connect(self.gold_preset)
|
||||||
preset.setToolTip("只勾选绿色史莱姆:优先级1、派遣、低于1时补至10,莉莉托斯市场;保留4星以上/A资质。应用后仍需开始执行。")
|
preset.setToolTip("只勾选绿色史莱姆:优先级1、派遣、低于1时补至10,莉莉托斯市场;保留4星以上/A资质。应用后仍需开始执行。")
|
||||||
save = W.QPushButton("保存当前配置")
|
|
||||||
save.clicked.connect(self.save_config)
|
|
||||||
bottom = W.QHBoxLayout()
|
bottom = W.QHBoxLayout()
|
||||||
bottom.addWidget(preset)
|
bottom.addWidget(preset)
|
||||||
bottom.addWidget(save)
|
|
||||||
for label, function in (("导入策略…", self.import_policies), ("导出策略…", self.export_policies)):
|
for label, function in (("导入策略…", self.import_policies), ("导出策略…", self.export_policies)):
|
||||||
button = W.QPushButton(label)
|
button = W.QPushButton(label)
|
||||||
button.clicked.connect(function)
|
button.clicked.connect(function)
|
||||||
@@ -669,9 +660,9 @@ class Window(ActivityPages, W.QMainWindow):
|
|||||||
self.collect.setChecked(True)
|
self.collect.setChecked(True)
|
||||||
else:
|
else:
|
||||||
self.collect.setChecked(True)
|
self.collect.setChecked(True)
|
||||||
self.save_config(quiet=True)
|
self.settings_changed()
|
||||||
self.update_workflow_status()
|
self.update_workflow_status()
|
||||||
self.statusBar().showMessage("孵蛋规则已保存;下一轮按新规则执行", 5000)
|
self.statusBar().showMessage("孵蛋规则已更新,将自动保存并应用", 5000)
|
||||||
|
|
||||||
def filter_inventory(self, category, text):
|
def filter_inventory(self, category, text):
|
||||||
self.inventory_tables[category].set_filter(text, category)
|
self.inventory_tables[category].set_filter(text, category)
|
||||||
@@ -681,7 +672,7 @@ class Window(ActivityPages, W.QMainWindow):
|
|||||||
self.gift_items = rules
|
self.gift_items = rules
|
||||||
if rules[key]["enabled"]:
|
if rules[key]["enabled"]:
|
||||||
self.gift_enabled.setChecked(True)
|
self.gift_enabled.setChecked(True)
|
||||||
self.save_config(quiet=True)
|
self.settings_changed()
|
||||||
self.update_gift_status()
|
self.update_gift_status()
|
||||||
|
|
||||||
def update_gift_status(self, *args):
|
def update_gift_status(self, *args):
|
||||||
@@ -704,7 +695,7 @@ class Window(ActivityPages, W.QMainWindow):
|
|||||||
self.collect.setChecked(True)
|
self.collect.setChecked(True)
|
||||||
else:
|
else:
|
||||||
self.feed_targets.pop(mid, None)
|
self.feed_targets.pop(mid, None)
|
||||||
self.save_config(quiet=True)
|
self.settings_changed()
|
||||||
self.update_target_status()
|
self.update_target_status()
|
||||||
|
|
||||||
def monster_gift_changed(self, mid, enabled, priority):
|
def monster_gift_changed(self, mid, enabled, priority):
|
||||||
@@ -713,7 +704,7 @@ class Window(ActivityPages, W.QMainWindow):
|
|||||||
self.gift_enabled.setChecked(True)
|
self.gift_enabled.setChecked(True)
|
||||||
else:
|
else:
|
||||||
self.gift_targets.pop(mid, None)
|
self.gift_targets.pop(mid, None)
|
||||||
self.save_config(quiet=True)
|
self.settings_changed()
|
||||||
self.update_gift_status()
|
self.update_gift_status()
|
||||||
|
|
||||||
def add_egg_rule(self):
|
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()],
|
"yield_stars": [star for star, check in self.yield_stars.items() if check.isChecked()],
|
||||||
"interval": self.interval.currentData()}
|
"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):
|
def save_config(self, *args, quiet=False):
|
||||||
try:
|
try:
|
||||||
value = self.config_value()
|
value = self.config_value()
|
||||||
@@ -1629,8 +1662,9 @@ class Window(ActivityPages, W.QMainWindow):
|
|||||||
temporary.replace(self.state / "settings.json")
|
temporary.replace(self.state / "settings.json")
|
||||||
if not quiet:
|
if not quiet:
|
||||||
self.report("已保存当前角色的策略;会话单独加密保存")
|
self.report("已保存当前角色的策略;会话单独加密保存")
|
||||||
except ValueError:
|
return value
|
||||||
self.error("设置格式不正确,未保存")
|
except (ValueError, OSError):
|
||||||
|
self.statusBar().showMessage("设置尚未保存,请检查输入格式及本地目录", 5000)
|
||||||
|
|
||||||
def export_policies(self):
|
def export_policies(self):
|
||||||
path, _ = W.QFileDialog.getSaveFileName(self, "导出培养策略", "ranch-policies-1.1.0.json", "策略文件 (*.json)")
|
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"
|
path = self.state / "settings.json"
|
||||||
if value is None and not path.exists():
|
if value is None and not path.exists():
|
||||||
return
|
return
|
||||||
|
if hasattr(self, "auto_save_timer"):
|
||||||
|
self.auto_save_timer.stop()
|
||||||
|
self.loading_config = True
|
||||||
try:
|
try:
|
||||||
if value is None:
|
if value is None:
|
||||||
value = json.loads(path.read_text(encoding="utf-8"))
|
value = json.loads(path.read_text(encoding="utf-8"))
|
||||||
@@ -1730,13 +1767,15 @@ class Window(ActivityPages, W.QMainWindow):
|
|||||||
self.render_current_page()
|
self.render_current_page()
|
||||||
except Exception:
|
except Exception:
|
||||||
self.report("旧设置无法读取,已使用默认设置")
|
self.report("旧设置无法读取,已使用默认设置")
|
||||||
|
finally:
|
||||||
|
self.loading_config = False
|
||||||
|
|
||||||
def closeEvent(self, event):
|
def closeEvent(self, event):
|
||||||
self.closed = True
|
self.closed = True
|
||||||
self.timer.stop()
|
self.timer.stop()
|
||||||
self.hatch_timer.stop()
|
self.hatch_timer.stop()
|
||||||
if hasattr(self, "activity_save_timer"):
|
if hasattr(self, "auto_save_timer"):
|
||||||
self.activity_save_timer.stop()
|
self.auto_save_timer.stop()
|
||||||
if hasattr(self.eggs, "row_batch"):
|
if hasattr(self.eggs, "row_batch"):
|
||||||
self.eggs.row_batch.stop()
|
self.eggs.row_batch.stop()
|
||||||
for name in ("map_render_timer", "monster_render_timer"):
|
for name in ("map_render_timer", "monster_render_timer"):
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ import copy
|
|||||||
from PySide6 import QtCore as C, QtWidgets as W
|
from PySide6 import QtCore as C, QtWidgets as W
|
||||||
|
|
||||||
from .native_widgets import IntegerInput, RowBatch
|
from .native_widgets import IntegerInput, RowBatch
|
||||||
|
from .table_widgets import CenteredCheckBox, bind_controls, set_value, table_item
|
||||||
|
|
||||||
ITEM_TYPES = [(0, "全部物品"), (6, "魔物蛋"), (1, "可使用"), (2, "消耗品"), (3, "材料"), (4, "其他"), (5, "装备")]
|
ITEM_TYPES = [(0, "全部物品"), (6, "魔物蛋"), (1, "可使用"), (2, "消耗品"), (3, "材料"), (4, "其他"), (5, "装备")]
|
||||||
|
|
||||||
@@ -58,9 +59,9 @@ class InventoryTable(W.QTableWidget):
|
|||||||
for column, value in enumerate(values):
|
for column, value in enumerate(values):
|
||||||
cell = self.item(index, column)
|
cell = self.item(index, column)
|
||||||
if cell is None:
|
if cell is None:
|
||||||
cell = W.QTableWidgetItem()
|
cell = table_item(value, column)
|
||||||
self.setItem(index, column, cell)
|
self.setItem(index, column, cell)
|
||||||
cell.setData(C.Qt.ItemDataRole.DisplayRole, value)
|
set_value(cell, column, value)
|
||||||
if column == 0:
|
if column == 0:
|
||||||
cell.setData(C.Qt.ItemDataRole.UserRole, key)
|
cell.setData(C.Qt.ItemDataRole.UserRole, key)
|
||||||
eligible = type_id not in (5, 6) and bool(info.get("sellable"))
|
eligible = type_id not in (5, 6) and bool(info.get("sellable"))
|
||||||
@@ -71,8 +72,9 @@ class InventoryTable(W.QTableWidget):
|
|||||||
reserve.setValue(int(rule.get("reserve", 0)))
|
reserve.setValue(int(rule.get("reserve", 0)))
|
||||||
check.setEnabled(eligible)
|
check.setEnabled(eligible)
|
||||||
reserve.setEnabled(eligible)
|
reserve.setEnabled(eligible)
|
||||||
|
bind_controls(self, index, {6: check, 7: reserve})
|
||||||
return
|
return
|
||||||
check, reserve = W.QCheckBox(), IntegerInput()
|
check, reserve = CenteredCheckBox(), IntegerInput()
|
||||||
check.setProperty("item_type", key)
|
check.setProperty("item_type", key)
|
||||||
check.setEnabled(eligible)
|
check.setEnabled(eligible)
|
||||||
check.setChecked(bool(rule.get("enabled")))
|
check.setChecked(bool(rule.get("enabled")))
|
||||||
@@ -87,6 +89,7 @@ class InventoryTable(W.QTableWidget):
|
|||||||
reserve.valueChanged.connect(commit)
|
reserve.valueChanged.connect(commit)
|
||||||
self.setCellWidget(index, 6, check)
|
self.setCellWidget(index, 6, check)
|
||||||
self.setCellWidget(index, 7, reserve)
|
self.setCellWidget(index, 7, reserve)
|
||||||
|
bind_controls(self, index, {6: check, 7: reserve})
|
||||||
def finish():
|
def finish():
|
||||||
self.setSortingEnabled(True)
|
self.setSortingEnabled(True)
|
||||||
self.render_signature = copy.deepcopy(signature)
|
self.render_signature = copy.deepcopy(signature)
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ class ComboBox(W.QComboBox):
|
|||||||
"""Size popups for their text, independently of narrow table columns."""
|
"""Size popups for their text, independently of narrow table columns."""
|
||||||
def __init__(self, parent=None):
|
def __init__(self, parent=None):
|
||||||
self._text_width = None
|
self._text_width = None
|
||||||
|
self._text_alignment = None
|
||||||
super().__init__(parent)
|
super().__init__(parent)
|
||||||
self.setSizeAdjustPolicy(W.QComboBox.SizeAdjustPolicy.AdjustToMinimumContentsLengthWithIcon)
|
self.setSizeAdjustPolicy(W.QComboBox.SizeAdjustPolicy.AdjustToMinimumContentsLengthWithIcon)
|
||||||
self.setMinimumContentsLength(6)
|
self.setMinimumContentsLength(6)
|
||||||
@@ -71,6 +72,20 @@ class ComboBox(W.QComboBox):
|
|||||||
return True
|
return True
|
||||||
return super().event(event)
|
return super().event(event)
|
||||||
|
|
||||||
|
def setTextAlignment(self, alignment):
|
||||||
|
self._text_alignment = alignment
|
||||||
|
self.update()
|
||||||
|
|
||||||
|
def paintEvent(self, event):
|
||||||
|
if self._text_alignment is None:
|
||||||
|
return super().paintEvent(event)
|
||||||
|
painter = W.QStylePainter(self)
|
||||||
|
option = W.QStyleOptionComboBox()
|
||||||
|
self.initStyleOption(option)
|
||||||
|
option.textAlignment = self._text_alignment
|
||||||
|
painter.drawComplexControl(W.QStyle.ComplexControl.CC_ComboBox, option)
|
||||||
|
painter.drawControl(W.QStyle.ControlElement.CE_ComboBoxLabel, option)
|
||||||
|
|
||||||
|
|
||||||
class RowBatch(C.QObject):
|
class RowBatch(C.QObject):
|
||||||
"""Create Qt rows in short event-loop slices, keeping input responsive."""
|
"""Create Qt rows in short event-loop slices, keeping input responsive."""
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ from collections import Counter
|
|||||||
from PySide6 import QtCore as C, QtWidgets as W
|
from PySide6 import QtCore as C, QtWidgets as W
|
||||||
|
|
||||||
from .native_widgets import IntegerInput, RowBatch
|
from .native_widgets import IntegerInput, RowBatch
|
||||||
|
from .table_widgets import CenteredCheckBox, TreeItem, bind_controls, set_value
|
||||||
|
|
||||||
|
|
||||||
class RanchView(W.QTreeWidget):
|
class RanchView(W.QTreeWidget):
|
||||||
@@ -92,7 +93,7 @@ class RanchView(W.QTreeWidget):
|
|||||||
for key, label in groups.items():
|
for key, label in groups.items():
|
||||||
item = self.group_items.get(key)
|
item = self.group_items.get(key)
|
||||||
if item is None:
|
if item is None:
|
||||||
item = W.QTreeWidgetItem(self, [label])
|
item = TreeItem(self, [label])
|
||||||
item.setData(0, C.Qt.ItemDataRole.UserRole + 1, key)
|
item.setData(0, C.Qt.ItemDataRole.UserRole + 1, key)
|
||||||
item.setFirstColumnSpanned(True)
|
item.setFirstColumnSpanned(True)
|
||||||
item.setSizeHint(0, C.QSize(100, 26))
|
item.setSizeHint(0, C.QSize(100, 26))
|
||||||
@@ -108,13 +109,12 @@ class RanchView(W.QTreeWidget):
|
|||||||
item = self.monster_items.get(mid)
|
item = self.monster_items.get(mid)
|
||||||
if item is None:
|
if item is None:
|
||||||
parent = self.group_items.get(wanted[mid])
|
parent = self.group_items.get(wanted[mid])
|
||||||
item = W.QTreeWidgetItem(parent if parent is not None else self)
|
item = TreeItem(parent if parent is not None else self)
|
||||||
item.setData(0, C.Qt.ItemDataRole.UserRole, mid)
|
item.setData(0, C.Qt.ItemDataRole.UserRole, mid)
|
||||||
self.monster_items[mid] = item
|
self.monster_items[mid] = item
|
||||||
for check_column, priority_column, signal in ((8, 9, self.feed_changed), (17, 18, self.gift_changed)):
|
for check_column, priority_column, signal in ((8, 9, self.feed_changed), (17, 18, self.gift_changed)):
|
||||||
check, priority = W.QCheckBox(), IntegerInput()
|
check, priority = CenteredCheckBox(), IntegerInput()
|
||||||
priority.setRange(1, 999)
|
priority.setRange(1, 999)
|
||||||
priority.setFixedWidth(76)
|
|
||||||
def changed(*args, check=check, priority=priority, signal=signal, mid=mid):
|
def changed(*args, check=check, priority=priority, signal=signal, mid=mid):
|
||||||
signal.emit(str(mid), check.isChecked(), priority.value())
|
signal.emit(str(mid), check.isChecked(), priority.value())
|
||||||
check.toggled.connect(changed)
|
check.toggled.connect(changed)
|
||||||
@@ -125,7 +125,7 @@ class RanchView(W.QTreeWidget):
|
|||||||
item.setSelected(mid in selected)
|
item.setSelected(mid in selected)
|
||||||
for column, value in enumerate(values):
|
for column, value in enumerate(values):
|
||||||
if item.data(column, C.Qt.ItemDataRole.DisplayRole) != value:
|
if item.data(column, C.Qt.ItemDataRole.DisplayRole) != value:
|
||||||
item.setData(column, C.Qt.ItemDataRole.DisplayRole, value)
|
set_value(item, column, value)
|
||||||
item.setToolTip(16, str(values[16]))
|
item.setToolTip(16, str(values[16]))
|
||||||
for check_column, priority_column, targets in ((8, 9, feed_targets), (17, 18, gift_targets)):
|
for check_column, priority_column, targets in ((8, 9, feed_targets), (17, 18, gift_targets)):
|
||||||
check, priority = self.itemWidget(item, check_column), self.itemWidget(item, priority_column)
|
check, priority = self.itemWidget(item, check_column), self.itemWidget(item, priority_column)
|
||||||
@@ -135,6 +135,7 @@ class RanchView(W.QTreeWidget):
|
|||||||
priority.setEnabled(mon.get("process") == 3)
|
priority.setEnabled(mon.get("process") == 3)
|
||||||
if not priority.hasFocus():
|
if not priority.hasFocus():
|
||||||
priority.setValue(targets.get(str(mid), 100))
|
priority.setValue(targets.get(str(mid), 100))
|
||||||
|
bind_controls(self, item, {column: self.itemWidget(item, column) for column in (8, 9, 17, 18)})
|
||||||
|
|
||||||
def finish():
|
def finish():
|
||||||
self.render_signature = copy.deepcopy(signature)
|
self.render_signature = copy.deepcopy(signature)
|
||||||
|
|||||||
@@ -0,0 +1,89 @@
|
|||||||
|
"""Native table alignment and sorting for embedded rule editors."""
|
||||||
|
import re
|
||||||
|
|
||||||
|
from PySide6 import QtCore as C, QtWidgets as W
|
||||||
|
|
||||||
|
SORT_ROLE = C.Qt.ItemDataRole.UserRole + 20
|
||||||
|
|
||||||
|
|
||||||
|
def alignment(column):
|
||||||
|
return C.Qt.AlignmentFlag.AlignVCenter | (C.Qt.AlignmentFlag.AlignLeft if column < 2 else C.Qt.AlignmentFlag.AlignHCenter)
|
||||||
|
|
||||||
|
|
||||||
|
def sort_key(value):
|
||||||
|
if isinstance(value, (int, float)):
|
||||||
|
return (0, value)
|
||||||
|
parts = re.split(r"(\d+)", str(value or "").casefold())
|
||||||
|
return (1, tuple((0, int(part)) if part.isdigit() else (1, part) for part in parts))
|
||||||
|
|
||||||
|
|
||||||
|
class TableItem(W.QTableWidgetItem):
|
||||||
|
def __lt__(self, other):
|
||||||
|
def value(item):
|
||||||
|
result = item.data(SORT_ROLE)
|
||||||
|
return item.data(C.Qt.ItemDataRole.DisplayRole) if result is None else result
|
||||||
|
return sort_key(value(self)) < sort_key(value(other))
|
||||||
|
|
||||||
|
|
||||||
|
class TreeItem(W.QTreeWidgetItem):
|
||||||
|
def __lt__(self, other):
|
||||||
|
column = self.treeWidget().sortColumn()
|
||||||
|
def value(item):
|
||||||
|
result = item.data(column, SORT_ROLE)
|
||||||
|
return item.data(column, C.Qt.ItemDataRole.DisplayRole) if result is None else result
|
||||||
|
return sort_key(value(self)) < sort_key(value(other))
|
||||||
|
|
||||||
|
|
||||||
|
class CenteredCheckBox(W.QCheckBox):
|
||||||
|
def paintEvent(self, event):
|
||||||
|
painter = W.QStylePainter(self)
|
||||||
|
option = W.QStyleOptionButton()
|
||||||
|
self.initStyleOption(option)
|
||||||
|
indicator = self.style().subElementRect(W.QStyle.SubElement.SE_CheckBoxIndicator, option, self)
|
||||||
|
option.rect.setLeft((self.width() - indicator.width()) // 2)
|
||||||
|
option.rect.setWidth(indicator.width())
|
||||||
|
painter.drawControl(W.QStyle.ControlElement.CE_CheckBox, option)
|
||||||
|
|
||||||
|
def hitButton(self, position):
|
||||||
|
return self.rect().contains(position)
|
||||||
|
|
||||||
|
|
||||||
|
def set_value(item, column, value):
|
||||||
|
if isinstance(item, W.QTreeWidgetItem):
|
||||||
|
item.setData(column, C.Qt.ItemDataRole.DisplayRole, value)
|
||||||
|
item.setTextAlignment(column, alignment(column))
|
||||||
|
else:
|
||||||
|
item.setData(C.Qt.ItemDataRole.DisplayRole, value)
|
||||||
|
item.setTextAlignment(alignment(column))
|
||||||
|
|
||||||
|
|
||||||
|
def table_item(value, column):
|
||||||
|
item = TableItem()
|
||||||
|
set_value(item, column, value)
|
||||||
|
return item
|
||||||
|
|
||||||
|
|
||||||
|
def bind_controls(view, row, controls):
|
||||||
|
"""Keep a stable item reference: a control edit can move its row immediately."""
|
||||||
|
for column, control in controls.items():
|
||||||
|
item = row if isinstance(row, W.QTreeWidgetItem) else view.item(row, column)
|
||||||
|
control._sort_binding = (item, column)
|
||||||
|
if isinstance(control, W.QLineEdit):
|
||||||
|
control.setAlignment(alignment(column))
|
||||||
|
elif isinstance(control, W.QComboBox):
|
||||||
|
control.setTextAlignment(alignment(column))
|
||||||
|
if not getattr(control, "_sort_connected", False):
|
||||||
|
def update(*args, control=control):
|
||||||
|
item, column = control._sort_binding
|
||||||
|
value = (int(control.isChecked()) if isinstance(control, W.QCheckBox) else
|
||||||
|
control.currentText() if isinstance(control, W.QComboBox) else control.value())
|
||||||
|
if isinstance(item, W.QTreeWidgetItem):
|
||||||
|
item.setData(column, SORT_ROLE, value)
|
||||||
|
else:
|
||||||
|
item.setData(SORT_ROLE, value)
|
||||||
|
signal = (control.toggled if isinstance(control, W.QCheckBox) else
|
||||||
|
control.currentIndexChanged if isinstance(control, W.QComboBox) else control.valueChanged)
|
||||||
|
signal.connect(update)
|
||||||
|
control._sort_connected = True
|
||||||
|
control._update_sort = update
|
||||||
|
control._update_sort()
|
||||||
@@ -0,0 +1,185 @@
|
|||||||
|
from dataclasses import asdict
|
||||||
|
import json
|
||||||
|
import os
|
||||||
|
import unittest
|
||||||
|
|
||||||
|
os.environ.setdefault("QT_QPA_PLATFORM", "offscreen")
|
||||||
|
from PySide6 import QtCore as C, QtWidgets as W
|
||||||
|
from PySide6.QtTest import QTest
|
||||||
|
|
||||||
|
from ranch_assistant.egg_rules_gui import EggTable
|
||||||
|
from ranch_assistant.engine import demo_snapshot
|
||||||
|
from ranch_assistant.gui import Window
|
||||||
|
from ranch_assistant.inventory_gui import InventoryTable
|
||||||
|
from ranch_assistant.model import Catalog, EggRule
|
||||||
|
from ranch_assistant.presentation import monster_rows
|
||||||
|
from ranch_assistant.ranch_gui import RanchView
|
||||||
|
from ranch_assistant.tests.test_activities import scenario
|
||||||
|
from ranch_assistant.tests.test_core import workspace_temp
|
||||||
|
|
||||||
|
|
||||||
|
class RuleEditingTests(unittest.TestCase):
|
||||||
|
@classmethod
|
||||||
|
def setUpClass(cls):
|
||||||
|
cls.app = W.QApplication.instance() or W.QApplication([])
|
||||||
|
|
||||||
|
def wait(self, predicate):
|
||||||
|
for _ in range(800):
|
||||||
|
self.app.processEvents()
|
||||||
|
QTest.qWait(2)
|
||||||
|
if predicate():
|
||||||
|
return
|
||||||
|
self.fail("Qt operation did not finish")
|
||||||
|
|
||||||
|
def test_egg_controls_sort_numerically_and_edits_stay_with_their_species(self):
|
||||||
|
catalog = Catalog()
|
||||||
|
snapshot = demo_snapshot(catalog)
|
||||||
|
snapshot.raw["items"] = snapshot.eggs(catalog)[:3]
|
||||||
|
keys = [str(item["typeId"]) for item in snapshot.raw["items"]]
|
||||||
|
rules = {key: asdict(EggRule(enabled=index != 0, priority=priority, action=action))
|
||||||
|
for index, (key, priority, action) in enumerate(zip(keys, (10, 2, 1), ("sell", "keep", "feed")))}
|
||||||
|
table = EggTable(catalog)
|
||||||
|
try:
|
||||||
|
table.set_data(snapshot, rules)
|
||||||
|
self.wait(lambda: not table.row_batch.running)
|
||||||
|
table.sortItems(4, C.Qt.SortOrder.AscendingOrder)
|
||||||
|
self.assertEqual([table.cellWidget(i, 4).value() for i in range(3)], [1, 2, 10])
|
||||||
|
table.sortItems(5, C.Qt.SortOrder.AscendingOrder)
|
||||||
|
self.assertEqual([table.cellWidget(i, 5).currentText() for i in range(3)], ["保留", "喂养", "派遣"])
|
||||||
|
table.sortItems(3, C.Qt.SortOrder.DescendingOrder)
|
||||||
|
self.assertEqual([table.cellWidget(i, 3).isChecked() for i in range(3)], [True, True, False])
|
||||||
|
key = table.item(0, 0).data(C.Qt.ItemDataRole.UserRole)
|
||||||
|
table.cellWidget(0, 3).setChecked(False)
|
||||||
|
self.assertFalse(table.rules[key]["enabled"])
|
||||||
|
table.set_data(snapshot, table.rules)
|
||||||
|
self.wait(lambda: not table.row_batch.running)
|
||||||
|
for i in range(3):
|
||||||
|
self.assertEqual(table.cellWidget(i, 3).property("egg_type_id"), table.item(i, 0).data(C.Qt.ItemDataRole.UserRole))
|
||||||
|
self.assertTrue(table.item(i, 1).textAlignment() & C.Qt.AlignmentFlag.AlignHCenter)
|
||||||
|
self.assertTrue(table.item(i, 2).textAlignment() & C.Qt.AlignmentFlag.AlignHCenter)
|
||||||
|
self.assertTrue(table.cellWidget(i, 4).alignment() & C.Qt.AlignmentFlag.AlignHCenter)
|
||||||
|
finally:
|
||||||
|
table.row_batch.stop()
|
||||||
|
table.close()
|
||||||
|
|
||||||
|
def test_inventory_checkbox_and_reserve_sort_keep_item_rule_identity(self):
|
||||||
|
catalog = Catalog()
|
||||||
|
snapshot = demo_snapshot(catalog)
|
||||||
|
keys = [key for key, row in catalog.data["item_info"].items() if row.get("sellable") and catalog.item_type(key) != 5][:3]
|
||||||
|
snapshot.raw["items"] = [{"id": 2000 + i, "typeId": int(key), "num": 20} for i, key in enumerate(keys)]
|
||||||
|
rules = {key: {"enabled": i != 0, "reserve": reserve} for i, (key, reserve) in enumerate(zip(keys, (10, 2, 1)))}
|
||||||
|
table = InventoryTable(catalog)
|
||||||
|
try:
|
||||||
|
table.set_data(snapshot, rules)
|
||||||
|
self.wait(lambda: not table.row_batch.running)
|
||||||
|
table.sortItems(7, C.Qt.SortOrder.AscendingOrder)
|
||||||
|
self.assertEqual([table.cellWidget(i, 7).value() for i in range(3)], [1, 2, 10])
|
||||||
|
key = table.item(0, 0).data(C.Qt.ItemDataRole.UserRole)
|
||||||
|
table.cellWidget(0, 7).setValue(30)
|
||||||
|
self.assertEqual(table.rules[key]["reserve"], 30)
|
||||||
|
self.assertEqual([table.cellWidget(i, 7).value() for i in range(3)], [2, 10, 30])
|
||||||
|
table.sortItems(6, C.Qt.SortOrder.DescendingOrder)
|
||||||
|
self.assertEqual([table.cellWidget(i, 6).isChecked() for i in range(3)], [True, True, False])
|
||||||
|
for i in range(3):
|
||||||
|
self.assertEqual(table.cellWidget(i, 6).property("item_type"), table.item(i, 0).data(C.Qt.ItemDataRole.UserRole))
|
||||||
|
finally:
|
||||||
|
table.row_batch.stop()
|
||||||
|
table.close()
|
||||||
|
|
||||||
|
def test_monster_priority_and_checkbox_sort_in_grouped_and_flat_views(self):
|
||||||
|
catalog = Catalog()
|
||||||
|
snapshot = demo_snapshot(catalog)
|
||||||
|
template = snapshot.monsters[900]
|
||||||
|
snapshot.raw["monsters"] = [template | {"id": mid} for mid in (900, 901, 902)]
|
||||||
|
tree = RanchView(catalog)
|
||||||
|
try:
|
||||||
|
for grouped in (True, False):
|
||||||
|
tree.set_view(grouped)
|
||||||
|
tree.set_data(snapshot, monster_rows(catalog, snapshot, set()), {"900": 10, "901": 2, "902": 1}, {"901": 2})
|
||||||
|
self.wait(lambda: not tree.row_batch.running)
|
||||||
|
tree.sortByColumn(9, C.Qt.SortOrder.AscendingOrder)
|
||||||
|
self.app.processEvents()
|
||||||
|
parent = tree.group_items["room:1"] if grouped else tree.invisibleRootItem()
|
||||||
|
self.assertEqual([parent.child(i).data(0, C.Qt.ItemDataRole.UserRole) for i in range(3)], [902, 901, 900])
|
||||||
|
tree.sortByColumn(17, C.Qt.SortOrder.DescendingOrder)
|
||||||
|
self.app.processEvents()
|
||||||
|
self.assertEqual(parent.child(0).data(0, C.Qt.ItemDataRole.UserRole), 901)
|
||||||
|
self.assertTrue(tree.monster_items[901].textAlignment(2) & C.Qt.AlignmentFlag.AlignHCenter)
|
||||||
|
finally:
|
||||||
|
tree.row_batch.stop()
|
||||||
|
tree.close()
|
||||||
|
|
||||||
|
def test_sweep_checked_rows_and_limits_sort_without_reset_on_refresh(self):
|
||||||
|
with workspace_temp() as folder:
|
||||||
|
window = Window(folder)
|
||||||
|
window.timer.stop()
|
||||||
|
try:
|
||||||
|
self.wait(lambda: not window.busy)
|
||||||
|
catalog, snapshot = scenario()
|
||||||
|
window.catalog = catalog
|
||||||
|
window.engine.catalog = catalog
|
||||||
|
window.engine.snapshot = snapshot
|
||||||
|
window.render_maps()
|
||||||
|
self.wait(lambda: not window.map_render_timer.running)
|
||||||
|
first, second = window._map_items["0101"], window._map_items["0102"]
|
||||||
|
first.setCheckState(0, C.Qt.CheckState.Checked)
|
||||||
|
window.maps_tree.itemWidget(first, 8).setValue(10)
|
||||||
|
window.maps_tree.itemWidget(second, 8).setValue(2)
|
||||||
|
window.maps_tree.sortByColumn(8, C.Qt.SortOrder.AscendingOrder)
|
||||||
|
self.app.processEvents()
|
||||||
|
self.assertIs(first.parent().child(0), second)
|
||||||
|
window.maps_tree.sortByColumn(0, C.Qt.SortOrder.DescendingOrder)
|
||||||
|
window.render_maps()
|
||||||
|
self.wait(lambda: not window.map_render_timer.running)
|
||||||
|
self.assertIs(first.parent().child(0), first)
|
||||||
|
self.assertTrue(window.map_rules["0101"]["enabled"])
|
||||||
|
self.assertEqual(window.map_rules["0101"]["limit"], 10)
|
||||||
|
finally:
|
||||||
|
window.close()
|
||||||
|
|
||||||
|
def test_all_form_rules_autosave_and_restore_without_save_buttons_or_starting(self):
|
||||||
|
with workspace_temp() as folder:
|
||||||
|
window = Window(folder)
|
||||||
|
window.timer.stop()
|
||||||
|
try:
|
||||||
|
self.wait(lambda: not window.busy)
|
||||||
|
labels = [button.text() for button in window.findChildren(W.QPushButton)]
|
||||||
|
self.assertFalse(any(label in labels for label in ("保存规则", "保存设置", "保存当前配置")))
|
||||||
|
window.keep_money.setValue(4321)
|
||||||
|
window.protect_quality.setCurrentIndex(window.protect_quality.findData(6))
|
||||||
|
window.quest_money.setValue(77)
|
||||||
|
window.map_keep_ti.setValue(23)
|
||||||
|
window.gift_liked_only.setChecked(False)
|
||||||
|
self.wait(lambda: not window.auto_save_timer.isActive())
|
||||||
|
saved = json.loads((folder / "settings.json").read_text(encoding="utf-8"))
|
||||||
|
self.assertEqual(saved["policy"]["keep_money"], 4321)
|
||||||
|
self.assertEqual(saved["policy"]["protect_quality"], 6)
|
||||||
|
self.assertFalse(saved["policy"]["gift_liked_only"])
|
||||||
|
self.assertEqual(saved["quest_policy"]["max_money"], 77)
|
||||||
|
self.assertEqual(saved["sweep_policy"]["keep_stamina"], 23)
|
||||||
|
self.assertEqual(window.engine.policy.keep_money, 4321)
|
||||||
|
self.assertFalse(window.monitoring)
|
||||||
|
self.assertFalse(window.execute.isChecked())
|
||||||
|
window.reserve_eggs.setText("1001010:")
|
||||||
|
self.wait(lambda: not window.auto_save_timer.isActive())
|
||||||
|
self.assertEqual(json.loads((folder / "settings.json").read_text(encoding="utf-8")), saved)
|
||||||
|
self.assertTrue(window.engine.heartbeat_enabled)
|
||||||
|
window.reserve_eggs.setText("1001010:2")
|
||||||
|
self.wait(lambda: not window.auto_save_timer.isActive())
|
||||||
|
self.assertEqual(window.engine.policy.reserved_eggs, {"1001010": 2})
|
||||||
|
finally:
|
||||||
|
window.close()
|
||||||
|
restored = Window(folder)
|
||||||
|
restored.timer.stop()
|
||||||
|
try:
|
||||||
|
self.wait(lambda: not restored.busy)
|
||||||
|
self.assertEqual(restored.read_policy().keep_money, 4321)
|
||||||
|
self.assertEqual(restored.read_policy().protect_quality, 6)
|
||||||
|
self.assertEqual(restored.read_policy().reserved_eggs, {"1001010": 2})
|
||||||
|
self.assertFalse(restored.auto_save_timer.isActive())
|
||||||
|
finally:
|
||||||
|
restored.close()
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
unittest.main()
|
||||||
Reference in New Issue
Block a user