From bc782c0cb9e6fa6a5740178fd67131244a5d0450 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期三, 20 八月 2025 08:36:21 +0800
Subject: [PATCH] 1.工具条增加Jobs按钮，准备用于弹出对话框查看当前JOBS
---
SourceCode/Bond/Servo/resource.h | 0
SourceCode/Bond/Servo/TopToolbar.h | 1 +
SourceCode/Bond/Servo/Servo.rc | 0
SourceCode/Bond/Servo/TopToolbar.cpp | 8 ++++++++
SourceCode/Bond/x64/Debug/Res/ControlJob_High_32.ico | 0
SourceCode/Bond/Servo/ServoDlg.cpp | 6 +++++-
SourceCode/Bond/x64/Debug/Res/ControlJob_Gray_32.ico | 0
7 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/SourceCode/Bond/Servo/Servo.rc b/SourceCode/Bond/Servo/Servo.rc
index c1df135..3e4c1c6 100644
--- a/SourceCode/Bond/Servo/Servo.rc
+++ b/SourceCode/Bond/Servo/Servo.rc
Binary files differ
diff --git a/SourceCode/Bond/Servo/ServoDlg.cpp b/SourceCode/Bond/Servo/ServoDlg.cpp
index 14422e2..fed2ac6 100644
--- a/SourceCode/Bond/Servo/ServoDlg.cpp
+++ b/SourceCode/Bond/Servo/ServoDlg.cpp
@@ -351,7 +351,8 @@
HMENU hMenu = m_pTopToolbar->GetOperatorMenu();
ASSERT(hMenu);
::EnableMenuItem(hMenu, ID_OPEATOR_SWITCH, MF_BYCOMMAND | MF_DISABLED | MF_GRAYED);
-
+ m_pTopToolbar->GetBtn(IDC_BUTTON_JOBS)->EnableWindow(TRUE);
+
// Tab
m_pPageGraph1 = new CPageGraph1();
@@ -977,6 +978,9 @@
m_pTopToolbar->GetBtn(IDC_BUTTON_STOP)->EnableWindow(FALSE);
}
}
+ else if (id == IDC_BUTTON_JOBS) {
+ AfxMessageBox("IDC_BUTTON_CJOBS");
+ }
else if (id == IDC_BUTTON_PORT_CONFIG) {
CPortConfigurationDlg dlg;
dlg.DoModal();
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:
diff --git a/SourceCode/Bond/Servo/TopToolbar.h b/SourceCode/Bond/Servo/TopToolbar.h
index 6400443..d93c9e6 100644
--- a/SourceCode/Bond/Servo/TopToolbar.h
+++ b/SourceCode/Bond/Servo/TopToolbar.h
@@ -33,6 +33,7 @@
CBlButton m_btnRun;
CBlButton m_btnRunCt;
CBlButton m_btnStop;
+ CBlButton m_btnCJobs;
CBlButton m_btnAlarm;
CBlButton m_btnSettings;
CBlButton m_btnPortConfig;
diff --git a/SourceCode/Bond/Servo/resource.h b/SourceCode/Bond/Servo/resource.h
index 3658421..a16ac88 100644
--- a/SourceCode/Bond/Servo/resource.h
+++ b/SourceCode/Bond/Servo/resource.h
Binary files differ
diff --git a/SourceCode/Bond/x64/Debug/Res/ControlJob_Gray_32.ico b/SourceCode/Bond/x64/Debug/Res/ControlJob_Gray_32.ico
new file mode 100644
index 0000000..a4ca240
--- /dev/null
+++ b/SourceCode/Bond/x64/Debug/Res/ControlJob_Gray_32.ico
Binary files differ
diff --git a/SourceCode/Bond/x64/Debug/Res/ControlJob_High_32.ico b/SourceCode/Bond/x64/Debug/Res/ControlJob_High_32.ico
new file mode 100644
index 0000000..4787246
--- /dev/null
+++ b/SourceCode/Bond/x64/Debug/Res/ControlJob_High_32.ico
Binary files differ
--
Gitblit v1.9.3