From fed531ab4372f6199e8e2fcc1659dbaf9bc97a5a Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 23 Jan 2013 19:11:17 +0000 Subject: wiping out old garbage from clist modern git-svn-id: http://svn.miranda-ng.org/main/trunk@3254 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Clist_modern/src/modern_clistmenus.cpp | 2 +- plugins/Clist_modern/src/modern_clui.cpp | 6 +++--- plugins/Clist_modern/src/modern_toolbar.cpp | 4 ++-- plugins/Clist_modern/src/modern_viewmodebar.cpp | 22 ++++++---------------- 4 files changed, 12 insertions(+), 22 deletions(-) (limited to 'plugins/Clist_modern/src') diff --git a/plugins/Clist_modern/src/modern_clistmenus.cpp b/plugins/Clist_modern/src/modern_clistmenus.cpp index cf0d402bc5..3d25cc2911 100644 --- a/plugins/Clist_modern/src/modern_clistmenus.cpp +++ b/plugins/Clist_modern/src/modern_clistmenus.cpp @@ -115,7 +115,7 @@ static int FAV_OnContactMenuBuild(WPARAM wParam,LPARAM lParam) mir_sntprintf(name,bufsize/sizeof(TCHAR),_T("%s (%s)"),FAVMENUROOTNAME,rates[bContactRate]); mi.ptszName = name; } - mi.flags = CMIF_ROOTPOPUP|CMIF_TCHAR; + mi.flags = CMIF_ROOTPOPUP | CMIF_TCHAR; if ( !hFavoriteContactMenu) hFavoriteContactMenu = Menu_AddContactMenuItem(&mi); else diff --git a/plugins/Clist_modern/src/modern_clui.cpp b/plugins/Clist_modern/src/modern_clui.cpp index 9459856ce4..1d113d2437 100644 --- a/plugins/Clist_modern/src/modern_clui.cpp +++ b/plugins/Clist_modern/src/modern_clui.cpp @@ -1667,7 +1667,7 @@ static BOOL FileExists(TCHAR * tszFilename) return TRUE; } -HANDLE RegisterIcolibIconHandle(char * szIcoID, char *szSectionName, char * szDescription, TCHAR * tszDefaultFile, int iDefaultIndex, HINSTANCE hDefaultModuleInst, int iDefaultResource ) +HANDLE RegisterIcolibIconHandle(char *szIcoID, char *szSectionName, char *szDescription, TCHAR *tszDefaultFile, int iDefaultIndex, HINSTANCE hDefaultModuleInst, int iDefaultResource ) { if (hDefaultModuleInst == NULL) return LoadSkinnedIconHandle(iDefaultResource); @@ -1689,10 +1689,10 @@ HANDLE RegisterIcolibIconHandle(char * szIcoID, char *szSectionName, char * szD } if (fileFull[0] != _T('\0')) - sid.iDefaultIndex = iDefaultIndex; + sid.iDefaultIndex = -iDefaultIndex; else { GetModuleFileName(hDefaultModuleInst, fileFull, SIZEOF(fileFull)); - sid.iDefaultIndex = iDefaultResource; + sid.iDefaultIndex = -iDefaultResource; } return Skin_AddIcon(&sid); diff --git a/plugins/Clist_modern/src/modern_toolbar.cpp b/plugins/Clist_modern/src/modern_toolbar.cpp index 5e3c00e496..4088d6d2dc 100644 --- a/plugins/Clist_modern/src/modern_toolbar.cpp +++ b/plugins/Clist_modern/src/modern_toolbar.cpp @@ -70,7 +70,7 @@ static int Modern_InitButtons(WPARAM, LPARAM) char buf[255]; if (i != 0) { mir_snprintf(buf,SIZEOF(buf),"%s%s%s", TTB_OPTDIR, BTNS[i].pszButtonID, "_dn"); - tbb.hIconHandleUp = RegisterIcolibIconHandle(buf, "Toolbar", BTNS[i].pszTooltipUp, _T("icons\\toolbar_icons.dll"),-BTNS[i].icoDefIdx, g_hInst, BTNS[i].defResource); + tbb.hIconHandleUp = RegisterIcolibIconHandle(buf, "Toolbar", BTNS[i].pszTooltipUp, _T("icons\\toolbar_icons.dll"), BTNS[i].icoDefIdx, g_hInst, BTNS[i].defResource); } else tbb.hIconHandleUp = RegisterIcolibIconHandle(buf, "Toolbar", BTNS[i].pszTooltipUp, NULL, 0, NULL, SKINICON_OTHER_MAINMENU); @@ -78,7 +78,7 @@ static int Modern_InitButtons(WPARAM, LPARAM) tbb.dwFlags |= TTBBF_ASPUSHBUTTON; mir_snprintf(buf,SIZEOF(buf),"%s%s%s", TTB_OPTDIR, BTNS[i].pszButtonID, "_up"); - tbb.hIconHandleDn = RegisterIcolibIconHandle(buf, "Toolbar", BTNS[i].pszTooltipDn, _T("icons\\toolbar_icons.dll"),-(BTNS[i].icoDefIdx+1), g_hInst, BTNS[i].defResource2 ); + tbb.hIconHandleDn = RegisterIcolibIconHandle(buf, "Toolbar", BTNS[i].pszTooltipDn, _T("icons\\toolbar_icons.dll"), BTNS[i].icoDefIdx+1, g_hInst, BTNS[i].defResource2 ); } else tbb.hIconHandleDn = NULL; } diff --git a/plugins/Clist_modern/src/modern_viewmodebar.cpp b/plugins/Clist_modern/src/modern_viewmodebar.cpp index 61b5fc0bcd..f1a7d13b88 100644 --- a/plugins/Clist_modern/src/modern_viewmodebar.cpp +++ b/plugins/Clist_modern/src/modern_viewmodebar.cpp @@ -1077,26 +1077,16 @@ LRESULT CALLBACK ViewModeFrameWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM case WM_USER + 100: SendMessage(GetDlgItem(hwnd, IDC_RESETMODES), MBM_SETICOLIBHANDLE, 0, - (LPARAM) RegisterIcolibIconHandle("CLN_CLVM_reset", "Contact List",Translate("Reset view mode"), _T("clisticons.dll"),9, g_hInst, IDI_RESETVIEW )); + (LPARAM) RegisterIcolibIconHandle("CLN_CLVM_reset", "Contact List",Translate("Reset view mode"), NULL, 0, g_hInst, IDI_RESETVIEW )); SendMessage(GetDlgItem(hwnd, IDC_CONFIGUREMODES), MBM_SETICOLIBHANDLE, 0, - (LPARAM) RegisterIcolibIconHandle("CLN_CLVM_set", "Contact List",Translate("Setup view modes"), _T("clisticons.dll"), 10, g_hInst, IDI_SETVIEW )); + (LPARAM) RegisterIcolibIconHandle("CLN_CLVM_set", "Contact List",Translate("Setup view modes"), NULL, 0, g_hInst, IDI_SETVIEW )); { - int bSkinned = db_get_b(NULL, "CLCExt", "bskinned", 0); - int i=0; - - while(_buttons[i] != 0) { - //SendMessage(GetDlgItem(hwnd, _buttons[i]), BM_SETSKINNED, 0, bSkinned); - if (1 && bSkinned) { - SendDlgItemMessage(hwnd, _buttons[i], BUTTONSETASFLATBTN, TRUE, 0); - SendDlgItemMessage(hwnd, _buttons[i], BUTTONSETASFLATBTN + 10, 0, 0); - } - else { - SendDlgItemMessage(hwnd, _buttons[i], BUTTONSETASFLATBTN, TRUE, 1); - SendDlgItemMessage(hwnd, _buttons[i], BUTTONSETASFLATBTN + 10, 0, 1); - } - i++; + // int bSkinned = db_get_b(NULL, "CLCExt", "bskinned", 0); + for (int i=0; _buttons[i] != 0; i++) { + SendDlgItemMessage(hwnd, _buttons[i], BUTTONSETASFLATBTN, TRUE, 0); + SendDlgItemMessage(hwnd, _buttons[i], BUTTONSETASFLATBTN + 10, 0, 0); } } -- cgit v1.2.3