From 0de0a72329a77fbf20bc299c542e435a6d47256b Mon Sep 17 00:00:00 2001 From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com> Date: 星期六, 21 六月 2025 17:12:01 +0800 Subject: [PATCH] Merge branch 'liuyang' into clh --- SourceCode/Bond/Servo/TopToolbar.cpp | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/SourceCode/Bond/Servo/TopToolbar.cpp b/SourceCode/Bond/Servo/TopToolbar.cpp index 32c9d8a..a601129 100644 --- a/SourceCode/Bond/Servo/TopToolbar.cpp +++ b/SourceCode/Bond/Servo/TopToolbar.cpp @@ -30,6 +30,7 @@ DDX_Control(pDX, IDC_BUTTON_STOP, m_btnStop); DDX_Control(pDX, IDC_BUTTON_ALARM, m_btnAlarm); DDX_Control(pDX, IDC_BUTTON_SETTINGS, m_btnSettings); + DDX_Control(pDX, IDC_BUTTON_PORT_CONFIG, m_btnPortConfig); DDX_Control(pDX, IDC_BUTTON_ROBOT, m_btnRobot); DDX_Control(pDX, IDC_BUTTON_OPERATOR, m_btnOperator); } @@ -55,6 +56,7 @@ InitBtn(m_btnAlarm, "Alarm_o_32.ico", "Alarm_gray_32.ico"); InitBtn(m_btnSettings, "Settings_High_32.ico", "Settings_Gray_32.ico"); InitBtn(m_btnRobot, "Robot_High_32.ico", "Robot_Gray_32.ico"); + InitBtn(m_btnPortConfig, "PortConfig_High_32.ico", "PortConfig_Gray_32.ico"); InitBtn(m_btnOperator, "Operator_High_32.ico", "Operator_Gray_32.ico"); HMENU hMenu = LoadMenu(AfxGetInstanceHandle(), MAKEINTRESOURCEA(IDR_MENU_OPEATOR)); m_btnOperator.SetMenu(hMenu); @@ -133,6 +135,11 @@ x += BTN_WIDTH; x += 2; + pItem = GetDlgItem(IDC_BUTTON_PORT_CONFIG); + pItem->MoveWindow(x, y, BTN_WIDTH, nBthHeight); + x += BTN_WIDTH; + x += 2; + pItem = GetDlgItem(IDC_BUTTON_ROBOT); pItem->MoveWindow(x, y, BTN_WIDTH, nBthHeight); x += BTN_WIDTH; @@ -186,6 +193,7 @@ case IDC_BUTTON_STOP: case IDC_BUTTON_ALARM: case IDC_BUTTON_SETTINGS: + case IDC_BUTTON_PORT_CONFIG: case IDC_BUTTON_ROBOT: GetParent()->SendMessage(ID_MSG_TOOLBAR_BTN_CLICKED, 0, LOWORD(wParam)); break; -- Gitblit v1.9.3