diff options
author | George Hazan <george.hazan@gmail.com> | 2015-06-26 22:03:02 +0000 |
---|---|---|
committer | George Hazan <george.hazan@gmail.com> | 2015-06-26 22:03:02 +0000 |
commit | be616d81bdaf8fd4ae61b0a145fb81bbdf467994 (patch) | |
tree | c0d4798a8e882583f74eb166508e0f4ce96bd4e4 /plugins/Clist_nicer | |
parent | c89c550677f40d8b2010de442053cba81ba06d96 (diff) |
YEEHAW! CLISTMENUITEM::pszPopupName also died
git-svn-id: http://svn.miranda-ng.org/main/trunk@14404 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/Clist_nicer')
-rw-r--r-- | plugins/Clist_nicer/src/CLUIFrames/cluiframes.cpp | 43 | ||||
-rw-r--r-- | plugins/Clist_nicer/src/CLUIFrames/groupmenu.cpp | 4 | ||||
-rw-r--r-- | plugins/Clist_nicer/src/clistmenus.cpp | 1 |
3 files changed, 19 insertions, 29 deletions
diff --git a/plugins/Clist_nicer/src/CLUIFrames/cluiframes.cpp b/plugins/Clist_nicer/src/CLUIFrames/cluiframes.cpp index c1dbc69c9c..951979c69f 100644 --- a/plugins/Clist_nicer/src/CLUIFrames/cluiframes.cpp +++ b/plugins/Clist_nicer/src/CLUIFrames/cluiframes.cpp @@ -89,7 +89,7 @@ static int TitleBarH = DEFAULT_TITLEBAR_HEIGHT; static boolean resizing = FALSE; // menus -static FrameMenuHandles cont = { HGENMENU_ROOT }; +static FrameMenuHandles cont; // others static int ContactListHeight; @@ -577,7 +577,7 @@ HMENU CLUIFramesCreateMenuForFrame(int frameid, HGENMENU root, int popuppos, HGE mi.hParentMenu = root; mi.position = popuppos++; mi.pszName = LPGEN("&FrameTitle"); - mi.flags = CMIF_ROOTHANDLE | CMIF_GRAYED; + mi.flags = CMIF_GRAYED; fmh.MITitle = pfnAdd(&mi); popuppos += 100000; @@ -585,13 +585,13 @@ HMENU CLUIFramesCreateMenuForFrame(int frameid, HGENMENU root, int popuppos, HGE mi.hIcon = NULL; mi.position = popuppos++; mi.pszName = LPGEN("&Visible"); - mi.flags = CMIF_ROOTHANDLE | CMIF_CHECKED; + mi.flags = CMIF_CHECKED; mi.pszService = MS_CLIST_FRAMES_SHFRAME; Menu_ConfigureItem(fmh.MIVisible = pfnAdd(&mi), MCI_OPT_EXECPARAM, frameid); mi.position = popuppos++; mi.pszName = LPGEN("&Show title bar"); - mi.flags = CMIF_ROOTHANDLE | CMIF_CHECKED; + mi.flags = CMIF_CHECKED; mi.pszService = MS_CLIST_FRAMES_SHFRAMETITLEBAR; Menu_ConfigureItem(fmh.MITBVisible = pfnAdd(&mi), MCI_OPT_EXECPARAM, frameid); @@ -599,20 +599,20 @@ HMENU CLUIFramesCreateMenuForFrame(int frameid, HGENMENU root, int popuppos, HGE mi.position = popuppos++; mi.pszName = LPGEN("&Locked"); - mi.flags = CMIF_ROOTHANDLE | CMIF_CHECKED; + mi.flags = CMIF_CHECKED; mi.pszService = MS_CLIST_FRAMES_ULFRAME; Menu_ConfigureItem(fmh.MILock = pfnAdd(&mi), MCI_OPT_EXECPARAM, frameid); mi.position = popuppos++; mi.pszName = LPGEN("&Collapsed"); - mi.flags = CMIF_ROOTHANDLE | CMIF_CHECKED; + mi.flags = CMIF_CHECKED; mi.pszService = MS_CLIST_FRAMES_UCOLLFRAME; Menu_ConfigureItem(fmh.MIColl = pfnAdd(&mi), MCI_OPT_EXECPARAM, frameid); // floating mi.position = popuppos++; mi.pszName = LPGEN("&Floating mode"); - mi.flags = CMIF_ROOTHANDLE; + mi.flags = 0; mi.pszService = "Set_Floating"; fmh.MIFloating = pfnAdd(&mi); @@ -620,7 +620,7 @@ HMENU CLUIFramesCreateMenuForFrame(int frameid, HGENMENU root, int popuppos, HGE mi.position = popuppos++; mi.pszName = LPGEN("&Border"); - mi.flags = CMIF_ROOTHANDLE | CMIF_CHECKED; + mi.flags = CMIF_CHECKED; mi.pszService = MS_CLIST_FRAMES_SETUNBORDER; Menu_ConfigureItem(fmh.MIBorder = pfnAdd(&mi), MCI_OPT_EXECPARAM, frameid); @@ -628,7 +628,7 @@ HMENU CLUIFramesCreateMenuForFrame(int frameid, HGENMENU root, int popuppos, HGE mi.position = popuppos++; mi.pszName = LPGEN("&Skinned frame"); - mi.flags = CMIF_ROOTHANDLE | CMIF_CHECKED; + mi.flags = CMIF_CHECKED; mi.pszService = MS_CLIST_FRAMES_SETSKINNED; Menu_ConfigureItem(fmh.MISkinned = pfnAdd(&mi), MCI_OPT_EXECPARAM, frameid); @@ -638,11 +638,10 @@ HMENU CLUIFramesCreateMenuForFrame(int frameid, HGENMENU root, int popuppos, HGE mi.hParentMenu = root; mi.position = popuppos++; mi.pszName = LPGEN("&Align"); - mi.flags = CMIF_ROOTHANDLE; + mi.flags = 0; mi.pszService = ""; fmh.MIAlignRoot = pfnAdd(&mi); - mi.flags = CMIF_ROOTHANDLE; // align top mi.hParentMenu = fmh.MIAlignRoot; mi.position = popuppos++; @@ -669,7 +668,6 @@ HMENU CLUIFramesCreateMenuForFrame(int frameid, HGENMENU root, int popuppos, HGE mi.hParentMenu = root; mi.position = popuppos++; mi.pszName = LPGEN("&Position"); - mi.flags = CMIF_ROOTHANDLE; mi.pszService = ""; mi.pszContactOwner = (char*)0; HGENMENU menuid = pfnAdd(&mi); @@ -677,14 +675,12 @@ HMENU CLUIFramesCreateMenuForFrame(int frameid, HGENMENU root, int popuppos, HGE mi.hParentMenu = menuid; mi.position = popuppos++; mi.pszName = LPGEN("&Up"); - mi.flags = CMIF_ROOTHANDLE; mi.pszService = CLUIFRAMESMOVEUP; mi.pszContactOwner = (char*)1; Menu_ConfigureItem(pfnAdd(&mi), MCI_OPT_EXECPARAM, frameid); mi.position = popuppos++; mi.pszName = LPGEN("&Down"); - mi.flags = CMIF_ROOTHANDLE; mi.pszService = CLUIFRAMESMOVEDOWN; mi.pszContactOwner = (char*)-1; Menu_ConfigureItem(pfnAdd(&mi), MCI_OPT_EXECPARAM, frameid); @@ -1333,17 +1329,15 @@ static int CLUIFramesLoadMainMenu() if (FramesSysNotStarted) return -1; - if (cont.MainMenuItem != HGENMENU_ROOT) { + if (cont.MainMenuItem != NULL) { Menu_RemoveItem(cont.MainMenuItem); - cont.MainMenuItem = HGENMENU_ROOT; + cont.MainMenuItem = NULL; } // create root menu CLISTMENUITEM mi = { 0 }; mi.icolibItem = Skin_GetIconHandle(SKINICON_OTHER_FRAME); - mi.flags = CMIF_ROOTHANDLE; mi.position = 3000090000; - mi.hParentMenu = HGENMENU_ROOT; mi.pszName = LPGEN("Frames"); mi.pszService = 0; cont.MainMenuItem = Menu_AddMainMenuItem(&mi); @@ -1352,7 +1346,7 @@ static int CLUIFramesLoadMainMenu() int separator = (int)3000200000; for (int i = 0; i < nFramescount; i++) { mi.hIcon = Frames[i].TitleBar.hicon; - mi.flags = CMIF_ROOTHANDLE | CMIF_TCHAR; + mi.flags = CMIF_TCHAR; mi.position = separator; mi.hParentMenu = cont.MainMenuItem; mi.ptszName = Frames[i].TitleBar.tbname ? Frames[i].TitleBar.tbname : Frames[i].name; @@ -1367,8 +1361,8 @@ static int CLUIFramesLoadMainMenu() separator += 100000; // create "show all frames" menu - mi.hIcon = NULL;//LoadIcon(g_hInst,MAKEINTRESOURCE(IDI_MIRANDA)); - mi.flags = CMIF_ROOTHANDLE; + mi.icolibItem = Skin_GetIconHandle(SKINICON_OTHER_MIRANDA); + mi.flags = 0; mi.position = separator++; mi.hParentMenu = cont.MainMenuItem; mi.pszName = LPGEN("Show all frames"); @@ -1376,17 +1370,14 @@ static int CLUIFramesLoadMainMenu() Menu_AddMainMenuItem(&mi); // create "show all titlebars" menu - mi.hIcon = NULL;//LoadIcon(g_hInst,MAKEINTRESOURCE(IDI_HELP)); + mi.icolibItem = Skin_GetIconHandle(SKINICON_OTHER_HELP); mi.position = separator++; - mi.flags = CMIF_ROOTHANDLE; mi.pszName = LPGEN("Show all title bars"); mi.pszService = MS_CLIST_FRAMES_SHOWALLFRAMESTB; Menu_AddMainMenuItem(&mi); // create "hide all titlebars" menu - mi.hIcon = NULL;//LoadIcon(g_hInst,MAKEINTRESOURCE(IDI_HELP)); mi.position = separator++; - mi.flags = CMIF_ROOTHANDLE; mi.pszName = LPGEN("Hide all title bars"); mi.pszService = MS_CLIST_FRAMES_HIDEALLFRAMESTB; Menu_AddMainMenuItem(&mi); @@ -2949,7 +2940,7 @@ static int CLUIFrameOnModulesLoad(WPARAM, LPARAM) hThreadMFUpdate = mir_forkthread(MF_UpdateThread, NULL); SetThreadPriority(hThreadMFUpdate, THREAD_PRIORITY_IDLE); CLUIFramesLoadMainMenu(); - CLUIFramesCreateMenuForFrame(-1, HGENMENU_ROOT, 000010000, Menu_AddContextFrameMenuItem); + CLUIFramesCreateMenuForFrame(-1, NULL, 000010000, Menu_AddContextFrameMenuItem); return 0; } diff --git a/plugins/Clist_nicer/src/CLUIFrames/groupmenu.cpp b/plugins/Clist_nicer/src/CLUIFrames/groupmenu.cpp index 86bff0d6a2..077d832549 100644 --- a/plugins/Clist_nicer/src/CLUIFrames/groupmenu.cpp +++ b/plugins/Clist_nicer/src/CLUIFrames/groupmenu.cpp @@ -25,7 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include <commonheaders.h>
//////////////////////////////Group MENU/////////////////////////
-HANDLE hGroupMenuObject;
+int hGroupMenuObject;
HANDLE hPreBuildGroupMenuEvent;
HGENMENU hGroupMainMenuItemProxy;
@@ -314,7 +314,7 @@ void InitGroupMenus(void) //////////////////////////////END Group MENU/////////////////////////
//////////////////////////////SubGroup MENU/////////////////////////
-HANDLE hSubGroupMenuObject;
+int hSubGroupMenuObject;
HANDLE hSubGroupMainMenuItemProxy;
HANDLE hSubGroupStatusMenuItemProxy;
diff --git a/plugins/Clist_nicer/src/clistmenus.cpp b/plugins/Clist_nicer/src/clistmenus.cpp index d0b08d00d2..fd7b062dd3 100644 --- a/plugins/Clist_nicer/src/clistmenus.cpp +++ b/plugins/Clist_nicer/src/clistmenus.cpp @@ -383,7 +383,6 @@ int InitCustomMenus(void) CLISTMENUITEM mi = { 0 };
mi.position = 200000;
- mi.hParentMenu = HGENMENU_ROOT;
mi.pszService = "CList/SetContactIgnore";
mi.icolibItem = iconItem[1].hIcolib;
mi.pszName = LPGEN("&Contact list settings...");
|