From f8a2931aff174ded0a69b7b5933dd27337cbb134 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sat, 26 Jan 2013 21:04:38 +0000 Subject: SKINICON_OTHER_FRAME for all plugins git-svn-id: http://svn.miranda-ng.org/main/trunk@3297 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Clist_mw/src/CLUIFrames/cluiframes.cpp | 127 ++++++++++--------------- plugins/Clist_mw/src/CLUIFrames/statusbar.cpp | 2 +- plugins/Clist_mw/src/clui.cpp | 2 +- 3 files changed, 50 insertions(+), 81 deletions(-) (limited to 'plugins/Clist_mw/src') diff --git a/plugins/Clist_mw/src/CLUIFrames/cluiframes.cpp b/plugins/Clist_mw/src/CLUIFrames/cluiframes.cpp index 0326de4745..b504a96f0e 100644 --- a/plugins/Clist_mw/src/CLUIFrames/cluiframes.cpp +++ b/plugins/Clist_mw/src/CLUIFrames/cluiframes.cpp @@ -180,7 +180,7 @@ static int id2pos(int id) if (FramesSysNotStarted) return -1; - for (int i = 0;ihwndContactList,0); return 0; @@ -1113,7 +1114,7 @@ static INT_PTR CLUIFramesShowAll(WPARAM wParam,LPARAM lParam) //wparam = lparam = 0 INT_PTR CLUIFramesShowAllTitleBars(WPARAM wParam,LPARAM lParam) { - for (int i = 0;ihwndContactList,0); return 0; @@ -1122,7 +1123,7 @@ INT_PTR CLUIFramesShowAllTitleBars(WPARAM wParam,LPARAM lParam) //wparam = lparam = 0 INT_PTR CLUIFramesHideAllTitleBars(WPARAM wParam,LPARAM lParam) { - for (int i = 0;ihwndContactList,0); return 0; @@ -1166,14 +1167,14 @@ INT_PTR CLUIFramesMoveUpDown(WPARAM wParam,LPARAM lParam) lockfrm(); pos = id2pos(wParam); - if (pos>=0&&(int)pos= 0 &&(int)pos < nFramescount) { SortData *sd; curpos = Frames[pos].order; curalign = Frames[pos].align; v = 0; sd = (SortData*)malloc(sizeof(SortData)*nFramescount); memset(sd,0,sizeof(SortData)*nFramescount); - for (i = 0;i= v-1) @@ -1358,7 +1359,7 @@ INT_PTR CLUIFramesCollapseUnCollapseFrame(WPARAM wParam,LPARAM lParam) } else { int i,sumheight = 0; - for (i = 0; i < nFramescount; i++) { + for (i=0; i < nFramescount; i++) { if ((Frames[i].align != alClient)&&(!Frames[i].floating)&&(Frames[i].visible)&&(!Frames[i].needhide)) { sumheight += (Frames[i].height)+(TitleBarH*btoint(Frames[i].TitleBar.ShowTitleBar))+2; return FALSE; @@ -1406,38 +1407,6 @@ INT_PTR CLUIFramesCollapseUnCollapseFrame(WPARAM wParam,LPARAM lParam) static int CLUIFramesLoadMainMenu() { - int i,separator; - - if ( !(ServiceExists(MS_CLIST_REMOVEMAINMENUITEM))) { - // create "show all frames" menu - CLISTMENUITEM mi = { sizeof(mi) }; - mi.hIcon = NULL;//LoadIcon(g_hInst,MAKEINTRESOURCE(IDI_MIRANDA)); - mi.flags = CMIF_GRAYED; - mi.position = 10000000; - mi.pszPopupName = LPGEN("Frames"); - mi.pszName = LPGEN("New Menu System not Found..."); - mi.pszService = ""; - Menu_AddMainMenuItem(&mi); - - // create "show all frames" menu - mi.hIcon = NULL;//LoadIcon(g_hInst,MAKEINTRESOURCE(IDI_MIRANDA)); - mi.flags = 0; - mi.position = 10100000; - mi.pszPopupName = LPGEN("Frames"); - mi.pszName = LPGEN("Show All Frames"); - mi.pszService = MS_CLIST_FRAMES_SHOWALLFRAMES; - Menu_AddMainMenuItem(&mi); - - mi.hIcon = NULL;//LoadIcon(g_hInst,MAKEINTRESOURCE(IDI_HELP)); - mi.position = 10100001; - mi.pszPopupName = LPGEN("Frames"); - mi.flags = CMIF_CHILDPOPUP; - mi.pszName = LPGEN("Show All Titlebars"); - mi.pszService = MS_CLIST_FRAMES_SHOWALLFRAMESTB; - Menu_AddMainMenuItem(&mi); - return 0; - } - if (MainMIRoot != (HGENMENU)-1) { CallService(MS_CLIST_REMOVEMAINMENUITEM,(WPARAM)MainMIRoot,0); MainMIRoot = (HGENMENU)-1; @@ -1445,8 +1414,8 @@ static int CLUIFramesLoadMainMenu() // create root menu CLISTMENUITEM mi = { sizeof(mi) }; - mi.hIcon = LoadIcon(g_hInst,MAKEINTRESOURCE(IDI_CLIENTMIRANDA)); - mi.flags = CMIF_ROOTPOPUP; + mi.icolibItem = LoadSkinnedIconHandle(SKINICON_OTHER_FRAME); + mi.flags = CMIF_ROOTPOPUP | CMIF_ICONFROMICOLIB; mi.position = 3000090000; mi.pszPopupName = (char*)-1; mi.pszName = LPGEN("Frames"); @@ -1454,10 +1423,10 @@ static int CLUIFramesLoadMainMenu() MainMIRoot = Menu_AddMainMenuItem(&mi); // create frames menu - separator = 3000200000; - for (i = 0;iContactListHeight-tbh-2) @@ -1746,7 +1715,7 @@ int CLUIFramesGetMinHeight() if (clientfrm != -1) tbh = TitleBarH*btoint(Frames[clientfrm].TitleBar.ShowTitleBar); - for (i = 0; i < nFramescount; i++) { + for (i=0; i < nFramescount; i++) { if ((Frames[i].align != alClient)&&(Frames[i].visible)&&(!Frames[i].needhide)&&(!Frames[i].floating)) { RECT wsize; @@ -1786,7 +1755,7 @@ int CLUIFramesResize(const RECT newsize) if (clientfrm != -1) tbh = (TitleBarH+GapBetweenTitlebar)*btoint(Frames[clientfrm].TitleBar.ShowTitleBar); - for (i = 0; i < nFramescount; i++) { + for (i=0; i < nFramescount; i++) { if ( !Frames[i].floating) { Frames[i].needhide = FALSE; Frames[i].wndSize.left = 0; @@ -1797,7 +1766,7 @@ int CLUIFramesResize(const RECT newsize) //sorting stuff sdarray = (SortData*)malloc(sizeof(SortData)*nFramescount); if (sdarray == NULL){return(-1);} - for (i = 0;i(newheight-tbh)&&drawitems>0) { sumheight = 0; drawitems = 0; - for (i = 0;ihwndContactList,0); CLUIFramesStoreAllFrames(); lockfrm(); - for (int i = 0; i < nFramescount; i++) { + for (int i=0; i < nFramescount; i++) { DestroyWindow(Frames[i].hWnd); Frames[i].hWnd = (HWND)-1; DestroyWindow(Frames[i].TitleBar.hwnd); diff --git a/plugins/Clist_mw/src/CLUIFrames/statusbar.cpp b/plugins/Clist_mw/src/CLUIFrames/statusbar.cpp index 2c88c43175..5d6288269c 100644 --- a/plugins/Clist_mw/src/CLUIFrames/statusbar.cpp +++ b/plugins/Clist_mw/src/CLUIFrames/statusbar.cpp @@ -457,7 +457,7 @@ HANDLE CreateStatusBarFrame() Frame.cbSize = sizeof(CLISTFrame); Frame.hWnd = helperhwnd; Frame.align = alBottom; - Frame.hIcon = LoadSkinnedIcon (SKINICON_OTHER_MIRANDA); + Frame.hIcon = LoadSkinnedIcon(SKINICON_OTHER_FRAME); Frame.Flags = ( db_get_b(NULL,"CLUI","ShowSBar",1)?F_VISIBLE:0)|F_LOCKED|F_NOBORDER|F_TCHAR; Frame.height = (h == 0) ? 20 : h; Frame.tname = _T("Status"); diff --git a/plugins/Clist_mw/src/clui.cpp b/plugins/Clist_mw/src/clui.cpp index aadd15cdbd..67862d2a79 100644 --- a/plugins/Clist_mw/src/clui.cpp +++ b/plugins/Clist_mw/src/clui.cpp @@ -391,7 +391,7 @@ int CreateCLC(HWND parent) Frame.cbSize = sizeof(CLISTFrame); Frame.hWnd = pcli->hwndContactTree; Frame.align = alClient; - Frame.hIcon = LoadSkinnedIcon(SKINICON_OTHER_MIRANDA); + Frame.hIcon = LoadSkinnedIcon(SKINICON_OTHER_FRAME); //LoadIcon(hInst,MAKEINTRESOURCE(IDI_MIRANDA)); Frame.Flags = F_VISIBLE|F_SHOWTB|F_SHOWTBTIP|F_TCHAR; Frame.tname = _T("My Contacts"); -- cgit v1.2.3