From e8a27bb203fe2aff70390a5eca002d7438da9b0f Mon Sep 17 00:00:00 2001 From: mrDarker <mr.darker@163.com> Date: 星期三, 22 十月 2025 14:24:34 +0800 Subject: [PATCH] Merge branch 'clh' into liuyang --- 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 4b7755e..47d5ee4 100644 --- a/SourceCode/Bond/Servo/TopToolbar.cpp +++ b/SourceCode/Bond/Servo/TopToolbar.cpp @@ -37,6 +37,7 @@ 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_CASSETTE, m_btnCassette); DDX_Control(pDX, IDC_BUTTON_ROBOT, m_btnRobot); DDX_Control(pDX, IDC_BUTTON_OPERATOR, m_btnOperator); } @@ -66,6 +67,7 @@ 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_btnCassette, "Cassette_High_32.ico", "Cassette_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); @@ -168,6 +170,11 @@ x += BTN_WIDTH; x += 2; + pItem = GetDlgItem(IDC_BUTTON_CASSETTE); + 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; @@ -225,6 +232,7 @@ case IDC_BUTTON_ALARM: case IDC_BUTTON_SETTINGS: case IDC_BUTTON_PORT_CONFIG: + case IDC_BUTTON_CASSETTE: case IDC_BUTTON_ROBOT: GetParent()->SendMessage(ID_MSG_TOOLBAR_BTN_CLICKED, 0, LOWORD(wParam)); break; -- Gitblit v1.9.3