Index: src/ch/FeedbackReplaceDlg.cpp =================================================================== diff -u -N -r547f865c69434c14c6f16e4b529d4198f6fe2040 -r09127018dfb45c37cae3486731d219eee147b1ae --- src/ch/FeedbackReplaceDlg.cpp (.../FeedbackReplaceDlg.cpp) (revision 547f865c69434c14c6f16e4b529d4198f6fe2040) +++ src/ch/FeedbackReplaceDlg.cpp (.../FeedbackReplaceDlg.cpp) (revision 09127018dfb45c37cae3486731d219eee147b1ae) @@ -42,16 +42,26 @@ DDX_Control(pDX, IDC_DST_MODIFIEDDATE_EDIT, m_ctlDstDate); DDX_Control(pDX, IDC_DST_FILESIZE_EDIT, m_ctlDstSize); - DDX_Control(pDX, IDC_MFCMENUBUTTON1, m_mfcButton); + DDX_Control(pDX, IDC_REPLACE_BUTTON, m_btnReplace); + DDX_Control(pDX, IDC_RENAME_BUTTON, m_btnRename); + DDX_Control(pDX, IDC_RESUME_BUTTON, m_btnResume); + DDX_Control(pDX, IDC_SKIP_BUTTON, m_btnSkip); + DDX_Control(pDX, IDC_PAUSE_BUTTON, m_btnPause); + DDX_Control(pDX, IDC_CANCEL_BUTTON, m_btnCancel); + + DDX_Control(pDX, IDC_MASS_REPLACE_MENUBUTTON, m_btnMassReplace); + DDX_Control(pDX, IDC_MASS_RENAME_MENUBUTTON, m_btnMassRename); + DDX_Control(pDX, IDC_MASS_RESUME_MENUBUTTON, m_btnMassResume); + DDX_Control(pDX, IDC_MASS_SKIP_MENUBUTTON, m_btnMassSkip); } BEGIN_MESSAGE_MAP(CFeedbackReplaceDlg, ictranslate::CLanguageDialog) ON_BN_CLICKED(IDC_REPLACE_BUTTON, &CFeedbackReplaceDlg::OnBnClickedReplaceButton) - ON_BN_CLICKED(IDC_COPY_REST_BUTTON, &CFeedbackReplaceDlg::OnBnClickedCopyRestButton) + ON_BN_CLICKED(IDC_RESUME_BUTTON, &CFeedbackReplaceDlg::OnBnClickedCopyRestButton) ON_BN_CLICKED(IDC_SKIP_BUTTON, &CFeedbackReplaceDlg::OnBnClickedSkipButton) ON_BN_CLICKED(IDC_PAUSE_BUTTON, &CFeedbackReplaceDlg::OnBnClickedPauseButton) ON_BN_CLICKED(IDC_CANCEL_BUTTON, &CFeedbackReplaceDlg::OnBnClickedCancelButton) - ON_BN_CLICKED(IDC_MFCMENUBUTTON1, &CFeedbackReplaceDlg::OnBnMfcMenu) + ON_BN_CLICKED(IDC_MASS_REPLACE_MENUBUTTON, &CFeedbackReplaceDlg::OnBnMassReplace) END_MESSAGE_MAP() @@ -97,7 +107,7 @@ AddResizableControl(IDC_MASS_REPLACE_MENUBUTTON, 0.25, 0.0, 0.0, 0.0); AddResizableControl(IDC_RENAME_BUTTON, 0.25, 0.0, 0.25, 0.0); AddResizableControl(IDC_MASS_RENAME_MENUBUTTON, 0.5, 0.0, 0.0, 0.0); - AddResizableControl(IDC_COPY_REST_BUTTON, 0.5, 0.0, 0.25, 0.0); + AddResizableControl(IDC_RESUME_BUTTON, 0.5, 0.0, 0.25, 0.0); AddResizableControl(IDC_MASS_RESUME_MENUBUTTON, 0.75, 0.0, 0.0, 0.0); AddResizableControl(IDC_SKIP_BUTTON, 0.75, 0.0, 0.25, 0.0); AddResizableControl(IDC_MASS_SKIP_MENUBUTTON, 1.0, 0.0, 0.0, 0.0); @@ -114,21 +124,17 @@ HMENU hMenu = GetResManager().LoadMenu(MAKEINTRESOURCE(IDR_PRIORITY_MENU)); m_mfcMenu.Attach(hMenu); - m_mfcButton.m_hMenu = m_mfcMenu.GetSubMenu(0)->GetSafeHmenu(); + m_btnMassReplace.m_hMenu = m_mfcMenu.GetSubMenu(0)->GetSafeHmenu(); + m_btnMassResume.m_hMenu = m_mfcMenu.GetSubMenu(0)->GetSafeHmenu(); + m_btnMassRename.m_hMenu = m_mfcMenu.GetSubMenu(0)->GetSafeHmenu(); + m_btnMassSkip.m_hMenu = m_mfcMenu.GetSubMenu(0)->GetSafeHmenu(); - m_mfcButton.SetWindowText(L"Unattended operation"); - return TRUE; // return TRUE unless you set the focus to a control // EXCEPTION: OCX Property Pages should return FALSE } void CFeedbackReplaceDlg::RefreshFilesInfo() { - // load template - ictranslate::CResourceManager& rManager = GetResManager(); - - CString strTemplate; - ///////////////////////////////////////////////////////////// // src file chcore::TSmartPath pathSrc = m_rSrcFile.GetFullFilePath(); @@ -164,15 +170,9 @@ m_ctlDstDate.SetWindowText(dtTemp.Format(LOCALE_NOUSEROVERRIDE, LANG_USER_DEFAULT)); // button captions - CWnd* pAppendButton = GetDlgItem(IDC_COPY_REST_BUTTON); - if(pAppendButton) - { - if(m_rDstFile.GetLength64() > m_rSrcFile.GetLength64()) - { - CString strAltButtonCaption = rManager.LoadString(IDS_BUTTON_TRUNCATE_STRING); - pAppendButton->SetWindowText(strAltButtonCaption); - } - } + m_btnResume.EnableWindow(m_rDstFile.GetLength64() < m_rSrcFile.GetLength64()); + m_btnResume.SetTooltip(L"Some tooltip"); + m_btnReplace.SetTooltip(L"Replace tooltip"); } void CFeedbackReplaceDlg::RefreshImages() @@ -217,10 +217,10 @@ EndDialog(chengine::EFeedbackResult::eResult_Cancel); } -void CFeedbackReplaceDlg::OnBnMfcMenu() +void CFeedbackReplaceDlg::OnBnMassReplace() { CString str; - switch (m_mfcButton.m_nMenuResult) + switch (m_btnMassReplace.m_nMenuResult) { case ID_POPUP_TIME_CRITICAL: str = L"first menu item clicked"; Index: src/ch/FeedbackReplaceDlg.h =================================================================== diff -u -N -r547f865c69434c14c6f16e4b529d4198f6fe2040 -r09127018dfb45c37cae3486731d219eee147b1ae --- src/ch/FeedbackReplaceDlg.h (.../FeedbackReplaceDlg.h) (revision 547f865c69434c14c6f16e4b529d4198f6fe2040) +++ src/ch/FeedbackReplaceDlg.h (.../FeedbackReplaceDlg.h) (revision 09127018dfb45c37cae3486731d219eee147b1ae) @@ -59,9 +59,20 @@ CEdit m_ctlDstSize; CEdit m_ctlDstDate; - CMFCMenuButton m_mfcButton; CMenu m_mfcMenu; + CMFCButton m_btnReplace; + CMFCButton m_btnRename; + CMFCButton m_btnResume; + CMFCButton m_btnSkip; + CMFCButton m_btnPause; + CMFCButton m_btnCancel; + + CMFCMenuButton m_btnMassReplace; + CMFCMenuButton m_btnMassRename; + CMFCMenuButton m_btnMassResume; + CMFCMenuButton m_btnMassSkip; + BOOL m_bAllItems; protected: @@ -74,7 +85,7 @@ afx_msg void OnBnClickedSkipButton(); afx_msg void OnBnClickedPauseButton(); afx_msg void OnBnClickedCancelButton(); - afx_msg void OnBnMfcMenu(); + afx_msg void OnBnMassReplace(); }; #endif Index: src/ch/ch.rc =================================================================== diff -u -N -r547f865c69434c14c6f16e4b529d4198f6fe2040 -r09127018dfb45c37cae3486731d219eee147b1ae --- src/ch/ch.rc (.../ch.rc) (revision 547f865c69434c14c6f16e4b529d4198f6fe2040) +++ src/ch/ch.rc (.../ch.rc) (revision 09127018dfb45c37cae3486731d219eee147b1ae) @@ -396,11 +396,12 @@ CAPTION "File already exists" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - PUSHBUTTON "&Replace",IDC_REPLACE_BUTTON,7,162,69,14 - PUSHBUTTON "R&esume",IDC_COPY_REST_BUTTON,188,162,69,14 - PUSHBUTTON "&Skip",IDC_SKIP_BUTTON,276,162,69,14 - PUSHBUTTON "&Pause",IDC_PAUSE_BUTTON,188,183,81,14 - PUSHBUTTON "&Cancel",IDC_CANCEL_BUTTON,276,183,81,14 + CONTROL "&Replace",IDC_REPLACE_BUTTON,"MfcButton",WS_TABSTOP,7,162,69,14 + CONTROL "R&esume",IDC_RESUME_BUTTON,"MfcButton",WS_TABSTOP,188,162,69,14 + CONTROL "&Skip",IDC_SKIP_BUTTON,"MfcButton",WS_TABSTOP,276,162,69,14 + CONTROL "&Pause",IDC_PAUSE_BUTTON,"MfcButton",WS_TABSTOP,188,183,81,14 + CONTROL "&Cancel",IDC_CANCEL_BUTTON,"MfcButton",WS_TABSTOP,276,183,81,14 + CONTROL "&Rename",IDC_RENAME_BUTTON,"MfcButton",WS_TABSTOP,96,162,69,14 EDITTEXT IDC_SRC_FILENAME_EDIT,96,34,201,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER EDITTEXT IDC_SRC_PATH_EDIT,96,46,201,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER EDITTEXT IDC_SRC_FILESIZE_EDIT,96,58,201,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER @@ -423,7 +424,6 @@ LTEXT "Location:",IDC_DST_LOCATION_STATIC,47,117,31,8 LTEXT "Size:",IDC_DST_SIZE_STATIC,47,129,18,8 LTEXT "Modified:",IDC_DST_TIME_STATIC,47,141,31,8 - PUSHBUTTON "&Rename",IDC_RENAME_BUTTON,96,162,69,14 CONTROL "",IDC_MASS_RENAME_MENUBUTTON,"MfcMenuButton",WS_TABSTOP,165,162,12,14 CONTROL "",IDC_MASS_RESUME_MENUBUTTON,"MfcMenuButton",WS_TABSTOP,257,162,12,14 CONTROL "",IDC_MASS_SKIP_MENUBUTTON,"MfcMenuButton",WS_TABSTOP,345,162,12,14 @@ -838,74 +838,206 @@ IDD_FEEDBACK_REPLACE_DIALOG DLGINIT BEGIN - IDC_MASS_REPLACE_MENUBUTTON, 0x37c, 283, 0 + IDC_REPLACE_BUTTON, 0x37c, 369, 0 +0x4d3c, 0x4346, 0x7542, 0x7474, 0x6e6f, 0x535f, 0x7974, 0x656c, 0x343e, +0x2f3c, 0x464d, 0x4243, 0x7475, 0x6f74, 0x5f6e, 0x7453, 0x6c79, 0x3e65, +0x4d3c, 0x4346, 0x7542, 0x7474, 0x6e6f, 0x415f, 0x7475, 0x736f, 0x7a69, +0x3e65, 0x4146, 0x534c, 0x3c45, 0x4d2f, 0x4346, 0x7542, 0x7474, 0x6e6f, +0x415f, 0x7475, 0x736f, 0x7a69, 0x3e65, 0x4d3c, 0x4346, 0x7542, 0x7474, +0x6e6f, 0x545f, 0x6f6f, 0x746c, 0x7069, 0x3c3e, 0x4d2f, 0x4346, 0x7542, +0x7474, 0x6e6f, 0x545f, 0x6f6f, 0x746c, 0x7069, 0x3c3e, 0x464d, 0x4243, +0x7475, 0x6f74, 0x5f6e, 0x7546, 0x6c6c, 0x6554, 0x7478, 0x6f54, 0x6c6f, +0x543e, 0x5552, 0x3c45, 0x4d2f, 0x4346, 0x7542, 0x7474, 0x6e6f, 0x465f, +0x6c75, 0x546c, 0x7865, 0x5474, 0x6f6f, 0x3e6c, 0x4d3c, 0x4346, 0x7542, +0x7474, 0x6e6f, 0x435f, 0x7275, 0x6f73, 0x5472, 0x7079, 0x3e65, 0x3131, +0x2f3c, 0x464d, 0x4243, 0x7475, 0x6f74, 0x5f6e, 0x7543, 0x7372, 0x726f, +0x7954, 0x6570, 0x3c3e, 0x464d, 0x4243, 0x7475, 0x6f74, 0x5f6e, 0x6d49, +0x6761, 0x5465, 0x7079, 0x3e65, 0x3c38, 0x4d2f, 0x4346, 0x7542, 0x7474, +0x6e6f, 0x495f, 0x616d, 0x6567, 0x7954, 0x6570, 0x3c3e, 0x464d, 0x4243, +0x7475, 0x6f74, 0x5f6e, 0x6d49, 0x6761, 0x4f65, 0x546e, 0x706f, 0x463e, +0x4c41, 0x4553, 0x2f3c, 0x464d, 0x4243, 0x7475, 0x6f74, 0x5f6e, 0x6d49, +0x6761, 0x4f65, 0x546e, 0x706f, 0x3c3e, 0x464d, 0x4243, 0x7475, 0x6f74, +0x5f6e, 0x6d49, 0x6761, 0x4f65, 0x526e, 0x6769, 0x7468, 0x463e, 0x4c41, +0x4553, 0x2f3c, 0x464d, 0x4243, 0x7475, 0x6f74, 0x5f6e, 0x6d49, 0x6761, +0x4f65, 0x526e, 0x6769, 0x7468, "\076" + IDC_RESUME_BUTTON, 0x37c, 369, 0 +0x4d3c, 0x4346, 0x7542, 0x7474, 0x6e6f, 0x535f, 0x7974, 0x656c, 0x343e, +0x2f3c, 0x464d, 0x4243, 0x7475, 0x6f74, 0x5f6e, 0x7453, 0x6c79, 0x3e65, +0x4d3c, 0x4346, 0x7542, 0x7474, 0x6e6f, 0x415f, 0x7475, 0x736f, 0x7a69, +0x3e65, 0x4146, 0x534c, 0x3c45, 0x4d2f, 0x4346, 0x7542, 0x7474, 0x6e6f, +0x415f, 0x7475, 0x736f, 0x7a69, 0x3e65, 0x4d3c, 0x4346, 0x7542, 0x7474, +0x6e6f, 0x545f, 0x6f6f, 0x746c, 0x7069, 0x3c3e, 0x4d2f, 0x4346, 0x7542, +0x7474, 0x6e6f, 0x545f, 0x6f6f, 0x746c, 0x7069, 0x3c3e, 0x464d, 0x4243, +0x7475, 0x6f74, 0x5f6e, 0x7546, 0x6c6c, 0x6554, 0x7478, 0x6f54, 0x6c6f, +0x543e, 0x5552, 0x3c45, 0x4d2f, 0x4346, 0x7542, 0x7474, 0x6e6f, 0x465f, +0x6c75, 0x546c, 0x7865, 0x5474, 0x6f6f, 0x3e6c, 0x4d3c, 0x4346, 0x7542, +0x7474, 0x6e6f, 0x435f, 0x7275, 0x6f73, 0x5472, 0x7079, 0x3e65, 0x3131, +0x2f3c, 0x464d, 0x4243, 0x7475, 0x6f74, 0x5f6e, 0x7543, 0x7372, 0x726f, +0x7954, 0x6570, 0x3c3e, 0x464d, 0x4243, 0x7475, 0x6f74, 0x5f6e, 0x6d49, +0x6761, 0x5465, 0x7079, 0x3e65, 0x3c38, 0x4d2f, 0x4346, 0x7542, 0x7474, +0x6e6f, 0x495f, 0x616d, 0x6567, 0x7954, 0x6570, 0x3c3e, 0x464d, 0x4243, +0x7475, 0x6f74, 0x5f6e, 0x6d49, 0x6761, 0x4f65, 0x546e, 0x706f, 0x463e, +0x4c41, 0x4553, 0x2f3c, 0x464d, 0x4243, 0x7475, 0x6f74, 0x5f6e, 0x6d49, +0x6761, 0x4f65, 0x546e, 0x706f, 0x3c3e, 0x464d, 0x4243, 0x7475, 0x6f74, +0x5f6e, 0x6d49, 0x6761, 0x4f65, 0x526e, 0x6769, 0x7468, 0x463e, 0x4c41, +0x4553, 0x2f3c, 0x464d, 0x4243, 0x7475, 0x6f74, 0x5f6e, 0x6d49, 0x6761, +0x4f65, 0x526e, 0x6769, 0x7468, "\076" + IDC_SKIP_BUTTON, 0x37c, 369, 0 +0x4d3c, 0x4346, 0x7542, 0x7474, 0x6e6f, 0x535f, 0x7974, 0x656c, 0x343e, +0x2f3c, 0x464d, 0x4243, 0x7475, 0x6f74, 0x5f6e, 0x7453, 0x6c79, 0x3e65, +0x4d3c, 0x4346, 0x7542, 0x7474, 0x6e6f, 0x415f, 0x7475, 0x736f, 0x7a69, +0x3e65, 0x4146, 0x534c, 0x3c45, 0x4d2f, 0x4346, 0x7542, 0x7474, 0x6e6f, +0x415f, 0x7475, 0x736f, 0x7a69, 0x3e65, 0x4d3c, 0x4346, 0x7542, 0x7474, +0x6e6f, 0x545f, 0x6f6f, 0x746c, 0x7069, 0x3c3e, 0x4d2f, 0x4346, 0x7542, +0x7474, 0x6e6f, 0x545f, 0x6f6f, 0x746c, 0x7069, 0x3c3e, 0x464d, 0x4243, +0x7475, 0x6f74, 0x5f6e, 0x7546, 0x6c6c, 0x6554, 0x7478, 0x6f54, 0x6c6f, +0x543e, 0x5552, 0x3c45, 0x4d2f, 0x4346, 0x7542, 0x7474, 0x6e6f, 0x465f, +0x6c75, 0x546c, 0x7865, 0x5474, 0x6f6f, 0x3e6c, 0x4d3c, 0x4346, 0x7542, +0x7474, 0x6e6f, 0x435f, 0x7275, 0x6f73, 0x5472, 0x7079, 0x3e65, 0x3131, +0x2f3c, 0x464d, 0x4243, 0x7475, 0x6f74, 0x5f6e, 0x7543, 0x7372, 0x726f, +0x7954, 0x6570, 0x3c3e, 0x464d, 0x4243, 0x7475, 0x6f74, 0x5f6e, 0x6d49, +0x6761, 0x5465, 0x7079, 0x3e65, 0x3c38, 0x4d2f, 0x4346, 0x7542, 0x7474, +0x6e6f, 0x495f, 0x616d, 0x6567, 0x7954, 0x6570, 0x3c3e, 0x464d, 0x4243, +0x7475, 0x6f74, 0x5f6e, 0x6d49, 0x6761, 0x4f65, 0x546e, 0x706f, 0x463e, +0x4c41, 0x4553, 0x2f3c, 0x464d, 0x4243, 0x7475, 0x6f74, 0x5f6e, 0x6d49, +0x6761, 0x4f65, 0x546e, 0x706f, 0x3c3e, 0x464d, 0x4243, 0x7475, 0x6f74, +0x5f6e, 0x6d49, 0x6761, 0x4f65, 0x526e, 0x6769, 0x7468, 0x463e, 0x4c41, +0x4553, 0x2f3c, 0x464d, 0x4243, 0x7475, 0x6f74, 0x5f6e, 0x6d49, 0x6761, +0x4f65, 0x526e, 0x6769, 0x7468, "\076" + IDC_PAUSE_BUTTON, 0x37c, 369, 0 +0x4d3c, 0x4346, 0x7542, 0x7474, 0x6e6f, 0x535f, 0x7974, 0x656c, 0x343e, +0x2f3c, 0x464d, 0x4243, 0x7475, 0x6f74, 0x5f6e, 0x7453, 0x6c79, 0x3e65, +0x4d3c, 0x4346, 0x7542, 0x7474, 0x6e6f, 0x415f, 0x7475, 0x736f, 0x7a69, +0x3e65, 0x4146, 0x534c, 0x3c45, 0x4d2f, 0x4346, 0x7542, 0x7474, 0x6e6f, +0x415f, 0x7475, 0x736f, 0x7a69, 0x3e65, 0x4d3c, 0x4346, 0x7542, 0x7474, +0x6e6f, 0x545f, 0x6f6f, 0x746c, 0x7069, 0x3c3e, 0x4d2f, 0x4346, 0x7542, +0x7474, 0x6e6f, 0x545f, 0x6f6f, 0x746c, 0x7069, 0x3c3e, 0x464d, 0x4243, +0x7475, 0x6f74, 0x5f6e, 0x7546, 0x6c6c, 0x6554, 0x7478, 0x6f54, 0x6c6f, +0x543e, 0x5552, 0x3c45, 0x4d2f, 0x4346, 0x7542, 0x7474, 0x6e6f, 0x465f, +0x6c75, 0x546c, 0x7865, 0x5474, 0x6f6f, 0x3e6c, 0x4d3c, 0x4346, 0x7542, +0x7474, 0x6e6f, 0x435f, 0x7275, 0x6f73, 0x5472, 0x7079, 0x3e65, 0x3131, +0x2f3c, 0x464d, 0x4243, 0x7475, 0x6f74, 0x5f6e, 0x7543, 0x7372, 0x726f, +0x7954, 0x6570, 0x3c3e, 0x464d, 0x4243, 0x7475, 0x6f74, 0x5f6e, 0x6d49, +0x6761, 0x5465, 0x7079, 0x3e65, 0x3c38, 0x4d2f, 0x4346, 0x7542, 0x7474, +0x6e6f, 0x495f, 0x616d, 0x6567, 0x7954, 0x6570, 0x3c3e, 0x464d, 0x4243, +0x7475, 0x6f74, 0x5f6e, 0x6d49, 0x6761, 0x4f65, 0x546e, 0x706f, 0x463e, +0x4c41, 0x4553, 0x2f3c, 0x464d, 0x4243, 0x7475, 0x6f74, 0x5f6e, 0x6d49, +0x6761, 0x4f65, 0x546e, 0x706f, 0x3c3e, 0x464d, 0x4243, 0x7475, 0x6f74, +0x5f6e, 0x6d49, 0x6761, 0x4f65, 0x526e, 0x6769, 0x7468, 0x463e, 0x4c41, +0x4553, 0x2f3c, 0x464d, 0x4243, 0x7475, 0x6f74, 0x5f6e, 0x6d49, 0x6761, +0x4f65, 0x526e, 0x6769, 0x7468, "\076" + IDC_CANCEL_BUTTON, 0x37c, 369, 0 +0x4d3c, 0x4346, 0x7542, 0x7474, 0x6e6f, 0x535f, 0x7974, 0x656c, 0x343e, +0x2f3c, 0x464d, 0x4243, 0x7475, 0x6f74, 0x5f6e, 0x7453, 0x6c79, 0x3e65, +0x4d3c, 0x4346, 0x7542, 0x7474, 0x6e6f, 0x415f, 0x7475, 0x736f, 0x7a69, +0x3e65, 0x4146, 0x534c, 0x3c45, 0x4d2f, 0x4346, 0x7542, 0x7474, 0x6e6f, +0x415f, 0x7475, 0x736f, 0x7a69, 0x3e65, 0x4d3c, 0x4346, 0x7542, 0x7474, +0x6e6f, 0x545f, 0x6f6f, 0x746c, 0x7069, 0x3c3e, 0x4d2f, 0x4346, 0x7542, +0x7474, 0x6e6f, 0x545f, 0x6f6f, 0x746c, 0x7069, 0x3c3e, 0x464d, 0x4243, +0x7475, 0x6f74, 0x5f6e, 0x7546, 0x6c6c, 0x6554, 0x7478, 0x6f54, 0x6c6f, +0x543e, 0x5552, 0x3c45, 0x4d2f, 0x4346, 0x7542, 0x7474, 0x6e6f, 0x465f, +0x6c75, 0x546c, 0x7865, 0x5474, 0x6f6f, 0x3e6c, 0x4d3c, 0x4346, 0x7542, +0x7474, 0x6e6f, 0x435f, 0x7275, 0x6f73, 0x5472, 0x7079, 0x3e65, 0x3131, +0x2f3c, 0x464d, 0x4243, 0x7475, 0x6f74, 0x5f6e, 0x7543, 0x7372, 0x726f, +0x7954, 0x6570, 0x3c3e, 0x464d, 0x4243, 0x7475, 0x6f74, 0x5f6e, 0x6d49, +0x6761, 0x5465, 0x7079, 0x3e65, 0x3c38, 0x4d2f, 0x4346, 0x7542, 0x7474, +0x6e6f, 0x495f, 0x616d, 0x6567, 0x7954, 0x6570, 0x3c3e, 0x464d, 0x4243, +0x7475, 0x6f74, 0x5f6e, 0x6d49, 0x6761, 0x4f65, 0x546e, 0x706f, 0x463e, +0x4c41, 0x4553, 0x2f3c, 0x464d, 0x4243, 0x7475, 0x6f74, 0x5f6e, 0x6d49, +0x6761, 0x4f65, 0x546e, 0x706f, 0x3c3e, 0x464d, 0x4243, 0x7475, 0x6f74, +0x5f6e, 0x6d49, 0x6761, 0x4f65, 0x526e, 0x6769, 0x7468, 0x463e, 0x4c41, +0x4553, 0x2f3c, 0x464d, 0x4243, 0x7475, 0x6f74, 0x5f6e, 0x6d49, 0x6761, +0x4f65, 0x526e, 0x6769, 0x7468, "\076" + IDC_RENAME_BUTTON, 0x37c, 369, 0 +0x4d3c, 0x4346, 0x7542, 0x7474, 0x6e6f, 0x535f, 0x7974, 0x656c, 0x343e, +0x2f3c, 0x464d, 0x4243, 0x7475, 0x6f74, 0x5f6e, 0x7453, 0x6c79, 0x3e65, +0x4d3c, 0x4346, 0x7542, 0x7474, 0x6e6f, 0x415f, 0x7475, 0x736f, 0x7a69, +0x3e65, 0x4146, 0x534c, 0x3c45, 0x4d2f, 0x4346, 0x7542, 0x7474, 0x6e6f, +0x415f, 0x7475, 0x736f, 0x7a69, 0x3e65, 0x4d3c, 0x4346, 0x7542, 0x7474, +0x6e6f, 0x545f, 0x6f6f, 0x746c, 0x7069, 0x3c3e, 0x4d2f, 0x4346, 0x7542, +0x7474, 0x6e6f, 0x545f, 0x6f6f, 0x746c, 0x7069, 0x3c3e, 0x464d, 0x4243, +0x7475, 0x6f74, 0x5f6e, 0x7546, 0x6c6c, 0x6554, 0x7478, 0x6f54, 0x6c6f, +0x543e, 0x5552, 0x3c45, 0x4d2f, 0x4346, 0x7542, 0x7474, 0x6e6f, 0x465f, +0x6c75, 0x546c, 0x7865, 0x5474, 0x6f6f, 0x3e6c, 0x4d3c, 0x4346, 0x7542, +0x7474, 0x6e6f, 0x435f, 0x7275, 0x6f73, 0x5472, 0x7079, 0x3e65, 0x3131, +0x2f3c, 0x464d, 0x4243, 0x7475, 0x6f74, 0x5f6e, 0x7543, 0x7372, 0x726f, +0x7954, 0x6570, 0x3c3e, 0x464d, 0x4243, 0x7475, 0x6f74, 0x5f6e, 0x6d49, +0x6761, 0x5465, 0x7079, 0x3e65, 0x3c38, 0x4d2f, 0x4346, 0x7542, 0x7474, +0x6e6f, 0x495f, 0x616d, 0x6567, 0x7954, 0x6570, 0x3c3e, 0x464d, 0x4243, +0x7475, 0x6f74, 0x5f6e, 0x6d49, 0x6761, 0x4f65, 0x546e, 0x706f, 0x463e, +0x4c41, 0x4553, 0x2f3c, 0x464d, 0x4243, 0x7475, 0x6f74, 0x5f6e, 0x6d49, +0x6761, 0x4f65, 0x546e, 0x706f, 0x3c3e, 0x464d, 0x4243, 0x7475, 0x6f74, +0x5f6e, 0x6d49, 0x6761, 0x4f65, 0x526e, 0x6769, 0x7468, 0x463e, 0x4c41, +0x4553, 0x2f3c, 0x464d, 0x4243, 0x7475, 0x6f74, 0x5f6e, 0x6d49, 0x6761, +0x4f65, 0x526e, 0x6769, 0x7468, "\076" + IDC_MASS_REPLACE_MENUBUTTON, 0x37c, 282, 0 0x4d3c, 0x4346, 0x654d, 0x756e, 0x7542, 0x7474, 0x6e6f, 0x4f5f, 0x4d53, 0x6e65, 0x3e75, 0x4146, 0x534c, 0x3c45, 0x4d2f, 0x4346, 0x654d, 0x756e, 0x7542, 0x7474, 0x6e6f, 0x4f5f, 0x4d53, 0x6e65, 0x3e75, 0x4d3c, 0x4346, 0x654d, 0x756e, 0x7542, 0x7474, 0x6e6f, 0x525f, 0x6769, 0x7468, 0x7241, 0x6f72, 0x3e77, 0x4146, 0x534c, 0x3c45, 0x4d2f, 0x4346, 0x654d, 0x756e, 0x7542, 0x7474, 0x6e6f, 0x525f, 0x6769, 0x7468, 0x7241, 0x6f72, 0x3e77, 0x4d3c, 0x4346, 0x654d, 0x756e, 0x7542, 0x7474, 0x6e6f, 0x535f, 0x6174, -0x5079, 0x6572, 0x7373, 0x6465, 0x463e, 0x4c41, 0x4553, 0x2f3c, 0x464d, -0x4d43, 0x6e65, 0x4275, 0x7475, 0x6f74, 0x5f6e, 0x7453, 0x7961, 0x7250, -0x7365, 0x6573, 0x3e64, 0x4d3c, 0x4346, 0x654d, 0x756e, 0x7542, 0x7474, -0x6e6f, 0x445f, 0x6665, 0x7561, 0x746c, 0x6c43, 0x6369, 0x3e6b, 0x5254, -0x4555, 0x2f3c, 0x464d, 0x4d43, 0x6e65, 0x4275, 0x7475, 0x6f74, 0x5f6e, -0x6544, 0x6166, 0x6c75, 0x4374, 0x696c, 0x6b63, 0x3c3e, 0x464d, 0x4d43, -0x6e65, 0x4275, 0x7475, 0x6f74, 0x5f6e, 0x7541, 0x6f74, 0x6973, 0x657a, -0x463e, 0x4c41, 0x4553, 0x2f3c, 0x464d, 0x4d43, 0x6e65, 0x4275, 0x7475, -0x6f74, 0x5f6e, 0x7541, 0x6f74, 0x6973, 0x657a, "\076" - IDC_MASS_RENAME_MENUBUTTON, 0x37c, 283, 0 +0x5079, 0x6572, 0x7373, 0x6465, 0x543e, 0x5552, 0x3c45, 0x4d2f, 0x4346, +0x654d, 0x756e, 0x7542, 0x7474, 0x6e6f, 0x535f, 0x6174, 0x5079, 0x6572, +0x7373, 0x6465, 0x3c3e, 0x464d, 0x4d43, 0x6e65, 0x4275, 0x7475, 0x6f74, +0x5f6e, 0x6544, 0x6166, 0x6c75, 0x4374, 0x696c, 0x6b63, 0x543e, 0x5552, +0x3c45, 0x4d2f, 0x4346, 0x654d, 0x756e, 0x7542, 0x7474, 0x6e6f, 0x445f, +0x6665, 0x7561, 0x746c, 0x6c43, 0x6369, 0x3e6b, 0x4d3c, 0x4346, 0x654d, +0x756e, 0x7542, 0x7474, 0x6e6f, 0x415f, 0x7475, 0x736f, 0x7a69, 0x3e65, +0x4146, 0x534c, 0x3c45, 0x4d2f, 0x4346, 0x654d, 0x756e, 0x7542, 0x7474, +0x6e6f, 0x415f, 0x7475, 0x736f, 0x7a69, 0x3e65, + IDC_MASS_RENAME_MENUBUTTON, 0x37c, 282, 0 0x4d3c, 0x4346, 0x654d, 0x756e, 0x7542, 0x7474, 0x6e6f, 0x4f5f, 0x4d53, 0x6e65, 0x3e75, 0x4146, 0x534c, 0x3c45, 0x4d2f, 0x4346, 0x654d, 0x756e, 0x7542, 0x7474, 0x6e6f, 0x4f5f, 0x4d53, 0x6e65, 0x3e75, 0x4d3c, 0x4346, 0x654d, 0x756e, 0x7542, 0x7474, 0x6e6f, 0x525f, 0x6769, 0x7468, 0x7241, 0x6f72, 0x3e77, 0x4146, 0x534c, 0x3c45, 0x4d2f, 0x4346, 0x654d, 0x756e, 0x7542, 0x7474, 0x6e6f, 0x525f, 0x6769, 0x7468, 0x7241, 0x6f72, 0x3e77, 0x4d3c, 0x4346, 0x654d, 0x756e, 0x7542, 0x7474, 0x6e6f, 0x535f, 0x6174, -0x5079, 0x6572, 0x7373, 0x6465, 0x463e, 0x4c41, 0x4553, 0x2f3c, 0x464d, -0x4d43, 0x6e65, 0x4275, 0x7475, 0x6f74, 0x5f6e, 0x7453, 0x7961, 0x7250, -0x7365, 0x6573, 0x3e64, 0x4d3c, 0x4346, 0x654d, 0x756e, 0x7542, 0x7474, -0x6e6f, 0x445f, 0x6665, 0x7561, 0x746c, 0x6c43, 0x6369, 0x3e6b, 0x5254, -0x4555, 0x2f3c, 0x464d, 0x4d43, 0x6e65, 0x4275, 0x7475, 0x6f74, 0x5f6e, -0x6544, 0x6166, 0x6c75, 0x4374, 0x696c, 0x6b63, 0x3c3e, 0x464d, 0x4d43, -0x6e65, 0x4275, 0x7475, 0x6f74, 0x5f6e, 0x7541, 0x6f74, 0x6973, 0x657a, -0x463e, 0x4c41, 0x4553, 0x2f3c, 0x464d, 0x4d43, 0x6e65, 0x4275, 0x7475, -0x6f74, 0x5f6e, 0x7541, 0x6f74, 0x6973, 0x657a, "\076" - IDC_MASS_RESUME_MENUBUTTON, 0x37c, 283, 0 +0x5079, 0x6572, 0x7373, 0x6465, 0x543e, 0x5552, 0x3c45, 0x4d2f, 0x4346, +0x654d, 0x756e, 0x7542, 0x7474, 0x6e6f, 0x535f, 0x6174, 0x5079, 0x6572, +0x7373, 0x6465, 0x3c3e, 0x464d, 0x4d43, 0x6e65, 0x4275, 0x7475, 0x6f74, +0x5f6e, 0x6544, 0x6166, 0x6c75, 0x4374, 0x696c, 0x6b63, 0x543e, 0x5552, +0x3c45, 0x4d2f, 0x4346, 0x654d, 0x756e, 0x7542, 0x7474, 0x6e6f, 0x445f, +0x6665, 0x7561, 0x746c, 0x6c43, 0x6369, 0x3e6b, 0x4d3c, 0x4346, 0x654d, +0x756e, 0x7542, 0x7474, 0x6e6f, 0x415f, 0x7475, 0x736f, 0x7a69, 0x3e65, +0x4146, 0x534c, 0x3c45, 0x4d2f, 0x4346, 0x654d, 0x756e, 0x7542, 0x7474, +0x6e6f, 0x415f, 0x7475, 0x736f, 0x7a69, 0x3e65, + IDC_MASS_RESUME_MENUBUTTON, 0x37c, 282, 0 0x4d3c, 0x4346, 0x654d, 0x756e, 0x7542, 0x7474, 0x6e6f, 0x4f5f, 0x4d53, 0x6e65, 0x3e75, 0x4146, 0x534c, 0x3c45, 0x4d2f, 0x4346, 0x654d, 0x756e, 0x7542, 0x7474, 0x6e6f, 0x4f5f, 0x4d53, 0x6e65, 0x3e75, 0x4d3c, 0x4346, 0x654d, 0x756e, 0x7542, 0x7474, 0x6e6f, 0x525f, 0x6769, 0x7468, 0x7241, 0x6f72, 0x3e77, 0x4146, 0x534c, 0x3c45, 0x4d2f, 0x4346, 0x654d, 0x756e, 0x7542, 0x7474, 0x6e6f, 0x525f, 0x6769, 0x7468, 0x7241, 0x6f72, 0x3e77, 0x4d3c, 0x4346, 0x654d, 0x756e, 0x7542, 0x7474, 0x6e6f, 0x535f, 0x6174, -0x5079, 0x6572, 0x7373, 0x6465, 0x463e, 0x4c41, 0x4553, 0x2f3c, 0x464d, -0x4d43, 0x6e65, 0x4275, 0x7475, 0x6f74, 0x5f6e, 0x7453, 0x7961, 0x7250, -0x7365, 0x6573, 0x3e64, 0x4d3c, 0x4346, 0x654d, 0x756e, 0x7542, 0x7474, -0x6e6f, 0x445f, 0x6665, 0x7561, 0x746c, 0x6c43, 0x6369, 0x3e6b, 0x5254, -0x4555, 0x2f3c, 0x464d, 0x4d43, 0x6e65, 0x4275, 0x7475, 0x6f74, 0x5f6e, -0x6544, 0x6166, 0x6c75, 0x4374, 0x696c, 0x6b63, 0x3c3e, 0x464d, 0x4d43, -0x6e65, 0x4275, 0x7475, 0x6f74, 0x5f6e, 0x7541, 0x6f74, 0x6973, 0x657a, -0x463e, 0x4c41, 0x4553, 0x2f3c, 0x464d, 0x4d43, 0x6e65, 0x4275, 0x7475, -0x6f74, 0x5f6e, 0x7541, 0x6f74, 0x6973, 0x657a, "\076" - IDC_MASS_SKIP_MENUBUTTON, 0x37c, 283, 0 +0x5079, 0x6572, 0x7373, 0x6465, 0x543e, 0x5552, 0x3c45, 0x4d2f, 0x4346, +0x654d, 0x756e, 0x7542, 0x7474, 0x6e6f, 0x535f, 0x6174, 0x5079, 0x6572, +0x7373, 0x6465, 0x3c3e, 0x464d, 0x4d43, 0x6e65, 0x4275, 0x7475, 0x6f74, +0x5f6e, 0x6544, 0x6166, 0x6c75, 0x4374, 0x696c, 0x6b63, 0x543e, 0x5552, +0x3c45, 0x4d2f, 0x4346, 0x654d, 0x756e, 0x7542, 0x7474, 0x6e6f, 0x445f, +0x6665, 0x7561, 0x746c, 0x6c43, 0x6369, 0x3e6b, 0x4d3c, 0x4346, 0x654d, +0x756e, 0x7542, 0x7474, 0x6e6f, 0x415f, 0x7475, 0x736f, 0x7a69, 0x3e65, +0x4146, 0x534c, 0x3c45, 0x4d2f, 0x4346, 0x654d, 0x756e, 0x7542, 0x7474, +0x6e6f, 0x415f, 0x7475, 0x736f, 0x7a69, 0x3e65, + IDC_MASS_SKIP_MENUBUTTON, 0x37c, 282, 0 0x4d3c, 0x4346, 0x654d, 0x756e, 0x7542, 0x7474, 0x6e6f, 0x4f5f, 0x4d53, 0x6e65, 0x3e75, 0x4146, 0x534c, 0x3c45, 0x4d2f, 0x4346, 0x654d, 0x756e, 0x7542, 0x7474, 0x6e6f, 0x4f5f, 0x4d53, 0x6e65, 0x3e75, 0x4d3c, 0x4346, 0x654d, 0x756e, 0x7542, 0x7474, 0x6e6f, 0x525f, 0x6769, 0x7468, 0x7241, 0x6f72, 0x3e77, 0x4146, 0x534c, 0x3c45, 0x4d2f, 0x4346, 0x654d, 0x756e, 0x7542, 0x7474, 0x6e6f, 0x525f, 0x6769, 0x7468, 0x7241, 0x6f72, 0x3e77, 0x4d3c, 0x4346, 0x654d, 0x756e, 0x7542, 0x7474, 0x6e6f, 0x535f, 0x6174, -0x5079, 0x6572, 0x7373, 0x6465, 0x463e, 0x4c41, 0x4553, 0x2f3c, 0x464d, -0x4d43, 0x6e65, 0x4275, 0x7475, 0x6f74, 0x5f6e, 0x7453, 0x7961, 0x7250, -0x7365, 0x6573, 0x3e64, 0x4d3c, 0x4346, 0x654d, 0x756e, 0x7542, 0x7474, -0x6e6f, 0x445f, 0x6665, 0x7561, 0x746c, 0x6c43, 0x6369, 0x3e6b, 0x5254, -0x4555, 0x2f3c, 0x464d, 0x4d43, 0x6e65, 0x4275, 0x7475, 0x6f74, 0x5f6e, -0x6544, 0x6166, 0x6c75, 0x4374, 0x696c, 0x6b63, 0x3c3e, 0x464d, 0x4d43, -0x6e65, 0x4275, 0x7475, 0x6f74, 0x5f6e, 0x7541, 0x6f74, 0x6973, 0x657a, -0x463e, 0x4c41, 0x4553, 0x2f3c, 0x464d, 0x4d43, 0x6e65, 0x4275, 0x7475, -0x6f74, 0x5f6e, 0x7541, 0x6f74, 0x6973, 0x657a, "\076" +0x5079, 0x6572, 0x7373, 0x6465, 0x543e, 0x5552, 0x3c45, 0x4d2f, 0x4346, +0x654d, 0x756e, 0x7542, 0x7474, 0x6e6f, 0x535f, 0x6174, 0x5079, 0x6572, +0x7373, 0x6465, 0x3c3e, 0x464d, 0x4d43, 0x6e65, 0x4275, 0x7475, 0x6f74, +0x5f6e, 0x6544, 0x6166, 0x6c75, 0x4374, 0x696c, 0x6b63, 0x543e, 0x5552, +0x3c45, 0x4d2f, 0x4346, 0x654d, 0x756e, 0x7542, 0x7474, 0x6e6f, 0x445f, +0x6665, 0x7561, 0x746c, 0x6c43, 0x6369, 0x3e6b, 0x4d3c, 0x4346, 0x654d, +0x756e, 0x7542, 0x7474, 0x6e6f, 0x415f, 0x7475, 0x736f, 0x7a69, 0x3e65, +0x4146, 0x534c, 0x3c45, 0x4d2f, 0x4346, 0x654d, 0x756e, 0x7542, 0x7474, +0x6e6f, 0x415f, 0x7475, 0x736f, 0x7a69, 0x3e65, 0 END @@ -1139,7 +1271,6 @@ IDS_EMPTYSUBTASKNAME_STRING "none" IDS_STATUS_LOADERROR_STRING "Load error" IDS_EXPORTING_TASK_FAILED "Exporting task data failed. Reason: %reason." - IDS_BUTTON_TRUNCATE_STRING "&Truncate" IDS_LOGFILEEMPTY_STRING "Log file is empty" END Index: src/ch/resource.h =================================================================== diff -u -N -r547f865c69434c14c6f16e4b529d4198f6fe2040 -r09127018dfb45c37cae3486731d219eee147b1ae --- src/ch/resource.h (.../resource.h) (revision 547f865c69434c14c6f16e4b529d4198f6fe2040) +++ src/ch/resource.h (.../resource.h) (revision 09127018dfb45c37cae3486731d219eee147b1ae) @@ -150,7 +150,6 @@ #define IDC_DESTFILENAME_EDIT 1090 #define IDC_IGNORE_BUTTON 1097 #define IDC_RETRY_BUTTON 1100 -#define IDC_COPY_REST_BUTTON 1103 #define IDC_SHOW_LOG_BUTTON 1120 #define IDC_STICK_BUTTON 1122 #define IDC_FREESPACE_STATIC 1123 @@ -711,7 +710,6 @@ #define IDS_EMPTYSUBTASKNAME_STRING 21554 #define IDS_STATUS_LOADERROR_STRING 21555 #define IDS_EXPORTING_TASK_FAILED 21556 -#define IDS_BUTTON_TRUNCATE_STRING 21557 #define IDS_LOGFILEEMPTY_STRING 21558 #define ID_POPUP_SHOW_STATUS 32773 #define ID_POPUP_TIME_CRITICAL 32774 Index: src/libictranslate/LanguageDialog.cpp =================================================================== diff -u -N -r547f865c69434c14c6f16e4b529d4198f6fe2040 -r09127018dfb45c37cae3486731d219eee147b1ae --- src/libictranslate/LanguageDialog.cpp (.../LanguageDialog.cpp) (revision 547f865c69434c14c6f16e4b529d4198f6fe2040) +++ src/libictranslate/LanguageDialog.cpp (.../LanguageDialog.cpp) (revision 09127018dfb45c37cae3486731d219eee147b1ae) @@ -613,7 +613,8 @@ (*it).m_wClass == 0x0082 || (*it).m_wClass == 0x0086 || ((*it).m_pszClass != nullptr && _tcscmp((*it).m_pszClass, _T("STATICEX")) == 0) || - ((*it).m_pszClass != nullptr && _tcscmp((*it).m_pszClass, _T("MfcMenuButton")) == 0) + ((*it).m_pszClass != nullptr && _tcscmp((*it).m_pszClass, _T("MfcMenuButton")) == 0) || + ((*it).m_pszClass != nullptr && _tcscmp((*it).m_pszClass, _T("MfcButton")) == 0) ) pWnd->SetWindowText(m_prm->LoadString((WORD)m_uiResID, (*it).m_itemTemplate.id)); }