From f98b74ac7a60677b1e8572348ad8fcebf8fc5354 Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Mon, 19 Dec 2005 19:50:43 +0000 Subject: [PATCH] PATCH: [ 1384646 ] Replace Question icons with warning icons in messageboxes --- Src/Changes.txt | 4 ++++ Src/DirActions.cpp | 8 ++++---- Src/FileFiltersDlg.cpp | 2 +- Src/MainFrm.cpp | 10 +++++----- Src/MergeDoc.cpp | 4 ++-- Src/PatchDlg.cpp | 2 +- 6 files changed, 17 insertions(+), 13 deletions(-) diff --git a/Src/Changes.txt b/Src/Changes.txt index c04052385..186211f42 100644 --- a/Src/Changes.txt +++ b/Src/Changes.txt @@ -1,3 +1,7 @@ +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 diff --git a/Src/DirActions.cpp b/Src/DirActions.cpp index 6c3362873..f8de928f8 100644 --- a/Src/DirActions.cpp +++ b/Src/DirActions.cpp @@ -43,7 +43,7 @@ static BOOL ConfirmMultipleCopy(int count, int total) 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); } @@ -52,7 +52,7 @@ static BOOL ConfirmSingleCopy(LPCTSTR src, LPCTSTR dest) { 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); } @@ -61,7 +61,7 @@ static BOOL ConfirmMultipleDelete(int count, int total) { 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); } @@ -70,7 +70,7 @@ static BOOL ConfirmSingleDelete(LPCTSTR filepath) { 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); } diff --git a/Src/FileFiltersDlg.cpp b/Src/FileFiltersDlg.cpp index ffd538f0c..8c36fae68 100644 --- a/Src/FileFiltersDlg.cpp +++ b/Src/FileFiltersDlg.cpp @@ -426,7 +426,7 @@ void FileFiltersDlg::OnBnClickedFilterfileDelete() 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)) diff --git a/Src/MainFrm.cpp b/Src/MainFrm.cpp index 3d16d13d5..34fbe37d9 100644 --- a/Src/MainFrm.cpp +++ b/Src/MainFrm.cpp @@ -618,7 +618,7 @@ CMainFrame::ShowMergeDoc(CDirDoc * pDirDoc, const FileLocation & ifilelocLeft, { 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); @@ -814,7 +814,7 @@ int CMainFrame::HandleReadonlySave(CString& strSavePath, BOOL bMultiFile, // 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 @@ -822,7 +822,7 @@ int CMainFrame::HandleReadonlySave(CString& strSavePath, BOOL bMultiFile, // 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); } } @@ -1098,7 +1098,7 @@ BOOL CMainFrame::SaveToVersionControl(CString& strSavePath) { // 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) { @@ -1468,7 +1468,7 @@ BOOL CMainFrame::CreateBackup(LPCTSTR pszPath) 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; } diff --git a/Src/MergeDoc.cpp b/Src/MergeDoc.cpp index e5674cee9..7842643ea 100644 --- a/Src/MergeDoc.cpp +++ b/Src/MergeDoc.cpp @@ -2473,7 +2473,7 @@ int CMergeDoc::LoadFile(CString sFileName, int nBuffer, BOOL & readOnly, int cod { 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 @@ -2661,7 +2661,7 @@ CMergeDoc::OpenDocs(FileLocation filelocLeft, FileLocation filelocRight, // 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); diff --git a/Src/PatchDlg.cpp b/Src/PatchDlg.cpp index 2028b7577..37cc4e070 100644 --- a/Src/PatchDlg.cpp +++ b/Src/PatchDlg.cpp @@ -149,7 +149,7 @@ void CPatchDlg::OnOK() 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; -- 2.11.0