From 829fe6c6bc33d53fda9c31fd45a37e1df87befff Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期五, 30 一月 2026 11:16:24 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/Servo/Servo.rc | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/SourceCode/Bond/Servo/Servo.rc b/SourceCode/Bond/Servo/Servo.rc
index 98fa6fd..d24a894 100644
--- a/SourceCode/Bond/Servo/Servo.rc
+++ b/SourceCode/Bond/Servo/Servo.rc
@@ -841,10 +841,10 @@
BEGIN
PUSHBUTTON "<< 上一条",IDC_BUTTON_PREV,8,224,50,14,NOT WS_VISIBLE
PUSHBUTTON "下一条 >>",IDC_BUTTON_NEXT,62,224,50,14,NOT WS_VISIBLE
- LTEXT "警告",IDC_LABEL_TITLE,27,6,67,17,SS_CENTERIMAGE | NOT WS_VISIBLE
+ LTEXT "警告",IDC_LABEL_TITLE,27,6,212,17,SS_CENTERIMAGE | NOT WS_VISIBLE
ICON "",IDC_ICON_ALARM,29,28,20,20
ICON "",IDC_ICON_TITLE,7,8,20,20,NOT WS_VISIBLE
- LTEXT "等级：--",IDC_LABEL_LEVEL,75,26,118,18
+ LTEXT "等级：--",IDC_LABEL_LEVEL,75,26,161,18
LTEXT "警告名称",IDC_LABEL_NAME,120,45,251,24
PUSHBUTTON "",IDC_POPUP_BTN_CLOSE,354,0,24,22
CONTROL "Custom1",IDC_LINE1,"BYHorizontalLine",WS_TABSTOP,7,78,364,8
@@ -852,7 +852,7 @@
PUSHBUTTON "异常解除",IDC_BUTTON_ALARM_OFF,304,216,68,22,WS_DISABLED
CONTROL "Custom1",IDC_LINE2,"BYHorizontalLine",WS_TABSTOP,7,202,364,8
LTEXT "警告描述：",IDC_LABEL_DESCRIPTION,18,98,329,89
- LTEXT "当前没有警告", IDC_LABEL_NO_ALARM, 18, 98, 329, 89, NOT WS_VISIBLE
+ CTEXT "当前没有警告",IDC_LABEL_NO_ALARM,18,98,329,89,SS_CENTERIMAGE | NOT WS_VISIBLE
END
@@ -1633,12 +1633,17 @@
END
POPUP "测试(&T)"
BEGIN
+ MENUITEM "Test1", ID_MENU_TEST_ALARM_ON
+ MENUITEM "Test2", ID_MENU_TEST_ALARM_OFF
MENUITEM "Message &Set", ID_MENU_TEST_MESSAGE_SET
MENUITEM "Message &Clear", ID_MENU_TEST_MESSAGE_CLEAR
END
POPUP "工具(&O)"
BEGIN
MENUITEM "曲线显示端列表(&C)", ID_MENU_TOOLS_CLIENT_LIST
+ MENUITEM SEPARATOR
+ MENUITEM "空腔调机曲线模式(&E)", ID_MENU_TOOLS_CURVE_EMPTY
+ MENUITEM "生产曲线模式(&P)", ID_MENU_TOOLS_CURVE_PRODUCTION
END
POPUP "窗口(&W)"
BEGIN
--
Gitblit v1.9.3