shameful end of the group processing zoo, part 1

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

1 files changed, 102 insertions, 107 deletions

diff --git a/plugins/Clist_mw/src/groupmenu.cpp b/plugins/Clist_mw/src/groupmenu.cpp
index 821a57d754..3a79598ab5 100644
--- a/plugins/Clist_mw/src/groupmenu.cpp
+++ b/plugins/Clist_mw/src/groupmenu.cpp
@@ -240,7 +240,7 @@ void InitGroupMenus(void)
 	HICON hicon;

 	hicon = LoadIconFromExternalFile("clisticons.dll",2,TRUE,TRUE,"NewGroup","Contact List","New Group",-IDI_NEWGROUP2,0);

 	NewGroupIconidx = ImageList_AddIcon(hCListImages,hicon );	

-	

+

 	CreateServiceFunction("CLISTMENUSGroup/ExecService",GroupMenuExecService);

 	CreateServiceFunction("CLISTMENUSGroup/FreeOwnerDataGroupMenu",FreeOwnerDataGroupMenu);

 	CreateServiceFunction("CLISTMENUSGroup/GroupMenuonAddService",GroupMenuonAddService);

@@ -263,13 +263,13 @@ void InitGroupMenus(void)
 	tmp.ExecService = "CLISTMENUSGroup/ExecService";

 	tmp.name = "Group Menu";

 	hGroupMenuObject = (HANDLE)CallService(MO_CREATENEWMENUOBJECT,0,(LPARAM)&tmp);

-	

-	

+

+

 	op.Handle = hGroupMenuObject;

 	op.Setting = OPT_USERDEFINEDITEMS;

 	op.Value = TRUE;

 	CallService(MO_SETOPTIONSMENUOBJECT,0,(LPARAM)&op);

-	

+

 	op.Handle = hGroupMenuObject;

 	op.Setting = OPT_MENUOBJECT_SET_FREE_SERVICE;

 	op.Value = (INT_PTR)"CLISTMENUSGroup/FreeOwnerDataGroupMenu";

@@ -281,109 +281,104 @@ void InitGroupMenus(void)
 	CallService(MO_SETOPTIONSMENUOBJECT,0,(LPARAM)&op);

 

 	{	

-	//add  exit command to menu

-	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 = (HANDLE)AddGroupMenuItem(0,(LPARAM)&mi);

-

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

-	mi.cbSize = sizeof(mi);

-	mi.position = 200000;

-	mi.hIcon = 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 = (HANDLE)AddGroupMenuItem(0,(LPARAM)&mi);

-

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

-	mi.cbSize = sizeof(mi);

-	mi.position = 300100;

-	mi.pszService = "";

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

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

-

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

-	mi.cbSize = sizeof(mi);

-	mi.position = 400000;

-	mi.hIcon = 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.hIcon = LoadIcon(GetModuleHandle(NULL),MAKEINTRESOURCE(IDI_CLIENTMIRANDA));

-	mi.pszService = "Help/AboutCommand";

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

-	

-	//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 = MS_CLIST_GROUPCREATE;

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

-	hNewGroupMenuItem = (HGENMENU)AddGroupMenuItem(0,(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);

-	

-	HookEvent(ME_SKIN2_ICONSCHANGED,OnIconLibIconChanged);

-	

-	//MS_CLIST_GROUPCREATE

-

+		//add  exit command to menu

+		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 = (HANDLE)AddGroupMenuItem(0,(LPARAM)&mi);

+

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

+		mi.cbSize = sizeof(mi);

+		mi.position = 200000;

+		mi.hIcon = 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 = (HANDLE)AddGroupMenuItem(0,(LPARAM)&mi);

+

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

+		mi.cbSize = sizeof(mi);

+		mi.position = 300100;

+		mi.pszService = "";

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

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

+

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

+		mi.cbSize = sizeof(mi);

+		mi.position = 400000;

+		mi.hIcon = 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.hIcon = LoadIcon(GetModuleHandle(NULL),MAKEINTRESOURCE(IDI_CLIENTMIRANDA));

+		mi.pszService = "Help/AboutCommand";

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

+

+		//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 = MS_CLIST_GROUPCREATE;

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

+		hNewGroupMenuItem = (HGENMENU)AddGroupMenuItem(0,(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);

+

+		HookEvent(ME_SKIN2_ICONSCHANGED,OnIconLibIconChanged);

 	}

 }