From 3e0ceaf4e569ea1f57a14de2f6135d1f1a50d080 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期三, 27 八月 2025 13:47:31 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/Servo/TopToolbar.cpp | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/SourceCode/Bond/Servo/TopToolbar.cpp b/SourceCode/Bond/Servo/TopToolbar.cpp
index a1d80db..4b7755e 100644
--- a/SourceCode/Bond/Servo/TopToolbar.cpp
+++ b/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,6 +30,7 @@
{
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);
@@ -54,6 +58,7 @@
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");
@@ -120,10 +125,19 @@
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);
@@ -204,6 +218,7 @@
{
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:
--
Gitblit v1.9.3