patch for the core Mbutton class customization, to use the themes defined by plugins

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

1 files changed, 202 insertions, 202 deletions

diff --git a/plugins/Clist_nicer/SRC/clistmenus.cpp b/plugins/Clist_nicer/SRC/clistmenus.cpp
index 082a655b5b..a1947e51a3 100644
--- a/plugins/Clist_nicer/SRC/clistmenus.cpp
+++ b/plugins/Clist_nicer/SRC/clistmenus.cpp
@@ -113,240 +113,240 @@ static INT_PTR CALLBACK IgnoreDialogProc(HWND hWnd, UINT msg, WPARAM wParam, LPA
 			SendMessage(hWnd, WM_USER + 120, 0, 0);

 			TranslateDialogDefault(hWnd);

 			hwndAdd = GetDlgItem(hWnd, IDC_IGN_ADDPERMANENTLY); // CreateWindowEx(0, _T("CLCButtonClass"), _T("FOO"), WS_VISIBLE | BS_PUSHBUTTON | WS_CHILD | WS_TABSTOP, 200, 276, 106, 24, hWnd, (HMENU)IDC_IGN_ADDPERMANENTLY, g_hInst, NULL);

-			SendMessage(hwndAdd, BUTTONSETASFLATBTN, FALSE, 0);

-			SendMessage(hwndAdd, BUTTONSETASTHEMEDBTN, TRUE, 0);

+			CustomizeButton(hwndAdd, false, true, false);

 

 			SendMessage(hwndAdd, BM_SETIMAGE, IMAGE_ICON, (LPARAM)LoadImage(GetModuleHandle(NULL), MAKEINTRESOURCE(210), IMAGE_ICON, 16, 16, LR_SHARED));

 			SetWindowText(hwndAdd, TranslateT("Add permanently"));

 			EnableWindow(hwndAdd, cfg::getByte(hContact, "CList", "NotOnList", 0));

 

-            hwndAdd = GetDlgItem(hWnd, IDC_DSP_LOADDEFAULT); // CreateWindowEx(0, _T("CLCButtonClass"), _T("FOO"), WS_VISIBLE | BS_PUSHBUTTON | WS_CHILD | WS_TABSTOP, 200, 276, 106, 24, hWnd, (HMENU)IDC_IGN_ADDPERMANENTLY, g_hInst, NULL);

-            SendMessage(hwndAdd, BUTTONSETASFLATBTN, FALSE, 0);

-            SendMessage(hwndAdd, BUTTONSETASTHEMEDBTN, TRUE, 0);

+			hwndAdd = GetDlgItem(hWnd, IDC_DSP_LOADDEFAULT); // CreateWindowEx(0, _T("CLCButtonClass"), _T("FOO"), WS_VISIBLE | BS_PUSHBUTTON | WS_CHILD | WS_TABSTOP, 200, 276, 106, 24, hWnd, (HMENU)IDC_IGN_ADDPERMANENTLY, g_hInst, NULL);

+			CustomizeButton(hwndAdd, false, true, false);

 

-            SendMessage(hwndAdd, BM_SETIMAGE, IMAGE_ICON, (LPARAM)LoadImage(GetModuleHandle(NULL), MAKEINTRESOURCE(IDI_DELETE), IMAGE_ICON, 16, 16, LR_SHARED));

-            SetWindowText(hwndAdd, TranslateT("Revert to default"));

-            EnableWindow(hwndAdd, TRUE);

+			SendMessage(hwndAdd, BM_SETIMAGE, IMAGE_ICON, (LPARAM)LoadImage(GetModuleHandle(NULL), MAKEINTRESOURCE(IDI_DELETE), IMAGE_ICON, 16, 16, LR_SHARED));

+			SetWindowText(hwndAdd, TranslateT("Revert to default"));

+			EnableWindow(hwndAdd, TRUE);

 

-            SendDlgItemMessage(hWnd, IDC_AVATARDISPMODE, CB_INSERTSTRING, -1, (LPARAM)TranslateT("Default (global setting)"));

-            SendDlgItemMessage(hWnd, IDC_AVATARDISPMODE, CB_INSERTSTRING, -1, (LPARAM)TranslateT("Show always when available"));

-            SendDlgItemMessage(hWnd, IDC_AVATARDISPMODE, CB_INSERTSTRING, -1, (LPARAM)TranslateT("Hide always"));

+			SendDlgItemMessage(hWnd, IDC_AVATARDISPMODE, CB_INSERTSTRING, -1, (LPARAM)TranslateT("Default (global setting)"));

+			SendDlgItemMessage(hWnd, IDC_AVATARDISPMODE, CB_INSERTSTRING, -1, (LPARAM)TranslateT("Show always when available"));

+			SendDlgItemMessage(hWnd, IDC_AVATARDISPMODE, CB_INSERTSTRING, -1, (LPARAM)TranslateT("Hide always"));

 

-            SendDlgItemMessage(hWnd, IDC_SECONDLINEMODE, CB_INSERTSTRING, -1, (LPARAM)TranslateT("Default (global setting)"));

-            SendDlgItemMessage(hWnd, IDC_SECONDLINEMODE, CB_INSERTSTRING, -1, (LPARAM)TranslateT("Never"));

-            SendDlgItemMessage(hWnd, IDC_SECONDLINEMODE, CB_INSERTSTRING, -1, (LPARAM)TranslateT("Always"));

-            SendDlgItemMessage(hWnd, IDC_SECONDLINEMODE, CB_INSERTSTRING, -1, (LPARAM)TranslateT("When space is available"));

-            SendDlgItemMessage(hWnd, IDC_SECONDLINEMODE, CB_INSERTSTRING, -1, (LPARAM)TranslateT("When needed by status message"));

+			SendDlgItemMessage(hWnd, IDC_SECONDLINEMODE, CB_INSERTSTRING, -1, (LPARAM)TranslateT("Default (global setting)"));

+			SendDlgItemMessage(hWnd, IDC_SECONDLINEMODE, CB_INSERTSTRING, -1, (LPARAM)TranslateT("Never"));

+			SendDlgItemMessage(hWnd, IDC_SECONDLINEMODE, CB_INSERTSTRING, -1, (LPARAM)TranslateT("Always"));

+			SendDlgItemMessage(hWnd, IDC_SECONDLINEMODE, CB_INSERTSTRING, -1, (LPARAM)TranslateT("When space is available"));

+			SendDlgItemMessage(hWnd, IDC_SECONDLINEMODE, CB_INSERTSTRING, -1, (LPARAM)TranslateT("When needed by status message"));

 

 			if(cfg::clcdat) {

 				FindItem(pcli->hwndContactTree, cfg::clcdat, hContact, &contact, NULL, NULL); 

-                if(contact && contact->type != CLCIT_CONTACT) {

-                    DestroyWindow(hWnd);

-                    return FALSE;

-                } else {

-                    TCHAR szTitle[512];

-                    DWORD dwFlags = cfg::getDword(hContact, "CList", "CLN_Flags", 0);

-                    BYTE  bSecondLine = cfg::getByte(hContact, "CList", "CLN_2ndline", -1);

-                    DWORD dwXMask = cfg::getDword(hContact, "CList", "CLN_xmask", 0);

-                    int   i = 0;

-

-                    mir_sntprintf(szTitle, 512, TranslateT("Contact list display and ignore options for %s"), contact ? contact->szText : (TCHAR *)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)hContact, GCDNF_TCHAR));

-

-                    SetWindowText(hWnd, szTitle);

-                    SendMessage(hWnd, WM_SETICON, ICON_BIG, (LPARAM)LoadSkinnedIcon(SKINICON_OTHER_MIRANDA));

-                    pCaps = CallProtoService(contact ? contact->proto : (char *)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0), PS_GETCAPS, PFLAGNUM_1, 0);

-                    Utils::enableDlgControl(hWnd, IDC_IGN_ALWAYSONLINE, pCaps & PF1_INVISLIST ? TRUE : FALSE);

-                    Utils::enableDlgControl(hWnd, IDC_IGN_ALWAYSOFFLINE, pCaps & PF1_VISLIST ? TRUE : FALSE);

-                    CheckDlgButton(hWnd, IDC_IGN_PRIORITY, cfg::getByte(hContact, "CList", "Priority", 0) ? 1 : 0);

-                    Utils::enableDlgControl(hWnd, IDC_IGN_PRIORITY, TRUE);

-                    Utils::enableDlgControl(hWnd, IDC_AVATARDISPMODE, TRUE);

-                    Utils::enableDlgControl(hWnd, IDC_SECONDLINEMODE, TRUE);

-                    if(dwFlags & ECF_FORCEAVATAR)

-                        SendDlgItemMessage(hWnd, IDC_AVATARDISPMODE, CB_SETCURSEL, 1, 0);

-                    else if(dwFlags & ECF_HIDEAVATAR)

-                        SendDlgItemMessage(hWnd, IDC_AVATARDISPMODE, CB_SETCURSEL, 2, 0);

-                    else

-                        SendDlgItemMessage(hWnd, IDC_AVATARDISPMODE, CB_SETCURSEL, 0, 0);

-

-                    if(dwFlags & ECF_FORCEOVERLAY)

-                        SendDlgItemMessage(hWnd, IDC_OVERLAYICON, BM_SETCHECK, BST_CHECKED, 0);

-                    else if(dwFlags & ECF_HIDEOVERLAY)

-                        SendDlgItemMessage(hWnd, IDC_OVERLAYICON, BM_SETCHECK, BST_UNCHECKED, 0);

-                    else

-                        SendDlgItemMessage(hWnd, IDC_OVERLAYICON, BM_SETCHECK, BST_INDETERMINATE, 0);

-

-                    if(dwFlags & ECF_FORCELOCALTIME)

-                        SendDlgItemMessage(hWnd, IDC_SHOWLOCALTIME1, BM_SETCHECK, BST_CHECKED, 0);

-                    else if(dwFlags & ECF_HIDELOCALTIME)

-                        SendDlgItemMessage(hWnd, IDC_SHOWLOCALTIME1, BM_SETCHECK, BST_UNCHECKED, 0);

-                    else

-                        SendDlgItemMessage(hWnd, IDC_SHOWLOCALTIME1, BM_SETCHECK, BST_INDETERMINATE, 0);

-

-                    if(dwFlags & ECF_FORCEVISIBILITY)

-                        SendDlgItemMessage(hWnd, IDC_SHOWVISIBILITY, BM_SETCHECK, BST_CHECKED, 0);

-                    else if(dwFlags & ECF_HIDEVISIBILITY)

-                        SendDlgItemMessage(hWnd, IDC_SHOWVISIBILITY, BM_SETCHECK, BST_UNCHECKED, 0);

-                    else

-                        SendDlgItemMessage(hWnd, IDC_SHOWVISIBILITY, BM_SETCHECK, BST_INDETERMINATE, 0);

-

-                    while(xImgCtrlIds[i] != 0) {

-                        if(dwXMask & (1 << (2 * xImgCtrlBits[i])))

-                            SendDlgItemMessage(hWnd, xImgCtrlIds[i], BM_SETCHECK, BST_CHECKED, 0);

-                        else if(dwXMask & (1 << (2 * xImgCtrlBits[i] + 1)))

-                            SendDlgItemMessage(hWnd, xImgCtrlIds[i], BM_SETCHECK, BST_UNCHECKED, 0);

-                        else

-                            SendDlgItemMessage(hWnd, xImgCtrlIds[i], BM_SETCHECK, BST_INDETERMINATE, 0);

-                        i++;

-                    }

-

-                    if(bSecondLine == 0xff)

-                        SendDlgItemMessage(hWnd, IDC_SECONDLINEMODE, CB_SETCURSEL, 0, 0);

-                    else

-                        SendDlgItemMessage(hWnd, IDC_SECONDLINEMODE, CB_SETCURSEL, (WPARAM)(bSecondLine + 1), 0);

-                }

+				if(contact && contact->type != CLCIT_CONTACT) {

+					DestroyWindow(hWnd);

+					return FALSE;

+				} 

+				else {

+					TCHAR szTitle[512];

+					DWORD dwFlags = cfg::getDword(hContact, "CList", "CLN_Flags", 0);

+					BYTE  bSecondLine = cfg::getByte(hContact, "CList", "CLN_2ndline", -1);

+					DWORD dwXMask = cfg::getDword(hContact, "CList", "CLN_xmask", 0);

+					int   i = 0;

+

+					mir_sntprintf(szTitle, 512, TranslateT("Contact list display and ignore options for %s"), contact ? contact->szText : (TCHAR *)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)hContact, GCDNF_TCHAR));

+

+					SetWindowText(hWnd, szTitle);

+					SendMessage(hWnd, WM_SETICON, ICON_BIG, (LPARAM)LoadSkinnedIcon(SKINICON_OTHER_MIRANDA));

+					pCaps = CallProtoService(contact ? contact->proto : (char *)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0), PS_GETCAPS, PFLAGNUM_1, 0);

+					Utils::enableDlgControl(hWnd, IDC_IGN_ALWAYSONLINE, pCaps & PF1_INVISLIST ? TRUE : FALSE);

+					Utils::enableDlgControl(hWnd, IDC_IGN_ALWAYSOFFLINE, pCaps & PF1_VISLIST ? TRUE : FALSE);

+					CheckDlgButton(hWnd, IDC_IGN_PRIORITY, cfg::getByte(hContact, "CList", "Priority", 0) ? 1 : 0);

+					Utils::enableDlgControl(hWnd, IDC_IGN_PRIORITY, TRUE);

+					Utils::enableDlgControl(hWnd, IDC_AVATARDISPMODE, TRUE);

+					Utils::enableDlgControl(hWnd, IDC_SECONDLINEMODE, TRUE);

+					if(dwFlags & ECF_FORCEAVATAR)

+						SendDlgItemMessage(hWnd, IDC_AVATARDISPMODE, CB_SETCURSEL, 1, 0);

+					else if(dwFlags & ECF_HIDEAVATAR)

+						SendDlgItemMessage(hWnd, IDC_AVATARDISPMODE, CB_SETCURSEL, 2, 0);

+					else

+						SendDlgItemMessage(hWnd, IDC_AVATARDISPMODE, CB_SETCURSEL, 0, 0);

+

+					if(dwFlags & ECF_FORCEOVERLAY)

+						SendDlgItemMessage(hWnd, IDC_OVERLAYICON, BM_SETCHECK, BST_CHECKED, 0);

+					else if(dwFlags & ECF_HIDEOVERLAY)

+						SendDlgItemMessage(hWnd, IDC_OVERLAYICON, BM_SETCHECK, BST_UNCHECKED, 0);

+					else

+						SendDlgItemMessage(hWnd, IDC_OVERLAYICON, BM_SETCHECK, BST_INDETERMINATE, 0);

+

+					if(dwFlags & ECF_FORCELOCALTIME)

+						SendDlgItemMessage(hWnd, IDC_SHOWLOCALTIME1, BM_SETCHECK, BST_CHECKED, 0);

+					else if(dwFlags & ECF_HIDELOCALTIME)

+						SendDlgItemMessage(hWnd, IDC_SHOWLOCALTIME1, BM_SETCHECK, BST_UNCHECKED, 0);

+					else

+						SendDlgItemMessage(hWnd, IDC_SHOWLOCALTIME1, BM_SETCHECK, BST_INDETERMINATE, 0);

+

+					if(dwFlags & ECF_FORCEVISIBILITY)

+						SendDlgItemMessage(hWnd, IDC_SHOWVISIBILITY, BM_SETCHECK, BST_CHECKED, 0);

+					else if(dwFlags & ECF_HIDEVISIBILITY)

+						SendDlgItemMessage(hWnd, IDC_SHOWVISIBILITY, BM_SETCHECK, BST_UNCHECKED, 0);

+					else

+						SendDlgItemMessage(hWnd, IDC_SHOWVISIBILITY, BM_SETCHECK, BST_INDETERMINATE, 0);

+

+					while(xImgCtrlIds[i] != 0) {

+						if(dwXMask & (1 << (2 * xImgCtrlBits[i])))

+							SendDlgItemMessage(hWnd, xImgCtrlIds[i], BM_SETCHECK, BST_CHECKED, 0);

+						else if(dwXMask & (1 << (2 * xImgCtrlBits[i] + 1)))

+							SendDlgItemMessage(hWnd, xImgCtrlIds[i], BM_SETCHECK, BST_UNCHECKED, 0);

+						else

+							SendDlgItemMessage(hWnd, xImgCtrlIds[i], BM_SETCHECK, BST_INDETERMINATE, 0);

+						i++;

+					}

+

+					if(bSecondLine == 0xff)

+						SendDlgItemMessage(hWnd, IDC_SECONDLINEMODE, CB_SETCURSEL, 0, 0);

+					else

+						SendDlgItemMessage(hWnd, IDC_SECONDLINEMODE, CB_SETCURSEL, (WPARAM)(bSecondLine + 1), 0);

+				}

 			}

 			WindowList_Add(hWindowListIGN, hWnd, hContact);

 			ShowWindow(hWnd, SW_SHOWNORMAL);

-			return TRUE;

 		}

+		return TRUE;

+

 	case WM_COMMAND:

 		switch(LOWORD(wParam)) {

-        case IDC_IGN_PRIORITY:

-            SendMessage(pcli->hwndContactTree, CLM_TOGGLEPRIORITYCONTACT, (WPARAM)hContact, 0);

-            return 0;

-	  	case IDC_IGN_ALL:

+		case IDC_IGN_PRIORITY:

+			SendMessage(pcli->hwndContactTree, CLM_TOGGLEPRIORITYCONTACT, (WPARAM)hContact, 0);

+			return 0;

+		case IDC_IGN_ALL:

 			SendMessage(hWnd, WM_USER + 100, (WPARAM)hContact, (LPARAM)0xffffffff);

-		  	return 0;

-	  	case IDC_IGN_NONE:

+			return 0;

+		case IDC_IGN_NONE:

 			SendMessage(hWnd, WM_USER + 100, (WPARAM)hContact, (LPARAM)0);

 		  	return 0;

-	  	case IDC_IGN_ALWAYSONLINE:

+		case IDC_IGN_ALWAYSONLINE:

 			if(IsDlgButtonChecked(hWnd, IDC_IGN_ALWAYSONLINE))

 				CheckDlgButton(hWnd, IDC_IGN_ALWAYSOFFLINE, FALSE);

-		  	break;

-	  	case IDC_IGN_ALWAYSOFFLINE:

+			break;

+		case IDC_IGN_ALWAYSOFFLINE:

 			if(IsDlgButtonChecked(hWnd, IDC_IGN_ALWAYSOFFLINE))

 				CheckDlgButton(hWnd, IDC_IGN_ALWAYSONLINE, FALSE);

-		  	break;

-	  	case IDC_HIDECONTACT:

+			break;

+		case IDC_HIDECONTACT:

 			cfg::writeByte(hContact, "CList", "Hidden", (BYTE)(IsDlgButtonChecked(hWnd, IDC_HIDECONTACT) ? 1 : 0));

-		  	break;

-	  	case IDC_IGN_ADDPERMANENTLY:

+			break;

+		case IDC_IGN_ADDPERMANENTLY:

 			{

 				ADDCONTACTSTRUCT acs = {0};

 

 				acs.handle = hContact;

-			  	acs.handleType = HANDLE_CONTACT;

-			  	acs.szProto = 0;

-			  	CallService(MS_ADDCONTACT_SHOW, (WPARAM)hWnd, (LPARAM)&acs);

-			  	Utils::enableDlgControl(hWnd, IDC_IGN_ADDPERMANENTLY, cfg::getByte(hContact, "CList", "NotOnList", 0));

-			  	break;

-		  	}

-        case IDC_DSP_LOADDEFAULT:

-            {

-                int i = 0;

-

-                SendDlgItemMessage(hWnd, IDC_AVATARDISPMODE, CB_SETCURSEL, 0, 0);

-                SendDlgItemMessage(hWnd, IDC_SECONDLINEMODE, CB_SETCURSEL, 0, 0);

-                while(xImgCtrlIds[i] != 0)

-                    SendDlgItemMessage(hWnd, xImgCtrlIds[i++], BM_SETCHECK, BST_INDETERMINATE, 0);

-

-                SendDlgItemMessage(hWnd, IDC_OVERLAYICON, BM_SETCHECK, BST_INDETERMINATE, 0);

-                SendDlgItemMessage(hWnd, IDC_LOCALTIME, BM_SETCHECK, BST_INDETERMINATE, 0);

-                SendDlgItemMessage(hWnd, IDC_SHOWVISIBILITY, BM_SETCHECK, BST_INDETERMINATE, 0);

-                break;

-            }

-	  	case IDOK:

+				acs.handleType = HANDLE_CONTACT;

+				acs.szProto = 0;

+				CallService(MS_ADDCONTACT_SHOW, (WPARAM)hWnd, (LPARAM)&acs);

+				Utils::enableDlgControl(hWnd, IDC_IGN_ADDPERMANENTLY, cfg::getByte(hContact, "CList", "NotOnList", 0));

+				break;

+			}

+		case IDC_DSP_LOADDEFAULT:

+			{

+				int i = 0;

+

+				SendDlgItemMessage(hWnd, IDC_AVATARDISPMODE, CB_SETCURSEL, 0, 0);

+				SendDlgItemMessage(hWnd, IDC_SECONDLINEMODE, CB_SETCURSEL, 0, 0);

+				while(xImgCtrlIds[i] != 0)

+					SendDlgItemMessage(hWnd, xImgCtrlIds[i++], BM_SETCHECK, BST_INDETERMINATE, 0);

+

+				SendDlgItemMessage(hWnd, IDC_OVERLAYICON, BM_SETCHECK, BST_INDETERMINATE, 0);

+				SendDlgItemMessage(hWnd, IDC_LOCALTIME, BM_SETCHECK, BST_INDETERMINATE, 0);

+				SendDlgItemMessage(hWnd, IDC_SHOWVISIBILITY, BM_SETCHECK, BST_INDETERMINATE, 0);

+				break;

+			}

+		case IDOK:

 			{

 				DWORD newMask = 0;

-                struct ClcContact *contact = NULL;

-

-			  	SendMessage(hWnd, WM_USER + 110, 0, (LPARAM)&newMask);

-			  	cfg::writeDword(hContact, "Ignore", "Mask1", newMask);

-			  	SendMessage(hWnd, WM_USER + 130, 0, 0);

-

-                if(cfg::clcdat) {

-                    LRESULT iSel = SendDlgItemMessage(hWnd, IDC_AVATARDISPMODE, CB_GETCURSEL, 0, 0);

-                    DWORD dwFlags = cfg::getDword(hContact, "CList", "CLN_Flags", 0), dwXMask = 0;

-                    LRESULT  checked = 0;

-                    int      i = 0;

-

-                    FindItem(pcli->hwndContactTree, cfg::clcdat, hContact, &contact, NULL, NULL); 

-                    if(iSel != CB_ERR) {

-                        dwFlags &= ~(ECF_FORCEAVATAR | ECF_HIDEAVATAR);

-

-                        if(iSel == 1)

-                            dwFlags |= ECF_FORCEAVATAR;

-                        else if(iSel == 2)

-                            dwFlags |= ECF_HIDEAVATAR;

-                        if(contact)

-                            LoadAvatarForContact(contact);

-                    }

-

-                    dwFlags &= ~(ECF_FORCEOVERLAY | ECF_HIDEOVERLAY | ECF_FORCELOCALTIME | ECF_HIDELOCALTIME | 

-                                 ECF_FORCEVISIBILITY | ECF_HIDEVISIBILITY);

-

-                    checked = SendDlgItemMessage(hWnd, IDC_OVERLAYICON, BM_GETCHECK, 0, 0);

-                    if(checked == BST_CHECKED)

-                        dwFlags |= ECF_FORCEOVERLAY;

-                    else if(checked == BST_UNCHECKED)

-                        dwFlags |= ECF_HIDEOVERLAY;

-

-                    checked = SendDlgItemMessage(hWnd, IDC_SHOWLOCALTIME1, BM_GETCHECK, 0, 0);

-                    if(checked == BST_CHECKED)

-                        dwFlags |= ECF_FORCELOCALTIME;

-                    else if(checked == BST_UNCHECKED)

-                        dwFlags |= ECF_HIDELOCALTIME;

-

-                    checked = SendDlgItemMessage(hWnd, IDC_SHOWVISIBILITY, BM_GETCHECK, 0, 0);

-                    if(checked == BST_CHECKED)

-                        dwFlags |= ECF_FORCEVISIBILITY;

-                    else if(checked == BST_UNCHECKED)

-                        dwFlags |= ECF_HIDEVISIBILITY;

-

-                    cfg::writeDword(hContact, "CList", "CLN_Flags", dwFlags);

-

-                    if ((iSel = SendDlgItemMessage(hWnd, IDC_SECONDLINEMODE, CB_GETCURSEL, 0, 0)) != CB_ERR) {

-                        if(iSel == 0) {

-                            DBDeleteContactSetting(hContact, "CList", "CLN_2ndline");

-                            if(contact)

-                                contact->bSecondLine = cfg::dat.dualRowMode;

-                        }

-                        else {

-                            DBWriteContactSettingByte(hContact, "CList", "CLN_2ndline", (BYTE)(iSel - 1));

-                            if(contact)

-                                contact->bSecondLine = (BYTE)(iSel - 1);

-                        }

-                    }

-                    while(xImgCtrlIds[i] != 0) {

-                        checked = SendDlgItemMessage(hWnd, xImgCtrlIds[i], BM_GETCHECK, 0, 0);

-                        if(checked == BST_CHECKED)

-                            dwXMask |= (1 << (2 * xImgCtrlBits[i]));

-                        else if(checked == BST_UNCHECKED)

-                            dwXMask |= (1 << (2 * xImgCtrlBits[i] + 1));

-                        i++;

-                    }

-                    cfg::writeDword(hContact, "CList", "CLN_xmask", dwXMask);

-                    if(contact) {

-                        if(contact->extraCacheEntry >= 0 && contact->extraCacheEntry <= cfg::nextCacheEntry) {

-                            cfg::eCache[contact->extraCacheEntry].dwDFlags = dwFlags;

-                            cfg::eCache[contact->extraCacheEntry].dwXMask = CalcXMask(hContact);

-                        }

-                    }

-                    else {

-                        int iIndex = cfg::getCache(hContact, NULL);

-                        if(iIndex >= 0 && iIndex <= cfg::nextCacheEntry) {

-                            cfg::eCache[iIndex].dwDFlags = dwFlags;

-                            cfg::eCache[iIndex].dwXMask = CalcXMask(hContact);

-                        }

-                    }

-                    cfg::writeByte(hContact, "CList", "Priority", (BYTE)(IsDlgButtonChecked(hWnd, IDC_IGN_PRIORITY) ? 1 : 0));

-                    pcli->pfnClcBroadcast(CLM_AUTOREBUILD, 0, 0);

-                }

-		  	}

-	  	case IDCANCEL:

+				struct ClcContact *contact = NULL;

+

+				SendMessage(hWnd, WM_USER + 110, 0, (LPARAM)&newMask);

+				cfg::writeDword(hContact, "Ignore", "Mask1", newMask);

+				SendMessage(hWnd, WM_USER + 130, 0, 0);

+

+				if(cfg::clcdat) {

+					LRESULT iSel = SendDlgItemMessage(hWnd, IDC_AVATARDISPMODE, CB_GETCURSEL, 0, 0);

+					DWORD dwFlags = cfg::getDword(hContact, "CList", "CLN_Flags", 0), dwXMask = 0;

+					LRESULT  checked = 0;

+					int      i = 0;

+

+					FindItem(pcli->hwndContactTree, cfg::clcdat, hContact, &contact, NULL, NULL); 

+					if(iSel != CB_ERR) {

+						dwFlags &= ~(ECF_FORCEAVATAR | ECF_HIDEAVATAR);

+

+						if(iSel == 1)

+							dwFlags |= ECF_FORCEAVATAR;

+						else if(iSel == 2)

+							dwFlags |= ECF_HIDEAVATAR;

+						if(contact)

+							LoadAvatarForContact(contact);

+					}

+

+					dwFlags &= ~(ECF_FORCEOVERLAY | ECF_HIDEOVERLAY | ECF_FORCELOCALTIME | ECF_HIDELOCALTIME | 

+						ECF_FORCEVISIBILITY | ECF_HIDEVISIBILITY);

+

+					checked = SendDlgItemMessage(hWnd, IDC_OVERLAYICON, BM_GETCHECK, 0, 0);

+					if(checked == BST_CHECKED)

+						dwFlags |= ECF_FORCEOVERLAY;

+					else if(checked == BST_UNCHECKED)

+						dwFlags |= ECF_HIDEOVERLAY;

+

+					checked = SendDlgItemMessage(hWnd, IDC_SHOWLOCALTIME1, BM_GETCHECK, 0, 0);

+					if(checked == BST_CHECKED)

+						dwFlags |= ECF_FORCELOCALTIME;

+					else if(checked == BST_UNCHECKED)

+						dwFlags |= ECF_HIDELOCALTIME;

+

+					checked = SendDlgItemMessage(hWnd, IDC_SHOWVISIBILITY, BM_GETCHECK, 0, 0);

+					if(checked == BST_CHECKED)

+						dwFlags |= ECF_FORCEVISIBILITY;

+					else if(checked == BST_UNCHECKED)

+						dwFlags |= ECF_HIDEVISIBILITY;

+

+					cfg::writeDword(hContact, "CList", "CLN_Flags", dwFlags);

+

+					if ((iSel = SendDlgItemMessage(hWnd, IDC_SECONDLINEMODE, CB_GETCURSEL, 0, 0)) != CB_ERR) {

+						if(iSel == 0) {

+							DBDeleteContactSetting(hContact, "CList", "CLN_2ndline");

+							if(contact)

+								contact->bSecondLine = cfg::dat.dualRowMode;

+						}

+						else {

+							DBWriteContactSettingByte(hContact, "CList", "CLN_2ndline", (BYTE)(iSel - 1));

+							if(contact)

+								contact->bSecondLine = (BYTE)(iSel - 1);

+						}

+					}

+					while(xImgCtrlIds[i] != 0) {

+						checked = SendDlgItemMessage(hWnd, xImgCtrlIds[i], BM_GETCHECK, 0, 0);

+						if(checked == BST_CHECKED)

+							dwXMask |= (1 << (2 * xImgCtrlBits[i]));

+						else if(checked == BST_UNCHECKED)

+							dwXMask |= (1 << (2 * xImgCtrlBits[i] + 1));

+						i++;

+					}

+					cfg::writeDword(hContact, "CList", "CLN_xmask", dwXMask);

+					if(contact) {

+						if(contact->extraCacheEntry >= 0 && contact->extraCacheEntry <= cfg::nextCacheEntry) {

+							cfg::eCache[contact->extraCacheEntry].dwDFlags = dwFlags;

+							cfg::eCache[contact->extraCacheEntry].dwXMask = CalcXMask(hContact);

+						}

+					}

+					else {

+						int iIndex = cfg::getCache(hContact, NULL);

+						if(iIndex >= 0 && iIndex <= cfg::nextCacheEntry) {

+							cfg::eCache[iIndex].dwDFlags = dwFlags;

+							cfg::eCache[iIndex].dwXMask = CalcXMask(hContact);

+						}

+					}

+					cfg::writeByte(hContact, "CList", "Priority", (BYTE)(IsDlgButtonChecked(hWnd, IDC_IGN_PRIORITY) ? 1 : 0));

+					pcli->pfnClcBroadcast(CLM_AUTOREBUILD, 0, 0);

+				}

+			}

+		case IDCANCEL:

 			DestroyWindow(hWnd);

-		  	break;

+			break;

 		}

 		break;

 	case WM_USER + 100:                                         // fill dialog (wParam = hContact, lParam = mask)