From 0225e25a20995f5b091c31ea1ea91306bfc8e23c Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Thu, 14 May 2015 19:07:52 +0000 Subject: cleanup git-svn-id: http://svn.miranda-ng.org/main/trunk@13595 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Popup/src/opttree.cpp | 304 +++++++++++++++++++++--------------------- 1 file changed, 152 insertions(+), 152 deletions(-) (limited to 'plugins/Popup/src/opttree.cpp') diff --git a/plugins/Popup/src/opttree.cpp b/plugins/Popup/src/opttree.cpp index b4481864d0..39a9d3f090 100644 --- a/plugins/Popup/src/opttree.cpp +++ b/plugins/Popup/src/opttree.cpp @@ -2,9 +2,9 @@ Popup Plus plugin for Miranda IM Copyright © 2002 Luca Santarelli, - © 2004-2007 Victor Pavlychko - © 2010 MPK - © 2010 Merlin_de +© 2004-2007 Victor Pavlychko +© 2010 MPK +© 2010 Merlin_de This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -29,7 +29,7 @@ static void OptTree_TranslateItem(HWND hwndTree, HTREEITEM hItem) { TCHAR buf[64]; - TVITEM tvi = {0}; + TVITEM tvi = { 0 }; tvi.mask = TVIF_HANDLE | TVIF_TEXT; tvi.hItem = hItem; tvi.pszText = buf; @@ -67,7 +67,7 @@ void OptTree_Translate(HWND hwndTree) HTREEITEM OptTree_FindNamedTreeItemAt(HWND hwndTree, HTREEITEM hItem, const TCHAR *name) { - TVITEM tvi = {0}; + TVITEM tvi = { 0 }; TCHAR str[MAX_PATH]; if (hItem) @@ -118,7 +118,7 @@ HTREEITEM OptTree_AddItem(HWND hwndTree, LPTSTR name, LPARAM lParam, int iconInd hItem = OptTree_FindNamedTreeItemAt(hwndTree, hSection, pItemName); if (!sectionName || !hItem) { if (!hItem) { - TVINSERTSTRUCT tvis = {0}; + TVINSERTSTRUCT tvis = { 0 }; tvis.hParent = hSection; tvis.hInsertAfter = TVI_LAST;// TVI_SORT; @@ -151,168 +151,168 @@ BOOL OptTree_ProcessMessage(HWND hwnd, UINT msg, WPARAM, LPARAM lparam, int *res HWND hwndTree = GetDlgItem(hwnd, idcTree); switch (msg) { - case WM_INITDIALOG: - { - int indx; - TCHAR itemName[1024]; - HIMAGELIST hImgLst; - - TreeView_SelectItem(hwndTree, NULL); - TreeView_DeleteAllItems(hwndTree); - - hImgLst = ImageList_Create(GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), ILC_COLOR | ILC_COLOR32 | ILC_MASK, 5, 1); - ImageList_ReplaceIcon(hImgLst, -1, (HICON)LoadImage(hInst, MAKEINTRESOURCE(IDI_POPUP), IMAGE_ICON, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), LR_DEFAULTCOLOR | LR_SHARED)); - ImageList_ReplaceIcon(hImgLst, -1, (HICON)LoadSkinnedIcon(SKINICON_OTHER_TICK)); - ImageList_ReplaceIcon(hImgLst, -1, (HICON)LoadSkinnedIcon(SKINICON_OTHER_NOTICK)); - ImageList_ReplaceIcon(hImgLst, -1, (HICON)LoadSkinnedIcon(SKINICON_OTHER_TICK)); - ImageList_ReplaceIcon(hImgLst, -1, (HICON)LoadSkinnedIcon(SKINICON_OTHER_NOTICK)); - ImageList_ReplaceIcon(hImgLst, -1, (HICON)LoadSkinnedIcon(SKINICON_OTHER_GROUPOPEN)); - ImageList_ReplaceIcon(hImgLst, -1, (HICON)LoadSkinnedIcon(SKINICON_OTHER_GROUPSHUT)); - TreeView_SetImageList(hwndTree, hImgLst, TVSIL_NORMAL); - - /* build options tree. based on code from IcoLib */ - for (indx = 0; indx < optionCount; indx++) { - TCHAR *sectionName; - int sectionLevel = 0; - - HTREEITEM hSection = NULL; - mir_tstrcpy(itemName, options[indx].pszOptionName); - sectionName = itemName; - - while (sectionName) { - // allow multi-level tree - TCHAR *pItemName = sectionName; - HTREEITEM hItem; - - if (sectionName = _tcschr(sectionName, '/')) { - // one level deeper - *sectionName = 0; - sectionName++; - } + case WM_INITDIALOG: + { + int indx; + TCHAR itemName[1024]; + HIMAGELIST hImgLst; + + TreeView_SelectItem(hwndTree, NULL); + TreeView_DeleteAllItems(hwndTree); + + hImgLst = ImageList_Create(GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), ILC_COLOR | ILC_COLOR32 | ILC_MASK, 5, 1); + ImageList_ReplaceIcon(hImgLst, -1, (HICON)LoadImage(hInst, MAKEINTRESOURCE(IDI_POPUP), IMAGE_ICON, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), LR_DEFAULTCOLOR | LR_SHARED)); + ImageList_ReplaceIcon(hImgLst, -1, (HICON)LoadSkinnedIcon(SKINICON_OTHER_TICK)); + ImageList_ReplaceIcon(hImgLst, -1, (HICON)LoadSkinnedIcon(SKINICON_OTHER_NOTICK)); + ImageList_ReplaceIcon(hImgLst, -1, (HICON)LoadSkinnedIcon(SKINICON_OTHER_TICK)); + ImageList_ReplaceIcon(hImgLst, -1, (HICON)LoadSkinnedIcon(SKINICON_OTHER_NOTICK)); + ImageList_ReplaceIcon(hImgLst, -1, (HICON)LoadSkinnedIcon(SKINICON_OTHER_GROUPOPEN)); + ImageList_ReplaceIcon(hImgLst, -1, (HICON)LoadSkinnedIcon(SKINICON_OTHER_GROUPSHUT)); + TreeView_SetImageList(hwndTree, hImgLst, TVSIL_NORMAL); + + /* build options tree. based on code from IcoLib */ + for (indx = 0; indx < optionCount; indx++) { + TCHAR *sectionName; + int sectionLevel = 0; + + HTREEITEM hSection = NULL; + mir_tstrcpy(itemName, options[indx].pszOptionName); + sectionName = itemName; + + while (sectionName) { + // allow multi-level tree + TCHAR *pItemName = sectionName; + HTREEITEM hItem; + + if (sectionName = _tcschr(sectionName, '/')) { + // one level deeper + *sectionName = 0; + sectionName++; + } - hItem = OptTree_FindNamedTreeItemAt(hwndTree, hSection, pItemName); - if (!sectionName || !hItem) { - if (!hItem) { - TVINSERTSTRUCT tvis = {0}; - - tvis.hParent = hSection; - tvis.hInsertAfter = TVI_LAST;// TVI_SORT; - tvis.item.mask = TVIF_TEXT | TVIF_PARAM | TVIF_STATE | TVIF_IMAGE | TVIF_SELECTEDIMAGE; - tvis.item.pszText = pItemName; - tvis.item.state = tvis.item.stateMask = TVIS_EXPANDED; - if (sectionName) { - tvis.item.lParam = -1; - tvis.item.state |= TVIS_BOLD; - tvis.item.stateMask |= TVIS_BOLD; - tvis.item.iImage = tvis.item.iSelectedImage = IMG_GRPOPEN; - } - else { - tvis.item.lParam = indx; - if (options[indx].groupId == OPTTREE_CHECK) - tvis.item.iImage = tvis.item.iSelectedImage = IMG_NOCHECK; - else - tvis.item.iImage = tvis.item.iSelectedImage = IMG_NORCHECK; - } - hItem = TreeView_InsertItem(hwndTree, &tvis); - if (!sectionName) - options[indx].hItem = hItem; + hItem = OptTree_FindNamedTreeItemAt(hwndTree, hSection, pItemName); + if (!sectionName || !hItem) { + if (!hItem) { + TVINSERTSTRUCT tvis = { 0 }; + + tvis.hParent = hSection; + tvis.hInsertAfter = TVI_LAST;// TVI_SORT; + tvis.item.mask = TVIF_TEXT | TVIF_PARAM | TVIF_STATE | TVIF_IMAGE | TVIF_SELECTEDIMAGE; + tvis.item.pszText = pItemName; + tvis.item.state = tvis.item.stateMask = TVIS_EXPANDED; + if (sectionName) { + tvis.item.lParam = -1; + tvis.item.state |= TVIS_BOLD; + tvis.item.stateMask |= TVIS_BOLD; + tvis.item.iImage = tvis.item.iSelectedImage = IMG_GRPOPEN; + } + else { + tvis.item.lParam = indx; + if (options[indx].groupId == OPTTREE_CHECK) + tvis.item.iImage = tvis.item.iSelectedImage = IMG_NOCHECK; + else + tvis.item.iImage = tvis.item.iSelectedImage = IMG_NORCHECK; } + hItem = TreeView_InsertItem(hwndTree, &tvis); + if (!sectionName) + options[indx].hItem = hItem; } - sectionLevel++; - hSection = hItem; } + sectionLevel++; + hSection = hItem; } - - OptTree_Translate(hwndTree); - ShowWindow(hwndTree, SW_SHOW); - TreeView_SelectItem(hwndTree, OptTree_FindNamedTreeItemAt(hwndTree, 0, NULL)); - break; } - case WM_DESTROY: - { - ImageList_Destroy(TreeView_GetImageList(hwndTree, TVSIL_NORMAL)); - break; - } + OptTree_Translate(hwndTree); + ShowWindow(hwndTree, SW_SHOW); + TreeView_SelectItem(hwndTree, OptTree_FindNamedTreeItemAt(hwndTree, 0, NULL)); + break; + } - case WM_NOTIFY: + case WM_DESTROY: + { + ImageList_Destroy(TreeView_GetImageList(hwndTree, TVSIL_NORMAL)); + break; + } + + case WM_NOTIFY: + { + LPNMHDR lpnmhdr = (LPNMHDR)lparam; + if (lpnmhdr->idFrom != (UINT)idcTree) + break; + switch (lpnmhdr->code) + { + case NM_CLICK: { - LPNMHDR lpnmhdr = (LPNMHDR)lparam; - if (lpnmhdr->idFrom != (UINT)idcTree) - break; - switch (lpnmhdr->code) - { - case NM_CLICK: - { - TVHITTESTINFO hti; - hti.pt.x = (short)LOWORD(GetMessagePos()); - hti.pt.y = (short)HIWORD(GetMessagePos()); - ScreenToClient(lpnmhdr->hwndFrom, &hti.pt); - if (TreeView_HitTest(lpnmhdr->hwndFrom, &hti)) { - if (hti.flags & TVHT_ONITEMICON) { - TVITEM tvi; - tvi.mask = TVIF_HANDLE | TVIF_PARAM | TVIF_IMAGE | TVIF_SELECTEDIMAGE; - tvi.hItem = hti.hItem; - TreeView_GetItem(lpnmhdr->hwndFrom, &tvi); - switch (tvi.iImage) - { - case IMG_GRPOPEN: - tvi.iImage = tvi.iSelectedImage = IMG_GRPCLOSED; - TreeView_Expand(lpnmhdr->hwndFrom, tvi.hItem, TVE_COLLAPSE); - break; - case IMG_GRPCLOSED: - tvi.iImage = tvi.iSelectedImage = IMG_GRPOPEN; - TreeView_Expand(lpnmhdr->hwndFrom, tvi.hItem, TVE_EXPAND); - break; - - case IMG_CHECK: - tvi.iImage = tvi.iSelectedImage = IMG_NOCHECK; - *result = tvi.lParam; - options[tvi.lParam].bState = FALSE; - SendMessage(GetParent(hwnd), PSM_CHANGED, 0, 0); - break; - case IMG_NOCHECK: - tvi.iImage = tvi.iSelectedImage = IMG_CHECK; - *result = tvi.lParam; - options[tvi.lParam].bState = TRUE; - SendMessage(GetParent(hwnd), PSM_CHANGED, 0, 0); - break; - case IMG_NORCHECK: - { - int i; - for (i = 0; i < optionCount; ++i) { - if (options[i].groupId == options[tvi.lParam].groupId) { - TVITEM tvi_tmp; - tvi_tmp.mask = TVIF_HANDLE | TVIF_IMAGE | TVIF_SELECTEDIMAGE; - tvi_tmp.hItem = options[i].hItem; - tvi_tmp.iImage = tvi_tmp.iSelectedImage = IMG_NORCHECK; - TreeView_SetItem(lpnmhdr->hwndFrom, &tvi_tmp); - } - } - tvi.iImage = tvi.iSelectedImage = IMG_RCHECK; - SendMessage(GetParent(hwnd), PSM_CHANGED, 0, 0); - break; - } + TVHITTESTINFO hti; + hti.pt.x = (short)LOWORD(GetMessagePos()); + hti.pt.y = (short)HIWORD(GetMessagePos()); + ScreenToClient(lpnmhdr->hwndFrom, &hti.pt); + if (TreeView_HitTest(lpnmhdr->hwndFrom, &hti)) { + if (hti.flags & TVHT_ONITEMICON) { + TVITEM tvi; + tvi.mask = TVIF_HANDLE | TVIF_PARAM | TVIF_IMAGE | TVIF_SELECTEDIMAGE; + tvi.hItem = hti.hItem; + TreeView_GetItem(lpnmhdr->hwndFrom, &tvi); + switch (tvi.iImage) + { + case IMG_GRPOPEN: + tvi.iImage = tvi.iSelectedImage = IMG_GRPCLOSED; + TreeView_Expand(lpnmhdr->hwndFrom, tvi.hItem, TVE_COLLAPSE); + break; + case IMG_GRPCLOSED: + tvi.iImage = tvi.iSelectedImage = IMG_GRPOPEN; + TreeView_Expand(lpnmhdr->hwndFrom, tvi.hItem, TVE_EXPAND); + break; + + case IMG_CHECK: + tvi.iImage = tvi.iSelectedImage = IMG_NOCHECK; + *result = tvi.lParam; + options[tvi.lParam].bState = FALSE; + SendMessage(GetParent(hwnd), PSM_CHANGED, 0, 0); + break; + case IMG_NOCHECK: + tvi.iImage = tvi.iSelectedImage = IMG_CHECK; + *result = tvi.lParam; + options[tvi.lParam].bState = TRUE; + SendMessage(GetParent(hwnd), PSM_CHANGED, 0, 0); + break; + case IMG_NORCHECK: + { + int i; + for (i = 0; i < optionCount; ++i) { + if (options[i].groupId == options[tvi.lParam].groupId) { + TVITEM tvi_tmp; + tvi_tmp.mask = TVIF_HANDLE | TVIF_IMAGE | TVIF_SELECTEDIMAGE; + tvi_tmp.hItem = options[i].hItem; + tvi_tmp.iImage = tvi_tmp.iSelectedImage = IMG_NORCHECK; + TreeView_SetItem(lpnmhdr->hwndFrom, &tvi_tmp); } - TreeView_SetItem(lpnmhdr->hwndFrom, &tvi); } + tvi.iImage = tvi.iSelectedImage = IMG_RCHECK; + SendMessage(GetParent(hwnd), PSM_CHANGED, 0, 0); + break; + } } - break; - } - - case TVN_ITEMEXPANDED: - { - LPNMTREEVIEW lpnmtv = (LPNMTREEVIEW)lparam; - TVITEM tvi; - tvi.mask = TVIF_HANDLE | TVIF_IMAGE | TVIF_SELECTEDIMAGE; - tvi.hItem = lpnmtv->itemNew.hItem; - tvi.iImage = tvi.iSelectedImage = (lpnmtv->itemNew.state & TVIS_EXPANDED) ? IMG_GRPOPEN : IMG_GRPCLOSED; TreeView_SetItem(lpnmhdr->hwndFrom, &tvi); - break; } } break; } + + case TVN_ITEMEXPANDED: + { + LPNMTREEVIEW lpnmtv = (LPNMTREEVIEW)lparam; + TVITEM tvi; + tvi.mask = TVIF_HANDLE | TVIF_IMAGE | TVIF_SELECTEDIMAGE; + tvi.hItem = lpnmtv->itemNew.hItem; + tvi.iImage = tvi.iSelectedImage = (lpnmtv->itemNew.state & TVIS_EXPANDED) ? IMG_GRPOPEN : IMG_GRPCLOSED; + TreeView_SetItem(lpnmhdr->hwndFrom, &tvi); + break; + } + } + break; + } } return FALSE; } @@ -326,7 +326,7 @@ DWORD OptTree_GetOptions(HWND hwnd, int idcTree, OPTTREE_OPTION *options, int op if ((!options[i].pszSettingName && !pszSettingName) || (options[i].pszSettingName && pszSettingName && !mir_tstrcmp(options[i].pszSettingName, pszSettingName))) { - TVITEM tvi = {0}; + TVITEM tvi = { 0 }; tvi.mask = TVIF_HANDLE | TVIF_IMAGE; tvi.hItem = options[i].hItem; TreeView_GetItem(hwndTree, &tvi); -- cgit v1.2.3