Continue 1.1.0 development with inventory tabs and refresh fix
This commit is contained in:
+31
-20
@@ -283,21 +283,25 @@ class Window(ActivityPages, W.QMainWindow):
|
||||
egg_buttons.addStretch()
|
||||
egg_layout.addLayout(egg_buttons)
|
||||
egg_layout.addWidget(self.eggs)
|
||||
self.inventory = InventoryTable(self.catalog)
|
||||
self.inventory.gifts_changed.connect(self.gift_items_changed)
|
||||
self.inventory_tabs = W.QTabWidget()
|
||||
self.inventory_tabs.addTab(self.egg_page, "魔物蛋")
|
||||
item_page = W.QWidget()
|
||||
item_layout = W.QVBoxLayout(item_page)
|
||||
item_tools = W.QHBoxLayout()
|
||||
self.item_search = W.QLineEdit()
|
||||
self.item_search.setPlaceholderText("按物品名称或类型编号筛选")
|
||||
self.item_category = combo([(label, value) for value, label in ITEM_TYPES])
|
||||
item_tools.addWidget(self.item_category)
|
||||
item_tools.addWidget(self.item_search, 1)
|
||||
item_layout.addLayout(item_tools)
|
||||
item_layout.addWidget(self.inventory)
|
||||
self.inventory_tabs.addTab(item_page, "物品与装备")
|
||||
self.inventory_tables = {}
|
||||
for category, label in ITEM_TYPES:
|
||||
if category in (0, 6):
|
||||
continue
|
||||
item_page = W.QWidget()
|
||||
item_page.setProperty("inventory_category", category)
|
||||
item_layout = W.QVBoxLayout(item_page)
|
||||
search = W.QLineEdit()
|
||||
search.setPlaceholderText("按物品名称或类型编号筛选")
|
||||
inventory = InventoryTable(self.catalog)
|
||||
inventory.set_filter(category=category)
|
||||
inventory.gifts_changed.connect(self.gift_items_changed)
|
||||
search.textChanged.connect(lambda text, category=category: self.filter_inventory(category, text))
|
||||
item_layout.addWidget(search)
|
||||
item_layout.addWidget(inventory)
|
||||
self.inventory_tables[category] = inventory
|
||||
self.inventory_tabs.addTab(item_page, label)
|
||||
self.tabs.addTab(self.inventory_tabs, "背包")
|
||||
self.egg_page = self.inventory_tabs
|
||||
self.egg_rules_page = self.inventory_tabs.widget(0)
|
||||
@@ -358,8 +362,6 @@ class Window(ActivityPages, W.QMainWindow):
|
||||
self.tabs.addTab(page, self.tabs.tabText(self.tabs.indexOf(page)))
|
||||
self.monster_view.currentIndexChanged.connect(self.monster_view_changed)
|
||||
self.monster_room.currentIndexChanged.connect(self.monster_view_changed)
|
||||
self.item_search.textChanged.connect(lambda text: self.inventory.set_filter(text, self.item_category.currentData()))
|
||||
self.item_category.currentIndexChanged.connect(lambda: self.inventory.set_filter(self.item_search.text(), self.item_category.currentData()))
|
||||
self.inventory_tabs.currentChanged.connect(self.render_current_page)
|
||||
self.inventory_tabs.setCurrentIndex(0)
|
||||
self.log = W.QPlainTextEdit()
|
||||
@@ -745,6 +747,10 @@ class Window(ActivityPages, W.QMainWindow):
|
||||
self.update_workflow_status()
|
||||
self.statusBar().showMessage("孵蛋规则已保存;下一轮按新规则执行", 5000)
|
||||
|
||||
def filter_inventory(self, category, text):
|
||||
self.inventory_tables[category].set_filter(text, category)
|
||||
self.render_current_page()
|
||||
|
||||
def gift_items_changed(self, rules, key):
|
||||
self.gift_items = rules
|
||||
if rules[key]["enabled"]:
|
||||
@@ -1626,6 +1632,8 @@ class Window(ActivityPages, W.QMainWindow):
|
||||
timer.stop()
|
||||
if hasattr(self.eggs, "row_batch"):
|
||||
self.eggs.row_batch.stop()
|
||||
for inventory in self.inventory_tables.values():
|
||||
inventory.row_batch.stop()
|
||||
elif self.latest_render:
|
||||
self.render_current_page()
|
||||
|
||||
@@ -1638,10 +1646,13 @@ class Window(ActivityPages, W.QMainWindow):
|
||||
timer = getattr(self, name, None)
|
||||
if timer and page is not target:
|
||||
timer.stop()
|
||||
if page is not self.egg_page and hasattr(self.eggs, "row_batch"):
|
||||
inventory_page = self.inventory_tabs.currentWidget() if page is self.inventory_tabs else None
|
||||
active_inventory = self.inventory_tables.get(inventory_page.property("inventory_category")) if inventory_page else None
|
||||
if inventory_page is not self.egg_rules_page and hasattr(self.eggs, "row_batch"):
|
||||
self.eggs.row_batch.stop()
|
||||
if page is not self.inventory_tabs and hasattr(self.inventory, "row_batch"):
|
||||
self.inventory.row_batch.stop()
|
||||
for inventory in self.inventory_tables.values():
|
||||
if inventory is not active_inventory:
|
||||
inventory.row_batch.stop()
|
||||
try:
|
||||
if page is self.monster_page:
|
||||
self.render_rooms(snapshot)
|
||||
@@ -1649,8 +1660,8 @@ class Window(ActivityPages, W.QMainWindow):
|
||||
elif page is self.inventory_tabs:
|
||||
if self.inventory_tabs.currentWidget() is self.egg_rules_page:
|
||||
self.render_egg_rules()
|
||||
else:
|
||||
self.inventory.set_data(snapshot, self.gift_items)
|
||||
elif active_inventory is not None:
|
||||
active_inventory.set_data(snapshot, self.gift_items)
|
||||
elif page is self.egg_page:
|
||||
self.render_egg_rules()
|
||||
elif page is self.room_page:
|
||||
|
||||
Reference in New Issue
Block a user