From 6fa60de2b0d0237054aa7571191df0f291838031 Mon Sep 17 00:00:00 2001
From: QuakeGod <quakegod@sina.com>
Date: 星期五, 20 十月 2023 22:27:53 +0800
Subject: [PATCH] fix conflict
---
MTerm1/Resource.h | 796 ++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 705 insertions(+), 91 deletions(-)
diff --git a/MTerm1/Resource.h b/MTerm1/Resource.h
index f57e86c..2c29b08 100644
--- a/MTerm1/Resource.h
+++ b/MTerm1/Resource.h
@@ -1,97 +1,711 @@
-锘�//{{NO_DEPENDENCIES}}
-// 鐢熸垚鐨� Microsoft Visual C++ 鍖呭惈鏂囦欢銆�
-// 鐢� MTerm1.rc 浣跨敤
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ 生成的包含文件。
+// 供 MTerm1.rc 使用
//
-#define IDD_ABOUTBOX 100
-#define IDP_OLE_INIT_FAILED 100
-#define IDR_POPUP_EDIT 119
-#define ID_STATUSBAR_PANE1 120
-#define ID_STATUSBAR_PANE2 121
-#define IDS_STATUS_PANE1 122
-#define IDS_STATUS_PANE2 123
-#define IDS_TOOLBAR_STANDARD 124
-#define IDS_TOOLBAR_CUSTOMIZE 125
-#define ID_VIEW_CUSTOMIZE 126
-#define IDR_MAINFRAME 128
-#define IDR_MAINFRAME_256 129
-#define IDR_MTerm1TYPE 130
-#define ID_WINDOW_MANAGER 131
-#define ID_VIEW_FILEVIEW 133
-#define ID_VIEW_CLASSVIEW 134
-#define ID_PROPERTIES 135
-#define ID_OPEN 136
-#define ID_OPEN_WITH 137
-#define ID_DUMMY_COMPILE 138
-#define ID_CLASS_ADD_MEMBER_FUNCTION 139
-#define ID_CLASS_ADD_MEMBER_VARIABLE 140
-#define ID_CLASS_DEFINITION 141
-#define ID_CLASS_PROPERTIES 142
-#define ID_NEW_FOLDER 143
-#define ID_SORT_MENU 144
-#define ID_SORTING_GROUPBYTYPE 145
-#define ID_SORTING_SORTALPHABETIC 146
-#define ID_SORTING_SORTBYTYPE 147
-#define ID_SORTING_SORTBYACCESS 148
-#define ID_VIEW_OUTPUTWND 149
-#define ID_VIEW_PROPERTIESWND 150
-#define ID_SORTPROPERTIES 151
-#define ID_PROPERTIES1 152
-#define ID_PROPERTIES2 153
-#define ID_EXPAND_ALL 154
-#define IDS_FILE_VIEW 155
-#define IDS_CLASS_VIEW 156
-#define IDS_OUTPUT_WND 157
-#define IDS_PROPERTIES_WND 158
-#define IDI_FILE_VIEW 161
-#define IDI_FILE_VIEW_HC 162
-#define IDI_CLASS_VIEW 163
-#define IDI_CLASS_VIEW_HC 164
-#define IDI_OUTPUT_WND 165
-#define IDI_OUTPUT_WND_HC 166
-#define IDI_PROPERTIES_WND 167
-#define IDI_PROPERTIES_WND_HC 168
-#define IDR_EXPLORER 169
-#define IDB_EXPLORER_24 170
-#define IDR_SORT 171
-#define IDB_SORT_24 172
-#define IDR_POPUP_SORT 173
-#define IDR_POPUP_EXPLORER 174
-#define IDB_FILE_VIEW 175
-#define IDB_FILE_VIEW_24 176
-#define IDB_CLASS_VIEW 177
-#define IDB_CLASS_VIEW_24 178
-#define IDR_MENU_IMAGES 179
-#define IDB_MENU_IMAGES_24 180
-#define ID_TOOLS_MACRO 181
-#define IDR_OUTPUT_POPUP 182
-#define IDR_PROPERTIES 183
-#define IDB_PROPERTIES_HC 184
-#define IDR_THEME_MENU 200
-#define ID_SET_STYLE 201
-#define ID_VIEW_APPLOOK_WIN_2000 205
-#define ID_VIEW_APPLOOK_OFF_XP 206
-#define ID_VIEW_APPLOOK_WIN_XP 207
-#define ID_VIEW_APPLOOK_OFF_2003 208
-#define ID_VIEW_APPLOOK_VS_2005 209
-#define ID_VIEW_APPLOOK_VS_2008 210
-#define ID_VIEW_APPLOOK_OFF_2007_BLUE 215
-#define ID_VIEW_APPLOOK_OFF_2007_BLACK 216
-#define ID_VIEW_APPLOOK_OFF_2007_SILVER 217
-#define ID_VIEW_APPLOOK_OFF_2007_AQUA 218
-#define ID_VIEW_APPLOOK_WINDOWS_7 219
-#define IDS_BUILD_TAB 300
-#define IDS_DEBUG_TAB 301
-#define IDS_FIND_TAB 302
-#define IDS_EXPLORER 305
-#define IDS_EDIT_MENU 306
+#define IDD_ABOUTBOX 100
+#define IDP_OLE_INIT_FAILED 100
+#define IDD_MTerm1CommDevView2 101
+#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_MTerm1TYPE 130
+#define ID_WINDOW_MANAGER 131
+#define IDR_MTerm1TYPE1 131
+#define IDR_MTerm1TYPE2 132
+#define IDR_MTerm1TYPE3 133
+#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_MTerm1CommTestView 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_MTerm1TestView 311
+#define IDD_MTerm1CtrlView 312
+#define IDD_MTerm1DataView 313
+#define IDW_CHILD_STATUS_BAR 314
+#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 IDD_PROP_OUTPUT_MAPPING 352
+#define IDD_FORM_INPUTSHOW 353
+#define IDC_EDIT1 1000
+#define IDC_BUTTON1 1001
+#define IDC_BUTTON_LOAD 1001
+#define IDC_EDIT2 1002
+#define IDC_STATIC_STATUS_CON 1002
+#define IDC_COMBO_RES 1003
+#define IDC_BUTTON_SAVE 1003
+#define IDC_EDIT_CAP_DOUT 1003
+#define IDC_COMBOBOXEX1 1004
+#define IDC_BUTTON_CONVERT 1004
+#define IDC_EDIT_CAP_AIN_I 1004
+#define IDC_EDIT_DISPLAY 1005
+#define IDC_BUTTON4 1005
+#define IDC_COMBO_INPUT 1006
+#define IDC_BUTTON_TRNS_TOTXT 1006
+#define IDC_EDIT_CAP_AOUT_I 1006
+#define IDC_BUTTON_SEND 1007
+#define IDC_BUTTON_TRNS_PRG 1007
+#define IDC_EDIT_CAP_AIN_E 1007
+#define IDC_BUTTON_CLRSCR 1008
+#define IDC_RADIO_SET_ON 1008
+#define IDC_EDIT_CAP_AOUT_E 1008
+#define IDC_BUTTON_START 1009
+#define IDC_RADIO_SET_OFF 1009
+#define IDC_EDIT_CAP_HIN 1009
+#define IDC_COMBO_COMPORT 1010
+#define IDC_STATIC_INFO2 1010
+#define IDC_EDIT_CAP_HOUT 1010
+#define IDC_CHECK_AUTO_START 1011
+#define IDC_EDIT_VALUE 1011
+#define IDC_EDIT_CAP_IRQ_I 1011
+#define IDC_COMBO_COM_BAUD 1012
+#define IDC_STATIC_IO_NAME 1012
+#define IDC_EDIT_CAP_IRQ_O 1012
+#define IDC_BUTTON_STOP 1013
+#define IDC_STATIC_CAPACITY 1013
+#define IDC_EDIT_CAP_EXT_I 1013
+#define IDC_EDIT_REF1 1014
+#define IDC_STATIC_LEFT 1014
+#define IDC_EDIT_CAP_EXT_O 1014
+#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_CAP_DT 1032
+#define IDC_EDIT_EXT_DATA2 1033
+#define IDC_STATIC_OUTPUT_NAME_1 1033
+#define IDC_EDIT12 1033
+#define IDC_EDIT_CAP_WR 1033
+#define IDC_STATIC_INPUT_NAME_9 1033
+#define IDC_STATIC_MON 1034
+#define IDC_COMBO_OUTPUT_SET_2 1034
+#define IDC_BUTTON6 1034
+#define IDC_COMBO_INPUT_FILTER_9 1034
+#define IDC_STATIC_MON2 1035
+#define IDC_STATIC_OUTPUT_NAME_2 1035
+#define IDC_EDIT13 1035
+#define IDC_EDIT_CAP_TM 1035
+#define IDC_STATIC_INPUT_NAME_10 1035
+#define IDC_TREE1 1036
+#define IDC_COMBO_OUTPUT_SET_3 1036
+#define IDC_EDIT1_FUNCTIONS 1036
+#define IDC_EDIT_FUNCTIONS 1036
+#define IDC_COMBO_INPUT_FILTER_10 1036
+#define IDC_EDIT_MON 1037
+#define IDC_STATIC_OUTPUT_NAME_3 1037
+#define IDC_BUTTON7 1037
+#define IDC_STATIC_INPUT_NAME_11 1037
+#define IDC_EDIT_MON2 1038
+#define IDC_COMBO_OUTPUT_SET_4 1038
+#define IDC_BUTTON8 1038
+#define IDC_COMBO_INPUT_FILTER_11 1038
+#define IDC_STATIC_OUTPUT_NAME_4 1039
+#define IDC_BUTTON_WRITEDATA 1039
+#define IDC_BUTTON_READ_FROM_PLC 1039
+#define IDC_STATIC_INPUT_NAME_12 1039
+#define IDC_EDIT_MON3 1039
+#define IDC_BUTTON2 1040
+#define IDC_COMBO_OUTPUT_SET_5 1040
+#define IDC_CHECK_AUTO_CONN 1040
+#define IDC_COMBO_INPUT_FILTER_12 1040
+#define IDC_COMBO_NETWORK_TYPE 1041
+#define IDC_STATIC_OUTPUT_NAME_5 1041
+#define IDC_BUTTON_CONN 1041
+#define IDC_BUTTON_WRITE_TO_PLC 1041
+#define IDC_STATIC_INPUT_NAME_13 1041
+#define IDC_EDIT_MON4 1041
+#define IDC_COMBO_PORT 1042
+#define IDC_COMBO_OUTPUT_SET_6 1042
+#define IDC_EDIT_DEVICE_TYPE 1042
+#define IDC_BUTTON_READ_FROM_PLC2 1042
+#define IDC_COMBO_INPUT_FILTER_13 1042
+#define IDC_COMBO_BAUD 1043
+#define IDC_STATIC_OUTPUT_NAME_6 1043
+#define IDC_EDIT_DEVICE_UID 1043
+#define IDC_STATIC_INPUT_NAME_14 1043
+#define IDC_COMBO_COMM_TIMEOUT 1044
+#define IDC_COMBO_OUTPUT_SET_7 1044
+#define IDC_EDIT_FIRM_VER 1044
+#define IDC_COMBO_INPUT_FILTER_14 1044
+#define IDC_RADIO_DATA_LENGTH_7B 1045
+#define IDC_STATIC_OUTPUT_NAME_7 1045
+#define IDC_EDIT_LOT_NO 1045
+#define IDC_STATIC_INPUT_NAME_15 1045
+#define IDC_RADIO_DATA_LENGTH_8B 1046
+#define IDC_COMBO_OUTPUT_SET_8 1046
+#define IDC_EDIT_FACT_SN 1046
+#define IDC_COMBO_INPUT_FILTER_15 1046
+#define IDC_RADIO_STOP_1B 1047
+#define IDC_STATIC_OUTPUT_NAME_8 1047
+#define IDC_STATIC_CONN_STAT 1047
+#define IDC_STATIC_INPUT_NAME_16 1047
+#define IDC_RADIO_STOP_2B 1048
+#define IDC_EDIT15 1048
+#define IDC_COMBO_INPUT_FILTER_16 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_EDIT_CAP_PROG 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_EDIT_CAP_COM 1059
+#define IDC_COMBO1 1060
+#define IDC_EDIT8 1060
+#define IDC_EDIT32 1060
+#define IDC_EDIT_KBUS_VER 1060
+#define IDC_COMBO2 1061
+#define IDC_EDIT_INPUT 1061
+#define IDC_EDIT_KNET_VER 1061
+#define IDC_COMBO3 1062
+#define IDC_BUTTON5 1062
+#define IDC_RADIO1 1063
+#define IDC_BUTTON_CLEAR 1063
+#define IDC_COMBO_BYTE_SIZE 1063
+#define IDC_RADIO2 1064
+#define IDC_BUTTON_ADD 1064
+#define IDC_COMBO_PARITY 1064
+#define IDC_RADIO3 1065
+#define IDC_EDIT_VIEW 1065
+#define IDC_COMBO_STOP_BIT 1065
+#define IDC_STATIC_PROP 1066
+#define IDC_BUTTON_BACKSPACE 1066
+#define IDC_COMBO_EOF_CHAR 1066
+#define IDC_SCROLLBAR1 1067
+#define IDC_BUTTON_0 1067
+#define IDC_COMBO_SOF_CHAR 1067
+#define IDC_BUTTON_EQ 1068
+#define IDC_COMBO_END_TYPE 1068
+#define IDC_BUTTON1_DOT 1069
+#define IDC_COMBO_BAUDRATE 1069
+#define IDC_EDIT_DAY 1070
+#define IDC_RADIO4 1070
+#define IDC_EDIT_LOG 1070
+#define IDC_EDIT_CAP_EVENT 1070
+#define IDC_EDIT_HOUR 1071
+#define IDC_RADIO5 1071
+#define IDC_EDIT_CAP_CFG 1071
+#define IDC_EDIT_MINUTE 1072
+#define IDC_RADIO6 1072
+#define IDC_EDIT_DEVICE_NAME 1072
+#define IDC_EDIT_SECOND 1073
+#define IDC_RADIO7 1073
+#define IDC_EDIT_CAP_DIN 1073
+#define IDC_RADIO8 1074
+#define IDC_EDIT_KWL_VER 1074
+#define IDC_BUTTON_CLEAR_STATISTICS 1074
+#define IDC_RADIO9 1075
+#define IDC_EDIT_CAP_SW 1075
+#define IDC_EDIT_BUF_ADDR 1075
+#define IDC_RADIO10 1076
+#define IDC_EDIT_BUF_SIZE 1076
+#define IDC_RADIO11 1077
+#define IDC_COMBO_WORKMODE 1077
+#define IDC_BUTTON_CLEAR_STAT 1078
+#define IDC_COMBO_STATION 1078
+#define IDC_PROGRESS1 1079
+#define IDC_EDIT_END_TIME 1079
+#define IDC_BUTTON_READ 1080
+#define IDC_STATIC_PIN_NAME_1 1080
+#define IDC_STATIC_HINT 1081
+#define IDC_COMBO_FROM_COIL_TYPE_1 1081
+#define IDC_BUTTON_CONNECT 1082
+#define IDC_COMBO_FROM_COIL_ADDR_1 1082
+#define IDC_LIST_EVENTLOG 1083
+#define IDC_BUTTON_DISCONNECT 1083
+#define IDC_COMBO_FROM_COIL_TYPE_2 1083
+#define IDC_COMBO4 1083
+#define IDC_EDIT_EVENT_COUNT 1084
+#define IDC_COMBO_FROM_COIL_ADDR_2 1084
+#define IDC_COMBO5 1084
+#define IDC_BUTTON_CLEAR_EVENTLOG 1085
+#define IDC_STATIC_PIN_NAME_2 1085
+#define IDC_COMBO6 1085
+#define IDC_BUTTON_RELOAD 1086
+#define IDC_COMBO_FROM_COIL_TYPE_3 1086
+#define IDC_LIST_FORCE_IO 1087
+#define IDC_COMBO_FROM_COIL_ADDR_3 1087
+#define IDC_BUTTON_FREE 1088
+#define IDC_STATIC_PIN_NAME_3 1088
+#define IDC_BUTTON_RELEASE 1089
+#define IDC_COMBO_FROM_COIL_TYPE_4 1089
+#define IDC_BUTTON_EP_ADD 1090
+#define IDC_COMBO_FROM_COIL_ADDR_4 1090
+#define IDC_BUTTON_DELETE 1091
+#define IDC_STATIC_PIN_NAME_4 1091
+#define IDC_BUTTON_HELP 1092
+#define IDC_COMBO_FROM_COIL_TYPE_5 1092
+#define IDC_BUTTON_CLOSE 1093
+#define IDC_COMBO_FROM_COIL_ADDR_5 1093
+#define IDC_BUTTON_ON 1094
+#define IDC_STATIC_PIN_NAME_5 1094
+#define IDC_BUTTON_OFF 1095
+#define IDC_COMBO_FROM_COIL_TYPE_6 1095
+#define IDC_STATIC_INFO 1096
+#define IDC_COMBO_FROM_COIL_ADDR_6 1096
+#define IDC_CHECK_SYSTIME 1097
+#define IDC_STATIC_PIN_NAME_6 1097
+#define IDC_BUTTON_SUBMIT 1098
+#define IDC_COMBO_FROM_COIL_TYPE_7 1098
+#define IDC_EDIT_YEAR 1099
+#define IDC_COMBO_FROM_COIL_ADDR_7 1099
+#define IDC_EDIT_MONTH 1100
+#define IDC_STATIC_PIN_NAME_7 1100
+#define IDC_STATIC_CONNECT 1101
+#define IDC_COMBO_FROM_COIL_TYPE_8 1101
+#define IDC_BUTTON11 1102
+#define IDC_COMBO_FROM_COIL_ADDR_8 1102
+#define IDC_BUTTON12 1103
+#define IDC_STATIC_PIN_NAME_8 1103
+#define IDC_BUTTON13 1104
+#define IDC_COMBO_FROM_COIL_BIT_1 1104
+#define IDC_COMBO_FROM_COIL_BIT_2 1105
+#define IDC_COMBO_FROM_COIL_BIT_3 1106
+#define IDC_COMBO_FROM_COIL_BIT_4 1107
+#define IDC_COMBO_FROM_COIL_BIT_5 1108
+#define IDC_COMBO_FROM_COIL_BIT_6 1109
+#define IDC_COMBO_FROM_COIL_BIT_7 1110
+#define IDC_COMBO_FROM_COIL_BIT_8 1111
+#define IDC_CHECK_PAUSE 1157
+#define IDC_CHECK_NOSCROLL 1158
+#define IDC_CHECK_PAUSEUPDATE 1161
+#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
+#define ID_BUTTON32797 32797
+#define ID_BUTTON32798 32798
+#define ID_BUTTON32799 32799
+#define ID_BUTTON32800 32800
+#define ID_BUTTON32801 32801
+#define ID_BUTTON32802 32802
+#define ID_BUTTON32803 32803
+#define ID_BTN_OFFLINE 32805
+#define ID_BTN_ONLINE 32806
+#define ID_32808 32808
+#define ID_32810 32810
+#define ID_32811 32811
+#define ID_32813 32813
+#define ID_32814 32814
+#define ID_32822 32822
+#define ID_32823 32823
+#define ID_32825 32825
+#define ID_32826 32826
+#define ID_32827 32827
+#define ID_32828 32828
+#define ID_32829 32829
+#define ID_Menu32833 32833
+#define ID_32834 32834
+#define ID_32835 32835
+#define ID_32836 32836
+#define ID_32837 32837
+#define ID_32839 32839
+#define ID_32840 32840
+#define ID_32844 32844
+#define ID_32845 32845
+#define ID_32846 32846
+#define ID_32847 32847
+#define ID_32848 32848
+#define ID_32849 32849
+#define ID_32850 32850
+#define ID_32851 32851
+#define ID_32852 32852
+#define ID_32855 32855
+#define ID_32856 32856
+#define ID_32858 32858
+#define ID_32859 32859
+#define ID_32860 32860
+#define ID_32861 32861
+#define ID_32862 32862
+#define ID_32863 32863
+#define ID_32864 32864
+#define ID_32865 32865
+#define ID_32866 32866
+#define ID_32867 32867
+#define ID_32868 32868
+#define ID_32869 32869
+#define ID_32870 32870
+#define ID_32871 32871
+#define ID_32872 32872
+#define ID_32873 32873
+#define ID_32874 32874
+#define ID_32875 32875
+#define ID_32876 32876
+#define ID_32877 32877
+#define ID_32878 32878
+#define ID_32879 32879
+#define ID_Menu32884 32884
+#define ID_32886 32886
+#define ID_32887 32887
+#define ID_32894 32894
+#define ID_32895 32895
+#define ID_32896 32896
+#define ID_32897 32897
+#define ID_32898 32898
+#define ID_32899 32899
+#define ID_32906 32906
+#define ID_32907 32907
+#define ID_32908 32908
+#define ID_32909 32909
+#define ID_32911 32911
+#define ID_32912 32912
+#define ID_32913 32913
+#define ID_32914 32914
+#define ID_32915 32915
+#define ID_32917 32917
+#define ID_32918 32918
+#define ID_32919 32919
+#define ID_32920 32920
+#define ID_32921 32921
+#define ID_32922 32922
+#define ID_32923 32923
+#define ID_32924 32924
+#define ID_32926 32926
+#define ID_32927 32927
+#define ID_32928 32928
+#define ID_32929 32929
+#define ID_32930 32930
+#define ID_32931 32931
+#define ID_32932 32932
+#define ID_32933 32933
+#define ID_32934 32934
+#define ID_32936 32936
+#define ID_32938 32938
+#define ID_32939 32939
+#define ID_32940 32940
+#define ID_32944 32944
+#define ID_32946 32946
+#define ID_32947 32947
+#define ID_32948 32948
+#define ID_32949 32949
+#define ID_IC32953 32953
+#define ID_IC32954 32954
+#define ID_IC32955 32955
+#define ID_IC32956 32956
+#define ID_IC32957 32957
+#define ID_IC32958 32958
+#define ID_IC32959 32959
+#define ID_IC32961 32961
+#define ID_IC32962 32962
+#define ID_UPLOAD_FROM_PLC 32963
+#define ID_GRAPH_DISPLAY_SET 32975
+#define ID_FUNCKEY_1SEG_DISPLAY 32976
+#define ID_COMUNICATION_SET 32977
+#define ID_ENV_SET 32978
+#define ID_ONLINE 32979
+#define ID_OFFLINE 32980
+#define ID_MONITOR 32981
+#define ID_PLC_RUN 32982
+#define ID_EXPORT 32983
+#define ID_DOWNLOAD_TO_PLC 32984
+#define ID_STATION_SET 32985
+#define ID_PROG_CONVERT 32986
+#define ID_VIEW_FUNC_KEY 32987
+#define ID_VIEW_INPUT_BAR 32988
+#define ID_VIEW_NUM_BAR 32989
+#define ID_VIEW_INPUT_SEGMENT 32990
+#define ID_VIEW_COMMENTS 32991
+#define ID_VIEW_COMMENTS_BAR 32992
+#define ID_VIEW_FUNCKEY_BAR 32994
+#define ID_VIEW_NUMKEY_BAR 32995
+#define ID_VIEW_INPUTSEG_BAR 32996
+#define ID_PLC_SYSREG_SET 32998
+#define ID_32999 32999
+#define ID_TEXT_FIRST 33000
+#define ID_INSERT_BLANK_LINE 33002
+#define ID_DELETE_BLANK_LINE 33003
+#define ID_DISPLAY_COMMENTS 33004
+#define ID_MENU_VIEW_LDS 33005
+#define ID_MENU_BLD 33006
+#define ID_MENU_BNL 33007
+#define ID_MENU_SHOW_LOG 33010
+#define ID_MENU_COMM_TEST 33011
+#define ID_MENU_CONSOLE 33013
+#define ID_MENU_VIEW_BLD 33014
+#define ID_MENU_VIEW_BNL 33015
+#define ID_MENU_SHOW_CONSOLE 33016
+#define ID_MENU_PROG_CHG 33017
+#define ID_33018 33018
+#define ID_33019 33019
+#define ID_33020 33020
+#define ID_33021 33021
+#define ID_33022 33022
+#define ID_33023 33023
+#define ID_33024 33024
+#define ID_33025 33025
+#define ID_33026 33026
+#define ID_33027 33027
+#define ID_33028 33028
+#define ID_33029 33029
+#define ID_33030 33030
+#define ID_REVERT 33031
+#define ID_CUT 33032
+#define ID_COPY 33033
+#define ID_PASTE 33034
+#define ID_INSERT 33035
+#define ID_DELETE 33036
+#define ID_INSERT_LINE 33037
+#define ID_DELETE_LINE 33038
+#define ID_LINE_CONNECT 33039
+#define ID_LINE_REMOVE 33040
+#define ID_PROG_REVERT 33041
+#define ID_REVERT_CONVERT 33042
+#define ID_SELECT_ALL 33043
+#define ID_EDIT_INSERT 33044
+#define ID_PROG_CANCEL_EDIT 33045
+#define ID_INPUT_COMMENT 33048
+#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
+#define ID_BUTTON33060 33060
+#define ID_BUTTON33061 33061
+#define ID_BUTTON_INFO1 33062
+#define ID_BUTTON33063 33063
+#define ID_BUTTON33064 33064
+#define ID_BUTTON33065 33065
+#define ID_BUTTON33066 33066
+#define ID_BUTTON33067 33067
+#define ID_BUTTON33068 33068
+#define ID_33069 33069
+#define ID_SIMULATE 33070
+#define ID_MENU_STATUS_SHOW 33073
+#define ID_PLC_INFO_DISPLAY 33074
+#define ID_PLC_INFO_SHOW 33075
+#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 ID_33091 33091
+#define ID_SHOW_LOG 33092
+#define ID_33093 33093
+#define ID_MENU_SHOWNAV 33094
+#define IDS_STRING101 33100
+#define IDC_BUTTON_AND 33101
+#define IDC_BUTTON_OR 33102
+#define IDC_BUTTON_VLINE 33103
+#define IDC_BUTTON_OUT 33104
+#define IDC_BUTTON_TMCT 33105
+#define IDC_BUTTON_FUN 33106
+#define IDC_BUTTON_HLINE 33107
+#define IDC_BUTTON_NOT 33108
+#define IDC_BUTTON_INDEX 33109
+#define IDC_BUTTON_MC 33110
+#define IDC_BUTTON_MCE 33111
+#define IDC_BUTTON_E 33183
+#define IDC_BUTTON_SET 33201
+#define IDC_BUTTON_RESET 33202
+#define IDC_BUTTON_DF 33203
+#define IDC_BUTTON_END 33204
+#define IDC_BUTTON_COMPARE 33205
+#define IDC_BUTTON_PFUN 33206
+#define IDC_BUTTON_UPDOWN 33207
+#define IDC_BUTTON_BIT 33208
+#define IDC_BUTTON_WORD 33209
+#define IDC_BUTTON_INSTRUCTION1 33210
+#define IDC_BUTTON_INSTRUCTION2 33211
+#define IDC_BUTTON_PGCONVERT 33301
+#define IDC_BUTTON_ONLINE 33302
+#define IDC_BUTTON_OFFLINE 33303
+#define IDC_BUTTON_COLSE 33304
+#define IDC_BUTTON_FIND 33305
+#define IDC_BUTTON_NEXTWIN 33306
+#define IDC_BUTTON_MONITOR 33307
+#define IDC_BUTTON_STATUS 33308
+#define IDC_BUTTON_RUNPROG 33309
+#define IDC_BUTTON_PLCREAD 33310
+#define IDC_BUTTON_PLCWRITE 33311
+#define IDC_BUTTON_X 33401
+#define IDC_BUTTON_Y 33402
+#define IDC_BUTTON_R 33403
+#define IDC_BUTTON_L 33404
+#define IDC_BUTTON_P 33405
+#define IDC_BUTTON_COMPARE1 33406
+#define IDC_BUTTON_NOT1 33408
+#define IDC_BUTTON_T 33501
+#define IDC_BUTTON_C 33502
+#define ID_KEY_X 33095
+#define ID_INDICATOR_SEL_TYPE 59135
+#define ID_INDICATOR_MACHINE_TYPE 59142
+#define ID_INDICATOR_PROGRAM_POS 59143
+#define ID_INDICATOR_CONNECTIVITY 59144
+#define ID_INDICATOR_RUN_STATUS 59145
+#define ID_INDICATOR_MONITOR_STATUS 59146
+#define ID_INDICATOR_TARGET_ADDRESS 59147
+#define ID_INDICATOR_INFO_DISPLAY 59148
-// 鏂板璞＄殑涓嬩竴缁勯粯璁ゅ��
-//
+// Next default values for new objects
+//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE 310
-#define _APS_NEXT_CONTROL_VALUE 1000
-#define _APS_NEXT_SYMED_VALUE 310
-#define _APS_NEXT_COMMAND_VALUE 32771
+#define _APS_NEXT_RESOURCE_VALUE 359
+#define _APS_NEXT_COMMAND_VALUE 33185
+#define _APS_NEXT_CONTROL_VALUE 1087
+#define _APS_NEXT_SYMED_VALUE 319
#endif
#endif
--
Gitblit v1.9.1