+2005-12-19 Kimmo
+ PATCH: [ 1384646 ] Replace Question icons with warning icons in messageboxes
+ Src: DirActions.cpp FileFiltersDlg.cpp MainFrm.cpp MergeDoc.cpp PatchDlg.cpp
+
2005-12-19 Perry
PATCH: [ 1383120 ] Fix background colors in WinMerge
Src: SyntaxColors.cpp SyntaxColors.h
CString s;
ASSERT(count>1);
AfxFormatString2(s, IDS_CONFIRM_COPY2DIR, NumToStr(count), NumToStr(total));
- int rtn = AfxMessageBox(s, MB_YESNO|MB_ICONQUESTION|MB_DONT_ASK_AGAIN, IDS_CONFIRM_COPY2DIR);
+ int rtn = AfxMessageBox(s, MB_YESNO | MB_ICONWARNING | MB_DONT_ASK_AGAIN, IDS_CONFIRM_COPY2DIR);
return (rtn==IDYES);
}
{
CString s;
AfxFormatString2(s, IDS_CONFIRM_COPY_SINGLE, src, dest);
- int rtn = AfxMessageBox(s, MB_YESNO|MB_ICONQUESTION|MB_DONT_ASK_AGAIN, IDS_CONFIRM_COPY_SINGLE);
+ int rtn = AfxMessageBox(s, MB_YESNO | MB_ICONWARNING | MB_DONT_ASK_AGAIN, IDS_CONFIRM_COPY_SINGLE);
return (rtn==IDYES);
}
{
CString s;
AfxFormatString2(s, IDS_CONFIRM_DELETE_ITEMS, NumToStr(count), NumToStr(total));
- int rtn = AfxMessageBox(s, MB_YESNO|MB_ICONQUESTION|MB_DONT_ASK_AGAIN, IDS_CONFIRM_DELETE_ITEMS);
+ int rtn = AfxMessageBox(s, MB_YESNO | MB_ICONWARNING | MB_DONT_ASK_AGAIN, IDS_CONFIRM_DELETE_ITEMS);
return (rtn==IDYES);
}
{
CString s;
AfxFormatString1(s, IDS_CONFIRM_DELETE_SINGLE, filepath);
- int rtn = AfxMessageBox(s, MB_YESNO|MB_ICONQUESTION|MB_DONT_ASK_AGAIN, IDS_CONFIRM_DELETE_SINGLE);
+ int rtn = AfxMessageBox(s, MB_YESNO | MB_ICONWARNING | MB_DONT_ASK_AGAIN, IDS_CONFIRM_DELETE_SINGLE);
return (rtn==IDYES);
}
CString sConfirm;
AfxFormatString1(sConfirm, IDS_CONFIRM_DELETE_SINGLE, path);
- int res = AfxMessageBox(sConfirm, MB_ICONQUESTION | MB_YESNO);
+ int res = AfxMessageBox(sConfirm, MB_ICONWARNING | MB_YESNO);
if (res == IDYES)
{
if (DeleteFile(path))
{
CString msg;
msg.Format(IDS_SUGGEST_IGNORECODEPAGE, filelocLeft.codepage, filelocRight.codepage);
- int msgflags = MB_YESNO | MB_ICONQUESTION | MB_DONT_ASK_AGAIN;
+ int msgflags = MB_YESNO | MB_ICONWARNING | MB_DONT_ASK_AGAIN;
// Two files with different codepages
// Warn and propose to use the default codepage for both
int userChoice = AfxMessageBox(msg, msgflags);
// Multiple files or folder
AfxFormatString1(s, IDS_SAVEREADONLY_MULTI, strSavePath);
userChoice = AfxMessageBox(s, MB_YESNOCANCEL |
- MB_ICONQUESTION | MB_DEFBUTTON3 | MB_DONT_ASK_AGAIN |
+ MB_ICONWARNING | MB_DEFBUTTON3 | MB_DONT_ASK_AGAIN |
MB_YES_TO_ALL, IDS_SAVEREADONLY_MULTI);
}
else
// Single file
AfxFormatString1(s, IDS_SAVEREADONLY_FMT, strSavePath);
userChoice = AfxMessageBox(s, MB_YESNOCANCEL |
- MB_ICONQUESTION | MB_DEFBUTTON2 | MB_DONT_ASK_AGAIN,
+ MB_ICONWARNING | MB_DEFBUTTON2 | MB_DONT_ASK_AGAIN,
IDS_SAVEREADONLY_FMT);
}
}
{
// BSP - if the directories are different, let the user confirm the CheckOut
int iRes = AfxMessageBox(IDS_VSSFOLDER_AND_FILE_NOMATCH,
- MB_YESNO | MB_YES_TO_ALL | MB_ICONQUESTION);
+ MB_YESNO | MB_YES_TO_ALL | MB_ICONWARNING);
if (iRes == IDNO)
{
if (!success)
{
if (ResMsgBox1(IDS_BACKUP_FAILED_PROMPT, pszPath,
- MB_YESNO | MB_ICONQUESTION | MB_DONT_ASK_AGAIN,
+ MB_YESNO | MB_ICONWARNING | MB_DONT_ASK_AGAIN,
IDS_BACKUP_FAILED_PROMPT) != IDYES)
return FALSE;
}
{
CString s;
AfxFormatString1(s, IDS_SUGGEST_PRESERVEEOL, sFileName);
- if (AfxMessageBox(s, MB_YESNO | MB_ICONQUESTION | MB_DONT_ASK_AGAIN,
+ if (AfxMessageBox(s, MB_YESNO | MB_ICONWARNING | MB_DONT_ASK_AGAIN,
IDS_SUGGEST_PRESERVEEOL) == IDYES)
{
// the user wants to keep the original chars
// All lines will differ, that is not very interesting and probably not wanted.
// Propose to turn off the option 'sensitive to EOL'
CString s = LoadResString(IDS_SUGGEST_IGNOREEOL);
- if (AfxMessageBox(s, MB_YESNO|MB_ICONQUESTION|MB_DONT_ASK_AGAIN, IDS_SUGGEST_IGNOREEOL) == IDYES)
+ if (AfxMessageBox(s, MB_YESNO | MB_ICONWARNING | MB_DONT_ASK_AGAIN, IDS_SUGGEST_IGNOREEOL) == IDYES)
{
diffOptions.bEolSensitive = FALSE;
m_diffWrapper.SetOptions(&diffOptions);
if (fileExists && !m_appendFile)
{
if (AfxMessageBox(IDS_DIFF_FILEOVERWRITE,
- MB_YESNO | MB_ICONQUESTION | MB_DONT_ASK_AGAIN,
+ MB_YESNO | MB_ICONWARNING | MB_DONT_ASK_AGAIN,
IDS_DIFF_FILEOVERWRITE) != IDYES)
{
return;