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
+19 -14
View File
@@ -6,6 +6,7 @@ from .maps import stages
from .native_widgets import ComboBox, IntegerInput, RowBatch
from .presentation import map_source
from .sweeping import SweepPolicy
from .table_widgets import SORT_ROLE, TreeItem, bind_controls, set_value, table_item
def number(value, maximum=9999):
@@ -63,6 +64,8 @@ class ActivityPages:
self.maps_tree.setUniformRowHeights(False)
self.maps_tree.setEditTriggers(W.QAbstractItemView.EditTrigger.NoEditTriggers)
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)):
self.maps_tree.setColumnWidth(col, width)
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())
def activity_settings_changed(self, *args):
if self.closed:
if self.closed or self.loading_config:
return
# Stop takes effect immediately, even if the current request is in flight.
if hasattr(self, "map_enabled") and not self.map_enabled.isChecked():
self.engine.sweep_policy.enabled = False
if hasattr(self, "daily_enabled") and not self.daily_enabled.isChecked():
self.engine.daily_policy.enabled = False
if hasattr(self, "default_config"):
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)
self.settings_changed()
def map_item_changed(self, item, column):
key = item.data(0, C.Qt.ItemDataRole.UserRole)
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):
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}
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()
self.maps_tree.setSortingEnabled(False)
def apply(operation):
kind, data = operation
blocker = C.QSignalBlocker(self.maps_tree)
@@ -152,13 +154,13 @@ class ActivityPages:
first = options[0]
city = self._map_cities.get(first.city)
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.setExpanded(first_render or bool(query))
self._map_cities[first.city] = city
item = self._map_items.get(key)
if item is None:
item = W.QTreeWidgetItem(city)
item = TreeItem(city)
item.setData(0, C.Qt.ItemDataRole.UserRole, key)
difficulty = ComboBox()
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))]
for col, text in enumerate(values):
if item.text(col) != text:
item.setText(col, text)
set_value(item, col, text)
if col in (5, 6, 7):
item.setToolTip(col, text)
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()
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)
@@ -193,13 +196,13 @@ class ActivityPages:
block_limit = C.QSignalBlocker(limit)
if not limit.hasFocus():
limit.setValue(rule.get("limit", 3))
bind_controls(self.maps_tree, item, {3: difficulty, 8: limit})
def finish():
for cid, city in list(self._map_cities.items()):
if not city.childCount():
self.maps_tree.takeTopLevelItem(self.maps_tree.indexOfTopLevelItem(city))
del self._map_cities[cid]
else:
city.sortChildren(1, C.Qt.SortOrder.AscendingOrder)
self.maps_tree.setSortingEnabled(True)
self.map_render_timer.start(operations, apply, finish)
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())} 关。" +
@@ -261,12 +264,14 @@ class ActivityPages:
def render_daily(self):
rows = entries(self.catalog, self.engine.snapshot, self.engine.daily_ledger)
self.daily_table.setSortingEnabled(False)
self.daily_table.setRowCount(len(rows))
for i, row in enumerate(rows):
for j, text in enumerate((row.name, row.status, row.reward)):
item = W.QTableWidgetItem(text)
item = table_item(text, j)
item.setToolTip(text)
self.daily_table.setItem(i, j, item)
self.daily_table.setSortingEnabled(True)
def claim_daily(self):
if self.busy: