xiemeng / BlueFlashTool · Commits

Commit 8a702b8cd574de94c12114d19b25a0429cf03071

Authored by xiemeng
1 parent 55205d56

简化窗口元素

Inline Side-by-side
Showing 2 changed files with 61 additions and 152 deletions
@@ -15,21 +15,22 @@ @@ -15,21 +15,22 @@
15 // Ó¢Óï(ÃÀ¹ú) resources 15 // Ó¢Óï(ÃÀ¹ú) resources
16 16
17 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) 17 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
  18 +#ifdef _WIN32
18 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US 19 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
19 #pragma code_page(1252) 20 #pragma code_page(1252)
  21 +#endif //_WIN32
20 22
21 ///////////////////////////////////////////////////////////////////////////// 23 /////////////////////////////////////////////////////////////////////////////
22 // 24 //
23 // Accelerator 25 // Accelerator
24 // 26 //
25 27
26 -IDR_MTTTYACCELERATOR ACCELERATORS 28 +IDR_MTTTYACCELERATOR ACCELERATORS
27 BEGIN 29 BEGIN
28 VK_F5, ID_TRANSFER_SENDFILETEXT, VIRTKEY, NOINVERT 30 VK_F5, ID_TRANSFER_SENDFILETEXT, VIRTKEY, NOINVERT
29 VK_F5, ID_TRANSFER_ABORTREPEATEDSENDING, VIRTKEY, ALT, NOINVERT 31 VK_F5, ID_TRANSFER_ABORTREPEATEDSENDING, VIRTKEY, ALT, NOINVERT
30 VK_F5, ID_TRANSFER_ABORTSENDING, VIRTKEY, SHIFT, NOINVERT 32 VK_F5, ID_TRANSFER_ABORTSENDING, VIRTKEY, SHIFT, NOINVERT
31 - VK_F3, ID_FILE_EXIT, VIRTKEY, NOINVERT ///ASCII, ALT, NOINVERT  
32 - VK_F4, ID_FILE_CONNECT, VIRTKEY, NOINVERT 33 + VK_F3, ID_FILE_EXIT, VIRTKEY, NOINVERT
33 END 34 END
34 35
35 36
@@ -38,7 +39,7 @@ END @@ -38,7 +39,7 @@ END
38 // Dialog 39 // Dialog
39 // 40 //
40 41
41 -IDD_ABOUT DIALOG 0, 0, 149, 159 42 +IDD_ABOUT DIALOG 0, 0, 149, 159
42 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU 43 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
43 CAPTION "About MTTTY" 44 CAPTION "About MTTTY"
44 FONT 8, "MS Sans Serif" 45 FONT 8, "MS Sans Serif"
@@ -52,62 +53,27 @@ BEGIN @@ -52,62 +53,27 @@ BEGIN
52 EDITTEXT IDC_OSVERSIONINFO,36,81,104,46,ES_MULTILINE | ES_AUTOHSCROLL | ES_READONLY 53 EDITTEXT IDC_OSVERSIONINFO,36,81,104,46,ES_MULTILINE | ES_AUTOHSCROLL | ES_READONLY
53 END 54 END
54 55
55 -IDD_TOOLBARSETTINGS DIALOGEX 0, 0, 414, 132 56 +IDD_TOOLBARSETTINGS DIALOGEX 0, 0, 223, 30
56 STYLE DS_ABSALIGN | DS_SETFONT | WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_BORDER 57 STYLE DS_ABSALIGN | DS_SETFONT | WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_BORDER
57 -FONT 14, "Arial Narrow", 400, 0, 0x0 58 +FONT 10, "Arial", 400, 0, 0x0
58 BEGIN 59 BEGIN
59 - COMBOBOX IDC_PORTCOMBO,2,13,48,51,CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP  
60 - LTEXT "Baud",IDC_STATIC,54,2,17,8  
61 - COMBOBOX IDC_BAUDCOMBO,67,12,48,64,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP  
62 - COMBOBOX IDC_PARITYCOMBO,3,87,48,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP  
63 - COMBOBOX IDC_DATABITSCOMBO,57,87,48,48,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP  
64 - COMBOBOX IDC_STOPBITSCOMBO,110,87,48,39,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP  
65 - LTEXT "Port",IDC_STATIC,2,2,17,8  
66 - LTEXT "Parity",IDC_STATIC,5,71,20,8  
67 - LTEXT "Data Bits",IDC_STATIC,59,71,31,9  
68 - LTEXT "Stop Bits",IDC_STATIC,112,71,43,10  
69 - CONTROL "Local Echo",IDC_LOCALECHOCHK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,275,79,49,10  
70 - CONTROL "Display Errors",IDC_DISPLAYERRORSCHK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,275,89,57,10  
71 - PUSHBUTTON "Font...",IDC_FONTBTN,3,107,33,14  
72 - PUSHBUTTON "Comm Events...",IDC_COMMEVENTSBTN,41,107,61,14  
73 - CONTROL "CR => CR/LF",IDC_LFBTN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,275,99,56,10  
74 - CONTROL "Autowrap",IDC_AUTOWRAPCHK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,275,109,43,10  
75 - PUSHBUTTON "Flow Control...",IDC_FLOWCONTROLBTN,105,107,59,14  
76 - PUSHBUTTON "Timeouts...",IDC_TIMEOUTSBTN,169,107,49,14  
77 - CONTROL "No Reading",IDC_NOREADINGCHK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,341,79,53,10  
78 - CONTROL "No Writing",IDC_NOWRITINGCHK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,341,89,58,10  
79 - CONTROL "No Status",IDC_NOSTATUSCHK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,341,109,54,10  
80 - CONTROL "No Events",IDC_NOEVENTSCHK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,341,99,68,10  
81 - PUSHBUTTON "Send",IDC_SENDBTN,137,11,50,14 60 + COMBOBOX IDC_PORTCOMBO,2,0,48,51,CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP
  61 + PUSHBUTTON "stop",IDC_BTN_STOPFLASH,144,0,37,12
  62 + PUSHBUTTON "select file",IDC_BUTTON2_SEC_BINFILE,102,0,37,12
  63 + EDITTEXT IDC_STATIC_BINPATH,0,13,218,12,ES_AUTOHSCROLL | ES_READONLY
  64 + PUSHBUTTON "Connect",IDC_BTN_CONNECT_UART,57,0,37,12
82 END 65 END
83 66
84 IDD_STATUSDIALOG DIALOGEX 0, 0, 459, 156 67 IDD_STATUSDIALOG DIALOGEX 0, 0, 459, 156
85 STYLE DS_ABSALIGN | DS_SETFONT | WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_BORDER 68 STYLE DS_ABSALIGN | DS_SETFONT | WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_BORDER
86 FONT 8, "MS Sans Serif", 0, 0, 0x0 69 FONT 8, "MS Sans Serif", 0, 0, 0x0
87 BEGIN 70 BEGIN
88 - PUSHBUTTON "",IDC_ABORTBTN,4,13,44,27,NOT WS_VISIBLE  
89 - CONTROL "Generic1",IDC_TRANSFERPROGRESS,"msctls_progress32",PBS_SMOOTH | NOT WS_VISIBLE | WS_BORDER,56,12,192,29  
90 - GROUPBOX "Modem Status",IDC_MODEMSTATUSGRP,4,70,153,25  
91 - CONTROL "CTS",IDC_STATCTS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,79,26,10  
92 - CONTROL "DSR",IDC_STATDSR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,37,79,29,10  
93 - CONTROL "RING",IDC_STATRING,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,70,79,30,10  
94 - CONTROL "RLSD (CD)",IDC_STATRLSD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,105,79,48,10  
95 - GROUPBOX "Comm Status",IDC_STATIC,157,76,162,80  
96 - CONTROL "CTS Hold",IDC_CTSHOLDCHK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,162,95,50,10  
97 - CONTROL "DSR Hold",IDC_DSRHOLDCHK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,162,107,50,10  
98 - CONTROL "RLSD Hold",IDC_RLSDHOLDCHK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,159,146,50,10  
99 - CONTROL "XOFF Hold",IDC_XOFFHOLDCHK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,214,95,48,10  
100 - CONTROL "XOFF Sent",IDC_XOFFSENTCHK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,214,107,48,10  
101 - CONTROL "EOF Sent",IDC_EOFSENTCHK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,211,146,47,10  
102 - CONTROL "TX Char",IDC_TXIMCHK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,265,95,42,10  
103 - LTEXT "TX Chars:",IDC_STATIC,265,108,34,8  
104 - EDITTEXT IDC_TXCHAREDIT,302,105,19,12,ES_AUTOHSCROLL | ES_READONLY  
105 - LTEXT "RX Chars:",IDC_STATIC,262,146,34,8  
106 - EDITTEXT IDC_RXCHAREDIT,298,144,19,12,ES_AUTOHSCROLL | ES_READONLY 71 + PUSHBUTTON "",IDC_ABORTBTN,4,1,44,27,NOT WS_VISIBLE
  72 + CONTROL "Generic1",IDC_TRANSFERPROGRESS,"msctls_progress32",PBS_SMOOTH | PBS_VERTICAL | NOT WS_VISIBLE | WS_BORDER,0,1,75,104
107 EDITTEXT IDC_STATUSEDIT,260,3,193,44,ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL 73 EDITTEXT IDC_STATUSEDIT,260,3,193,44,ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL
108 END 74 END
109 75
110 -IDD_COMMEVENTSDLG DIALOG 0, 0, 226, 113 76 +IDD_COMMEVENTSDLG DIALOG 0, 0, 226, 113
111 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU 77 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
112 CAPTION "Select Comm Events" 78 CAPTION "Select Comm Events"
113 FONT 8, "MS Sans Serif" 79 FONT 8, "MS Sans Serif"
@@ -130,7 +96,7 @@ BEGIN @@ -130,7 +96,7 @@ BEGIN
130 LTEXT "0x",IDC_STATIC,10,99,9,8 96 LTEXT "0x",IDC_STATIC,10,99,9,8
131 END 97 END
132 98
133 -IDD_FLOWCONTROLDLG DIALOG 0, 0, 210, 208 99 +IDD_FLOWCONTROLDLG DIALOG 0, 0, 210, 208
134 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU 100 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
135 CAPTION "Flow Control Settings" 101 CAPTION "Flow Control Settings"
136 FONT 8, "MS Sans Serif" 102 FONT 8, "MS Sans Serif"
@@ -168,7 +134,7 @@ BEGIN @@ -168,7 +134,7 @@ BEGIN
168 PUSHBUTTON "&Dtr/Dsr",IDC_DTRDSRBTN,153,62,50,14 134 PUSHBUTTON "&Dtr/Dsr",IDC_DTRDSRBTN,153,62,50,14
169 END 135 END
170 136
171 -IDD_TIMEOUTSDLG DIALOG 0, 0, 231, 158 137 +IDD_TIMEOUTSDLG DIALOG 0, 0, 231, 158
172 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU 138 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
173 CAPTION "Timeouts" 139 CAPTION "Timeouts"
174 FONT 8, "MS Sans Serif" 140 FONT 8, "MS Sans Serif"
@@ -192,7 +158,7 @@ BEGIN @@ -192,7 +158,7 @@ BEGIN
192 "Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,20,140,122,10 158 "Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,20,140,122,10
193 END 159 END
194 160
195 -IDD_GETADWORD DIALOG 0, 0, 183, 68 161 +IDD_GETADWORD DIALOG 0, 0, 183, 68
196 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU 162 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
197 CAPTION "Please Enter A Number" 163 CAPTION "Please Enter A Number"
198 FONT 8, "MS Sans Serif" 164 FONT 8, "MS Sans Serif"
@@ -211,49 +177,41 @@ END @@ -211,49 +177,41 @@ END
211 177
212 // Icon with lowest ID value placed first to ensure application icon 178 // Icon with lowest ID value placed first to ensure application icon
213 // remains consistent on all systems. 179 // remains consistent on all systems.
  180 +IDI_TITLE ICON "Optek_Logo_ICO_32 X 32.ico"
214 IDI_APPICON ICON "MTTTY.ICO" 181 IDI_APPICON ICON "MTTTY.ICO"
215 -  
216 IDI_APPICON2 ICON "MTTTY2.ICO" 182 IDI_APPICON2 ICON "MTTTY2.ICO"
217 -  
218 IDI_APPICON3 ICON "MTTTY3.ICO" 183 IDI_APPICON3 ICON "MTTTY3.ICO"
219 -  
220 IDI_APPICON4 ICON "MTTTY4.ICO" 184 IDI_APPICON4 ICON "MTTTY4.ICO"
221 185
222 -IDI_TITLE ICON "Optek_Logo_ICO_32 X 32.ico"  
223 ///////////////////////////////////////////////////////////////////////////// 186 /////////////////////////////////////////////////////////////////////////////
224 // 187 //
225 // Menu 188 // Menu
226 // 189 //
227 190
228 -IDR_MTTTYMENU MENU 191 +IDR_MTTTYMENU MENU
229 BEGIN 192 BEGIN
230 POPUP "&File" 193 POPUP "&File"
231 BEGIN 194 BEGIN
232 - MENUITEM "Connect", ID_FILE_CONNECT 195 + POPUP "&TTY"
  196 + BEGIN
  197 + MENUITEM "&Clear", ID_TTY_CLEAR
  198 + END
  199 + POPUP "T&ransfer"
  200 + BEGIN
  201 + MENUITEM "&Select file\tF5", ID_TRANSFER_SENDFILETEXT
  202 + MENUITEM "&Receive File (Text)...", ID_TRANSFER_RECEIVEFILETEXT
  203 + MENUITEM "&Abort Sending\tShift+F5", ID_TRANSFER_ABORTSENDING, GRAYED
  204 + MENUITEM SEPARATOR
  205 + MENUITEM "S&end Repeatedly...", ID_TRANSFER_SENDREPEATEDLY
  206 + MENUITEM "A&bort Repeated Sending\tAlt+F5", ID_TRANSFER_ABORTREPEATEDSENDING
  207 + END
233 MENUITEM "Disconnect", ID_FILE_DISCONNECT 208 MENUITEM "Disconnect", ID_FILE_DISCONNECT
234 MENUITEM SEPARATOR 209 MENUITEM SEPARATOR
235 - MENUITEM "E&xit\tF3", ID_FILE_EXIT  
236 - END  
237 - POPUP "&TTY"  
238 - BEGIN  
239 - MENUITEM "&Clear", ID_TTY_CLEAR  
240 - MENUITEM "&Set Font...", IDC_FONTBTN  
241 - MENUITEM "Comm &Events...", IDC_COMMEVENTSBTN  
242 - MENUITEM "&Flow Control...", IDC_FLOWCONTROLBTN  
243 - MENUITEM "&Timeouts...", IDC_TIMEOUTSBTN  
244 - END  
245 - POPUP "T&ransfer"  
246 - BEGIN  
247 - MENUITEM "&Select file\tF5", ID_TRANSFER_SENDFILETEXT  
248 - MENUITEM "&Receive File (Text)...", ID_TRANSFER_RECEIVEFILETEXT  
249 - MENUITEM "&Abort Sending\tShift+F5", ID_TRANSFER_ABORTSENDING, GRAYED  
250 - MENUITEM SEPARATOR  
251 - MENUITEM "S&end Repeatedly...", ID_TRANSFER_SENDREPEATEDLY  
252 - MENUITEM "A&bort Repeated Sending\tAlt+F5", ID_TRANSFER_ABORTREPEATEDSENDING  
253 - END  
254 - POPUP "&Help"  
255 - BEGIN  
256 - MENUITEM "&About MTTTY", ID_HELP_ABOUTMTTTY 210 + POPUP "&Help"
  211 + BEGIN
  212 + MENUITEM "&About MTTTY", ID_HELP_ABOUTMTTTY
  213 + END
  214 + MENUITEM "E&xit\tF3", ID_FILE_EXIT
257 END 215 END
258 END 216 END
259 217
@@ -329,34 +287,13 @@ END @@ -329,34 +287,13 @@ END
329 // 287 //
330 288
331 #ifdef APSTUDIO_INVOKED 289 #ifdef APSTUDIO_INVOKED
332 -GUIDELINES DESIGNINFO 290 +GUIDELINES DESIGNINFO
333 BEGIN 291 BEGIN
334 - IDD_ABOUT, DIALOG  
335 - BEGIN  
336 - END  
337 -  
338 - IDD_TOOLBARSETTINGS, DIALOG  
339 - BEGIN  
340 - BOTTOMMARGIN, 48  
341 - END  
342 -  
343 IDD_STATUSDIALOG, DIALOG 292 IDD_STATUSDIALOG, DIALOG
344 BEGIN 293 BEGIN
345 TOPMARGIN, 1 294 TOPMARGIN, 1
346 END 295 END
347 296
348 - IDD_COMMEVENTSDLG, DIALOG  
349 - BEGIN  
350 - END  
351 -  
352 - IDD_FLOWCONTROLDLG, DIALOG  
353 - BEGIN  
354 - END  
355 -  
356 - IDD_TIMEOUTSDLG, DIALOG  
357 - BEGIN  
358 - END  
359 -  
360 IDD_GETADWORD, DIALOG 297 IDD_GETADWORD, DIALOG
361 BEGIN 298 BEGIN
362 LEFTMARGIN, 7 299 LEFTMARGIN, 7
@@ -373,34 +310,23 @@ END @@ -373,34 +310,23 @@ END
373 // AFX_DIALOG_LAYOUT 310 // AFX_DIALOG_LAYOUT
374 // 311 //
375 312
376 -IDD_STATUSDIALOG AFX_DIALOG_LAYOUT 313 +IDD_STATUSDIALOG AFX_DIALOG_LAYOUT
377 BEGIN 314 BEGIN
378 - 0,  
379 - 0, 0, 0, 0,  
380 - 0, 0, 0, 0,  
381 - 0, 0, 0, 0,  
382 - 0, 0, 0, 0,  
383 - 0, 0, 0, 0,  
384 - 0, 0, 0, 0,  
385 - 0, 0, 0, 0,  
386 - 0, 0, 0, 0,  
387 - 0, 0, 0, 0,  
388 - 0, 0, 0, 0,  
389 - 0, 0, 0, 0,  
390 - 0, 0, 0, 0,  
391 - 0, 0, 0, 0,  
392 - 0, 0, 0, 0,  
393 - 0, 0, 0, 0,  
394 - 0, 0, 0, 0,  
395 - 0, 0, 0, 0,  
396 - 0, 0, 0, 0,  
397 - 0, 0, 0, 0,  
398 - 0, 0, 100, 100 315 + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
  316 + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
  317 + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
  318 + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
  319 + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
  320 + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
  321 + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
  322 + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
  323 + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0064, 0x0064
  324 +
399 END 325 END
400 326
401 -IDD_TOOLBARSETTINGS AFX_DIALOG_LAYOUT 327 +IDD_TOOLBARSETTINGS AFX_DIALOG_LAYOUT
402 BEGIN 328 BEGIN
403 - 0 329 + 0x0000
404 END 330 END
405 331
406 #endif // Ó¢Óï(ÃÀ¹ú) resources 332 #endif // Ó¢Óï(ÃÀ¹ú) resources
1 //{{NO_DEPENDENCIES}} 1 //{{NO_DEPENDENCIES}}
2 -// Microsoft Visual C++ 生成的包含文件。  
3 -// 供 MTTTY.RC 使用 2 +// Microsoft Visual C++ generated include file.
  3 +// Used by MTTTY.RC
4 // 4 //
5 #define IDR_MTTTYMENU 101 5 #define IDR_MTTTYMENU 101
6 #define IDR_MTTTYACCELERATOR 102 6 #define IDR_MTTTYACCELERATOR 102
  7 +#define IDI_TITLE 102
7 #define IDI_APPICON 103 8 #define IDI_APPICON 103
8 #define IDD_TOOLBARSETTINGS 103 9 #define IDD_TOOLBARSETTINGS 103
9 #define ID_TTYWINDOW 103 10 #define ID_TTYWINDOW 103
@@ -16,24 +17,16 @@ @@ -16,24 +17,16 @@
16 #define IDD_TIMEOUTSDLG 110 17 #define IDD_TIMEOUTSDLG 110
17 #define IDI_APPICON4 111 18 #define IDI_APPICON4 111
18 #define IDD_GETADWORD 111 19 #define IDD_GETADWORD 111
19 -#define IDI_TITLE 102  
20 #define IDC_PORTCOMBO 1000 20 #define IDC_PORTCOMBO 1000
21 -#define IDC_BAUDCOMBO 1001  
22 -#define IDC_PARITYCOMBO 1002  
23 -#define IDC_DATABITSCOMBO 1003  
24 -#define IDC_STOPBITSCOMBO 1004  
25 -#define IDC_STATCTS 1004  
26 -#define IDC_STATDSR 1005  
27 -#define IDC_STATRING 1006  
28 -#define IDC_STATRLSD 1007  
29 #define IDC_LOCALECHOCHK 1008 21 #define IDC_LOCALECHOCHK 1008
30 #define IDC_DISPLAYERRORSCHK 1009 22 #define IDC_DISPLAYERRORSCHK 1009
31 -#define IDC_FONTBTN 1010  
32 #define IDC_ABORTBTN 1011 23 #define IDC_ABORTBTN 1011
33 #define IDC_SENDBTN 1012 24 #define IDC_SENDBTN 1012
  25 +#define IDC_BTN_STOPFLASH 1012
34 #define IDC_TRANSFERPROGRESS 1013 26 #define IDC_TRANSFERPROGRESS 1013
  27 +#define IDC_SENDBTN2 1013
  28 +#define IDC_BTN_CONNECT_UART 1013
35 #define IDC_MODEMSTATUSGRP 1018 29 #define IDC_MODEMSTATUSGRP 1018
36 -#define IDC_COMMEVENTSBTN 1019  
37 #define IDC_EVBREAKBTN 1020 30 #define IDC_EVBREAKBTN 1020
38 #define IDC_EVCTSBTN 1021 31 #define IDC_EVCTSBTN 1021
39 #define IDC_EVDSRBTN 1022 32 #define IDC_EVDSRBTN 1022
@@ -49,7 +42,6 @@ @@ -49,7 +42,6 @@
49 #define IDC_AUTOWRAPCHK 1033 42 #define IDC_AUTOWRAPCHK 1033
50 #define IDC_STATUSEDIT 1034 43 #define IDC_STATUSEDIT 1034
51 #define IDC_FLAGCHAR 1036 44 #define IDC_FLAGCHAR 1036
52 -#define IDC_FLOWCONTROLBTN 1039  
53 #define IDC_CTSOUTCHK 1040 45 #define IDC_CTSOUTCHK 1040
54 #define IDC_DSROUTCHK 1041 46 #define IDC_DSROUTCHK 1041
55 #define IDC_DTRCONTROLCOMBO 1043 47 #define IDC_DTRCONTROLCOMBO 1043
@@ -67,7 +59,6 @@ @@ -67,7 +59,6 @@
67 #define IDC_XOFFCHARDISP 1055 59 #define IDC_XOFFCHARDISP 1055
68 #define IDC_PICTURE 1056 60 #define IDC_PICTURE 1056
69 #define IDC_DTRDSRBTN 1056 61 #define IDC_DTRDSRBTN 1056
70 -#define IDC_TIMEOUTSBTN 1057  
71 #define IDC_READINTERVALEDIT 1058 62 #define IDC_READINTERVALEDIT 1058
72 #define IDC_READMULTIPLIEREDIT 1059 63 #define IDC_READMULTIPLIEREDIT 1059
73 #define IDC_READCONSTANTEDIT 1060 64 #define IDC_READCONSTANTEDIT 1060
@@ -76,15 +67,6 @@ @@ -76,15 +67,6 @@
76 #define IDC_NONEBTN 1064 67 #define IDC_NONEBTN 1064
77 #define IDC_OSVERSIONINFO 1065 68 #define IDC_OSVERSIONINFO 1065
78 #define IDC_TXAFTERXOFFSENTCHK 1066 69 #define IDC_TXAFTERXOFFSENTCHK 1066
79 -#define IDC_CTSHOLDCHK 1067  
80 -#define IDC_DSRHOLDCHK 1068  
81 -#define IDC_RLSDHOLDCHK 1069  
82 -#define IDC_XOFFHOLDCHK 1070  
83 -#define IDC_XOFFSENTCHK 1071  
84 -#define IDC_EOFSENTCHK 1072  
85 -#define IDC_TXIMCHK 1073  
86 -#define IDC_TXCHAREDIT 1074  
87 -#define IDC_RXCHAREDIT 1075  
88 #define IDC_NOREADINGCHK 1076 70 #define IDC_NOREADINGCHK 1076
89 #define IDC_NOWRITINGCHK 1077 71 #define IDC_NOWRITINGCHK 1077
90 #define IDC_NOSTATUSCHK 1078 72 #define IDC_NOSTATUSCHK 1078
@@ -92,9 +74,10 @@ @@ -92,9 +74,10 @@
92 #define IDC_DWORDSTATIC 1081 74 #define IDC_DWORDSTATIC 1081
93 #define IDC_DWORDEDIT 1082 75 #define IDC_DWORDEDIT 1082
94 #define IDC_DISPLAYTIMEOUTS 1083 76 #define IDC_DISPLAYTIMEOUTS 1083
  77 +#define IDC_BUTTON2_SEC_BINFILE 1085
  78 +#define IDC_STATIC_BINPATH 1086
95 #define ID_FILE_EXIT 40001 79 #define ID_FILE_EXIT 40001
96 #define ID_HELP_ABOUTMTTTY 40002 80 #define ID_HELP_ABOUTMTTTY 40002
97 -#define ID_FILE_CONNECT 40004  
98 #define ID_FILE_DISCONNECT 40005 81 #define ID_FILE_DISCONNECT 40005
99 #define ID_TTY_CLEAR 40008 82 #define ID_TTY_CLEAR 40008
100 #define ID_TRANSFER_SENDFILETEXT 40010 83 #define ID_TRANSFER_SENDFILETEXT 40010
@@ -110,7 +93,7 @@ @@ -110,7 +93,7 @@
110 #ifndef APSTUDIO_READONLY_SYMBOLS 93 #ifndef APSTUDIO_READONLY_SYMBOLS
111 #define _APS_NEXT_RESOURCE_VALUE 115 94 #define _APS_NEXT_RESOURCE_VALUE 115
112 #define _APS_NEXT_COMMAND_VALUE 40021 95 #define _APS_NEXT_COMMAND_VALUE 40021
113 -#define _APS_NEXT_CONTROL_VALUE 1085 96 +#define _APS_NEXT_CONTROL_VALUE 1087
114 #define _APS_NEXT_SYMED_VALUE 104 97 #define _APS_NEXT_SYMED_VALUE 104
115 #endif 98 #endif
116 #endif 99 #endif
Please register or login to post a comment