Index: scripts/jenkins/prepare-portable-package.bat =================================================================== diff -u -r6b464cfe96c1828308331ff3731db364db830576 -r1c366a50e84393bce67e50dcccc4fc5ff147db27 --- scripts/jenkins/prepare-portable-package.bat (.../prepare-portable-package.bat) (revision 6b464cfe96c1828308331ff3731db364db830576) +++ scripts/jenkins/prepare-portable-package.bat (.../prepare-portable-package.bat) (revision 1c366a50e84393bce67e50dcccc4fc5ff147db27) @@ -25,7 +25,6 @@ xcopy "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Redist\MSVC\14.16.27012\x86\Microsoft.VC141.MFC\*" "%TmpDir%\32bit\" || exit /B 1 xcopy "C:\Program Files (x86)\Windows Kits\8.1\Debuggers\x86\dbghelp.dll" "%TmpDir%\32bit\" || exit /B 1 xcopy "C:\Program Files (x86)\Windows Kits\10\Redist\10.0.17763.0\ucrt\DLLs\x86\*" "%TmpDir%\32bit\" || exit /B 1 -xcopy /E /I "%WORKSPACE%\bin\release\help" "%TmpDir%\32bit\help" || exit /B 1 xcopy /E /I "%WORKSPACE%\bin\release\langs" "%TmpDir%\32bit\langs" || exit /B 1 rem Prepare 64bit build @@ -46,7 +45,6 @@ xcopy "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Redist\MSVC\14.16.27012\x64\Microsoft.VC141.MFC\*" "%TmpDir%\64bit\" || exit /B 1 xcopy "C:\Program Files (x86)\Windows Kits\8.1\Debuggers\x64\dbghelp.dll" "%TmpDir%\64bit\" || exit /B 1 xcopy "C:\Program Files (x86)\Windows Kits\10\Redist\10.0.17763.0\ucrt\DLLs\x64\*" "%TmpDir%\64bit\" || exit /B 1 -xcopy /E /I "%WORKSPACE%\bin\release\help" "%TmpDir%\64bit\help" || exit /B 1 xcopy /E /I "%WORKSPACE%\bin\release\langs" "%TmpDir%\64bit\langs" || exit /B 1 rem Prepare 32bit shell extension for 64bit build Index: scripts/setup.iss =================================================================== diff -u -ra9fc065f3dfe647a5b72b3363c830267678e59eb -r1c366a50e84393bce67e50dcccc4fc5ff147db27 --- scripts/setup.iss (.../setup.iss) (revision a9fc065f3dfe647a5b72b3363c830267678e59eb) +++ scripts/setup.iss (.../setup.iss) (revision 1c366a50e84393bce67e50dcccc4fc5ff147db27) @@ -101,7 +101,6 @@ Name: startatboot; Description: {cm:StartAtBoot}; Flags: unchecked [Files] -Source: "..\bin\release\help\*.chm"; DestDir: "{app}\help"; Flags: ignoreversion recursesubdirs createallsubdirs restartreplace uninsrestartdelete Source: "..\bin\release\langs\*.lng"; DestDir: "{app}\langs"; Flags: ignoreversion recursesubdirs createallsubdirs restartreplace uninsrestartdelete Source: "..\License.txt"; DestDir: "{app}"; Flags: ignoreversion restartreplace uninsrestartdelete @@ -170,7 +169,6 @@ Root: "HKLM"; Subkey: "SOFTWARE\Microsoft\Windows\CurrentVersion\Run"; ValueType: none; ValueName: "Copy Handler"; Flags: deletevalue uninsdeletevalue [Dirs] -Name: {app}\help; Flags: uninsalwaysuninstall Name: {app}\langs; Flags: uninsalwaysuninstall [CustomMessages] Index: src/ch/CustomCopyDlg.cpp =================================================================== diff -u -r2e4eacb299f21d06196fe13140b4b0d095abdca9 -r1c366a50e84393bce67e50dcccc4fc5ff147db27 --- src/ch/CustomCopyDlg.cpp (.../CustomCopyDlg.cpp) (revision 2e4eacb299f21d06196fe13140b4b0d095abdca9) +++ src/ch/CustomCopyDlg.cpp (.../CustomCopyDlg.cpp) (revision 1c366a50e84393bce67e50dcccc4fc5ff147db27) @@ -145,7 +145,6 @@ AddResizableControl(IDC_BAR5_STATIC, 0.0, 1.0, 1.0, 0.0); AddResizableControl(IDOK, 1.0, 1.0, 0.0, 0.0); AddResizableControl(IDCANCEL, 1.0, 1.0, 0.0, 0.0); - AddResizableControl(IDC_HELP_BUTTON, 1.0, 1.0, 0.0, 0.0); AddResizableControl(IDC_EXPORT_BUTTON, 0.0, 1.0, 0.0, 0.0); InitializeResizableControls(); Index: src/ch/MainWnd.cpp =================================================================== diff -u -rf84eecda89d8734da9790a2b8d4a54d344e40c46 -r1c366a50e84393bce67e50dcccc4fc5ff147db27 --- src/ch/MainWnd.cpp (.../MainWnd.cpp) (revision f84eecda89d8734da9790a2b8d4a54d344e40c46) +++ src/ch/MainWnd.cpp (.../MainWnd.cpp) (revision 1c366a50e84393bce67e50dcccc4fc5ff147db27) @@ -154,7 +154,6 @@ ON_COMMAND(ID_POPUP_REGISTERDLL, OnPopupRegisterdll) ON_COMMAND(ID_POPUP_UNREGISTERDLL, OnPopupUnregisterdll) ON_COMMAND(ID_APP_EXIT, OnAppExit) - ON_COMMAND(ID_POPUP_HELP, OnPopupHelp) //}}AFX_MSG_MAP ON_MESSAGE(WM_ICON_NOTIFY, OnTrayNotification) ON_COMMAND(ID_POPUP_CHECKFORUPDATES, &CMainWnd::OnPopupCheckForUpdates) @@ -790,11 +789,6 @@ PostMessage(WM_CLOSE); } -void CMainWnd::OnPopupHelp() -{ - GetApp().HtmlHelp(HH_DISPLAY_TOPIC, 0); -} - void CMainWnd::OnPopupCheckForUpdates() { CUpdaterDlg* pDlg = new CUpdaterDlg(false); Index: src/ch/MainWnd.h =================================================================== diff -u -r0d5b67ee96b435d63f7bf075dc8e28603793b187 -r1c366a50e84393bce67e50dcccc4fc5ff147db27 --- src/ch/MainWnd.h (.../MainWnd.h) (revision 0d5b67ee96b435d63f7bf075dc8e28603793b187) +++ src/ch/MainWnd.h (.../MainWnd.h) (revision 1c366a50e84393bce67e50dcccc4fc5ff147db27) @@ -69,7 +69,6 @@ afx_msg void OnPopupRegisterdll(); afx_msg void OnPopupUnregisterdll(); afx_msg void OnAppExit(); - afx_msg void OnPopupHelp(); afx_msg LRESULT OnTrayNotification(WPARAM wParam, LPARAM lParam); afx_msg void OnPopupCheckForUpdates(); Index: src/ch/RecentDlg.cpp =================================================================== diff -u -r8068e0c351055554340ac9755d1bc846893bf2b8 -r1c366a50e84393bce67e50dcccc4fc5ff147db27 --- src/ch/RecentDlg.cpp (.../RecentDlg.cpp) (revision 8068e0c351055554340ac9755d1bc846893bf2b8) +++ src/ch/RecentDlg.cpp (.../RecentDlg.cpp) (revision 1c366a50e84393bce67e50dcccc4fc5ff147db27) @@ -78,7 +78,6 @@ AddResizableControl(IDOK, 1.0, 1.0, 0.0, 0.0); AddResizableControl(IDCANCEL, 1.0, 1.0, 0.0, 0.0); - AddResizableControl(IDC_HELP_BUTTON, 1.0, 1.0, 0.0, 0.0); InitializeResizableControls(); Index: src/ch/ShortcutsDlg.cpp =================================================================== diff -u -r973e284577383310bef3c4e4ef21de0b14e44094 -r1c366a50e84393bce67e50dcccc4fc5ff147db27 --- src/ch/ShortcutsDlg.cpp (.../ShortcutsDlg.cpp) (revision 973e284577383310bef3c4e4ef21de0b14e44094) +++ src/ch/ShortcutsDlg.cpp (.../ShortcutsDlg.cpp) (revision 1c366a50e84393bce67e50dcccc4fc5ff147db27) @@ -85,7 +85,6 @@ AddResizableControl(IDC_DELETE_BUTTON, 0, 1, 0, 0); AddResizableControl(IDOK, 1, 1, 0, 0); AddResizableControl(IDCANCEL, 1, 1, 0, 0); - AddResizableControl(IDC_HELP_BUTTON, 1, 1, 0, 0); InitializeResizableControls(); Index: src/ch/ch.cpp =================================================================== diff -u -rb3ca8a9ff1f5b02f32095a4a17b84ae1eab7274f -r1c366a50e84393bce67e50dcccc4fc5ff147db27 --- src/ch/ch.cpp (.../ch.cpp) (revision b3ca8a9ff1f5b02f32095a4a17b84ae1eab7274f) +++ src/ch/ch.cpp (.../ch.cpp) (revision 1c366a50e84393bce67e50dcccc4fc5ff147db27) @@ -38,6 +38,7 @@ #include "../liblogger/TAsyncMultiLogger.h" #include "TWindowMessageFilterHelper.h" #include "../libchengine/TConfigSerializers.h" +#include "../libictranslate/ResourceManager.h" #ifdef _DEBUG #define new DEBUG_NEW @@ -135,23 +136,6 @@ return AfxMessageBox(GetResManager().LoadString(uiID), nType, nIDHelp); } -bool CCopyHandlerApp::UpdateHelpPaths() -{ - bool bChanged=false; // flag that'll be returned - if the paths has changed - - // generate the current filename - uses language from config - CString strHelpPath = m_pathProcessor.ExpandPath(_T("\\Help\\")); - strHelpPath += GetResManager().m_ld.GetHelpName(); - if(strHelpPath != m_pszHelpFilePath) - { - free((void*)m_pszHelpFilePath); - m_pszHelpFilePath = _tcsdup(strHelpPath); - bChanged=true; - } - - return bChanged; -} - ///////////////////////////////////////////////////////////////////////////// // CCopyHandlerApp initialization @@ -308,7 +292,6 @@ rResManager.Init(AfxGetInstanceHandle()); rResManager.SetCallback(ResManCallback); GetPropValue(rCfg, strPath); - TRACE(_T("Help path=%s\n"), (PCTSTR)strPath); if(!rResManager.SetLanguage(m_pathProcessor.ExpandPath(strPath))) { TCHAR szData[2048]; @@ -318,13 +301,9 @@ return FALSE; } - UpdateHelpPaths(); - // for dialogs ictranslate::CLanguageDialog::SetResManager(&rResManager); - EnableHtmlHelp(); - // ================================= Checking for running instances of CH ======================================== // check instance - return false if it's the second one LOG_INFO(m_spLog) << _T("Checking for other running instances of Copy Handler"); @@ -672,80 +651,9 @@ { if (uiType == RMNT_LANGCHANGE) { - // language has been changed - close the current help file - if (UpdateHelpPaths()) - HtmlHelp(0, HH_CLOSE_ALL); } } -HWND CCopyHandlerApp::HHelp(HWND hwndCaller, LPCTSTR pszFile, UINT uCommand, DWORD_PTR dwData) -{ - PCTSTR pszPath=nullptr; - WIN32_FIND_DATA wfd; - HANDLE handle=::FindFirstFile(m_pszHelpFilePath, &wfd); - if (handle != INVALID_HANDLE_VALUE) - { - pszPath=m_pszHelpFilePath; - ::FindClose(handle); - } - - if (pszPath == nullptr) - return nullptr; - - if (pszFile != nullptr) - { - CString strAdd = pszPath; - strAdd += pszFile; - return ::HtmlHelp(hwndCaller, strAdd, uCommand, dwData); - } - - return ::HtmlHelp(hwndCaller, pszPath, uCommand, dwData); -} - -void CCopyHandlerApp::HtmlHelp(DWORD_PTR dwData, UINT nCmd) -{ - switch (nCmd) - { - case HH_DISPLAY_TOPIC: - case HH_HELP_CONTEXT: - { - HHelp(GetDesktopWindow(), nullptr, nCmd, dwData); - break; - } - case HH_CLOSE_ALL: - ::HtmlHelp(nullptr, nullptr, HH_CLOSE_ALL, 0); - break; - case HH_DISPLAY_TEXT_POPUP: - { - HELPINFO* pHelp=(HELPINFO*)dwData; - if ( pHelp->dwContextId == 0 || pHelp->iCtrlId == 0 - || ::GetWindowContextHelpId((HWND)pHelp->hItemHandle) == 0) - return; - - HH_POPUP hhp; - hhp.cbStruct=sizeof(HH_POPUP); - hhp.hinst=nullptr; - hhp.idString=(pHelp->dwContextId & 0xffff); - hhp.pszText=nullptr; - hhp.pt=pHelp->MousePos; - hhp.pt.y+=::GetSystemMetrics(SM_CYCURSOR)/2; - hhp.clrForeground=(COLORREF)-1; - hhp.clrBackground=(COLORREF)-1; - hhp.rcMargins.left=-1; - hhp.rcMargins.right=-1; - hhp.rcMargins.top=-1; - hhp.rcMargins.bottom=-1; - hhp.pszFont=_T("Tahoma, 8, , "); - - TCHAR szPath[_MAX_PATH]; - _sntprintf(szPath, _MAX_PATH, _T("::/%lu.txt"), (DWORD)((pHelp->dwContextId >> 16) & 0x7fff)); - HHelp(GetDesktopWindow(), szPath, HH_DISPLAY_TEXT_POPUP, (DWORD_PTR)&hhp); - - break; - } - } -} - int CCopyHandlerApp::ExitInstance() { LOG_INFO(m_spLog) << _T("Pre-exit step - releasing shell extension"); Index: src/ch/ch.h =================================================================== diff -u -r33b33baa373533d0cff8ea5d25154b370f2b2e05 -r1c366a50e84393bce67e50dcccc4fc5ff147db27 --- src/ch/ch.h (.../ch.h) (revision 33b33baa373533d0cff8ea5d25154b370f2b2e05) +++ src/ch/ch.h (.../ch.h) (revision 1c366a50e84393bce67e50dcccc4fc5ff147db27) @@ -37,10 +37,6 @@ BOOL InitInstance() override; int ExitInstance() override; - void HtmlHelp(DWORD_PTR dwData, UINT nCmd) override; - - PCTSTR GetHelpPath() const { return m_pszHelpFilePath; } - static int MsgBox(UINT uiID, UINT nType=MB_OK, UINT nIDHelp=0); friend CCopyHandlerApp& GetApplication(); @@ -60,9 +56,6 @@ const TCommandLineParser& GetCommandLine() const { return m_cmdLineParser; } protected: - bool UpdateHelpPaths(); - HWND HHelp(HWND hwndCaller, LPCTSTR pszFile, UINT uCommand, DWORD_PTR dwData); - void InitShellExtension(); bool ParseCommandLine(); Index: src/ch/ch.rc =================================================================== diff -u -rdb26c9ac6945d5c754c3460dd55bd6d53e2c9e7e -r1c366a50e84393bce67e50dcccc4fc5ff147db27 --- src/ch/ch.rc (.../ch.rc) (revision db26c9ac6945d5c754c3460dd55bd6d53e2c9e7e) +++ src/ch/ch.rc (.../ch.rc) (revision 1c366a50e84393bce67e50dcccc4fc5ff147db27) @@ -2,17 +2,11 @@ // #include "resource.h" -// Generated Help ID header file -#define APSTUDIO_HIDDEN_SYMBOLS -#include "resource.hm" -#undef APSTUDIO_HIDDEN_SYMBOLS - #define APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// // // Generated from the TEXTINCLUDE 2 resource. // -#define _USING_V110_SDK71_ 1 #include "afxres.h" ///////////////////////////////////////////////////////////////////////////// @@ -45,26 +39,25 @@ END IDD_BUFFERSIZE_DIALOG DIALOGEX 0, 0, 345, 169 -STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Buffer size settings" FONT 8, "Tahoma", 0, 0, 0x1 BEGIN - EDITTEXT IDC_DEFAULTSIZE_EDIT,35,17,97,14,ES_AUTOHSCROLL | NOT WS_BORDER,WS_EX_CLIENTEDGE,HIDC_DEFAULTSIZE_EDIT - COMBOBOX IDC_DEFAULTMULTIPLIER_COMBO,134,18,31,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP,0,HIDC_DEFAULTMULTIPLIER_COMBO - EDITTEXT IDC_ONEDISKSIZE_EDIT,35,49,97,14,ES_AUTOHSCROLL | NOT WS_BORDER,WS_EX_CLIENTEDGE,HIDC_ONEDISKSIZE_EDIT - COMBOBOX IDC_ONEDISKMULTIPLIER_COMBO,134,50,31,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP,0,HIDC_ONEDISKMULTIPLIER_COMBO - EDITTEXT IDC_TWODISKSSIZE_EDIT,35,81,97,14,ES_AUTOHSCROLL | NOT WS_BORDER,WS_EX_CLIENTEDGE,HIDC_TWODISKSSIZE_EDIT - COMBOBOX IDC_TWODISKSMULTIPLIER_COMBO,134,82,31,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP,0,HIDC_TWODISKSMULTIPLIER_COMBO - EDITTEXT IDC_CDROMSIZE_EDIT,206,18,97,14,ES_AUTOHSCROLL | NOT WS_BORDER,WS_EX_CLIENTEDGE,HIDC_CDROMSIZE_EDIT - COMBOBOX IDC_CDROMMULTIPLIER_COMBO,307,18,31,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP,0,HIDC_CDROMMULTIPLIER_COMBO - EDITTEXT IDC_LANSIZE_EDIT,206,51,97,14,ES_AUTOHSCROLL | NOT WS_BORDER,WS_EX_CLIENTEDGE,HIDC_LANSIZE_EDIT - COMBOBOX IDC_LANMULTIPLIER_COMBO,307,52,31,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP,0,HIDC_LANMULTIPLIER_COMBO + EDITTEXT IDC_DEFAULTSIZE_EDIT,35,17,97,14,ES_AUTOHSCROLL | NOT WS_BORDER,WS_EX_CLIENTEDGE + COMBOBOX IDC_DEFAULTMULTIPLIER_COMBO,134,18,31,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP,0 + EDITTEXT IDC_ONEDISKSIZE_EDIT,35,49,97,14,ES_AUTOHSCROLL | NOT WS_BORDER,WS_EX_CLIENTEDGE + COMBOBOX IDC_ONEDISKMULTIPLIER_COMBO,134,50,31,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP,0 + EDITTEXT IDC_TWODISKSSIZE_EDIT,35,81,97,14,ES_AUTOHSCROLL | NOT WS_BORDER,WS_EX_CLIENTEDGE + COMBOBOX IDC_TWODISKSMULTIPLIER_COMBO,134,82,31,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP,0 + EDITTEXT IDC_CDROMSIZE_EDIT,206,18,97,14,ES_AUTOHSCROLL | NOT WS_BORDER,WS_EX_CLIENTEDGE + COMBOBOX IDC_CDROMMULTIPLIER_COMBO,307,18,31,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP,0 + EDITTEXT IDC_LANSIZE_EDIT,206,51,97,14,ES_AUTOHSCROLL | NOT WS_BORDER,WS_EX_CLIENTEDGE + COMBOBOX IDC_LANMULTIPLIER_COMBO,307,52,31,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP,0 EDITTEXT IDC_BUFFERCOUNT_EDIT,206,82,122,14,ES_AUTOHSCROLL | ES_NUMBER CONTROL "",IDC_BUFFERCOUNT_SPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,327,82,11,14 - CONTROL "Use only default buffer",IDC_ONLYDEFAULT_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,132,331,10,0,HIDC_ONLYDEFAULT_CHECK - DEFPUSHBUTTON "&OK",IDOK,176,148,50,14,0,0,0x80890001 - PUSHBUTTON "&Cancel",IDCANCEL,229,148,50,14,0,0,HIDCANCEL - PUSHBUTTON "&Help",IDC_HELP_BUTTON,288,148,50,14,0,0,HIDC_HELP_BUTTON + CONTROL "Use only default buffer",IDC_ONLYDEFAULT_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,132,331,10,0 + DEFPUSHBUTTON "&OK",IDOK,229,148,50,14,0,0 + PUSHBUTTON "&Cancel",IDCANCEL,288,148,50,14,0,0 LTEXT "Default",IDC_001_STATIC,35,7,127,8 LTEXT "For copying inside one disk boundary",IDC_002_STATIC,35,38,130,8 LTEXT "For copying between two different disks",IDC_003_STATIC,35,70,132,8 @@ -85,62 +78,61 @@ END IDD_FEEDBACK_FILE_ERROR_DIALOG DIALOGEX 0, 0, 283, 112 -STYLE DS_SYSMODAL | DS_SETFONT | DS_CENTER | DS_CONTEXTHELP | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME +STYLE DS_SYSMODAL | DS_SETFONT | DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME CAPTION "File Error" FONT 8, "Tahoma", 0, 0, 0x1 BEGIN - PUSHBUTTON "&Retry",IDC_RETRY_BUTTON,7,79,64,14,0,0,HIDC_RETRY_BUTTON - PUSHBUTTON "&Skip",IDC_SKIP_BUTTON,74,79,64,14,0,0,HIDC_SKIP_BUTTON - DEFPUSHBUTTON "&Pause",IDC_PAUSE_BUTTON,141,79,64,14,0,0,HIDC_PAUSE_BUTTON - PUSHBUTTON "&Cancel",IDCANCEL,212,79,64,14,0,0,HIDCANCEL + PUSHBUTTON "&Retry",IDC_RETRY_BUTTON,7,79,64,14,0,0 + PUSHBUTTON "&Skip",IDC_SKIP_BUTTON,74,79,64,14,0,0 + DEFPUSHBUTTON "&Pause",IDC_PAUSE_BUTTON,141,79,64,14,0,0 + PUSHBUTTON "&Cancel",IDCANCEL,212,79,64,14,0,0 ICON IDI_ERR_ICON,IDC_001_STATIC,15,15,20,20,SS_REALSIZEIMAGE CONTROL "&Apply to all items",IDC_ALL_ITEMS_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,95,269,10 LTEXT "Encountered an error while processing file.",IDC_DESC_STATIC,43,7,223,23 LTEXT "File: c:\\test.avi\nReason: No permission to perform the operation requested.",IDC_INFO_STATIC,51,28,225,42 END IDD_MINIVIEW_DIALOG DIALOGEX 0, 0, 91, 23 -STYLE DS_ABSALIGN | DS_SYSMODAL | DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_CONTEXTHELP | WS_POPUP | WS_CAPTION +STYLE DS_ABSALIGN | DS_SYSMODAL | DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | WS_POPUP | WS_CAPTION EXSTYLE WS_EX_TOOLWINDOW CAPTION "Status" FONT 8, "Tahoma", 0, 0, 0x1 BEGIN - LISTBOX IDC_PROGRESS_LIST,7,7,77,9,LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | NOT WS_BORDER | WS_TABSTOP,0,HIDC_PROGRESS_LIST + LISTBOX IDC_PROGRESS_LIST,7,7,77,9,LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | NOT WS_BORDER | WS_TABSTOP,0 END IDD_OPTIONS_DIALOG DIALOGEX 0, 0, 397, 214 -STYLE DS_SETFONT | DS_CENTER | DS_CONTEXTHELP | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME +STYLE DS_SETFONT | DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME CAPTION "Options" FONT 8, "Tahoma", 0, 0, 0x1 BEGIN - DEFPUSHBUTTON "&OK",IDOK,173,193,50,14,0,0,HIDHELP - PUSHBUTTON "&Cancel",IDCANCEL,227,193,50,14,0,0,HIDCANCEL - LISTBOX IDC_PROPERTIES_LIST,7,7,383,179,LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP,0,HIDC_PROPERTIES_LIST - PUSHBUTTON "&Apply",IDC_APPLY_BUTTON,283,193,50,14,0,0,HIDC_APPLY_BUTTON - PUSHBUTTON "&Help",IDHELP,340,193,50,14,0,0,HIDHELP + DEFPUSHBUTTON "&OK",IDOK, 227,193,50,14,0,0 + PUSHBUTTON "&Cancel",IDCANCEL, 283,193,50,14,0,0 + LISTBOX IDC_PROPERTIES_LIST,7,7,383,179,LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP,0 + PUSHBUTTON "&Apply",IDC_APPLY_BUTTON, 340,193,50,14,0,0 END IDD_STATUS_DIALOG DIALOGEX 0, 0, 491, 302 -STYLE DS_SETFONT | DS_CONTEXTHELP | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME +STYLE DS_SETFONT | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME EXSTYLE WS_EX_APPWINDOW CAPTION "Status" FONT 8, "Tahoma", 0, 0, 0x1 BEGIN - CONTROL "List1",IDC_STATUS_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,19,223,171,0,HIDC_STATUS_LIST - PUSHBUTTON "&Pause",IDC_PAUSE_BUTTON,7,193,44,14,0,0,HIDC_PAUSE_BUTTON - PUSHBUTTON "&Restart",IDC_RESTART_BUTTON,97,193,44,14,0,0,HIDC_RESTART_BUTTON - PUSHBUTTON "&Cancel",IDC_CANCEL_BUTTON,142,193,44,14,0,0,HIDC_CANCEL_BUTTON - PUSHBUTTON "&Remove",IDC_DELETE_BUTTON,187,193,44,14,0,0,HIDC_DELETE_BUTTON - PUSHBUTTON "Pause/all",IDC_PAUSE_ALL_BUTTON,7,208,71,14,0,0,HIDC_PAUSE_ALL_BUTTON - PUSHBUTTON "Resume/all",IDC_START_ALL_BUTTON,79,208,71,14,0,0,HIDC_START_ALL_BUTTON - PUSHBUTTON "Cancel/all",IDC_CANCEL_ALL_BUTTON,7,223,71,14,0,0,HIDC_CANCEL_ALL_BUTTON - PUSHBUTTON "Remove/all",IDC_REMOVE_FINISHED_BUTTON,79,223,71,14,0,0,HIDC_REMOVE_FINISHED_BUTTON - PUSHBUTTON "Restart/all",IDC_RESTART_ALL_BUTTON,151,223,79,14,0,0,HIDC_RESTART_ALL_BUTTON - PUSHBUTTON "Advanced >",IDC_TASK_ADVANCED_BUTTON,151,208,79,14,0,0,HIDC_TASK_ADVANCED_BUTTON - PUSHBUTTON "",IDC_STICK_BUTTON,484,295,7,7,BS_CENTER | BS_VCENTER | BS_FLAT,0,HIDC_STICK_BUTTON - PUSHBUTTON "...",IDC_SET_BUFFERSIZE_BUTTON,463,71,13,14,0,0,HIDC_SET_BUFFERSIZE_BUTTON - PUSHBUTTON ">",IDC_SET_PRIORITY_BUTTON,463,85,13,14,0,0,HIDC_SET_PRIORITY_BUTTON - PUSHBUTTON "View log",IDC_SHOW_LOG_BUTTON,431,18,45,12,0,0,HIDC_SHOW_LOG_BUTTON + CONTROL "List1",IDC_STATUS_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,19,223,171,0 + PUSHBUTTON "&Pause",IDC_PAUSE_BUTTON,7,193,44,14,0,0 + PUSHBUTTON "&Restart",IDC_RESTART_BUTTON,97,193,44,14,0,0 + PUSHBUTTON "&Cancel",IDC_CANCEL_BUTTON,142,193,44,14,0,0 + PUSHBUTTON "&Remove",IDC_DELETE_BUTTON,187,193,44,14,0,0 + PUSHBUTTON "Pause/all",IDC_PAUSE_ALL_BUTTON,7,208,71,14,0,0 + PUSHBUTTON "Resume/all",IDC_START_ALL_BUTTON,79,208,71,14,0,0 + PUSHBUTTON "Cancel/all",IDC_CANCEL_ALL_BUTTON,7,223,71,14,0,0 + PUSHBUTTON "Remove/all",IDC_REMOVE_FINISHED_BUTTON,79,223,71,14,0,0 + PUSHBUTTON "Restart/all",IDC_RESTART_ALL_BUTTON,151,223,79,14,0,0 + PUSHBUTTON "Advanced >",IDC_TASK_ADVANCED_BUTTON,151,208,79,14,0,0 + PUSHBUTTON "",IDC_STICK_BUTTON,484,295,7,7,BS_CENTER | BS_VCENTER | BS_FLAT,0 + PUSHBUTTON "...",IDC_SET_BUFFERSIZE_BUTTON,463,71,13,14,0,0 + PUSHBUTTON ">",IDC_SET_PRIORITY_BUTTON,463,85,13,14,0,0 + PUSHBUTTON "View log",IDC_SHOW_LOG_BUTTON,431,18,45,12,0,0 LTEXT "List of tasks:",IDC_TASKLIST_LABEL_STATIC,7,7,223,8 CONTROL "Progress1",IDC_GLOBAL_PROGRESS,"msctls_progress32",0x0,71,282,153,7 LTEXT "Progress:",IDC_GLOBALPROGRESS_LABEL_STATIC,13,281,54,8 @@ -156,33 +148,33 @@ LTEXT "Transfer:",IDC_GLOBALTRANSFER_LABEL_STATIC,13,268,54,8 LTEXT "Processed:",IDC_GLOBALPROCESSED_LABEL_STATIC,13,255,54,8 LTEXT "Time:",IDC_TASKTIME_LABEL_STATIC,247,245,62,8 - PUSHBUTTON "&Resume",IDC_RESUME_BUTTON,52,193,44,14,0,0,HIDC_RESUME_BUTTON + PUSHBUTTON "&Resume",IDC_RESUME_BUTTON,52,193,44,14,0,0 LTEXT "Task ID:",IDC_TASKID_LABEL_STATIC,247,21,62,8 - CONTROL "",IDC_TASKID_STATIC,"STATICEX",0x4,311,18,118,12,WS_EX_STATICEDGE,HIDC_TASKID_STATIC - CONTROL "",IDC_OPERATION_STATIC,"STATICEX",0x4,311,32,165,12,WS_EX_STATICEDGE,HIDC_OPERATION_STATIC - CONTROL "",IDC_SOURCEOBJECT_STATIC,"STATICEX",0x4,311,45,165,12,WS_EX_STATICEDGE,HIDC_SOURCEOBJECT_STATIC - CONTROL "",IDC_DESTINATIONOBJECT_STATIC,"STATICEX",0x4,311,58,165,12,WS_EX_STATICEDGE,HIDC_DESTINATIONOBJECT_STATIC - CONTROL "",IDC_TASKPROCESSED_STATIC,"STATICEX",0x4,311,230,165,12,WS_EX_STATICEDGE,HIDC_TASKPROCESSED_STATIC - CONTROL "",IDC_TASKTIME_STATIC,"STATICEX",0x4,311,243,165,12,WS_EX_STATICEDGE,HIDC_TASKTIME_STATIC - CONTROL "",IDC_TASKTRANSFER_STATIC,"STATICEX",0x4,311,256,165,12,WS_EX_STATICEDGE,HIDC_TASKTRANSFER_STATIC - CONTROL "",IDC_GLOBALPROCESSED_STATIC,"STATICEX",0x4,71,253,153,12,WS_EX_STATICEDGE,HIDC_GLOBALPROCESSED_STATIC - CONTROL "",IDC_GLOBALTRANSFER_STATIC,"STATICEX",0x4,71,266,153,12,WS_EX_STATICEDGE,HIDC_GLOBALTRANSFER_STATIC - CONTROL "",IDC_BUFFERSIZE_STATIC,"STATICEX",0x4,311,72,151,12,WS_EX_STATICEDGE,HIDC_BUFFERSIZE_STATIC - CONTROL "",IDC_THREADPRIORITY_STATIC,"STATICEX",0x4,311,86,151,12,WS_EX_STATICEDGE,HIDC_THREADPRIORITY_STATIC + CONTROL "",IDC_TASKID_STATIC,"STATICEX",0x4,311,18,118,12,WS_EX_STATICEDGE + CONTROL "",IDC_OPERATION_STATIC,"STATICEX",0x4,311,32,165,12,WS_EX_STATICEDGE + CONTROL "",IDC_SOURCEOBJECT_STATIC,"STATICEX",0x4,311,45,165,12,WS_EX_STATICEDGE + CONTROL "",IDC_DESTINATIONOBJECT_STATIC,"STATICEX",0x4,311,58,165,12,WS_EX_STATICEDGE + CONTROL "",IDC_TASKPROCESSED_STATIC,"STATICEX",0x4,311,230,165,12,WS_EX_STATICEDGE + CONTROL "",IDC_TASKTIME_STATIC,"STATICEX",0x4,311,243,165,12,WS_EX_STATICEDGE + CONTROL "",IDC_TASKTRANSFER_STATIC,"STATICEX",0x4,311,256,165,12,WS_EX_STATICEDGE + CONTROL "",IDC_GLOBALPROCESSED_STATIC,"STATICEX",0x4,71,253,153,12,WS_EX_STATICEDGE + CONTROL "",IDC_GLOBALTRANSFER_STATIC,"STATICEX",0x4,71,266,153,12,WS_EX_STATICEDGE + CONTROL "",IDC_BUFFERSIZE_STATIC,"STATICEX",0x4,311,72,151,12,WS_EX_STATICEDGE + CONTROL "",IDC_THREADPRIORITY_STATIC,"STATICEX",0x4,311,86,151,12,WS_EX_STATICEDGE CONTROL "",IDC_SUBTASKCOUNT_PROGRESS,"msctls_progress32",0x0,311,189,165,6 LTEXT "Count of objects:",IDC_SUBTASKCOUNT_LABEL_STATIC,247,187,62,8 CONTROL "",IDC_SUBTASKSIZE_PROGRESS,"msctls_progress32",0x0,311,199,165,6 LTEXT "Size of objects:",IDC_SUBTASKSIZE_LABEL_STATIC,247,197,62,8 LTEXT "Processed:",IDC_SUBTASKPROCESSED_LABEL_STATIC,247,139,62,8 - CONTROL "",IDC_SUBTASKPROCESSED_STATIC,"STATICEX",0x4,311,136,165,12,WS_EX_STATICEDGE,HIDC_SUBTASKPROCESSED_STATIC + CONTROL "",IDC_SUBTASKPROCESSED_STATIC,"STATICEX",0x4,311,136,165,12,WS_EX_STATICEDGE LTEXT "Time:",IDC_SUBTASKTIME_LABEL_STATIC,247,152,62,8 - CONTROL "",IDC_SUBTASKTIME_STATIC,"STATICEX",0x4,311,149,165,12,WS_EX_STATICEDGE,HIDC_SUBTASKTIME_STATIC + CONTROL "",IDC_SUBTASKTIME_STATIC,"STATICEX",0x4,311,149,165,12,WS_EX_STATICEDGE CONTROL "",IDC_TASKCOUNT_PROGRESS,"msctls_progress32",0x0,311,272,165,6 LTEXT "Task count:",IDC_TASKCOUNT_LABEL_STATIC,247,270,62,8 LTEXT "Speed:",IDC_SUBTASKTRANSFER_LABEL_STATIC,247,165,62,8 - CONTROL "",IDC_SUBTASKTRANSFER_STATIC,"STATICEX",0x4,311,162,165,12,WS_EX_STATICEDGE,HIDC_SUBTASKTRANSFER_STATIC + CONTROL "",IDC_SUBTASKTRANSFER_STATIC,"STATICEX",0x4,311,162,165,12,WS_EX_STATICEDGE LTEXT "Current phase:",IDC_SUBTASKNAME_LABEL_STATIC,247,125,62,8 - CONTROL "",IDC_SUBTASKNAME_STATIC,"STATICEX",0x4,311,122,165,12,WS_EX_STATICEDGE,HIDC_SUBTASKNAME_STATIC + CONTROL "",IDC_SUBTASKNAME_STATIC,"STATICEX",0x4,311,122,165,12,WS_EX_STATICEDGE CONTROL "",IDC_CURRENTOBJECT_PROGRESS,"msctls_progress32",0x0,311,179,165,6 LTEXT "Current object:",IDC_CURRENTOBJECT_LABEL_STATIC,247,177,62,8 GROUPBOX "Task information",IDC_TASKINFORMATION_GROUP_STATIC,238,7,246,98,0,WS_EX_TRANSPARENT @@ -192,16 +184,16 @@ END IDD_FEEDBACK_NOTENOUGHSPACE_DIALOG DIALOGEX 0, 0, 255, 147 -STYLE DS_SYSMODAL | DS_SETFONT | DS_CENTER | DS_CONTEXTHELP | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME +STYLE DS_SYSMODAL | DS_SETFONT | DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME CAPTION "Not enough free space" FONT 8, "Tahoma", 0, 0, 0x1 BEGIN - PUSHBUTTON "&Retry",IDC_RETRY_BUTTON,78,113,57,14,0,0,HIDC_RETRY_BUTTON - PUSHBUTTON "C&ontinue",IDC_IGNORE_BUTTON,136,113,57,14,0,0,HIDC_IGNORE_BUTTON - PUSHBUTTON "&Cancel",IDCANCEL,198,113,50,14,0,0,HIDCANCEL - LISTBOX IDC_FILES_LIST,42,35,206,44,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP,0,HIDC_FILES_LIST - LTEXT "",IDC_REQUIRED_STATIC,109,85,139,8,0,0,HIDC_REQUIRED_STATIC - LTEXT "",IDC_AVAILABLE_STATIC,109,97,139,8,0,0,HIDC_AVAILABLE_STATIC + PUSHBUTTON "&Retry",IDC_RETRY_BUTTON,78,113,57,14,0,0 + PUSHBUTTON "C&ontinue",IDC_IGNORE_BUTTON,136,113,57,14,0,0 + PUSHBUTTON "&Cancel",IDCANCEL,198,113,50,14,0,0 + LISTBOX IDC_FILES_LIST,42,35,206,44,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP,0 + LTEXT "",IDC_REQUIRED_STATIC,109,85,139,8,0,0 + LTEXT "",IDC_AVAILABLE_STATIC,109,97,139,8,0,0 ICON IDI_WARNING_ICON,IDC_001_STATIC,9,11,20,20,SS_REALSIZEIMAGE LTEXT "Required space:",IDC_003_STATIC,41,85,59,8 LTEXT "Space available:",IDC_004_STATIC,41,97,59,8 @@ -210,45 +202,45 @@ END IDD_SHUTDOWN_DIALOG DIALOGEX 0, 0, 186, 86 -STYLE DS_SYSMODAL | DS_SETFONT | DS_MODALFRAME | DS_CENTER | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE DS_SYSMODAL | DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Copy handler" FONT 8, "Tahoma", 0, 0, 0x1 BEGIN - DEFPUSHBUTTON "&Cancel",IDCANCEL,67,65,50,14,0,0,HIDCANCEL + DEFPUSHBUTTON "&Cancel",IDCANCEL,67,65,50,14,0,0 ICON IDI_SHUTDOWN_ICON,IDC_001_STATIC,7,10,20,20,SS_REALSIZEIMAGE LTEXT "All copy/move operations were finished. Attempt to shut down the system will be performed in:",IDC_002_STATIC,37,7,142,24 CTEXT "",IDC_TIME_STATIC,7,35,172,8 CONTROL "Progress1",IDC_TIME_PROGRESS,"msctls_progress32",PBS_SMOOTH,7,48,172,9 END IDD_CUSTOM_COPY_DIALOG DIALOGEX 0, 0, 351, 318 -STYLE DS_SETFONT | DS_CENTER | DS_CONTEXTHELP | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME +STYLE DS_SETFONT | DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME EXSTYLE WS_EX_APPWINDOW CAPTION "Copying/moving parameters" FONT 8, "Tahoma", 0, 0, 0x1 BEGIN - CONTROL "List1",IDC_FILES_LIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,7,16,279,57,WS_EX_ACCEPTFILES,HIDC_FILES_LIST - PUSHBUTTON "Add &file(s)...",IDC_ADDFILE_BUTTON,291,15,53,14,0,0,HIDC_ADDFILE_BUTTON - PUSHBUTTON "Add f&older...",IDC_ADDDIR_BUTTON,291,30,53,14,0,0,HIDC_ADDDIR_BUTTON - PUSHBUTTON "&Delete",IDC_REMOVEFILEFOLDER_BUTTON,291,45,53,14,0,0,HIDC_REMOVEFILEFOLDER_BUTTON - PUSHBUTTON "&Import...",IDC_IMPORT_BUTTON,291,60,53,14,0,0,HIDC_IMPORT_BUTTON - CONTROL "",IDC_DESTPATH_COMBOBOXEX,"ComboBoxEx32",CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP,7,86,314,136,WS_EX_ACCEPTFILES,HIDC_DESTPATH_COMBOBOXEX - PUSHBUTTON "...",IDC_DESTBROWSE_BUTTON,326,85,18,14,0,0,HIDC_DESTBROWSE_BUTTON - COMBOBOX IDC_OPERATION_COMBO,13,124,159,143,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP,0,HIDC_OPERATION_COMBO - COMBOBOX IDC_PRIORITY_COMBO,181,124,159,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP,0,HIDC_PRIORITY_COMBO - LISTBOX IDC_BUFFERSIZES_LIST,13,152,275,20,LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_NOSEL | WS_VSCROLL | WS_TABSTOP,0,HIDC_BUFFERSIZES_LIST - PUSHBUTTON "&Change...",IDC_BUFFERSIZES_BUTTON,294,152,50,14,0,0,HIDC_BUFFERSIZES_BUTTON - CONTROL "Filtering",IDC_FILTERS_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,177,61,10,0,HIDC_FILTERS_CHECK - CONTROL "List2",IDC_FILTERS_LIST,"SysListView32",LVS_REPORT | WS_BORDER | WS_TABSTOP,13,190,303,46,0,HIDC_FILTERS_LIST - PUSHBUTTON "+",IDC_ADDFILTER_BUTTON,322,190,22,14,0,0,HIDC_ADDFILTER_BUTTON - PUSHBUTTON "-",IDC_REMOVEFILTER_BUTTON,322,206,22,14,0,0,HIDC_REMOVEFILTER_BUTTON - CONTROL "Advanced options",IDC_ADVANCED_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,242,84,10,0,HIDC_ADVANCED_CHECK + CONTROL "List1",IDC_FILES_LIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,7,16,279,57,WS_EX_ACCEPTFILES + PUSHBUTTON "Add &file(s)...",IDC_ADDFILE_BUTTON,291,15,53,14,0,0 + PUSHBUTTON "Add f&older...",IDC_ADDDIR_BUTTON,291,30,53,14,0,0 + PUSHBUTTON "&Delete",IDC_REMOVEFILEFOLDER_BUTTON,291,45,53,14,0,0 + PUSHBUTTON "&Import...",IDC_IMPORT_BUTTON,291,60,53,14,0,0 + CONTROL "",IDC_DESTPATH_COMBOBOXEX,"ComboBoxEx32",CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP,7,86,314,136,WS_EX_ACCEPTFILES + PUSHBUTTON "...",IDC_DESTBROWSE_BUTTON,326,85,18,14,0,0 + COMBOBOX IDC_OPERATION_COMBO,13,124,159,143,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP,0 + COMBOBOX IDC_PRIORITY_COMBO,181,124,159,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP,0 + LISTBOX IDC_BUFFERSIZES_LIST,13,152,275,20,LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_NOSEL | WS_VSCROLL | WS_TABSTOP,0 + PUSHBUTTON "&Change...",IDC_BUFFERSIZES_BUTTON,294,152,50,14,0,0 + CONTROL "Filtering",IDC_FILTERS_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,177,61,10,0 + CONTROL "List2",IDC_FILTERS_LIST,"SysListView32",LVS_REPORT | WS_BORDER | WS_TABSTOP,13,190,303,46,0 + PUSHBUTTON "+",IDC_ADDFILTER_BUTTON,322,190,22,14,0,0 + PUSHBUTTON "-",IDC_REMOVEFILTER_BUTTON,322,206,22,14,0,0 + CONTROL "Advanced options",IDC_ADVANCED_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,242,84,10,0 CONTROL "Do not create destination directories - copy files loosely to destination folder",IDC_IGNOREFOLDERS_CHECK, - "Button",BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,13,255,329,10,0,HIDC_IGNOREFOLDERS_CHECK + "Button",BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,13,255,329,10,0 CONTROL "Do not copy/move contents of files - only create it (empty)",IDC_ONLYSTRUCTURE_CHECK, - "Button",BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,13,277,329,10,0,HIDC_ONLYSTRUCTURE_CHECK - PUSHBUTTON "&OK",IDOK,186,297,50,14,0,0,HIDHELP - PUSHBUTTON "&Cancel",IDCANCEL,239,297,50,14,0,0,HIDCANCEL + "Button",BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,13,277,329,10,0 + PUSHBUTTON "&OK",IDOK,239,297,50,14,0,0 + PUSHBUTTON "&Cancel",IDCANCEL,294,297,50,14,0,0 LTEXT "Source files/folders:",IDC_001_STATIC,7,7,337,8 LTEXT "Destination folder:",IDC_002_STATIC,7,76,337,8 LTEXT "Operation type:",IDC_003_STATIC,13,115,117,8 @@ -261,103 +253,99 @@ CTEXT "Standard options",IDC_007_STATIC,20,104,80,8 CONTROL "",IDC_BAR1_STATIC,"Static",SS_ETCHEDHORZ,7,107,8,1 CONTROL "Create directory structure in destination folder (relatively to root directory)",IDC_FORCEDIRECTORIES_CHECK, - "Button",BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,13,266,329,10,0,HIDC_FORCEDIRECTORIES_CHECK - PUSHBUTTON "&Help",IDC_HELP_BUTTON,294,297,50,14,0,0,HIDC_HELP_BUTTON + "Button",BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,13,266,329,10,0 PUSHBUTTON "&Export...",IDC_EXPORT_BUTTON,7,297,50,14 END IDD_FILTER_DIALOG DIALOGEX 0, 0, 291, 266 -STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Filtering settings" FONT 8, "Tahoma", 0, 0, 0x1 BEGIN CONTROL "Include mask (separate by vertical lines ie. *.jpg|*.gif)",IDC_FILTER_CHECK, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,7,277,10,0,HIDC_FILTER_CHECK - COMBOBOX IDC_FILTER_COMBO,15,19,269,98,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP,0,HIDC_FILTER_COMBO - CONTROL "Exclude mask",IDC_EXCLUDEMASK_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,35,277,10,0,HIDC_EXCLUDEMASK_CHECK - COMBOBOX IDC_FILTEREXCLUDE_COMBO,15,48,269,170,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP,0,HIDC_FILTEREXCLUDE_COMBO - CONTROL "Filtering by size",IDC_SIZE_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,66,277,10,0,HIDC_SIZE_CHECK - COMBOBOX IDC_SIZETYPE1_COMBO,63,81,34,140,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP,0,HIDC_SIZETYPE1_COMBO - EDITTEXT IDC_SIZE1_EDIT,100,80,77,14,ES_AUTOHSCROLL,0,HIDC_SIZE1_EDIT - CONTROL "Spin1",IDC_SIZE1_SPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,166,80,11,14,0,HIDC_SIZE1_SPIN - COMBOBOX IDC_SIZE1MULTI_COMBO,180,81,34,135,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP,0,HIDC_SIZE1MULTI_COMBO - CONTROL "and",IDC_SIZE2_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,30,101,32,10,0,HIDC_SIZE2_CHECK - COMBOBOX IDC_SIZETYPE2_COMBO,63,99,34,137,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP,0,HIDC_SIZETYPE2_COMBO - EDITTEXT IDC_SIZE2_EDIT,100,98,77,14,ES_AUTOHSCROLL,0,HIDC_SIZE2_EDIT - CONTROL "Spin1",IDC_SIZE2_SPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,166,98,11,14,0,HIDC_SIZE2_SPIN - COMBOBOX IDC_SIZE2MULTI_COMBO,180,99,34,143,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP,0,HIDC_SIZE2MULTI_COMBO - CONTROL "Filtering by date",IDC_DATE_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,124,277,10,0,HIDC_DATE_CHECK - COMBOBOX IDC_DATETYPE_COMBO,32,138,151,133,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP,0,HIDC_DATETYPE_COMBO - COMBOBOX IDC_DATE1TYPE_COMBO,58,158,48,104,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP,0,HIDC_DATE1TYPE_COMBO + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,7,277,10,0 + COMBOBOX IDC_FILTER_COMBO,15,19,269,98,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP,0 + CONTROL "Exclude mask",IDC_EXCLUDEMASK_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,35,277,10,0 + COMBOBOX IDC_FILTEREXCLUDE_COMBO,15,48,269,170,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP,0 + CONTROL "Filtering by size",IDC_SIZE_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,66,277,10,0 + COMBOBOX IDC_SIZETYPE1_COMBO,63,81,34,140,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP,0 + EDITTEXT IDC_SIZE1_EDIT,100,80,77,14,ES_AUTOHSCROLL,0 + CONTROL "Spin1",IDC_SIZE1_SPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,166,80,11,14,0 + COMBOBOX IDC_SIZE1MULTI_COMBO,180,81,34,135,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP,0 + CONTROL "and",IDC_SIZE2_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,30,101,32,10,0 + COMBOBOX IDC_SIZETYPE2_COMBO,63,99,34,137,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP,0 + EDITTEXT IDC_SIZE2_EDIT,100,98,77,14,ES_AUTOHSCROLL,0 + CONTROL "Spin1",IDC_SIZE2_SPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,166,98,11,14,0 + COMBOBOX IDC_SIZE2MULTI_COMBO,180,99,34,143,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP,0 + CONTROL "Filtering by date",IDC_DATE_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,124,277,10,0 + COMBOBOX IDC_DATETYPE_COMBO,32,138,151,133,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP,0 + COMBOBOX IDC_DATE1TYPE_COMBO,58,158,48,104,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP,0 CONTROL "DateTimePicker1",IDC_DATE1_DATETIMEPICKER, - "SysDateTimePick32",DTS_RIGHTALIGN | DTS_UPDOWN | DTS_SHOWNONE | WS_TABSTOP,108,157,109,15,0,HIDC_DATE1_DATETIMEPICKER + "SysDateTimePick32",DTS_RIGHTALIGN | DTS_UPDOWN | DTS_SHOWNONE | WS_TABSTOP,108,157,109,15,0 CONTROL "DateTimePicker2",IDC_TIME1_DATETIMEPICKER, - "SysDateTimePick32",DTS_RIGHTALIGN | DTS_UPDOWN | DTS_SHOWNONE | WS_TABSTOP | 0x8,220,157,64,15,0,HIDC_TIME1_DATETIMEPICKER - CONTROL "and",IDC_DATE2_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,25,176,30,10,0,HIDC_DATE2_CHECK - COMBOBOX IDC_DATE2TYPE_COMBO,58,174,48,107,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP,0,HIDC_DATE2TYPE_COMBO + "SysDateTimePick32",DTS_RIGHTALIGN | DTS_UPDOWN | DTS_SHOWNONE | WS_TABSTOP | 0x8,220,157,64,15,0 + CONTROL "and",IDC_DATE2_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,25,176,30,10,0 + COMBOBOX IDC_DATE2TYPE_COMBO,58,174,48,107,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP,0 CONTROL "DateTimePicker1",IDC_DATE2_DATETIMEPICKER, - "SysDateTimePick32",DTS_RIGHTALIGN | DTS_UPDOWN | DTS_SHOWNONE | WS_TABSTOP,108,173,109,15,0,HIDC_DATE2_DATETIMEPICKER + "SysDateTimePick32",DTS_RIGHTALIGN | DTS_UPDOWN | DTS_SHOWNONE | WS_TABSTOP,108,173,109,15,0 CONTROL "DateTimePicker2",IDC_TIME2_DATETIMEPICKER, - "SysDateTimePick32",DTS_RIGHTALIGN | DTS_UPDOWN | DTS_SHOWNONE | WS_TABSTOP | 0x8,220,173,64,15,0,HIDC_TIME2_DATETIMEPICKER - CONTROL "By attributes",IDC_ATTRIBUTES_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,199,277,10,0,HIDC_ATTRIBUTES_CHECK - CONTROL "Archive",IDC_ARCHIVE_CHECK,"Button",BS_AUTO3STATE | WS_TABSTOP,29,212,81,10,0,HIDC_ARCHIVE_CHECK - CONTROL "Read only",IDC_READONLY_CHECK,"Button",BS_AUTO3STATE | WS_TABSTOP,29,224,81,10,0,HIDC_READONLY_CHECK - CONTROL "Hidden",IDC_HIDDEN_CHECK,"Button",BS_AUTO3STATE | WS_TABSTOP,117,212,68,10,0,HIDC_HIDDEN_CHECK - CONTROL "System",IDC_SYSTEM_CHECK,"Button",BS_AUTO3STATE | WS_TABSTOP,117,224,68,10,0,HIDC_SYSTEM_CHECK - CONTROL "Directory",IDC_DIRECTORY_CHECK,"Button",BS_AUTO3STATE | NOT WS_VISIBLE | WS_DISABLED | WS_TABSTOP,191,212,93,10,0,HIDC_DIRECTORY_CHECK - DEFPUSHBUTTON "&OK",IDOK,127,245,50,14,0,0,HIDHELP - PUSHBUTTON "&Cancel",IDCANCEL,179,245,50,14,0,0,HIDCANCEL + "SysDateTimePick32",DTS_RIGHTALIGN | DTS_UPDOWN | DTS_SHOWNONE | WS_TABSTOP | 0x8,220,173,64,15,0 + CONTROL "By attributes",IDC_ATTRIBUTES_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,199,277,10,0 + CONTROL "Archive",IDC_ARCHIVE_CHECK,"Button",BS_AUTO3STATE | WS_TABSTOP,29,212,81,10,0 + CONTROL "Read only",IDC_READONLY_CHECK,"Button",BS_AUTO3STATE | WS_TABSTOP,29,224,81,10,0 + CONTROL "Hidden",IDC_HIDDEN_CHECK,"Button",BS_AUTO3STATE | WS_TABSTOP,117,212,68,10,0 + CONTROL "System",IDC_SYSTEM_CHECK,"Button",BS_AUTO3STATE | WS_TABSTOP,117,224,68,10,0 + CONTROL "Directory",IDC_DIRECTORY_CHECK,"Button",BS_AUTO3STATE | NOT WS_VISIBLE | WS_DISABLED | WS_TABSTOP,191,212,93,10,0 + DEFPUSHBUTTON "&OK",IDOK,179,245,50,14,0,0 + PUSHBUTTON "&Cancel",IDCANCEL,234,245,50,14,0,0 CONTROL "",IDC_001_STATIC,"Static",SS_ETCHEDHORZ,7,238,276,1 - PUSHBUTTON "&Help",IDC_HELP_BUTTON,234,245,50,14,0,0,HIDC_HELP_BUTTON END IDD_SHORTCUTEDIT_DIALOG DIALOGEX 0, 0, 325, 206 -STYLE DS_SETFONT | DS_CENTER | DS_CONTEXTHELP | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_THICKFRAME +STYLE DS_SETFONT | DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_THICKFRAME CAPTION "Shortcuts editing" FONT 8, "Tahoma", 0, 0, 0x1 BEGIN - CONTROL "List1",IDC_SHORTCUT_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | LVS_EDITLABELS | WS_BORDER | WS_TABSTOP,7,16,261,88,0,HIDC_SHORTCUT_LIST - EDITTEXT IDC_NAME_EDIT,77,123,228,14,ES_AUTOHSCROLL,0,HIDC_NAME_EDIT - CONTROL "",IDC_PATH_COMBOBOXEX,"ComboBoxEx32",CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP,77,142,205,89,0,HIDC_PATH_COMBOBOXEX - PUSHBUTTON "...",IDC_BROWSE_BUTTON,286,142,18,13,0,0,HIDC_BROWSE_BUTTON - PUSHBUTTON "&Add",IDC_ADD_BUTTON,17,160,50,14,0,0,HIDC_ADD_BUTTON - PUSHBUTTON "&Update",IDC_CHANGE_BUTTON,69,160,50,14,0,0,HIDC_CHANGE_BUTTON - PUSHBUTTON "&Delete",IDC_DELETE_BUTTON,121,160,50,14,0,0,HIDC_DELETE_BUTTON - DEFPUSHBUTTON "&OK",IDOK,156,185,50,14,0,0,HIDHELP - PUSHBUTTON "&Cancel",IDCANCEL,211,185,50,14,0,0,HIDCANCEL + CONTROL "List1",IDC_SHORTCUT_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | LVS_EDITLABELS | WS_BORDER | WS_TABSTOP,7,16,261,88,0 + EDITTEXT IDC_NAME_EDIT,77,123,228,14,ES_AUTOHSCROLL,0 + CONTROL "",IDC_PATH_COMBOBOXEX,"ComboBoxEx32",CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP,77,142,205,89,0 + PUSHBUTTON "...",IDC_BROWSE_BUTTON,286,142,18,13,0,0 + PUSHBUTTON "&Add",IDC_ADD_BUTTON,17,160,50,14,0,0 + PUSHBUTTON "&Update",IDC_CHANGE_BUTTON,69,160,50,14,0,0 + PUSHBUTTON "&Delete",IDC_DELETE_BUTTON,121,160,50,14,0,0 + DEFPUSHBUTTON "&OK",IDOK,211,185,50,14,0,0 + PUSHBUTTON "&Cancel",IDCANCEL,268,185,50,14,0,0 LTEXT "Shortcuts:",IDC_001_STATIC,7,7,311,8 LTEXT "Name:",IDC_002_STATIC,18,126,53,8 LTEXT "Path:",IDC_003_STATIC,18,145,56,8 GROUPBOX "Shortcut properties",IDC_004_STATIC,7,111,311,70 - PUSHBUTTON "Move up",IDC_UP_BUTTON,273,47,45,14,0,0,HIDC_UP_BUTTON - PUSHBUTTON "Move down",IDC_DOWN_BUTTON,273,63,45,14,0,0,HIDC_DOWN_BUTTON - PUSHBUTTON "&Help",IDC_HELP_BUTTON,268,185,50,14,0,0,HIDC_HELP_BUTTON + PUSHBUTTON "Move up",IDC_UP_BUTTON,273,47,45,14,0,0 + PUSHBUTTON "Move down",IDC_DOWN_BUTTON,273,63,45,14,0,0 END IDD_RECENTEDIT_DIALOG DIALOGEX 0, 0, 325, 190 -STYLE DS_SETFONT | DS_CENTER | DS_CONTEXTHELP | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_THICKFRAME +STYLE DS_SETFONT | DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_THICKFRAME CAPTION "Recent paths" FONT 8, "Tahoma", 0, 0, 0x1 BEGIN - CONTROL "List1",IDC_RECENT_LIST,"SysListView32",LVS_LIST | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | LVS_EDITLABELS | WS_BORDER | WS_TABSTOP,7,16,311,88,0,HIDC_RECENT_LIST - EDITTEXT IDC_PATH_EDIT,20,123,266,14,ES_AUTOHSCROLL,0,HIDC_PATH_EDIT - PUSHBUTTON "...",IDC_BROWSE_BUTTON,290,123,18,14,0,0,HIDC_BROWSE_BUTTON - PUSHBUTTON "&Add",IDC_ADD_BUTTON,20,141,50,14,0,0,HIDC_ADD_BUTTON - PUSHBUTTON "&Update",IDC_CHANGE_BUTTON,72,141,50,14,0,0,HIDC_CHANGE_BUTTON - PUSHBUTTON "&Delete",IDC_DELETE_BUTTON,124,141,50,14,0,0,HIDC_DELETE_BUTTON - DEFPUSHBUTTON "&OK",IDOK,156,169,50,14,0,0,HIDHELP - PUSHBUTTON "&Cancel",IDCANCEL,211,169,50,14,0,0,HIDCANCEL + CONTROL "List1",IDC_RECENT_LIST,"SysListView32",LVS_LIST | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | LVS_EDITLABELS | WS_BORDER | WS_TABSTOP,7,16,311,88,0 + EDITTEXT IDC_PATH_EDIT,20,123,266,14,ES_AUTOHSCROLL,0 + PUSHBUTTON "...",IDC_BROWSE_BUTTON,290,123,18,14,0,0 + PUSHBUTTON "&Add",IDC_ADD_BUTTON,20,141,50,14,0,0 + PUSHBUTTON "&Update",IDC_CHANGE_BUTTON,72,141,50,14,0,0 + PUSHBUTTON "&Delete",IDC_DELETE_BUTTON,124,141,50,14,0,0 + DEFPUSHBUTTON "&OK",IDOK,211,169,50,14,0,0 + PUSHBUTTON "&Cancel",IDCANCEL,268,169,50,14,0,0 LTEXT "Recently used paths:",IDC_001_STATIC,7,7,311,8 GROUPBOX "Path",IDC_002_STATIC,7,110,311,51 - PUSHBUTTON "&Help",IDC_HELP_BUTTON,268,169,50,14,0,0,HIDC_HELP_BUTTON END IDD_ABOUTBOX DIALOGEX 0, 0, 369, 164 -STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "About ..." FONT 8, "Tahoma", 0, 0, 0x1 BEGIN - DEFPUSHBUTTON "&OK",IDOK,306,143,56,14,WS_GROUP,0,HIDHELP + DEFPUSHBUTTON "&OK",IDOK,306,143,56,14,WS_GROUP,0 ICON IDR_MAINFRAME,IDC_STATIC,11,14,20,20 CTEXT "",IDC_COPYRIGHT_STATIC,40,93,322,8 CONTROL "",IDC_HOMEPAGELINK_STATIC,"STATICEX",0x1,208,32,154,8 @@ -651,7 +639,6 @@ END MENUITEM SEPARATOR MENUITEM "&Options...", ID_POPUP_OPTIONS - MENUITEM "&Help...", ID_POPUP_HELP MENUITEM "About...", ID_APP_ABOUT MENUITEM SEPARATOR MENUITEM "Exit", ID_APP_EXIT @@ -1207,8 +1194,6 @@ IDS_CFGLOGFILE_STRING "Debugging" IDS_CFGMAXLIMIT_STRING "Maximum size of the log file" IDS_CFGROTATEDCOUNT_STRING "Maximum count of rotated log files to keep" - IDS_CFGHELPDIR_STRING "Directory with help files" - IDS_CFGHELPDIRCHOOSE_STRING "!Choose folder with program's help files" IDS_LANGUAGESFOLDER_STRING "Directory with language files" IDS_LANGSFOLDERCHOOSE_STRING "!Choose folder with language files" IDS_ABOUT_LANGUAGE_STRING Index: src/ch/ch.vc140.vcxproj =================================================================== diff -u -r49869c22052117465b59dc527b3393ab771d50f6 -r1c366a50e84393bce67e50dcccc4fc5ff147db27 --- src/ch/ch.vc140.vcxproj (.../ch.vc140.vcxproj) (revision 49869c22052117465b59dc527b3393ab771d50f6) +++ src/ch/ch.vc140.vcxproj (.../ch.vc140.vcxproj) (revision 1c366a50e84393bce67e50dcccc4fc5ff147db27) @@ -217,7 +217,7 @@ 0x0409 - winmm.lib;imagehlp.lib;version.lib;htmlhelp.lib;Dbghelp.lib;%(AdditionalDependencies) + winmm.lib;imagehlp.lib;version.lib;Dbghelp.lib;%(AdditionalDependencies) true Windows MachineX86 @@ -260,7 +260,7 @@ 0x0409 - winmm.lib;imagehlp.lib;version.lib;htmlhelp.lib;Dbghelp.lib;gmock-dynamic-crt32d.lib;%(AdditionalDependencies) + winmm.lib;imagehlp.lib;version.lib;Dbghelp.lib;gmock-dynamic-crt32d.lib;%(AdditionalDependencies) true Console MachineX86 @@ -307,7 +307,7 @@ 0x0409 - winmm.lib;imagehlp.lib;version.lib;htmlhelp.lib;Dbghelp.lib;%(AdditionalDependencies) + winmm.lib;imagehlp.lib;version.lib;Dbghelp.lib;%(AdditionalDependencies) true Windows MachineX64 @@ -351,7 +351,7 @@ 0x0409 - winmm.lib;imagehlp.lib;version.lib;htmlhelp.lib;Dbghelp.lib;gmock-dynamic-crt64d.lib;%(AdditionalDependencies) + winmm.lib;imagehlp.lib;version.lib;Dbghelp.lib;gmock-dynamic-crt64d.lib;%(AdditionalDependencies) true Console MachineX64 @@ -397,7 +397,7 @@ 0x0409 - winmm.lib;imagehlp.lib;version.lib;htmlhelp.lib;Dbghelp.lib;%(AdditionalDependencies) + winmm.lib;imagehlp.lib;version.lib;Dbghelp.lib;%(AdditionalDependencies) true Windows MachineX86 @@ -442,7 +442,7 @@ 0x0409 - winmm.lib;imagehlp.lib;version.lib;htmlhelp.lib;Dbghelp.lib;gmock-dynamic-crt32.lib;%(AdditionalDependencies) + winmm.lib;imagehlp.lib;version.lib;Dbghelp.lib;gmock-dynamic-crt32.lib;%(AdditionalDependencies) true Console MachineX86 @@ -489,7 +489,7 @@ 0x0409 - winmm.lib;imagehlp.lib;version.lib;htmlhelp.lib;Dbghelp.lib;%(AdditionalDependencies) + winmm.lib;imagehlp.lib;version.lib;Dbghelp.lib;%(AdditionalDependencies) true Windows MachineX64 @@ -534,7 +534,7 @@ 0x0409 - winmm.lib;imagehlp.lib;version.lib;htmlhelp.lib;Dbghelp.lib;gmock-dynamic-crt64.lib;%(AdditionalDependencies) + winmm.lib;imagehlp.lib;version.lib;Dbghelp.lib;gmock-dynamic-crt64.lib;%(AdditionalDependencies) true Console MachineX64 @@ -612,184 +612,7 @@ - - Generating map file for help compiler... - Generating map file for help compiler... - echo // Generated Help Map file. Used by Copy Handler help files. > "help\HTMLDefines.h" -echo. > "help\HTMLDefines.h" -echo // Commands (ID_* and IDM_*) >> "help\HTMLDefines.h" -makehm /h ID_,HID_,0x10000 IDM_,HIDM_,0x10000 "%(Filename)%(Extension)" >> "help\HTMLDefines.h" -echo. >> "help\HTMLDefines.h" -echo // Prompts (IDP_*) >> "help\HTMLDefines.h" -makehm /h IDP_,HIDP_,0x30000 "%(Filename)%(Extension)" >> "help\HTMLDefines.h" -echo. >> "help\HTMLDefines.h" -echo // Resources (IDR_*) >> "help\HTMLDefines.h" -makehm /h IDR_,HIDR_,0x20000 "%(Filename)%(Extension)" >> "help\HTMLDefines.h" -echo. >> "help\HTMLDefines.h" -echo // Dialogs (IDD_*) >> "help\HTMLDefines.h" -makehm /h IDD_,HIDD_,0x20000 "%(Filename)%(Extension)" >> "help\HTMLDefines.h" -echo. >> "help\HTMLDefines.h" -echo // Frame Controls (IDW_*) >> "help\HTMLDefines.h" -makehm /h /a afxhh.h IDW_,HIDW_,0x50000 "%(Filename)%(Extension)" >> "help\HTMLDefines.h" -echo. >> "help\HTMLDefines.h" -echo // Controls (IDC_*) >> "help\HTMLDefines.h" -makehm /h IDC_,IDH_,0x00000 "%(Filename)%(Extension)" >> "help\HTMLDefines.h" - - echo // Generated Help Map file. Used by Copy Handler help files. > "help\HTMLDefines.h" -echo. > "help\HTMLDefines.h" -echo // Commands (ID_* and IDM_*) >> "help\HTMLDefines.h" -makehm /h ID_,HID_,0x10000 IDM_,HIDM_,0x10000 "%(Filename)%(Extension)" >> "help\HTMLDefines.h" -echo. >> "help\HTMLDefines.h" -echo // Prompts (IDP_*) >> "help\HTMLDefines.h" -makehm /h IDP_,HIDP_,0x30000 "%(Filename)%(Extension)" >> "help\HTMLDefines.h" -echo. >> "help\HTMLDefines.h" -echo // Resources (IDR_*) >> "help\HTMLDefines.h" -makehm /h IDR_,HIDR_,0x20000 "%(Filename)%(Extension)" >> "help\HTMLDefines.h" -echo. >> "help\HTMLDefines.h" -echo // Dialogs (IDD_*) >> "help\HTMLDefines.h" -makehm /h IDD_,HIDD_,0x20000 "%(Filename)%(Extension)" >> "help\HTMLDefines.h" -echo. >> "help\HTMLDefines.h" -echo // Frame Controls (IDW_*) >> "help\HTMLDefines.h" -makehm /h /a afxhh.h IDW_,HIDW_,0x50000 "%(Filename)%(Extension)" >> "help\HTMLDefines.h" -echo. >> "help\HTMLDefines.h" -echo // Controls (IDC_*) >> "help\HTMLDefines.h" -makehm /h IDC_,IDH_,0x00000 "%(Filename)%(Extension)" >> "help\HTMLDefines.h" - - help\HTMLDefines.h;%(Outputs) - help\HTMLDefines.h;%(Outputs) - Generating map file for help compiler... - Generating map file for help compiler... - echo // Generated Help Map file. Used by Copy Handler help files. > "help\HTMLDefines.h" -echo. > "help\HTMLDefines.h" -echo // Commands (ID_* and IDM_*) >> "help\HTMLDefines.h" -makehm /h ID_,HID_,0x10000 IDM_,HIDM_,0x10000 "%(Filename)%(Extension)" >> "help\HTMLDefines.h" -echo. >> "help\HTMLDefines.h" -echo // Prompts (IDP_*) >> "help\HTMLDefines.h" -makehm /h IDP_,HIDP_,0x30000 "%(Filename)%(Extension)" >> "help\HTMLDefines.h" -echo. >> "help\HTMLDefines.h" -echo // Resources (IDR_*) >> "help\HTMLDefines.h" -makehm /h IDR_,HIDR_,0x20000 "%(Filename)%(Extension)" >> "help\HTMLDefines.h" -echo. >> "help\HTMLDefines.h" -echo // Dialogs (IDD_*) >> "help\HTMLDefines.h" -makehm /h IDD_,HIDD_,0x20000 "%(Filename)%(Extension)" >> "help\HTMLDefines.h" -echo. >> "help\HTMLDefines.h" -echo // Frame Controls (IDW_*) >> "help\HTMLDefines.h" -makehm /h /a afxhh.h IDW_,HIDW_,0x50000 "%(Filename)%(Extension)" >> "help\HTMLDefines.h" -echo. >> "help\HTMLDefines.h" -echo // Controls (IDC_*) >> "help\HTMLDefines.h" -makehm /h IDC_,IDH_,0x00000 "%(Filename)%(Extension)" >> "help\HTMLDefines.h" - - echo // Generated Help Map file. Used by Copy Handler help files. > "help\HTMLDefines.h" -echo. > "help\HTMLDefines.h" -echo // Commands (ID_* and IDM_*) >> "help\HTMLDefines.h" -makehm /h ID_,HID_,0x10000 IDM_,HIDM_,0x10000 "%(Filename)%(Extension)" >> "help\HTMLDefines.h" -echo. >> "help\HTMLDefines.h" -echo // Prompts (IDP_*) >> "help\HTMLDefines.h" -makehm /h IDP_,HIDP_,0x30000 "%(Filename)%(Extension)" >> "help\HTMLDefines.h" -echo. >> "help\HTMLDefines.h" -echo // Resources (IDR_*) >> "help\HTMLDefines.h" -makehm /h IDR_,HIDR_,0x20000 "%(Filename)%(Extension)" >> "help\HTMLDefines.h" -echo. >> "help\HTMLDefines.h" -echo // Dialogs (IDD_*) >> "help\HTMLDefines.h" -makehm /h IDD_,HIDD_,0x20000 "%(Filename)%(Extension)" >> "help\HTMLDefines.h" -echo. >> "help\HTMLDefines.h" -echo // Frame Controls (IDW_*) >> "help\HTMLDefines.h" -makehm /h /a afxhh.h IDW_,HIDW_,0x50000 "%(Filename)%(Extension)" >> "help\HTMLDefines.h" -echo. >> "help\HTMLDefines.h" -echo // Controls (IDC_*) >> "help\HTMLDefines.h" -makehm /h IDC_,IDH_,0x00000 "%(Filename)%(Extension)" >> "help\HTMLDefines.h" - - help\HTMLDefines.h;%(Outputs) - help\HTMLDefines.h;%(Outputs) - Generating map file for help compiler... - Generating map file for help compiler... - echo // Generated Help Map file. Used by Copy Handler help files. > "help\HTMLDefines.h" -echo. > "help\HTMLDefines.h" -echo // Commands (ID_* and IDM_*) >> "help\HTMLDefines.h" -makehm /h ID_,HID_,0x10000 IDM_,HIDM_,0x10000 "%(Filename)%(Extension)" >> "help\HTMLDefines.h" -echo. >> "help\HTMLDefines.h" -echo // Prompts (IDP_*) >> "help\HTMLDefines.h" -makehm /h IDP_,HIDP_,0x30000 "%(Filename)%(Extension)" >> "help\HTMLDefines.h" -echo. >> "help\HTMLDefines.h" -echo // Resources (IDR_*) >> "help\HTMLDefines.h" -makehm /h IDR_,HIDR_,0x20000 "%(Filename)%(Extension)" >> "help\HTMLDefines.h" -echo. >> "help\HTMLDefines.h" -echo // Dialogs (IDD_*) >> "help\HTMLDefines.h" -makehm /h IDD_,HIDD_,0x20000 "%(Filename)%(Extension)" >> "help\HTMLDefines.h" -echo. >> "help\HTMLDefines.h" -echo // Frame Controls (IDW_*) >> "help\HTMLDefines.h" -makehm /h /a afxhh.h IDW_,HIDW_,0x50000 "%(Filename)%(Extension)" >> "help\HTMLDefines.h" -echo. >> "help\HTMLDefines.h" -echo // Controls (IDC_*) >> "help\HTMLDefines.h" -makehm /h IDC_,IDH_,0x00000 "%(Filename)%(Extension)" >> "help\HTMLDefines.h" - - echo // Generated Help Map file. Used by Copy Handler help files. > "help\HTMLDefines.h" -echo. > "help\HTMLDefines.h" -echo // Commands (ID_* and IDM_*) >> "help\HTMLDefines.h" -makehm /h ID_,HID_,0x10000 IDM_,HIDM_,0x10000 "%(Filename)%(Extension)" >> "help\HTMLDefines.h" -echo. >> "help\HTMLDefines.h" -echo // Prompts (IDP_*) >> "help\HTMLDefines.h" -makehm /h IDP_,HIDP_,0x30000 "%(Filename)%(Extension)" >> "help\HTMLDefines.h" -echo. >> "help\HTMLDefines.h" -echo // Resources (IDR_*) >> "help\HTMLDefines.h" -makehm /h IDR_,HIDR_,0x20000 "%(Filename)%(Extension)" >> "help\HTMLDefines.h" -echo. >> "help\HTMLDefines.h" -echo // Dialogs (IDD_*) >> "help\HTMLDefines.h" -makehm /h IDD_,HIDD_,0x20000 "%(Filename)%(Extension)" >> "help\HTMLDefines.h" -echo. >> "help\HTMLDefines.h" -echo // Frame Controls (IDW_*) >> "help\HTMLDefines.h" -makehm /h /a afxhh.h IDW_,HIDW_,0x50000 "%(Filename)%(Extension)" >> "help\HTMLDefines.h" -echo. >> "help\HTMLDefines.h" -echo // Controls (IDC_*) >> "help\HTMLDefines.h" -makehm /h IDC_,IDH_,0x00000 "%(Filename)%(Extension)" >> "help\HTMLDefines.h" - - help\HTMLDefines.h;%(Outputs) - help\HTMLDefines.h;%(Outputs) - Generating map file for help compiler... - Generating map file for help compiler... - echo // Generated Help Map file. Used by Copy Handler help files. > "help\HTMLDefines.h" -echo. > "help\HTMLDefines.h" -echo // Commands (ID_* and IDM_*) >> "help\HTMLDefines.h" -makehm /h ID_,HID_,0x10000 IDM_,HIDM_,0x10000 "%(Filename)%(Extension)" >> "help\HTMLDefines.h" -echo. >> "help\HTMLDefines.h" -echo // Prompts (IDP_*) >> "help\HTMLDefines.h" -makehm /h IDP_,HIDP_,0x30000 "%(Filename)%(Extension)" >> "help\HTMLDefines.h" -echo. >> "help\HTMLDefines.h" -echo // Resources (IDR_*) >> "help\HTMLDefines.h" -makehm /h IDR_,HIDR_,0x20000 "%(Filename)%(Extension)" >> "help\HTMLDefines.h" -echo. >> "help\HTMLDefines.h" -echo // Dialogs (IDD_*) >> "help\HTMLDefines.h" -makehm /h IDD_,HIDD_,0x20000 "%(Filename)%(Extension)" >> "help\HTMLDefines.h" -echo. >> "help\HTMLDefines.h" -echo // Frame Controls (IDW_*) >> "help\HTMLDefines.h" -makehm /h /a afxhh.h IDW_,HIDW_,0x50000 "%(Filename)%(Extension)" >> "help\HTMLDefines.h" -echo. >> "help\HTMLDefines.h" -echo // Controls (IDC_*) >> "help\HTMLDefines.h" -makehm /h IDC_,IDH_,0x00000 "%(Filename)%(Extension)" >> "help\HTMLDefines.h" - - echo // Generated Help Map file. Used by Copy Handler help files. > "help\HTMLDefines.h" -echo. > "help\HTMLDefines.h" -echo // Commands (ID_* and IDM_*) >> "help\HTMLDefines.h" -makehm /h ID_,HID_,0x10000 IDM_,HIDM_,0x10000 "%(Filename)%(Extension)" >> "help\HTMLDefines.h" -echo. >> "help\HTMLDefines.h" -echo // Prompts (IDP_*) >> "help\HTMLDefines.h" -makehm /h IDP_,HIDP_,0x30000 "%(Filename)%(Extension)" >> "help\HTMLDefines.h" -echo. >> "help\HTMLDefines.h" -echo // Resources (IDR_*) >> "help\HTMLDefines.h" -makehm /h IDR_,HIDR_,0x20000 "%(Filename)%(Extension)" >> "help\HTMLDefines.h" -echo. >> "help\HTMLDefines.h" -echo // Dialogs (IDD_*) >> "help\HTMLDefines.h" -makehm /h IDD_,HIDD_,0x20000 "%(Filename)%(Extension)" >> "help\HTMLDefines.h" -echo. >> "help\HTMLDefines.h" -echo // Frame Controls (IDW_*) >> "help\HTMLDefines.h" -makehm /h /a afxhh.h IDW_,HIDW_,0x50000 "%(Filename)%(Extension)" >> "help\HTMLDefines.h" -echo. >> "help\HTMLDefines.h" -echo // Controls (IDC_*) >> "help\HTMLDefines.h" -makehm /h IDC_,IDH_,0x00000 "%(Filename)%(Extension)" >> "help\HTMLDefines.h" - - help\HTMLDefines.h;%(Outputs) - help\HTMLDefines.h;%(Outputs) - + @@ -929,242 +752,6 @@ - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - - - - Making help file... - Making help file... - copy "help\HTMLDefines.h" "%(RootDir)%(Directory)HTMLDefines.h" -SET PATH=%PATH%;$(VS_ExecutablePath) -hhc "%(FullPath)" -if not exist "%(RootDir)%(Directory)english.chm" goto :HelpError -mkdir "$(OutDir)help" >nul 2>nul -copy "%(RootDir)%(Directory)english.chm" "$(OutDir)help\english.chm" -goto :HelpDone -:HelpError -echo %(FullPath)(1) : error:Problem encountered creating help file -echo. -exit 1 -:HelpDone -echo. - - copy "help\HTMLDefines.h" "%(RootDir)%(Directory)HTMLDefines.h" -SET PATH=%PATH%;$(VS_ExecutablePath) -hhc "%(FullPath)" -if not exist "%(RootDir)%(Directory)english.chm" goto :HelpError -mkdir "$(OutDir)help" >nul 2>nul -copy "%(RootDir)%(Directory)english.chm" "$(OutDir)help\english.chm" -goto :HelpDone -:HelpError -echo %(FullPath)(1) : error:Problem encountered creating help file -echo. -exit 1 -:HelpDone -echo. - - help\HTMLDefines.h;%(AdditionalInputs) - help\HTMLDefines.h;%(AdditionalInputs) - help\english\english.chm;%(Outputs) - help\english\english.chm;%(Outputs) - Making help file... - Making help file... - copy "help\HTMLDefines.h" "%(RootDir)%(Directory)HTMLDefines.h" -SET PATH=%PATH%;$(VS_ExecutablePath) -hhc "%(FullPath)" -if not exist "%(RootDir)%(Directory)english.chm" goto :HelpError -mkdir "$(OutDir)help" >nul 2>nul -copy "%(RootDir)%(Directory)english.chm" "$(OutDir)help\english.chm" -goto :HelpDone -:HelpError -echo %(FullPath)(1) : error:Problem encountered creating help file -echo. -exit 1 -:HelpDone -echo. - - copy "help\HTMLDefines.h" "%(RootDir)%(Directory)HTMLDefines.h" -SET PATH=%PATH%;$(VS_ExecutablePath) -hhc "%(FullPath)" -if not exist "%(RootDir)%(Directory)english.chm" goto :HelpError -mkdir "$(OutDir)help" >nul 2>nul -copy "%(RootDir)%(Directory)english.chm" "$(OutDir)help\english.chm" -goto :HelpDone -:HelpError -echo %(FullPath)(1) : error:Problem encountered creating help file -echo. -exit 1 -:HelpDone -echo. - - help\HTMLDefines.h;%(AdditionalInputs) - help\HTMLDefines.h;%(AdditionalInputs) - help\english\english.chm;%(Outputs) - help\english\english.chm;%(Outputs) - Making help file... - Making help file... - copy "help\HTMLDefines.h" "%(RootDir)%(Directory)HTMLDefines.h" -SET PATH=%PATH%;$(VS_ExecutablePath) -hhc "%(FullPath)" -if not exist "%(RootDir)%(Directory)english.chm" goto :HelpError -mkdir "$(OutDir)help" >nul 2>nul -copy "%(RootDir)%(Directory)english.chm" "$(OutDir)help\english.chm" -goto :HelpDone -:HelpError -echo %(FullPath)(1) : error:Problem encountered creating help file -echo. -exit 1 -:HelpDone -echo. - - copy "help\HTMLDefines.h" "%(RootDir)%(Directory)HTMLDefines.h" -SET PATH=%PATH%;$(VS_ExecutablePath) -hhc "%(FullPath)" -if not exist "%(RootDir)%(Directory)english.chm" goto :HelpError -mkdir "$(OutDir)help" >nul 2>nul -copy "%(RootDir)%(Directory)english.chm" "$(OutDir)help\english.chm" -goto :HelpDone -:HelpError -echo %(FullPath)(1) : error:Problem encountered creating help file -echo. -exit 1 -:HelpDone -echo. - - help\HTMLDefines.h;%(AdditionalInputs) - help\HTMLDefines.h;%(AdditionalInputs) - help\english\english.chm;%(Outputs) - help\english\english.chm;%(Outputs) - Making help file... - Making help file... - copy "help\HTMLDefines.h" "%(RootDir)%(Directory)HTMLDefines.h" -SET PATH=%PATH%;$(VS_ExecutablePath) -hhc "%(FullPath)" -if not exist "%(RootDir)%(Directory)english.chm" goto :HelpError -mkdir "$(OutDir)help" >nul 2>nul -copy "%(RootDir)%(Directory)english.chm" "$(OutDir)help\english.chm" -goto :HelpDone -:HelpError -echo %(FullPath)(1) : error:Problem encountered creating help file -echo. -exit 1 -:HelpDone -echo. - - copy "help\HTMLDefines.h" "%(RootDir)%(Directory)HTMLDefines.h" -SET PATH=%PATH%;$(VS_ExecutablePath) -hhc "%(FullPath)" -if not exist "%(RootDir)%(Directory)english.chm" goto :HelpError -mkdir "$(OutDir)help" >nul 2>nul -copy "%(RootDir)%(Directory)english.chm" "$(OutDir)help\english.chm" -goto :HelpDone -:HelpError -echo %(FullPath)(1) : error:Problem encountered creating help file -echo. -exit 1 -:HelpDone -echo. - - help\HTMLDefines.h;%(AdditionalInputs) - help\HTMLDefines.h;%(AdditionalInputs) - help\english\english.chm;%(Outputs) - help\english\english.chm;%(Outputs) - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - - true - - - true - - - true - - - true - - - true - Copying language file %(Filename)%(Extension)... Copying language file %(Filename)%(Extension)... @@ -1709,241 +1296,6 @@ $(OutDir)langs\%(Filename)%(Extension);%(Outputs) $(OutDir)langs\%(Filename)%(Extension);%(Outputs) - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - - - - Making help file... - Making help file... - copy "help\HTMLDefines.h" "%(RootDir)%(Directory)HTMLDefines.h" -SET PATH=%PATH%;$(VS_ExecutablePath) -hhc "%(FullPath)" -if not exist "%(RootDir)%(Directory)polish.chm" goto :HelpError -mkdir "$(OutDir)help" >nul 2>nul -copy "%(RootDir)%(Directory)polish.chm" "$(OutDir)help\polish.chm" -goto :HelpDone -:HelpError -echo %(FullPath)(1) : error:Problem encountered creating help file -echo. -exit 1 -:HelpDone -echo. - - copy "help\HTMLDefines.h" "%(RootDir)%(Directory)HTMLDefines.h" -SET PATH=%PATH%;$(VS_ExecutablePath) -hhc "%(FullPath)" -if not exist "%(RootDir)%(Directory)polish.chm" goto :HelpError -mkdir "$(OutDir)help" >nul 2>nul -copy "%(RootDir)%(Directory)polish.chm" "$(OutDir)help\polish.chm" -goto :HelpDone -:HelpError -echo %(FullPath)(1) : error:Problem encountered creating help file -echo. -exit 1 -:HelpDone -echo. - - help\HTMLDefines.h;%(AdditionalInputs) - help\HTMLDefines.h;%(AdditionalInputs) - help\polish\polish.chm;%(Outputs) - help\polish\polish.chm;%(Outputs) - Making help file... - Making help file... - copy "help\HTMLDefines.h" "%(RootDir)%(Directory)HTMLDefines.h" -SET PATH=%PATH%;$(VS_ExecutablePath) -hhc "%(FullPath)" -if not exist "%(RootDir)%(Directory)polish.chm" goto :HelpError -mkdir "$(OutDir)help" >nul 2>nul -copy "%(RootDir)%(Directory)polish.chm" "$(OutDir)help\polish.chm" -goto :HelpDone -:HelpError -echo %(FullPath)(1) : error:Problem encountered creating help file -echo. -exit 1 -:HelpDone -echo. - - copy "help\HTMLDefines.h" "%(RootDir)%(Directory)HTMLDefines.h" -SET PATH=%PATH%;$(VS_ExecutablePath) -hhc "%(FullPath)" -if not exist "%(RootDir)%(Directory)polish.chm" goto :HelpError -mkdir "$(OutDir)help" >nul 2>nul -copy "%(RootDir)%(Directory)polish.chm" "$(OutDir)help\polish.chm" -goto :HelpDone -:HelpError -echo %(FullPath)(1) : error:Problem encountered creating help file -echo. -exit 1 -:HelpDone -echo. - - help\HTMLDefines.h;%(AdditionalInputs) - help\HTMLDefines.h;%(AdditionalInputs) - help\polish\polish.chm;%(Outputs) - help\polish\polish.chm;%(Outputs) - Making help file... - Making help file... - copy "help\HTMLDefines.h" "%(RootDir)%(Directory)HTMLDefines.h" -SET PATH=%PATH%;$(VS_ExecutablePath) -hhc "%(FullPath)" -if not exist "%(RootDir)%(Directory)polish.chm" goto :HelpError -mkdir "$(OutDir)help" >nul 2>nul -copy "%(RootDir)%(Directory)polish.chm" "$(OutDir)help\polish.chm" -goto :HelpDone -:HelpError -echo %(FullPath)(1) : error:Problem encountered creating help file -echo. -exit 1 -:HelpDone -echo. - - copy "help\HTMLDefines.h" "%(RootDir)%(Directory)HTMLDefines.h" -SET PATH=%PATH%;$(VS_ExecutablePath) -hhc "%(FullPath)" -if not exist "%(RootDir)%(Directory)polish.chm" goto :HelpError -mkdir "$(OutDir)help" >nul 2>nul -copy "%(RootDir)%(Directory)polish.chm" "$(OutDir)help\polish.chm" -goto :HelpDone -:HelpError -echo %(FullPath)(1) : error:Problem encountered creating help file -echo. -exit 1 -:HelpDone -echo. - - help\HTMLDefines.h;%(AdditionalInputs) - help\HTMLDefines.h;%(AdditionalInputs) - help\polish\polish.chm;%(Outputs) - help\polish\polish.chm;%(Outputs) - Making help file... - Making help file... - copy "help\HTMLDefines.h" "%(RootDir)%(Directory)HTMLDefines.h" -SET PATH=%PATH%;$(VS_ExecutablePath) -hhc "%(FullPath)" -if not exist "%(RootDir)%(Directory)polish.chm" goto :HelpError -mkdir "$(OutDir)help" >nul 2>nul -copy "%(RootDir)%(Directory)polish.chm" "$(OutDir)help\polish.chm" -goto :HelpDone -:HelpError -echo %(FullPath)(1) : error:Problem encountered creating help file -echo. -exit 1 -:HelpDone -echo. - - copy "help\HTMLDefines.h" "%(RootDir)%(Directory)HTMLDefines.h" -SET PATH=%PATH%;$(VS_ExecutablePath) -hhc "%(FullPath)" -if not exist "%(RootDir)%(Directory)polish.chm" goto :HelpError -mkdir "$(OutDir)help" >nul 2>nul -copy "%(RootDir)%(Directory)polish.chm" "$(OutDir)help\polish.chm" -goto :HelpDone -:HelpError -echo %(FullPath)(1) : error:Problem encountered creating help file -echo. -exit 1 -:HelpDone -echo. - - help\HTMLDefines.h;%(AdditionalInputs) - help\HTMLDefines.h;%(AdditionalInputs) - help\polish\polish.chm;%(Outputs) - help\polish\polish.chm;%(Outputs) - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - - true - - - true - - - true - - - true - - - true - @@ -1972,40 +1324,8 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {cbbf380b-7b16-4a1e-8194-758dad7d8011} Index: src/ch/ch.vc140.vcxproj.filters =================================================================== diff -u -rf84eecda89d8734da9790a2b8d4a54d344e40c46 -r1c366a50e84393bce67e50dcccc4fc5ff147db27 --- src/ch/ch.vc140.vcxproj.filters (.../ch.vc140.vcxproj.filters) (revision f84eecda89d8734da9790a2b8d4a54d344e40c46) +++ src/ch/ch.vc140.vcxproj.filters (.../ch.vc140.vcxproj.filters) (revision 1c366a50e84393bce67e50dcccc4fc5ff147db27) @@ -42,18 +42,10 @@ {ca6137b1-4022-4488-af7a-48bfbcdaa51c} - - {0908a1a6-24cd-40d8-a65d-105ecf31514d} - htm;html;css;txt;hhp;hhc;hhk;js;gif - {0549f736-3a28-48ed-864b-f53c8c790c8e} lng - - {13791876-3eb5-454d-a0e2-8fea6dd685f3} - htm;html;css;txt;hhp;hhc;hhk;js;gif - {4ab952d0-201f-4dc7-9493-c74c95fcae45} @@ -260,6 +252,9 @@ Source Files\Tools + + Resource Files + @@ -447,219 +442,6 @@ Resource Files - - Resource Files - - - Localization\EN Help Files - - - Localization\EN Help Files - - - Localization\EN Help Files - - - Localization\EN Help Files - - - Localization\EN Help Files - - - Localization\EN Help Files - - - Localization\EN Help Files - - - Localization\EN Help Files - - - Localization\EN Help Files - - - Localization\EN Help Files - - - Localization\EN Help Files - - - Localization\EN Help Files - - - Localization\EN Help Files - - - Localization\EN Help Files - - - Localization\EN Help Files - - - Localization\EN Help Files - - - Localization\EN Help Files - - - Localization\EN Help Files - - - Localization\EN Help Files - - - Localization\EN Help Files - - - Localization\EN Help Files - - - Localization\EN Help Files - - - Localization\EN Help Files - - - Localization\EN Help Files - - - Localization\EN Help Files - - - Localization\EN Help Files - - - Localization\EN Help Files - - - Localization\EN Help Files - - - Localization\EN Help Files - - - Localization\EN Help Files - - - Localization\EN Help Files - - - Localization\EN Help Files - - - Localization\EN Help Files - - - Localization\EN Help Files - - - Localization\EN Help Files - - - Localization\PL Help Files - - - Localization\PL Help Files - - - Localization\PL Help Files - - - Localization\PL Help Files - - - Localization\PL Help Files - - - Localization\PL Help Files - - - Localization\PL Help Files - - - Localization\PL Help Files - - - Localization\PL Help Files - - - Localization\PL Help Files - - - Localization\PL Help Files - - - Localization\PL Help Files - - - Localization\PL Help Files - - - Localization\PL Help Files - - - Localization\PL Help Files - - - Localization\PL Help Files - - - Localization\PL Help Files - - - Localization\PL Help Files - - - Localization\PL Help Files - - - Localization\PL Help Files - - - Localization\PL Help Files - - - Localization\PL Help Files - - - Localization\PL Help Files - - - Localization\PL Help Files - - - Localization\PL Help Files - - - Localization\PL Help Files - - - Localization\PL Help Files - - - Localization\PL Help Files - - - Localization\PL Help Files - - - Localization\PL Help Files - - - Localization\PL Help Files - - - Localization\PL Help Files - - - Localization\PL Help Files - - - Localization\PL Help Files - - - Localization\PL Help Files - @@ -740,109 +522,11 @@ Resource Files\Icons - - Localization\EN Help Files - - - Localization\PL Help Files - - - Localization\EN Help Files - - - Localization\EN Help Files - - - Localization\EN Help Files - - - Localization\EN Help Files - - - Localization\EN Help Files - - - Localization\EN Help Files - - - Localization\EN Help Files - - - Localization\EN Help Files - - - Localization\EN Help Files - - - Localization\EN Help Files - - - Localization\EN Help Files - - - Localization\EN Help Files - - - Localization\EN Help Files - - - Localization\EN Help Files - - - Localization\PL Help Files - - - Localization\PL Help Files - - - Localization\PL Help Files - - - Localization\PL Help Files - - - Localization\PL Help Files - - - Localization\PL Help Files - - - Localization\PL Help Files - - - Localization\PL Help Files - - - Localization\PL Help Files - - - Localization\PL Help Files - - - Localization\PL Help Files - - - Localization\PL Help Files - - - Localization\PL Help Files - - - Localization\PL Help Files - - - Resource Files - - Resource Files - - - Localization\EN Help Files - Localization\Languages @@ -891,8 +575,5 @@ Localization\Languages - - Localization\PL Help Files - \ No newline at end of file Fisheye: Tag 1c366a50e84393bce67e50dcccc4fc5ff147db27 refers to a dead (removed) revision in file `src/ch/help/english/0.txt'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1c366a50e84393bce67e50dcccc4fc5ff147db27 refers to a dead (removed) revision in file `src/ch/help/english/100.txt'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1c366a50e84393bce67e50dcccc4fc5ff147db27 refers to a dead (removed) revision in file `src/ch/help/english/131.txt'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1c366a50e84393bce67e50dcccc4fc5ff147db27 refers to a dead (removed) revision in file `src/ch/help/english/137.txt'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1c366a50e84393bce67e50dcccc4fc5ff147db27 refers to a dead (removed) revision in file `src/ch/help/english/144.txt'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1c366a50e84393bce67e50dcccc4fc5ff147db27 refers to a dead (removed) revision in file `src/ch/help/english/145.txt'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1c366a50e84393bce67e50dcccc4fc5ff147db27 refers to a dead (removed) revision in file `src/ch/help/english/149.txt'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1c366a50e84393bce67e50dcccc4fc5ff147db27 refers to a dead (removed) revision in file `src/ch/help/english/161.txt'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1c366a50e84393bce67e50dcccc4fc5ff147db27 refers to a dead (removed) revision in file `src/ch/help/english/167.txt'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1c366a50e84393bce67e50dcccc4fc5ff147db27 refers to a dead (removed) revision in file `src/ch/help/english/173.txt'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1c366a50e84393bce67e50dcccc4fc5ff147db27 refers to a dead (removed) revision in file `src/ch/help/english/182.txt'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1c366a50e84393bce67e50dcccc4fc5ff147db27 refers to a dead (removed) revision in file `src/ch/help/english/195.txt'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1c366a50e84393bce67e50dcccc4fc5ff147db27 refers to a dead (removed) revision in file `src/ch/help/english/208.txt'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1c366a50e84393bce67e50dcccc4fc5ff147db27 refers to a dead (removed) revision in file `src/ch/help/english/209.txt'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1c366a50e84393bce67e50dcccc4fc5ff147db27 refers to a dead (removed) revision in file `src/ch/help/english/advmenu.htm'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1c366a50e84393bce67e50dcccc4fc5ff147db27 refers to a dead (removed) revision in file `src/ch/help/english/buffersize.htm'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1c366a50e84393bce67e50dcccc4fc5ff147db27 refers to a dead (removed) revision in file `src/ch/help/english/bugs.htm'. Fisheye: No comparison available. Pass `N' to diff? Index: src/ch/help/english/ch.gif =================================================================== diff -u -r5f4ef9387368390412ff8852b54067b1f7dc8a28 -r1c366a50e84393bce67e50dcccc4fc5ff147db27 Binary files differ Fisheye: Tag 1c366a50e84393bce67e50dcccc4fc5ff147db27 refers to a dead (removed) revision in file `src/ch/help/english/customcopy.htm'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1c366a50e84393bce67e50dcccc4fc5ff147db27 refers to a dead (removed) revision in file `src/ch/help/english/explorermenu.htm'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1c366a50e84393bce67e50dcccc4fc5ff147db27 refers to a dead (removed) revision in file `src/ch/help/english/faq.htm'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1c366a50e84393bce67e50dcccc4fc5ff147db27 refers to a dead (removed) revision in file `src/ch/help/english/feeddstfile.htm'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1c366a50e84393bce67e50dcccc4fc5ff147db27 refers to a dead (removed) revision in file `src/ch/help/english/feediwr.htm'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1c366a50e84393bce67e50dcccc4fc5ff147db27 refers to a dead (removed) revision in file `src/ch/help/english/feednotenoughroom.htm'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1c366a50e84393bce67e50dcccc4fc5ff147db27 refers to a dead (removed) revision in file `src/ch/help/english/feedreplacefiles.htm'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1c366a50e84393bce67e50dcccc4fc5ff147db27 refers to a dead (removed) revision in file `src/ch/help/english/feedsmallreplace.htm'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1c366a50e84393bce67e50dcccc4fc5ff147db27 refers to a dead (removed) revision in file `src/ch/help/english/filterdlg.htm'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1c366a50e84393bce67e50dcccc4fc5ff147db27 refers to a dead (removed) revision in file `src/ch/help/english/folderdlg.htm'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1c366a50e84393bce67e50dcccc4fc5ff147db27 refers to a dead (removed) revision in file `src/ch/help/english/headfoot.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1c366a50e84393bce67e50dcccc4fc5ff147db27 refers to a dead (removed) revision in file `src/ch/help/english/help.hhc'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1c366a50e84393bce67e50dcccc4fc5ff147db27 refers to a dead (removed) revision in file `src/ch/help/english/help.hhk'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1c366a50e84393bce67e50dcccc4fc5ff147db27 refers to a dead (removed) revision in file `src/ch/help/english/help.hhp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1c366a50e84393bce67e50dcccc4fc5ff147db27 refers to a dead (removed) revision in file `src/ch/help/english/history.htm'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1c366a50e84393bce67e50dcccc4fc5ff147db27 refers to a dead (removed) revision in file `src/ch/help/english/installation.htm'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1c366a50e84393bce67e50dcccc4fc5ff147db27 refers to a dead (removed) revision in file `src/ch/help/english/license.htm'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1c366a50e84393bce67e50dcccc4fc5ff147db27 refers to a dead (removed) revision in file `src/ch/help/english/mainmenu.htm'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1c366a50e84393bce67e50dcccc4fc5ff147db27 refers to a dead (removed) revision in file `src/ch/help/english/miniview.htm'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1c366a50e84393bce67e50dcccc4fc5ff147db27 refers to a dead (removed) revision in file `src/ch/help/english/options.htm'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1c366a50e84393bce67e50dcccc4fc5ff147db27 refers to a dead (removed) revision in file `src/ch/help/english/recentdlg.htm'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1c366a50e84393bce67e50dcccc4fc5ff147db27 refers to a dead (removed) revision in file `src/ch/help/english/replacepaths.htm'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1c366a50e84393bce67e50dcccc4fc5ff147db27 refers to a dead (removed) revision in file `src/ch/help/english/reporting.htm'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1c366a50e84393bce67e50dcccc4fc5ff147db27 refers to a dead (removed) revision in file `src/ch/help/english/requirements.htm'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1c366a50e84393bce67e50dcccc4fc5ff147db27 refers to a dead (removed) revision in file `src/ch/help/english/shortcutsdlg.htm'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1c366a50e84393bce67e50dcccc4fc5ff147db27 refers to a dead (removed) revision in file `src/ch/help/english/shutdowndlg.htm'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1c366a50e84393bce67e50dcccc4fc5ff147db27 refers to a dead (removed) revision in file `src/ch/help/english/status.htm'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1c366a50e84393bce67e50dcccc4fc5ff147db27 refers to a dead (removed) revision in file `src/ch/help/english/style.css'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1c366a50e84393bce67e50dcccc4fc5ff147db27 refers to a dead (removed) revision in file `src/ch/help/english/support.htm'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1c366a50e84393bce67e50dcccc4fc5ff147db27 refers to a dead (removed) revision in file `src/ch/help/english/template.htm'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1c366a50e84393bce67e50dcccc4fc5ff147db27 refers to a dead (removed) revision in file `src/ch/help/english/thanks.htm'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1c366a50e84393bce67e50dcccc4fc5ff147db27 refers to a dead (removed) revision in file `src/ch/help/english/using.htm'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1c366a50e84393bce67e50dcccc4fc5ff147db27 refers to a dead (removed) revision in file `src/ch/help/english/welcome.htm'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1c366a50e84393bce67e50dcccc4fc5ff147db27 refers to a dead (removed) revision in file `src/ch/help/polish/0.txt'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1c366a50e84393bce67e50dcccc4fc5ff147db27 refers to a dead (removed) revision in file `src/ch/help/polish/100.txt'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1c366a50e84393bce67e50dcccc4fc5ff147db27 refers to a dead (removed) revision in file `src/ch/help/polish/131.txt'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1c366a50e84393bce67e50dcccc4fc5ff147db27 refers to a dead (removed) revision in file `src/ch/help/polish/137.txt'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1c366a50e84393bce67e50dcccc4fc5ff147db27 refers to a dead (removed) revision in file `src/ch/help/polish/144.txt'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1c366a50e84393bce67e50dcccc4fc5ff147db27 refers to a dead (removed) revision in file `src/ch/help/polish/145.txt'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1c366a50e84393bce67e50dcccc4fc5ff147db27 refers to a dead (removed) revision in file `src/ch/help/polish/149.txt'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1c366a50e84393bce67e50dcccc4fc5ff147db27 refers to a dead (removed) revision in file `src/ch/help/polish/161.txt'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1c366a50e84393bce67e50dcccc4fc5ff147db27 refers to a dead (removed) revision in file `src/ch/help/polish/167.txt'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1c366a50e84393bce67e50dcccc4fc5ff147db27 refers to a dead (removed) revision in file `src/ch/help/polish/173.txt'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1c366a50e84393bce67e50dcccc4fc5ff147db27 refers to a dead (removed) revision in file `src/ch/help/polish/182.txt'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1c366a50e84393bce67e50dcccc4fc5ff147db27 refers to a dead (removed) revision in file `src/ch/help/polish/195.txt'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1c366a50e84393bce67e50dcccc4fc5ff147db27 refers to a dead (removed) revision in file `src/ch/help/polish/208.txt'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1c366a50e84393bce67e50dcccc4fc5ff147db27 refers to a dead (removed) revision in file `src/ch/help/polish/209.txt'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1c366a50e84393bce67e50dcccc4fc5ff147db27 refers to a dead (removed) revision in file `src/ch/help/polish/advmenu.htm'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1c366a50e84393bce67e50dcccc4fc5ff147db27 refers to a dead (removed) revision in file `src/ch/help/polish/buffersize.htm'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1c366a50e84393bce67e50dcccc4fc5ff147db27 refers to a dead (removed) revision in file `src/ch/help/polish/bugs.htm'. Fisheye: No comparison available. Pass `N' to diff? Index: src/ch/help/polish/ch.gif =================================================================== diff -u -r5f4ef9387368390412ff8852b54067b1f7dc8a28 -r1c366a50e84393bce67e50dcccc4fc5ff147db27 Binary files differ Fisheye: Tag 1c366a50e84393bce67e50dcccc4fc5ff147db27 refers to a dead (removed) revision in file `src/ch/help/polish/customcopy.htm'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1c366a50e84393bce67e50dcccc4fc5ff147db27 refers to a dead (removed) revision in file `src/ch/help/polish/explorermenu.htm'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1c366a50e84393bce67e50dcccc4fc5ff147db27 refers to a dead (removed) revision in file `src/ch/help/polish/faq.htm'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1c366a50e84393bce67e50dcccc4fc5ff147db27 refers to a dead (removed) revision in file `src/ch/help/polish/feeddstfile.htm'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1c366a50e84393bce67e50dcccc4fc5ff147db27 refers to a dead (removed) revision in file `src/ch/help/polish/feediwr.htm'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1c366a50e84393bce67e50dcccc4fc5ff147db27 refers to a dead (removed) revision in file `src/ch/help/polish/feednotenoughroom.htm'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1c366a50e84393bce67e50dcccc4fc5ff147db27 refers to a dead (removed) revision in file `src/ch/help/polish/feedreplacefiles.htm'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1c366a50e84393bce67e50dcccc4fc5ff147db27 refers to a dead (removed) revision in file `src/ch/help/polish/feedsmallreplace.htm'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1c366a50e84393bce67e50dcccc4fc5ff147db27 refers to a dead (removed) revision in file `src/ch/help/polish/filterdlg.htm'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1c366a50e84393bce67e50dcccc4fc5ff147db27 refers to a dead (removed) revision in file `src/ch/help/polish/folderdlg.htm'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1c366a50e84393bce67e50dcccc4fc5ff147db27 refers to a dead (removed) revision in file `src/ch/help/polish/headfoot.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1c366a50e84393bce67e50dcccc4fc5ff147db27 refers to a dead (removed) revision in file `src/ch/help/polish/help.hhc'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1c366a50e84393bce67e50dcccc4fc5ff147db27 refers to a dead (removed) revision in file `src/ch/help/polish/help.hhk'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1c366a50e84393bce67e50dcccc4fc5ff147db27 refers to a dead (removed) revision in file `src/ch/help/polish/help.hhp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1c366a50e84393bce67e50dcccc4fc5ff147db27 refers to a dead (removed) revision in file `src/ch/help/polish/history.htm'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1c366a50e84393bce67e50dcccc4fc5ff147db27 refers to a dead (removed) revision in file `src/ch/help/polish/installation.htm'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1c366a50e84393bce67e50dcccc4fc5ff147db27 refers to a dead (removed) revision in file `src/ch/help/polish/license.htm'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1c366a50e84393bce67e50dcccc4fc5ff147db27 refers to a dead (removed) revision in file `src/ch/help/polish/mainmenu.htm'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1c366a50e84393bce67e50dcccc4fc5ff147db27 refers to a dead (removed) revision in file `src/ch/help/polish/miniview.htm'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1c366a50e84393bce67e50dcccc4fc5ff147db27 refers to a dead (removed) revision in file `src/ch/help/polish/options.htm'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1c366a50e84393bce67e50dcccc4fc5ff147db27 refers to a dead (removed) revision in file `src/ch/help/polish/recentdlg.htm'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1c366a50e84393bce67e50dcccc4fc5ff147db27 refers to a dead (removed) revision in file `src/ch/help/polish/replacepaths.htm'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1c366a50e84393bce67e50dcccc4fc5ff147db27 refers to a dead (removed) revision in file `src/ch/help/polish/reporting.htm'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1c366a50e84393bce67e50dcccc4fc5ff147db27 refers to a dead (removed) revision in file `src/ch/help/polish/requirements.htm'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1c366a50e84393bce67e50dcccc4fc5ff147db27 refers to a dead (removed) revision in file `src/ch/help/polish/shortcutsdlg.htm'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1c366a50e84393bce67e50dcccc4fc5ff147db27 refers to a dead (removed) revision in file `src/ch/help/polish/shutdowndlg.htm'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1c366a50e84393bce67e50dcccc4fc5ff147db27 refers to a dead (removed) revision in file `src/ch/help/polish/status.htm'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1c366a50e84393bce67e50dcccc4fc5ff147db27 refers to a dead (removed) revision in file `src/ch/help/polish/style.css'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1c366a50e84393bce67e50dcccc4fc5ff147db27 refers to a dead (removed) revision in file `src/ch/help/polish/support.htm'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1c366a50e84393bce67e50dcccc4fc5ff147db27 refers to a dead (removed) revision in file `src/ch/help/polish/template.htm'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1c366a50e84393bce67e50dcccc4fc5ff147db27 refers to a dead (removed) revision in file `src/ch/help/polish/thanks.htm'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1c366a50e84393bce67e50dcccc4fc5ff147db27 refers to a dead (removed) revision in file `src/ch/help/polish/using.htm'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1c366a50e84393bce67e50dcccc4fc5ff147db27 refers to a dead (removed) revision in file `src/ch/help/polish/welcome.htm'. Fisheye: No comparison available. Pass `N' to diff? Index: src/ch/resource.h =================================================================== diff -u -rdb26c9ac6945d5c754c3460dd55bd6d53e2c9e7e -r1c366a50e84393bce67e50dcccc4fc5ff147db27 --- src/ch/resource.h (.../resource.h) (revision db26c9ac6945d5c754c3460dd55bd6d53e2c9e7e) +++ src/ch/resource.h (.../resource.h) (revision 1c366a50e84393bce67e50dcccc4fc5ff147db27) @@ -305,7 +305,6 @@ #define IDC_BAR5_STATIC 1253 #define IDC_HEADER_STATIC 1254 #define IDC_HOSTLINK_STATIC 1255 -#define IDC_HELP_BUTTON 1257 #define IDC_PROGRAM_STATICEX 1263 #define IDC_FULLVERSION_STATICEX 1264 #define IDC_HOMEPAGE_STATICEX 1265 @@ -521,8 +520,6 @@ #define IDS_CFGLOGFILE_STRING 8085 #define IDS_CFGMAXLIMIT_STRING 8088 #define IDS_CFGROTATEDCOUNT_STRING 8089 -#define IDS_CFGHELPDIR_STRING 8091 -#define IDS_CFGHELPDIRCHOOSE_STRING 8092 #define IDS_LANGUAGESFOLDER_STRING 8093 #define IDS_LANGSFOLDERCHOOSE_STRING 8094 #define IDS_ABOUT_LANGUAGE_STRING 8095 @@ -721,7 +718,6 @@ #define ID_POPUP_SHUTAFTERFINISHED 32807 #define ID_POPUP_REGISTERDLL 32809 #define ID_POPUP_UNREGISTERDLL 32810 -#define ID_POPUP_HELP 32814 #define ID_POPUP_TEMP 32815 #define ID_POPUP_CHECKFORUPDATES 32816 #define ID_POPUP_TOOLS 32817 Fisheye: Tag 1c366a50e84393bce67e50dcccc4fc5ff147db27 refers to a dead (removed) revision in file `src/ch/resource.hm'. Fisheye: No comparison available. Pass `N' to diff? Index: src/ictranslate/ICTranslateDlg.cpp =================================================================== diff -u -r33b33baa373533d0cff8ea5d25154b370f2b2e05 -r1c366a50e84393bce67e50dcccc4fc5ff147db27 --- src/ictranslate/ICTranslateDlg.cpp (.../ICTranslateDlg.cpp) (revision 33b33baa373533d0cff8ea5d25154b370f2b2e05) +++ src/ictranslate/ICTranslateDlg.cpp (.../ICTranslateDlg.cpp) (revision 1c366a50e84393bce67e50dcccc4fc5ff147db27) @@ -88,13 +88,11 @@ DDX_Control(pDX, IDC_SRC_FILENAME_EDIT, m_ctlSrcFilename); DDX_Control(pDX, IDC_SRC_AUTHOR_EDIT, m_ctlSrcAuthor); DDX_Control(pDX, IDC_SRC_LANGUAGE_NAME_EDIT, m_ctlSrcLanguageName); - DDX_Control(pDX, IDC_SRC_HELP_FILENAME_EDIT, m_ctlSrcHelpFilename); DDX_Control(pDX, IDC_SRC_FONT_EDIT, m_ctlSrcFont); DDX_Control(pDX, IDC_SRC_RTL_CHECK, m_ctlSrcRTL); DDX_Control(pDX, IDC_DST_FILENAME_EDIT, m_ctlDstFilename); DDX_Control(pDX, IDC_DST_AUTHOR_EDIT, m_ctlDstAuthor); DDX_Control(pDX, IDC_DST_LANGUAGE_NAME_EDIT, m_ctlDstLanguageName); - DDX_Control(pDX, IDC_DST_HELP_FILENAME_EDIT, m_ctlDstHelpFilename); DDX_Control(pDX, IDC_DST_FONT_EDIT, m_ctlDstFont); DDX_Control(pDX, IDC_DST_RTL_CHECK, m_ctlDstRTL); } @@ -117,7 +115,6 @@ ON_COMMAND(ID_FILE_SAVETRANSLATION, &CICTranslateDlg::OnFileSaveTranslation) ON_EN_KILLFOCUS(IDC_DST_AUTHOR_EDIT, &CICTranslateDlg::OnEnKillFocusDstAuthorEdit) ON_EN_KILLFOCUS(IDC_DST_LANGUAGE_NAME_EDIT, &CICTranslateDlg::OnEnKillFocusDstLanguageNameEdit) - ON_EN_KILLFOCUS(IDC_DST_HELP_FILENAME_EDIT, &CICTranslateDlg::OnEnKillFocusDstHelpFilenameEdit) ON_BN_CLICKED(IDC_DST_RTL_CHECK, &CICTranslateDlg::OnBnClickedDstRtlCheck) ON_COMMAND(ID_EDIT_PREVIOUS_TO_TRANSLATE, &CICTranslateDlg::OnEditPreviousToTranslate) ON_COMMAND(ID_EDIT_NEXT_TO_TRANSLATE, &CICTranslateDlg::OnEditNextToTranslate) @@ -436,7 +433,6 @@ m_ctlSrcFilename.SetWindowText(m_ldBase.GetFilename(true)); m_ctlSrcAuthor.SetWindowText(m_ldBase.GetAuthor()); m_ctlSrcLanguageName.SetWindowText(m_ldBase.GetLangName()); - m_ctlSrcHelpFilename.SetWindowText(m_ldBase.GetHelpName()); CString strFont; if(m_ldBase.GetFontFace()) strFont.Format(L"%s, %u", m_ldBase.GetFontFace(), m_ldBase.GetPointSize()); @@ -458,7 +454,6 @@ m_ctlDstFilename.SetWindowText(m_ldCustom.GetFilename(true)); m_ctlDstAuthor.SetWindowText(m_ldCustom.GetAuthor()); m_ctlDstLanguageName.SetWindowText(m_ldCustom.GetLangName()); - m_ctlDstHelpFilename.SetWindowText(m_ldCustom.GetHelpName()); m_ctlDstRTL.SetCheck(m_ldCustom.GetDirection() ? BST_CHECKED : BST_UNCHECKED); CString strFont; if(m_ldCustom.GetFontFace()) @@ -718,8 +713,6 @@ m_ldCustom.SetAuthor(str); m_ctlDstLanguageName.GetWindowText(str); m_ldCustom.SetLangName(str); - m_ctlDstHelpFilename.GetWindowText(str); - m_ldCustom.SetHelpName(str); bool bRTL = (m_ctlDstRTL.GetCheck() == BST_CHECKED); m_ldCustom.SetDirection(bRTL); @@ -761,8 +754,6 @@ m_ldCustom.SetAuthor(str); m_ctlDstLanguageName.GetWindowText(str); m_ldCustom.SetLangName(str); - m_ctlDstHelpFilename.GetWindowText(str); - m_ldCustom.SetHelpName(str); bool bRTL = (m_ctlDstRTL.GetCheck() == BST_CHECKED); m_ldCustom.SetDirection(bRTL); @@ -817,15 +808,6 @@ m_ldCustom.SetLangName(str); } -void CICTranslateDlg::OnEnKillFocusDstHelpFilenameEdit() -{ - CString str; - m_ctlDstHelpFilename.GetWindowText(str); - const wchar_t* psz = m_ldCustom.GetHelpName(); - if(!psz || psz != str) - m_ldCustom.SetHelpName(str); -} - void CICTranslateDlg::OnBnClickedDstRtlCheck() { bool bRTL = (m_ctlDstRTL.GetCheck() == BST_CHECKED); Index: src/ictranslate/ICTranslateDlg.h =================================================================== diff -u -r12ee49f6bf1f8921500ee2078e0a8c2d7b6d2a45 -r1c366a50e84393bce67e50dcccc4fc5ff147db27 --- src/ictranslate/ICTranslateDlg.h (.../ICTranslateDlg.h) (revision 12ee49f6bf1f8921500ee2078e0a8c2d7b6d2a45) +++ src/ictranslate/ICTranslateDlg.h (.../ICTranslateDlg.h) (revision 1c366a50e84393bce67e50dcccc4fc5ff147db27) @@ -39,7 +39,6 @@ afx_msg void OnBnClickedApply(); afx_msg void OnEnKillFocusDstAuthorEdit(); afx_msg void OnEnKillFocusDstLanguageNameEdit(); - afx_msg void OnEnKillFocusDstHelpFilenameEdit(); afx_msg void OnBnClickedDstRtlCheck(); afx_msg void OnEditPreviousToTranslate(); afx_msg void OnEditNextToTranslate(); @@ -89,13 +88,11 @@ CEdit m_ctlSrcFilename; CEdit m_ctlSrcAuthor; CEdit m_ctlSrcLanguageName; - CEdit m_ctlSrcHelpFilename; CEdit m_ctlSrcFont; CButton m_ctlSrcRTL; CEdit m_ctlDstFilename; CEdit m_ctlDstAuthor; CEdit m_ctlDstLanguageName; - CEdit m_ctlDstHelpFilename; CEdit m_ctlDstFont; CButton m_ctlDstRTL; }; Index: src/libictranslate/LanguageDialog.cpp =================================================================== diff -u -r9ddf8fdd5f641491dd30c49eb90f8f740314b6af -r1c366a50e84393bce67e50dcccc4fc5ff147db27 --- src/libictranslate/LanguageDialog.cpp (.../LanguageDialog.cpp) (revision 9ddf8fdd5f641491dd30c49eb90f8f740314b6af) +++ src/libictranslate/LanguageDialog.cpp (.../LanguageDialog.cpp) (revision 1c366a50e84393bce67e50dcccc4fc5ff147db27) @@ -332,9 +332,6 @@ // CLanguageDialog dialog BEGIN_MESSAGE_MAP(CLanguageDialog, CDialog) - ON_WM_HELPINFO() - ON_WM_CONTEXTMENU() - ON_BN_CLICKED(IDHELP, OnHelpButton) END_MESSAGE_MAP() @@ -778,36 +775,6 @@ ::ReleaseDC(nullptr, hDC); } - BOOL CLanguageDialog::OnHelpInfo(HELPINFO* pHelpInfo) - { - if(pHelpInfo->iContextType == HELPINFO_WINDOW) - { - pHelpInfo->dwContextId = (m_uiResID << 16) | pHelpInfo->iCtrlId; - AfxGetApp()->HtmlHelp((DWORD_PTR)pHelpInfo, HH_DISPLAY_TEXT_POPUP); - return true; - } - - return false; - } - - void CLanguageDialog::OnContextMenu(CWnd* pWnd, CPoint point) - { - HELPINFO hi; - hi.cbSize = sizeof(HELPINFO); - hi.iCtrlId = pWnd->GetDlgCtrlID(); - hi.dwContextId = (m_uiResID << 16) | hi.iCtrlId; - hi.hItemHandle = pWnd->m_hWnd; - hi.iContextType = HELPINFO_WINDOW; - hi.MousePos = point; - - AfxGetApp()->HtmlHelp((DWORD_PTR)&hi, HH_DISPLAY_TEXT_POPUP); - } - - void CLanguageDialog::OnHelpButton() - { - AfxGetApp()->HtmlHelp(m_uiResID + 0x20000, HH_HELP_CONTEXT); - } - // ============================================================================ /// ictranslate::CLanguageDialog::InitializeResizableControls /// @date 2009/04/18 Index: src/libictranslate/LanguageDialog.h =================================================================== diff -u -r3921d82d9605d98b2281f3f42d9f9c8385b89a3e -r1c366a50e84393bce67e50dcccc4fc5ff147db27 --- src/libictranslate/LanguageDialog.h (.../LanguageDialog.h) (revision 3921d82d9605d98b2281f3f42d9f9c8385b89a3e) +++ src/libictranslate/LanguageDialog.h (.../LanguageDialog.h) (revision 1c366a50e84393bce67e50dcccc4fc5ff147db27) @@ -205,10 +205,6 @@ return m_pFont ? m_pFont : ((CDialog*)this)->GetFont(); } - afx_msg BOOL OnHelpInfo(HELPINFO* pHelpInfo); - afx_msg void OnContextMenu(CWnd* pWnd, CPoint point); - void OnHelpButton(); - // Controls resize support void InitializeResizableControls(); void ClearResizableControls(); Index: src/libictranslate/ResourceManager.cpp =================================================================== diff -u -r9ddf8fdd5f641491dd30c49eb90f8f740314b6af -r1c366a50e84393bce67e50dcccc4fc5ff147db27 --- src/libictranslate/ResourceManager.cpp (.../ResourceManager.cpp) (revision 9ddf8fdd5f641491dd30c49eb90f8f740314b6af) +++ src/libictranslate/ResourceManager.cpp (.../ResourceManager.cpp) (revision 1c366a50e84393bce67e50dcccc4fc5ff147db27) @@ -316,7 +316,6 @@ m_pszLngName(nullptr), m_pszFontFace(nullptr), m_wPointSize(0), - m_pszHelpName(nullptr), m_pszAuthor(nullptr), m_bRTL(false), m_uiSectionID(0), @@ -330,7 +329,6 @@ delete[] m_pszFilename; delete[] m_pszLngName; delete[] m_pszFontFace; - delete[] m_pszHelpName; delete[] m_pszAuthor; } @@ -342,8 +340,6 @@ m_pszLngName = nullptr; delete[] m_pszFontFace; m_pszFontFace = nullptr; - delete[] m_pszHelpName; - m_pszHelpName = nullptr; delete[] m_pszAuthor; m_pszAuthor = nullptr; m_bModified = false; @@ -360,7 +356,6 @@ m_pszLngName(nullptr), m_pszFontFace(nullptr), m_wPointSize(ld.m_wPointSize), - m_pszHelpName(nullptr), m_pszAuthor(nullptr), m_bRTL(ld.m_bRTL), m_uiSectionID(ld.m_uiSectionID), @@ -372,7 +367,6 @@ SetFontFace(ld.GetFontFace()); SetPointSize(ld.GetPointSize()); SetDirection(ld.GetDirection()); - SetHelpName(ld.GetHelpName()); SetAuthor(ld.GetAuthor()); m_mapTranslation.insert(ld.m_mapTranslation.begin(), ld.m_mapTranslation.end()); @@ -387,7 +381,6 @@ SetFontFace(rSrc.GetFontFace()); SetPointSize(rSrc.GetPointSize()); SetDirection(rSrc.GetDirection()); - SetHelpName(rSrc.GetHelpName()); SetAuthor(rSrc.GetAuthor()); m_bRTL = rSrc.m_bRTL; m_bUpdating = rSrc.m_bUpdating; @@ -412,7 +405,6 @@ const unsigned int uiFontFace = cfg.register_string(_T("Info/Font Face"), _T("")); const unsigned int uiSize = cfg.register_signed_num(_T("Info/Size"), 0, 0, 0xffff); const unsigned int uiRTL = cfg.register_bool(_T("Info/RTL reading order"), false); - const unsigned int uiHelpName = cfg.register_string(_T("Info/Help name"), _T("")); const unsigned int uiAuthor = cfg.register_string(_T("Info/Author"), _T("")); const unsigned int uiVersion = cfg.register_string(_T("Info/Format version"), _T("1")); @@ -440,11 +432,6 @@ SetDirection(cfg.get_bool(uiRTL)); - psz = cfg.get_string(uiHelpName); - if(!psz || psz[ 0 ] == _T('\0')) - return false; - SetHelpName(psz); - psz = cfg.get_string(uiAuthor); if(!psz || psz[ 0 ] == _T('\0')) return false; @@ -582,7 +569,6 @@ const unsigned int uiFontFace = cfg.register_string(_T("Info/Font Face"), _T("")); const unsigned int uiSize = cfg.register_signed_num(_T("Info/Size"), 0, 0, 0xffff); const unsigned int uiRTL = cfg.register_bool(_T("Info/RTL reading order"), false); - const unsigned int uiHelpName = cfg.register_string(_T("Info/Help name"), _T("")); const unsigned int uiAuthor = cfg.register_string(_T("Info/Author"), _T("")); const unsigned int uiVersion = cfg.register_string(_T("Info/Format version"), _T("1")); @@ -613,11 +599,6 @@ SetDirection(cfg.get_bool(uiRTL)); - psz = cfg.get_string(uiHelpName); - if(!psz || psz[ 0 ] == _T('\0')) - return false; - SetHelpName(psz); - psz = cfg.get_string(uiAuthor); if(!psz || psz[ 0 ] == _T('\0')) return false; @@ -659,7 +640,6 @@ cfg.set_string(_T("Info/Font Face"), m_pszFontFace); cfg.set_string(_T("Info/Size"), _itot(m_wPointSize, szTemp, 10)); cfg.set_string(_T("Info/RTL reading order"), m_bRTL ? _T("1") : _T("0")); - cfg.set_string(_T("Info/Help name"), m_pszHelpName); cfg.set_string(_T("Info/Author"), m_pszAuthor); cfg.set_string(_T("Info/Format version"), TRANSLATION_FORMAT_VERSION); @@ -801,12 +781,6 @@ m_bModified = true; } - void CLangData::SetHelpName(PCTSTR psz) - { - SetFnameData(&m_pszHelpName, psz); - m_bModified = true; - } - void CLangData::SetAuthor(PCTSTR psz) { if(m_pszAuthor) @@ -827,21 +801,6 @@ return true; } - void CLangData::SetFnameData(PTSTR *ppszDst, PCTSTR pszSrc) - { - if(*ppszDst) - delete[](*ppszDst); - const TCHAR* pszLast = nullptr; - if((pszLast = _tcsrchr(pszSrc, _T('\\'))) != nullptr) - pszLast++; - else - pszLast = pszSrc; - - // copy - *ppszDst = new TCHAR[ _tcslen(pszLast) + 1 ]; - _tcscpy(*ppszDst, pszLast); - } - CResourceManager::CResourceManager() : m_hRes(nullptr), m_pfnCallback(nullptr) Index: src/libictranslate/ResourceManager.h =================================================================== diff -u -r4635360505e8d113395dc8cc394dfb696747e197 -r1c366a50e84393bce67e50dcccc4fc5ff147db27 --- src/libictranslate/ResourceManager.h (.../ResourceManager.h) (revision 4635360505e8d113395dc8cc394dfb696747e197) +++ src/libictranslate/ResourceManager.h (.../ResourceManager.h) (revision 1c366a50e84393bce67e50dcccc4fc5ff147db27) @@ -169,12 +169,6 @@ return m_bRTL; } - void SetHelpName(PCTSTR psz); - PCTSTR GetHelpName() const - { - return m_pszHelpName; - } - void SetAuthor(PCTSTR psz); PCTSTR GetAuthor() const { @@ -193,7 +187,6 @@ bool IsValidDescription() const; protected: - void SetFnameData(PTSTR *ppszDst, PCTSTR pszSrc); static void EnumAttributesCallback(bool bGroup, const wchar_t* pszName, const wchar_t* pszValue, void* pData); static void UnescapeString(wchar_t* pszData); @@ -202,7 +195,6 @@ TCHAR *m_pszLngName; // name of the language (ie. Chinese (PRC)) TCHAR *m_pszFontFace; // face name of the font that will be used in dialogs WORD m_wPointSize; // font point size - TCHAR *m_pszHelpName; // help name (wo the directory) for this language TCHAR *m_pszAuthor; // author name bool m_bRTL; // does the language require right-to-left reading order ?