- 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

6 files changed, 20 insertions, 20 deletions

diff --git a/plugins/Clist_mw/CLUIFrames/cluiframes.cpp b/plugins/Clist_mw/CLUIFrames/cluiframes.cpp
index ab56da832d..3d5eb1d676 100644
--- a/plugins/Clist_mw/CLUIFrames/cluiframes.cpp
+++ b/plugins/Clist_mw/CLUIFrames/cluiframes.cpp
@@ -293,7 +293,7 @@ static void PositionThumb( wndFrame *pThumb, short nX, short nY )
 	bLeading = pThumb->dockOpt.hwndRight != NULL;

 

 	if ( bMoveTogether ) {

-		UndockThumbs( pThumb,  FindFrameByWnd( pThumb->dockOpt.hwndLeft ) );

+		UndockThumbs( pThumb,  FindFrameByWnd( pThumb->dockOpt.hwndLeft ));

 		GetWindowRect( pThumb->ContainerWnd, &rcOld );

 	}

 

@@ -350,7 +350,7 @@ static void PositionThumb( wndFrame *pThumb, short nX, short nY )
 

 				if ( PtInRect( &rcBottom, pt )) {

 					nNewY = rc.bottom;

-					if ( PtInRect( &rcLeft, pt ) )

+					if ( PtInRect( &rcLeft, pt ))

 						nNewX = rc.left;

 				}

 

@@ -401,7 +401,7 @@ static void PositionThumb( wndFrame *pThumb, short nX, short nY )
 

 				if ( PtInRect( &rcTop, pt )) {

 					nNewY = rc.top - nHeight;

-					if ( PtInRect( &rcLeft, pt ) )

+					if ( PtInRect( &rcLeft, pt ))

 						nNewX = rc.left;

 				}

 

@@ -414,7 +414,7 @@ static void PositionThumb( wndFrame *pThumb, short nX, short nY )
 

 				if ( !bLeading && PtInRect( &rcTop, pt )) {

 					nNewY = rc.top - nHeight;

-					if ( PtInRect( &rcRight, pt ) )

+					if ( PtInRect( &rcRight, pt ))

 						nNewX = rc.right - nWidth;

 				}

 			}

@@ -2226,9 +2226,9 @@ LRESULT CALLBACK CLUIFrameTitleBarProc(HWND hwnd, UINT msg, WPARAM wParam, LPARA
 

 	case WM_COMMAND:

 		if ( ServiceExists(MO_CREATENEWMENUOBJECT)) {

-			if (ProcessCommandProxy(MAKEWPARAM(LOWORD(wParam),0),(LPARAM)Frameid) ) break;

+			if (ProcessCommandProxy(MAKEWPARAM(LOWORD(wParam),0),(LPARAM)Frameid)) break;

 		}

-		else if ( CallService(MS_CLIST_MENUPROCESSCOMMAND,MAKEWPARAM(LOWORD(wParam),MPCF_CONTEXTFRAMEMENU),(LPARAM)Frameid) )

+		else if ( CallService(MS_CLIST_MENUPROCESSCOMMAND,MAKEWPARAM(LOWORD(wParam),MPCF_CONTEXTFRAMEMENU),(LPARAM)Frameid))

 			break;

 

 		if (HIWORD(wParam) == 0) {//mouse events for self created menu

@@ -2278,15 +2278,15 @@ LRESULT CALLBACK CLUIFrameTitleBarProc(HWND hwnd, UINT msg, WPARAM wParam, LPARA
 

 				if (Frames[framepos].visible)

 				{AppendMenu(hmenu,MF_STRING|MF_CHECKED,frame_menu_visible,TranslateT("Visible"));}

-				else{AppendMenu(hmenu,MF_STRING,frame_menu_visible,TranslateT("Visible") );}

+				else{AppendMenu(hmenu,MF_STRING,frame_menu_visible,TranslateT("Visible"));}

 

 				if (Frames[framepos].TitleBar.ShowTitleBar)

-				{AppendMenu(hmenu,MF_STRING|MF_CHECKED,frame_menu_showtitlebar,TranslateT("Show TitleBar") );}

-				else{AppendMenu(hmenu,MF_STRING,frame_menu_showtitlebar,TranslateT("Show TitleBar") );}

+				{AppendMenu(hmenu,MF_STRING|MF_CHECKED,frame_menu_showtitlebar,TranslateT("Show TitleBar"));}

+				else{AppendMenu(hmenu,MF_STRING,frame_menu_showtitlebar,TranslateT("Show TitleBar"));}

 

 				if (Frames[framepos].floating)

-				{AppendMenu(hmenu,MF_STRING|MF_CHECKED,frame_menu_floating,TranslateT("Floating") );}

-				else{AppendMenu(hmenu,MF_STRING,frame_menu_floating,TranslateT("Floating") );}

+				{AppendMenu(hmenu,MF_STRING|MF_CHECKED,frame_menu_floating,TranslateT("Floating"));}

+				else{AppendMenu(hmenu,MF_STRING,frame_menu_floating,TranslateT("Floating"));}

 

 				ulockfrm();

 			}

diff --git a/plugins/Clist_mw/clcitems.cpp b/plugins/Clist_mw/clcitems.cpp
index ae69b6ee42..0a483fb76d 100644
--- a/plugins/Clist_mw/clcitems.cpp
+++ b/plugins/Clist_mw/clcitems.cpp
@@ -54,7 +54,7 @@ void AddSubcontacts(struct ClcContact * cont)
 	{

 		hsub = (HANDLE)CallService(MS_MC_GETSUBCONTACT,(WPARAM)cont->hContact,j);

 		cacheEntry = GetContactFullCacheEntry(hsub);		

-		if (!(DBGetContactSettingByte(NULL,"CLC","MetaHideOfflineSub",1) && DBGetContactSettingByte(NULL,"CList","HideOffline",SETTING_HIDEOFFLINE_DEFAULT) )||

+		if (!(DBGetContactSettingByte(NULL,"CLC","MetaHideOfflineSub",1) && DBGetContactSettingByte(NULL,"CList","HideOffline",SETTING_HIDEOFFLINE_DEFAULT))||

 			cacheEntry->status != ID_STATUS_OFFLINE )

 		{

 			cont->subcontacts[i].hContact = cacheEntry->hContact;

diff --git a/plugins/Clist_mw/clcpaint.cpp b/plugins/Clist_mw/clcpaint.cpp
index 952ef930f2..b4fc20850f 100644
--- a/plugins/Clist_mw/clcpaint.cpp
+++ b/plugins/Clist_mw/clcpaint.cpp
@@ -333,7 +333,7 @@ void InternalPaintClc(HWND hwnd,struct ClcData *dat,HDC hdc,RECT *rcPaint)
 			}

 			else if (Drawing->type == CLCIT_DIVIDER)

 				ChangeToFont(hdcMem,dat,FONTID_DIVIDERS,&fontHeight);

-			else if (Drawing->type == CLCIT_CONTACT && (Drawing->flags&CONTACTF_NOTONLIST) && (!Drawing->isSubcontact) )

+			else if (Drawing->type == CLCIT_CONTACT && (Drawing->flags&CONTACTF_NOTONLIST) && (!Drawing->isSubcontact))

 				ChangeToFont(hdcMem,dat,FONTID_NOTONLIST,&fontHeight);

 			else if ( Drawing->type == CLCIT_CONTACT && 

 				(	

diff --git a/plugins/Clist_mw/clistopts.cpp b/plugins/Clist_mw/clistopts.cpp
index d2738d8aa6..b845c5a0a0 100644
--- a/plugins/Clist_mw/clistopts.cpp
+++ b/plugins/Clist_mw/clistopts.cpp
@@ -62,14 +62,14 @@ static INT_PTR CALLBACK DlgProcGenOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 			DBCONTACTWRITESETTING * ws = (DBCONTACTWRITESETTING *)lParam;

 			if ( hContact == NULL && ws != NULL && ws->szModule != NULL && ws->szSetting != NULL

 				&& lstrcmpiA(ws->szModule,"CList") == 0 && lstrcmpiA(ws->szSetting,"UseGroups") == 0

-				&& IsWindowVisible(hwndDlg) ) {

+				&& IsWindowVisible(hwndDlg)) {

 				CheckDlgButton(hwndDlg,IDC_DISABLEGROUPS,ws->value.bVal == 0);

 			}

 			break;

 		}

 		case WM_DESTROY: 

 		{

-			UnhookEvent( (HANDLE)GetWindowLongPtr(hwndDlg,GWLP_USERDATA) );

+			UnhookEvent( (HANDLE)GetWindowLongPtr(hwndDlg,GWLP_USERDATA));

 			break;

 		}

 

diff --git a/plugins/Clist_mw/clistsettings.cpp b/plugins/Clist_mw/clistsettings.cpp
index 24275f4362..25206e86ba 100644
--- a/plugins/Clist_mw/clistsettings.cpp
+++ b/plugins/Clist_mw/clistsettings.cpp
@@ -338,10 +338,10 @@ int ContactSettingChanged(WPARAM wParam,LPARAM lParam)
 			*/

 

 			//name is null or (setting is myhandle)

-			if (pdnce->name == NULL||(!strcmp(cws->szSetting,"MyHandle")) )

+			if (pdnce->name == NULL||(!strcmp(cws->szSetting,"MyHandle")))

 				InvalidateDisplayNameCacheEntryByPDNE((HANDLE)wParam,pdnce,cws->value.type);

 

-			if ((!strcmp(cws->szSetting,"Group")) )

+			if ((!strcmp(cws->szSetting,"Group")))

 				InvalidateDisplayNameCacheEntryByPDNE((HANDLE)wParam,pdnce,cws->value.type);

 

 			if (!strcmp(cws->szSetting,"Hidden")) {

@@ -367,7 +367,7 @@ int ContactSettingChanged(WPARAM wParam,LPARAM lParam)
 			}

 		}

 	} 

-	__except (exceptFunction(GetExceptionInformation()) ) 

+	__except (exceptFunction(GetExceptionInformation())) 

 	{ 

 	} 

 

diff --git a/plugins/Clist_mw/init.cpp b/plugins/Clist_mw/init.cpp
index 2c155b744d..d5167fffd5 100644
--- a/plugins/Clist_mw/init.cpp
+++ b/plugins/Clist_mw/init.cpp
@@ -122,7 +122,7 @@ static int systemModulesLoaded(WPARAM wParam, LPARAM lParam)
 		disableDefaultModule = (int*)CallService(MS_PLUGINS_GETDISABLEDEFAULTARRAY,0,0);

 		if (!disableDefaultModule[DEFMOD_UICLUI]) if ( LoadCLUIModule()) return 1;

 	}

-	__except (exceptFunction(GetExceptionInformation()) )

+	__except (exceptFunction(GetExceptionInformation()))

 	{

 		return 0;

 	}

@@ -231,7 +231,7 @@ LBL_Error:
 

 		OutputDebugStringA("CListInitialise ClistMW...Done\r\n");

 	}

-	__except (exceptFunction(GetExceptionInformation()) )

+	__except (exceptFunction(GetExceptionInformation()))

 	{

 		return 0;

 	}