From 8e15885ed875502a7c528c0ac535e9c71e797e3a Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Sun, 28 Mar 2004 12:31:02 +0000 Subject: [PATCH] PATCH: [ 913743 ] Icons for menuitems (RFE 873697) - File/Exit and Help/Contents icons from Tim Gerundt --- Src/MainFrm.cpp | 201 ++++++++++++++--------------- Src/Merge.rc | 318 +++++++++++++++++++++++----------------------- Src/readme.txt | 9 ++ Src/res/exit.bmp | Bin 0 -> 774 bytes Src/res/help_contents.bmp | Bin 0 -> 238 bytes Src/resource.h | 4 +- 6 files changed, 274 insertions(+), 258 deletions(-) create mode 100644 Src/res/exit.bmp create mode 100644 Src/res/help_contents.bmp diff --git a/Src/MainFrm.cpp b/Src/MainFrm.cpp index 3cb65afb4..e682eda02 100644 --- a/Src/MainFrm.cpp +++ b/Src/MainFrm.cpp @@ -18,7 +18,7 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // ///////////////////////////////////////////////////////////////////////////// -/** +/** * @file MainFrm.cpp * * @brief Implementation of the CMainFrame class @@ -77,7 +77,7 @@ static char THIS_FILE[] = __FILE__; extern CLogFile gLog; CMainFrame *mf = NULL; -// add a +// add a static void add_regexp PARAMS((struct regexp_list **, char const*)); ///////////////////////////////////////////////////////////////////////////// // CMainFrame @@ -283,11 +283,11 @@ int CMainFrame::OnCreate(LPCREATESTRUCT lpCreateStruct) return -1; mf = this; - + // build the initial reg expression list RebuildRegExpList(); GetFontProperties(); - + if (!m_wndToolBar.CreateEx(this,TBSTYLE_FLAT,WS_CHILD|WS_VISIBLE|CBRS_GRIPPER|CBRS_TOP|CBRS_TOOLTIPS|CBRS_FLYBY|CBRS_SIZE_DYNAMIC) || !m_wndToolBar.LoadToolBar(IDR_MAINFRAME)) { @@ -302,7 +302,7 @@ int CMainFrame::OnCreate(LPCREATESTRUCT lpCreateStruct) TRACE0("Failed to create status bar\n"); return -1; // fail to create } - m_wndStatusBar.SetPaneInfo(1, ID_DIFFNUM, 0, 150); + m_wndStatusBar.SetPaneInfo(1, ID_DIFFNUM, 0, 150); // TODO: Remove this if you don't want tool tips or a resizeable toolbar m_wndToolBar.SetBarStyle(m_wndToolBar.GetBarStyle() | @@ -334,7 +334,7 @@ HMENU CMainFrame::NewMenu() } */ -/** +/** * @brief Find the scripts submenu from the main menu * As now this is the first submenu in "Edit" menu */ @@ -362,7 +362,7 @@ HMENU CMainFrame::GetScriptsSubmenu(HMENU mainMenu) HMENU CMainFrame::NewDefaultMenu() { m_default.LoadMenu(IDR_MAINFRAME); - + // Load bitmaps to menuitems m_default.ModifyODMenu(NULL, ID_EDIT_COPY, IDB_EDIT_COPY); m_default.ModifyODMenu(NULL, ID_EDIT_CUT, IDB_EDIT_CUT); @@ -377,7 +377,8 @@ HMENU CMainFrame::NewDefaultMenu() m_default.ModifyODMenu(NULL, ID_EDIT_REPLACE, IDB_EDIT_REPLACE); m_default.ModifyODMenu(NULL, ID_VIEW_LANGUAGE, IDB_VIEW_LANGUAGE); m_default.ModifyODMenu(NULL, ID_VIEW_SELECTFONT, IDB_VIEW_SELECTFONT); - + m_default.ModifyODMenu(NULL, ID_APP_EXIT, IDB_FILE_EXIT); + m_default.ModifyODMenu(NULL, ID_HELP_CONTENTS, IDB_HELP_CONTENTS); m_default.LoadToolbar(IDR_MAINFRAME); // append the scripts submenu @@ -419,8 +420,8 @@ void CMainFrame::OnMeasureItem(int nIDCtl, /** * @brief This handler ensures that keyboard shortcuts work. */ -LRESULT CMainFrame::OnMenuChar(UINT nChar, UINT nFlags, - CMenu* pMenu) +LRESULT CMainFrame::OnMenuChar(UINT nChar, UINT nFlags, + CMenu* pMenu) { LRESULT lresult; if(m_default.IsMenu(pMenu)) @@ -433,10 +434,10 @@ LRESULT CMainFrame::OnMenuChar(UINT nChar, UINT nFlags, /** * @brief This handler updates the menus from time to time. */ -void CMainFrame::OnInitMenuPopup(CMenu* pPopupMenu, UINT nIndex, BOOL bSysMenu) +void CMainFrame::OnInitMenuPopup(CMenu* pPopupMenu, UINT nIndex, BOOL bSysMenu) { CMDIFrameWnd::OnInitMenuPopup(pPopupMenu, nIndex, bSysMenu); - + if (!bSysMenu) { if (BCMenu::IsMenu(pPopupMenu)) @@ -455,7 +456,7 @@ BOOL CMainFrame::PreCreateWindow(CREATESTRUCT& cs) ///////////////////////////////////////////////////////////////////////////// // CMainFrame message handlers -void CMainFrame::OnFileOpen() +void CMainFrame::OnFileOpen() { DoFileOpen(); } @@ -504,7 +505,7 @@ void CMainFrame::RedisplayAllDirDocs() /** * @brief Show/Hide different files/directories */ -void CMainFrame::OnOptionsShowDifferent() +void CMainFrame::OnOptionsShowDifferent() { varprop::VariantValue val; val = m_options.Get(OPT_SHOW_DIFFERENT); @@ -516,7 +517,7 @@ void CMainFrame::OnOptionsShowDifferent() /** * @brief Show/Hide identical files/directories */ -void CMainFrame::OnOptionsShowIdentical() +void CMainFrame::OnOptionsShowIdentical() { varprop::VariantValue val; val = m_options.Get(OPT_SHOW_IDENTICAL); @@ -528,7 +529,7 @@ void CMainFrame::OnOptionsShowIdentical() /** * @brief Show/Hide left-only files/directories */ -void CMainFrame::OnOptionsShowUniqueLeft() +void CMainFrame::OnOptionsShowUniqueLeft() { varprop::VariantValue val; val = m_options.Get(OPT_SHOW_UNIQUE_LEFT); @@ -540,7 +541,7 @@ void CMainFrame::OnOptionsShowUniqueLeft() /** * @brief Show/Hide right-only files/directories */ -void CMainFrame::OnOptionsShowUniqueRight() +void CMainFrame::OnOptionsShowUniqueRight() { varprop::VariantValue val; val = m_options.Get(OPT_SHOW_UNIQUE_RIGHT); @@ -573,27 +574,27 @@ void CMainFrame::OnOptionsShowSkipped() RedisplayAllDirDocs(); } -void CMainFrame::OnUpdateOptionsShowdifferent(CCmdUI* pCmdUI) +void CMainFrame::OnUpdateOptionsShowdifferent(CCmdUI* pCmdUI) { pCmdUI->SetCheck(m_options.GetInt(OPT_SHOW_DIFFERENT)); } -void CMainFrame::OnUpdateOptionsShowidentical(CCmdUI* pCmdUI) +void CMainFrame::OnUpdateOptionsShowidentical(CCmdUI* pCmdUI) { pCmdUI->SetCheck(m_options.GetInt(OPT_SHOW_IDENTICAL)); } -void CMainFrame::OnUpdateOptionsShowuniqueleft(CCmdUI* pCmdUI) +void CMainFrame::OnUpdateOptionsShowuniqueleft(CCmdUI* pCmdUI) { pCmdUI->SetCheck(m_options.GetInt(OPT_SHOW_UNIQUE_LEFT)); } -void CMainFrame::OnUpdateOptionsShowuniqueright(CCmdUI* pCmdUI) +void CMainFrame::OnUpdateOptionsShowuniqueright(CCmdUI* pCmdUI) { pCmdUI->SetCheck(m_options.GetInt(OPT_SHOW_UNIQUE_RIGHT)); } -void CMainFrame::OnUpdateOptionsShowBinaries(CCmdUI* pCmdUI) +void CMainFrame::OnUpdateOptionsShowBinaries(CCmdUI* pCmdUI) { pCmdUI->SetCheck(m_options.GetInt(OPT_SHOW_BINARIES)); } @@ -606,7 +607,7 @@ void CMainFrame::OnUpdateOptionsShowSkipped(CCmdUI* pCmdUI) /** * @brief Show/Hide backup files */ -void CMainFrame::OnHideBackupFiles() +void CMainFrame::OnHideBackupFiles() { varprop::VariantValue val; val = m_options.Get(OPT_HIDE_BACKUP); @@ -615,7 +616,7 @@ void CMainFrame::OnHideBackupFiles() RedisplayAllDirDocs(); } -void CMainFrame::OnUpdateHideBackupFiles(CCmdUI* pCmdUI) +void CMainFrame::OnUpdateHideBackupFiles(CCmdUI* pCmdUI) { pCmdUI->SetCheck(m_options.GetInt(OPT_HIDE_BACKUP)); } @@ -623,11 +624,11 @@ void CMainFrame::OnUpdateHideBackupFiles(CCmdUI* pCmdUI) /** * @brief Show GNU licence information in notepad (local file) or in Web Browser */ -void CMainFrame::OnHelpGnulicense() +void CMainFrame::OnHelpGnulicense() { CString spath = GetModulePath() + _T("\\Copying"); CString url = _T("http://www.gnu.org/copyleft/gpl.html"); - + CFileStatus status; if (CFile::GetStatus(spath, status)) ShellExecute(m_hWnd, _T("open"), _T("notepad.exe"), spath, NULL, SW_SHOWNORMAL); @@ -641,7 +642,7 @@ void CMainFrame::OnHelpGnulicense() * Reads words from a file deliminated by charset with one slight twist. * If the next char in the file to be read is one of the characters inside the delimiter, * then the word returned will be a word consisting only of delimiters. - * + * * @note pfile is not incremented past the word returned */ BOOL CMainFrame::GetWordFile(HANDLE pfile, TCHAR * buffer, TCHAR * charset) @@ -656,7 +657,7 @@ BOOL CMainFrame::GetWordFile(HANDLE pfile, TCHAR * buffer, TCHAR * charset) BOOL delimMatch = FALSE; ZeroMemory(&cbuffer, sizeof(cbuffer)); - + while (numread == sizeof(ctemp) && pfile != INVALID_HANDLE_VALUE && buffercount < sizeof(cbuffer)) { if (ReadFile(pfile, (LPVOID)&ctemp, sizeof(ctemp), &numread, NULL) == TRUE) @@ -692,7 +693,7 @@ BOOL CMainFrame::GetWordFile(HANDLE pfile, TCHAR * buffer, TCHAR * charset) else if (delimword == FALSE) { for (pcharset = charset;*pcharset;pcharset++) - { + { //if next char is equal to a delimiter or we want delimwords stop the adding if (ctemp == *pcharset) { @@ -712,7 +713,7 @@ BOOL CMainFrame::GetWordFile(HANDLE pfile, TCHAR * buffer, TCHAR * charset) { delimMatch = FALSE; for (pcharset = charset;*pcharset;pcharset++) - { + { //if next char is equal to a delimiter or we want delimwords stop the adding if (ctemp == *pcharset) { @@ -763,7 +764,7 @@ BOOL CMainFrame::CheckSavePath(CString& strSavePath) CString s; bFileRO = files_isFileReadOnly(strSavePath, &bFileExists); - + if (bFileExists && bFileRO) { // Version control system used? @@ -773,7 +774,7 @@ BOOL CMainFrame::CheckSavePath(CString& strSavePath) { CString title; VERIFY(title.LoadString(IDS_SAVE_AS_TITLE)); - + // Prompt for user choice AfxFormatString1(s, IDS_SAVEREADONLY_FMT, strSavePath); userChoice = AfxMessageBox(s, MB_YESNOCANCEL | @@ -787,7 +788,7 @@ BOOL CMainFrame::CheckSavePath(CString& strSavePath) status.m_attribute &= ~CFile::Attribute::readOnly; CFile::SetStatus(strSavePath, status); break; - + // Save to new filename case IDNO: if (SelectFile(s, strSavePath, title, NULL, FALSE)) @@ -795,7 +796,7 @@ BOOL CMainFrame::CheckSavePath(CString& strSavePath) else bRetVal = FALSE; break; - + // Cancel saving case IDCANCEL: bRetVal = FALSE; @@ -909,7 +910,7 @@ BOOL CMainFrame::SaveToVersionControl(CString& strSavePath) m_strVssUser = dlg.m_strUser; m_strVssPassword = dlg.m_strPassword; m_strVssDatabase = dlg.m_strSelectedDatabase; - m_bVCProjSync = dlg.m_bVCProjSync; + m_bVCProjSync = dlg.m_bVCProjSync; theApp.WriteProfileString(_T("Settings"), _T("VssDatabase"), m_strVssDatabase); theApp.WriteProfileString(_T("Settings"), _T("VssProject"), m_strVssProjectBase); @@ -921,7 +922,7 @@ BOOL CMainFrame::SaveToVersionControl(CString& strSavePath) IVSSItem m_vssi; COleException *eOleException = new COleException; - + // BSP - Create the COM interface pointer to VSS if (FAILED(vssdb.CreateDispatch(_T("SourceSafe"), eOleException))) { @@ -937,10 +938,10 @@ BOOL CMainFrame::SaveToVersionControl(CString& strSavePath) { CString iniPath = m_strVssDatabase + _T("\\srcsafe.ini"); // BSP - Open the specific VSS data file using info from VSS dialog box - vssdb.Open(iniPath, m_strVssUser, m_strVssPassword); + vssdb.Open(iniPath, m_strVssUser, m_strVssPassword); bOpened = TRUE; } - + if (bOpened == FALSE) { // BSP - Open the specific VSS data file using info from VSS dialog box @@ -977,7 +978,7 @@ BOOL CMainFrame::SaveToVersionControl(CString& strSavePath) if (buffer2[k] == '/') buffer2[k] = '\\'; } - + //take out last '\\' int strlb2 = _tcslen(buffer2); if (buffer2[strlb2-1] == '\\') @@ -988,7 +989,7 @@ BOOL CMainFrame::SaveToVersionControl(CString& strSavePath) if (pdest) { int index = (int)(pdest - buffer1 + 1); - + _tcscpy(buffer, buffer1); TCHAR * fp = &buffer[int(index + _tcslen(pbuf2))]; sname = fp; @@ -1051,7 +1052,7 @@ BOOL CMainFrame::SaveToVersionControl(CString& strSavePath) WaitForSingleObject(hVss, INFINITE); GetExitCodeProcess(hVss, &code); CloseHandle(hVss); - + if (code != 0) { AfxMessageBox(IDS_VSSERROR, MB_ICONSTOP); @@ -1078,7 +1079,7 @@ void CMainFrame::SetEOLMixed(BOOL bAllow) ApplyViewWhitespace(); } -void CMainFrame::OnOptions() +void CMainFrame::OnOptions() { CString sExtEditor; CString selectedFilter; @@ -1093,7 +1094,7 @@ void CMainFrame::OnOptions() CPropRegistry regpage; CPropCompare compage(&m_options); CPropEditor editor; - + sht.AddPage(&gen); sht.AddPage(&compage); sht.AddPage(&editor); @@ -1101,7 +1102,7 @@ void CMainFrame::OnOptions() sht.AddPage(&vss); sht.AddPage(&colors); sht.AddPage(®page); - + vss.m_nVerSys = m_nVerSys; vss.m_strPath = m_strVssPath; gen.m_bBackup = m_options.GetInt(OPT_CREATE_BACKUPS); @@ -1124,12 +1125,12 @@ void CMainFrame::OnOptions() editor.m_bAutomaticRescan = m_options.GetInt(OPT_AUTOMATIC_RESCAN); editor.m_bHiliteSyntax = m_options.GetInt(OPT_SYNTAX_HIGHLIGHT); editor.m_bAllowMixedEol = m_options.GetInt(OPT_ALLOW_MIXED_EOL); - + if (sht.DoModal()==IDOK) { m_nVerSys = vss.m_nVerSys; m_strVssPath = vss.m_strPath; - + m_options.SaveOption(OPT_CREATE_BACKUPS, gen.m_bBackup); m_options.SaveOption(OPT_SCROLL_TO_FIRST, gen.m_bScroll); m_options.SaveOption(OPT_DISABLE_SPLASH, gen.m_bDisableSplash); @@ -1149,7 +1150,7 @@ void CMainFrame::OnOptions() m_options.SaveOption(OPT_CMP_IGNORE_CASE, compage.m_bIgnoreCase); m_options.SaveOption(OPT_CMP_METHOD, compage.m_compareMethod); m_options.SaveOption(OPT_CMP_MOVED_BLOCKS, compage.m_bMovedBlocks); - + m_nCompMethod = compage.m_compareMethod; m_options.SaveOption(OPT_TAB_SIZE, editor.m_nTabSize); @@ -1176,7 +1177,7 @@ void CMainFrame::OnOptions() m_options.SaveOption(OPT_CLR_SELECTED_DIFF_TEXT, colors.m_clrSelDiffText); m_options.SaveOption(OPT_CLR_TRIVIAL_DIFF, colors.m_clrTrivial); m_options.SaveOption(OPT_CLR_TRIVIAL_DIFF_DELETED, colors.m_clrTrivialDeleted); - + RebuildRegExpList(); // Call the wrapper to set m_bAllowMixedEol (the wrapper updates the registry) @@ -1193,7 +1194,7 @@ void CMainFrame::OnOptions() // Re-read MergeDoc settings pMergeDoc->RefreshOptions(); - + // Enable/disable automatic rescan (rescan after editing) pLeft->EnableRescan(m_options.GetInt(OPT_AUTOMATIC_RESCAN)); pRight->EnableRescan(m_options.GetInt(OPT_AUTOMATIC_RESCAN)); @@ -1448,7 +1449,7 @@ BOOL CMainFrame::DoFileOpen(LPCTSTR pszLeft /*=NULL*/, LPCTSTR pszRight /*=NULL* gLog.Write(LOGLEVEL::LNOTICE, _T("Open files: Left: %s\n\tRight: %s."), strLeft, strRight); - + ShowMergeDoc(pDirDoc, strLeft, strRight, bROLeft, bRORight, cpleft, cpright, &infoUnpacker); } @@ -1513,13 +1514,13 @@ BOOL CMainFrame::SyncFilesToVCS(LPCTSTR pszSrc, LPCTSTR pszDest, CString * psErr psError->LoadString(IDS_ERROR_FILE_WRITEABLE); return FALSE; } - + if (!CreateBackup(strSavePath)) { psError->LoadString(IDS_ERROR_BACKUP); return FALSE; } - + // If VC project opened from VSS sync first if (m_bVCProjSync) return ReLinkVCProj(strSavePath, psError); @@ -1554,7 +1555,7 @@ BOOL CMainFrame::ReLinkVCProj(CString strSavePath,CString * psError) if (!_tcscmp(buffer,_T(".vcproj"))) bVCPROJ = TRUE; SplitFilename(strSavePath, &spath, NULL, NULL); - + //check if m_strVssProjectBase has leading $\\, if not put them in: if ((m_strVssProjectBase[0] != '$' && m_strVssProjectBase[1] != '\\') || (m_strVssProjectBase[0] != '$' && m_strVssProjectBase[1] != '/')) @@ -1575,7 +1576,7 @@ BOOL CMainFrame::ReLinkVCProj(CString strSavePath,CString * psError) if (buffer2[k] == '\\') buffer2[k] = '/'; } - + //take out last '\\' int strlb2 = _tcslen(buffer2); if (buffer2[strlb2-1] == '/') @@ -1588,7 +1589,7 @@ BOOL CMainFrame::ReLinkVCProj(CString strSavePath,CString * psError) if (pdest) { int index = (int)(pdest - buffer1 + 1); - + _tcscpy(buffer,buffer1); TCHAR * fp = &buffer[int(index + _tcslen(pbuf2))]; m_strVssProjectFull = fp; @@ -1609,7 +1610,7 @@ BOOL CMainFrame::ReLinkVCProj(CString strSavePath,CString * psError) } m_strVssProjectFull = m_strVssProjectBase + spath; - + //if sln file, we need to replace ' ' with _T("\\u0020") if (!bVCPROJ) { @@ -1636,24 +1637,24 @@ BOOL CMainFrame::ReLinkVCProj(CString strSavePath,CString * psError) HANDLE hfile; HANDLE tfile; SetFileAttributes(strSavePath, FILE_ATTRIBUTE_NORMAL); - + hfile = CreateFile(strSavePath, GENERIC_ALL, // open for writing - FILE_SHARE_READ, // share for reading - NULL, // no security - OPEN_EXISTING, // existing file only - FILE_ATTRIBUTE_NORMAL | FILE_FLAG_SEQUENTIAL_SCAN, // normal file + FILE_SHARE_READ, // share for reading + NULL, // no security + OPEN_EXISTING, // existing file only + FILE_ATTRIBUTE_NORMAL | FILE_FLAG_SEQUENTIAL_SCAN, // normal file NULL); tfile = CreateFile(tempFile, GENERIC_ALL, // open for writing - FILE_SHARE_READ, // share for reading - NULL, // no security - CREATE_ALWAYS, // existing file only - FILE_ATTRIBUTE_NORMAL | FILE_FLAG_SEQUENTIAL_SCAN, // normal file - NULL); + FILE_SHARE_READ, // share for reading + NULL, // no security + CREATE_ALWAYS, // existing file only + FILE_ATTRIBUTE_NORMAL | FILE_FLAG_SEQUENTIAL_SCAN, // normal file + NULL); static TCHAR charset[] = _T(" \t\n\r="); DWORD numwritten = 0; - + ZeroMemory(&buffer2, nBufferSize * sizeof(TCHAR)); while (GetWordFile(hfile, buffer, charset)) { @@ -1665,7 +1666,7 @@ BOOL CMainFrame::ReLinkVCProj(CString strSavePath,CString * psError) //nab the equals sign GetWordFile(hfile, buffer, _T("=")); WriteFile(tfile, buffer, _tcslen(buffer), &numwritten, NULL); - CString stemp = _T("\""") + m_strVssProjectFull + + CString stemp = _T("\""") + m_strVssProjectFull + _T("""); WriteFile(tfile, stemp, stemp.GetLength(), &numwritten, NULL); @@ -1673,7 +1674,7 @@ BOOL CMainFrame::ReLinkVCProj(CString strSavePath,CString * psError) GetWordFile(hfile, buffer, _T(",\n"));//get the next delimiter if (!_tcscmp(buffer, _T("\n"))) { - WriteFile(tfile, _T("\""), 1, &numwritten, NULL); + WriteFile(tfile, _T("\""), 1, &numwritten, NULL); } WriteFile(tfile, buffer, _tcslen(buffer), &numwritten, NULL); } @@ -1689,7 +1690,7 @@ BOOL CMainFrame::ReLinkVCProj(CString strSavePath,CString * psError) //nab word GetWordFile(hfile, buffer, _T("\\\n.")); while (!_tcsstr(buffer, _T("."))) - { + { if (buffer[0] != '\\') { _stprintf(buffer1, _T("%s/%s"), buffer2, buffer);//put append word to file @@ -1702,7 +1703,7 @@ BOOL CMainFrame::ReLinkVCProj(CString strSavePath,CString * psError) } else if (_tcsstr(buffer, _T("SccProjectName")) == buffer) { - + //buffer2 appends CString capp; if (buffer2[0] != '\\' && !_tcsstr(buffer2, _T("."))) @@ -1726,17 +1727,17 @@ BOOL CMainFrame::ReLinkVCProj(CString strSavePath,CString * psError) } _tcslwr(buffer1); capp = buffer1; - + //nab until the no space, and no = GetWordFile(hfile, buffer, _T(" =")); WriteFile(tfile, buffer, _tcslen(buffer), &numwritten, NULL); CString stemp = _T("\\u0022") + m_strVssProjectFull + capp + _T("\\u0022"); WriteFile(tfile, stemp, stemp.GetLength(), &numwritten, NULL); - + //nab until the first backslash GetWordFile(hfile, buffer, _T(",")); - ZeroMemory(&buffer2, nBufferSize * sizeof(TCHAR)); + ZeroMemory(&buffer2, nBufferSize * sizeof(TCHAR)); } } } @@ -1756,7 +1757,7 @@ BOOL CMainFrame::ReLinkVCProj(CString strSavePath,CString * psError) return TRUE; } -void CMainFrame::OnViewSelectfont() +void CMainFrame::OnViewSelectfont() { CHOOSEFONT cf; memset(&cf, 0, sizeof(CHOOSEFONT)); @@ -1788,7 +1789,7 @@ void CMainFrame::OnViewSelectfont() MergeEditViewList editViews; GetAllViews(&editViews, NULL, NULL); - + // TODO: Update document fonts /* for (POSITION pos = editViews.GetHeadPosition(); pos; editViews.GetNext(pos)) @@ -1818,13 +1819,13 @@ void CMainFrame::GetFontProperties() _tcscpy(m_lfDiff.lfFaceName, theApp.GetProfileString(_T("Font"), _T("FaceName"), _T("Courier"))); } -void CMainFrame::OnViewUsedefaultfont() +void CMainFrame::OnViewUsedefaultfont() { m_bFontSpecified=FALSE; theApp.WriteProfileInt(_T("Font"), _T("Specified"), m_bFontSpecified); } -void CMainFrame::OnUpdateViewUsedefaultfont(CCmdUI* pCmdUI) +void CMainFrame::OnUpdateViewUsedefaultfont(CCmdUI* pCmdUI) { pCmdUI->Enable(m_bFontSpecified); } @@ -1852,7 +1853,7 @@ void CMainFrame::UpdateResources() } } -void CMainFrame::OnHelpContents() +void CMainFrame::OnHelpContents() { CString spath = GetModulePath(0) + _T("\\Docs\\index.html"); CString url = _T("http://winmerge.org/docs20/index.html"); @@ -1865,12 +1866,12 @@ void CMainFrame::OnHelpContents() } -void CMainFrame::OnUpdateHelpContents(CCmdUI* pCmdUI) +void CMainFrame::OnUpdateHelpContents(CCmdUI* pCmdUI) { pCmdUI->Enable(TRUE); } -void CMainFrame::ActivateFrame(int nCmdShow) +void CMainFrame::ActivateFrame(int nCmdShow) { if (!m_bFirstTime) { @@ -1897,7 +1898,7 @@ void CMainFrame::ActivateFrame(int nCmdShow) dsk_rc.bottom = dsk_rc.top + ::GetSystemMetrics(SM_CYVIRTUALSCREEN); if (theApp.GetProfileInt(_T("Settings"), _T("MainMax"), FALSE)) { - CMDIFrameWnd::ActivateFrame(SW_MAXIMIZE); + CMDIFrameWnd::ActivateFrame(SW_MAXIMIZE); } else if (rc.Width() != 0 && rc.Height() != 0) { @@ -1915,7 +1916,7 @@ void CMainFrame::ActivateFrame(int nCmdShow) CMDIFrameWnd::ActivateFrame(nCmdShow); } -void CMainFrame::OnClose() +void CMainFrame::OnClose() { // save any dirty edit views MergeDocList mergedocs; @@ -1934,7 +1935,7 @@ void CMainFrame::OnClose() else { // Set modified status to false so that we are not asking - // about saving again. + // about saving again. pMergeDoc->m_ltBuf.SetModified(FALSE); pMergeDoc->m_rtBuf.SetModified(FALSE); } @@ -1962,11 +1963,11 @@ void CMainFrame::OnClose() pMergeDoc->GetParentFrame()->SavePosition(); } */ - + // Stop handling status messages from CustomStatusCursors CustomStatusCursor::SetStatusDisplay(0); myStatusDisplay.SetFrame(0); - + CMDIFrameWnd::OnClose(); } @@ -1993,7 +1994,7 @@ void CMainFrame::RebuildRegExpList() _TCHAR tmp[_MAX_PATH] = {0}; _TCHAR* token; _TCHAR sep[] = _T("\r\n"); - + // destroy the old list if the it is not NULL FreeRegExpList(); @@ -2067,7 +2068,7 @@ void CMainFrame::addToMru(LPCTSTR szItem, LPCTSTR szRegSubKey, UINT nMaxItems) /** * @brief Apply tabs and eols settings to all merge documents */ -void CMainFrame::ApplyViewWhitespace() +void CMainFrame::ApplyViewWhitespace() { MergeDocList mergedocs; GetAllMergeDocs(&mergedocs); @@ -2105,7 +2106,7 @@ void CMainFrame::ApplyViewWhitespace() } } -void CMainFrame::OnViewWhitespace() +void CMainFrame::OnViewWhitespace() { BOOL bViewWhitespace = m_options.GetInt(OPT_VIEW_WHITESPACE); bViewWhitespace = !bViewWhitespace; @@ -2114,7 +2115,7 @@ void CMainFrame::OnViewWhitespace() } /// Enables View/View Whitespace menuitem when merge view is active -void CMainFrame::OnUpdateViewWhitespace(CCmdUI* pCmdUI) +void CMainFrame::OnUpdateViewWhitespace(CCmdUI* pCmdUI) { pCmdUI->SetCheck(m_options.GetInt(OPT_VIEW_WHITESPACE)); } @@ -2271,7 +2272,7 @@ void CMainFrame::OnToolsGeneratePatch() if (ind != -1) { DIFFITEM item = pView->GetItemAt(ind); - + if (!item.isBin() && !item.isDirectory() && !item.isResultError()) { CString leftFile = item.getLeftFilepath(); @@ -2280,7 +2281,7 @@ void CMainFrame::OnToolsGeneratePatch() CString rightFile = item.getRightFilepath(); if (!rightFile.IsEmpty()) rightFile += _T("\\") + item.sfilename; - + patcher.AddFiles(leftFile, rightFile); } } @@ -2347,7 +2348,7 @@ void CMainFrame::OnDropFiles(HDROP dropInfo) CString expandedFile = ExpandShortcut(files[i]); // if that worked, we should have a real file name - if (!expandedFile.IsEmpty()) + if (!expandedFile.IsEmpty()) files[i] = expandedFile; } @@ -2367,7 +2368,7 @@ void CMainFrame::OnDropFiles(HDROP dropInfo) DoFileOpen(files[0], files[1], FFILEOPEN_NONE, FFILEOPEN_NONE, ctrlKey); } -BOOL CMainFrame::OnSetCursor(CWnd* pWnd, UINT nHitTest, UINT message) +BOOL CMainFrame::OnSetCursor(CWnd* pWnd, UINT nHitTest, UINT message) { if (CustomStatusCursor::HasWaitCursor()) { @@ -2391,7 +2392,7 @@ void CMainFrame::OnPluginUnpackMode(UINT nID ) theApp.WriteProfileInt(_T("Settings"), _T("UnpackerMode"), g_bUnpackerMode); } -void CMainFrame::OnUpdatePluginUnpackMode(CCmdUI* pCmdUI) +void CMainFrame::OnUpdatePluginUnpackMode(CCmdUI* pCmdUI) { if (pCmdUI->m_nID == ID_UNPACK_MANUAL) pCmdUI->SetRadio(PLUGIN_MANUAL == g_bUnpackerMode); @@ -2432,7 +2433,7 @@ BOOL CMainFrame::OpenFileToExternalEditor(CString file) CString ext; CString sExecutable; CString sCmd; - + sExtEditor = m_options.GetString(OPT_EXT_EDITOR_CMD); GetDecoratedCmdLine(sExtEditor, sCmd, sExecutable); @@ -2494,7 +2495,7 @@ void CMainFrame::OnSaveConfigData() configLog.m_diffOptions.bIgnoreBlankLines = mf->m_options.GetInt(OPT_CMP_IGNORE_BLANKLINES); configLog.m_diffOptions.bIgnoreCase = mf->m_options.GetInt(OPT_CMP_IGNORE_CASE); configLog.m_diffOptions.bEolSensitive = mf->m_options.GetInt(OPT_CMP_EOL_SENSITIVE); - + configLog.m_viewSettings.bShowIdent = m_options.GetInt(OPT_SHOW_DIFFERENT); configLog.m_viewSettings.bShowDiff = m_options.GetInt(OPT_SHOW_DIFFERENT); configLog.m_viewSettings.bShowUniqueLeft = m_options.GetInt(OPT_SHOW_UNIQUE_LEFT); @@ -2518,7 +2519,7 @@ void CMainFrame::OnSaveConfigData() /** * @brief Open two new empty docs, 'Scratchpads' - * + * * Allows user to open two empty docs, to paste text to * compare from clipboard. * @note File filenames are set emptys and filedescriptors @@ -2526,7 +2527,7 @@ void CMainFrame::OnSaveConfigData() * @sa CMergeDoc::OpenDocs() * @sa CMergeDoc::TrySaveAs() */ -void CMainFrame::OnFileNew() +void CMainFrame::OnFileNew() { BOOL docNull; CDirDoc *pDirDoc = GetDirDocToShow(&docNull); @@ -2543,7 +2544,7 @@ void CMainFrame::OnFileNew() if (!pDirDoc->ReusingDirDoc()) return; } - + // Load emptyfile descriptors and open empty docs VERIFY(m_strLeftDesc.LoadString(IDS_EMPTY_LEFT_FILE)); VERIFY(m_strRightDesc.LoadString(IDS_EMPTY_RIGHT_FILE)); diff --git a/Src/Merge.rc b/Src/Merge.rc index d30c7141c..f2b73db65 100644 --- a/Src/Merge.rc +++ b/Src/Merge.rc @@ -1,5 +1,7 @@ //Microsoft Developer Studio generated resource script. // +// $Id$ + #include "resource.h" #define APSTUDIO_READONLY_SYMBOLS @@ -27,18 +29,18 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // TEXTINCLUDE // -1 TEXTINCLUDE MOVEABLE PURE +1 TEXTINCLUDE MOVEABLE PURE BEGIN "resource.h\0" END -2 TEXTINCLUDE MOVEABLE PURE +2 TEXTINCLUDE MOVEABLE PURE BEGIN "#include ""afxres.h""\r\n" "\0" END -3 TEXTINCLUDE MOVEABLE PURE +3 TEXTINCLUDE MOVEABLE PURE BEGIN "#define _AFX_NO_OLE_RESOURCES\r\n" "#define _AFX_NO_TRACKER_RESOURCES\r\n" @@ -73,17 +75,17 @@ IDR_MERGETYPE ICON DISCARDABLE "res\\MergeDoc.ico" // Menu // -IDR_POPUP_DIFFVIEW MENU DISCARDABLE +IDR_POPUP_DIFFVIEW MENU DISCARDABLE BEGIN POPUP "_POPUP_" BEGIN MENUITEM "Copy to other side", ID_POPUP_COPYTOOTHERSIDE MENUITEM "Copy from other side", ID_POPUP_COPYFROMOTHERSIDE MENUITEM SEPARATOR - MENUITEM "Copy all diffs to other side...", + MENUITEM "Copy all diffs to other side...", ID_POPUP_COPYALLDIFFSTOOTHERSIDE - MENUITEM "Copy all diffs from other side...", + MENUITEM "Copy all diffs from other side...", ID_POPUP_COPYALLDIFFSFROMOTHERSIDE MENUITEM SEPARATOR @@ -93,7 +95,7 @@ BEGIN END END -IDR_MAINFRAME MENU DISCARDABLE +IDR_MAINFRAME MENU DISCARDABLE BEGIN POPUP "&File" BEGIN @@ -229,7 +231,7 @@ BEGIN END END -IDR_POPUP_DIRVIEW MENU DISCARDABLE +IDR_POPUP_DIRVIEW MENU DISCARDABLE BEGIN POPUP "_ITEM_POPUP_" BEGIN @@ -268,13 +270,13 @@ BEGIN MENUITEM SEPARATOR POPUP "&Zip" BEGIN - MENUITEM "Zip &Left Side %1 File(s) from %2 Selected Item(s)", + MENUITEM "Zip &Left Side %1 File(s) from %2 Selected Item(s)", ID_DIR_ZIP_LEFT - MENUITEM "Zip &Right Side %1 File(s) from %2 Selected Item(s)", + MENUITEM "Zip &Right Side %1 File(s) from %2 Selected Item(s)", ID_DIR_ZIP_RIGHT - MENUITEM "Zip &Both Sides %1 File(s) from %2 Selected Item(s)", + MENUITEM "Zip &Both Sides %1 File(s) from %2 Selected Item(s)", ID_DIR_ZIP_BOTH - MENUITEM "Zip Both &Sides Diffs Only %1 File(s) from %2 of %3 Selected Item(s)", + MENUITEM "Zip Both &Sides Diffs Only %1 File(s) from %2 of %3 Selected Item(s)", ID_DIR_ZIP_BOTH_DIFFS_ONLY END @@ -285,7 +287,7 @@ BEGIN END END -IDR_POPUP_EDITOR_HEADERBAR MENU DISCARDABLE +IDR_POPUP_EDITOR_HEADERBAR MENU DISCARDABLE BEGIN POPUP "_POPUP_" BEGIN @@ -300,7 +302,7 @@ END // Accelerator // -IDR_MAINFRAME ACCELERATORS MOVEABLE PURE +IDR_MAINFRAME ACCELERATORS MOVEABLE PURE BEGIN "A", ID_EDIT_SELECT_ALL, VIRTKEY, CONTROL, NOINVERT "C", ID_EDIT_COPY, VIRTKEY, CONTROL, NOINVERT @@ -367,22 +369,22 @@ CAPTION "Select Files or Directories..." FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN RTEXT "&Left:",IDC_STATIC,13,24,40,8 - COMBOBOX IDC_LEFT_COMBO,56,22,182,94,CBS_DROPDOWN | + COMBOBOX IDC_LEFT_COMBO,56,22,182,94,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP, WS_EX_ACCEPTFILES PUSHBUTTON "&Browse...",IDC_LEFT_BUTTON,241,22,38,12 RTEXT "&Right:",IDC_STATIC,13,40,40,8 - COMBOBOX IDC_RIGHT_COMBO,56,38,182,95,CBS_DROPDOWN | + COMBOBOX IDC_RIGHT_COMBO,56,38,182,95,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP, WS_EX_ACCEPTFILES PUSHBUTTON "Bro&wse...",IDC_RIGHT_BUTTON,241,38,38,12 RTEXT "E&xtensions:",IDC_STATIC,13,56,40,8 - COMBOBOX IDC_EXT_COMBO,56,54,151,95,CBS_DROPDOWN | + COMBOBOX IDC_EXT_COMBO,56,54,151,95,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP - CONTROL "Re&cursive",IDC_RECURS_CHECK,"Button",BS_AUTOCHECKBOX | + CONTROL "Re&cursive",IDC_RECURS_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,35,72,48,10 RTEXT "&Unpacker:",IDC_STATIC,13,88,40,8 - EDITTEXT IDC_UNPACKER_EDIT,56,86,182,12,ES_AUTOHSCROLL | + EDITTEXT IDC_UNPACKER_EDIT,56,86,182,12,ES_AUTOHSCROLL | ES_READONLY PUSHBUTTON "Select...",IDC_SELECT_UNPACKER,241,86,38,12 DEFPUSHBUTTON "OK",IDOK,295,11,50,14 @@ -402,14 +404,14 @@ BEGIN PUSHBUTTON "Cancel",IDCANCEL,193,132,50,14 PUSHBUTTON "Save As...",IDSAVEAS,123,132,50,14 LTEXT "Project:",IDC_STATIC,9,81,25,8 - COMBOBOX IDC_PROJECT_COMBO,48,78,202,114,CBS_DROPDOWN | + COMBOBOX IDC_PROJECT_COMBO,48,78,202,114,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP LTEXT "User:",IDC_STATIC,10,99,18,8 EDITTEXT IDC_USER,48,96,58,14,ES_AUTOHSCROLL LTEXT "Password:",IDC_STATIC,127,99,34,8 EDITTEXT IDC_PASSWORD,162,97,70,14,ES_PASSWORD | ES_AUTOHSCROLL LTEXT "Database:",IDC_STATIC,9,64,33,13 - COMBOBOX IDC_DATABASE_LIST,48,63,202,114,CBS_DROPDOWN | + COMBOBOX IDC_DATABASE_LIST,48,63,202,114,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP CONTROL "Apply to all items",IDC_MULTI_CHECKOUT,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,49,117,65,8 @@ -426,7 +428,7 @@ BEGIN LTEXT "&Path to cleartool.exe:",IDC_VSS_L1,16,42,68,8 EDITTEXT IDC_PATH_EDIT,85,40,116,12,ES_AUTOHSCROLL PUSHBUTTON "&Browse...",IDC_BROWSE_BUTTON,206,40,42,12 - COMBOBOX IDC_VER_SYS,85,20,157,41,CBS_DROPDOWNLIST | WS_VSCROLL | + COMBOBOX IDC_VER_SYS,85,20,157,41,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "&Versioning System:",IDC_STATIC,16,22,60,10 END @@ -444,7 +446,7 @@ BEGIN CONTROL "&Disable Splash Screen",IDC_DISABLE_SPLASH,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,27,206,10 CONTROL "&Close compare Statepane automatically", - IDC_CMPPANE_AUTOCLOSE,"Button",BS_AUTOCHECKBOX | + IDC_CMPPANE_AUTOCLOSE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,37,206,10 END @@ -455,7 +457,7 @@ FONT 8, "MS Sans Serif" BEGIN PUSHBUTTON "OK",IDOK,154,16,52,14 PUSHBUTTON "Cancel",IDCANCEL,154,33,52,14 - LISTBOX IDC_LANGUAGE_LIST,5,16,141,89,LBS_NOINTEGRALHEIGHT | + LISTBOX IDC_LANGUAGE_LIST,5,16,141,89,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP LTEXT "Available languages:",IDC_STATIC,7,7,66,8 END @@ -465,7 +467,7 @@ STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Find" FONT 8, "MS Shell Dlg" BEGIN - COMBOBOX IDC_EDIT_FINDTEXT,41,6,135,138,CBS_DROPDOWN | + COMBOBOX IDC_EDIT_FINDTEXT,41,6,135,138,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP CONTROL "Match &whole word only",IDC_EDIT_WHOLE_WORD,"Button", BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,4,26,100,12 @@ -473,7 +475,7 @@ BEGIN BS_AUTOCHECKBOX | WS_TABSTOP,4,40,64,12 CONTROL "Regular &expression",IDC_EDIT_REGEXP,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,4,54,77,12 - CONTROL "&Up",IDC_EDIT_DIRECTION_UP,"Button",BS_AUTORADIOBUTTON | + CONTROL "&Up",IDC_EDIT_DIRECTION_UP,"Button",BS_AUTORADIOBUTTON | WS_GROUP,111,36,25,12 CONTROL "&Down",IDC_EDIT_DIRECTION_DOWN,"Button", BS_AUTORADIOBUTTON,111,48,35,12 @@ -488,9 +490,9 @@ STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Replace" FONT 8, "MS Shell Dlg" BEGIN - COMBOBOX IDC_EDIT_FINDTEXT,52,7,116,30,CBS_DROPDOWN | + COMBOBOX IDC_EDIT_FINDTEXT,52,7,116,30,CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_EDIT_REPLACE_WITH,52,24,116,30,CBS_DROPDOWN | + COMBOBOX IDC_EDIT_REPLACE_WITH,52,24,116,30,CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP CONTROL "Match &whole word only",IDC_EDIT_WHOLE_WORD,"Button", BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,5,46,91,12 @@ -521,7 +523,7 @@ BEGIN DEFPUSHBUTTON "CheckOut",IDOK,35,90,50,14 PUSHBUTTON "Cancel",IDCANCEL,194,90,50,14 PUSHBUTTON "Save As...",IDSAVEAS,114,90,50,14 - EDITTEXT IDC_COMMENTS,18,21,243,56,ES_MULTILINE | ES_AUTOVSCROLL | + EDITTEXT IDC_COMMENTS,18,21,243,56,ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_WANTRETURN | WS_VSCROLL | WS_HSCROLL LTEXT "Comments",IDC_STATIC,18,7,34,10 END @@ -536,10 +538,10 @@ BEGIN 7,221,15 LTEXT "Regular Expressions (one per line):",IDC_STATIC,7,28, 221,8 - EDITTEXT IDC_EDITPATTERN,7,39,221,72,ES_MULTILINE | + EDITTEXT IDC_EDITPATTERN,7,39,221,72,ES_MULTILINE | ES_AUTOHSCROLL | ES_WANTRETURN LTEXT "File filter:",IDC_STATIC,7,128,60,10 - COMBOBOX IDC_FILE_FILTER,73,126,117,63,CBS_DROPDOWNLIST | + COMBOBOX IDC_FILE_FILTER,73,126,117,63,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Edit",IDC_EDIT_FILE_FILTER,194,126,34,13,WS_DISABLED END @@ -550,34 +552,34 @@ CAPTION "Colors" FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN RTEXT "Difference:",IDC_STATIC,13,29,66,8 - CONTROL "Dif",IDC_DIFFERENCE_COLOR,"Button",BS_OWNERDRAW | - WS_TABSTOP,98,29,17,14,WS_EX_TRANSPARENT | + CONTROL "Dif",IDC_DIFFERENCE_COLOR,"Button",BS_OWNERDRAW | + WS_TABSTOP,98,29,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE RTEXT "Selected Difference:",IDC_STATIC,13,49,66,8 - CONTROL "Dif",IDC_SEL_DIFFERENCE_COLOR,"Button",BS_OWNERDRAW | - WS_TABSTOP,98,49,17,14,WS_EX_TRANSPARENT | + CONTROL "Dif",IDC_SEL_DIFFERENCE_COLOR,"Button",BS_OWNERDRAW | + WS_TABSTOP,98,49,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE CTEXT "Background",IDC_STATIC,81,15,50,8 CTEXT "Deleted",IDC_STATIC,130,15,38,8 - CONTROL "Dif",IDC_DIFFERENCE_DELETED_COLOR,"Button",BS_OWNERDRAW | - WS_TABSTOP,141,29,17,14,WS_EX_TRANSPARENT | + CONTROL "Dif",IDC_DIFFERENCE_DELETED_COLOR,"Button",BS_OWNERDRAW | + WS_TABSTOP,141,29,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE CONTROL "Dif",IDC_SEL_DIFFERENCE_DELETED_COLOR,"Button", - BS_OWNERDRAW | WS_TABSTOP,141,49,17,14,WS_EX_TRANSPARENT | + BS_OWNERDRAW | WS_TABSTOP,141,49,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE - CONTROL "Dif",IDC_DIFFERENCE_TEXT_COLOR,"Button",BS_OWNERDRAW | - WS_TABSTOP,184,29,17,14,WS_EX_TRANSPARENT | + CONTROL "Dif",IDC_DIFFERENCE_TEXT_COLOR,"Button",BS_OWNERDRAW | + WS_TABSTOP,184,29,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE CONTROL "Dif",IDC_SEL_DIFFERENCE_TEXT_COLOR,"Button", - BS_OWNERDRAW | WS_TABSTOP,184,49,17,14,WS_EX_TRANSPARENT | + BS_OWNERDRAW | WS_TABSTOP,184,49,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE CTEXT "Text",IDC_STATIC,178,15,29,8 - CONTROL "Dif",IDC_TRIVIAL_DIFF_COLOR,"Button",BS_OWNERDRAW | - WS_TABSTOP,98,69,17,14,WS_EX_TRANSPARENT | + CONTROL "Dif",IDC_TRIVIAL_DIFF_COLOR,"Button",BS_OWNERDRAW | + WS_TABSTOP,98,69,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE RTEXT "Ignored Difference:",IDC_STATIC,13,69,66,8 CONTROL "Dif",IDC_TRIVIAL_DIFF_DELETED_COLOR,"Button", - BS_OWNERDRAW | WS_TABSTOP,141,69,17,14,WS_EX_TRANSPARENT | + BS_OWNERDRAW | WS_TABSTOP,141,69,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE PUSHBUTTON "Defaults",IDC_COLORDEFAULTS_BTN,151,90,50,14 END @@ -588,7 +590,7 @@ CAPTION "Dialog" FONT 8, "MS Sans Serif" BEGIN DEFPUSHBUTTON "OK",IDOK,106,136,50,14 - EDITTEXT IDC_EDIT1,7,7,264,123,ES_MULTILINE | ES_READONLY | + EDITTEXT IDC_EDIT1,7,7,264,123,ES_MULTILINE | ES_READONLY | WS_VSCROLL END @@ -615,26 +617,26 @@ CAPTION "Patch Generator" FONT 8, "MS Sans Serif" BEGIN LTEXT "File&1:",IDC_STATIC,7,10,36,8 - COMBOBOX IDC_DIFF_FILE1,48,7,230,93,CBS_DROPDOWN | + COMBOBOX IDC_DIFF_FILE1,48,7,230,93,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Browse...",IDC_DIFF_BROWSE_FILE1,283,7,50,14 LTEXT "File&2:",IDC_STATIC,7,27,36,8 - COMBOBOX IDC_DIFF_FILE2,48,24,230,96,CBS_DROPDOWN | + COMBOBOX IDC_DIFF_FILE2,48,24,230,96,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Br&owse...",IDC_DIFF_BROWSE_FILE2,283,24,50,14 PUSHBUTTON "&Swap",IDC_DIFF_SWAPFILES,283,41,50,14 CONTROL "&Append to existing file",IDC_DIFF_APPENDFILE,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,48,51,230,10 LTEXT "&Result:",IDC_STATIC,7,66,37,8 - COMBOBOX IDC_DIFF_FILERESULT,48,63,230,96,CBS_DROPDOWN | + COMBOBOX IDC_DIFF_FILERESULT,48,63,230,96,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Bro&wse...",IDC_DIFF_BROWSE_RESULT,283,63,50,14 GROUPBOX "&Format",IDC_STATIC,7,81,142,46 LTEXT "St&yle:",IDC_STATIC,13,95,46,8 - COMBOBOX IDC_DIFF_STYLE,63,92,80,68,CBS_DROPDOWNLIST | WS_VSCROLL | + COMBOBOX IDC_DIFF_STYLE,63,92,80,68,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "&Context:",IDC_STATIC,13,109,46,8 - COMBOBOX IDC_DIFF_CONTEXT,63,108,80,65,CBS_DROPDOWNLIST | + COMBOBOX IDC_DIFF_CONTEXT,63,108,80,65,CBS_DROPDOWNLIST | WS_DISABLED | WS_VSCROLL | WS_TABSTOP GROUPBOX "W&hitespaces",IDC_STATIC,155,81,123,46 CONTROL "Com&pare",IDC_DIFF_WHITESPACE_COMPARE,"Button", @@ -660,11 +662,11 @@ IDD_EDITOR_HEADERBAR DIALOGEX 0, 0, 373, 12 STYLE WS_CHILD FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN - EDITTEXT IDC_STATIC_TITLE_LEFT,0,2,160,12,ES_AUTOHSCROLL | - ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT + EDITTEXT IDC_STATIC_TITLE_LEFT,0,2,160,12,ES_AUTOHSCROLL | + ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_STATICEDGE - EDITTEXT IDC_STATIC_TITLE_RIGHT,163,2,160,12,ES_AUTOHSCROLL | - ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT + EDITTEXT IDC_STATIC_TITLE_RIGHT,163,2,160,12,ES_AUTOHSCROLL | + ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_STATICEDGE END @@ -676,12 +678,12 @@ BEGIN DEFPUSHBUTTON "OK",IDOK,89,122,50,14 PUSHBUTTON "Cancel",IDCANCEL,143,122,50,14 GROUPBOX "Show columns",IDC_GROUP_SHOW,7,7,129,109 - LISTBOX IDC_LIST_SHOW,48,19,80,90,LBS_NOINTEGRALHEIGHT | + LISTBOX IDC_LIST_SHOW,48,19,80,90,LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Up",IDC_UP,14,45,27,14 PUSHBUTTON "&Down",IDC_DOWN,14,63,27,14 GROUPBOX "Hide columns",IDC_GROUP_HIDE,180,7,96,109 - LISTBOX IDC_LIST_HIDE,188,19,80,90,LBS_NOINTEGRALHEIGHT | + LISTBOX IDC_LIST_HIDE,188,19,80,90,LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "<==",IDC_ADD,143,45,29,14 PUSHBUTTON "==>",IDC_REMOVE,143,63,29,14 @@ -695,16 +697,16 @@ BEGIN DEFPUSHBUTTON "OK",IDOK,87,99,50,14 PUSHBUTTON "Cancel",IDCANCEL,156,99,50,14 LTEXT "File unpacker:",IDC_STATIC,7,18,50,10 - COMBOBOX IDC_UNPACKER_NAME,98,16,188,63,CBS_DROPDOWNLIST | + COMBOBOX IDC_UNPACKER_NAME,98,16,188,63,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "Display all unpackers, don't check the extension", - IDC_UNPACKER_ALLOW_ALL,"Button",BS_AUTOCHECKBOX | + IDC_UNPACKER_ALLOW_ALL,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,7,74,202,13 LTEXT "Extensions list:",IDC_STATIC,7,36,49,10 LTEXT "Description:",IDC_STATIC,7,52,47,10 EDITTEXT IDC_UNPACKER_SUPPORTED_EXTENSIONS,97,34,176,12, ES_AUTOHSCROLL | ES_READONLY - EDITTEXT IDC_UNPACKER_DESCRIPTION,58,50,228,12,ES_AUTOHSCROLL | + EDITTEXT IDC_UNPACKER_DESCRIPTION,58,50,228,12,ES_AUTOHSCROLL | ES_READONLY END @@ -745,24 +747,24 @@ BEGIN WS_EX_STATICEDGE CONTROL 227,IDC_STATIC,"Static",SS_BITMAP,218,27,12,11, WS_EX_STATICEDGE - RTEXT "",IDC_COUNT_LFOLDER,24,10,26,8,SS_REALSIZEIMAGE | + RTEXT "",IDC_COUNT_LFOLDER,24,10,26,8,SS_REALSIZEIMAGE | 0x2000 - RTEXT "",IDC_COUNT_RFOLDER,24,29,26,8,SS_REALSIZEIMAGE | + RTEXT "",IDC_COUNT_RFOLDER,24,29,26,8,SS_REALSIZEIMAGE | 0x2000 RTEXT "",IDC_COUNT_EQUAL,76,10,26,8,SS_REALSIZEIMAGE | 0x2000 - RTEXT "",IDC_COUNT_NOTEQUAL,76,29,26,8,SS_REALSIZEIMAGE | + RTEXT "",IDC_COUNT_NOTEQUAL,76,29,26,8,SS_REALSIZEIMAGE | 0x2000 - RTEXT "",IDC_COUNT_BINARYSAME,129,10,26,8,SS_REALSIZEIMAGE | + RTEXT "",IDC_COUNT_BINARYSAME,129,10,26,8,SS_REALSIZEIMAGE | 0x2000 - RTEXT "",IDC_COUNT_BINARYDIFF,129,29,26,8,SS_REALSIZEIMAGE | + RTEXT "",IDC_COUNT_BINARYDIFF,129,29,26,8,SS_REALSIZEIMAGE | 0x2000 RTEXT "",IDC_COUNT_LFILE,182,10,26,8,SS_REALSIZEIMAGE | 0x2000 RTEXT "",IDC_COUNT_RFILE,182,29,26,8,SS_REALSIZEIMAGE | 0x2000 - RTEXT "",IDC_COUNT_FOLDERSKIP,235,10,26,8,SS_REALSIZEIMAGE | + RTEXT "",IDC_COUNT_FOLDERSKIP,235,10,26,8,SS_REALSIZEIMAGE | 0x2000 - RTEXT "",IDC_COUNT_FILESKIP,235,29,26,8,SS_REALSIZEIMAGE | + RTEXT "",IDC_COUNT_FILESKIP,235,29,26,8,SS_REALSIZEIMAGE | 0x2000 - RTEXT "",IDC_COUNT_UNKNOWN,288,10,26,8,SS_REALSIZEIMAGE | + RTEXT "",IDC_COUNT_UNKNOWN,288,10,26,8,SS_REALSIZEIMAGE | 0x2000 DEFPUSHBUTTON "Stop",IDC_COMPARISON_STOP,327,17,83,14 END @@ -775,12 +777,12 @@ BEGIN LTEXT "G&oto:",IDC_STATIC,7,9,18,8 EDITTEXT IDC_WMGOTO_PARAM,33,7,93,14,ES_AUTOHSCROLL | ES_NUMBER GROUPBOX "File",IDC_STATIC,7,27,48,35 - CONTROL "&Left",IDC_WMGOTO_FILELEFT,"Button",BS_AUTORADIOBUTTON | + CONTROL "&Left",IDC_WMGOTO_FILELEFT,"Button",BS_AUTORADIOBUTTON | WS_GROUP,13,38,28,10 CONTROL "&Right",IDC_WMGOTO_FILERIGHT,"Button", BS_AUTORADIOBUTTON,13,48,33,10 GROUPBOX "Goto what",IDC_STATIC,61,27,63,35 - CONTROL "Li&ne",IDC_WMGOTO_TOLINE,"Button",BS_AUTORADIOBUTTON | + CONTROL "Li&ne",IDC_WMGOTO_TOLINE,"Button",BS_AUTORADIOBUTTON | WS_GROUP,68,38,29,10 CONTROL "&Difference",IDC_WMGOTO_TODIFF,"Button", BS_AUTORADIOBUTTON,68,48,49,10 @@ -794,7 +796,7 @@ CAPTION "Compare" FONT 8, "MS Sans Serif" BEGIN GROUPBOX "Whitespace",IDC_STATIC,7,7,221,50 - CONTROL "&Compare",IDC_WHITESPACE,"Button",BS_AUTORADIOBUTTON | + CONTROL "&Compare",IDC_WHITESPACE,"Button",BS_AUTORADIOBUTTON | WS_GROUP,14,19,206,10 CONTROL "&Ignore change",IDC_WHITE_CHANGE,"Button", BS_AUTORADIOBUTTON,14,30,206,10 @@ -809,7 +811,7 @@ BEGIN CONTROL "E&nable moved block detection",IDC_MOVED_BLOCKS,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,90,221,10 LTEXT "&File Compare method:",IDC_STATIC,7,105,70,9 - COMBOBOX IDC_COMPAREMETHODCOMBO,79,103,84,52,CBS_DROPDOWNLIST | + COMBOBOX IDC_COMPAREMETHODCOMBO,79,103,84,52,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Defaults",IDC_COMPARE_DEFAULTS,7,121,50,14 END @@ -920,33 +922,35 @@ END // Bitmap // -IDR_MAINFRAME BITMAP MOVEABLE PURE "res\\Toolbar.bmp" -IDB_SPLASH BITMAP MOVEABLE PURE "res\\splash1.bmp" -IDB_LFOLDER BITMAP MOVEABLE PURE "res\\lfolder.bmp" -IDB_EQUAL BITMAP MOVEABLE PURE "res\\equal.bmp" -IDB_NOTEQUAL BITMAP MOVEABLE PURE "res\\notequal.bmp" -IDB_RFOLDER BITMAP MOVEABLE PURE "res\\rfolder.bmp" -IDB_UNKNOWN BITMAP MOVEABLE PURE "res\\unknown.bmp" -IDB_BINARYSAME BITMAP MOVEABLE PURE "res\\binary.bmp" -IDB_LFILE BITMAP MOVEABLE PURE "res\\lfile.bmp" -IDB_RFILE BITMAP MOVEABLE PURE "res\\rfile.bmp" -IDB_BINARYDIFF BITMAP MOVEABLE PURE "res\\binarydiff.bmp" -IDB_FOLDERSKIP BITMAP MOVEABLE PURE "res\\folderskip.bmp" -IDB_FILESKIP BITMAP MOVEABLE PURE "res\\fileskip.bmp" -IDB_FOLDER BITMAP MOVEABLE PURE "res\\folder.bmp" -IDB_EDIT_COPY BITMAP MOVEABLE PURE "res\\copy.bmp" -IDB_EDIT_CUT BITMAP MOVEABLE PURE "res\\cut.bmp" -IDB_EDIT_PASTE BITMAP MOVEABLE PURE "res\\paste.bmp" -IDB_EDIT_SEARCH BITMAP MOVEABLE PURE "res\\search.bmp" -IDB_WINDOW_CASCADE BITMAP MOVEABLE PURE "res\\cascade.bmp" -IDB_WINDOW_HORIZONTAL BITMAP MOVEABLE PURE "res\\horizontally.bmp" -IDB_WINDOW_VERTICAL BITMAP MOVEABLE PURE "res\\vertically.bmp" -IDB_WINDOW_CLOSE BITMAP MOVEABLE PURE "res\\close.bmp" -IDB_WINDOW_CHANGEPANE BITMAP MOVEABLE PURE "res\\change_pane.bmp" -IDB_EDIT_GOTO BITMAP MOVEABLE PURE "res\\go_to.bmp" -IDB_EDIT_REPLACE BITMAP MOVEABLE PURE "res\\replace.bmp" -IDB_VIEW_LANGUAGE BITMAP MOVEABLE PURE "res\\language.bmp" -IDB_VIEW_SELECTFONT BITMAP MOVEABLE PURE "res\\select_font.bmp" +IDR_MAINFRAME BITMAP "res\\Toolbar.bmp" +IDB_SPLASH BITMAP "res\\splash1.bmp" +IDB_LFOLDER BITMAP "res\\lfolder.bmp" +IDB_EQUAL BITMAP "res\\equal.bmp" +IDB_NOTEQUAL BITMAP "res\\notequal.bmp" +IDB_RFOLDER BITMAP "res\\rfolder.bmp" +IDB_UNKNOWN BITMAP "res\\unknown.bmp" +IDB_BINARYSAME BITMAP "res\\binary.bmp" +IDB_LFILE BITMAP "res\\lfile.bmp" +IDB_RFILE BITMAP "res\\rfile.bmp" +IDB_BINARYDIFF BITMAP "res\\binarydiff.bmp" +IDB_FOLDERSKIP BITMAP "res\\folderskip.bmp" +IDB_FILESKIP BITMAP "res\\fileskip.bmp" +IDB_FOLDER BITMAP "res\\folder.bmp" +IDB_EDIT_COPY BITMAP "res\\copy.bmp" +IDB_EDIT_CUT BITMAP "res\\cut.bmp" +IDB_EDIT_PASTE BITMAP "res\\paste.bmp" +IDB_EDIT_SEARCH BITMAP "res\\search.bmp" +IDB_WINDOW_CASCADE BITMAP "res\\cascade.bmp" +IDB_WINDOW_HORIZONTAL BITMAP "res\\horizontally.bmp" +IDB_WINDOW_VERTICAL BITMAP "res\\vertically.bmp" +IDB_WINDOW_CLOSE BITMAP "res\\close.bmp" +IDB_WINDOW_CHANGEPANE BITMAP "res\\change_pane.bmp" +IDB_EDIT_GOTO BITMAP "res\\go_to.bmp" +IDB_EDIT_REPLACE BITMAP "res\\replace.bmp" +IDB_VIEW_LANGUAGE BITMAP "res\\language.bmp" +IDB_VIEW_SELECTFONT BITMAP "res\\select_font.bmp" +IDB_FILE_EXIT BITMAP "res\\exit.bmp" +IDB_HELP_CONTENTS BITMAP "res\\help_contents.bmp" ///////////////////////////////////////////////////////////////////////////// // @@ -956,16 +960,16 @@ IDB_VIEW_SELECTFONT BITMAP MOVEABLE PURE "res\\select_font.bmp" IDD_PROP_VSS DLGINIT BEGIN IDC_VER_SYS, 0x403, 5, 0 -0x6f4e, 0x656e, "\000" +0x6f4e, 0x656e, "\000" IDC_VER_SYS, 0x403, 34, 0 -0x6956, 0x7573, 0x6c61, 0x5320, 0x756f, 0x6372, 0x5365, 0x6661, 0x2065, -0x6c28, 0x7365, 0x2073, 0x6874, 0x6e61, 0x3520, 0x302e, 0x0029, +0x6956, 0x7573, 0x6c61, 0x5320, 0x756f, 0x6372, 0x5365, 0x6661, 0x2065, +0x6c28, 0x7365, 0x2073, 0x6874, 0x6e61, 0x3520, 0x302e, 0x0029, IDC_VER_SYS, 0x403, 34, 0 -0x6956, 0x7573, 0x6c61, 0x5320, 0x756f, 0x6372, 0x5365, 0x6661, 0x2065, -0x3528, 0x302e, 0x6120, 0x646e, 0x6120, 0x6f62, 0x6576, 0x0029, +0x6956, 0x7573, 0x6c61, 0x5320, 0x756f, 0x6372, 0x5365, 0x6661, 0x2065, +0x3528, 0x302e, 0x6120, 0x646e, 0x6120, 0x6f62, 0x6576, 0x0029, IDC_VER_SYS, 0x403, 19, 0 -0x6152, 0x6974, 0x6e6f, 0x6c61, 0x4320, 0x656c, 0x7261, 0x6143, 0x6573, -"\000" +0x6152, 0x6974, 0x6e6f, 0x6c61, 0x4320, 0x656c, 0x7261, 0x6143, 0x6573, +"\000" 0 END @@ -982,13 +986,13 @@ IDR_MARGIN_CURSOR CURSOR DISCARDABLE "res\\mg_cur.cur" // String Table // -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN AFX_IDS_APP_TITLE "WinMerge" AFX_IDS_IDLEMESSAGE "Ready" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN ID_INDICATOR_EXT "EXT" ID_INDICATOR_CAPS "CAP" @@ -998,7 +1002,7 @@ BEGIN ID_INDICATOR_REC "REC" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN ID_FILE_NEW "Create empty documents\nNew Documents (Ctrl+N)" ID_FILE_OPEN "Open an existing document\nOpen (Ctrl+O)" @@ -1011,13 +1015,13 @@ BEGIN ID_FILE_PRINT_PREVIEW "Display full pages\nPrint Preview" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN ID_APP_ABOUT "Display program information, version number and copyright\nAbout" ID_APP_EXIT "Quit the application; prompts to save documents\nExit" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN ID_FILE_MRU_FILE1 "Open this document" ID_FILE_MRU_FILE2 "Open this document" @@ -1037,13 +1041,13 @@ BEGIN ID_FILE_MRU_FILE16 "Open this document" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN ID_NEXT_PANE "Switch to the next window pane\nNext Pane" ID_PREV_PANE "Switch back to the previous window pane\nPrevious Pane" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN ID_WINDOW_NEW "Open another window for the active document\nNew Window" ID_WINDOW_ARRANGE "Arrange icons at the bottom of the window\nArrange Icons" @@ -1053,7 +1057,7 @@ BEGIN ID_WINDOW_SPLIT "Split the active window into panes\nSplit" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN ID_EDIT_CLEAR "Erase the selection\nErase" ID_EDIT_CLEAR_ALL "Erase everything\nErase All" @@ -1068,13 +1072,13 @@ BEGIN ID_EDIT_REDO "Redo the previously undone action\nRedo (Ctrl+Y)" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN ID_VIEW_TOOLBAR "Show or hide the toolbar\nToggle ToolBar" ID_VIEW_STATUS_BAR "Show or hide the status bar\nToggle StatusBar" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN AFX_IDS_SCSIZE "Change the window size" AFX_IDS_SCMOVE "Change the window position" @@ -1085,19 +1089,19 @@ BEGIN AFX_IDS_SCCLOSE "Close the active window and prompts to save the documents" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN AFX_IDS_SCRESTORE "Restore the window to normal size" AFX_IDS_SCTASKLIST "Activate Task List" AFX_IDS_MDICHILD "Activate this window" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN AFX_IDS_PREVIEW_CLOSE "Close print preview mode\nCancel Preview" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN IDR_MAINFRAME "WinMerge" IDR_MERGETYPE "\nWinMerge\nWinMerge\n\n\nWinMerge.Document\nWinMerge Document" @@ -1106,7 +1110,7 @@ BEGIN IDS_ELAPSED_TIME "Elapsed time: %ld ms" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN IDS_VERSION_FMT "Version %1" IDS_ALLFILES "All Files (*.*)|*.*||" @@ -1124,12 +1128,12 @@ BEGIN IDS_CANT_COMPARE_FILES "Unable to compare files" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN IDS_SAVE_AS_TITLE "Save As" - IDS_SELECT_FILES_OR_FOLDERS + IDS_SELECT_FILES_OR_FOLDERS "Your selections must be either both files or both folders" - IDS_BACKUP_FAILED_PROMPT + IDS_BACKUP_FAILED_PROMPT "Unable to backup original file.\nContinue anyway?" IDS_OPTIONS_TITLE "Options" IDS_OPEN_TITLE "Open" @@ -1146,7 +1150,7 @@ BEGIN IDS_NOPROJECT "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN IDS_COLHDR_FILENAME "Filename" IDS_COLHDR_DIR "Directory" @@ -1158,17 +1162,17 @@ BEGIN IDS_CC_CMD "&Path to cleartool.exe :" IDS_VSS_CMD "&Path to SS.EXE :" IDS_VSS_RUN_ERROR "Error executing versioning system command." - IDS_DIFF_OPEN_NO_SET_PROPS + IDS_DIFF_OPEN_NO_SET_PROPS "Modifications have been made to the current file comparison session. Some settings may not take place until the current file comparison is restarted." IDS_COLHDR_LTIMEM "Left Date" IDS_COLHDR_RTIMEM "Right Date" IDS_COLHDR_EXTENSION "Extension" - IDS_CONFIRM_DELETE_ITEMS + IDS_CONFIRM_DELETE_ITEMS "Are you sure you want to delete %1 of %2 selected item(s) ?" IDS_DEL_LEFT_FMT "Left (%1)" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN IDS_DEL_RIGHT_FMT "Right (%1)" IDS_DELETE_FILE_FAILED "Delete file %1 failed: %2" @@ -1188,7 +1192,7 @@ BEGIN IDS_BIN_FILES_SAME "Binary files are identical" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN IDS_FILESAVE_FAILED "Saving %1 failed. Would you like to save the file under a different name?" IDS_ERROR_FILE_NOT_FOUND "File not found: %1" @@ -1208,7 +1212,7 @@ BEGIN IDS_COLHDR_RVERSION "Right File Version" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN IDS_LEFTONLY "Left Only" IDS_RIGHTONLY "Right Only" @@ -1223,7 +1227,7 @@ BEGIN IDS_DIRECTORY_REPORT_TITLE "Compare %1 with %2" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN IDC_COMPARISON_STOP "Stop" IDC_COMPARISON_CLOSE "Press any key" @@ -1231,7 +1235,7 @@ BEGIN IDS_COLHDR_NSDIFFS "#sig. differences" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN IDS_PRIVATEBUILD_FMT "Private Build: %1" IDS_FILEWRITE_ERROR "Could not write to file %1." @@ -1243,14 +1247,14 @@ BEGIN IDS_DIFF_NORMAL "Normal" IDS_DIFF_CONTEXT "Context" IDS_DIFF_UNIFIED "Unified" - IDS_FILEPACK_FAILED_LEFT + IDS_FILEPACK_FAILED_LEFT "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n\nThe original file will not be changed.\n\nDo you want to save the unpacked version to another file?" - IDS_FILEPACK_FAILED_RIGHT + IDS_FILEPACK_FAILED_RIGHT "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n\nThe original file will not be changed.\n\nDo you want to save the unpacked version to another file?" IDS_QUICKHELP "Syntax : WinMerge [/r] [/e] [/ul] [/ur] [/ub] [/dl leftdesc] [/dr rightdesc] leftpath rightpath [outputpath]\n\nwhere:\n /? or -? displays this help\n /r or -r tells winmerge to compare directories recursively\n /e or -e allows WinMerge to be closed with a single esc keypress\n /ul or -ul tells winmerge to not add left path to MRU\n /ur or -ur tells winmerge to not add right path to MRU\n /ub or -ub tells winmerge to not add both paths to MRU\n /dl or -dl adds a description for left side shown instead of directory/filename\n /dr or -dr adds a description for right side shown instead of directory/filename\n leftpath is the directory or filename to open on the left side\n rightpath is the directory or filename to open on the right side\n outputpath is an optional output directory where you want merged files to be \n saved\n \n Note: leftpath and rightpath both has to be files or both has to be \n directories\n" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN IDS_LINEDIFF_NODIFF "No difference" IDS_LINEDIFF_NODIFF_CAPTION "Line difference" @@ -1269,7 +1273,7 @@ BEGIN IDS_DIRSEL_TAG "Directory Selection" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN IDS_COPY_LEFT_TO "Left to... (%1)" IDS_COPY_LEFT_TO2 "Left to... (%1 of %2)" @@ -1282,30 +1286,30 @@ BEGIN IDS_FILECHANGED_ONDISK "Another application has updated file\n%1\nsince WinMerge loaded it.\n\nOverwrite changed file?" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN IDC_STATIC_TITLE_LEFT "Right click on the path to copy" IDC_STATIC_TITLE_RIGHT "Right click on the path to copy" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN IDC_MIXED_EOL "Preserve original EOL chars" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN IDS_NUM_REPLACED "Replaced %1 string(s)." IDS_EDIT_TEXT_NOT_FOUND "Cannot find string""%s""" IDS_LINE_STATUS_INFO_EOL "Line: %s Column: %d Characters: %d EOL: %s" IDS_EMPTY_LINE_STATUS_INFO "Line: %s" IDS_LINE_STATUS_INFO "Line: %s Column: %d Characters: %d" - IDS_VSSFOLDER_AND_FILE_NOMATCH + IDS_VSSFOLDER_AND_FILE_NOMATCH "The VSS Working Folder and the location of the current file do not match. Continue?" IDS_CANNOT_EXECUTE_FILE "Cannot execute %1" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN IDS_AFRIKAANS "Afrikaans" IDS_ALBANIAN "Albanian" @@ -1322,7 +1326,7 @@ BEGIN IDS_ARABIC_JORDAN "Arabic (Jordan)" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN IDS_ARABIC_LEBANON "Arabic (Lebanon)" IDS_ARABIC_KUWAIT "Arabic (Kuwait)" @@ -1342,7 +1346,7 @@ BEGIN IDS_CHINESE_SINGAPORE "Chinese (Singapore)" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN IDS_CHINESE_MACAU "Chinese (Macau SAR)" IDS_CROATIAN "Croatian" @@ -1362,7 +1366,7 @@ BEGIN IDS_ENGLISH_BELIZE "English (Belize)" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN IDS_ENGLISH_TRINIDAD "English (Trinidad)" IDS_ENGLISH_ZIMBABWE "English (Zimbabwe)" @@ -1382,7 +1386,7 @@ BEGIN IDS_GERMAN_SWISS "Deutsch (Schweiz)" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN IDS_GERMAN_AUSTRIAN "Deutsch (Österreich)" IDS_GERMAN_LUXEMBOURG "Deutsch (Luxemburg)" @@ -1402,7 +1406,7 @@ BEGIN IDS_KOREAN_JOHAB "Korean (Johab)" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN IDS_LATVIAN "Latvian" IDS_LITHUANIAN "Lithuanian" @@ -1422,7 +1426,7 @@ BEGIN IDS_SINDHI "Sindhi" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN IDS_SLOVAK "Slovak" IDS_SLOVENIAN "Slovensko" @@ -1442,7 +1446,7 @@ BEGIN IDS_SPANISH_URUGUAY "Espanol (Uruguay)" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN IDS_SPANISH_PARAGUAY "Espanol (Paraguay)" IDS_SPANISH_BOLIVIA "Espanol (Bolivia)" @@ -1462,14 +1466,14 @@ BEGIN IDS_URDU_INDIA "Urdu (India)" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN IDS_UZBEK_LATIN "Uzbek (Latin)" IDS_UZBEK_CYRILLIC "Uzbek (Cyrillic)" IDS_VIETNAMESE "Vietnamese" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN ID_L2R "Copy the selected text to the right file\nCopy Right (Alt+Right)" ID_R2L "Copy the selected text to the left file\nCopy Left (Alt+Left)" @@ -1477,13 +1481,13 @@ BEGIN ID_OPTIONS_SHOWDIFFERENT "Displays files that have differences" ID_PREVDIFF "Scroll to the previous difference\nPrev Diff (Alt+Up)" ID_NEXTDIFF "Scroll to the next difference\nNext Diff (Alt+Down)" - ID_OPTIONS_BACKUPORIGINALFILE + ID_OPTIONS_BACKUPORIGINALFILE "Save a copy of the original as *.bak\nBackup" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN - ID_OPTIONS_SCROLLTOFIRSTDIFFERENCE + ID_OPTIONS_SCROLLTOFIRSTDIFFERENCE "Automatically scrolls to the first difference\nScroll First" ID_OPTIONS_IGNOREWHITESPACE "Disregards whitespace when comparing files" ID_HIDE_BACKUP_FILES "Hides files with extension BAK" @@ -1497,7 +1501,7 @@ BEGIN ID_DIR_COPY_RIGHT_TO_LEFT "Copy selected file to named directory" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN ID_DIR_COPY_LEFT_TO_RIGHT "Copy selected file to named directory" ID_VIEW_LANGUAGE "Select the current user interfacce language\nLanguage" @@ -1510,7 +1514,7 @@ BEGIN ID_DIR_DEL_RIGHT "Delete selected item on right" ID_DIFFSTATUS "placeholder for status count" ID_OPTIONS_SHOWUNIQUELEFT "Displays files that exist in only on left side" - ID_OPTIONS_SHOWUNIQUERIGHT + ID_OPTIONS_SHOWUNIQUERIGHT "Displays files that exist in only on right side" ID_DIR_DEL_BOTH "Delete selected item(s) on both sides" ID_DIR_OPEN_LEFT "Open left file" @@ -1518,7 +1522,7 @@ BEGIN ID_DIR_OPEN_RIGHT "Open right file" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN ID_DIR_OPEN_RIGHT_WITH "Open right file with..." ID_OPTIONS_SHOWBINARIES "Displays binary files" @@ -1532,7 +1536,7 @@ BEGIN ID_FILE_RIGHT_READONLY "Change right file/dir read-only status" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN ID_EOL_TO_DOS "Convert EOL to DOS mode" ID_EOL_TO_UNIX "Convert EOL to UNIX mode" @@ -1547,7 +1551,7 @@ BEGIN ID_L2RNEXT "Copy difference to right and advance to next\nCopy Right and Advance (Ctrl+Alt+Right)" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN ID_MULTIPLE_RIGHT "Copy differences from the selected text in left panel to the right file" ID_MULTIPLE_LEFT "Copy differences from the selected text in right panel to the left file" @@ -1560,7 +1564,7 @@ BEGIN ID_EDIT_WMGOTO "Go to line or difference\nGo to (Ctrl+G)" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN ID_NO_EDIT_SCRIPTS "< Empty >" ID_RELOAD_PLUGINS "&Unload all plugins and reload them (for developpers)" diff --git a/Src/readme.txt b/Src/readme.txt index 25f9c9b62..9ee90b729 100644 --- a/Src/readme.txt +++ b/Src/readme.txt @@ -1,4 +1,13 @@ +2004-03-28 Kimmo + PATCH: [ 913743 ] Icons for menuitems (RFE 873697) + File/Exit and Help/Contents icons from Tim Gerundt + Src: MainFrm.cpp Merge.rc resource.h + Src/res new files: exit.bmp help_contents.bmp + Languages: *.rc resource.h + Languages/res: exit.bmp help_contents.bmp + 2004-03-27 Laoran + PATCH [ 921788 ] scripts submenu in the main menu Src: FileTransform.cpp FileTransform.h MainFrm.cpp MainFrm.h Merge.rc MergeEditView.cpp MergeEditView.h Plugins.cpp Plugins.h resource.h Src/Languages: *.rc resource.h diff --git a/Src/res/exit.bmp b/Src/res/exit.bmp new file mode 100644 index 0000000000000000000000000000000000000000..4872eb5329d19f6685a0cd48cc11e65642fd34c0 GIT binary patch literal 774 zcmZ?rWn*Rl12Z700mK48%n!tj3=%++f#CuZ1H%zM2nGuPi37t3K>UQ}A*_OMHE6PE zT(~l123!rCfh>!a4N(asvC3i!lB6E)3^)VRK)48+8Z<6k8H9mV7ONnd#sTC40N&u- AGynhq literal 0 HcmV?d00001 diff --git a/Src/res/help_contents.bmp b/Src/res/help_contents.bmp new file mode 100644 index 0000000000000000000000000000000000000000..66629793a86749f0f41964b90984fedd754b75fd GIT binary patch literal 238 zcmZ{du?@p83Nf%gpgU@v!jFXB)s+1uxrCMvK4|=3}_X_abg3K(>5RsN&{pX+mwpdiIzL>W; Txq*^sU81*CV{TbG4*8iK4`oL` literal 0 HcmV?d00001 diff --git a/Src/resource.h b/Src/resource.h index a6b5a95b6..c0d6a9054 100644 --- a/Src/resource.h +++ b/Src/resource.h @@ -194,6 +194,8 @@ #define IDB_EDIT_REPLACE 276 #define IDB_VIEW_LANGUAGE 277 #define IDB_VIEW_SELECTFONT 278 +#define IDB_FILE_EXIT 279 +#define IDB_HELP_CONTENTS 280 #define ID_SCRIPT_FIRST 900 #define ID_SCRIPT_LAST 999 #define IDC_LEFT_EDIT 1000 @@ -570,7 +572,7 @@ #define ID_RELOAD_PLUGINS 32866 // Next default values for new objects -// +// #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_3D_CONTROLS 1 -- 2.11.0