Index: src/ch/AboutDlg.cpp =================================================================== diff -u -re701ed2460c2558eeefab55a1f3ed1d2c89a56c0 -r4ee5b2305c2ed7776e64e7fbd52952ccfd2a8dd8 --- src/ch/AboutDlg.cpp (.../AboutDlg.cpp) (revision e701ed2460c2558eeefab55a1f3ed1d2c89a56c0) +++ src/ch/AboutDlg.cpp (.../AboutDlg.cpp) (revision 4ee5b2305c2ed7776e64e7fbd52952ccfd2a8dd8) @@ -62,67 +62,27 @@ } } -void CAboutDlg::UpdateThanks() -{ - CEdit* pEdit=(CEdit*)GetDlgItem(IDC_THANX_EDIT); - if (pEdit == NULL) - return; - - // get the info about current translations - TCHAR szData[1024]; - GetConfig()->GetStringValue(PP_PLANGDIR, szData, 1024); - GetApp()->ExpandPath(szData); - vector vData; - GetResManager()->Scan(szData, &vData); - - // format the info - TCHAR szTI[8192]; - szTI[0]=_T('\0'); - for (vector::iterator it=vData.begin();it!=vData.end();it++) - { - _stprintf(szData, _T("%s\t\t%s [%s%lu, %s%s]\r\n"), it->GetAuthor(), it->GetLangName(), GetResManager()->LoadString(IDS_LANGCODE_STRING), it->GetLangCode(), GetResManager()->LoadString(IDS_LANGVER_STRING), it->GetVersion()); - _tcscat(szTI, szData); - } - - TCHAR szText[16384]; - _sntprintf(szText, 16384, GetResManager()->LoadString(IDR_THANKS_TEXT), szTI); - szText[16383]=0; - pEdit->SetWindowText(szText); -} - BOOL CAboutDlg::OnInitDialog() { CHLanguageDialog::OnInitDialog(); UpdateProgramVersion(); - UpdateThanks(); return TRUE; } void CAboutDlg::OnLanguageChanged(WORD /*wOld*/, WORD /*wNew*/) { UpdateProgramVersion(); - UpdateThanks(); } BOOL CAboutDlg::OnTooltipText(UINT uiID, TOOLTIPTEXT* pTip) { switch(uiID) { case IDC_HOMEPAGELINK_STATIC: - case IDC_HOMEPAGELINK2_STATIC: case IDC_CONTACT1LINK_STATIC: case IDC_CONTACT2LINK_STATIC: - case IDC_CONTACT3LINK_STATIC: - case IDC_GENFORUMPAGELINK_STATIC: - case IDC_GENFORUMSUBSCRIBELINK_STATIC: - case IDC_GENFORUMUNSUBSCRIBELINK_STATIC: - case IDC_GENFORUMSENDLINK_STATIC: - case IDC_DEVFORUMPAGELINK_STATIC: - case IDC_DEVFORUMSUBSCRIBELINK_STATIC: - case IDC_DEVFORUMUNSUBSCRIBELINK_STATIC: - case IDC_DEVFORUMSENDLINK_STATIC: { HWND hWnd=::GetDlgItem(this->m_hWnd, uiID); if (!hWnd) Index: src/ch/AboutDlg.h =================================================================== diff -u -r3493e9fc470285b0a0b417d50be281467a071eb7 -r4ee5b2305c2ed7776e64e7fbd52952ccfd2a8dd8 --- src/ch/AboutDlg.h (.../AboutDlg.h) (revision 3493e9fc470285b0a0b417d50be281467a071eb7) +++ src/ch/AboutDlg.h (.../AboutDlg.h) (revision 4ee5b2305c2ed7776e64e7fbd52952ccfd2a8dd8) @@ -28,7 +28,6 @@ ~CAboutDlg(); void UpdateProgramVersion(); - void UpdateThanks(); virtual void OnLanguageChanged(WORD wOld, WORD wNew); virtual BOOL OnTooltipText(UINT uiID, TOOLTIPTEXT* pTip); Index: src/ch/ch.rc =================================================================== diff -u -re701ed2460c2558eeefab55a1f3ed1d2c89a56c0 -r4ee5b2305c2ed7776e64e7fbd52952ccfd2a8dd8 --- src/ch/ch.rc (.../ch.rc) (revision e701ed2460c2558eeefab55a1f3ed1d2c89a56c0) +++ src/ch/ch.rc (.../ch.rc) (revision 4ee5b2305c2ed7776e64e7fbd52952ccfd2a8dd8) @@ -28,13 +28,6 @@ ///////////////////////////////////////////////////////////////////////////// // -// 25 -// - -IDR_THANKS_TEXT 25 "res\\thanks.txt" - -///////////////////////////////////////////////////////////////////////////// -// // Icon // @@ -768,48 +761,20 @@ HIDC_HELP_BUTTON END -IDD_ABOUTBOX DIALOGEX 0, 0, 369, 249 +IDD_ABOUTBOX DIALOGEX 0, 0, 369, 150 STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "About ..." FONT 8, "Tahoma", 0, 0, 0x1 BEGIN - DEFPUSHBUTTON "&OK",IDOK,306,228,56,14,WS_GROUP,0,HIDOK - ICON IDR_MAINFRAME,IDC_STATIC,11,14,20,20 - CTEXT "Copyright (C) 2001-2004 J�zef Starosczyk", + DEFPUSHBUTTON "&OK",IDOK,306,129,56,14,WS_GROUP,0,HIDOK + ICON IDR_MAINFRAME,IDC_STATIC,11,14,21,20 + CTEXT "Copyright (C) 2001-2007 J�zef Starosczyk", IDC_COPYRIGHT_STATIC,40,80,322,8 - LTEXT "General discussion forum:",IDC_GENFORUM_STATIC,46,124, - 98,8 - LTEXT "Developers' discussion forum: ",IDC_DEVFORUM_STATIC,46, - 137,98,8 - LTEXT "Special thanks list:",IDC_THANX_STATIC,46,154,316,8 - EDITTEXT IDC_THANX_EDIT,46,164,316,54,ES_MULTILINE | ES_READONLY | - NOT WS_BORDER | WS_VSCROLL,WS_EX_STATICEDGE, - HIDC_THANX_EDIT CONTROL "http://www.copyhandler.com|http://www.copyhandler.com", IDC_HOMEPAGELINK_STATIC,"STATICEX",0x1,257,7,105,8 CONTROL "ixen@copyhandler.com|mailto:ixen@copyhandler.com", IDC_CONTACT1LINK_STATIC,"STATICEX",0x1,257,41,105,8 - CONTROL "Page|http://groups.yahoo.com/group/copyhandler", - IDC_GENFORUMPAGELINK_STATIC,"STATICEX",0x1,155,124,33,8 - CONTROL "Page|http://groups.yahoo.com/group/chdev", - IDC_DEVFORUMPAGELINK_STATIC,"STATICEX",0x1,155,137,33,8 - CONTROL "Subscribe|mailto:copyhandler-subscribe@yahoogroups.com", - IDC_GENFORUMSUBSCRIBELINK_STATIC,"STATICEX",0x1,198,124, - 44,8 - CONTROL "Subscribe|mailto:chdev-subscribe@yahoogroups.com", - IDC_DEVFORUMSUBSCRIBELINK_STATIC,"STATICEX",0x1,198,137, - 44,8 - CONTROL "Unsubscribe|mailto:copyhandler-unsubscribe@yahoogroups.com", - IDC_GENFORUMUNSUBSCRIBELINK_STATIC,"STATICEX",0x1,251, - 124,48,8 - CONTROL "Unsubscribe|mailto:chdev-unsubscribe@yahoogroups.com", - IDC_DEVFORUMUNSUBSCRIBELINK_STATIC,"STATICEX",0x1,251, - 137,48,8 - CONTROL "Send message|mailto:copyhandler@yahoogroups.com", - IDC_GENFORUMSENDLINK_STATIC,"STATICEX",0x1,307,124,55,8 - CONTROL "Send message|mailto:chdev@yahoogroups.com", - IDC_DEVFORUMSENDLINK_STATIC,"STATICEX",0x1,307,137,55,8 CONTROL "",IDC_PROGRAM_STATICEX,"STATICEX",0x30,39,7,122,10 CONTROL "",IDC_FULLVERSION_STATICEX,"STATICEX",0x10,39,20,109,8 CONTROL "Home page:",IDC_HOMEPAGE_STATICEX,"STATICEX",0x10,185,7, @@ -818,19 +783,14 @@ 68,8 CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,39,92,323,1 CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,39,120,323,1 - CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,41,148,321,1 - CONTROL "This program is free software and may be distributed according to the terms of the GNU General Public License.", + CONTROL "This program is free software and may be distributed according to the terms of the GNU General Public License version 2.", IDC_LICENSE_STATICEX,"STATICEX",0x90,46,98,310,16 - CONTROL "http://www.copyhandler.prv.pl|http://www.copyhandler.prv.pl", - IDC_HOMEPAGELINK2_STATIC,"STATICEX",0x1,257,17,105,8 CONTROL "Author:",IDC_CONTACTAUTHOR_STATICEX,"STATICEX",0x50,185, 41,68,8 CONTROL "support@copyhandler.com|mailto:support@copyhandler.com", IDC_CONTACT2LINK_STATIC,"STATICEX",0x1,257,55,105,8 CONTROL "Support:",IDC_CONTACTSUPPORT_STATICEX,"STATICEX",0x50, 185,55,68,8 - CONTROL "copyhandler@o2.pl|mailto:copyhandler@o2.pl", - IDC_CONTACT3LINK_STATIC,"STATICEX",0x1,257,66,105,8 END @@ -858,14 +818,14 @@ BEGIN VALUE "Comments", "Program for copying files/folders" VALUE "CompanyName", " " - VALUE "FileDescription", "Copy Handler v. 1.28 development snapshot" + VALUE "FileDescription", "Copy Handler v.1.28-dev" VALUE "FileVersion", "1.28.43.1507" VALUE "InternalName", "Copy Handler" - VALUE "LegalCopyright", "Copyright (C) 2001-2006 J�zef Starosczyk" + VALUE "LegalCopyright", "Copyright (C) 2001-2007 J�zef Starosczyk" VALUE "LegalTrademarks", " " VALUE "OriginalFilename", "COPY HANDLER.EXE" VALUE "PrivateBuild", " " - VALUE "ProductName", "Copy Handler v. 1.28 development version" + VALUE "ProductName", "Copy Handler v.1.28-dev" VALUE "ProductVersion", "1.28.43.1507" VALUE "SpecialBuild", " " END @@ -1010,7 +970,7 @@ LEFTMARGIN, 7 RIGHTMARGIN, 362 TOPMARGIN, 7 - BOTTOMMARGIN, 242 + BOTTOMMARGIN, 143 END END #endif // APSTUDIO_INVOKED Index: src/ch/ch.vcproj =================================================================== diff -u -re701ed2460c2558eeefab55a1f3ed1d2c89a56c0 -r4ee5b2305c2ed7776e64e7fbd52952ccfd2a8dd8 --- src/ch/ch.vcproj (.../ch.vcproj) (revision e701ed2460c2558eeefab55a1f3ed1d2c89a56c0) +++ src/ch/ch.vcproj (.../ch.vcproj) (revision 4ee5b2305c2ed7776e64e7fbd52952ccfd2a8dd8) @@ -585,9 +585,6 @@ - - Index: src/ch/resource.h =================================================================== diff -u -r3493e9fc470285b0a0b417d50be281467a071eb7 -r4ee5b2305c2ed7776e64e7fbd52952ccfd2a8dd8 --- src/ch/resource.h (.../resource.h) (revision 3493e9fc470285b0a0b417d50be281467a071eb7) +++ src/ch/resource.h (.../resource.h) (revision 4ee5b2305c2ed7776e64e7fbd52952ccfd2a8dd8) @@ -1,6 +1,6 @@ //{{NO_DEPENDENCIES}} -// Microsoft Developer Studio generated include file. -// Used by Copy Handler.rc +// Microsoft Visual C++ generated include file. +// Used by ch.rc // #define IDR_MANIFEST 1 #define RT_TEXT 25 @@ -56,7 +56,6 @@ #define IDD_SHORTCUTEDIT_DIALOG 208 #define IDD_RECENTEDIT_DIALOG 209 #define IDC_ABOUTBOX 210 -#define IDR_THANKS_TEXT 211 #define IDC_PROGRAM_STATIC 1000 #define IDC_ADDFILE_BUTTON 1002 #define IDC_STATUS_LIST 1003 Index: src/ch/resource.hm =================================================================== diff -u -r3493e9fc470285b0a0b417d50be281467a071eb7 -r4ee5b2305c2ed7776e64e7fbd52952ccfd2a8dd8 --- src/ch/resource.hm (.../resource.hm) (revision 3493e9fc470285b0a0b417d50be281467a071eb7) +++ src/ch/resource.hm (.../resource.hm) (revision 4ee5b2305c2ed7776e64e7fbd52952ccfd2a8dd8) @@ -1,5 +1,5 @@ -// Microsoft Developer Studio generated Help ID include file. -// Used by Copy Handler.rc +// Microsoft Visual C++ generated Help ID include file. +// Used by ch.rc // #define HIDCANCEL 0x80890002 // IDD_BUFFERSIZE_DIALOG [English (U.S.)] #define HIDC_ADDDIR_BUTTON 0x809503f3 // IDD_CUSTOM_COPY_DIALOG [English (U.S.)] @@ -22,9 +22,6 @@ #define HIDC_CDROMMULTIPLIER_COMBO 0x80890476 // IDD_BUFFERSIZE_DIALOG [English (U.S.)] #define HIDC_CDROMSIZE_EDIT 0x80890475 // IDD_BUFFERSIZE_DIALOG [English (U.S.)] #define HIDC_CHANGE_BUTTON 0x80d104a1 // IDD_RECENTEDIT_DIALOG [English (U.S.)] -#define HIDC_CONTACT1LINK_STATIC 0x806404b6 // IDD_ABOUTBOX [English (U.S.)] -#define HIDC_CONTACT2LINK_STATIC 0x806404b7 // IDD_ABOUTBOX [English (U.S.)] -#define HIDC_CONTACT3LINK_STATIC 0x806404c1 // IDD_ABOUTBOX [English (U.S.)] #define HIDC_COPY_REST_ALL_BUTTON 0x80a40452 // IDD_FEEDBACK_REPLACE_FILES_DIALOG [English (U.S.)] #define HIDC_COPY_REST_BUTTON 0x80a4044f // IDD_FEEDBACK_REPLACE_FILES_DIALOG [English (U.S.)] #define HIDC_COUNT_EDIT 0x8095045f // IDD_CUSTOM_COPY_DIALOG [English (U.S.)] @@ -47,12 +44,6 @@ #define HIDC_DEST_FILENAME_EDIT 0x80a20445 // IDD_FEEDBACK_IGNOREWAITRETRY_DIALOG [English (U.S.)] #define HIDC_DEST_FILESIZE_EDIT 0x80a20446 // IDD_FEEDBACK_IGNOREWAITRETRY_DIALOG [English (U.S.)] #define HIDC_DEST_MODIFYTIME_EDIT 0x80a20448 // IDD_FEEDBACK_IGNOREWAITRETRY_DIALOG [English (U.S.)] -#define HIDC_DEVFORUMPAGELINK_STATIC 0x806404bc // IDD_ABOUTBOX [English (U.S.)] -#define HIDC_DEVFORUMSENDLINK_STATIC 0x806404bf // IDD_ABOUTBOX [English (U.S.)] -#define HIDC_DEVFORUMSUBSCRIBELINK_STATIC \ - 0x806404bd // IDD_ABOUTBOX [English (U.S.)] -#define HIDC_DEVFORUMUNSUBSCRIBELINK_STATIC \ - 0x806404be // IDD_ABOUTBOX [English (U.S.)] #define HIDC_DIRECTORY_CHECK 0x80c30497 // IDD_FILTER_DIALOG [English (U.S.)] #define HIDC_DOWN_BUTTON 0x80d004a9 // IDD_SHORTCUTEDIT_DIALOG [English (U.S.)] #define HIDC_ERRORS_EDIT 0x8083047b // IDD_STATUS_DIALOG [English (U.S.)] @@ -66,16 +57,8 @@ #define HIDC_FILTER_CHECK 0x80c3047e // IDD_FILTER_DIALOG [English (U.S.)] #define HIDC_FILTER_COMBO 0x80c3047d // IDD_FILTER_DIALOG [English (U.S.)] #define HIDC_FORCEDIRECTORIES_CHECK 0x809503fc // IDD_CUSTOM_COPY_DIALOG [English (U.S.)] -#define HIDC_GENFORUMPAGELINK_STATIC 0x806404b8 // IDD_ABOUTBOX [English (U.S.)] -#define HIDC_GENFORUMSENDLINK_STATIC 0x806404bb // IDD_ABOUTBOX [English (U.S.)] -#define HIDC_GENFORUMSUBSCRIBELINK_STATIC \ - 0x806404b9 // IDD_ABOUTBOX [English (U.S.)] -#define HIDC_GENFORUMUNSUBSCRIBELINK_STATIC \ - 0x806404ba // IDD_ABOUTBOX [English (U.S.)] #define HIDC_HELP_BUTTON 0x808904e9 // IDD_BUFFERSIZE_DIALOG [English (U.S.)] #define HIDC_HIDDEN_CHECK 0x80c3048d // IDD_FILTER_DIALOG [English (U.S.)] -#define HIDC_HOMEPAGELINK2_STATIC 0x806404b3 // IDD_ABOUTBOX [English (U.S.)] -#define HIDC_HOMEPAGELINK_STATIC 0x806404b2 // IDD_ABOUTBOX [English (U.S.)] #define HIDC_IGNOREFOLDERS_CHECK 0x809503f7 // IDD_CUSTOM_COPY_DIALOG [English (U.S.)] #define HIDC_IGNORE_ALL_BUTTON 0x80a7044a // IDD_FEEDBACK_DSTFILE_DIALOG [English (U.S.)] #define HIDC_IGNORE_BUTTON 0x80a70449 // IDD_FEEDBACK_DSTFILE_DIALOG [English (U.S.)] @@ -136,7 +119,6 @@ #define HIDC_STATUS_LIST 0x808303eb // IDD_STATUS_DIALOG [English (U.S.)] #define HIDC_STICK_BUTTON 0x80830462 // IDD_STATUS_DIALOG [English (U.S.)] #define HIDC_SYSTEM_CHECK 0x80c3048e // IDD_FILTER_DIALOG [English (U.S.)] -#define HIDC_THANX_EDIT 0x806404ae // IDD_ABOUTBOX [English (U.S.)] #define HIDC_TIME1_DATETIMEPICKER 0x80c30492 // IDD_FILTER_DIALOG [English (U.S.)] #define HIDC_TIME2_DATETIMEPICKER 0x80c30496 // IDD_FILTER_DIALOG [English (U.S.)] #define HIDC_TIME_STATIC 0x8083040d // IDD_STATUS_DIALOG [English (U.S.)]