Clist_nicer: proper capitalization in options and menus

options: use system checkboxes instead custom icons for TreeView controls
rearrange list of icons in IcoLib
code cleanup

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

4 files changed, 375 insertions, 382 deletions

diff --git a/plugins/Clist_nicer/src/CLUIFrames/cluiframes.cpp b/plugins/Clist_nicer/src/CLUIFrames/cluiframes.cpp
index d1d8629caf..71224107c0 100644
--- a/plugins/Clist_nicer/src/CLUIFrames/cluiframes.cpp
+++ b/plugins/Clist_nicer/src/CLUIFrames/cluiframes.cpp
@@ -54,7 +54,7 @@ extern HINSTANCE g_hInst;
 #define frame_menu_visible			2

 #define frame_menu_showtitlebar		3

 #define frame_menu_floating			4

-#define frame_menu_skinned          5

+#define frame_menu_skinned			5

 

 static int UpdateTBToolTip(int framepos);

 INT_PTR CLUIFrameSetFloat(WPARAM wParam, LPARAM lParam);

@@ -75,7 +75,7 @@ static int sortfunc(const void *a, const void *b)
 	sd1 = (SortData *)a;

 	sd2 = (SortData *)b;

 	if (sd1->order > sd2->order)

-		return(1);

+		return 1;

 	if (sd1->order < sd2->order)

 		return -1;

 	return 0;

@@ -97,7 +97,7 @@ static HANDLE contMIVisible, contMITitle, contMITBVisible, contMILock, contMICol
 static HANDLE contMIAlignRoot;

 static HANDLE contMIAlignTop, contMIAlignClient, contMIAlignBottom;

 static HANDLE contMIBorder, contMISkinned;

-static HGENMENU MainMIRoot = (HGENMENU) - 1;

+static HGENMENU MainMIRoot = (HGENMENU)-1;

 

 // others

 static int ContactListHeight;

@@ -114,7 +114,7 @@ static int GapBetweenFrames = 1;
 

 static int RemoveItemFromList(int pos, FRAMEWND **lpFrames, int *FrameItemCount)

 {

-	memcpy(&((*lpFrames)[pos]), &((*lpFrames)[pos+1]), sizeof(FRAMEWND)*(*FrameItemCount - pos - 1));

+	memcpy(&((*lpFrames)[pos]), &((*lpFrames)[pos + 1]), sizeof(FRAMEWND) * (*FrameItemCount - pos - 1));

 	(*FrameItemCount)--;

 	return 0;

 }

@@ -126,16 +126,16 @@ static int id2pos(int id)
 	if (FramesSysNotStarted)

 		return -1;

 

-	for (i = 0;i < nFramescount;i++) {

+	for (i = 0; i < nFramescount; i++) {

 		if (Frames[i].id == id)

-			return(i);

+			return i;

 	}

 	return -1;

 }

 

 int __forceinline btoint(BOOLEAN b)

 {

-	return(b ? 1 : 0);

+	return (b ? 1 : 0);

 }

 

 void __forceinline lockfrm()

@@ -149,31 +149,29 @@ void __forceinline ulockfrm()
 	LeaveCriticalSection(&csFrameHook);

 }

 

-static FRAMEWND* FindFrameByWnd(HWND hwnd)

+static FRAMEWND *FindFrameByWnd(HWND hwnd)

 {

-	BOOL        bFound  = FALSE;

+	BOOL bFound = FALSE;

 	int i;

 

 	if (hwnd == NULL)

-		return(NULL);

+		return (NULL);

 

-	for (i = 0;i < nFramescount;i++) {

+	for (i = 0; i < nFramescount; i++) {

 		if ((Frames[i].floating) && (Frames[i].ContainerWnd == hwnd))

-			return(&Frames[i]);

+			return (&Frames[i]);

 	}

 	return(NULL);

 }

 

-

 static void DockThumbs(FRAMEWND *pThumbLeft, FRAMEWND *pThumbRight, BOOL bMoveLeft)

 {

 	if ((pThumbRight->dockOpt.hwndLeft == NULL) && (pThumbLeft->dockOpt.hwndRight == NULL)) {

-		pThumbRight->dockOpt.hwndLeft   = pThumbLeft->ContainerWnd;

-		pThumbLeft->dockOpt.hwndRight   = pThumbRight->ContainerWnd;

+		pThumbRight->dockOpt.hwndLeft = pThumbLeft->ContainerWnd;

+		pThumbLeft->dockOpt.hwndRight = pThumbRight->ContainerWnd;

 	}

 }

 

-

 static void UndockThumbs(FRAMEWND *pThumb1, FRAMEWND *pThumb2)

 {

 	if ((pThumb1 == NULL) || (pThumb2 == NULL))

@@ -196,21 +194,21 @@ BOOLEAN bMoveTogether;
 

 static void PositionThumb(FRAMEWND *pThumb, short nX, short nY)

 {

-	FRAMEWND    *pCurThumb  = &Frames[0];

-	FRAMEWND    *pDockThumb = pThumb;

-	FRAMEWND    fakeMainWindow;

-	FRAMEWND    fakeTaskBarWindow;

-	RECT        rc;

-	RECT        rcThumb;

-	RECT        rcOld;

-	SIZE        sizeScreen;

-	int         nOffs       = 10;

-	POINT       pt;

-	RECT        rcLeft;

-	RECT        rcTop;

-	RECT        rcRight;

-	RECT        rcBottom;

-	int         frmidx = 0;

+	FRAMEWND *pCurThumb = &Frames[0];

+	FRAMEWND *pDockThumb = pThumb;

+	FRAMEWND fakeMainWindow;

+	FRAMEWND fakeTaskBarWindow;

+	RECT rc;

+	RECT rcThumb;

+	RECT rcOld;

+	SIZE sizeScreen;

+	int nOffs = 10;

+	POINT pt;

+	RECT rcLeft;

+	RECT rcTop;

+	RECT rcRight;

+	RECT rcBottom;

+	int frmidx = 0;

 

 	if (pThumb == NULL)

 		return;

@@ -220,7 +218,7 @@ static void PositionThumb(FRAMEWND *pThumb, short nX, short nY)
 

 	// Get thumb dimnsions

 	GetWindowRect(pThumb->ContainerWnd, &rcThumb);

-	int nWidth  = rcThumb.right - rcThumb.left;

+	int nWidth = rcThumb.right - rcThumb.left;

 	int nHeight = rcThumb.bottom - rcThumb.top;

 

 	// Docking to the edges of the screen

@@ -232,7 +230,7 @@ static void PositionThumb(FRAMEWND *pThumb, short nX, short nY)
 	bool bLeading = pThumb->dockOpt.hwndRight != NULL;

 

 	if (bMoveTogether) {

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

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

 		GetWindowRect(pThumb->ContainerWnd, &rcOld);

 	}

 

@@ -253,34 +251,34 @@ static void PositionThumb(FRAMEWND *pThumb, short nX, short nY)
 

 				GetWindowRect(pCurThumb->ContainerWnd, &rc);

 

-				rcLeft.left     = rc.left - nOffs;

-				rcLeft.top      = rc.top - nOffs;

-				rcLeft.right    = rc.left + nOffs;

-				rcLeft.bottom   = rc.bottom + nOffs;

+				rcLeft.left = rc.left - nOffs;

+				rcLeft.top = rc.top - nOffs;

+				rcLeft.right = rc.left + nOffs;

+				rcLeft.bottom = rc.bottom + nOffs;

 

-				rcTop.left      = rc.left - nOffs;

-				rcTop.top       = rc.top - nOffs;

-				rcTop.right     = rc.right + nOffs;

-				rcTop.bottom    = rc.top + nOffs;

+				rcTop.left = rc.left - nOffs;

+				rcTop.top = rc.top - nOffs;

+				rcTop.right = rc.right + nOffs;

+				rcTop.bottom = rc.top + nOffs;

 

-				rcRight.left    = rc.right - nOffs;

-				rcRight.top     = rc.top - nOffs;

-				rcRight.right   = rc.right + nOffs;

-				rcRight.bottom  = rc.bottom + nOffs;

+				rcRight.left = rc.right - nOffs;

+				rcRight.top = rc.top - nOffs;

+				rcRight.right = rc.right + nOffs;

+				rcRight.bottom = rc.bottom + nOffs;

 

-				rcBottom.left   = rc.left - nOffs;

-				rcBottom.top    = rc.bottom - nOffs;

-				rcBottom.right  = rc.right + nOffs;

+				rcBottom.left = rc.left - nOffs;

+				rcBottom.top = rc.bottom - nOffs;

+				rcBottom.right = rc.right + nOffs;

 				rcBottom.bottom = rc.bottom + nOffs;

 

 				bool bDockedLeft = false, bDockedRight = false, bDocked = false;

 

 				// Upper-left

-				pt.x    = rcThumb.left;

-				pt.y    = rcThumb.top;

+				pt.x = rcThumb.left;

+				pt.y = rcThumb.top;

 

 				if (PtInRect(&rcRight, pt)) {

-					nNewX   = rc.right;

+					nNewX = rc.right;

 					bDocked = true;

 				}

 

@@ -291,18 +289,18 @@ static void PositionThumb(FRAMEWND *pThumb, short nX, short nY)
 				}

 

 				if (PtInRect(&rcTop, pt)) {

-					nNewY       = rc.top;

+					nNewY = rc.top;

 					bDockedLeft = bDocked;

 				}

 

 				// Upper-right

-				pt.x    = rcThumb.right;

-				pt.y    = rcThumb.top;

+				pt.x = rcThumb.right;

+				pt.y = rcThumb.top;

 				bDocked = false;

 

-				if ( !bLeading && PtInRect(&rcLeft, pt)) {

-					if ( !bDockedLeft) {

-						nNewX   = rc.left - nWidth;

+				if (!bLeading && PtInRect(&rcLeft, pt)) {

+					if (!bDockedLeft) {

+						nNewX = rc.left - nWidth;

 						bDocked = true;

 					}

 					else if (rc.right == rcThumb.left)

@@ -316,9 +314,9 @@ static void PositionThumb(FRAMEWND *pThumb, short nX, short nY)
 						nNewX = rc.right - nWidth;

 				}

 

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

-					nNewY           = rc.top;

-					bDockedRight    = bDocked;

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

+					nNewY = rc.top;

+					bDockedRight = bDocked;

 				}

 

 				if (bMoveTogether) {

@@ -348,10 +346,10 @@ static void PositionThumb(FRAMEWND *pThumb, short nX, short nY)
 				pt.x = rcThumb.right;

 				pt.y = rcThumb.bottom;

 

-				if ( !bLeading && PtInRect(&rcLeft, pt))

+				if (!bLeading && PtInRect(&rcLeft, pt))

 					nNewX = rc.left - nWidth;

 

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

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

 					nNewY = rc.top - nHeight;

 

 					if (PtInRect(&rcRight, pt))

@@ -432,26 +430,26 @@ int DBLoadFrameSettingsAtPos(int pos, int Frameid)
 

 	_itoa(pos, sadd, 10);

 

-	Frames[Frameid].collapsed = 			  cfg::getByte(CLUIFrameModule, AS(buf, "Collapse", sadd), Frames[Frameid].collapsed);

+	Frames[Frameid].collapsed				= cfg::getByte(CLUIFrameModule, AS(buf, "Collapse", sadd), Frames[Frameid].collapsed);

 

-	Frames[Frameid].Locked                  = cfg::getByte(CLUIFrameModule, AS(buf, "Locked", sadd), Frames[Frameid].Locked);

-	Frames[Frameid].visible                 = cfg::getByte(CLUIFrameModule, AS(buf, "Visible", sadd), Frames[Frameid].visible);

-	Frames[Frameid].TitleBar.ShowTitleBar   = cfg::getByte(CLUIFrameModule, AS(buf, "TBVisile", sadd), Frames[Frameid].TitleBar.ShowTitleBar);

+	Frames[Frameid].Locked					= cfg::getByte(CLUIFrameModule, AS(buf, "Locked", sadd), Frames[Frameid].Locked);

+	Frames[Frameid].visible					= cfg::getByte(CLUIFrameModule, AS(buf, "Visible", sadd), Frames[Frameid].visible);

+	Frames[Frameid].TitleBar.ShowTitleBar	= cfg::getByte(CLUIFrameModule, AS(buf, "TBVisile", sadd), Frames[Frameid].TitleBar.ShowTitleBar);

 

-	Frames[Frameid].height                  = cfg::getWord(CLUIFrameModule, AS(buf, "Height", sadd), Frames[Frameid].height);

-	Frames[Frameid].HeightWhenCollapsed     = cfg::getWord(CLUIFrameModule, AS(buf, "HeightCollapsed", sadd), 0);

-	Frames[Frameid].align                   = cfg::getWord(CLUIFrameModule, AS(buf, "Align", sadd), Frames[Frameid].align);

+	Frames[Frameid].height					= cfg::getWord(CLUIFrameModule, AS(buf, "Height", sadd), Frames[Frameid].height);

+	Frames[Frameid].HeightWhenCollapsed		= cfg::getWord(CLUIFrameModule, AS(buf, "HeightCollapsed", sadd), 0);

+	Frames[Frameid].align					= cfg::getWord(CLUIFrameModule, AS(buf, "Align", sadd), Frames[Frameid].align);

 

-	Frames[Frameid].FloatingPos.x       = DBGetContactSettingRangedWord(0, CLUIFrameModule, AS(buf, "FloatX", sadd), 100, 0, 1024);

-	Frames[Frameid].FloatingPos.y       = DBGetContactSettingRangedWord(0, CLUIFrameModule, AS(buf, "FloatY", sadd), 100, 0, 1024);

-	Frames[Frameid].FloatingSize.x      = DBGetContactSettingRangedWord(0, CLUIFrameModule, AS(buf, "FloatW", sadd), 100, 0, 1024);

-	Frames[Frameid].FloatingSize.y      = DBGetContactSettingRangedWord(0, CLUIFrameModule, AS(buf, "FloatH", sadd), 100, 0, 1024);

+	Frames[Frameid].FloatingPos.x		= DBGetContactSettingRangedWord(0, CLUIFrameModule, AS(buf, "FloatX", sadd), 100, 0, 1024);

+	Frames[Frameid].FloatingPos.y		= DBGetContactSettingRangedWord(0, CLUIFrameModule, AS(buf, "FloatY", sadd), 100, 0, 1024);

+	Frames[Frameid].FloatingSize.x		= DBGetContactSettingRangedWord(0, CLUIFrameModule, AS(buf, "FloatW", sadd), 100, 0, 1024);

+	Frames[Frameid].FloatingSize.y		= DBGetContactSettingRangedWord(0, CLUIFrameModule, AS(buf, "FloatH", sadd), 100, 0, 1024);

 

-	Frames[Frameid].floating            = cfg::getByte(CLUIFrameModule, AS(buf, "Floating", sadd), 0);

-	Frames[Frameid].order               = cfg::getWord(CLUIFrameModule, AS(buf, "Order", sadd), 0);

+	Frames[Frameid].floating			= cfg::getByte(CLUIFrameModule, AS(buf, "Floating", sadd), 0);

+	Frames[Frameid].order				= cfg::getWord(CLUIFrameModule, AS(buf, "Order", sadd), 0);

 

-	Frames[Frameid].UseBorder           = cfg::getByte(CLUIFrameModule, AS(buf, "UseBorder", sadd), Frames[Frameid].UseBorder);

-	Frames[Frameid].Skinned             = cfg::getByte(CLUIFrameModule, AS(buf, "Skinned", sadd), Frames[Frameid].Skinned);

+	Frames[Frameid].UseBorder			= cfg::getByte(CLUIFrameModule, AS(buf, "UseBorder", sadd), Frames[Frameid].UseBorder);

+	Frames[Frameid].Skinned				= cfg::getByte(CLUIFrameModule, AS(buf, "Skinned", sadd), Frames[Frameid].Skinned);

 	return 0;

 }

 

@@ -490,10 +488,10 @@ int LocateStorePosition(int Frameid, int maxstored)
 {

 	if (Frames[Frameid].name == NULL) return -1;

 

-	for (int i = 0;i < maxstored;i++) {

+	for (int i = 0; i < maxstored; i++) {

 		char settingname[255];

 		mir_snprintf(settingname, sizeof(settingname), "Name%d", i);

-		ptrT frmname( db_get_tsa(0, CLUIFrameModule, settingname));

+		ptrT frmname(db_get_tsa(0, CLUIFrameModule, settingname));

 		if (frmname == NULL) continue;

 		if (lstrcmpi(frmname, Frames[Frameid].name) == 0)

 			return i;

@@ -663,7 +661,7 @@ HMENU CLUIFramesCreateMenuForFrame(int frameid, int root, int popuppos, HGENMENU
 	mi.pszPopupName = (char *)root;

 	mi.popupPosition = frameid;

 	mi.position = popuppos++;

-	mi.pszName = LPGEN("&Floating Mode");

+	mi.pszName = LPGEN("&Floating mode");

 	mi.flags = CMIF_CHILDPOPUP;

 	mi.pszService = "Set_Floating";

 	mi.pszContactOwner = 0;

@@ -1201,7 +1199,7 @@ INT_PTR CLUIFramesShowHideFrame(WPARAM wParam, LPARAM lParam)
 

 	lockfrm();

 	pos = id2pos((INT_PTR)wParam);

-	if (pos >= 0 && !lstrcmp(Frames[pos].name, _T("My Contacts")))

+	if (pos >= 0 && !lstrcmp(Frames[pos].name, _T("My contacts")))

 		Frames[pos].visible = 1;

 	else {

 		if (pos >= 0 && (int)pos < nFramescount)

@@ -1582,7 +1580,7 @@ static int CLUIFramesLoadMainMenu()
 	mi.flags = CMIF_ROOTHANDLE;

 	mi.position = separator++;

 	mi.hParentMenu = MainMIRoot;

-	mi.pszName = LPGEN("Show All Frames");

+	mi.pszName = LPGEN("Show all frames");

 	mi.pszService = MS_CLIST_FRAMES_SHOWALLFRAMES;

 	Menu_AddMainMenuItem(&mi);

 

@@ -2598,9 +2596,9 @@ LRESULT CALLBACK CLUIFrameTitleBarProc(HWND hwnd, UINT msg, WPARAM wParam, LPARA
 				AppendMenu(hmenu, MF_SEPARATOR, 16, _T(""));

 

 				if (Frames[framepos].Locked)

-					AppendMenu(hmenu, MF_STRING | MF_CHECKED, frame_menu_lock, TranslateT("Lock Frame"));

+					AppendMenu(hmenu, MF_STRING | MF_CHECKED, frame_menu_lock, TranslateT("Lock frame"));

 				else

-					AppendMenu(hmenu, MF_STRING, frame_menu_lock, TranslateT("Lock Frame"));

+					AppendMenu(hmenu, MF_STRING, frame_menu_lock, TranslateT("Lock frame"));

 

 				if (Frames[framepos].visible)

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

diff --git a/plugins/Clist_nicer/src/CLUIFrames/cluiframes.h b/plugins/Clist_nicer/src/CLUIFrames/cluiframes.h
index 0174e37743..89ce883477 100644
--- a/plugins/Clist_nicer/src/CLUIFrames/cluiframes.h
+++ b/plugins/Clist_nicer/src/CLUIFrames/cluiframes.h
@@ -25,7 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 int LoadCLUIFramesModule(void);

 int UnLoadCLUIFramesModule(void);

 int CLUIFramesGetMinHeight();

-int CLUIFramesOnClistResize(WPARAM wParam,LPARAM lParam);

+int CLUIFramesOnClistResize(WPARAM wParam, LPARAM lParam);

 int SizeFramesByWindowRect(RECT *r);

 int CLUIFramesResizeFrames(RECT *rc);

 

@@ -39,7 +39,7 @@ typedef struct
 {

 	int order;

 	int realpos;

-}SortData;

+} SortData;

 

 

 

@@ -81,8 +81,8 @@ struct FrameTitleBar
 

 struct DockOpt

 {

-	HWND	hwndLeft;

-	HWND	hwndRight;

+	HWND hwndLeft;

+	HWND hwndRight;

 };

 

 struct FRAMEWND

@@ -120,7 +120,7 @@ struct FRAMEWND
 #define OFFSET_PROTOPOS 200

 #define OFFSET_VISIBLE 400

 

-#define CLUIFrameTitleBarClassName				_T("CLUIFrameTitleBar")

-#define CLUIFrameModule							"CLUIFrames"

+#define CLUIFrameTitleBarClassName		_T("CLUIFrameTitleBar")

+#define CLUIFrameModule					"CLUIFrames"

 

 #endif

diff --git a/plugins/Clist_nicer/src/CLUIFrames/framesmenu.cpp b/plugins/Clist_nicer/src/CLUIFrames/framesmenu.cpp
index a8974665cc..8b2f6987b1 100644
--- a/plugins/Clist_nicer/src/CLUIFrames/framesmenu.cpp
+++ b/plugins/Clist_nicer/src/CLUIFrames/framesmenu.cpp
@@ -11,7 +11,7 @@ typedef struct{
 	char *szServiceName;

 	int Frameid;

 	INT_PTR param1;

-}FrameMenuExecParam,*lpFrameMenuExecParam;

+} FrameMenuExecParam, *lpFrameMenuExecParam;

 

 INT_PTR FreeOwnerDataFrameMenu(WPARAM wParam, LPARAM lParam)

 {

@@ -25,10 +25,10 @@ INT_PTR FreeOwnerDataFrameMenu(WPARAM wParam, LPARAM lParam)
 

 static INT_PTR AddContextFrameMenuItem(WPARAM wParam, LPARAM lParam)

 {

-	CLISTMENUITEM *mi = (CLISTMENUITEM*)lParam;

+	CLISTMENUITEM *mi = (CLISTMENUITEM *)lParam;

 

 	TMO_MenuItem tmi;

-	if ( !pcli->pfnConvertMenu(mi, &tmi))

+	if (!pcli->pfnConvertMenu(mi, &tmi))

 		return NULL;

 

 	tmi.root = (mi->flags & CMIF_ROOTHANDLE) ? mi->hParentMenu : NULL;

@@ -47,7 +47,7 @@ static INT_PTR AddContextFrameMenuItem(WPARAM wParam, LPARAM lParam)
 

 static INT_PTR RemoveContextFrameMenuItem(WPARAM wParam, LPARAM lParam)

 {

-	CallService(MO_REMOVEMENUITEM,wParam,0);

+	CallService(MO_REMOVEMENUITEM, wParam, 0);

 	return 0;

 }

 

@@ -61,7 +61,7 @@ INT_PTR FrameMenuExecService(WPARAM wParam, LPARAM lParam)
 		return -1;

 

 	CallService(fmep->szServiceName, lParam, fmep->param1);

-	RedrawWindow(pcli->hwndContactList,NULL,NULL,RDW_INVALIDATE|RDW_ERASE|RDW_FRAME|RDW_UPDATENOW|RDW_ALLCHILDREN);   

+	RedrawWindow(pcli->hwndContactList, NULL, NULL, RDW_INVALIDATE | RDW_ERASE | RDW_FRAME | RDW_UPDATENOW | RDW_ALLCHILDREN);

 	return 0;

 }

 

@@ -86,13 +86,13 @@ INT_PTR FrameMenuCheckService(WPARAM wParam, LPARAM lParam)
 

 static INT_PTR ContextFrameMenuNotify(WPARAM wParam, LPARAM lParam)

 {

-	NotifyEventHooks(hPreBuildFrameMenuEvent,wParam,lParam);

+	NotifyEventHooks(hPreBuildFrameMenuEvent, wParam, lParam);

 	return 0;

 }

 

-static INT_PTR BuildContextFrameMenu(WPARAM wParam,LPARAM lParam)

+static INT_PTR BuildContextFrameMenu(WPARAM wParam, LPARAM lParam)

 {

-	ListParam param = { 0 };

+	ListParam param = {0};

 	param.MenuObjectHandle = hFrameMenuObject;

 	param.wParam = wParam;

 	param.lParam = lParam;

diff --git a/plugins/Clist_nicer/src/CLUIFrames/groupmenu.cpp b/plugins/Clist_nicer/src/CLUIFrames/groupmenu.cpp
index e7d6a0f438..4fd3471746 100644
--- a/plugins/Clist_nicer/src/CLUIFrames/groupmenu.cpp
+++ b/plugins/Clist_nicer/src/CLUIFrames/groupmenu.cpp
@@ -46,7 +46,7 @@ HGENMENU hNewSubGroupMenuItem;
 int NewGroupIconidx;

 

 extern HIMAGELIST hCListImages;

-extern HICON LoadIconFromExternalFile (char *filename,int i,boolean UseLibrary,boolean registerit,char *IconName,char *SectName,char *Description,int internalidx);

+extern HICON LoadIconFromExternalFile(char *filename, int i, boolean UseLibrary, boolean registerit, char *IconName, char *SectName, char *Description, int internalidx);

 

 void InitSubGroupMenus(void);

 

@@ -54,44 +54,43 @@ void InitSubGroupMenus(void);
 typedef struct {

 	char *szServiceName;

 	int Param1,Param2;

-}GroupMenuExecParam,*lpGroupMenuExecParam;

+} GroupMenuExecParam, *lpGroupMenuExecParam;

 

 /*

 wparam=handle to the menu item returned by MS_CLIST_ADDCONTACTMENUITEM

 return 0 on success.

 */

-static INT_PTR RemoveGroupMenuItem(WPARAM wParam,LPARAM lParam)

+static INT_PTR RemoveGroupMenuItem(WPARAM wParam, LPARAM lParam)

 {

-	CallService(MO_REMOVEMENUITEM,wParam,0);

+	CallService(MO_REMOVEMENUITEM, wParam, 0);

 	return 0;

 }

 

-

-static INT_PTR BuildGroupMenu(WPARAM wParam,LPARAM lParam)

+static INT_PTR BuildGroupMenu(WPARAM wParam, LPARAM lParam)

 {

 	int tick;

 	HMENU hMenu;

-	ListParam param = { 0 };

-	param.MenuObjectHandle=hGroupMenuObject;

+	ListParam param = {0};

+	param.MenuObjectHandle = hGroupMenuObject;

 

-	//hMenu=hMainMenu;

-	hMenu=CreatePopupMenu();

-	//hMenu=wParam;

-	tick=GetTickCount();

+	//hMenu = hMainMenu;

+	hMenu = CreatePopupMenu();

+	//hMenu = wParam;

+	tick = GetTickCount();

 

-	NotifyEventHooks(hPreBuildGroupMenuEvent,0,0);

+	NotifyEventHooks(hPreBuildGroupMenuEvent, 0, 0);

 

-	CallService(MO_BUILDMENU,(WPARAM)hMenu,(LPARAM)&param);

+	CallService(MO_BUILDMENU, (WPARAM)hMenu, (LPARAM)&param);

 	//DrawMenuBar((HWND)CallService("CLUI/GetHwnd",0,0));

-	tick=GetTickCount()-tick;

-	return(INT_PTR)hMenu;

+	tick = GetTickCount() - tick;

+	return (INT_PTR)hMenu;

 }

 

-static INT_PTR AddGroupMenuItem(WPARAM wParam,LPARAM lParam)

+static INT_PTR AddGroupMenuItem(WPARAM wParam, LPARAM lParam)

 {

 	TMO_MenuItem tmi;

-	CLISTMENUITEM *mi = (CLISTMENUITEM*)lParam;

-	if ( !pcli->pfnConvertMenu(mi, &tmi))

+	CLISTMENUITEM *mi = (CLISTMENUITEM *)lParam;

+	if (!pcli->pfnConvertMenu(mi, &tmi))

 		return NULL;

 

 	lpGroupMenuExecParam mmep = (lpGroupMenuExecParam)mir_alloc(sizeof(GroupMenuExecParam));

@@ -101,51 +100,51 @@ static INT_PTR AddGroupMenuItem(WPARAM wParam,LPARAM lParam)
 	//we need just one parametr.

 	mmep->szServiceName = mir_strdup(mi->pszService);

 	mmep->Param1 = mi->popupPosition;

-	lpGroupMenuParam gmp=(lpGroupMenuParam)wParam;

+	lpGroupMenuParam gmp = (lpGroupMenuParam)wParam;

 	if (gmp != NULL) {

 		mmep->Param1 = gmp->wParam;

 		mmep->Param2 = gmp->lParam;

 	}

-	tmi.ownerdata=mmep;

+	tmi.ownerdata = mmep;

 

 	char buf[1024];

 	mir_snprintf(buf, SIZEOF(buf), "%s/%s", mi->pszService, mi->pszName);

 

 	OptParam op;

-	op.Handle=(HANDLE)CallService(MO_ADDNEWMENUITEM,(WPARAM)hGroupMenuObject,(LPARAM)&tmi);

-	op.Setting=OPT_MENUITEMSETUNIQNAME;

-	op.Value=(INT_PTR)buf;

-	CallService(MO_SETOPTIONSMENUITEM,0,(LPARAM)&op);

+	op.Handle = (HANDLE)CallService(MO_ADDNEWMENUITEM, (WPARAM)hGroupMenuObject, (LPARAM)&tmi);

+	op.Setting = OPT_MENUITEMSETUNIQNAME;

+	op.Value = (INT_PTR)buf;

+	CallService(MO_SETOPTIONSMENUITEM, 0, (LPARAM)&op);

 	return (INT_PTR)op.Handle;

 }

 

-INT_PTR GroupMenuCheckService(WPARAM wParam,LPARAM lParam)

+INT_PTR GroupMenuCheckService(WPARAM wParam, LPARAM lParam)

 {

 	return 0;

 }

 

-INT_PTR GroupMenuonAddService(WPARAM wParam,LPARAM lParam)

+INT_PTR GroupMenuonAddService(WPARAM wParam, LPARAM lParam)

 {

-	MENUITEMINFO *mii=(MENUITEMINFO* )wParam;

-	if (mii==NULL) return 0;

+	MENUITEMINFO *mii = (MENUITEMINFO *)wParam;

+	if (mii == NULL) return 0;

 

-	if (hHideShowMainMenuItem==(HANDLE)lParam) {

-		mii->fMask|=MIIM_STATE;

-		mii->fState|=MFS_DEFAULT;

+	if (hHideShowMainMenuItem == (HANDLE)lParam) {

+		mii->fMask |= MIIM_STATE;

+		mii->fState |= MFS_DEFAULT;

 

 	}

-	if (hGroupMainMenuItemProxy==(HANDLE)lParam) {

-		mii->fMask|=MIIM_SUBMENU;

-		//mi.fType=MFT_STRING;

-		mii->hSubMenu=(HMENU)CallService(MS_CLIST_MENUGETMAIN,0,0);

+	if (hGroupMainMenuItemProxy == (HANDLE)lParam) {

+		mii->fMask |= MIIM_SUBMENU;

+		//mi.fType = MFT_STRING;

+		mii->hSubMenu = (HMENU)CallService(MS_CLIST_MENUGETMAIN, 0, 0);

 	}

 

-	if (hGroupStatusMenuItemProxy==(HANDLE)lParam) {

-		mii->fMask|=MIIM_SUBMENU;

-		//mi.fType=MFT_STRING;

-		mii->hSubMenu=(HMENU)CallService(MS_CLIST_MENUGETSTATUS,0,0);

+	if (hGroupStatusMenuItemProxy == (HANDLE)lParam) {

+		mii->fMask |= MIIM_SUBMENU;

+		//mi.fType = MFT_STRING;

+		mii->hSubMenu = (HMENU)CallService(MS_CLIST_MENUGETSTATUS, 0, 0);

 	}

-	if (hAppearanceMenuItemProxy==(HANDLE)lParam) {

+	if (hAppearanceMenuItemProxy == (HANDLE)lParam) {

 		hMenuOldContext = GetSubMenu(LoadMenu(g_hInst, MAKEINTRESOURCE(IDR_CONTEXT)), 3);

 		TranslateMenu(hMenuOldContext);

 

@@ -155,30 +154,28 @@ INT_PTR GroupMenuonAddService(WPARAM wParam,LPARAM lParam)
 		CheckMenuItem(hMenuOldContext, POPUP_SHOWSTATUSICONS, MF_BYCOMMAND | (cfg::dat.dwFlags & CLUI_FRAME_STATUSICONS ? MF_CHECKED : MF_UNCHECKED));

 

 		mii->fMask |= MIIM_SUBMENU;

-		mii->hSubMenu=(HMENU)hMenuOldContext;

+		mii->hSubMenu = (HMENU)hMenuOldContext;

 	}

-	return(TRUE);

+	return (TRUE);

 };

 

-

 //called with:

 //wparam - ownerdata

 //lparam - lparam from winproc

-INT_PTR GroupMenuExecService(WPARAM wParam,LPARAM lParam)

+INT_PTR GroupMenuExecService(WPARAM wParam, LPARAM lParam)

 {

-	if (wParam!=0) {

-		lpGroupMenuExecParam mmep=(lpGroupMenuExecParam)wParam;

-		if ( !strcmp(mmep->szServiceName,"Help/AboutCommand")) {

+	if (wParam != 0) {

+		lpGroupMenuExecParam mmep = (lpGroupMenuExecParam)wParam;

+		if (!strcmp(mmep->szServiceName, "Help/AboutCommand")) {

 			//bug in help.c,it used wparam as parent window handle without reason.

-			mmep->Param1=0;

-			CallService(mmep->szServiceName,mmep->Param1,lParam);

-		}

-		else {

-			CallService(mmep->szServiceName,mmep->Param1,mmep->Param2);

+			mmep->Param1 = 0;

+			CallService(mmep->szServiceName, mmep->Param1, lParam);

 		}

+		else

+			CallService(mmep->szServiceName, mmep->Param1, mmep->Param2);

 

-	};

-	return(1);

+	}

+	return 1;

 }

 

 INT_PTR FreeOwnerDataGroupMenu(WPARAM wParam, LPARAM lParam)

@@ -191,45 +188,43 @@ INT_PTR FreeOwnerDataGroupMenu(WPARAM wParam, LPARAM lParam)
 	return 0;

 }

 

-INT_PTR HideGroupsHelper(WPARAM wParam,LPARAM lParam)

+INT_PTR HideGroupsHelper(WPARAM wParam, LPARAM lParam)

 {

-	int newVal=!(GetWindowLongPtr((HWND)CallService(MS_CLUI_GETHWNDTREE,0,0),GWL_STYLE)&CLS_HIDEEMPTYGROUPS);

-	cfg::writeByte("CList","HideEmptyGroups",(BYTE)newVal);

-	SendMessage((HWND)CallService(MS_CLUI_GETHWNDTREE,0,0),CLM_SETHIDEEMPTYGROUPS,newVal,0);

+	int newVal = !(GetWindowLongPtr((HWND)CallService(MS_CLUI_GETHWNDTREE, 0, 0), GWL_STYLE) & CLS_HIDEEMPTYGROUPS);

+	cfg::writeByte("CList", "HideEmptyGroups", (BYTE)newVal);

+	SendMessage((HWND)CallService(MS_CLUI_GETHWNDTREE, 0, 0), CLM_SETHIDEEMPTYGROUPS, newVal, 0);

 	return 0;

 }

 

-INT_PTR UseGroupsHelper(WPARAM wParam,LPARAM lParam)

+INT_PTR UseGroupsHelper(WPARAM wParam, LPARAM lParam)

 {

-	int newVal=!(GetWindowLongPtr((HWND)CallService(MS_CLUI_GETHWNDTREE,0,0),GWL_STYLE)&CLS_USEGROUPS);

-	cfg::writeByte("CList","UseGroups",(BYTE)newVal);

-	SendMessage((HWND)CallService(MS_CLUI_GETHWNDTREE,0,0),CLM_SETUSEGROUPS,newVal,0);

+	int newVal = !(GetWindowLongPtr((HWND)CallService(MS_CLUI_GETHWNDTREE, 0, 0), GWL_STYLE) & CLS_USEGROUPS);

+	cfg::writeByte("CList", "UseGroups", (BYTE)newVal);

+	SendMessage((HWND)CallService(MS_CLUI_GETHWNDTREE, 0, 0), CLM_SETUSEGROUPS, newVal,0);

 	return 0;

 }

 

-INT_PTR HideOfflineRootHelper(WPARAM wParam,LPARAM lParam)

+INT_PTR HideOfflineRootHelper(WPARAM wParam, LPARAM lParam)

 {

-	SendMessage(

-		(HWND)CallService(MS_CLUI_GETHWNDTREE,0,0),

-		CLM_SETHIDEOFFLINEROOT,

-		!SendMessage((HWND)CallService(MS_CLUI_GETHWNDTREE,0,0),CLM_GETHIDEOFFLINEROOT,0,0),

+	SendMessage((HWND)CallService(MS_CLUI_GETHWNDTREE, 0, 0), CLM_SETHIDEOFFLINEROOT,

+		!SendMessage((HWND)CallService(MS_CLUI_GETHWNDTREE, 0, 0), CLM_GETHIDEOFFLINEROOT, 0, 0),

 		0);

 	return 0;

 }

 

-static int OnBuildGroupMenu(WPARAM wParam,LPARAM lParam)

+static int OnBuildGroupMenu(WPARAM wParam, LPARAM lParam)

 {

 	CLISTMENUITEM mi = { sizeof(mi) };

-	mi.flags = CMIM_FLAGS | (cfg::getByte("CList","HideOffline",SETTING_HIDEOFFLINE_DEFAULT)?CMIF_CHECKED:0);

+	mi.flags = CMIM_FLAGS | (cfg::getByte("CList", "HideOffline", SETTING_HIDEOFFLINE_DEFAULT) ? CMIF_CHECKED : 0);

 	Menu_ModifyItem(hHideOfflineUsersMenuItem, &mi);

 

-	mi.flags = CMIM_FLAGS | (SendMessage(pcli->hwndContactTree,CLM_GETHIDEOFFLINEROOT,0,0)?CMIF_CHECKED:0);

+	mi.flags = CMIM_FLAGS | (SendMessage(pcli->hwndContactTree, CLM_GETHIDEOFFLINEROOT, 0, 0) ? CMIF_CHECKED : 0);

 	Menu_ModifyItem(hHideOfflineUsersOutHereMenuItem, &mi);

 

-	mi.flags = CMIM_FLAGS | (GetWindowLongPtr(pcli->hwndContactTree,GWL_STYLE)&CLS_HIDEEMPTYGROUPS?CMIF_CHECKED:0);

+	mi.flags = CMIM_FLAGS | (GetWindowLongPtr(pcli->hwndContactTree, GWL_STYLE) & CLS_HIDEEMPTYGROUPS ? CMIF_CHECKED : 0);

 	Menu_ModifyItem(hHideEmptyGroupsMenuItem, &mi);

 

-	mi.flags = CMIM_FLAGS | (GetWindowLongPtr(pcli->hwndContactTree,GWL_STYLE)&CLS_USEGROUPS?0:CMIF_CHECKED);

+	mi.flags = CMIM_FLAGS | (GetWindowLongPtr(pcli->hwndContactTree, GWL_STYLE) & CLS_USEGROUPS ? 0 : CMIF_CHECKED);

 	Menu_ModifyItem(hDisableGroupsMenuItem, &mi);

 

 	mi.flags = CMIM_FLAGS;

@@ -240,7 +235,7 @@ static int OnBuildGroupMenu(WPARAM wParam,LPARAM lParam)
 	return 0;

 }

 

-int static OnIconLibIconChanged(WPARAM wParam,LPARAM lParam)

+int static OnIconLibIconChanged(WPARAM wParam, LPARAM lParam)

 {

 	CLISTMENUITEM clmi = { sizeof(clmi) };

 	clmi.flags = CMIM_ICON;

@@ -252,18 +247,18 @@ int static OnIconLibIconChanged(WPARAM wParam,LPARAM lParam)
 

 void InitGroupMenus(void)

 {

-	CreateServiceFunction("CLISTMENUSGroup/ExecService",GroupMenuExecService);

-	CreateServiceFunction("CLISTMENUSGroup/FreeOwnerDataGroupMenu",FreeOwnerDataGroupMenu);

-	CreateServiceFunction("CLISTMENUSGroup/GroupMenuonAddService",GroupMenuonAddService);

-	CreateServiceFunction("CLISTMENUSGroup/HideGroupsHelper",HideGroupsHelper);

-	CreateServiceFunction("CLISTMENUSGroup/UseGroupsHelper",UseGroupsHelper);

-	CreateServiceFunction("CLISTMENUSGroup/HideOfflineRootHelper",HideOfflineRootHelper);

-

-	CreateServiceFunction("CList/AddGroupMenuItem",AddGroupMenuItem);

-	CreateServiceFunction(MS_CLIST_REMOVEGROUPMENUITEM,RemoveGroupMenuItem);

-	CreateServiceFunction(MS_CLIST_MENUBUILDGROUP,BuildGroupMenu);

+	CreateServiceFunction("CLISTMENUSGroup/ExecService", GroupMenuExecService);

+	CreateServiceFunction("CLISTMENUSGroup/FreeOwnerDataGroupMenu", FreeOwnerDataGroupMenu);

+	CreateServiceFunction("CLISTMENUSGroup/GroupMenuonAddService", GroupMenuonAddService);

+	CreateServiceFunction("CLISTMENUSGroup/HideGroupsHelper", HideGroupsHelper);

+	CreateServiceFunction("CLISTMENUSGroup/UseGroupsHelper", UseGroupsHelper);

+	CreateServiceFunction("CLISTMENUSGroup/HideOfflineRootHelper", HideOfflineRootHelper);

+

+	CreateServiceFunction("CList/AddGroupMenuItem", AddGroupMenuItem);

+	CreateServiceFunction(MS_CLIST_REMOVEGROUPMENUITEM, RemoveGroupMenuItem);

+	CreateServiceFunction(MS_CLIST_MENUBUILDGROUP, BuildGroupMenu);

 	hPreBuildGroupMenuEvent = CreateHookableEvent(ME_CLIST_PREBUILDGROUPMENU);

-	HookEvent(ME_CLIST_PREBUILDGROUPMENU,OnBuildGroupMenu);

+	HookEvent(ME_CLIST_PREBUILDGROUPMENU, OnBuildGroupMenu);

 

 	InitSubGroupMenus();

 

@@ -277,106 +272,108 @@ void InitGroupMenus(void)
 		GroupMenuParam gmp;

 

 		CLISTMENUITEM mi = { sizeof(mi) };

-		mi.position=1900000;

-		mi.pszService="CloseAction";

-		mi.pszName=LPGEN("E&xit");

-		AddGroupMenuItem(0,(LPARAM)&mi);

-

-		memset(&mi,0,sizeof(mi));

-		mi.cbSize=sizeof(mi);

-		mi.position=500;

-		mi.pszService=MS_CLIST_SHOWHIDE;

-		mi.pszName=LPGEN("&Hide/Show");

-		hHideShowMainMenuItem = (HGENMENU)AddGroupMenuItem(0,(LPARAM)&mi);

-

-		memset(&mi,0,sizeof(mi));

-		mi.cbSize=sizeof(mi);

-		mi.position=200000;

-		mi.icolibItem=LoadSkinnedIconHandle(SKINICON_OTHER_FINDUSER); //LoadIcon(GetModuleHandle(NULL), MAKEINTRESOURCE(IDI_FINDUSER));

-		mi.pszService="FindAdd/FindAddCommand";

-		mi.pszName=LPGEN("&Find/Add Contacts...");

-		AddGroupMenuItem(0,(LPARAM)&mi);

-

-		memset(&mi,0,sizeof(mi));

-		mi.cbSize=sizeof(mi);

-		mi.position=300000;

-		mi.pszService="";

-		mi.pszName=LPGEN("&Main menu");

-		hGroupMainMenuItemProxy = (HGENMENU)AddGroupMenuItem(0,(LPARAM)&mi);

-

-		memset(&mi,0,sizeof(mi));

-		mi.cbSize=sizeof(mi);

-		mi.position=300100;

-		mi.pszService="";

-		mi.pszName=LPGEN("&Status");

-		hGroupStatusMenuItemProxy = (HGENMENU)AddGroupMenuItem(0,(LPARAM)&mi);

-

-		memset(&mi,0,sizeof(mi));

-		mi.cbSize=sizeof(mi);

-		mi.position=390100;

-		mi.pszService="";

-		mi.pszName=LPGEN("Appearance");

-		hAppearanceMenuItemProxy = (HGENMENU)AddGroupMenuItem(0,(LPARAM)&mi);

-

-		memset(&mi,0,sizeof(mi));

-		mi.cbSize=sizeof(mi);

-		mi.position=400000;

-		mi.icolibItem=LoadSkinnedIconHandle(SKINICON_OTHER_OPTIONS); //LoadIcon(GetModuleHandle(NULL),MAKEINTRESOURCE(IDI_OPTIONS));

-		mi.pszService="Options/OptionsCommand";

-		mi.pszName=LPGEN("&Options...");

-

-		AddGroupMenuItem(0,(LPARAM)&mi);

-

-		memset(&mi,0,sizeof(mi));

-		mi.cbSize=sizeof(mi);

-		mi.position=500000;

-		mi.icolibItem=LoadSkinnedIconHandle(SKINICON_OTHER_MIRANDA); //LoadIcon(GetModuleHandle(NULL),MAKEINTRESOURCE(IDI_MIRANDA));

-		mi.pszService="CLN/About";

-		mi.pszName=LPGEN("&About the contact list...");

-

-		AddGroupMenuItem(0,(LPARAM)&mi);

-

-		memset(&mi,0,sizeof(mi));

-		mi.cbSize=sizeof(mi);

-		mi.position=100000;

-		mi.hIcon=ImageList_GetIcon(hCListImages,NewGroupIconidx,0);

-		mi.pszService="CLISTMENUSSubGroup/GroupMenuExecProxy";

-		mi.pszName=LPGEN("&New Group");

-		gmp.lParam=0;gmp.wParam=POPUP_NEWGROUP;

-		hNewGroupMenuItem = (HGENMENU)AddGroupMenuItem((WPARAM)&gmp,(LPARAM)&mi);

-

-		memset(&mi,0,sizeof(mi));

-		mi.cbSize=sizeof(mi);

-		mi.position=100001;

-		mi.hIcon=NULL;

-		mi.pszService=MS_CLIST_SETHIDEOFFLINE;

-		mi.pszName=LPGEN("&Hide Offline Users");

-		gmp.lParam=0;gmp.wParam=-1;

-		hHideOfflineUsersMenuItem = (HGENMENU)AddGroupMenuItem((WPARAM)&gmp,(LPARAM)&mi);

-

-		memset(&mi,0,sizeof(mi));

-		mi.cbSize=sizeof(mi);

-		mi.position=100002;

-		mi.hIcon=NULL;

-		mi.pszService="CLISTMENUSGroup/HideOfflineRootHelper";

-		mi.pszName=LPGEN("Hide &Offline Users out here");

-		hHideOfflineUsersOutHereMenuItem = (HGENMENU)AddGroupMenuItem(0,(LPARAM)&mi);

-

-		memset(&mi,0,sizeof(mi));

-		mi.cbSize=sizeof(mi);

-		mi.position=100003;

-		mi.hIcon=NULL;

-		mi.pszService="CLISTMENUSGroup/HideGroupsHelper";

-		mi.pszName=LPGEN("Hide &Empty Groups");

-		hHideEmptyGroupsMenuItem = (HGENMENU)AddGroupMenuItem(0,(LPARAM)&mi);

-

-		memset(&mi,0,sizeof(mi));

-		mi.cbSize=sizeof(mi);

-		mi.position=100004;

-		mi.hIcon=NULL;

-		mi.pszService="CLISTMENUSGroup/UseGroupsHelper";

-		mi.pszName=LPGEN("Disable &Groups");

-		hDisableGroupsMenuItem = (HGENMENU)AddGroupMenuItem(0,(LPARAM)&mi);

+		mi.position = 1900000;

+		mi.pszService = "CloseAction";

+		mi.pszName = LPGEN("E&xit");

+		AddGroupMenuItem(0, (LPARAM)&mi);

+

+		memset(&mi, 0, sizeof(mi));

+		mi.cbSize = sizeof(mi);

+		mi.position = 500;

+		mi.pszService = MS_CLIST_SHOWHIDE;

+		mi.pszName = LPGEN("&Hide/Show");

+		hHideShowMainMenuItem = (HGENMENU)AddGroupMenuItem(0, (LPARAM)&mi);

+

+		memset(&mi, 0, sizeof(mi));

+		mi.cbSize = sizeof(mi);

+		mi.position = 200000;

+		mi.icolibItem = LoadSkinnedIconHandle(SKINICON_OTHER_FINDUSER); //LoadIcon(GetModuleHandle(NULL), MAKEINTRESOURCE(IDI_FINDUSER));

+		mi.pszService = "FindAdd/FindAddCommand";

+		mi.pszName = LPGEN("&Find/Add contacts...");

+		AddGroupMenuItem(0, (LPARAM)&mi);

+

+		memset(&mi, 0, sizeof(mi));

+		mi.cbSize = sizeof(mi);

+		mi.position = 300000;

+		mi.pszService = "";

+		mi.pszName = LPGEN("&Main menu");

+		hGroupMainMenuItemProxy = (HGENMENU)AddGroupMenuItem(0, (LPARAM)&mi);

+

+		memset(&mi, 0, sizeof(mi));

+		mi.cbSize = sizeof(mi);

+		mi.position = 300100;

+		mi.pszService = "";

+		mi.pszName = LPGEN("&Status");

+		hGroupStatusMenuItemProxy = (HGENMENU)AddGroupMenuItem(0, (LPARAM)&mi);

+

+		memset(&mi, 0, sizeof(mi));

+		mi.cbSize = sizeof(mi);

+		mi.position = 390100;

+		mi.pszService = "";

+		mi.pszName = LPGEN("Appearance");

+		hAppearanceMenuItemProxy = (HGENMENU)AddGroupMenuItem(0, (LPARAM)&mi);

+

+		memset(&mi, 0, sizeof(mi));

+		mi.cbSize = sizeof(mi);

+		mi.position = 400000;

+		mi.icolibItem = LoadSkinnedIconHandle(SKINICON_OTHER_OPTIONS); //LoadIcon(GetModuleHandle(NULL),MAKEINTRESOURCE(IDI_OPTIONS));

+		mi.pszService = "Options/OptionsCommand";

+		mi.pszName = LPGEN("&Options...");

+

+		AddGroupMenuItem(0, (LPARAM)&mi);

+

+		memset(&mi, 0, sizeof(mi));

+		mi.cbSize = sizeof(mi);

+		mi.position = 500000;

+		mi.icolibItem = LoadSkinnedIconHandle(SKINICON_OTHER_MIRANDA); //LoadIcon(GetModuleHandle(NULL),MAKEINTRESOURCE(IDI_MIRANDA));

+		mi.pszService = "CLN/About";

+		mi.pszName = LPGEN("&About the contact list...");

+

+		AddGroupMenuItem(0, (LPARAM)&mi);

+

+		memset(&mi, 0, sizeof(mi));

+		mi.cbSize = sizeof(mi);

+		mi.position = 100000;

+		mi.hIcon = ImageList_GetIcon(hCListImages, NewGroupIconidx, 0);

+		mi.pszService = "CLISTMENUSSubGroup/GroupMenuExecProxy";

+		mi.pszName = LPGEN("&New group");

+		gmp.lParam = 0;

+		gmp.wParam = POPUP_NEWGROUP;

+		hNewGroupMenuItem = (HGENMENU)AddGroupMenuItem((WPARAM)&gmp, (LPARAM)&mi);

+

+		memset(&mi, 0, sizeof(mi));

+		mi.cbSize = sizeof(mi);

+		mi.position = 100001;

+		mi.hIcon = NULL;

+		mi.pszService = MS_CLIST_SETHIDEOFFLINE;

+		mi.pszName = LPGEN("&Hide offline users");

+		gmp.lParam = 0;

+		gmp.wParam = -1;

+		hHideOfflineUsersMenuItem = (HGENMENU)AddGroupMenuItem((WPARAM)&gmp, (LPARAM)&mi);

+

+		memset(&mi, 0, sizeof(mi));

+		mi.cbSize = sizeof(mi);

+		mi.position = 100002;

+		mi.hIcon = NULL;

+		mi.pszService = "CLISTMENUSGroup/HideOfflineRootHelper";

+		mi.pszName = LPGEN("Hide &offline users out here");

+		hHideOfflineUsersOutHereMenuItem = (HGENMENU)AddGroupMenuItem(0, (LPARAM)&mi);

+

+		memset(&mi, 0, sizeof(mi));

+		mi.cbSize = sizeof(mi);

+		mi.position = 100003;

+		mi.hIcon = NULL;

+		mi.pszService = "CLISTMENUSGroup/HideGroupsHelper";

+		mi.pszName = LPGEN("Hide &empty groups");

+		hHideEmptyGroupsMenuItem = (HGENMENU)AddGroupMenuItem(0, (LPARAM)&mi);

+

+		memset(&mi, 0, sizeof(mi));

+		mi.cbSize = sizeof(mi);

+		mi.position = 100004;

+		mi.hIcon = NULL;

+		mi.pszService = "CLISTMENUSGroup/UseGroupsHelper";

+		mi.pszName = LPGEN("Disable &groups");

+		hDisableGroupsMenuItem = (HGENMENU)AddGroupMenuItem(0, (LPARAM)&mi);

 	}

 }

 

@@ -391,52 +388,52 @@ HGENMENU hHideOfflineUsersHereMenuItem;
 //SubGroupmenu exec param(ownerdata)

 typedef struct {

 	char *szServiceName;

-	int Param1,Param2;

-}SubGroupMenuExecParam,*lpSubGroupMenuExecParam;

+	int Param1, Param2;

+} SubGroupMenuExecParam, *lpSubGroupMenuExecParam;

 

 /*

 wparam=handle to the menu item returned by MS_CLIST_ADDCONTACTMENUITEM

 return 0 on success.

 */

-static INT_PTR RemoveSubGroupMenuItem(WPARAM wParam,LPARAM lParam)

+static INT_PTR RemoveSubGroupMenuItem(WPARAM wParam, LPARAM lParam)

 {

-	CallService(MO_REMOVEMENUITEM,wParam,0);

+	CallService(MO_REMOVEMENUITEM, wParam, 0);

 	return 0;

 }

 

-static int OnBuildSubGroupMenu(WPARAM wParam,LPARAM lParam)

+static int OnBuildSubGroupMenu(WPARAM wParam, LPARAM lParam)

 {

-	ClcGroup *group=(ClcGroup *)wParam;

+	ClcGroup *group = (ClcGroup *)wParam;

 	if (group == 0)

 		return 0;

 

 	//contact->group

 	CLISTMENUITEM mi = { sizeof(mi) };

-	mi.flags = CMIM_FLAGS | (group->hideOffline?CMIF_CHECKED:0);

+	mi.flags = CMIM_FLAGS | (group->hideOffline ? CMIF_CHECKED : 0);

 	Menu_ModifyItem(hHideOfflineUsersHereMenuItem, &mi);

 	return 0;

 }

 

-static INT_PTR BuildSubGroupMenu(WPARAM wParam,LPARAM lParam)

+static INT_PTR BuildSubGroupMenu(WPARAM wParam, LPARAM lParam)

 {

-	ListParam param = { 0 };

+	ListParam param = {0};

 	param.MenuObjectHandle = hSubGroupMenuObject;

 	param.wParam = wParam;

 

 	HMENU hMenu = CreatePopupMenu();

 	int tick = GetTickCount();

-	NotifyEventHooks(hPreBuildSubGroupMenuEvent,wParam,0);

+	NotifyEventHooks(hPreBuildSubGroupMenuEvent, wParam, 0);

 

-	CallService(MO_BUILDMENU,(WPARAM)hMenu,(LPARAM)&param);

-	tick = GetTickCount()-tick;

-	return(INT_PTR)hMenu;

+	CallService(MO_BUILDMENU, (WPARAM)hMenu, (LPARAM)&param);

+	tick = GetTickCount() - tick;

+	return (INT_PTR)hMenu;

 }

 

-static INT_PTR AddSubGroupMenuItem(WPARAM wParam,LPARAM lParam)

+static INT_PTR AddSubGroupMenuItem(WPARAM wParam, LPARAM lParam)

 {

 	TMO_MenuItem tmi;

-	CLISTMENUITEM *mi = (CLISTMENUITEM*)lParam;

-	if ( !pcli->pfnConvertMenu(mi, &tmi))

+	CLISTMENUITEM *mi = (CLISTMENUITEM *)lParam;

+	if (!pcli->pfnConvertMenu(mi, &tmi))

 		return NULL;

 

 	lpSubGroupMenuExecParam mmep = (lpSubGroupMenuExecParam)mir_alloc(sizeof(SubGroupMenuExecParam));

@@ -444,7 +441,7 @@ static INT_PTR AddSubGroupMenuItem(WPARAM wParam,LPARAM lParam)
 		return 0;

 

 	//we need just one parametr.

-	lpGroupMenuParam gmp=(lpGroupMenuParam)wParam;

+	lpGroupMenuParam gmp = (lpGroupMenuParam)wParam;

 	mmep->szServiceName = mir_strdup(mi->pszService);

 	mmep->Param1 = mi->popupPosition;

 	if (gmp != NULL) {

@@ -457,68 +454,62 @@ static INT_PTR AddSubGroupMenuItem(WPARAM wParam,LPARAM lParam)
 	mir_snprintf(buf, SIZEOF(buf), "%s/%s", mi->pszService, mi->pszName);

 

 	OptParam op;

-	op.Handle=(HANDLE)CallService(MO_ADDNEWMENUITEM,(WPARAM)hSubGroupMenuObject,(LPARAM)&tmi);

-	op.Setting=OPT_MENUITEMSETUNIQNAME;

-	op.Value=(INT_PTR)buf;

-	CallService(MO_SETOPTIONSMENUITEM,0,(LPARAM)&op);

+	op.Handle = (HANDLE)CallService(MO_ADDNEWMENUITEM, (WPARAM)hSubGroupMenuObject, (LPARAM)&tmi);

+	op.Setting = OPT_MENUITEMSETUNIQNAME;

+	op.Value = (INT_PTR)buf;

+	CallService(MO_SETOPTIONSMENUITEM, 0, (LPARAM)&op);

 	return (INT_PTR)op.Handle;

 }

 

-INT_PTR SubGroupMenuCheckService(WPARAM wParam,LPARAM lParam) {

+INT_PTR SubGroupMenuCheckService(WPARAM wParam, LPARAM lParam) {

 	//not used

 	return 0;

 };

 

-INT_PTR SubGroupMenuonAddService(WPARAM wParam,LPARAM lParam) {

+INT_PTR SubGroupMenuonAddService(WPARAM wParam, LPARAM lParam) {

 

-	MENUITEMINFO *mii=(MENUITEMINFO* )wParam;

+	MENUITEMINFO *mii = (MENUITEMINFO *)wParam;

 

-	if (mii==NULL) return 0;

+	if (mii == NULL) return 0;

 

 	/*

-	if (hHideShowMainMenuItem==(HANDLE)lParam)

-	{

-	mii->fMask|=MIIM_STATE;

-	mii->fState|=MFS_DEFAULT;

-

+	if (hHideShowMainMenuItem == (HANDLE)lParam) {

+		mii->fMask |= MIIM_STATE;

+		mii->fState |= MFS_DEFAULT;

 	}

-	if (hSubGroupMainMenuItemProxy==(HANDLE)lParam)

-	{

-	mii->fMask|=MIIM_SUBMENU;

-	//mi.fType=MFT_STRING;

-	mii->hSubMenu=(HMENU)CallService(MS_CLIST_MENUGETMAIN,0,0);

+	if (hSubGroupMainMenuItemProxy == (HANDLE)lParam) {

+		mii->fMask |= MIIM_SUBMENU;

+		//mi.fType = MFT_STRING;

+		mii->hSubMenu = (HMENU)CallService(MS_CLIST_MENUGETMAIN, 0, 0);

 	}

 

-	if (hSubGroupStatusMenuItemProxy==(HANDLE)lParam)

-	{

-	mii->fMask|=MIIM_SUBMENU;

-	//mi.fType=MFT_STRING;

-	mii->hSubMenu=(HMENU)CallService(MS_CLIST_MENUGETSTATUS,0,0);

+	if (hSubGroupStatusMenuItemProxy == (HANDLE)lParam) {

+		mii->fMask |= MIIM_SUBMENU;

+		//mi.fType = MFT_STRING;

+		mii->hSubMenu = (HMENU)CallService(MS_CLIST_MENUGETSTATUS, 0, 0);

 	}

 	*/

-	return(TRUE);

+	return TRUE;

 };

 

-

 //called with:

 //wparam - ownerdata

 //lparam - lparam from winproc

-INT_PTR SubGroupMenuExecService(WPARAM wParam,LPARAM lParam) {

+INT_PTR SubGroupMenuExecService(WPARAM wParam, LPARAM lParam) {

 	if (wParam!=0) {

-		lpSubGroupMenuExecParam mmep=(lpSubGroupMenuExecParam)wParam;

-		if ( !strcmp(mmep->szServiceName,"Help/AboutCommand")) {

+		lpSubGroupMenuExecParam mmep = (lpSubGroupMenuExecParam)wParam;

+		if (!strcmp(mmep->szServiceName, "Help/AboutCommand")) {

 			//bug in help.c,it used wparam as parent window handle without reason.

-			mmep->Param1=0;

-			CallService(mmep->szServiceName,mmep->Param1,lParam);

-		}

-		else {

-			CallService(mmep->szServiceName,mmep->Param1,mmep->Param2);

+			mmep->Param1 = 0;

+			CallService(mmep->szServiceName, mmep->Param1, lParam);

 		}

+		else

+			CallService(mmep->szServiceName, mmep->Param1, mmep->Param2);

 	}

-	return(1);

+	return 1;

 }

 

-INT_PTR FreeOwnerDataSubGroupMenu (WPARAM wParam,LPARAM lParam)

+INT_PTR FreeOwnerDataSubGroupMenu (WPARAM wParam, LPARAM lParam)

 {

 	lpSubGroupMenuExecParam mmep = (lpSubGroupMenuExecParam)lParam;

 	if (mmep != NULL) {

@@ -529,28 +520,28 @@ INT_PTR FreeOwnerDataSubGroupMenu (WPARAM wParam,LPARAM lParam)
 }

 

 //wparam menu handle to pass to clc.c

-INT_PTR GroupMenuExecProxy(WPARAM wParam,LPARAM lParam)

+INT_PTR GroupMenuExecProxy(WPARAM wParam, LPARAM lParam)

 {

-	SendMessage((HWND)CallService(MS_CLUI_GETHWNDTREE,0,0),WM_COMMAND,wParam,0);

+	SendMessage((HWND)CallService(MS_CLUI_GETHWNDTREE, 0, 0), WM_COMMAND, wParam, 0);

 	return 0;

 }

 

 void InitSubGroupMenus(void)

 {

-	CreateServiceFunction("CLISTMENUSSubGroup/ExecService",SubGroupMenuExecService);

-	CreateServiceFunction("CLISTMENUSSubGroup/FreeOwnerDataSubGroupMenu",FreeOwnerDataSubGroupMenu);

-	CreateServiceFunction("CLISTMENUSSubGroup/SubGroupMenuonAddService",SubGroupMenuonAddService);

-	CreateServiceFunction("CLISTMENUSSubGroup/GroupMenuExecProxy",GroupMenuExecProxy);

+	CreateServiceFunction("CLISTMENUSSubGroup/ExecService", SubGroupMenuExecService);

+	CreateServiceFunction("CLISTMENUSSubGroup/FreeOwnerDataSubGroupMenu", FreeOwnerDataSubGroupMenu);

+	CreateServiceFunction("CLISTMENUSSubGroup/SubGroupMenuonAddService", SubGroupMenuonAddService);

+	CreateServiceFunction("CLISTMENUSSubGroup/GroupMenuExecProxy", GroupMenuExecProxy);

 

-	//CreateServiceFunction("CLISTMENUSSubGroup/HideSubGroupsHelper",HideSubGroupsHelper);

-	//CreateServiceFunction("CLISTMENUSSubGroup/UseSubGroupsHelper",UseSubGroupsHelper);

-	//CreateServiceFunction("CLISTMENUSSubGroup/HideOfflineRootHelper",HideOfflineRootHelper);

+	//CreateServiceFunction("CLISTMENUSSubGroup/HideSubGroupsHelper", HideSubGroupsHelper);

+	//CreateServiceFunction("CLISTMENUSSubGroup/UseSubGroupsHelper", UseSubGroupsHelper);

+	//CreateServiceFunction("CLISTMENUSSubGroup/HideOfflineRootHelper", HideOfflineRootHelper);

 

-	CreateServiceFunction("CList/AddSubGroupMenuItem",AddSubGroupMenuItem);

-	CreateServiceFunction(MS_CLIST_REMOVESUBGROUPMENUITEM,RemoveSubGroupMenuItem);

-	CreateServiceFunction(MS_CLIST_MENUBUILDSUBGROUP,BuildSubGroupMenu);

-	hPreBuildSubGroupMenuEvent=CreateHookableEvent(ME_CLIST_PREBUILDSUBGROUPMENU);

-	HookEvent(ME_CLIST_PREBUILDSUBGROUPMENU,OnBuildSubGroupMenu);

+	CreateServiceFunction("CList/AddSubGroupMenuItem", AddSubGroupMenuItem);

+	CreateServiceFunction(MS_CLIST_REMOVESUBGROUPMENUITEM, RemoveSubGroupMenuItem);

+	CreateServiceFunction(MS_CLIST_MENUBUILDSUBGROUP, BuildSubGroupMenu);

+	hPreBuildSubGroupMenuEvent = CreateHookableEvent(ME_CLIST_PREBUILDSUBGROUPMENU);

+	HookEvent(ME_CLIST_PREBUILDSUBGROUPMENU, OnBuildSubGroupMenu);

 

 	// SubGroup menu

 	hSubGroupMenuObject = MO_CreateMenuObject("SubGroupMenu", LPGEN("Subgroup menu"), 0, "CLISTMENUSSubGroup/ExecService");

@@ -563,39 +554,43 @@ void InitSubGroupMenus(void)
 		GroupMenuParam gmp;

 

 		CLISTMENUITEM mi = { sizeof(mi) };

-		mi.position=1000;

-		mi.hIcon=ImageList_GetIcon(hCListImages,NewGroupIconidx,0);

-		mi.pszService="CLISTMENUSSubGroup/GroupMenuExecProxy";

-		mi.pszName=LPGEN("&New SubGroup");

-		gmp.lParam=0;gmp.wParam=POPUP_NEWSUBGROUP;

-		hNewSubGroupMenuItem=(HGENMENU)AddSubGroupMenuItem((WPARAM)&gmp,(LPARAM)&mi);

-

-		memset(&mi,0,sizeof(mi));

-		mi.cbSize=sizeof(mi);

-		mi.position=1001;

-		mi.hIcon=NULL;

-		mi.pszService="CLISTMENUSSubGroup/GroupMenuExecProxy";

-		mi.pszName=LPGEN("&Hide Offline Users in here");

-		gmp.lParam=0;gmp.wParam=POPUP_GROUPHIDEOFFLINE;

-		hHideOfflineUsersHereMenuItem = (HGENMENU)AddSubGroupMenuItem((WPARAM)&gmp,(LPARAM)&mi);

-

-		memset(&mi,0,sizeof(mi));

-		mi.cbSize=sizeof(mi);

-		mi.position=900001;

-		mi.icolibItem=LoadSkinnedIconHandle(SKINICON_OTHER_RENAME); //LoadIcon(GetModuleHandle(NULL),MAKEINTRESOURCE(IDI_RENAME));

-		mi.pszService="CLISTMENUSSubGroup/GroupMenuExecProxy";

-		mi.pszName=LPGEN("&Rename Group");

-		gmp.lParam=0;gmp.wParam=POPUP_RENAMEGROUP;

-		AddSubGroupMenuItem((WPARAM)&gmp,(LPARAM)&mi);

-

-		memset(&mi,0,sizeof(mi));

-		mi.cbSize=sizeof(mi);

-		mi.position=900002;

-		mi.icolibItem=LoadSkinnedIconHandle(SKINICON_OTHER_DELETE); //LoadIcon(GetModuleHandle(NULL),MAKEINTRESOURCE(IDI_DELETE));

-		mi.pszService="CLISTMENUSSubGroup/GroupMenuExecProxy";

-		mi.pszName=LPGEN("&Delete Group");

-		gmp.lParam=0;gmp.wParam=POPUP_DELETEGROUP;

-		AddSubGroupMenuItem((WPARAM)&gmp,(LPARAM)&mi);

+		mi.position = 1000;

+		mi.hIcon = ImageList_GetIcon(hCListImages, NewGroupIconidx, 0);

+		mi.pszService = "CLISTMENUSSubGroup/GroupMenuExecProxy";

+		mi.pszName = LPGEN("&New subgroup");

+		gmp.lParam = 0;

+		gmp.wParam = POPUP_NEWSUBGROUP;

+		hNewSubGroupMenuItem = (HGENMENU)AddSubGroupMenuItem((WPARAM)&gmp, (LPARAM)&mi);

+

+		memset(&mi, 0, sizeof(mi));

+		mi.cbSize = sizeof(mi);

+		mi.position = 1001;

+		mi.hIcon = NULL;

+		mi.pszService = "CLISTMENUSSubGroup/GroupMenuExecProxy";

+		mi.pszName = LPGEN("&Hide offline users in here");

+		gmp.lParam = 0;

+		gmp.wParam = POPUP_GROUPHIDEOFFLINE;

+		hHideOfflineUsersHereMenuItem = (HGENMENU)AddSubGroupMenuItem((WPARAM)&gmp, (LPARAM)&mi);

+

+		memset(&mi, 0, sizeof(mi));

+		mi.cbSize = sizeof(mi);

+		mi.position = 900001;

+		mi.icolibItem = LoadSkinnedIconHandle(SKINICON_OTHER_RENAME); //LoadIcon(GetModuleHandle(NULL),MAKEINTRESOURCE(IDI_RENAME));

+		mi.pszService = "CLISTMENUSSubGroup/GroupMenuExecProxy";

+		mi.pszName = LPGEN("&Rename group");

+		gmp.lParam = 0;

+		gmp.wParam = POPUP_RENAMEGROUP;

+		AddSubGroupMenuItem((WPARAM)&gmp, (LPARAM)&mi);

+

+		memset(&mi, 0, sizeof(mi));

+		mi.cbSize = sizeof(mi);

+		mi.position = 900002;

+		mi.icolibItem = LoadSkinnedIconHandle(SKINICON_OTHER_DELETE); //LoadIcon(GetModuleHandle(NULL),MAKEINTRESOURCE(IDI_DELETE));

+		mi.pszService = "CLISTMENUSSubGroup/GroupMenuExecProxy";

+		mi.pszName = LPGEN("&Delete group");

+		gmp.lParam = 0;

+		gmp.wParam = POPUP_DELETEGROUP;

+		AddSubGroupMenuItem((WPARAM)&gmp, (LPARAM)&mi);

 	}

 }