Merge branch 'clh' into liuyang

mrDarker

2025-10-22 e8a27bb203fe2aff70390a5eca002d7438da9b0f

 SourceCode/Bond/Servo/TopToolbar.cpp

@@ -8,6 +8,9 @@
#include "Common.h"


#define SHOW_BATCH   1
#define SHOW_CT      1

// CTopToolbar 对话框

IMPLEMENT_DYNAMIC(CTopToolbar, CDialogEx)
@@ -27,10 +30,14 @@
{
   CDialogEx::DoDataExchange(pDX);
   DDX_Control(pDX, IDC_BUTTON_RUN, m_btnRun);
   DDX_Control(pDX, IDC_BUTTON_RUN_BATCH, m_btnRunBatch);
   DDX_Control(pDX, IDC_BUTTON_RUN_CT, m_btnRunCt);
   DDX_Control(pDX, IDC_BUTTON_STOP, m_btnStop);
   DDX_Control(pDX, IDC_BUTTON_JOBS, m_btnCJobs);
   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);
}
@@ -52,11 +59,15 @@
   CDialogEx::OnInitDialog();

   InitBtn(m_btnRun, "Run_High_32.ico", "Run_Gray_32.ico");
   InitBtn(m_btnRunBatch, "Run_High_32.ico", "Run_Gray_32.ico");
   InitBtn(m_btnRunCt, "RunCt_High_32.ico", "RunCt_Gray_32.ico");
   InitBtn(m_btnStop, "Stop_High_32.ico", "Stop_Gray_32.ico");
   InitBtn(m_btnAlarm, "Alarm_o_32.ico", "Alarm_gray_32.ico");
   InitBtn(m_btnCJobs, "ControlJob_High_32.ico", "ControlJob_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_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);
@@ -116,7 +127,26 @@
   x += BTN_WIDTH;
   x += 2;

#ifdef SHOW_BATCH
   pItem = GetDlgItem(IDC_BUTTON_RUN_BATCH);
   pItem->MoveWindow(x, y, BTN_WIDTH, nBthHeight);
   x += BTN_WIDTH;
   x += 2;
#endif

#ifdef SHOW_CT
   pItem = GetDlgItem(IDC_BUTTON_RUN_CT);
   pItem->MoveWindow(x, y, BTN_WIDTH, nBthHeight);
   x += BTN_WIDTH;
   x += 2;
#endif

   pItem = GetDlgItem(IDC_BUTTON_STOP);
   pItem->MoveWindow(x, y, BTN_WIDTH, nBthHeight);
   x += BTN_WIDTH;
   x += 2;

   pItem = GetDlgItem(IDC_BUTTON_JOBS);
   pItem->MoveWindow(x, y, BTN_WIDTH, nBthHeight);
   x += BTN_WIDTH;
   x += 2;
@@ -136,6 +166,11 @@
   x += 2;

   pItem = GetDlgItem(IDC_BUTTON_PORT_CONFIG);
   pItem->MoveWindow(x, y, BTN_WIDTH, nBthHeight);
   x += BTN_WIDTH;
   x += 2;

   pItem = GetDlgItem(IDC_BUTTON_CASSETTE);
   pItem->MoveWindow(x, y, BTN_WIDTH, nBthHeight);
   x += BTN_WIDTH;
   x += 2;
@@ -190,10 +225,14 @@
{
   switch (LOWORD(wParam)) {
   case IDC_BUTTON_RUN:
   case IDC_BUTTON_RUN_BATCH:
   case IDC_BUTTON_RUN_CT:
   case IDC_BUTTON_STOP:
   case IDC_BUTTON_JOBS:
   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;