From 43c7dc211f10851480352b12bd01f3443079bb01 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期二, 26 八月 2025 09:09:21 +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 0208ece..a1d80db 100644
--- a/SourceCode/Bond/Servo/TopToolbar.cpp
+++ b/SourceCode/Bond/Servo/TopToolbar.cpp
@@ -29,6 +29,7 @@
 	DDX_Control(pDX, IDC_BUTTON_RUN, m_btnRun);
 	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);
@@ -56,6 +57,7 @@
 	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");
@@ -124,6 +126,11 @@
 	x += 2;
 
 	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;
@@ -199,6 +206,7 @@
 	case IDC_BUTTON_RUN:
 	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:

--
Gitblit v1.9.3