xiemeng / BlueFlashTool · Commits

Commit e82e4414e9c4088152ea99cd9e4b3dca5240e917

Authored by xiemeng
1 parent a6b83181

1 修改启动窗口大小以及布局 

2 使用按钮选择文件,  而不是菜单
Inline Side-by-side
Showing 6 changed files with 239 additions and 250 deletions
... ... @@ -284,35 +284,8 @@ int WINAPI MTTTYWndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
284 284
285 285 case WM_SIZE:
286 286 {
287   - //
288   - // main window size has changed,
289   - // so I need to change the positions of child windows
290   - //
291   - WORD wTop;
292   - WORD wHeight;
293   - WORD wWidth = LOWORD(lParam);
294   -
295   - //
296   - // put Settings window at top
297   - //
298   - wHeight = SETTINGSFACTOR*gwBaseY;
299   - wTop = 0;
300   - MoveWindow(ghWndToolbarDlg, 0,wTop, wWidth, wHeight, TRUE);
301   -
302   - //
303   - // put Status window at bottom
304   - //
305   - wHeight = STATUSFACTOR*gwBaseY;
306   - wTop = HIWORD(lParam) - wHeight;
307   - MoveWindow(ghWndStatusDlg, 0, wTop, wWidth, wHeight, TRUE);
308   -
309   - //
310   - // put TTTY window right in the middle
311   - // height = whole window - height of two previous windows
312   - //
313   - wHeight = HIWORD(lParam) - ((STATUSFACTOR + SETTINGSFACTOR)*gwBaseY);
314   - wTop = SETTINGSFACTOR*gwBaseY;
315   - MoveWindow(ghWndTTY, 0, wTop, wWidth, wHeight, TRUE);
  287 + //主窗口大小已经改变，，所以我需要改变子窗口的位置
  288 + ResizeAllWindow(LOWORD(lParam),HIWORD(lParam));
316 289 }
317 290
318 291 break;
... ... @@ -373,139 +346,102 @@ void CmdDispatch(int iMenuChoice, HWND hwnd, LPARAM lParam)
373 346 {
374 347
375 348 switch (iMenuChoice)
376   - {
377   - case ID_HELP_ABOUTMTTTY:
378   - CmdAbout(hwnd);
379   - break;
380   -
381   - case ID_TRANSFER_SENDFILETEXT:
382   - {
383   -#ifdef __OPTEK_EDIT__
384   - char * szFilter = "bin Files\0*.bin\0";
385   -#else
386   - char * szFilter = "Text Files\0*.TXT\0";
387   -#endif
388   - OPENFILENAME ofn = {0};
389   -
390   - ofn.lStructSize = sizeof(OPENFILENAME);
391   - ofn.hwndOwner = hwnd;
392   - ofn.lpstrFilter = szFilter;
393   - ofn.lpstrFile = TTYInfo.szFileName;
394   - ofn.nMaxFile = MAX_PATH;
395   -#ifdef __OPTEK_EDIT__
396   - ofn.lpstrTitle = "Select file";
397   -#else
398   - ofn.lpstrTitle = "Send File";
399   -#endif
400   - ofn.Flags = OFN_FILEMUSTEXIST;
401   -
402   - if (!GetOpenFileName(&ofn))
403   - break;
404   -
405   -#ifdef __OPTEK_EDIT__
406   - UpdateStatus(TTYInfo.szFileName);
407   -#else
408   - if (TRUE)
409   - TransferFileTextStart(TTYInfo.szFileName);
410   -#endif
411   - }
412   - break;
413   -
414   - case ID_TRANSFER_RECEIVEFILETEXT:
415   - {
416   - char * szFilter = "Text Files\0*.TXT\0";
  349 + {
  350 + case ID_HELP_ABOUTMTTTY:
  351 + CmdAbout(hwnd);
  352 + break;
  353 + case ID_TRANSFER_SENDFILETEXT:
  354 +
  355 + break;
  356 + case ID_TRANSFER_RECEIVEFILETEXT:
  357 + {
  358 + char * szFilter = "Text Files\0*.TXT\0";
417 359 OPENFILENAME ofn = {0};
418 360
419   - ofn.lStructSize = sizeof(OPENFILENAME);
420   - ofn.hwndOwner = hwnd;
421   - ofn.lpstrFilter = szFilter;
422   - ofn.lpstrFile = TTYInfo.szFileName;
423   - ofn.nMaxFile = MAX_PATH;
424   - ofn.lpstrTitle = "Receive File";
425   - ofn.Flags = OFN_OVERWRITEPROMPT;
426   -
427   - if (!GetSaveFileName(&ofn))
428   - break;
429   -
430   - ReceiveFileText(TTYInfo.szFileName);
431   - }
432   - break;
433   -
434   - case ID_TRANSFER_ABORTSENDING:
435   - // was abort sent from the abort button?
436   - if (LOWORD(lParam) == IDC_ABORTBTN) {
437   - // am I in a transfer repeat?
438   - if (REPEATING(TTYInfo))
439   - TransferRepeatDestroy();
440   - // am I in a normal recieve state, then stop sending
441   - else if (gdwReceiveState == RECEIVE_TTY)
442   - TransferFileTextEnd();
443   - // if I am not in a normal receive state, then stop capturing
444   - else
445   - gfAbortTransfer = TRUE;
446   - }
447   - else
448   - // transfer abort was sent by transfer thread
449   - TransferFileTextEnd();
450   - break;
451   -
452   - case ID_TRANSFER_SENDREPEATEDLY:
453   - {
454   - DWORD dwFreq;
455   - char * szFilter = "Text Files\0*.TXT\0";
456   - OPENFILENAME ofn = {0};
457   -
458   - ofn.lStructSize = sizeof(OPENFILENAME);
459   - ofn.hwndOwner = hwnd;
460   - ofn.lpstrFilter = szFilter;
461   - ofn.lpstrFile = TTYInfo.szFileName;
462   - ofn.nMaxFile = MAX_PATH;
463   - ofn.lpstrTitle = "Send File Repeatedly";
464   - ofn.Flags = OFN_FILEMUSTEXIST;
465   -
466   - if (!GetOpenFileName(&ofn))
467   - break;
468   -
469   - dwFreq = GetAFrequency();
470   -
471   - TransferRepeatCreate(TTYInfo.szFileName, dwFreq);
472   - }
473   - break;
474   -
475   - case ID_TRANSFER_ABORTREPEATEDSENDING:
476   - TransferRepeatDestroy();
477   - break;
478   -
479   - case ID_TTY_CLEAR:
480   - ClearTTYContents();
481   - InvalidateRect(ghWndTTY, NULL, TRUE);
482   - break;
483   -
484   - // The following correspond to menu choices and buttons in the settings dlog
485   - case IDC_FONTBTN:
486   -#ifdef __OPTEK_EDIT__
487   - case IDC_SENDBTN:
488   -#endif
489   - case IDC_COMMEVENTSBTN:
490   - case IDC_FLOWCONTROLBTN:
491   - case IDC_TIMEOUTSBTN:
492   - SendMessage(ghWndToolbarDlg, WM_COMMAND, (WPARAM) iMenuChoice, (LPARAM) GetDlgItem(ghWndToolbarDlg, iMenuChoice));
493   - break;
494   -
495   - case ID_FILE_CONNECT:
496   - if (SetupCommPort() != NULL)
497   - ChangeConnection(hwnd, CONNECTED(TTYInfo));
498   - break;
499   -
500   - case ID_FILE_DISCONNECT:
501   - if (BreakDownCommPort())
502   - ChangeConnection(hwnd, CONNECTED(TTYInfo));
503   - break;
504   -
505   - case ID_FILE_EXIT:
506   - PostMessage(hwnd, WM_CLOSE, 0, 0);
507   - break;
508   - }
  361 + ofn.lStructSize = sizeof(OPENFILENAME);
  362 + ofn.hwndOwner = hwnd;
  363 + ofn.lpstrFilter = szFilter;
  364 + ofn.lpstrFile = TTYInfo.szFileName;
  365 + ofn.nMaxFile = MAX_PATH;
  366 + ofn.lpstrTitle = "Receive File";
  367 + ofn.Flags = OFN_OVERWRITEPROMPT;
  368 + if (!GetSaveFileName(&ofn))
  369 + break;
  370 + ReceiveFileText(TTYInfo.szFileName);
  371 + }
  372 + break;
  373 + case ID_TRANSFER_ABORTSENDING: // was abort sent from the abort button?
  374 + if (LOWORD(lParam) == IDC_ABORTBTN)
  375 + {
  376 + // am I in a transfer repeat?
  377 + if (REPEATING(TTYInfo))
  378 + TransferRepeatDestroy();
  379 +
  380 + // am I in a normal recieve state, then stop sending
  381 + else if (gdwReceiveState == RECEIVE_TTY)
  382 + TransferFileTextEnd();
  383 +
  384 + // if I am not in a normal receive state, then stop capturing
  385 + else
  386 + gfAbortTransfer = TRUE;
  387 + }
  388 + else
  389 + // transfer abort was sent by transfer thread
  390 + TransferFileTextEnd();
  391 + break;
  392 + case ID_TRANSFER_SENDREPEATEDLY:
  393 + {
  394 + DWORD dwFreq;
  395 + char * szFilter = "Text Files\0*.TXT\0";
  396 + OPENFILENAME ofn = {0};
  397 +
  398 + ofn.lStructSize = sizeof(OPENFILENAME);
  399 + ofn.hwndOwner = hwnd;
  400 + ofn.lpstrFilter = szFilter;
  401 + ofn.lpstrFile = TTYInfo.szFileName;
  402 + ofn.nMaxFile = MAX_PATH;
  403 + ofn.lpstrTitle = "Send File Repeatedly";
  404 + ofn.Flags = OFN_FILEMUSTEXIST;
  405 + if (!GetOpenFileName(&ofn))
  406 + break;
  407 + dwFreq = GetAFrequency();
  408 + TransferRepeatCreate(TTYInfo.szFileName, dwFreq);
  409 + }
  410 + break;
  411 + case ID_TRANSFER_ABORTREPEATEDSENDING:
  412 + TransferRepeatDestroy();
  413 + break;
  414 + case ID_TTY_CLEAR:
  415 + ClearTTYContents();
  416 + InvalidateRect(ghWndTTY, NULL, TRUE);
  417 + break;
  418 +
  419 + // The following correspond to menu choices and buttons in the settings dlog
  420 + case IDC_FONTBTN:
  421 +
  422 + #ifdef __OPTEK_EDIT__
  423 + case IDC_SENDBTN:
  424 + #endif
  425 +
  426 + case IDC_COMMEVENTSBTN:
  427 + case IDC_FLOWCONTROLBTN:
  428 + case IDC_TIMEOUTSBTN:
  429 + SendMessage(ghWndToolbarDlg, WM_COMMAND, (WPARAM) iMenuChoice, (LPARAM) GetDlgItem(ghWndToolbarDlg, iMenuChoice));
  430 + break;
  431 + case ID_FILE_CONNECT:
  432 + if (SetupCommPort() != NULL)
  433 + ChangeConnection(hwnd, CONNECTED(TTYInfo));
  434 + break;
  435 + case ID_FILE_DISCONNECT:
  436 + if (BreakDownCommPort())
  437 + ChangeConnection(hwnd, CONNECTED(TTYInfo));
  438 + break;
  439 + case ID_FILE_EXIT:
  440 + PostMessage(hwnd, WM_CLOSE, 0, 0);
  441 + break;
  442 + }
  443 +
  444 +
509 445 return;
510 446 }
511 447
... ... @@ -982,3 +918,41 @@ int WINAPI TTYChildProc(HWND hWnd, UINT uMessage, WPARAM wParam, LPARAM lParam)
982 918 }
983 919 return 0L;
984 920 }
  921 +BOOL ResizeAllWindow(DWORD mainwidth, WORD mainheigh)
  922 +{
  923 + RECT rect_setting,rect_info,rect_stauts;
  924 + rect_setting.left = 0;
  925 + rect_setting.top = 0;
  926 + rect_setting.right = mainwidth;
  927 + rect_setting.bottom = SETTINGSFACTOR*gwBaseY;
  928 +
  929 + rect_info.left = mainwidth/5;
  930 + rect_info.top = rect_setting.bottom;
  931 + rect_info.right = mainwidth;
  932 + rect_info.bottom = mainheigh;
  933 +
  934 + rect_stauts.left = 0;
  935 + rect_stauts.top = rect_setting.bottom;
  936 + rect_stauts.right = rect_info.left ;
  937 + rect_stauts.bottom = mainheigh;
  938 +
  939 + MoveWindow(ghWndToolbarDlg,
  940 + rect_setting.left,
  941 + rect_setting.top,
  942 + rect_setting.right -rect_setting.left,
  943 + rect_setting.bottom -rect_setting.top,
  944 + TRUE);
  945 + MoveWindow(ghWndTTY,
  946 + rect_info.left,
  947 + rect_info.top,
  948 + rect_info.right -rect_info.left,
  949 + rect_info.bottom -rect_info.top,
  950 + TRUE);
  951 + MoveWindow(ghWndStatusDlg,
  952 + rect_stauts.left,
  953 + rect_stauts.top,
  954 + rect_stauts.right -rect_stauts.left,
  955 + rect_stauts.bottom -rect_stauts.top,
  956 + TRUE);
  957 +
  958 +}
... ...
... ... @@ -195,13 +195,13 @@ struct TTYInfoStruct
195 195 //
196 196 // window coords
197 197 //
198   -#define MAXXWINDOW 750
199   -#define MAXYWINDOW 530
  198 +#define MAXXWINDOW 350
  199 +#define MAXYWINDOW 230
200 200 #define STARTXWINDOW 80
201 201 #define STARTYWINDOW 70
202 202
203   -#define SETTINGSFACTOR 5
204   -#define STATUSFACTOR 5
  203 +#define SETTINGSFACTOR 3
  204 +#define STATUSFACTOR 2
205 205
206 206 //
207 207 // window timer ids
... ...
... ... @@ -15,21 +15,23 @@
15 15 // Ó¢Óï(ÃÀ¹ú) resources
16 16
17 17 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
  18 +#ifdef _WIN32
18 19 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
19 20 #pragma code_page(1252)
  21 +#endif //_WIN32
20 22
21 23 /////////////////////////////////////////////////////////////////////////////
22 24 //
23 25 // Accelerator
24 26 //
25 27
26   -IDR_MTTTYACCELERATOR ACCELERATORS
  28 +IDR_MTTTYACCELERATOR ACCELERATORS
27 29 BEGIN
28 30 VK_F5, ID_TRANSFER_SENDFILETEXT, VIRTKEY, NOINVERT
29 31 VK_F5, ID_TRANSFER_ABORTREPEATEDSENDING, VIRTKEY, ALT, NOINVERT
30 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
  34 + VK_F4, ID_FILE_CONNECT, VIRTKEY, NOINVERT
33 35 END
34 36
35 37
... ... @@ -38,7 +40,7 @@ END
38 40 // Dialog
39 41 //
40 42
41   -IDD_ABOUT DIALOG 0, 0, 149, 159
  43 +IDD_ABOUT DIALOG 0, 0, 149, 159
42 44 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
43 45 CAPTION "About MTTTY"
44 46 FONT 8, "MS Sans Serif"
... ... @@ -54,15 +56,13 @@ END
54 56
55 57 IDD_TOOLBARSETTINGS DIALOGEX 0, 0, 414, 132
56 58 STYLE DS_ABSALIGN | DS_SETFONT | WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_BORDER
57   -FONT 14, "Arial Narrow", 400, 0, 0x0
  59 +FONT 12, "???? Light", 290, 0, 0x86
58 60 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
  61 + COMBOBOX IDC_PORTCOMBO,0,0,48,51,CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP
  62 + COMBOBOX IDC_BAUDCOMBO,202,0,48,64,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
62 63 COMBOBOX IDC_PARITYCOMBO,3,87,48,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
63 64 COMBOBOX IDC_DATABITSCOMBO,57,87,48,48,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
64 65 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 66 LTEXT "Parity",IDC_STATIC,5,71,20,8
67 67 LTEXT "Data Bits",IDC_STATIC,59,71,31,9
68 68 LTEXT "Stop Bits",IDC_STATIC,112,71,43,10
... ... @@ -78,36 +78,36 @@ BEGIN
78 78 CONTROL "No Writing",IDC_NOWRITINGCHK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,341,89,58,10
79 79 CONTROL "No Status",IDC_NOSTATUSCHK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,341,109,54,10
80 80 CONTROL "No Events",IDC_NOEVENTSCHK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,341,99,68,10
81   - PUSHBUTTON "Send",IDC_SENDBTN,137,11,50,14
  81 + PUSHBUTTON "Send",IDC_SENDBTN,100,0,50,12
  82 + EDITTEXT IDC_STATIC_BINPATH,0,13,192,12,ES_AUTOHSCROLL | ES_READONLY
  83 + PUSHBUTTON "select file",IDC_BUTTON2_SEC_BINFILE,50,0,50,12
82 84 END
83 85
84   -IDD_STATUSDIALOG DIALOGEX 0, 0, 459, 156
  86 +IDD_STATUSDIALOG DIALOGEX 0, 0, 460, 132
85 87 STYLE DS_ABSALIGN | DS_SETFONT | WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_BORDER
86 88 FONT 8, "MS Sans Serif", 0, 0, 0x0
87 89 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
  90 + PUSHBUTTON "",IDC_ABORTBTN,0,1,44,16,NOT WS_VISIBLE
  91 + CONTROL "Generic1",IDC_TRANSFERPROGRESS,"msctls_progress32",PBS_SMOOTH | PBS_VERTICAL | NOT WS_VISIBLE | WS_BORDER,0,20,44,96
  92 + CONTROL "CTS",IDC_STATCTS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,273,50,26,10
  93 + CONTROL "DSR",IDC_STATDSR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,303,50,29,10
  94 + CONTROL "RING",IDC_STATRING,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,336,50,30,10
  95 + CONTROL "RLSD (CD)",IDC_STATRLSD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,371,50,48,10
  96 + CONTROL "CTS Hold",IDC_CTSHOLDCHK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,275,60,50,10
  97 + CONTROL "DSR Hold",IDC_DSRHOLDCHK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,275,72,50,10
  98 + CONTROL "RLSD Hold",IDC_RLSDHOLDCHK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,274,84,50,10
  99 + CONTROL "XOFF Hold",IDC_XOFFHOLDCHK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,327,60,48,10
  100 + CONTROL "XOFF Sent",IDC_XOFFSENTCHK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,327,72,48,10
  101 + CONTROL "EOF Sent",IDC_EOFSENTCHK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,326,84,47,10
  102 + CONTROL "TX Char",IDC_TXIMCHK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,379,60,42,10
  103 + LTEXT "TX Chars:",IDC_STATIC,379,73,34,8
  104 + EDITTEXT IDC_TXCHAREDIT,428,51,19,12,ES_AUTOHSCROLL | ES_READONLY
  105 + LTEXT "RX Chars:",IDC_STATIC,377,84,34,8
  106 + EDITTEXT IDC_RXCHAREDIT,428,79,19,12,ES_AUTOHSCROLL | ES_READONLY
107 107 EDITTEXT IDC_STATUSEDIT,260,3,193,44,ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL
108 108 END
109 109
110   -IDD_COMMEVENTSDLG DIALOG 0, 0, 226, 113
  110 +IDD_COMMEVENTSDLG DIALOG 0, 0, 226, 113
111 111 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
112 112 CAPTION "Select Comm Events"
113 113 FONT 8, "MS Sans Serif"
... ... @@ -130,7 +130,7 @@ BEGIN
130 130 LTEXT "0x",IDC_STATIC,10,99,9,8
131 131 END
132 132
133   -IDD_FLOWCONTROLDLG DIALOG 0, 0, 210, 208
  133 +IDD_FLOWCONTROLDLG DIALOG 0, 0, 210, 208
134 134 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
135 135 CAPTION "Flow Control Settings"
136 136 FONT 8, "MS Sans Serif"
... ... @@ -168,7 +168,7 @@ BEGIN
168 168 PUSHBUTTON "&Dtr/Dsr",IDC_DTRDSRBTN,153,62,50,14
169 169 END
170 170
171   -IDD_TIMEOUTSDLG DIALOG 0, 0, 231, 158
  171 +IDD_TIMEOUTSDLG DIALOG 0, 0, 231, 158
172 172 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
173 173 CAPTION "Timeouts"
174 174 FONT 8, "MS Sans Serif"
... ... @@ -192,7 +192,7 @@ BEGIN
192 192 "Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,20,140,122,10
193 193 END
194 194
195   -IDD_GETADWORD DIALOG 0, 0, 183, 68
  195 +IDD_GETADWORD DIALOG 0, 0, 183, 68
196 196 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
197 197 CAPTION "Please Enter A Number"
198 198 FONT 8, "MS Sans Serif"
... ... @@ -211,28 +211,25 @@ END
211 211
212 212 // Icon with lowest ID value placed first to ensure application icon
213 213 // remains consistent on all systems.
  214 +IDI_TITLE ICON "Optek_Logo_ICO_32 X 32.ico"
214 215 IDI_APPICON ICON "MTTTY.ICO"
215   -
216 216 IDI_APPICON2 ICON "MTTTY2.ICO"
217   -
218 217 IDI_APPICON3 ICON "MTTTY3.ICO"
219   -
220 218 IDI_APPICON4 ICON "MTTTY4.ICO"
221 219
222   -IDI_TITLE ICON "Optek_Logo_ICO_32 X 32.ico"
223 220 /////////////////////////////////////////////////////////////////////////////
224 221 //
225 222 // Menu
226 223 //
227 224
228   -IDR_MTTTYMENU MENU
  225 +IDR_MTTTYMENU MENU
229 226 BEGIN
230 227 POPUP "&File"
231 228 BEGIN
232 229 MENUITEM "Connect", ID_FILE_CONNECT
233 230 MENUITEM "Disconnect", ID_FILE_DISCONNECT
234 231 MENUITEM SEPARATOR
235   - MENUITEM "E&xit\tF3", ID_FILE_EXIT
  232 + MENUITEM "E&xit\tF3", ID_FILE_EXIT
236 233 END
237 234 POPUP "&TTY"
238 235 BEGIN
... ... @@ -329,12 +326,8 @@ END
329 326 //
330 327
331 328 #ifdef APSTUDIO_INVOKED
332   -GUIDELINES DESIGNINFO
  329 +GUIDELINES DESIGNINFO
333 330 BEGIN
334   - IDD_ABOUT, DIALOG
335   - BEGIN
336   - END
337   -
338 331 IDD_TOOLBARSETTINGS, DIALOG
339 332 BEGIN
340 333 BOTTOMMARGIN, 48
... ... @@ -342,21 +335,10 @@ BEGIN
342 335
343 336 IDD_STATUSDIALOG, DIALOG
344 337 BEGIN
  338 + RIGHTMARGIN, 459
345 339 TOPMARGIN, 1
346 340 END
347 341
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 342 IDD_GETADWORD, DIALOG
361 343 BEGIN
362 344 LEFTMARGIN, 7
... ... @@ -373,34 +355,23 @@ END
373 355 // AFX_DIALOG_LAYOUT
374 356 //
375 357
376   -IDD_STATUSDIALOG AFX_DIALOG_LAYOUT
  358 +IDD_STATUSDIALOG AFX_DIALOG_LAYOUT
377 359 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
  360 + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
  361 + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
  362 + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
  363 + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
  364 + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
  365 + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
  366 + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
  367 + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
  368 + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0064, 0x0064
  369 +
399 370 END
400 371
401   -IDD_TOOLBARSETTINGS AFX_DIALOG_LAYOUT
  372 +IDD_TOOLBARSETTINGS AFX_DIALOG_LAYOUT
402 373 BEGIN
403   - 0
  374 + 0x0000
404 375 END
405 376
406 377 #endif // Ó¢Óï(ÃÀ¹ú) resources
... ...
... ... @@ -148,7 +148,7 @@
148 148 AssemblerListingLocation=".\Debug/"
149 149 ObjectFile=".\Debug/"
150 150 ProgramDataBaseFileName=".\Debug/"
151   - WarningLevel="3"
  151 + WarningLevel="1"
152 152 SuppressStartupBanner="true"
153 153 DebugInformationFormat="4"
154 154 />
... ... @@ -465,6 +465,10 @@
465 465 RelativePath="MTTTY4.ICO"
466 466 >
467 467 </File>
  468 + <File
  469 + RelativePath=".\Optek_Logo_ICO_32 X 32.ico"
  470 + >
  471 + </File>
468 472 </Filter>
469 473 </Files>
470 474 <Globals>
... ...
... ... @@ -815,6 +815,43 @@ BOOL CALLBACK ToolbarProc(HWND hWndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
815 815 }
816 816 fRet = FALSE;
817 817 break;
  818 + case IDC_BUTTON2_SEC_BINFILE:
  819 +{
  820 + if (strlen(TTYInfo.szFileName) == 0)
  821 + {
  822 + #ifdef __OPTEK_EDIT__
  823 + char * szFilter = "bin Files\0*.bin\0";
  824 + #else
  825 + char * szFilter = "Text Files\0*.TXT\0";
  826 + #endif
  827 + OPENFILENAME ofn = { 0 };
  828 + ofn.lStructSize = sizeof(OPENFILENAME);
  829 + ofn.hwndOwner = ghWndTTY;
  830 + ofn.lpstrFilter = szFilter;
  831 + ofn.lpstrFile = TTYInfo.szFileName;
  832 + ofn.nMaxFile = MAX_PATH;
  833 + #ifdef __OPTEK_EDIT__
  834 + ofn.lpstrTitle = "Select file";
  835 + #else
  836 + ofn.lpstrTitle = "Send File";
  837 + #endif
  838 + ofn.Flags = OFN_FILEMUSTEXIST;
  839 + if (!GetOpenFileName(&ofn)) break;
  840 + if (strlen(TTYInfo.szFileName) != 0)
  841 + {
  842 + SetWindowText(GetDlgItem(hWndDlg, IDC_STATIC_BINPATH), TTYInfo.szFileName);
  843 + ShowWindow(GetDlgItem(hWndDlg, IDC_BUTTON2_SEC_BINFILE),0);
  844 + //SetWindowText(GetDlgItem(hWndDlg, IDC_BUTTON2_SEC_BINFILE), "ÏÂÔØÈí¼þ");
  845 + }
  846 +
  847 + #ifdef __OPTEK_EDIT__
  848 + UpdateStatus(TTYInfo.szFileName);
  849 + #else
  850 + if (TRUE)
  851 + TransferFileTextStart(TTYInfo.szFileName);
  852 + #endif
  853 + }
  854 + } break;
818 855
819 856 #ifdef __OPTEK_EDIT__
820 857 case IDC_SENDBTN: // send button pressed
... ...
1 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 5 #define IDR_MTTTYMENU 101
6 6 #define IDR_MTTTYACCELERATOR 102
  7 +#define IDI_TITLE 102
7 8 #define IDI_APPICON 103
8 9 #define IDD_TOOLBARSETTINGS 103
9 10 #define ID_TTYWINDOW 103
... ... @@ -16,7 +17,6 @@
16 17 #define IDD_TIMEOUTSDLG 110
17 18 #define IDI_APPICON4 111
18 19 #define IDD_GETADWORD 111
19   -#define IDI_TITLE 102
20 20 #define IDC_PORTCOMBO 1000
21 21 #define IDC_BAUDCOMBO 1001
22 22 #define IDC_PARITYCOMBO 1002
... ... @@ -92,6 +92,9 @@
92 92 #define IDC_DWORDSTATIC 1081
93 93 #define IDC_DWORDEDIT 1082
94 94 #define IDC_DISPLAYTIMEOUTS 1083
  95 +#define IDC_STATIC_BINPATH 1085
  96 +#define IDC_BUTTON1 1086
  97 +#define IDC_BUTTON2_SEC_BINFILE 1086
95 98 #define ID_FILE_EXIT 40001
96 99 #define ID_HELP_ABOUTMTTTY 40002
97 100 #define ID_FILE_CONNECT 40004
... ... @@ -110,7 +113,7 @@
110 113 #ifndef APSTUDIO_READONLY_SYMBOLS
111 114 #define _APS_NEXT_RESOURCE_VALUE 115
112 115 #define _APS_NEXT_COMMAND_VALUE 40021
113   -#define _APS_NEXT_CONTROL_VALUE 1085
  116 +#define _APS_NEXT_CONTROL_VALUE 1087
114 117 #define _APS_NEXT_SYMED_VALUE 104
115 118 #endif
116 119 #endif
... ...
Please register or login to post a comment