Skip to content

Commit 35b5974

Browse files
authored
Merge pull request #106 from SECTL/fix-bugs
Fix bugs
2 parents 1524956 + bccbc7a commit 35b5974

3 files changed

Lines changed: 496 additions & 1070 deletions

File tree

app/page_building/another_window.py

Lines changed: 42 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -363,17 +363,24 @@ def create_remaining_list_window(
363363
def setup_page():
364364
nonlocal page
365365
page_template = window.get_page("remaining_list")
366-
if page_template and hasattr(page_template, "contentWidget"):
367-
page = page_template.contentWidget
368-
if hasattr(page, "update_remaining_list"):
369-
page.update_remaining_list(
370-
class_name,
371-
group_filter,
372-
gender_filter,
373-
half_repeat,
374-
group_index,
375-
gender_index,
376-
)
366+
content_widget = (
367+
getattr(page_template, "contentWidget", None)
368+
if page_template is not None
369+
else None
370+
)
371+
if content_widget is None:
372+
QTimer.singleShot(50, setup_page)
373+
return
374+
page = content_widget
375+
if hasattr(page, "update_remaining_list"):
376+
page.update_remaining_list(
377+
class_name,
378+
group_filter,
379+
gender_filter,
380+
half_repeat,
381+
group_index,
382+
gender_index,
383+
)
377384

378385
# 使用延迟调用确保内容控件已创建
379386
QTimer.singleShot(APP_INIT_DELAY, setup_page)
@@ -406,23 +413,30 @@ def check_page():
406413
def setup_page():
407414
nonlocal page
408415
page_template = window.get_page("remaining_list")
409-
if page_template and hasattr(page_template, "contentWidget"):
410-
page = page_template.contentWidget
411-
if hasattr(page, "update_remaining_list"):
412-
page.update_remaining_list(
413-
class_name,
414-
group_filter,
415-
gender_filter,
416-
half_repeat,
417-
group_index,
418-
gender_index,
419-
)
420-
try:
421-
window.windowClosed.connect(
422-
lambda: getattr(page, "stop_loader", lambda: None)()
423-
)
424-
except Exception:
425-
pass
416+
content_widget = (
417+
getattr(page_template, "contentWidget", None)
418+
if page_template is not None
419+
else None
420+
)
421+
if content_widget is None:
422+
QTimer.singleShot(50, setup_page)
423+
return
424+
page = content_widget
425+
if hasattr(page, "update_remaining_list"):
426+
page.update_remaining_list(
427+
class_name,
428+
group_filter,
429+
gender_filter,
430+
half_repeat,
431+
group_index,
432+
gender_index,
433+
)
434+
try:
435+
window.windowClosed.connect(
436+
lambda: getattr(page, "stop_loader", lambda: None)()
437+
)
438+
except Exception:
439+
pass
426440

427441
# 使用延迟调用确保内容控件已创建
428442
QTimer.singleShot(APP_INIT_DELAY, setup_page)

0 commit comments

Comments
 (0)