From a8fb417ef1fb696723c8b8d5a340e8ca2e0312ae Mon Sep 17 00:00:00 2001 From: mrDarker <mr.darker@163.com> Date: 星期六, 09 八月 2025 10:43:17 +0800 Subject: [PATCH] Merge branch 'clh' into liuyang --- SourceCode/Bond/EAPSimulator/Resource.h | 25 +++++++++++++++---------- 1 files changed, 15 insertions(+), 10 deletions(-) diff --git a/SourceCode/Bond/EAPSimulator/Resource.h b/SourceCode/Bond/EAPSimulator/Resource.h index fda0a5c..b39967c 100644 --- a/SourceCode/Bond/EAPSimulator/Resource.h +++ b/SourceCode/Bond/EAPSimulator/Resource.h @@ -22,29 +22,34 @@ #define IDC_BUTTON_DATETIME_SYNC 1006 #define IDC_BUTTON_TERMINAL_DISPLAY 1007 #define IDC_COMBO_TID 1008 -#define IDC_BUTTON_ED_EVENT_REPORT 1008 #define IDC_EDIT_TEXT 1009 -#define IDC_BUTTON_ED_ALARM_REPORT 1009 #define IDC_BUTTON_SEND 1010 -#define IDC_BUTTON_DEFINE_REPORT 1010 #define IDC_BUTTON_LINE_REPORT 1011 #define IDC_RADIO_ENABLE 1012 -#define IDC_BUTTON_LINE_REPORT2 1012 -#define IDC_BUTTON_CONFIGURE_SPOOLING 1012 #define IDC_RADIO_DISABLE 1013 #define IDC_EDIT_CEID 1014 #define IDC_LIST1 1015 -#define IDC_EDIT_CE_NAME 1015 #define IDC_LIST2 1016 -#define IDC_EDIT_CE_DESCRIPTIONS 1016 #define IDC_BUTTON_ADD_RPTID 1017 -#define IDC_EDIT_CE_RPTID 1017 #define IDC_BUTTON_DEL_REPORT 1018 #define IDC_BUTTON_ADD_VID 1019 #define IDC_BUTTON_DEL_VID 1020 #define IDC_GROUP_IDS 1021 #define IDC_EDIT_ID 1022 -#define IDC_BUTTON1 1023 +#define IDC_EDIT_CE_DESCRIPTIONS 1023 +#define IDC_BUTTON_ED_EVENT_REPORT 1025 +#define IDC_BUTTON_ED_ALARM_REPORT 1026 +#define IDC_BUTTON_DEFINE_REPORT 1027 +#define IDC_BUTTON_LINE_REPORT2 1028 +#define IDC_BUTTON_CONFIGURE_SPOOLING 1029 +#define IDC_BUTTON_PURGE_SPOOLED_DATA 1030 +#define IDC_EDIT_CE_NAME 1031 +#define IDC_BUTTON_QUERY_PPID_LIST 1032 +#define IDC_EDIT_CE_RPTID 1033 +#define IDC_BUTTON_PROCEED_WITH_CARRIER 1033 +#define IDC_BUTTON_TRANSMIT_SPOOLED_DATA 1034 +#define IDC_BUTTON_PROCEED_WITH_CARRIER2 1035 +#define IDC_BUTTON_CARRIER_RELEASE 1035 // Next default values for new objects // @@ -52,7 +57,7 @@ #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 141 #define _APS_NEXT_COMMAND_VALUE 32771 -#define _APS_NEXT_CONTROL_VALUE 1025 +#define _APS_NEXT_CONTROL_VALUE 1035 #define _APS_NEXT_SYMED_VALUE 101 #endif #endif -- Gitblit v1.9.3