From 829fe6c6bc33d53fda9c31fd45a37e1df87befff Mon Sep 17 00:00:00 2001 From: mrDarker <mr.darker@163.com> Date: 星期五, 30 一月 2026 11:16:24 +0800 Subject: [PATCH] Merge branch 'clh' into liuyang --- SourceCode/Bond/Servo/AlarmPopupDlg.h | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/SourceCode/Bond/Servo/AlarmPopupDlg.h b/SourceCode/Bond/Servo/AlarmPopupDlg.h index 5ca49a0..9822f18 100644 --- a/SourceCode/Bond/Servo/AlarmPopupDlg.h +++ b/SourceCode/Bond/Servo/AlarmPopupDlg.h @@ -43,11 +43,17 @@ afx_msg void OnDestroy(); afx_msg void OnBnClickedClose(); afx_msg void OnBnClickedAlarmOff(); + afx_msg void OnBnClickedPrev(); + afx_msg void OnBnClickedNext(); private: bool m_hasActive; AlarmData m_activeAlarm; + std::vector<AlarmData> m_activeAlarms; + int m_activeIndex = 0; void SetButtonBackgroundColors(bool bMute); void ShowNoAlarmControls(bool bShow); void ShowAlarmControls(bool bShow); + void UpdateNavButtons(); + void DisplayActiveAt(int idx); }; -- Gitblit v1.9.3