From 3abd733254c02e2ca2c9bcc7fbbd1417c4a8ff74 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 16 Dec 2013 16:07:54 +0000 Subject: - new menu object helpers (MO_CreateMenuObject, MO_SetMenuObjectParam); - menu item display names are now translatable; - old nasty pieces of junk removed in CLUIFrames/cluiframes.cpp git-svn-id: http://svn.miranda-ng.org/main/trunk@7247 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/MirOTR/MirOTR/src/mirotrmenu.cpp | 28 ++++++---------------------- 1 file changed, 6 insertions(+), 22 deletions(-) (limited to 'plugins/MirOTR') diff --git a/plugins/MirOTR/MirOTR/src/mirotrmenu.cpp b/plugins/MirOTR/MirOTR/src/mirotrmenu.cpp index dfd28d741f..f886cd14e6 100644 --- a/plugins/MirOTR/MirOTR/src/mirotrmenu.cpp +++ b/plugins/MirOTR/MirOTR/src/mirotrmenu.cpp @@ -200,36 +200,20 @@ void InitMirOTRMenu(void) CreateServiceFunction("MirOTRMenuExecService",MirOTRMenuExecService); CreateServiceFunction("MirOTRMenuCheckService",MirOTRMenuCheckService); - //free services + // menu object CreateServiceFunction("MIROTRMENUS/FreeOwnerDataMirOTRMenu",FreeOwnerDataMirOTRMenu); CreateServiceFunction("MIROTRMENUS/OnAddMenuItemMirOTRMenu",OnAddMenuItemMirOTRMenu); CreateServiceFunction(MS_MIROTR_ADDMIROTRMENUITEM,AddMirOTRMenuItem); CreateServiceFunction(MS_MIROTR_MENUBUILDMIROTR,BuildMirOTRMenu); CreateServiceFunction(MS_MIROTR_REMOVEMIROTRMENUITEM,RemoveMirOTRMenuItem); - { - TMenuParam tmp = { 0 }; - tmp.cbSize=sizeof(tmp); - tmp.CheckService="MirOTRMenuCheckService"; - tmp.ExecService="MirOTRMenuExecService"; - tmp.name="MirOTRMenu"; - hMirOTRMenuObject=(HANDLE)CallService(MO_CREATENEWMENUOBJECT,0,(LPARAM)&tmp); - } - - OptParam params; - params.Handle = hMirOTRMenuObject; - params.Setting = OPT_USERDEFINEDITEMS; - params.Value = FALSE; - CallService(MO_SETOPTIONSMENUOBJECT, 0, (LPARAM)¶ms); - - params.Setting = OPT_MENUOBJECT_SET_FREE_SERVICE; - params.Value = (INT_PTR)"MIROTRMENUS/FreeOwnerDataMirOTRMenu"; - CallService(MO_SETOPTIONSMENUOBJECT, 0, (LPARAM)¶ms); - params.Setting = OPT_MENUOBJECT_SET_ONADD_SERVICE; - params.Value = (INT_PTR)"MIROTRMENUS/OnAddMenuItemMirOTRMenu"; - CallService(MO_SETOPTIONSMENUOBJECT, 0, (LPARAM)¶ms); + hMirOTRMenuObject = MO_CreateMenuObject("MirOTRMenu", LPGEN("MirOTR menu"), "MirOTRMenuCheckService", "MirOTRMenuExecService"); + MO_SetMenuObjectParam(hMirOTRMenuObject, OPT_USERDEFINEDITEMS, FALSE); + MO_SetMenuObjectParam(hMirOTRMenuObject, OPT_MENUOBJECT_SET_FREE_SERVICE, "MIROTRMENUS/FreeOwnerDataMirOTRMenu"); + MO_SetMenuObjectParam(hMirOTRMenuObject, OPT_MENUOBJECT_SET_ONADD_SERVICE, "MIROTRMENUS/OnAddMenuItemMirOTRMenu"); + // menu items MIROTRMENUITEM mi = {0}; mi.cbSize = sizeof(mi); -- cgit v1.2.3