Clist_nicer: highlight Apply button only if settings changed

some code cleanup

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

4 files changed, 160 insertions, 153 deletions

diff --git a/plugins/Clist_nicer/src/clcopts.cpp b/plugins/Clist_nicer/src/clcopts.cpp
index f9b9cec494..78cf391dc5 100644
--- a/plugins/Clist_nicer/src/clcopts.cpp
+++ b/plugins/Clist_nicer/src/clcopts.cpp
@@ -80,7 +80,7 @@ static void CreateStateImageList()
 	HICON hIconNoTick = reinterpret_cast<HICON>(LoadImage(g_hInst, MAKEINTRESOURCE(IDI_NOTICK), IMAGE_ICON, 16, 16, 0));

 	HICON hIconTick = reinterpret_cast<HICON>(LoadImage(g_hInst, MAKEINTRESOURCE(IDI_TICK), IMAGE_ICON, 16, 16, 0));

 

-	himlCheckBoxes=ImageList_Create(GetSystemMetrics(SM_CXSMICON),GetSystemMetrics(SM_CYSMICON),ILC_COLOR32|ILC_MASK,2,2);

+	himlCheckBoxes = ImageList_Create(GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), ILC_COLOR32 | ILC_MASK, 2, 2);

 	ImageList_AddIcon(himlCheckBoxes, hIconNoTick);

 	ImageList_AddIcon(himlCheckBoxes, hIconTick);

 	ImageList_AddIcon(himlCheckBoxes, hIconNoTick);

@@ -111,23 +111,23 @@ static void FillCheckBoxTree(HWND hwndTree, const struct CheckBoxValues_t *value
 

 static DWORD MakeCheckBoxTreeFlags(HWND hwndTree)

 {

-    DWORD flags = 0;

-    TVITEM tvi;

-

-    tvi.mask = TVIF_HANDLE | TVIF_PARAM | TVIF_STATE;

-    tvi.hItem = TreeView_GetRoot(hwndTree);

-    while (tvi.hItem) {

-        TreeView_GetItem(hwndTree, &tvi);

-        if (((tvi.state & TVIS_STATEIMAGEMASK) >> 12 == 1))

-            flags |= tvi.lParam;

-        tvi.hItem = TreeView_GetNextSibling(hwndTree, tvi.hItem);

-    }

-    return flags;

+	DWORD flags = 0;

+	TVITEM tvi;

+

+	tvi.mask = TVIF_HANDLE | TVIF_PARAM | TVIF_STATE;

+	tvi.hItem = TreeView_GetRoot(hwndTree);

+	while (tvi.hItem) {

+		TreeView_GetItem(hwndTree, &tvi);

+		if ((tvi.state & TVIS_STATEIMAGEMASK) >> 12 == 1)

+			flags |= tvi.lParam;

+		tvi.hItem = TreeView_GetNextSibling(hwndTree, tvi.hItem);

+	}

+	return flags;

 }

 

 static void cfgSetFlag(HWND hwndDlg, int ctrlId, DWORD dwMask)

 {

-	if ( IsDlgButtonChecked(hwndDlg, ctrlId))

+	if (IsDlgButtonChecked(hwndDlg, ctrlId))

 		cfg::dat.dwFlags |= dwMask;

 	else

 		cfg::dat.dwFlags &= ~dwMask;

@@ -143,7 +143,7 @@ void GetDefaultFontSetting(int i, LOGFONT *lf, COLORREF *colour)
 		lf->lfWeight = FW_BOLD;

 		break;

 	case FONTID_GROUPCOUNTS:

-		lf->lfHeight = (int) (lf->lfHeight * .75);

+		lf->lfHeight = (int)(lf->lfHeight * .75);

 		*colour = GetSysColor(COLOR_3DSHADOW);

 		break;

 	case FONTID_OFFINVIS:

@@ -151,7 +151,7 @@ void GetDefaultFontSetting(int i, LOGFONT *lf, COLORREF *colour)
 		lf->lfItalic = !lf->lfItalic;

 		break;

 	case FONTID_DIVIDERS:

-		lf->lfHeight = (int) (lf->lfHeight * .75);

+		lf->lfHeight = (int)(lf->lfHeight * .75);

 		break;

 	case FONTID_NOTONLIST:

 		*colour = GetSysColor(COLOR_3DSHADOW);

@@ -175,8 +175,6 @@ static INT_PTR CALLBACK DlgProcDspGroups(HWND hwndDlg, UINT msg, WPARAM wParam,
 			CheckDlgButton(hwndDlg, IDC_NOGROUPICON, (cfg::dat.dwFlags & CLUI_FRAME_NOGROUPICON) ? BST_CHECKED : BST_UNCHECKED);

 			CheckDlgButton(hwndDlg, IDC_CENTERGROUPNAMES, cfg::getByte("CLCExt", "EXBK_CenterGroupnames", 0));

 			SendDlgItemMessage(hwndDlg, IDC_GROUPALIGN, CB_SETCURSEL, cfg::dat.bGroupAlign, 0);

-			SendDlgItemMessage(hwndDlg, IDC_AVATARPADDINGSPIN, UDM_SETRANGE, 0, MAKELONG(10, 0));

-			SendDlgItemMessage(hwndDlg, IDC_AVATARPADDINGSPIN, UDM_SETPOS, 0, cfg::dat.avatarPadding);

 

 			SendDlgItemMessage(hwndDlg, IDC_LEFTMARGINSPIN, UDM_SETRANGE, 0, MAKELONG(64, 0));

 			SendDlgItemMessage(hwndDlg, IDC_LEFTMARGINSPIN, UDM_SETPOS, 0, cfg::getByte("CLC", "LeftMargin", CLCDEFAULT_LEFTMARGIN));

@@ -190,20 +188,24 @@ static INT_PTR CALLBACK DlgProcDspGroups(HWND hwndDlg, UINT msg, WPARAM wParam,
 			SendDlgItemMessage(hwndDlg, IDC_ROWHEIGHTSPIN, UDM_SETPOS, 0, cfg::getByte("CLC", "RowHeight", CLCDEFAULT_ROWHEIGHT));

 			SendDlgItemMessage(hwndDlg, IDC_GROUPROWHEIGHTSPIN, UDM_SETRANGE, 0, MAKELONG(255, 8));

 			SendDlgItemMessage(hwndDlg, IDC_GROUPROWHEIGHTSPIN, UDM_SETPOS, 0, cfg::getByte("CLC", "GRowHeight", CLCDEFAULT_ROWHEIGHT));

+			SendDlgItemMessage(hwndDlg, IDC_AVATARPADDINGSPIN, UDM_SETRANGE, 0, MAKELONG(10, 0));

+			SendDlgItemMessage(hwndDlg, IDC_AVATARPADDINGSPIN, UDM_SETPOS, 0, cfg::dat.avatarPadding);

 		}

 		return TRUE;

 

 	case WM_COMMAND:

-		if ((LOWORD(wParam) == IDC_ROWHEIGHT || LOWORD(wParam) == IDC_AVATARPADDING || LOWORD(wParam) == IDC_ROWGAP || LOWORD(wParam) == IDC_RIGHTMARGIN || LOWORD(wParam) == IDC_LEFTMARGIN || LOWORD(wParam) == IDC_SMOOTHTIME || LOWORD(wParam) == IDC_GROUPINDENT || LOWORD(wParam) == IDC_GROUPROWHEIGHT)

-			&& (HIWORD(wParam) != EN_CHANGE || (HWND) lParam != GetFocus()))

+		if ((LOWORD(wParam) == IDC_ROWHEIGHT || LOWORD(wParam) == IDC_AVATARPADDING || LOWORD(wParam) == IDC_ROWGAP || LOWORD(wParam) == IDC_RIGHTMARGIN || LOWORD(wParam) == IDC_LEFTMARGIN || LOWORD(wParam) == IDC_GROUPINDENT || LOWORD(wParam) == IDC_GROUPROWHEIGHT)

+			&& (HIWORD(wParam) != EN_CHANGE || (HWND)lParam != GetFocus()))

+			return 0;

+		if (LOWORD(wParam) == IDC_GROUPALIGN && (HIWORD(wParam) != CBN_SELCHANGE || (HWND)lParam != GetFocus()))

 			return 0;

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

 		break;

 

 	case WM_NOTIFY:

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

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

 		case 0:

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

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

 				DWORD exStyle = cfg::getDword("CLC", "ExStyle", pcli->pfnGetDefaultExStyle());

 

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

@@ -281,32 +283,35 @@ static INT_PTR CALLBACK DlgProcDspItems(HWND hwndDlg, UINT msg, WPARAM wParam, L
 		return TRUE;

 

 	case WM_COMMAND:

+		if ((LOWORD(wParam) == IDC_SORTPRIMARY || LOWORD(wParam) == IDC_SORTTHEN || LOWORD(wParam) == IDC_SORTFINALLY || LOWORD(wParam) == IDC_CLISTALIGN)

+			&& (HIWORD(wParam) != CBN_SELCHANGE || (HWND)lParam != GetFocus()))

+			return 0;

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

 		break;

 

 	case WM_NOTIFY:

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

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

 		case IDC_HIDEOFFLINEOPTS:

-			if (((LPNMHDR) lParam)->code == NM_CLICK) {

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

 				TVHITTESTINFO hti;

-				hti.pt.x = (short) LOWORD(GetMessagePos());

-				hti.pt.y = (short) HIWORD(GetMessagePos());

-				ScreenToClient(((LPNMHDR) lParam)->hwndFrom, &hti.pt);

-				if (TreeView_HitTest(((LPNMHDR) lParam)->hwndFrom, &hti))

+				hti.pt.x = (short)LOWORD(GetMessagePos());

+				hti.pt.y = (short)HIWORD(GetMessagePos());

+				ScreenToClient(((LPNMHDR)lParam)->hwndFrom, &hti.pt);

+				if (TreeView_HitTest(((LPNMHDR)lParam)->hwndFrom, &hti))

 					if (hti.flags & TVHT_ONITEMSTATEICON) {

 						TVITEM tvi;

 						tvi.mask = TVIF_HANDLE | TVIF_IMAGE | TVIF_SELECTEDIMAGE;

 						tvi.hItem = hti.hItem;

-						TreeView_GetItem(((LPNMHDR) lParam)->hwndFrom, &tvi);

+						TreeView_GetItem(((LPNMHDR)lParam)->hwndFrom, &tvi);

 						tvi.iImage = tvi.iSelectedImage = tvi.iImage == 1 ? 2 : 1;

-						TreeView_SetItem(((LPNMHDR) lParam)->hwndFrom, &tvi);

+						TreeView_SetItem(((LPNMHDR)lParam)->hwndFrom, &tvi);

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

 					}

 			}

 			break;

 

 		case 0:

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

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

 				for (int i = 0; sortCtrlIDs[i] != 0; i++) {

 					LRESULT curSel = SendDlgItemMessage(hwndDlg, sortCtrlIDs[i], CB_GETCURSEL, 0, 0);

 					if (curSel == 0 || curSel == CB_ERR)

@@ -356,12 +361,12 @@ static INT_PTR CALLBACK DlgProcDspAdvanced(HWND hwndDlg, UINT msg, WPARAM wParam
 			int i = 0;

 			if (cfg::dat.bAvatarServiceAvail) {

 				Utils::enableDlgControl(hwndDlg, IDC_CLISTAVATARS, TRUE);

-				while(avatar_controls[i] != 0)

+				while (avatar_controls[i] != 0)

 					Utils::enableDlgControl(hwndDlg, avatar_controls[i++], TRUE);

 			}

 			else {

 				Utils::enableDlgControl(hwndDlg, IDC_CLISTAVATARS, FALSE);

-				while(avatar_controls[i] != 0)

+				while (avatar_controls[i] != 0)

 					Utils::enableDlgControl(hwndDlg, avatar_controls[i++], FALSE);

 			}

 		}

@@ -402,7 +407,7 @@ static INT_PTR CALLBACK DlgProcDspAdvanced(HWND hwndDlg, UINT msg, WPARAM wParam
 		return TRUE;

 

 	case WM_COMMAND:

-		switch(LOWORD(wParam)) {

+		switch (LOWORD(wParam)) {

 		case IDC_CLISTAVATARS:

 			if ((HWND)lParam != GetFocus())

 				return 0;

@@ -421,13 +426,15 @@ static INT_PTR CALLBACK DlgProcDspAdvanced(HWND hwndDlg, UINT msg, WPARAM wParam
 			Utils::enableDlgControl(hwndDlg, IDC_AVATARBORDERCLR, IsDlgButtonChecked(hwndDlg, IDC_AVATARSBORDER) ? TRUE : FALSE);

 			break;

 		}

-		if ((LOWORD(wParam) == IDC_RADIUS || LOWORD(wParam) == IDC_AVATARHEIGHT) && (HIWORD(wParam) != EN_CHANGE || (HWND) lParam != GetFocus()))

+		if ((LOWORD(wParam) == IDC_RADIUS || LOWORD(wParam) == IDC_AVATARHEIGHT) && (HIWORD(wParam) != EN_CHANGE || (HWND)lParam != GetFocus()))

+			return 0;

+		if ((LOWORD(wParam) == IDC_ALIGNMENT || LOWORD(wParam) == IDC_DUALROWMODE) && (HIWORD(wParam) != CBN_SELCHANGE || (HWND)lParam != GetFocus()))

 			return 0;

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

 		break;

 

 	case WM_NOTIFY:

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

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

 			LRESULT sel = SendDlgItemMessage(hwndDlg, IDC_ALIGNMENT, CB_GETCURSEL, 0, 0);

 			DWORD flags = 0;

 			if (sel != CB_ERR) {

@@ -502,7 +509,7 @@ static INT_PTR CALLBACK DlgProcIcons(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR
 		break;

 

 	case WM_NOTIFY:

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

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

 		case PSN_APPLY:

 			cfgSetFlag(hwndDlg, IDC_SHOWSTATUSICONS, CLUI_FRAME_STATUSICONS);

 			cfgSetFlag(hwndDlg, IDC_SHOWMETA, CLUI_USEMETAICONS);

@@ -607,11 +614,9 @@ static INT_PTR CALLBACK DlgProcClcMainOpts(HWND hwndDlg, UINT msg, WPARAM wParam
 		SetWindowLongPtr(GetDlgItem(hwndDlg, IDC_GREYOUTOPTS), GWL_STYLE, GetWindowLongPtr(GetDlgItem(hwndDlg, IDC_GREYOUTOPTS), GWL_STYLE) | TVS_NOHSCROLL | TVS_CHECKBOXES);

 		{

 			DWORD exStyle = cfg::getDword("CLC", "ExStyle", pcli->pfnGetDefaultExStyle());

-			UDACCEL accel[2] = {

-				{0,10}, {2,50}

-			};

+			UDACCEL accel[2] = { {0,10}, {2,50} };

 			SendDlgItemMessage(hwndDlg, IDC_SMOOTHTIMESPIN, UDM_SETRANGE, 0, MAKELONG(999, 0));

-			SendDlgItemMessage(hwndDlg, IDC_SMOOTHTIMESPIN, UDM_SETACCEL, SIZEOF(accel), (LPARAM) &accel);

+			SendDlgItemMessage(hwndDlg, IDC_SMOOTHTIMESPIN, UDM_SETACCEL, SIZEOF(accel), (LPARAM)&accel);

 			SendDlgItemMessage(hwndDlg, IDC_SMOOTHTIMESPIN, UDM_SETPOS, 0, MAKELONG(cfg::getWord("CLC", "ScrollTime", CLCDEFAULT_SCROLLTIME), 0));

 

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

@@ -637,26 +642,28 @@ static INT_PTR CALLBACK DlgProcClcMainOpts(HWND hwndDlg, UINT msg, WPARAM wParam
 			Utils::enableDlgControl(hwndDlg, IDC_SMOOTHTIME, IsDlgButtonChecked(hwndDlg, IDC_NOTNOSMOOTHSCROLLING));

 		if (LOWORD(wParam) == IDC_GREYOUT)

 			Utils::enableDlgControl(hwndDlg, IDC_GREYOUTOPTS, IsDlgButtonChecked(hwndDlg, IDC_GREYOUT));

+		if (LOWORD(wParam) == IDC_SMOOTHTIME && (HIWORD(wParam) != EN_CHANGE || (HWND)lParam != GetFocus()))

+			return 0;

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

 		opt_clc_main_changed = 1;

 		break;

 

 	case WM_NOTIFY:

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

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

 		case IDC_GREYOUTOPTS:

-			if (((LPNMHDR) lParam)->code == NM_CLICK) {

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

 				TVHITTESTINFO hti;

-				hti.pt.x = (short) LOWORD(GetMessagePos());

-				hti.pt.y = (short) HIWORD(GetMessagePos());

-				ScreenToClient(((LPNMHDR) lParam)->hwndFrom, &hti.pt);

-				if (TreeView_HitTest(((LPNMHDR) lParam)->hwndFrom, &hti))

+				hti.pt.x = (short)LOWORD(GetMessagePos());

+				hti.pt.y = (short)HIWORD(GetMessagePos());

+				ScreenToClient(((LPNMHDR)lParam)->hwndFrom, &hti.pt);

+				if (TreeView_HitTest(((LPNMHDR)lParam)->hwndFrom, &hti))

 					if (hti.flags & TVHT_ONITEMSTATEICON) {

 						TVITEM tvi;

 						tvi.mask = TVIF_HANDLE | TVIF_IMAGE | TVIF_SELECTEDIMAGE;

 						tvi.hItem = hti.hItem;

-						TreeView_GetItem(((LPNMHDR) lParam)->hwndFrom, &tvi);

+						TreeView_GetItem(((LPNMHDR)lParam)->hwndFrom, &tvi);

 						tvi.iImage = tvi.iSelectedImage = tvi.iImage == 1 ? 2 : 1;

-						TreeView_SetItem(((LPNMHDR) lParam)->hwndFrom, &tvi);

+						TreeView_SetItem(((LPNMHDR)lParam)->hwndFrom, &tvi);

 						opt_clc_main_changed = 1;

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

 					}

@@ -664,8 +671,8 @@ static INT_PTR CALLBACK DlgProcClcMainOpts(HWND hwndDlg, UINT msg, WPARAM wParam
 			break;

 

 		case 0:

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

-				if ( !opt_clc_main_changed)

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

+				if (!opt_clc_main_changed)

 					return TRUE;

 

 				int i;

@@ -689,8 +696,8 @@ static INT_PTR CALLBACK DlgProcClcMainOpts(HWND hwndDlg, UINT msg, WPARAM wParam
 

 				cfgSetFlag(hwndDlg, IDC_FULLROWSELECT, CLUI_FULLROWSELECT);

 

-				cfg::writeWord("CLC", "ScrollTime", (WORD) SendDlgItemMessage(hwndDlg, IDC_SMOOTHTIMESPIN, UDM_GETPOS, 0, 0));

-				cfg::writeByte("CLC", "NoVScrollBar", (BYTE) (IsDlgButtonChecked(hwndDlg, IDC_NOSCROLLBAR) ? 1 : 0));

+				cfg::writeWord("CLC", "ScrollTime", (WORD)SendDlgItemMessage(hwndDlg, IDC_SMOOTHTIMESPIN, UDM_GETPOS, 0, 0));

+				cfg::writeByte("CLC", "NoVScrollBar", (BYTE)(IsDlgButtonChecked(hwndDlg, IDC_NOSCROLLBAR) ? 1 : 0));

 				cfg::dat.bDblClkAvatars = IsDlgButtonChecked(hwndDlg, IDC_DBLCLKAVATARS) ? TRUE : FALSE;

 				cfg::writeByte("CLC", "dblclkav", (BYTE)cfg::dat.bDblClkAvatars);

 

@@ -727,9 +734,9 @@ static INT_PTR CALLBACK DlgProcClcBkgOpts(HWND hwndDlg, UINT msg, WPARAM wParam,
 		SendMessage(hwndDlg, WM_USER + 11, 0, 0);

 		{

 			DBVARIANT dbv;

-			if ( !cfg::getTString(NULL, "CLC", "BkBitmap", &dbv)) {

+			if (!cfg::getTString(NULL, "CLC", "BkBitmap", &dbv)) {

 				TCHAR szPath[MAX_PATH];

-				if ( PathToAbsoluteT(dbv.ptszVal, szPath))

+				if (PathToAbsoluteT(dbv.ptszVal, szPath))

 					SetDlgItemText(hwndDlg, IDC_FILENAME, szPath);

 

 				db_free(&dbv);

@@ -747,7 +754,7 @@ static INT_PTR CALLBACK DlgProcClcBkgOpts(HWND hwndDlg, UINT msg, WPARAM wParam,
 		}

 		return TRUE;

 

-	case WM_USER+10:

+	case WM_USER + 10:

 		Utils::enableDlgControl(hwndDlg, IDC_FILENAME, IsDlgButtonChecked(hwndDlg, IDC_BITMAP));

 		Utils::enableDlgControl(hwndDlg, IDC_BROWSE, IsDlgButtonChecked(hwndDlg, IDC_BITMAP));

 		Utils::enableDlgControl(hwndDlg, IDC_STRETCHH, IsDlgButtonChecked(hwndDlg, IDC_BITMAP));

@@ -757,7 +764,7 @@ static INT_PTR CALLBACK DlgProcClcBkgOpts(HWND hwndDlg, UINT msg, WPARAM wParam,
 		Utils::enableDlgControl(hwndDlg, IDC_SCROLL, IsDlgButtonChecked(hwndDlg, IDC_BITMAP));

 		Utils::enableDlgControl(hwndDlg, IDC_PROPORTIONAL, IsDlgButtonChecked(hwndDlg, IDC_BITMAP));

 		break;

-	case WM_USER+11:

+	case WM_USER + 11:

 		{

 			BOOL b = IsDlgButtonChecked(hwndDlg, IDC_WINCOLOUR);

 			Utils::enableDlgControl(hwndDlg, IDC_BKGCOLOUR, !b);

@@ -773,14 +780,14 @@ static INT_PTR CALLBACK DlgProcClcBkgOpts(HWND hwndDlg, UINT msg, WPARAM wParam,
 			ofn.lStructSize = OPENFILENAME_SIZE_VERSION_400;

 			ofn.hwndOwner = hwndDlg;

 			ofn.hInstance = NULL;

-			CallService(MS_UTILS_GETBITMAPFILTERSTRINGS, sizeof(filter), (LPARAM) filter);

+			CallService(MS_UTILS_GETBITMAPFILTERSTRINGS, sizeof(filter), (LPARAM)filter);

 			ofn.lpstrFilter = filter;

 			ofn.lpstrFile = str;

 			ofn.Flags = OFN_FILEMUSTEXIST | OFN_HIDEREADONLY;

 			ofn.nMaxFile = sizeof(str);

 			ofn.nMaxFileTitle = MAX_PATH;

 			ofn.lpstrDefExt = "bmp";

-			if ( !GetOpenFileNameA(&ofn))

+			if (!GetOpenFileNameA(&ofn))

 				break;

 			SetDlgItemTextA(hwndDlg, IDC_FILENAME, str);

 		}

@@ -791,7 +798,7 @@ static INT_PTR CALLBACK DlgProcClcBkgOpts(HWND hwndDlg, UINT msg, WPARAM wParam,
 			SendMessage(hwndDlg, WM_USER + 10, 0, 0);

 		if (LOWORD(wParam) == IDC_WINCOLOUR)

 			SendMessage(hwndDlg, WM_USER + 11, 0, 0);

-		if (LOWORD(wParam) == IDC_FILENAME && (HIWORD(wParam) != EN_CHANGE || (HWND) lParam != GetFocus()))

+		if (LOWORD(wParam) == IDC_FILENAME && (HIWORD(wParam) != EN_CHANGE || (HWND)lParam != GetFocus()))

 			return 0;

 

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

@@ -799,14 +806,14 @@ static INT_PTR CALLBACK DlgProcClcBkgOpts(HWND hwndDlg, UINT msg, WPARAM wParam,
 		break;

 

 	case WM_NOTIFY:

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

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

 		case 0:

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

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

 			case PSN_APPLY:

-				if ( !opt_clc_bkg_changed)

+				if (!opt_clc_bkg_changed)

 					return TRUE;

 

-				cfg::writeByte("CLC", "UseBitmap", (BYTE) IsDlgButtonChecked(hwndDlg, IDC_BITMAP)); {

+				cfg::writeByte("CLC", "UseBitmap", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_BITMAP)); {

 					COLORREF col;

 					col = SendDlgItemMessage(hwndDlg, IDC_BKGCOLOUR, CPM_GETCOLOUR, 0, 0);

 					if (col == CLCDEFAULT_BKCOLOUR)

diff --git a/plugins/Clist_nicer/src/clistopts.cpp b/plugins/Clist_nicer/src/clistopts.cpp
index bf6ce21a9b..7448b83792 100644
--- a/plugins/Clist_nicer/src/clistopts.cpp
+++ b/plugins/Clist_nicer/src/clistopts.cpp
@@ -37,14 +37,14 @@ static void __setFlag(DWORD dwFlag, int iMode)
 INT_PTR CALLBACK DlgProcGenOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)

 {

 	switch (msg) {

-	case WM_USER+1:

+	case WM_USER + 1:

 		{

 			MCONTACT hContact = wParam;

-			DBCONTACTWRITESETTING *ws = (DBCONTACTWRITESETTING *) lParam;

+			DBCONTACTWRITESETTING *ws = (DBCONTACTWRITESETTING *)lParam;

 			if (hContact == NULL && ws != NULL && ws->szModule != NULL && ws->szSetting != NULL && lstrcmpiA(ws->szModule, "CList") == 0 && lstrcmpiA(ws->szSetting, "UseGroups") == 0 && IsWindowVisible(hwndDlg))

 				CheckDlgButton(hwndDlg, IDC_DISABLEGROUPS, ws->value.bVal == 0);

-	  }

-	  break;

+		}

+		break;

 

 	case WM_DESTROY:

 		UnhookEvent((HANDLE)GetWindowLongPtr(hwndDlg, GWLP_USERDATA));

@@ -53,7 +53,7 @@ INT_PTR CALLBACK DlgProcGenOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 	case WM_INITDIALOG:

 		opt_gen_opts_changed = 0;

 		TranslateDialogDefault(hwndDlg);

-		SetWindowLongPtr(hwndDlg, GWLP_USERDATA, (LONG_PTR) HookEventMessage(ME_DB_CONTACT_SETTINGCHANGED, hwndDlg, WM_USER + 1));

+		SetWindowLongPtr(hwndDlg, GWLP_USERDATA, (LONG_PTR)HookEventMessage(ME_DB_CONTACT_SETTINGCHANGED, hwndDlg, WM_USER + 1));

 		CheckDlgButton(hwndDlg, IDC_ONTOP, cfg::getByte("CList", "OnTop", SETTING_ONTOP_DEFAULT) ? BST_CHECKED : BST_UNCHECKED);

 		CheckDlgButton(hwndDlg, IDC_HIDEOFFLINE, cfg::getByte(NULL, "CList", "HideOffline", SETTING_HIDEOFFLINE_DEFAULT) ? BST_CHECKED : BST_UNCHECKED);

 		CheckDlgButton(hwndDlg, IDC_HIDEEMPTYGROUPS, cfg::getByte("CList", "HideEmptyGroups", SETTING_HIDEEMPTYGROUPS_DEFAULT) ? BST_CHECKED : BST_UNCHECKED);

@@ -61,9 +61,9 @@ INT_PTR CALLBACK DlgProcGenOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 		CheckDlgButton(hwndDlg, IDC_CONFIRMDELETE, cfg::getByte("CList", "ConfirmDelete", SETTING_CONFIRMDELETE_DEFAULT) ? BST_CHECKED : BST_UNCHECKED);

 		{

 			DWORD caps = CallService(MS_CLUI_GETCAPS, CLUICAPS_FLAGS1, 0);

-			if ( !(caps & CLUIF_HIDEEMPTYGROUPS))

+			if (!(caps & CLUIF_HIDEEMPTYGROUPS))

 				ShowWindow(GetDlgItem(hwndDlg, IDC_HIDEEMPTYGROUPS), SW_HIDE);

-			if ( !(caps & CLUIF_DISABLEGROUPS))

+			if (!(caps & CLUIF_DISABLEGROUPS))

 				ShowWindow(GetDlgItem(hwndDlg, IDC_DISABLEGROUPS), SW_HIDE);

 			if (caps & CLUIF_HASONTOPOPTION)

 				ShowWindow(GetDlgItem(hwndDlg, IDC_ONTOP), SW_HIDE);

@@ -102,26 +102,24 @@ INT_PTR CALLBACK DlgProcGenOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 		SendDlgItemMessage(hwndDlg, IDC_CYCLETIMESPIN, UDM_SETPOS, 0, MAKELONG(cfg::getWord("CList", "CycleTime", SETTING_CYCLETIME_DEFAULT), 0)); {

 			int i, count, item;

 			PROTOACCOUNT **accs;

-			DBVARIANT dbv = {

-				DBVT_DELETED

-			};

+			DBVARIANT dbv = { DBVT_DELETED };

 			db_get(NULL, "CList", "PrimaryStatus", &dbv);

-			ProtoEnumAccounts( &count, &accs );

-			item = SendDlgItemMessage(hwndDlg, IDC_PRIMARYSTATUS, CB_ADDSTRING, 0, (LPARAM) TranslateT("Global"));

-			SendDlgItemMessage(hwndDlg, IDC_PRIMARYSTATUS, CB_SETITEMDATA, item, (LPARAM) 0);

+			ProtoEnumAccounts(&count, &accs);

+			item = SendDlgItemMessage(hwndDlg, IDC_PRIMARYSTATUS, CB_ADDSTRING, 0, (LPARAM)TranslateT("Global"));

+			SendDlgItemMessage(hwndDlg, IDC_PRIMARYSTATUS, CB_SETITEMDATA, item, (LPARAM)0);

 			for (i = 0; i < count; i++) {

-				if ( !IsAccountEnabled(accs[i]) || CallProtoService(accs[i]->szModuleName, PS_GETCAPS, PFLAGNUM_2, 0) == 0)

+				if (!IsAccountEnabled(accs[i]) || CallProtoService(accs[i]->szModuleName, PS_GETCAPS, PFLAGNUM_2, 0) == 0)

 					continue;

 

-				item = SendDlgItemMessage(hwndDlg, IDC_PRIMARYSTATUS, CB_ADDSTRING, 0, (LPARAM) accs[i]->tszAccountName);

-				SendDlgItemMessage(hwndDlg, IDC_PRIMARYSTATUS, CB_SETITEMDATA, item, (LPARAM)accs[i] );

-				if (dbv.type == DBVT_ASCIIZ && !lstrcmpA(dbv.pszVal, accs[i]->szModuleName ))

+				item = SendDlgItemMessage(hwndDlg, IDC_PRIMARYSTATUS, CB_ADDSTRING, 0, (LPARAM)accs[i]->tszAccountName);

+				SendDlgItemMessage(hwndDlg, IDC_PRIMARYSTATUS, CB_SETITEMDATA, item, (LPARAM)accs[i]);

+				if (dbv.type == DBVT_ASCIIZ && !lstrcmpA(dbv.pszVal, accs[i]->szModuleName))

 					SendDlgItemMessage(hwndDlg, IDC_PRIMARYSTATUS, CB_SETCURSEL, item, 0);

 			}

 		}

-		if (-1 == (int) SendDlgItemMessage(hwndDlg, IDC_PRIMARYSTATUS, CB_GETCURSEL, 0, 0))

+		if (-1 == (int)SendDlgItemMessage(hwndDlg, IDC_PRIMARYSTATUS, CB_GETCURSEL, 0, 0))

 			SendDlgItemMessage(hwndDlg, IDC_PRIMARYSTATUS, CB_SETCURSEL, 0, 0);

-		SendDlgItemMessage(hwndDlg, IDC_BLINKSPIN, UDM_SETBUDDY, (WPARAM) GetDlgItem(hwndDlg, IDC_BLINKTIME), 0);

+		SendDlgItemMessage(hwndDlg, IDC_BLINKSPIN, UDM_SETBUDDY, (WPARAM)GetDlgItem(hwndDlg, IDC_BLINKTIME), 0);

 		SendDlgItemMessage(hwndDlg, IDC_BLINKSPIN, UDM_SETRANGE, 0, MAKELONG(0x3FFF, 250));

 		SendDlgItemMessage(hwndDlg, IDC_BLINKSPIN, UDM_SETPOS, 0, MAKELONG(cfg::getWord("CList", "IconFlashTime", 550), 0));

 		CheckDlgButton(hwndDlg, IDC_NOTRAYINFOTIPS, cfg::dat.bNoTrayTips ? 1 : 0);

@@ -135,47 +133,47 @@ INT_PTR CALLBACK DlgProcGenOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 			Utils::enableDlgControl(hwndDlg, IDC_CYCLETIMESPIN, IsDlgButtonChecked(hwndDlg, IDC_CYCLE));

 			Utils::enableDlgControl(hwndDlg, IDC_ALWAYSMULTI, IsDlgButtonChecked(hwndDlg, IDC_MULTITRAY));

 		}

-		if ((LOWORD(wParam) == IDC_CYCLETIME) && HIWORD(wParam) != EN_CHANGE)

+		if (LOWORD(wParam) == IDC_CYCLETIME && HIWORD(wParam) != EN_CHANGE)

 			break;

 		if (LOWORD(wParam) == IDC_PRIMARYSTATUS && HIWORD(wParam) != CBN_SELCHANGE)

 			break;

-		if ((LOWORD(wParam) == IDC_CYCLETIME) && (HIWORD(wParam) != EN_CHANGE || (HWND) lParam != GetFocus()))

+		if (LOWORD(wParam) == IDC_CYCLETIME && (HIWORD(wParam) != EN_CHANGE || (HWND)lParam != GetFocus()))

+			return 0;

+		if (LOWORD(wParam) == IDC_BLINKTIME && (HIWORD(wParam) != EN_CHANGE || (HWND)lParam != GetFocus()))

 			return 0;

-		if (LOWORD(wParam) == IDC_BLINKTIME && HIWORD(wParam) != EN_CHANGE || (HWND) lParam != GetFocus())

-			return 0; // dont make apply enabled during buddy set crap

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

 		opt_gen_opts_changed = TRUE;

 		break;

 

 	case WM_NOTIFY:

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

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

 		case 0:

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

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

 			case PSN_APPLY:

-				if ( !opt_gen_opts_changed)

+				if (!opt_gen_opts_changed)

 					return TRUE;

 

-				cfg::writeByte("CList", "HideOffline", (BYTE) IsDlgButtonChecked(hwndDlg, IDC_HIDEOFFLINE));

+				cfg::writeByte("CList", "HideOffline", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_HIDEOFFLINE));

 				{

 					DWORD caps = CallService(MS_CLUI_GETCAPS, CLUICAPS_FLAGS1, 0);

 					if (caps & CLUIF_HIDEEMPTYGROUPS)

-						cfg::writeByte("CList", "HideEmptyGroups", (BYTE) IsDlgButtonChecked(hwndDlg, IDC_HIDEEMPTYGROUPS));

+						cfg::writeByte("CList", "HideEmptyGroups", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_HIDEEMPTYGROUPS));

 					if (caps & CLUIF_DISABLEGROUPS)

-						cfg::writeByte("CList", "UseGroups", (BYTE) ! IsDlgButtonChecked(hwndDlg, IDC_DISABLEGROUPS));

-					if ( !(caps & CLUIF_HASONTOPOPTION)) {

-						cfg::writeByte("CList", "OnTop", (BYTE) IsDlgButtonChecked(hwndDlg, IDC_ONTOP));

+						cfg::writeByte("CList", "UseGroups", (BYTE)!IsDlgButtonChecked(hwndDlg, IDC_DISABLEGROUPS));

+					if (!(caps & CLUIF_HASONTOPOPTION)) {

+						cfg::writeByte("CList", "OnTop", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_ONTOP));

 						SetWindowPos(pcli->hwndContactList, IsDlgButtonChecked(hwndDlg, IDC_ONTOP) ? HWND_TOPMOST : HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE);

 					}

 				}

-				cfg::writeByte("CList", "ConfirmDelete", (BYTE) IsDlgButtonChecked(hwndDlg, IDC_CONFIRMDELETE));

-				cfg::writeByte("CList", "Tray1Click", (BYTE) IsDlgButtonChecked(hwndDlg, IDC_ONECLK));

-				cfg::writeByte("CList", "AlwaysStatus", (BYTE) IsDlgButtonChecked(hwndDlg, IDC_ALWAYSSTATUS));

-				cfg::writeByte("CList", "AlwaysMulti", (BYTE) ! IsDlgButtonChecked(hwndDlg, IDC_ALWAYSMULTI));

-				cfg::writeByte("CList", "TrayIcon", (BYTE) (IsDlgButtonChecked(hwndDlg, IDC_DONTCYCLE) ? SETTING_TRAYICON_SINGLE : (IsDlgButtonChecked(hwndDlg, IDC_CYCLE) ? SETTING_TRAYICON_CYCLE : SETTING_TRAYICON_MULTI)));

-				cfg::writeWord("CList", "CycleTime", (WORD) SendDlgItemMessage(hwndDlg, IDC_CYCLETIMESPIN, UDM_GETPOS, 0, 0));

-				cfg::writeWord("CList", "IconFlashTime", (WORD) SendDlgItemMessage(hwndDlg, IDC_BLINKSPIN, UDM_GETPOS, 0, 0));

-				cfg::writeByte("CList", "DisableTrayFlash", (BYTE) IsDlgButtonChecked(hwndDlg, IDC_DISABLEBLINK));

-				cfg::writeByte("CList", "NoIconBlink", (BYTE) IsDlgButtonChecked(hwndDlg, IDC_ICONBLINK));

+				cfg::writeByte("CList", "ConfirmDelete", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_CONFIRMDELETE));

+				cfg::writeByte("CList", "Tray1Click", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_ONECLK));

+				cfg::writeByte("CList", "AlwaysStatus", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_ALWAYSSTATUS));

+				cfg::writeByte("CList", "AlwaysMulti", (BYTE)!IsDlgButtonChecked(hwndDlg, IDC_ALWAYSMULTI));

+				cfg::writeByte("CList", "TrayIcon", (BYTE)(IsDlgButtonChecked(hwndDlg, IDC_DONTCYCLE) ? SETTING_TRAYICON_SINGLE : (IsDlgButtonChecked(hwndDlg, IDC_CYCLE) ? SETTING_TRAYICON_CYCLE : SETTING_TRAYICON_MULTI)));

+				cfg::writeWord("CList", "CycleTime", (WORD)SendDlgItemMessage(hwndDlg, IDC_CYCLETIMESPIN, UDM_GETPOS, 0, 0));

+				cfg::writeWord("CList", "IconFlashTime", (WORD)SendDlgItemMessage(hwndDlg, IDC_BLINKSPIN, UDM_GETPOS, 0, 0));

+				cfg::writeByte("CList", "DisableTrayFlash", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_DISABLEBLINK));

+				cfg::writeByte("CList", "NoIconBlink", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_ICONBLINK));

 				cfg::writeByte("CList", "AutoApplyLastViewMode", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_APPLYLASTVIEWMODE));

 

 				__setFlag(CLUI_FRAME_EVENTAREASUNKEN, IsDlgButtonChecked(hwndDlg, IDC_EVENTAREASUNKEN));

@@ -188,11 +186,11 @@ INT_PTR CALLBACK DlgProcGenOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 				cfg::writeByte("CList", "NoTrayTips", (BYTE)cfg::dat.bNoTrayTips);

 				{

 					int cursel = SendDlgItemMessage(hwndDlg, IDC_PRIMARYSTATUS, CB_GETCURSEL, 0, 0);

-					PROTOACCOUNT *pa = (PROTOACCOUNT*)SendDlgItemMessage(hwndDlg, IDC_PRIMARYSTATUS, CB_GETITEMDATA, cursel, 0);

-					if ( !pa )

+					PROTOACCOUNT *pa = (PROTOACCOUNT *)SendDlgItemMessage(hwndDlg, IDC_PRIMARYSTATUS, CB_GETITEMDATA, cursel, 0);

+					if (!pa)

 						db_unset(NULL, "CList", "PrimaryStatus");

 					else

-						cfg::writeString(NULL, "CList", "PrimaryStatus", pa->szModuleName );

+						cfg::writeString(NULL, "CList", "PrimaryStatus", pa->szModuleName);

 				}

 				pcli->pfnTrayIconIconsChanged();

 				cfg::writeDword("CLUI", "Frameflags", cfg::dat.dwFlags);

diff --git a/plugins/Clist_nicer/src/clistsettings.cpp b/plugins/Clist_nicer/src/clistsettings.cpp
index 81506fa750..ac54ea9b81 100644
--- a/plugins/Clist_nicer/src/clistsettings.cpp
+++ b/plugins/Clist_nicer/src/clistsettings.cpp
@@ -26,7 +26,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 INT_PTR GetContactStatusMessage(WPARAM wParam, LPARAM lParam)

 {

-	if ( !cfg::shutDown)

+	if (!cfg::shutDown)

 		return SendMessage(pcli->hwndContactTree, CLM_GETSTATUSMSG, wParam, lParam);

 	return 0;

 }

diff --git a/plugins/Clist_nicer/src/cluiopts.cpp b/plugins/Clist_nicer/src/cluiopts.cpp
index d257b7b0cc..5617cd2431 100644
--- a/plugins/Clist_nicer/src/cluiopts.cpp
+++ b/plugins/Clist_nicer/src/cluiopts.cpp
@@ -82,7 +82,7 @@ INT_PTR CALLBACK DlgProcCluiOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l
 			Utils::enableDlgControl(hwndDlg, IDC_HIDETIME, IsDlgButtonChecked(hwndDlg, IDC_AUTOHIDE));

 			Utils::enableDlgControl(hwndDlg, IDC_HIDETIMESPIN, IsDlgButtonChecked(hwndDlg, IDC_AUTOHIDE));

 			Utils::enableDlgControl(hwndDlg, IDC_STATIC01, IsDlgButtonChecked(hwndDlg, IDC_AUTOHIDE));

-			if ( !IsDlgButtonChecked(hwndDlg, IDC_AUTOSIZE)) {

+			if (!IsDlgButtonChecked(hwndDlg, IDC_AUTOSIZE)) {

 				Utils::enableDlgControl(hwndDlg, IDC_STATIC21, FALSE);

 				Utils::enableDlgControl(hwndDlg, IDC_STATIC22, FALSE);

 				Utils::enableDlgControl(hwndDlg, IDC_MAXSIZEHEIGHT, FALSE);

@@ -90,17 +90,18 @@ INT_PTR CALLBACK DlgProcCluiOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l
 				Utils::enableDlgControl(hwndDlg, IDC_AUTOSIZEUPWARD, FALSE);

 			} {

 				DBVARIANT dbv;

-				if ( !cfg::getTString(NULL, "CList", "TitleText", &dbv)) {

+				if (!cfg::getTString(NULL, "CList", "TitleText", &dbv)) {

 					SetDlgItemText(hwndDlg, IDC_TITLETEXT, dbv.ptszVal);

 					db_free(&dbv);

-				} else

+				}

+				else

 					SetDlgItemTextA(hwndDlg, IDC_TITLETEXT, MIRANDANAME);

 			}

 

 			CheckDlgButton(hwndDlg, IDC_TRANSPARENT, cfg::dat.isTransparent ? BST_CHECKED : BST_UNCHECKED);

 			CheckDlgButton(hwndDlg, IDC_FULLTRANSPARENT, cfg::dat.bFullTransparent ? BST_CHECKED : BST_UNCHECKED);

 

-			if ( !IsDlgButtonChecked(hwndDlg, IDC_TRANSPARENT)) {

+			if (!IsDlgButtonChecked(hwndDlg, IDC_TRANSPARENT)) {

 				Utils::enableDlgControl(hwndDlg, IDC_STATIC11, FALSE);

 				Utils::enableDlgControl(hwndDlg, IDC_STATIC12, FALSE);

 				Utils::enableDlgControl(hwndDlg, IDC_TRANSACTIVE, FALSE);

@@ -141,9 +142,11 @@ INT_PTR CALLBACK DlgProcCluiOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l
 			Utils::enableDlgControl(hwndDlg, IDC_MAXSIZESPIN, IsDlgButtonChecked(hwndDlg, IDC_AUTOSIZE));

 			Utils::enableDlgControl(hwndDlg, IDC_AUTOSIZEUPWARD, IsDlgButtonChecked(hwndDlg, IDC_AUTOSIZE));

 		}

-		if ((LOWORD(wParam) == IDC_FRAMEGAP || LOWORD(wParam) == IDC_HIDETIME || LOWORD(wParam) == IDC_CLIPBORDER || LOWORD(wParam) == IDC_ROWGAP || LOWORD(wParam) == IDC_TITLETEXT ||

+		if ((LOWORD(wParam) == IDC_FRAMEGAP || LOWORD(wParam) == IDC_HIDETIME || LOWORD(wParam) == IDC_CLIPBORDER || LOWORD(wParam) == IDC_TITLETEXT ||

 			LOWORD(wParam) == IDC_MAXSIZEHEIGHT || LOWORD(wParam) == IDC_CLEFT || LOWORD(wParam) == IDC_CRIGHT || LOWORD(wParam) == IDC_CTOP

-			|| LOWORD(wParam) == IDC_CBOTTOM) && (HIWORD(wParam) != EN_CHANGE || (HWND) lParam != GetFocus()))

+			|| LOWORD(wParam) == IDC_CBOTTOM) && (HIWORD(wParam) != EN_CHANGE || (HWND)lParam != GetFocus()))

+			return 0;

+		if (LOWORD(wParam) == IDC_BORDERSTYLE && (HIWORD(wParam) != CBN_SELCHANGE || (HWND)lParam != GetFocus()))

 			return 0;

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

 		opt_clui_changed = 1;

@@ -164,16 +167,16 @@ INT_PTR CALLBACK DlgProcCluiOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l
 		break;

 

 	case WM_NOTIFY:

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

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

 			BOOL translated;

 			BYTE oldFading;

 			BYTE windowStyle = (BYTE)SendDlgItemMessage(hwndDlg, IDC_BORDERSTYLE, CB_GETCURSEL, 0, 0);

 			COLORREF clr_cluiframes;

 

-			if ( !opt_clui_changed)

+			if (!opt_clui_changed)

 				return TRUE;

 

-			cfg::writeByte("CLUI", "FadeInOut", (BYTE) IsDlgButtonChecked(hwndDlg, IDC_FADEINOUT));

+			cfg::writeByte("CLUI", "FadeInOut", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_FADEINOUT));

 			cfg::dat.fadeinout = IsDlgButtonChecked(hwndDlg, IDC_FADEINOUT) ? 1 : 0;

 			oldFading = cfg::dat.fadeinout;

 			cfg::dat.fadeinout = FALSE;

@@ -182,7 +185,7 @@ INT_PTR CALLBACK DlgProcCluiOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l
 			cfg::dat.gapBetweenFrames = GetDlgItemInt(hwndDlg, IDC_FRAMEGAP, &translated, FALSE);

 

 			cfg::writeDword("CLUIFrames", "GapBetweenFrames", cfg::dat.gapBetweenFrames);

-			cfg::writeByte("CList", "OnTop", (BYTE) IsDlgButtonChecked(hwndDlg, IDC_ONTOP));

+			cfg::writeByte("CList", "OnTop", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_ONTOP));

 			SetWindowPos(pcli->hwndContactList, IsDlgButtonChecked(hwndDlg, IDC_ONTOP) ? HWND_TOPMOST : HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE);

 

 			cfg::dat.bCLeft = (BYTE)SendDlgItemMessage(hwndDlg, IDC_CLEFTSPIN, UDM_GETPOS, 0, 0);

@@ -193,7 +196,7 @@ INT_PTR CALLBACK DlgProcCluiOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l
 			cfg::writeDword("CLUI", "clmargins", MAKELONG(MAKEWORD(cfg::dat.bCLeft, cfg::dat.bCRight), MAKEWORD(cfg::dat.bCTop, cfg::dat.bCBottom)));

 			SendMessage(pcli->hwndContactList, WM_SIZE, 0, 0);

 

-			cfg::writeByte("CList", "BringToFront", (BYTE) IsDlgButtonChecked(hwndDlg, IDC_BRINGTOFRONT));

+			cfg::writeByte("CList", "BringToFront", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_BRINGTOFRONT));

 			cfg::writeByte("CList", "AlwaysHideOnTB", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_ALWAYSHIDEONTASKBAR));

 

 			if (windowStyle != SETTING_WINDOWSTYLE_DEFAULT) {

@@ -213,15 +216,13 @@ INT_PTR CALLBACK DlgProcCluiOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l
 				SetWindowPlacement(pcli->hwndContactList, &p);

 				ShowWindow(pcli->hwndContactList, SW_SHOW);

 			}

-			else

-			{

+			else {

 				LONG style;

 				style = GetWindowLongPtr(pcli->hwndContactList, GWL_EXSTYLE);

 				style &= ~(WS_EX_TOOLWINDOW | WS_EX_WINDOWEDGE);

 				if (cfg::getByte("CList", "AlwaysHideOnTB", 1))

 					style &= ~WS_EX_APPWINDOW;

-				else

-				{

+				else {

 					style |= WS_EX_APPWINDOW;

 					AddToTaskBar(pcli->hwndContactList);

 				}

@@ -232,8 +233,8 @@ INT_PTR CALLBACK DlgProcCluiOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l
 			cfg::writeDword("CLUI", "Frameflags", cfg::dat.dwFlags);

 			cfg::writeByte("CLUI", "clipborder", cfg::dat.bClipBorder);

 

-			cfg::writeByte("CLUI", "ShowMainMenu", (BYTE) IsDlgButtonChecked(hwndDlg, IDC_SHOWMAINMENU));

-			cfg::writeByte("CLUI", "ClientAreaDrag", (BYTE) IsDlgButtonChecked(hwndDlg, IDC_CLIENTDRAG));

+			cfg::writeByte("CLUI", "ShowMainMenu", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_SHOWMAINMENU));

+			cfg::writeByte("CLUI", "ClientAreaDrag", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_CLIENTDRAG));

 

 			clr_cluiframes = (COLORREF)SendDlgItemMessage(hwndDlg, IDC_CLUIFRAMESBDR, CPM_GETCOLOUR, 0, 0);

 

@@ -244,7 +245,7 @@ INT_PTR CALLBACK DlgProcCluiOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l
 

 			ApplyCLUIBorderStyle(pcli->hwndContactList);

 

-			if ( !IsDlgButtonChecked(hwndDlg, IDC_SHOWMAINMENU))

+			if (!IsDlgButtonChecked(hwndDlg, IDC_SHOWMAINMENU))

 				SetMenu(pcli->hwndContactList, NULL);

 			else

 				SetMenu(pcli->hwndContactList, pcli->hMenuMain);

@@ -256,26 +257,26 @@ INT_PTR CALLBACK DlgProcCluiOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l
 				SetWindowText(pcli->hwndContactList, title);

 			}

 			cfg::dat.dwFlags = IsDlgButtonChecked(hwndDlg, IDC_ROUNDEDBORDER) ? cfg::dat.dwFlags | CLUI_FRAME_ROUNDEDFRAME : cfg::dat.dwFlags & ~CLUI_FRAME_ROUNDEDFRAME;

-			cfg::writeByte("CLUI", "AutoSize", (BYTE) IsDlgButtonChecked(hwndDlg, IDC_AUTOSIZE));

+			cfg::writeByte("CLUI", "AutoSize", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_AUTOSIZE));

 

 			if ((cfg::dat.autosize = IsDlgButtonChecked(hwndDlg, IDC_AUTOSIZE) ? 1 : 0)) {

 				SendMessage(pcli->hwndContactList, WM_SIZE, 0, 0);

 				SendMessage(pcli->hwndContactTree, WM_SIZE, 0, 0);

 			}

 

-			cfg::writeByte("CLUI", "MaxSizeHeight", (BYTE) GetDlgItemInt(hwndDlg, IDC_MAXSIZEHEIGHT, NULL, FALSE));

-			cfg::writeByte("CLUI", "AutoSizeUpward", (BYTE) IsDlgButtonChecked(hwndDlg, IDC_AUTOSIZEUPWARD));

-			cfg::writeByte("CList", "AutoHide", (BYTE) IsDlgButtonChecked(hwndDlg, IDC_AUTOHIDE));

-			cfg::writeWord("CList", "HideTime", (WORD) SendDlgItemMessage(hwndDlg, IDC_HIDETIMESPIN, UDM_GETPOS, 0, 0));

+			cfg::writeByte("CLUI", "MaxSizeHeight", (BYTE)GetDlgItemInt(hwndDlg, IDC_MAXSIZEHEIGHT, NULL, FALSE));

+			cfg::writeByte("CLUI", "AutoSizeUpward", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_AUTOSIZEUPWARD));

+			cfg::writeByte("CList", "AutoHide", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_AUTOHIDE));

+			cfg::writeWord("CList", "HideTime", (WORD)SendDlgItemMessage(hwndDlg, IDC_HIDETIMESPIN, UDM_GETPOS, 0, 0));

 

-			cfg::writeByte("CList", "Transparent", (BYTE) IsDlgButtonChecked(hwndDlg, IDC_TRANSPARENT));

+			cfg::writeByte("CList", "Transparent", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_TRANSPARENT));

 			cfg::dat.isTransparent = IsDlgButtonChecked(hwndDlg, IDC_TRANSPARENT) ? 1 : 0;

-			cfg::writeByte("CList", "Alpha", (BYTE) SendDlgItemMessage(hwndDlg, IDC_TRANSACTIVE, TBM_GETPOS, 0, 0));

-			cfg::dat.alpha = (BYTE) SendDlgItemMessage(hwndDlg, IDC_TRANSACTIVE, TBM_GETPOS, 0, 0);

-			cfg::writeByte("CList", "AutoAlpha", (BYTE) SendDlgItemMessage(hwndDlg, IDC_TRANSINACTIVE, TBM_GETPOS, 0, 0));

-			cfg::dat.autoalpha = (BYTE) SendDlgItemMessage(hwndDlg, IDC_TRANSINACTIVE, TBM_GETPOS, 0, 0);

-			cfg::writeByte("CList", "WindowShadow", (BYTE) IsDlgButtonChecked(hwndDlg, IDC_DROPSHADOW));

-			cfg::writeByte("CList", "OnDesktop", (BYTE) IsDlgButtonChecked(hwndDlg, IDC_ONDESKTOP));

+			cfg::writeByte("CList", "Alpha", (BYTE)SendDlgItemMessage(hwndDlg, IDC_TRANSACTIVE, TBM_GETPOS, 0, 0));

+			cfg::dat.alpha = (BYTE)SendDlgItemMessage(hwndDlg, IDC_TRANSACTIVE, TBM_GETPOS, 0, 0);

+			cfg::writeByte("CList", "AutoAlpha", (BYTE)SendDlgItemMessage(hwndDlg, IDC_TRANSINACTIVE, TBM_GETPOS, 0, 0));

+			cfg::dat.autoalpha = (BYTE)SendDlgItemMessage(hwndDlg, IDC_TRANSINACTIVE, TBM_GETPOS, 0, 0);

+			cfg::writeByte("CList", "WindowShadow", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_DROPSHADOW));

+			cfg::writeByte("CList", "OnDesktop", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_ONDESKTOP));

 			cfg::writeDword("CLUI", "Frameflags", cfg::dat.dwFlags);

 			cfg::dat.bFullTransparent = IsDlgButtonChecked(hwndDlg, IDC_FULLTRANSPARENT) ? 1 : 0;

 			cfg::writeByte("CLUI", "fulltransparent", (BYTE)cfg::dat.bFullTransparent);

@@ -299,9 +300,10 @@ INT_PTR CALLBACK DlgProcCluiOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l
 					(COLORREF)(cfg::dat.bFullTransparent ? cfg::dat.colorkey : 0),

 					(BYTE)(cfg::dat.isTransparent ? cfg::dat.autoalpha : 255),

 					(DWORD)((cfg::dat.isTransparent ? LWA_ALPHA : 0L) | (cfg::dat.bFullTransparent ? LWA_COLORKEY : 0L)));

-			} else {

+			}

+			else {

 				SetLayeredWindowAttributes(pcli->hwndContactList, RGB(0, 0, 0), (BYTE)255, LWA_ALPHA);

-				if ( !cfg::dat.bLayeredHack)

+				if (!cfg::dat.bLayeredHack)

 					SetWindowLongPtr(pcli->hwndContactList, GWL_EXSTYLE, GetWindowLongPtr(pcli->hwndContactList, GWL_EXSTYLE) & ~WS_EX_LAYERED);

 			}

 

@@ -345,7 +347,7 @@ INT_PTR CALLBACK DlgProcSBarOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l
 		CheckDlgButton(hwndDlg, IDC_SHOWXSTATUS, cfg::dat.bShowXStatusOnSbar);

 		CheckDlgButton(hwndDlg, IDC_MARKLOCKED, cfg::getByte("CLUI", "sbar_showlocked", 1));

 

-		if ( !IsDlgButtonChecked(hwndDlg, IDC_SHOWSBAR)) {

+		if (!IsDlgButtonChecked(hwndDlg, IDC_SHOWSBAR)) {

 			Utils::enableDlgControl(hwndDlg, IDC_SHOWICON, FALSE);

 			Utils::enableDlgControl(hwndDlg, IDC_SHOWPROTO, FALSE);

 			Utils::enableDlgControl(hwndDlg, IDC_SHOWSTATUS, FALSE);

@@ -373,27 +375,27 @@ INT_PTR CALLBACK DlgProcSBarOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l
 		opt_sbar_changed = 1;

 		break;

 	case WM_NOTIFY:

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

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

 		case PSN_APPLY:

-			if ( !opt_sbar_changed)

+			if (!opt_sbar_changed)

 				return TRUE;

 

-			cfg::writeByte("CLUI", "ShowSBar", (BYTE) IsDlgButtonChecked(hwndDlg, IDC_SHOWSBAR));

-			cfg::writeByte("CLUI", "SBarShow", (BYTE) ((IsDlgButtonChecked(hwndDlg, IDC_SHOWICON) ? 1 : 0) | (IsDlgButtonChecked(hwndDlg, IDC_SHOWPROTO) ? 2 : 0) | (IsDlgButtonChecked(hwndDlg, IDC_SHOWSTATUS) ? 4 : 0)));

-			cfg::writeByte("CLUI", "SBarRightClk", (BYTE) IsDlgButtonChecked(hwndDlg, IDC_RIGHTMIRANDA));

-			cfg::writeByte("CLUI", "EqualSections", (BYTE) IsDlgButtonChecked(hwndDlg, IDC_EQUALSECTIONS));

-			cfg::writeByte("CLUI", "sb_skinned", (BYTE) IsDlgButtonChecked(hwndDlg, IDC_SKINBACKGROUND));

-			cfg::writeByte("CLUI", "sbar_showlocked", (BYTE) IsDlgButtonChecked(hwndDlg, IDC_MARKLOCKED));

+			cfg::writeByte("CLUI", "ShowSBar", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_SHOWSBAR));

+			cfg::writeByte("CLUI", "SBarShow", (BYTE)((IsDlgButtonChecked(hwndDlg, IDC_SHOWICON) ? 1 : 0) | (IsDlgButtonChecked(hwndDlg, IDC_SHOWPROTO) ? 2 : 0) | (IsDlgButtonChecked(hwndDlg, IDC_SHOWSTATUS) ? 4 : 0)));

+			cfg::writeByte("CLUI", "SBarRightClk", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_RIGHTMIRANDA));

+			cfg::writeByte("CLUI", "EqualSections", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_EQUALSECTIONS));

+			cfg::writeByte("CLUI", "sb_skinned", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_SKINBACKGROUND));

+			cfg::writeByte("CLUI", "sbar_showlocked", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_MARKLOCKED));

 

 			cfg::dat.bEqualSections = IsDlgButtonChecked(hwndDlg, IDC_EQUALSECTIONS) ? 1 : 0;

 			cfg::dat.bSkinnedStatusBar = IsDlgButtonChecked(hwndDlg, IDC_SKINBACKGROUND) ? 1 : 0;

 			cfg::dat.bShowXStatusOnSbar = IsDlgButtonChecked(hwndDlg, IDC_SHOWXSTATUS) ? 1 : 0;

 			cfg::writeByte("CLUI", "xstatus_sbar", (BYTE)cfg::dat.bShowXStatusOnSbar);

-			cfg::writeByte("CLUI", "SBarBevel", (BYTE) IsDlgButtonChecked(hwndDlg, IDC_SBPANELBEVEL));

-			if (cfg::getByte("CLUI", "ShowGrip", 1) != (BYTE) IsDlgButtonChecked(hwndDlg, IDC_SHOWGRIP)) {

+			cfg::writeByte("CLUI", "SBarBevel", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_SBPANELBEVEL));

+			if (cfg::getByte("CLUI", "ShowGrip", 1) != (BYTE)IsDlgButtonChecked(hwndDlg, IDC_SHOWGRIP)) {

 				HWND parent = GetParent(pcli->hwndStatus);

 				int flags = WS_CHILD | CCS_BOTTOM;

-				cfg::writeByte("CLUI", "ShowGrip", (BYTE) IsDlgButtonChecked(hwndDlg, IDC_SHOWGRIP));

+				cfg::writeByte("CLUI", "ShowGrip", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_SHOWGRIP));

 				ShowWindow(pcli->hwndStatus, SW_HIDE);

 				mir_unsubclassWindow(pcli->hwndStatus, NewStatusBarWndProc);

 				DestroyWindow(pcli->hwndStatus);

@@ -444,7 +446,7 @@ void ApplyCLUIBorderStyle(HWND hwnd)
 {

 	BYTE windowStyle = cfg::getByte("CLUI", "WindowStyle", SETTING_WINDOWSTYLE_TOOLWINDOW);

 	WINDOWPLACEMENT p;

-	bool	minToTray = TRUE;

+	bool minToTray = TRUE;

 

 	p.length = sizeof(p);

 	GetWindowPlacement(pcli->hwndContactList, &p);