From df685a2064abd0fef557c250dcb7bbd38f480826 Mon Sep 17 00:00:00 2001 From: Yao Chunli <56721587@qq.com> Date: 星期二, 21 六月 2022 16:37:00 +0800 Subject: [PATCH] Merge branch 'dev2' of http://3u015c326.zicp.vip:8111/r/MultiTerminal1 into dev2 --- MTerm2/resource.h | 154 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 150 insertions(+), 4 deletions(-) diff --git a/MTerm2/resource.h b/MTerm2/resource.h index 88cebdf..b62b911 100644 --- a/MTerm2/resource.h +++ b/MTerm2/resource.h @@ -8,6 +8,7 @@ #define IDD_DIALOGBAR_MDI_INFO 103 #define IDP_SOCKETS_INIT_FAILED 104 #define IDD_PROPPAGE_SYSREG1 106 +#define IDD_PROP_SYSREG1 106 #define IDR_MAINFRAME 128 #define IDR_MultiTerminal2TYPE 130 #define IDR_MTerm2TYPE 130 @@ -18,16 +19,30 @@ #define IDD_DIALOG_COMMSET1 137 #define IDD_DIALOG_INFO_DISPLAY 139 #define IDD_DIALOG_DATA_MON 142 +#define ID_NEW_FOLDER 143 #define IDD_DIALOG_COMMTEST 144 #define IDD_MTerm2CommTestView 144 +#define ID_SORT_MENU 144 +#define ID_SORTING_GROUPBYTYPE 145 +#define ID_SORTING_SORTALPHABETIC 146 #define IDD_DIALOG_STATUS_SHOW 147 +#define ID_SORTING_SORTBYTYPE 147 +#define ID_SORTING_SORTBYACCESS 148 #define IDD_DIALOG_SYSREG_SET 149 #define IDD_DIALOG_COIL_MON 151 #define IDD_DIALOG_PROGRESS 155 #define IDD_DIALOG_EVENTLOG 157 #define IDD_DIALOG_FORCE_IO 159 #define IDD_DIALOG_DATETIME 161 +#define IDI_CLASS_VIEW 163 +#define IDI_CLASS_VIEW_HC 164 +#define IDR_SORT 171 +#define IDB_SORT_24 172 +#define IDR_POPUP_SORT 173 +#define IDB_CLASS_VIEW 177 +#define IDB_CLASS_VIEW_24 178 #define IDR_TOOLBAR_NUM 310 +#define IDR_TOOLBAR_NUM_KEY 310 #define IDD_MTerm2TestView 311 #define IDD_MTerm2CtrlView 312 #define IDD_MTerm2DataView 313 @@ -35,16 +50,32 @@ #define IDW_TOOL_BAR2 315 #define IDD_DIALOG1 316 #define IDW_TOOL_BAR_EDIT 316 +#define ID_VIEW_NAVVIEW 317 +#define IDW_TOOL_BAR_FUNC_KEY 318 #define IDD_DIALOG_SET_COIL 320 #define IDD_DIALOG_SET_DATA 321 #define IDR_MENU1 324 #define IDD_DIALOG_IO_COMMENT 325 #define IDR_TOOLBAR_EDIT 327 +#define IDR_TOOLBAR_EDIT_KEY 327 #define IDR_TOOLBAR_INPUT_SHOW 329 #define IDR_TOOLBAR_COMMENT 332 #define IDR_TOOLBAR_INFO_SHOW 334 +#define IDB_NAV_VIEW1 336 #define IDD_FORM_LOG 337 #define IDD_DIALOG_LOG 339 +#define IDD_PROP_INPUT_CFG 340 +#define IDD_PROP_OUTPUT_SET 341 +#define IDD_PROP_COMM_CFG 342 +#define IDD_PROP_MEM_CFG 343 +#define IDD_PROP_COMM_CFG1 344 +#define IDD_PROP_MODE_CFG1 344 +#define IDD_DIALOG_FACT_CFG 345 +#define IDD_DIALOGBAR_FUNC_KEYS 349 +#define IDD_DIALOGBAR2 350 +#define IDR_TOOLBAR_FUNC_KEY2 351 +#define IDD_DIALOGBAR 351 +#define IDD_DIALOGBAR_INPUT_SHOW 351 #define IDC_EDIT1 1000 #define IDC_BUTTON1 1001 #define IDC_BUTTON_LOAD 1001 @@ -77,55 +108,138 @@ #define IDC_STATIC_STAT_XY 1015 #define IDC_EDIT_IO_COMMENT 1015 #define IDC_STATIC_DRAW_XY 1016 +#define IDC_COMBO_INPUT_FILTER_1 1016 #define IDC_COMBO_MADDR 1017 +#define IDC_COMBO_OUTPUT_SET_1 1017 #define IDC_COMBO_CMD 1018 +#define IDC_STATIC_INPUT_NAME_1 1018 #define IDC_COMBO_CMD_TYPE 1019 +#define IDC_STATIC_INPUT_NAME_2 1019 +#define IDC_CHECK1 1019 #define IDC_COMBO_DADDR 1020 +#define IDC_COMBO_INPUT_FILTER_2 1020 +#define IDC_EDIT3 1020 #define IDC_COMBO_DCOUNT 1021 +#define IDC_STATIC_INPUT_NAME_3 1021 +#define IDC_EDIT4 1021 #define IDC_BUTTON_DO 1022 +#define IDC_COMBO_INPUT_FILTER_3 1022 +#define IDC_EDIT5 1022 #define IDC_EDIT_DATA1 1023 +#define IDC_STATIC_INPUT_NAME_4 1023 +#define IDC_EDIT6 1023 #define IDC_EDIT_DATA2 1024 +#define IDC_COMBO_INPUT_FILTER_4 1024 +#define IDC_EDIT7 1024 #define IDC_BUTTON_START_BULK_TEST 1025 +#define IDC_STATIC_INPUT_NAME_5 1025 +#define IDC_CHECK_AUTO_INC 1025 #define IDC_BUTTON_STOP_BULK_TEST 1026 +#define IDC_COMBO_INPUT_FILTER_5 1026 #define IDC_STATIC_SPEED 1027 +#define IDC_STATIC_INPUT_NAME_6 1027 #define IDC_CHECK_EXT_DATA 1028 +#define IDC_COMBO_INPUT_FILTER_6 1028 +#define IDC_DATETIMEPICKER1 1028 #define IDC_COMBO_EXT_TYPE 1029 +#define IDC_STATIC_INPUT_NAME_7 1029 +#define IDC_BUTTON_DISCONN 1029 #define IDC_COMBO_EXT_DST 1030 +#define IDC_COMBO_INPUT_FILTER_7 1030 +#define IDC_EDIT_KLINK_VER 1030 #define IDC_COMBO_EXT_DATA_LEN 1031 +#define IDC_STATIC_INPUT_NAME_8 1031 +#define IDC_CHECK_AUTO_WRITE 1031 #define IDC_EDIT_EXT_DATA1 1032 +#define IDC_COMBO_INPUT_FILTER_8 1032 +#define IDC_EDIT11 1032 #define IDC_EDIT_EXT_DATA2 1033 +#define IDC_STATIC_OUTPUT_NAME_1 1033 +#define IDC_EDIT12 1033 #define IDC_STATIC_MON 1034 +#define IDC_COMBO_OUTPUT_SET_2 1034 +#define IDC_BUTTON6 1034 #define IDC_STATIC_MON2 1035 +#define IDC_STATIC_OUTPUT_NAME_2 1035 +#define IDC_EDIT13 1035 #define IDC_TREE1 1036 +#define IDC_COMBO_OUTPUT_SET_3 1036 +#define IDC_EDIT1_FUNCTIONS 1036 #define IDC_EDIT_MON 1037 +#define IDC_STATIC_OUTPUT_NAME_3 1037 +#define IDC_BUTTON7 1037 #define IDC_EDIT_MON2 1038 +#define IDC_COMBO_OUTPUT_SET_4 1038 +#define IDC_BUTTON8 1038 +#define IDC_STATIC_OUTPUT_NAME_4 1039 +#define IDC_BUTTON_WRITEDATA 1039 #define IDC_BUTTON2 1040 +#define IDC_COMBO_OUTPUT_SET_5 1040 +#define IDC_CHECK_AUTO_CONN 1040 #define IDC_COMBO_NETWORK_TYPE 1041 +#define IDC_STATIC_OUTPUT_NAME_5 1041 +#define IDC_BUTTON_CONN 1041 #define IDC_COMBO_PORT 1042 +#define IDC_COMBO_OUTPUT_SET_6 1042 +#define IDC_EDIT_DEVICE_TYPE 1042 #define IDC_COMBO_BAUD 1043 +#define IDC_STATIC_OUTPUT_NAME_6 1043 +#define IDC_EDIT_DEVICE_UID 1043 #define IDC_COMBO_COMM_TIMEOUT 1044 +#define IDC_COMBO_OUTPUT_SET_7 1044 +#define IDC_EDIT_FIRM_VER 1044 #define IDC_RADIO_DATA_LENGTH_7B 1045 +#define IDC_STATIC_OUTPUT_NAME_7 1045 +#define IDC_EDIT_LOT_NO 1045 #define IDC_RADIO_DATA_LENGTH_8B 1046 +#define IDC_COMBO_OUTPUT_SET_8 1046 +#define IDC_EDIT_FACT_SN 1046 #define IDC_RADIO_STOP_1B 1047 +#define IDC_STATIC_OUTPUT_NAME_8 1047 +#define IDC_STATIC_CONN_STAT 1047 #define IDC_RADIO_STOP_2B 1048 +#define IDC_EDIT15 1048 #define IDC_RADIO_PARITY_NONE 1049 +#define IDC_CHECK2 1049 #define IDC_RADIO_PARITY_ODD 1050 +#define IDC_CHECK3 1050 #define IDC_RADIO_PARITY_EVEN 1051 +#define IDC_BUTTON9 1051 #define IDC_RADIO_PARITY_0 1052 +#define IDC_BUTTON_READDATA 1052 #define IDC_CHECK_AUTO_BAUD 1053 +#define IDC_STATIC_PROC_STAT 1053 #define IDC_CHECK_AUTO_DATA_LENGTH 1054 +#define IDC_EDIT_ORG_LOT_NO 1054 #define IDC_CHECK_AUTO_PARITY 1055 +#define IDC_EDIT_ORG_FACT_SN 1055 +#define IDC_EDIT_CAP 1056 #define IDC_LIST1 1057 +#define IDC_LIST_SEL1 1057 +#define IDC_EDIT_ORG_FAC_DATE 1057 +#define IDC_BUTTON31 1057 #define IDC_BUTTON3 1058 #define IDC_LIST_STATUS1 1059 +#define IDC_EDIT31 1059 #define IDC_COMBO1 1060 +#define IDC_EDIT8 1060 +#define IDC_EDIT32 1060 #define IDC_COMBO2 1061 +#define IDC_EDIT_INPUT 1061 #define IDC_COMBO3 1062 +#define IDC_BUTTON5 1062 #define IDC_RADIO1 1063 +#define IDC_BUTTON_CLEAR 1063 #define IDC_RADIO2 1064 +#define IDC_BUTTON_ADD 1064 #define IDC_RADIO3 1065 +#define IDC_EDIT_VIEW 1065 #define IDC_STATIC_PROP 1066 +#define IDC_BUTTON_BACKSPACE 1066 #define IDC_SCROLLBAR1 1067 +#define IDC_BUTTON_0 1067 +#define IDC_BUTTON_EQ 1068 +#define IDC_BUTTON1_DOT 1069 #define IDC_EDIT_DAY 1070 #define IDC_RADIO4 1070 #define IDC_EDIT_HOUR 1071 @@ -172,23 +286,40 @@ #define IDC_RICHEDIT2_LOG 1717 #define IDC_EDIT_LOG1 1719 #define ID_BUTTON32771 32771 +#define ID_BUTTON_0 32771 #define ID_BUTTON32772 32772 +#define ID_BUTTON_1 32772 #define ID_BUTTON32773 32773 +#define ID_BUTTON_2 32773 #define ID_BUTTON32774 32774 +#define ID_BUTTON_3 32774 #define ID_BUTTON32775 32775 +#define ID_BUTTON_4 32775 #define ID_BUTTON32776 32776 +#define ID_BUTTON_5 32776 #define ID_BUTTON32777 32777 +#define ID_BUTTON_6 32777 #define ID_BUTTON32778 32778 +#define ID_BUTTON_7 32778 #define ID_BUTTON32779 32779 +#define ID_BUTTON_8 32779 #define ID_BUTTON32780 32780 #define ID_BUTTON32781 32781 +#define ID_BUTTON_A 32781 #define ID_BUTTON32782 32782 +#define ID_BUTTON_B 32782 #define ID_BUTTON32783 32783 +#define ID_BUTTON_C 32783 #define ID_BUTTON32784 32784 +#define ID_BUTTON_D 32784 #define ID_BUTTON32785 32785 +#define ID_BUTTON_E 32785 #define ID_BUTTON32786 32786 +#define ID_BUTTON_F 32786 #define ID_BUTTON32787 32787 +#define ID_BUTTON_MINUS 32787 #define ID_BUTTON32788 32788 +#define ID_BUTTON_DOT 32788 #define ID_RECT_SELECT 32791 #define ID_BUTTON32793 32793 #define ID_BUTTON32795 32795 @@ -376,9 +507,13 @@ #define ID_INPUT_IO_COMMENT 33049 #define ID_BUTTON33052 33052 #define ID_BUTTON33053 33053 +#define ID_BUTTON_RET 33053 #define ID_BUTTON33054 33054 +#define ID_BUTTON_INSERT 33054 #define ID_BUTTON33055 33055 +#define ID_BUTTON_DELETE 33055 #define ID_BUTTON33056 33056 +#define ID_BUTTON_ESC 33056 #define ID_BUTTON_INPUT_SHOW 33057 #define ID_BUTTON33058 33058 #define ID_BUTTON33059 33059 @@ -399,6 +534,17 @@ #define ID_MENU_DATA_MON 33076 #define ID_MENU_COIL_MON 33077 #define ID_MENU_PLC_INFO_SHOW 33078 +#define ID_33079 33079 +#define ID_MENU_FACT_CFG 33080 +#define ID_DATETIME_SET 33081 +#define ID_MENU_DATETIME_SET 33082 +#define ID_MENU_EVENT_LOG 33083 +#define ID_BUTTON_9 33084 +#define ID_BUTTON33085 33085 +#define ID_BUTTON33086 33086 +#define ID_33088 33088 +#define ID_MENU_SHOW_DEV 33089 +#define IDS_STRING101 33101 #define ID_INDICATOR_SEL_TYPE 59135 #define ID_INDICATOR_MACHINE_TYPE 59142 #define ID_INDICATOR_PROGRAM_POS 59143 @@ -412,9 +558,9 @@ // #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 336 -#define _APS_NEXT_COMMAND_VALUE 33079 -#define _APS_NEXT_CONTROL_VALUE 1016 -#define _APS_NEXT_SYMED_VALUE 317 +#define _APS_NEXT_RESOURCE_VALUE 356 +#define _APS_NEXT_COMMAND_VALUE 33091 +#define _APS_NEXT_CONTROL_VALUE 1070 +#define _APS_NEXT_SYMED_VALUE 319 #endif #endif -- Gitblit v1.9.1