void CDirDoc::Rescan()
{
- WaitStatusCursor waitstatus(_T("Rescanning"));
+ WaitStatusCursor waitstatus(LoadResString(IDS_STATUS_RESCANNING));
ASSERT(m_pCtxt != NULL);
void CDirView::OnLButtonDblClk(UINT nFlags, CPoint point)
{
- WaitStatusCursor waitstatus(_T("Opening selection"));
+ WaitStatusCursor waitstatus(LoadResString(IDS_STATUS_OPENING_SELECTION));
OpenSelection();
CListViewEx::OnLButtonDblClk(nFlags, point);
}
{
if(nChar==VK_RETURN)
{
- WaitStatusCursor waitstatus(_T("Opening selection"));
+ WaitStatusCursor waitstatus(LoadResString(IDS_STATUS_OPENING_SELECTION));
OpenSelection();
}
CListViewEx::OnChar(nChar, nRepCnt, nFlags);
break;
case FILE_SAME:
{
- CString s;
- VERIFY(s.LoadString(IDS_FILESSAME));
- AfxMessageBox(s, MB_ICONINFORMATION);
+ AfxMessageBox(IDS_FILESSAME, MB_ICONINFORMATION);
}
break;
case FILE_LDIRUNIQUE:
case FILE_RDIRUNIQUE:
{
- CString s;
- VERIFY(s.LoadString(IDS_FILEISDIR));
- AfxMessageBox(s, MB_ICONINFORMATION);
+ AfxMessageBox(IDS_FILEISDIR, MB_ICONINFORMATION);
}
break;
case FILE_LUNIQUE:
case FILE_RUNIQUE:
{
- CString s;
- VERIFY(s.LoadString(IDS_FILEUNIQUE));
- AfxMessageBox(s, MB_ICONINFORMATION);
+ AfxMessageBox(IDS_FILEUNIQUE, MB_ICONINFORMATION);
}
break;
case FILE_BINDIFF:
case FILE_BINSAME:
{
- CString s;
- VERIFY(s.LoadString(IDS_FILEBINARY));
- AfxMessageBox(s, MB_ICONSTOP);
+ AfxMessageBox(IDS_FILEBINARY, MB_ICONSTOP);
}
break;
default:
{
- CString s;
- VERIFY(s.LoadString(IDS_FILEERROR));
- AfxMessageBox(s, MB_ICONSTOP);
+ AfxMessageBox(IDS_FILEERROR, MB_ICONSTOP);
}
break;
}
void CMainFrame::UpdateResources()
{
- CString s;
- VERIFY(s.LoadString(AFX_IDS_IDLEMESSAGE));
- m_wndStatusBar.SetPaneText(0, s);
+ m_wndStatusBar.SetPaneText(0, LoadResString(AFX_IDS_IDLEMESSAGE));
DirDocList dirdocs;
GetAllDirDocs(&dirdocs);
ID_DIR_OPEN_RIGHT_WITH "Open right file with..."
ID_OPTIONS_SHOWBINARIES "Displays binary files"
ID_VIEW_WHITESPACE "Shows whitespace characters"
+ ID_REFRESH "Refresh display\nRefresh (F5)"
END
STRINGTABLE DISCARDABLE
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"
IDS_ERROR_INCOMPARABLE "Select two existing directories or files to compare"
- ID_REFRESH "Refresh display\nRefresh (F5)"
+ IDS_STATUS_RESCANNING "Rescanning"
+ IDS_STATUS_OPENING_SELECTION "Opening selection"
+ IDS_STATUS_COPYL2R "Copying Left to Right"
+ IDS_STATUS_COPYR2L "Copying Right to Left"
+ IDS_STATUS_COPYALL2L "Copying All to Left"
+ IDS_STATUS_COPYALL2R "Copying All to Right"
END
#endif // English (U.S.) resources
COleDateTimeSpan elapsed = COleDateTime::GetCurrentTime() - m_LastRescan;
if (elapsed.GetTotalSeconds() > 1)
{
- WaitStatusCursor waitstatus(_T("Rescanning"));
+ WaitStatusCursor waitstatus(LoadResString(IDS_STATUS_RESCANNING));
FlushAndRescan();
}
}
void CMergeEditView::OnL2r()
{
- WaitStatusCursor waitstatus(_T("Copying Left to Right"));
+ WaitStatusCursor waitstatus(LoadResString(IDS_STATUS_COPYL2R));
GetDocument()->ListCopy(true);
}
void CMergeEditView::OnR2l()
{
- WaitStatusCursor waitstatus(_T("Copying Right to Left"));
+ WaitStatusCursor waitstatus(LoadResString(IDS_STATUS_COPYR2L));
GetDocument()->ListCopy(false);
}
void CMergeEditView::OnAllLeft()
{
- WaitStatusCursor waitstatus(_T("Copying All to Left"));
+ WaitStatusCursor waitstatus(LoadResString(IDS_STATUS_COPYALL2L));
CMergeDoc* pDoc = GetDocument();
// Unfortunately difftools is not designed for this kind
void CMergeEditView::OnAllRight()
{
- WaitStatusCursor waitstatus(_T("Copying All to Right"));
+ WaitStatusCursor waitstatus(LoadResString(IDS_STATUS_COPYALL2R));
CMergeDoc* pDoc = GetDocument();
// Unfortunately difftools is not designed for this kind
{
return isalnum (normch(c)) || xisspecial (normch(c));
}
+
+CString LoadResString(int id)
+{
+ CString s;
+ VERIFY(s.LoadString(id));
+ return s;
+}
int xisalpha (int c);
int xisalnum (int c);
-
-
+CString LoadResString(int id);
//{{AFX_INSERT_LOCATION}}
// Microsoft Developer Studio will insert additional declarations immediately before the previous line.
PATCH: [ 724309 ] Add WaitStatusCursors
WinMerge: DirDoc.cpp DirView.cpp MainFrm.cpp Merge.dsp MergeDoc.cpp MergeEditView.cpp
WaitStatusCursor.cpp WaitStatusCursor.h
+ PATCH: [ 724473 ] Move WaitStatusCursor strings into RC
+ WinMerge: DirDoc.cpp DirView.cpp MainFrm.cpp MergeDoc.cpp MergeEditView.cpp resource.h StdAfx.cpp StdAfx.h
2003-04-19 Perry
[ 724280 ] Could use wait cursors at OpenSelection calls
#define IDS_FILESAVE_FAILED 192
#define IDS_ERROR_FILE_NOT_FOUND 193
#define IDS_ERROR_INCOMPARABLE 194
+#define IDS_STATUS_RESCANNING 195
+#define IDS_STATUS_OPENING_SELECTION 196
+#define IDS_STATUS_COPYL2R 197
+#define IDS_STATUS_COPYR2L 198
+#define IDS_STATUS_COPYALL2L 199
+#define IDS_STATUS_COPYALL2R 200
#define IDB_EQUAL 213
#define IDB_NOTEQUAL 214
#define IDB_RFOLDER 215