Commit 68062b2d8ec9a5f899a4c5e0c2b2143c7437f8cc

Authored by xiemeng
1 parent 02eeb6f9

下载功能从菜单换成按钮

Showing 2 changed files with 39 additions and 14 deletions
@@ -351,6 +351,36 @@ void CmdDispatch(int iMenuChoice, HWND hwnd, LPARAM lParam) @@ -351,6 +351,36 @@ void CmdDispatch(int iMenuChoice, HWND hwnd, LPARAM lParam)
351 CmdAbout(hwnd); 351 CmdAbout(hwnd);
352 break; 352 break;
353 case ID_TRANSFER_SENDFILETEXT: 353 case ID_TRANSFER_SENDFILETEXT:
  354 + {
  355 +#ifdef __OPTEK_EDIT__
  356 + char * szFilter = "bin Files\0*.bin\0";
  357 +#else
  358 + char * szFilter = "Text Files\0*.TXT\0";
  359 +#endif
  360 + OPENFILENAME ofn = {0};
  361 +
  362 + ofn.lStructSize = sizeof(OPENFILENAME);
  363 + ofn.hwndOwner = hwnd;
  364 + ofn.lpstrFilter = szFilter;
  365 + ofn.lpstrFile = TTYInfo.szFileName;
  366 + ofn.nMaxFile = MAX_PATH;
  367 +#ifdef __OPTEK_EDIT__
  368 + ofn.lpstrTitle = "Select file";
  369 +#else
  370 + ofn.lpstrTitle = "Send File";
  371 +#endif
  372 + ofn.Flags = OFN_FILEMUSTEXIST;
  373 +
  374 + if (!GetOpenFileName(&ofn))
  375 + break;
  376 +
  377 +#ifdef __OPTEK_EDIT__
  378 + UpdateStatus(TTYInfo.szFileName);
  379 +#else
  380 + if (TRUE)
  381 + TransferFileTextStart(TTYInfo.szFileName);
  382 +#endif
  383 + }
354 384
355 break; 385 break;
356 case ID_TRANSFER_RECEIVEFILETEXT: 386 case ID_TRANSFER_RECEIVEFILETEXT:
@@ -954,11 +984,6 @@ BOOL ResizeAllWindow(DWORD mainwidth, WORD mainheigh) @@ -954,11 +984,6 @@ BOOL ResizeAllWindow(DWORD mainwidth, WORD mainheigh)
954 rect_stauts.right -rect_stauts.left, 984 rect_stauts.right -rect_stauts.left,
955 rect_stauts.bottom -rect_stauts.top, 985 rect_stauts.bottom -rect_stauts.top,
956 TRUE); 986 TRUE);
957 - MoveWindow(GetDlgItem(ghWndStatusDlg, IDC_TRANSFERPROGRESS),  
958 - rect_stauts.left,  
959 - rect_stauts.top,  
960 - rect_stauts.right -rect_stauts.left,  
961 - rect_stauts.bottom -rect_stauts.top,  
962 - TRUE); 987 + //MoveWindow(GetDlgItem(ghWndStatusDlg, IDC_TRANSFERPROGRESS),rect_stauts.left,rect_stauts.top, rect_stauts.right -rect_stauts.left,rect_stauts.bottom -rect_stauts.top,TRUE);
963 988
964 } 989 }
@@ -12,12 +12,12 @@ @@ -12,12 +12,12 @@
12 #undef APSTUDIO_READONLY_SYMBOLS 12 #undef APSTUDIO_READONLY_SYMBOLS
13 13
14 ///////////////////////////////////////////////////////////////////////////// 14 /////////////////////////////////////////////////////////////////////////////
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_CHS)
18 #ifdef _WIN32 18 #ifdef _WIN32
19 -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US  
20 -#pragma code_page(1252) 19 +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
  20 +#pragma code_page(936)
21 #endif //_WIN32 21 #endif //_WIN32
22 22
23 ///////////////////////////////////////////////////////////////////////////// 23 /////////////////////////////////////////////////////////////////////////////
@@ -78,9 +78,9 @@ BEGIN @@ -78,9 +78,9 @@ BEGIN
78 CONTROL "No Writing",IDC_NOWRITINGCHK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,341,89,58,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 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 80 CONTROL "No Events",IDC_NOEVENTSCHK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,341,99,68,10
81 - PUSHBUTTON "Send",IDC_SENDBTN,100,0,50,12,NOT WS_VISIBLE 81 + PUSHBUTTON "Download",IDC_SENDBTN,100,0,50,12
82 EDITTEXT IDC_STATIC_BINPATH,0,13,192,12,ES_AUTOHSCROLL | ES_READONLY 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 83 + PUSHBUTTON "Select Bin",IDC_BUTTON2_SEC_BINFILE,50,0,50,12
84 END 84 END
85 85
86 IDD_STATUSDIALOG DIALOGEX 0, 0, 460, 132 86 IDD_STATUSDIALOG DIALOGEX 0, 0, 460, 132
@@ -88,7 +88,7 @@ STYLE DS_ABSALIGN | DS_SETFONT | WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_BO @@ -88,7 +88,7 @@ STYLE DS_ABSALIGN | DS_SETFONT | WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_BO
88 FONT 8, "MS Sans Serif", 0, 0, 0x0 88 FONT 8, "MS Sans Serif", 0, 0, 0x0
89 BEGIN 89 BEGIN
90 PUSHBUTTON "",IDC_ABORTBTN,0,1,44,16,NOT WS_VISIBLE 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 91 + CONTROL "Generic1",IDC_TRANSFERPROGRESS,"msctls_progress32",PBS_SMOOTH | NOT WS_VISIBLE | WS_BORDER,0,20,44,19
92 CONTROL "CTS",IDC_STATCTS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,273,50,26,10 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 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 94 CONTROL "RING",IDC_STATRING,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,336,50,30,10
@@ -374,7 +374,7 @@ BEGIN @@ -374,7 +374,7 @@ BEGIN
374 0x0000 374 0x0000
375 END 375 END
376 376
377 -#endif // Ó¢Óï(ÃÀ¹ú) resources 377 +#endif // 中文(中华人民共和国) resources
378 ///////////////////////////////////////////////////////////////////////////// 378 /////////////////////////////////////////////////////////////////////////////
379 379
380 380
Please register or login to post a comment