- fixed crazy drawing bug in nicer;

- code cleaning

git-svn-id: http://svn.miranda-ng.org/main/trunk@2281 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

1 files changed, 174 insertions, 174 deletions

diff --git a/src/modules/visibility/visibility.cpp b/src/modules/visibility/visibility.cpp
index 88f43b4a3c..10a89ce628 100644
--- a/src/modules/visibility/visibility.cpp
+++ b/src/modules/visibility/visibility.cpp
@@ -24,29 +24,32 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 static void SetListGroupIcons(HWND hwndList, HANDLE hFirstItem, HANDLE hParentItem, int *groupChildCount)

 {

-	int typeOfFirst;

 	int iconOn[2] = {1, 1};

-	int childCount[2] = {0, 0}, i;

-	int iImage;

-	HANDLE hItem, hChildItem;

+	int childCount[2] = {0, 0};

 

-	typeOfFirst = SendMessage(hwndList, CLM_GETITEMTYPE, (WPARAM)hFirstItem, 0);

+	int typeOfFirst = SendMessage(hwndList, CLM_GETITEMTYPE, (WPARAM)hFirstItem, 0);

 	//check groups

-	if (typeOfFirst == CLCIT_GROUP) hItem = hFirstItem;

-	else hItem = (HANDLE)SendMessage(hwndList, CLM_GETNEXTITEM, CLGN_NEXTGROUP, (LPARAM)hFirstItem);

+	HANDLE hItem;

+	if (typeOfFirst == CLCIT_GROUP)

+		hItem = hFirstItem;

+	else

+		hItem = (HANDLE)SendMessage(hwndList, CLM_GETNEXTITEM, CLGN_NEXTGROUP, (LPARAM)hFirstItem);

+

 	while (hItem) {

-		hChildItem = (HANDLE)SendMessage(hwndList, CLM_GETNEXTITEM, CLGN_CHILD, (LPARAM)hItem);

+		HANDLE hChildItem = (HANDLE)SendMessage(hwndList, CLM_GETNEXTITEM, CLGN_CHILD, (LPARAM)hItem);

 		if (hChildItem) SetListGroupIcons(hwndList, hChildItem, hItem, childCount);

-		for (i=0; i < SIZEOF(iconOn); i++)

+		for (int i=0; i < SIZEOF(iconOn); i++)

 			if (iconOn[i] && SendMessage(hwndList, CLM_GETEXTRAIMAGE, (WPARAM)hItem, i) == 0) iconOn[i] = 0;

 		hItem = (HANDLE)SendMessage(hwndList, CLM_GETNEXTITEM, CLGN_NEXTGROUP, (LPARAM)hItem);

 	}

 	//check contacts

-	if (typeOfFirst == CLCIT_CONTACT) hItem = hFirstItem;

-	else hItem = (HANDLE)SendMessage(hwndList, CLM_GETNEXTITEM, CLGN_NEXTCONTACT, (LPARAM)hFirstItem);

+	if (typeOfFirst == CLCIT_CONTACT)

+		hItem = hFirstItem;

+	else

+		hItem = (HANDLE)SendMessage(hwndList, CLM_GETNEXTITEM, CLGN_NEXTCONTACT, (LPARAM)hFirstItem);

 	while (hItem) {

-		for (i=0; i < SIZEOF(iconOn); i++) {

-			iImage = SendMessage(hwndList, CLM_GETEXTRAIMAGE, (WPARAM)hItem, i);

+		for (int i=0; i < SIZEOF(iconOn); i++) {

+			int iImage = SendMessage(hwndList, CLM_GETEXTRAIMAGE, (WPARAM)hItem, i);

 			if (iconOn[i] && iImage == 0) iconOn[i] = 0;

 			if (iImage != EMPTY_EXTRA_ICON)

 				childCount[i]++;

@@ -54,7 +57,7 @@ static void SetListGroupIcons(HWND hwndList, HANDLE hFirstItem, HANDLE hParentIt
 		hItem = (HANDLE)SendMessage(hwndList, CLM_GETNEXTITEM, CLGN_NEXTCONTACT, (LPARAM)hItem);

 	}

 	//set icons

-	for (i=0; i < SIZEOF(iconOn); i++) {

+	for (int i=0; i < SIZEOF(iconOn); i++) {

 		SendMessage(hwndList, CLM_SETEXTRAIMAGE, (WPARAM)hParentItem, MAKELPARAM(i, childCount[i]?(iconOn[i]?i+1:0):EMPTY_EXTRA_ICON));

 		if (groupChildCount) groupChildCount[i]+=childCount[i];

 	}

@@ -62,23 +65,26 @@ static void SetListGroupIcons(HWND hwndList, HANDLE hFirstItem, HANDLE hParentIt
 

 static void SetAllChildIcons(HWND hwndList, HANDLE hFirstItem, int iColumn, int iImage)

 {

-	int typeOfFirst, iOldIcon;

-	HANDLE hItem, hChildItem;

-

-	typeOfFirst = SendMessage(hwndList, CLM_GETITEMTYPE, (WPARAM)hFirstItem, 0);

+	int typeOfFirst = SendMessage(hwndList, CLM_GETITEMTYPE, (WPARAM)hFirstItem, 0);

 	//check groups

-	if (typeOfFirst == CLCIT_GROUP) hItem = hFirstItem;

-	else hItem = (HANDLE)SendMessage(hwndList, CLM_GETNEXTITEM, CLGN_NEXTGROUP, (LPARAM)hFirstItem);

+	HANDLE hItem;

+	if (typeOfFirst == CLCIT_GROUP)

+		hItem = hFirstItem;

+	else

+		hItem = (HANDLE)SendMessage(hwndList, CLM_GETNEXTITEM, CLGN_NEXTGROUP, (LPARAM)hFirstItem);

 	while (hItem) {

-		hChildItem = (HANDLE)SendMessage(hwndList, CLM_GETNEXTITEM, CLGN_CHILD, (LPARAM)hItem);

-		if (hChildItem) SetAllChildIcons(hwndList, hChildItem, iColumn, iImage);

+		HANDLE hChildItem = (HANDLE)SendMessage(hwndList, CLM_GETNEXTITEM, CLGN_CHILD, (LPARAM)hItem);

+		if (hChildItem)

+			SetAllChildIcons(hwndList, hChildItem, iColumn, iImage);

 		hItem = (HANDLE)SendMessage(hwndList, CLM_GETNEXTITEM, CLGN_NEXTGROUP, (LPARAM)hItem);

 	}

 	//check contacts

-	if (typeOfFirst == CLCIT_CONTACT) hItem = hFirstItem;

-	else hItem = (HANDLE)SendMessage(hwndList, CLM_GETNEXTITEM, CLGN_NEXTCONTACT, (LPARAM)hFirstItem);

+	if (typeOfFirst == CLCIT_CONTACT)

+		hItem = hFirstItem;

+	else

+		hItem = (HANDLE)SendMessage(hwndList, CLM_GETNEXTITEM, CLGN_NEXTCONTACT, (LPARAM)hFirstItem);

 	while (hItem) {

-		iOldIcon = SendMessage(hwndList, CLM_GETEXTRAIMAGE, (WPARAM)hItem, iColumn);

+		int iOldIcon = SendMessage(hwndList, CLM_GETEXTRAIMAGE, (WPARAM)hItem, iColumn);

 		if (iOldIcon != EMPTY_EXTRA_ICON && iOldIcon != iImage)

 			SendMessage(hwndList, CLM_SETEXTRAIMAGE, (WPARAM)hItem, MAKELPARAM(iColumn, iImage));

 		hItem = (HANDLE)SendMessage(hwndList, CLM_GETNEXTITEM, CLGN_NEXTCONTACT, (LPARAM)hItem);

@@ -87,45 +93,44 @@ static void SetAllChildIcons(HWND hwndList, HANDLE hFirstItem, int iColumn, int
 

 static void ResetListOptions(HWND hwndList)

 {

-	int i;

-

-	SendMessage(hwndList, CLM_SETBKBITMAP, 0, (LPARAM)(HBITMAP)NULL);

+	SendMessage(hwndList, CLM_SETBKBITMAP, 0, 0);

 	SendMessage(hwndList, CLM_SETBKCOLOR, GetSysColor(COLOR_WINDOW), 0);

 	SendMessage(hwndList, CLM_SETGREYOUTFLAGS, 0, 0);

 	SendMessage(hwndList, CLM_SETLEFTMARGIN, 2, 0);

 	SendMessage(hwndList, CLM_SETINDENT, 10, 0);

-	for (i=0;i <= FONTID_MAX;i++)

+	for (int i=0; i <= FONTID_MAX; i++)

 		SendMessage(hwndList, CLM_SETTEXTCOLOR, i, GetSysColor(COLOR_WINDOWTEXT));

 	SetWindowLongPtr(hwndList, GWL_STYLE, GetWindowLongPtr(hwndList, GWL_STYLE)|CLS_SHOWHIDDEN);

 }

 

 static void SetAllContactIcons(HWND hwndList)

 {

-	HANDLE hContact, hItem;

-	char *szProto;

-	DWORD flags;

-	WORD status;

-

-	hContact = db_find_first();

+	HANDLE hContact = db_find_first();

 	do {

-		hItem = (HANDLE)SendMessage(hwndList, CLM_FINDCONTACT, (WPARAM)hContact, 0);

+		HANDLE hItem = (HANDLE)SendMessage(hwndList, CLM_FINDCONTACT, (WPARAM)hContact, 0);

 		if (hItem) {

-			szProto = (char*)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0);

-			if (szProto == NULL) {flags = 0; status = 0;}

+			DWORD flags;

+			WORD status;

+			char *szProto = (char*)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0);

+			if (szProto == NULL) {

+				flags = 0;

+				status = 0;

+			}

 			else {

 				flags = CallProtoServiceInt(NULL,szProto, PS_GETCAPS, PFLAGNUM_1, 0);

 				status = DBGetContactSettingWord(hContact, szProto, "ApparentMode", 0);

 			}

-			if (flags & PF1_INVISLIST) {

+

+			if (flags & PF1_INVISLIST)

 				if (SendMessage(hwndList, CLM_GETEXTRAIMAGE, (WPARAM)hItem, MAKELPARAM(0, 0)) == EMPTY_EXTRA_ICON)

-					SendMessage(hwndList, CLM_SETEXTRAIMAGE, (WPARAM)hItem, MAKELPARAM(0, status == ID_STATUS_ONLINE?1:0));

-			}

-			if (flags & PF1_VISLIST) {

+					SendMessage(hwndList, CLM_SETEXTRAIMAGE, (WPARAM)hItem, MAKELPARAM(0, status == ID_STATUS_ONLINE ? 1 : 0));

+

+			if (flags & PF1_VISLIST)

 				if (SendMessage(hwndList, CLM_GETEXTRAIMAGE, (WPARAM)hItem, MAKELPARAM(1, 0)) == EMPTY_EXTRA_ICON)

-					SendMessage(hwndList, CLM_SETEXTRAIMAGE, (WPARAM)hItem, MAKELPARAM(1, status == ID_STATUS_OFFLINE?2:0));

-			}

+					SendMessage(hwndList, CLM_SETEXTRAIMAGE, (WPARAM)hItem, MAKELPARAM(1, status == ID_STATUS_OFFLINE ? 2 : 0));

 		}

-	} while (hContact = db_find_next(hContact));

+	}

+		while (hContact = db_find_next(hContact));

 }

 

 static INT_PTR CALLBACK DlgProcVisibilityOpts(HWND hwndDlg, UINT msg, WPARAM, LPARAM lParam)

@@ -133,146 +138,141 @@ static INT_PTR CALLBACK DlgProcVisibilityOpts(HWND hwndDlg, UINT msg, WPARAM, LP
 	static HICON hVisibleIcon, hInvisibleIcon;

 	static HANDLE hItemAll;

 

-	switch (msg)

-	{

-		case WM_INITDIALOG:

-			TranslateDialogDefault(hwndDlg);

-			{	HIMAGELIST hIml;

-				hIml = ImageList_Create(GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), (IsWinVerXPPlus()?ILC_COLOR32:ILC_COLOR16)|ILC_MASK, 3, 3);

-				ImageList_AddIcon_IconLibLoaded(hIml, SKINICON_OTHER_SMALLDOT);

-				ImageList_AddIcon_IconLibLoaded(hIml, SKINICON_STATUS_INVISIBLE);

-				ImageList_AddIcon_IconLibLoaded(hIml, SKINICON_STATUS_OFFLINE);

-				SendDlgItemMessage(hwndDlg, IDC_LIST, CLM_SETEXTRAIMAGELIST, 0, (LPARAM)hIml);

-				hVisibleIcon = ImageList_GetIcon(hIml, 1, ILD_NORMAL);

-				SendDlgItemMessage(hwndDlg, IDC_VISIBLEICON, STM_SETICON, (WPARAM)hVisibleIcon, 0);

-				hInvisibleIcon = ImageList_GetIcon(hIml, 2, ILD_NORMAL);

-				SendDlgItemMessage(hwndDlg, IDC_INVISIBLEICON, STM_SETICON, (WPARAM)hInvisibleIcon, 0);

-			}

+	HIMAGELIST hIml;

 

-			ResetListOptions( GetDlgItem(hwndDlg, IDC_LIST));

-			SendDlgItemMessage(hwndDlg, IDC_LIST, CLM_SETEXTRACOLUMNS, 2, 0);

+	switch (msg) {

+	case WM_INITDIALOG:

+		TranslateDialogDefault(hwndDlg);

 

-			{	CLCINFOITEM cii = {0};

-				cii.cbSize = sizeof(cii);

-				cii.flags = CLCIIF_GROUPFONT;

-				cii.pszText = TranslateT("** All contacts **");

-				hItemAll = (HANDLE)SendDlgItemMessage(hwndDlg, IDC_LIST, CLM_ADDINFOITEM, 0, (LPARAM)&cii);

-			}

+		hIml = ImageList_Create(GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), (IsWinVerXPPlus()?ILC_COLOR32:ILC_COLOR16)|ILC_MASK, 3, 3);

+		ImageList_AddIcon_IconLibLoaded(hIml, SKINICON_OTHER_SMALLDOT);

+		ImageList_AddIcon_IconLibLoaded(hIml, SKINICON_STATUS_INVISIBLE);

+		ImageList_AddIcon_IconLibLoaded(hIml, SKINICON_STATUS_OFFLINE);

+		SendDlgItemMessage(hwndDlg, IDC_LIST, CLM_SETEXTRAIMAGELIST, 0, (LPARAM)hIml);

+		hVisibleIcon = ImageList_GetIcon(hIml, 1, ILD_NORMAL);

+		SendDlgItemMessage(hwndDlg, IDC_VISIBLEICON, STM_SETICON, (WPARAM)hVisibleIcon, 0);

+		hInvisibleIcon = ImageList_GetIcon(hIml, 2, ILD_NORMAL);

+		SendDlgItemMessage(hwndDlg, IDC_INVISIBLEICON, STM_SETICON, (WPARAM)hInvisibleIcon, 0);

 

-			SetAllContactIcons( GetDlgItem(hwndDlg, IDC_LIST));

-			SetListGroupIcons( GetDlgItem(hwndDlg, IDC_LIST), (HANDLE)SendDlgItemMessage(hwndDlg, IDC_LIST, CLM_GETNEXTITEM, CLGN_ROOT, 0), hItemAll, NULL);

-			return TRUE;

-		case WM_SETFOCUS:

-			SetFocus( GetDlgItem(hwndDlg, IDC_LIST));

-			break;

-		case WM_NOTIFY:

-			switch(((LPNMHDR)lParam)->idFrom) {

-				case IDC_LIST:

-					switch (((LPNMHDR)lParam)->code)

-					{

-						case CLN_NEWCONTACT:

-						case CLN_LISTREBUILT:

-							SetAllContactIcons( GetDlgItem(hwndDlg, IDC_LIST));

-							//fall through

-						case CLN_CONTACTMOVED:

-							SetListGroupIcons( GetDlgItem(hwndDlg, IDC_LIST), (HANDLE)SendDlgItemMessage(hwndDlg, IDC_LIST, CLM_GETNEXTITEM, CLGN_ROOT, 0), hItemAll, NULL);

-							break;

-						case CLN_OPTIONSCHANGED:

-							ResetListOptions( GetDlgItem(hwndDlg, IDC_LIST));

-							break;

-						case NM_CLICK:

-						{	HANDLE hItem;

-							NMCLISTCONTROL *nm = (NMCLISTCONTROL*)lParam;

-							DWORD hitFlags;

-							int iImage;

-							int itemType;

-

-							// Make sure we have an extra column

-							if (nm->iColumn == -1)

-								break;

+		ResetListOptions( GetDlgItem(hwndDlg, IDC_LIST));

+		SendDlgItemMessage(hwndDlg, IDC_LIST, CLM_SETEXTRACOLUMNS, 2, 0);

+		{

+			CLCINFOITEM cii = { sizeof(cii) };

+			cii.flags = CLCIIF_GROUPFONT;

+			cii.pszText = TranslateT("** All contacts **");

+			hItemAll = (HANDLE)SendDlgItemMessage(hwndDlg, IDC_LIST, CLM_ADDINFOITEM, 0, (LPARAM)&cii);

+		}

+		SetAllContactIcons( GetDlgItem(hwndDlg, IDC_LIST));

+		SetListGroupIcons( GetDlgItem(hwndDlg, IDC_LIST), (HANDLE)SendDlgItemMessage(hwndDlg, IDC_LIST, CLM_GETNEXTITEM, CLGN_ROOT, 0), hItemAll, NULL);

+		return TRUE;

 

-							// Find clicked item

-							hItem = (HANDLE)SendDlgItemMessage(hwndDlg, IDC_LIST, CLM_HITTEST, (WPARAM)&hitFlags, MAKELPARAM(nm->pt.x, nm->pt.y));

-							// Nothing was clicked

-							if (hItem == NULL) break; 

-							// It was not a visbility icon

-							if ( !(hitFlags & CLCHT_ONITEMEXTRA)) break;

-

-							// Get image in clicked column (0 = none, 1 = visible, 2 = invisible)

-							iImage = SendDlgItemMessage(hwndDlg, IDC_LIST, CLM_GETEXTRAIMAGE, (WPARAM)hItem, MAKELPARAM(nm->iColumn, 0));

-							if (iImage == 0)

-								iImage = nm->iColumn + 1;

-							else

-								if (iImage == 1 || iImage == 2)

-									iImage = 0;

-

-							// Get item type (contact, group, etc...)

-							itemType = SendDlgItemMessage(hwndDlg, IDC_LIST, CLM_GETITEMTYPE, (WPARAM)hItem, 0);

-

-							// Update list, making sure that the options are mutually exclusive

-							if (itemType == CLCIT_CONTACT) { // A contact

-								SendDlgItemMessage(hwndDlg, IDC_LIST, CLM_SETEXTRAIMAGE, (WPARAM)hItem, MAKELPARAM(nm->iColumn, iImage));

-								if (iImage && SendDlgItemMessage(hwndDlg, IDC_LIST, CLM_GETEXTRAIMAGE, (WPARAM)hItem, MAKELPARAM(nm->iColumn?0:1, 0)) != EMPTY_EXTRA_ICON)

-									SendDlgItemMessage(hwndDlg, IDC_LIST, CLM_SETEXTRAIMAGE, (WPARAM)hItem, MAKELPARAM(nm->iColumn?0:1, 0));

-							}

-							else if (itemType == CLCIT_INFO) {	 // All Contacts

-								SetAllChildIcons( GetDlgItem(hwndDlg, IDC_LIST), hItem, nm->iColumn, iImage);

-								if (iImage)

-									SetAllChildIcons( GetDlgItem(hwndDlg, IDC_LIST), hItem, nm->iColumn?0:1, 0);

-							}

-							else if (itemType == CLCIT_GROUP) { // A group

-								hItem = (HANDLE)SendDlgItemMessage(hwndDlg, IDC_LIST, CLM_GETNEXTITEM, CLGN_CHILD, (LPARAM)hItem);

-								if (hItem) {

-									SetAllChildIcons( GetDlgItem(hwndDlg, IDC_LIST), hItem, nm->iColumn, iImage);

-									if (iImage)

-										SetAllChildIcons( GetDlgItem(hwndDlg, IDC_LIST), hItem, nm->iColumn?0:1, 0);

-								}

-							}

-							// Update the all/none icons

-							SetListGroupIcons( GetDlgItem(hwndDlg, IDC_LIST), (HANDLE)SendDlgItemMessage(hwndDlg, IDC_LIST, CLM_GETNEXTITEM, CLGN_ROOT, 0), hItemAll, NULL);

+	case WM_SETFOCUS:

+		SetFocus( GetDlgItem(hwndDlg, IDC_LIST));

+		break;

 

-							// Activate Apply button

-							SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0);

-							break;

-						}

+	case WM_NOTIFY:

+		switch(((LPNMHDR)lParam)->idFrom) {

+		case IDC_LIST:

+			switch (((LPNMHDR)lParam)->code) {

+			case CLN_NEWCONTACT:

+			case CLN_LISTREBUILT:

+				SetAllContactIcons( GetDlgItem(hwndDlg, IDC_LIST));

+				//fall through

+			case CLN_CONTACTMOVED:

+				SetListGroupIcons( GetDlgItem(hwndDlg, IDC_LIST), (HANDLE)SendDlgItemMessage(hwndDlg, IDC_LIST, CLM_GETNEXTITEM, CLGN_ROOT, 0), hItemAll, NULL);

+				break;

+

+			case CLN_OPTIONSCHANGED:

+				ResetListOptions( GetDlgItem(hwndDlg, IDC_LIST));

+				break;

+

+			case NM_CLICK:

+				{

+					// Make sure we have an extra column

+					NMCLISTCONTROL *nm = (NMCLISTCONTROL*)lParam;

+					if (nm->iColumn == -1)

+						break;

+

+					// Find clicked item

+					DWORD hitFlags;

+					HANDLE hItem = (HANDLE)SendDlgItemMessage(hwndDlg, IDC_LIST, CLM_HITTEST, (WPARAM)&hitFlags, MAKELPARAM(nm->pt.x, nm->pt.y));

+					if (hItem == NULL)

+						break; 

+

+					// It was not a visbility icon

+					if ( !(hitFlags & CLCHT_ONITEMEXTRA))

+						break;

+

+					// Get image in clicked column (0 = none, 1 = visible, 2 = invisible)

+					int iImage = SendDlgItemMessage(hwndDlg, IDC_LIST, CLM_GETEXTRAIMAGE, (WPARAM)hItem, MAKELPARAM(nm->iColumn, 0));

+					if (iImage == 0)

+						iImage = nm->iColumn + 1;

+					else if (iImage == 1 || iImage == 2)

+						iImage = 0;

+

+					// Get item type (contact, group, etc...)

+					int itemType = SendDlgItemMessage(hwndDlg, IDC_LIST, CLM_GETITEMTYPE, (WPARAM)hItem, 0);

+

+					// Update list, making sure that the options are mutually exclusive

+					if (itemType == CLCIT_CONTACT) { // A contact

+						SendDlgItemMessage(hwndDlg, IDC_LIST, CLM_SETEXTRAIMAGE, (WPARAM)hItem, MAKELPARAM(nm->iColumn, iImage));

+						if (iImage && SendDlgItemMessage(hwndDlg, IDC_LIST, CLM_GETEXTRAIMAGE, (WPARAM)hItem, MAKELPARAM(nm->iColumn?0:1, 0)) != EMPTY_EXTRA_ICON)

+							SendDlgItemMessage(hwndDlg, IDC_LIST, CLM_SETEXTRAIMAGE, (WPARAM)hItem, MAKELPARAM(nm->iColumn?0:1, 0));

 					}

-					break;

-				case 0:

-					switch (((LPNMHDR)lParam)->code)

-					{

-						case PSN_APPLY:

-						{	HANDLE hContact, hItem;

-							int set, i, iImage;

-

-							hContact = db_find_first();

-							do {

-								hItem = (HANDLE)SendDlgItemMessage(hwndDlg, IDC_LIST, CLM_FINDCONTACT, (WPARAM)hContact, 0);

-								if (hItem) {

-									set = 0;

-									for (i=0;i<2;i++) {

-										iImage = SendDlgItemMessage(hwndDlg, IDC_LIST, CLM_GETEXTRAIMAGE, (WPARAM)hItem, MAKELPARAM(i, 0));

-										if (iImage == i+1) {

-											CallContactService(hContact, PSS_SETAPPARENTMODE, iImage == 1?ID_STATUS_ONLINE:ID_STATUS_OFFLINE, 0);

-											set = 1;

-											break;

-										}

-									}

-									if ( !set) CallContactService(hContact, PSS_SETAPPARENTMODE, 0, 0);

-								}

-							} while (hContact = db_find_next(hContact));

-							return TRUE;

+					else if (itemType == CLCIT_INFO) {	 // All Contacts

+						SetAllChildIcons( GetDlgItem(hwndDlg, IDC_LIST), hItem, nm->iColumn, iImage);

+						if (iImage)

+							SetAllChildIcons( GetDlgItem(hwndDlg, IDC_LIST), hItem, nm->iColumn?0:1, 0);

+					}

+					else if (itemType == CLCIT_GROUP) { // A group

+						hItem = (HANDLE)SendDlgItemMessage(hwndDlg, IDC_LIST, CLM_GETNEXTITEM, CLGN_CHILD, (LPARAM)hItem);

+						if (hItem) {

+							SetAllChildIcons( GetDlgItem(hwndDlg, IDC_LIST), hItem, nm->iColumn, iImage);

+							if (iImage)

+								SetAllChildIcons( GetDlgItem(hwndDlg, IDC_LIST), hItem, nm->iColumn?0:1, 0);

 						}

 					}

-					break;

+					// Update the all/none icons

+					SetListGroupIcons( GetDlgItem(hwndDlg, IDC_LIST), (HANDLE)SendDlgItemMessage(hwndDlg, IDC_LIST, CLM_GETNEXTITEM, CLGN_ROOT, 0), hItemAll, NULL);

+

+					// Activate Apply button

+					SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0);

+				}

 			}

 			break;

-		case WM_DESTROY:

-			DestroyIcon(hVisibleIcon);

-			DestroyIcon(hInvisibleIcon);

-			{	HIMAGELIST hIml = (HIMAGELIST)SendDlgItemMessage(hwndDlg, IDC_LIST, CLM_GETEXTRAIMAGELIST, 0, 0);

-				ImageList_Destroy(hIml);

+

+		case 0:

+			if (((LPNMHDR)lParam)->code == PSN_APPLY) {

+				HANDLE hContact = db_find_first();

+				do {

+					HANDLE hItem = (HANDLE)SendDlgItemMessage(hwndDlg, IDC_LIST, CLM_FINDCONTACT, (WPARAM)hContact, 0);

+					if (hItem) {

+						int set = 0;

+						for (int i=0; i < 2; i++) {

+							int iImage = SendDlgItemMessage(hwndDlg, IDC_LIST, CLM_GETEXTRAIMAGE, (WPARAM)hItem, MAKELPARAM(i, 0));

+							if (iImage == i+1) {

+								CallContactService(hContact, PSS_SETAPPARENTMODE, iImage == 1?ID_STATUS_ONLINE:ID_STATUS_OFFLINE, 0);

+								set = 1;

+								break;

+							}

+						}

+						if ( !set)

+							CallContactService(hContact, PSS_SETAPPARENTMODE, 0, 0);

+					}

+				}

+					while (hContact = db_find_next(hContact));

+				return TRUE;

 			}

-			break;

+		}

+		break;

+

+	case WM_DESTROY:

+		DestroyIcon(hVisibleIcon);

+		DestroyIcon(hInvisibleIcon);

+

+		hIml = (HIMAGELIST)SendDlgItemMessage(hwndDlg, IDC_LIST, CLM_GETEXTRAIMAGELIST, 0, 0);

+		ImageList_Destroy(hIml);

+		break;

 	}

 	return FALSE;

 }