Improved and iconized some MessageBoxes.

git-svn-id: http://svn.miranda-ng.org/main/trunk@4931 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

7 files changed, 19 insertions, 15 deletions

diff --git a/src/modules/clist/clistmod.cpp b/src/modules/clist/clistmod.cpp
index a7cae8ed75..6108a31fe2 100644
--- a/src/modules/clist/clistmod.cpp
+++ b/src/modules/clist/clistmod.cpp
@@ -217,7 +217,7 @@ static void RemoveProtoIconIndex(PROTOACCOUNT* pa)
 static int ContactListModulesLoaded(WPARAM, LPARAM)

 {

 	if ( !ServiceExists(MS_DB_CONTACT_GETSETTING_STR)) {

-		MessageBox(NULL, TranslateT("This plugin requires db3x plugin version 0.5.1.0 or later"), _T("CList"), MB_OK);

+		MessageBox(NULL, TranslateT("This plugin requires db3x plugin version 0.5.1.0 or later"), _T("CList"), MB_ICONERROR | MB_OK);

 		return 1;

 	}

 

diff --git a/src/modules/clist/clui.cpp b/src/modules/clist/clui.cpp
index 7b6e5f7db0..30722e00ff 100644
--- a/src/modules/clist/clui.cpp
+++ b/src/modules/clist/clui.cpp
@@ -201,7 +201,7 @@ static INT_PTR MenuItem_DeleteContact(WPARAM wParam, LPARAM lParam)
 						db_set_b((HANDLE)wParam, "CList", "Delete", 1);

 						MessageBox(NULL,

 							TranslateT("This contact is on an instant messaging system which stores its contact list on a central server. The contact will be removed from the server and from your contact list when you next connect to that network."),

-							TranslateT("Delete Contact"), MB_OK);

+							TranslateT("Delete Contact"), MB_ICONINFORMATION | MB_OK);

 						return 0;

 					}

 				}

diff --git a/src/modules/clist/groups.cpp b/src/modules/clist/groups.cpp
index c2ac366c54..e4d40f7113 100644
--- a/src/modules/clist/groups.cpp
+++ b/src/modules/clist/groups.cpp
@@ -255,7 +255,7 @@ static int RenameGroupWithMove(int groupId, const TCHAR *szName, int move)
 	DBVARIANT dbv;

 

 	if (GroupNameExists(szName, groupId)) {

-		MessageBox(NULL, TranslateT("You already have a group with that name. Please enter a unique name for the group."), TranslateT("Rename Group"), MB_OK);

+		MessageBox(NULL, TranslateT("You already have a group with that name. Please enter a unique name for the group."), TranslateT("Rename Group"), MB_ICONERROR | MB_OK);

 		return 1;

 	}

 

diff --git a/src/modules/database/dbini.cpp b/src/modules/database/dbini.cpp
index 89034b9ea8..aa42015730 100644
--- a/src/modules/database/dbini.cpp
+++ b/src/modules/database/dbini.cpp
@@ -386,7 +386,9 @@ static void ProcessIniFile(TCHAR* szIniPath, char *szSafeSections, char *szUnsaf
 			}

 			break;

 		default:

-			MessageBox(NULL, TranslateT("Invalid setting type. The first character of every value must be b, w, d, l, s, e, u, g, h or n."), TranslateT("Install Database Settings"), MB_OK);

+			TCHAR buf[ 100 ];

+			mir_sntprintf(buf, SIZEOF(buf), TranslateT("Invalid setting type for '%s'. The first character of every value must be b, w, d, l, s, e, u, g, h or n."), _A2T(szName));

+			MessageBox(NULL, buf, TranslateT("Install Database Settings"), MB_ICONWARNING | MB_OK);

 			break;

 		}

 	}

diff --git a/src/modules/findadd/findadd.cpp b/src/modules/findadd/findadd.cpp
index 1228083026..2a0705b37f 100644
--- a/src/modules/findadd/findadd.cpp
+++ b/src/modules/findadd/findadd.cpp
@@ -689,7 +689,7 @@ static INT_PTR CALLBACK DlgProcFindAdd(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 					GetDlgItemText(hwndDlg, IDC_PROTOID, str, SIZEOF(str));

 					rtrimt(str);

 					if (str[0] == 0)

-						MessageBox(hwndDlg, sttErrMsg, sttErrTitle, MB_OK);

+						MessageBox(hwndDlg, sttErrMsg, sttErrTitle, MB_ICONERROR | MB_OK);

 					else

 						BeginSearch(hwndDlg, dat, szProto, PS_BASICSEARCHT, PF1_BASICSEARCH, str);

 				}

@@ -698,7 +698,7 @@ static INT_PTR CALLBACK DlgProcFindAdd(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 					GetDlgItemText(hwndDlg, IDC_EMAIL, str, SIZEOF(str));

 					rtrimt(str);

 					if (str[0] == 0)

-						MessageBox(hwndDlg, sttErrMsg, sttErrTitle, MB_OK);

+						MessageBox(hwndDlg, sttErrMsg, sttErrTitle, MB_ICONERROR | MB_OK);

 					else

 						BeginSearch(hwndDlg, dat, szProto, PS_SEARCHBYEMAILT, PF1_SEARCHBYEMAIL, str);

 				}

@@ -712,13 +712,13 @@ static INT_PTR CALLBACK DlgProcFindAdd(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 					psbn.pszLastName = last;

 					psbn.pszNick = nick;

 					if (nick[0] == 0 && first[0] == 0 && last[0] == 0)

-						MessageBox(hwndDlg, sttErrMsg, sttErrTitle, MB_OK);

+						MessageBox(hwndDlg, sttErrMsg, sttErrTitle, MB_ICONERROR | MB_OK);

 					else

 						BeginSearch(hwndDlg, dat, szProto, PS_SEARCHBYNAMET, PF1_SEARCHBYNAME, &psbn);

 				}

 				else if (IsDlgButtonChecked(hwndDlg, IDC_BYADVANCED)) {

 					if (dat->hwndAdvSearch == NULL)

-						MessageBox(hwndDlg, sttErrMsg, sttErrTitle, MB_OK);

+						MessageBox(hwndDlg, sttErrMsg, sttErrTitle, MB_ICONERROR | MB_OK);

 					else

 						BeginSearch(hwndDlg, dat, szProto, PS_SEARCHBYADVANCED, PF1_EXTSEARCHUI, dat->hwndAdvSearch);

 				}

diff --git a/src/modules/plugins/newplugins.cpp b/src/modules/plugins/newplugins.cpp
index d31d7169d1..dfe9602246 100644
--- a/src/modules/plugins/newplugins.cpp
+++ b/src/modules/plugins/newplugins.cpp
@@ -150,7 +150,7 @@ int LoadStdPlugins()
 	}

 

 	if (pluginDefault[13].pImpl == NULL)

-		MessageBox(NULL, TranslateT("No messaging plugins loaded. Please install/enable one of the messaging plugins, for instance, \"srmm.dll\""), _T("Miranda NG"), MB_OK | MB_ICONINFORMATION);

+		MessageBox(NULL, TranslateT("No messaging plugins loaded. Please install/enable one of the messaging plugins, for instance, \"srmm.dll\""), _T("Miranda NG"), MB_OK | MB_ICONWARNING);

 

 	return 0;

 }

@@ -681,7 +681,7 @@ static int LaunchServicePlugin(pluginEntry* p)
 	if (res != CALLSERVICE_NOTFOUND)

 		return res;

 

-	MessageBox(NULL, TranslateT("Unable to load plugin in Service Mode!"), p->pluginname, 0);

+	MessageBox(NULL, TranslateT("Unable to load plugin in Service Mode!"), p->pluginname, MB_ICONSTOP);

 	Plugin_Uninit(p);

 	return SERVICE_FAILED;

 }

@@ -787,9 +787,9 @@ int LoadNewPluginsModule(void)
 	if (clist == NULL) {

 		// result = 0, no clist_* can be found

 		if (clistPlugins.getCount())

-			MessageBox(NULL, TranslateT("Unable to start any of the installed contact list plugins, I even ignored your preferences for which contact list couldn't load any."), _T("Miranda NG"), MB_OK | MB_ICONINFORMATION);

+			MessageBox(NULL, TranslateT("Unable to start any of the installed contact list plugins, I even ignored your preferences for which contact list couldn't load any."), _T("Miranda NG"), MB_OK | MB_ICONERROR);

 		else

-			MessageBox(NULL, TranslateT("Can't find a contact list plugin! you need clist_classic or any other clist plugin.") , _T("Miranda NG"), MB_OK | MB_ICONINFORMATION);

+			MessageBox(NULL, TranslateT("Can't find a contact list plugin! you need clist_classic or any other clist plugin.") , _T("Miranda NG"), MB_OK | MB_ICONERROR);

 		return 1;

 	}

 

diff --git a/src/modules/protocols/protoopts.cpp b/src/modules/protocols/protoopts.cpp
index aa5d75af62..b3c9c21065 100644
--- a/src/modules/protocols/protoopts.cpp
+++ b/src/modules/protocols/protoopts.cpp
@@ -783,9 +783,11 @@ INT_PTR CALLBACK AccMgrDlgProc(HWND hwndDlg, UINT message, WPARAM wParam, LPARAM
 							else {

 								DWORD dwStatus = CallProtoServiceInt(NULL,pa->szModuleName, PS_GETSTATUS, 0, 0);

 								if (dwStatus >= ID_STATUS_ONLINE) {

-									if (IDCANCEL == ::MessageBox(hwndDlg, 

+									TCHAR buf[ 200 ];

+									mir_sntprintf(buf, SIZEOF(buf), TranslateT("Account %s is being disabled"), pa->tszAccountName);

+									if (IDNO == ::MessageBox(hwndDlg, 

 																TranslateT("Account is online. Disable account?"),

-																TranslateT("Accounts"), MB_OKCANCEL)) {

+																buf, MB_ICONWARNING | MB_DEFBUTTON2 | MB_YESNO)) {

 										pa->bIsEnabled = 1; //stay enabled

 									}

 								}

@@ -858,7 +860,7 @@ INT_PTR CALLBACK AccMgrDlgProc(HWND hwndDlg, UINT message, WPARAM wParam, LPARAM
 							MB_ICONERROR | MB_OK);

 						break;

 					}

-					if (IDYES == MessageBox(NULL, errMsg, buf, MB_ICONSTOP | MB_DEFBUTTON2 | MB_YESNO)) {

+					if (IDYES == MessageBox(NULL, errMsg, buf, MB_ICONWARNING | MB_DEFBUTTON2 | MB_YESNO)) {

 						// lock controls to avoid changes during remove process

 						ListBox_SetCurSel(hList, -1);

 						sttUpdateAccountInfo(hwndDlg, dat);