- direct call of MS_SKIN_ADDNEWSOUND replaced with Skin_AddSound() call;

- obsolete structure SKINSOUNDDESC removed 
- dynamically translated hot keys;
- checked correct LPGEN'ing of the sounds creation;
- code cleaning

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

8 files changed, 17 insertions, 17 deletions

diff --git a/plugins/UserInfoEx/Flags/svc_flags.cpp b/plugins/UserInfoEx/Flags/svc_flags.cpp
index 49435ec5c0..ec08f9704c 100644
--- a/plugins/UserInfoEx/Flags/svc_flags.cpp
+++ b/plugins/UserInfoEx/Flags/svc_flags.cpp
@@ -366,7 +366,7 @@ static int OnExtraIconSvcChanged(WPARAM wParam,LPARAM lParam) {
 	DBCONTACTWRITESETTING *dbcws=(DBCONTACTWRITESETTING*)lParam;

 	if ((HANDLE)wParam!=NULL)return 0;

 	if (!lstrcmpA(dbcws->szModule, "ExtraIcons") &&

-	   !lstrcmpA(dbcws->szSetting,"Slot_Flags") ) {

+	   !lstrcmpA(dbcws->szSetting,"Slot_Flags")) {

 			BOOL bEnable;

 			switch (dbcws->value.type) {

 				case DBVT_BYTE:

diff --git a/plugins/UserInfoEx/Flags/svc_flagsicons.cpp b/plugins/UserInfoEx/Flags/svc_flagsicons.cpp
index a765b8e8f8..e265d1b850 100644
--- a/plugins/UserInfoEx/Flags/svc_flagsicons.cpp
+++ b/plugins/UserInfoEx/Flags/svc_flagsicons.cpp
@@ -103,10 +103,10 @@ static int CountryNumberToBitmapIndex(int countryNumber)
 			countryNumber=599;  /* Netherlands Antilles (dissolved 2010) */

 			//countryNumber=31;   /* Netherlands */

 			break;

-		case 5995:              /* St. Maarten (new country in 2010 (from Netherlands Antilles) new country in 2010 (from Netherlands Antilles) ) */

+		case 5995:              /* St. Maarten (new country in 2010 (from Netherlands Antilles) new country in 2010 (from Netherlands Antilles)) */

 			countryNumber=599;  /* Netherlands Antilles (dissolved 2010) */

 			break;

-		case 5999:              /* Curacao (new country in 2010 (from Netherlands Antilles) new country in 2010 (from Netherlands Antilles) ) */

+		case 5999:              /* Curacao (new country in 2010 (from Netherlands Antilles) new country in 2010 (from Netherlands Antilles)) */

 			countryNumber=599;  /* Netherlands Antilles (dissolved 2010) */

 			break;

 		case 5399:              /* missing Guantanamo Bay */

diff --git a/plugins/UserInfoEx/dlg_anniversarylist.cpp b/plugins/UserInfoEx/dlg_anniversarylist.cpp
index 60718f5861..680dd1e23b 100644
--- a/plugins/UserInfoEx/dlg_anniversarylist.cpp
+++ b/plugins/UserInfoEx/dlg_anniversarylist.cpp
@@ -583,14 +583,14 @@ class CAnnivList
 					if (!pDlg->_wmINIT && (wndPos->cx != 0 || wndPos->cy != 0)) {

 						//win pos change

 						if ( (wndPos->cx == pDlg->_rcWin.right  - pDlg->_rcWin.left) && 

-							(wndPos->cy == pDlg->_rcWin.bottom - pDlg->_rcWin.top) ) {

+							(wndPos->cy == pDlg->_rcWin.bottom - pDlg->_rcWin.top)) {

 							//win pos change (store new pos)

 							GetWindowRect(hDlg, &pDlg->_rcWin);

 						}

 						//win size change

 						else {

 							// l change

-							if (	(wndPos->cx < pDlg->_sizeMin.cx) && (wndPos->x > pDlg->_rcWin.left) ) {

+							if (	(wndPos->cx < pDlg->_sizeMin.cx) && (wndPos->x > pDlg->_rcWin.left)) {

 								wndPos->x  = wndPos->x + wndPos->cx - pDlg->_sizeMin.cx;

 								wndPos->cx = pDlg->_sizeMin.cx;

 							}

@@ -600,7 +600,7 @@ class CAnnivList
 							}

 

 							// t change

-							if (	(wndPos->cy < pDlg->_sizeMin.cy) && (wndPos->y > pDlg->_rcWin.top) ) {

+							if (	(wndPos->cy < pDlg->_sizeMin.cy) && (wndPos->y > pDlg->_rcWin.top)) {

 								wndPos->y  = wndPos->y + wndPos->cy - pDlg->_sizeMin.cy;

 								wndPos->cy = pDlg->_sizeMin.cy;

 							}

diff --git a/plugins/UserInfoEx/ex_import/classExImContactXML.cpp b/plugins/UserInfoEx/ex_import/classExImContactXML.cpp
index 11f2aed631..2264f4d278 100644
--- a/plugins/UserInfoEx/ex_import/classExImContactXML.cpp
+++ b/plugins/UserInfoEx/ex_import/classExImContactXML.cpp
@@ -579,10 +579,10 @@ VOID CExImContactXML::CountKeys(DWORD &numSettings, DWORD &numEvents)
 	numSettings = numEvents = 0;

 	for (xmod = _xmlNode->FirstChild(); 

 		xmod != NULL; 

-		xmod = xmod->NextSibling(XKEY_MOD) ) {

+		xmod = xmod->NextSibling(XKEY_MOD)) {

 		for (xkey = xmod->FirstChild();

 			xkey != NULL;

-			xkey = xkey->NextSibling() ) {

+			xkey = xkey->NextSibling()) {

 			if (!mir_stricmp(xkey->Value(), XKEY_SET)) numSettings++;

 			else numEvents++;

 		}

@@ -941,7 +941,7 @@ INT CExImContactXML::ImportModule(TiXmlNode* xmlModule)
 			else if(isProtoModule && isMetaModule) {

 				if (!mir_stricmp(xKey->Attribute("key"),"Nick") ||

 					!mir_stricmp(xKey->Attribute("key"),"TzName") ||

-					!mir_stricmp(xKey->Attribute("key"),"Timezone") ) {

+					!mir_stricmp(xKey->Attribute("key"),"Timezone")) {

 					if (ImportSetting(pszModule, xKey->ToElement()) == ERROR_OK) {

 						_pXmlFile->_numSettingsDone++;

 					}

diff --git a/plugins/UserInfoEx/ex_import/dlg_ExImModules.cpp b/plugins/UserInfoEx/ex_import/dlg_ExImModules.cpp
index ba026e2c52..9ca27d7289 100644
--- a/plugins/UserInfoEx/ex_import/dlg_ExImModules.cpp
+++ b/plugins/UserInfoEx/ex_import/dlg_ExImModules.cpp
@@ -363,7 +363,7 @@ INT_PTR CALLBACK SelectModulesToExport_DlgProc(HWND hDlg, UINT uMsg, WPARAM wPar
 									(!pDat->ExImContact->hContact || mir_stricmp(p, pszProto)) &&

 									//mir_stricmp(p, "Protocol") &&

 									mir_stricmp(p, USERINFO) &&

-									mir_stricmp(p, MOD_MBIRTHDAY) )

+									mir_stricmp(p, MOD_MBIRTHDAY))

 								{

 									ExportTree_AddItem(hTree, hItemOptional, (LPSTR)p, bImagesLoaded, 1);

 								}

diff --git a/plugins/UserInfoEx/ex_import/dlg_ExImOpenSaveFile.cpp b/plugins/UserInfoEx/ex_import/dlg_ExImOpenSaveFile.cpp
index 6e1bb7ad54..d9d0efbd7d 100644
--- a/plugins/UserInfoEx/ex_import/dlg_ExImOpenSaveFile.cpp
+++ b/plugins/UserInfoEx/ex_import/dlg_ExImOpenSaveFile.cpp
@@ -168,7 +168,7 @@ static LRESULT PlacesBarSubclassProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM
 					// profile button

 					case 41064:

 						// set button text

-						iString = SendMessage(hWnd, TB_ADDSTRING, NULL, (LPARAM) TranslateT("Profile") );

+						iString = SendMessage(hWnd, TB_ADDSTRING, NULL, (LPARAM) TranslateT("Profile"));

 						if (iString != -1) tbb->iString = iString;

 

 						// set tooltip

diff --git a/plugins/UserInfoEx/mir_db.cpp b/plugins/UserInfoEx/mir_db.cpp
index b17dc3e7d0..e4596df4cc 100644
--- a/plugins/UserInfoEx/mir_db.cpp
+++ b/plugins/UserInfoEx/mir_db.cpp
@@ -1222,7 +1222,7 @@ BOOLEAN	Exists(HANDLE hContact, HANDLE& hDbExistingEvent, DBEVENTINFO *dbei)
 		sdbe = hDbExistingEvent;

 		for (	edbe = sdbe;

 				edbe && !GetInfo(edbe, &edbei) && (dbei->timestamp <= edbei.timestamp);

-				edbe = FindPrev(edbe) ) {

+				edbe = FindPrev(edbe)) {

 			hDbExistingEvent = edbe;

 			//compare without data (faster)

 			if ( result = IsEqual(dbei, &edbei, false)) {

@@ -1239,7 +1239,7 @@ BOOLEAN	Exists(HANDLE hContact, HANDLE& hDbExistingEvent, DBEVENTINFO *dbei)
 		if (!result) {

 			for (	edbe = FindNext(sdbe);

 					edbe && !GetInfo(edbe, &edbei) && (dbei->timestamp >= edbei.timestamp);

-					edbe = FindNext(edbe) ) {

+					edbe = FindNext(edbe)) {

 				hDbExistingEvent = edbe;

 				//compare without data (faster)

 				if ( result = IsEqual(dbei, &edbei, false)) {

diff --git a/plugins/UserInfoEx/svc_reminder.cpp b/plugins/UserInfoEx/svc_reminder.cpp
index 203b98faa4..20abe584a6 100644
--- a/plugins/UserInfoEx/svc_reminder.cpp
+++ b/plugins/UserInfoEx/svc_reminder.cpp
@@ -1189,22 +1189,22 @@ VOID SvcReminderLoadModule(VOID)
 	// init sounds

 	SKINSOUNDDESCEX ssd = { 0 };

 	ssd.cbSize = sizeof(ssd);

-	ssd.pszSection = LPGEN(MODNAME);

+	ssd.pszSection = MODNAME;

 

 	ssd.pszName = SOUND_BIRTHDAY_TODAY;

 	ssd.pszDescription = LPGEN("Birthday reminder");

 	ssd.pszDefaultFile = "Sounds\\BirthDay.wav";

-	CallService(MS_SKIN_ADDNEWSOUND, 0, (LPARAM)&ssd);

+	Skin_AddSound(&ssd);

 

 	ssd.pszName = SOUND_BIRTHDAY_SOON;

 	ssd.pszDescription = LPGEN("Birthday reminder: it's coming");

 	ssd.pszDefaultFile = "Sounds\\BirthDayComing.wav";

-	CallService(MS_SKIN_ADDNEWSOUND, 0, (LPARAM)&ssd);

+	Skin_AddSound(&ssd);

 

 	ssd.pszName = SOUND_ANNIVERSARY;

 	ssd.pszDescription = LPGEN("Anniversary Reminder");

 	ssd.pszDefaultFile = "Sounds\\Reminder.wav";

-	CallService(MS_SKIN_ADDNEWSOUND, 0, (LPARAM)&ssd);

+	Skin_AddSound(&ssd);

 

 	// create service functions

 	myCreateServiceFunction(MS_USERINFO_REMINDER_CHECK, CheckService);