Merge branch 'clh' into liuyang

mrDarker

2025-10-22 e8a27bb203fe2aff70390a5eca002d7438da9b0f

 SourceCode/Bond/BoounionPLC/TopToolbar.cpp

@@ -29,6 +29,7 @@
   DDX_Control(pDX, IDC_BUTTON_ADD, m_btnAdd);
   DDX_Control(pDX, IDC_BUTTON_DELETE, m_btnDelete);
   DDX_Control(pDX, IDC_BUTTON_SETTINGS, m_btnSettings);
   DDX_Control(pDX, IDC_BUTTON_ALARM, m_btnAlarm);	
   DDX_Control(pDX, IDC_BUTTON_OPERATOR, m_btnOperator);
}

@@ -51,6 +52,7 @@
   InitBtn(m_btnAdd, "Add_blue_32.ico", "Add_Gray_32.ico");
   InitBtn(m_btnDelete, "delete_blue_32.ico", "delete_Gray_32.ico");
   InitBtn(m_btnSettings, "Settings_High_32.ico", "Settings_Gray_32.ico");
   InitBtn(m_btnAlarm, "Alarm_o_32.ico", "Alarm_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);
@@ -123,6 +125,11 @@
   x += BTN_WIDTH;
   x += 2;

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

   x = rcClient.right - 5 - BTN_WIDTH - 20;
   pItem = GetDlgItem(IDC_BUTTON_OPERATOR);
   pItem->MoveWindow(x, y, BTN_WIDTH + 20, nBthHeight);
@@ -170,6 +177,7 @@
   case IDC_BUTTON_ADD:
   case IDC_BUTTON_DELETE:
   case IDC_BUTTON_SETTINGS:
   case IDC_BUTTON_ALARM:
      GetParent()->SendMessage(ID_MSG_TOOLBAR_BTN_CLICKED, 0, LOWORD(wParam));
      break;
   }