code cleaning

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

1 files changed, 80 insertions, 81 deletions

diff --git a/src/core/stdmsg/src/msgoptions.cpp b/src/core/stdmsg/src/msgoptions.cpp
index 7a45049e73..cf8b779237 100644
--- a/src/core/stdmsg/src/msgoptions.cpp
+++ b/src/core/stdmsg/src/msgoptions.cpp
@@ -480,95 +480,94 @@ static INT_PTR CALLBACK DlgProcTypeOptions(HWND hwndDlg, UINT msg, WPARAM wParam
 	static HANDLE hItemNew, hItemUnknown;

 

 	switch (msg) {

-		case WM_INITDIALOG:

-			TranslateDialogDefault(hwndDlg);

-			{

-				CLCINFOITEM cii = { 0 };

-				cii.cbSize = sizeof(cii);

-				cii.flags = CLCIIF_GROUPFONT | CLCIIF_CHECKBOX;

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

-				hItemNew = (HANDLE)SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_ADDINFOITEM, 0, (LPARAM) & cii);

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

-				hItemUnknown = (HANDLE)SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_ADDINFOITEM, 0, (LPARAM) & cii);

+	case WM_INITDIALOG:

+		TranslateDialogDefault(hwndDlg);

+		{

+			CLCINFOITEM cii = { sizeof(cii) };

+			cii.flags = CLCIIF_GROUPFONT | CLCIIF_CHECKBOX;

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

+			hItemNew = (HANDLE)SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_ADDINFOITEM, 0, (LPARAM) & cii);

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

+			hItemUnknown = (HANDLE)SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_ADDINFOITEM, 0, (LPARAM) & cii);

+		}

+		SetWindowLongPtr(GetDlgItem(hwndDlg, IDC_CLIST), GWL_STYLE, GetWindowLongPtr(GetDlgItem(hwndDlg, IDC_CLIST), GWL_STYLE) | (CLS_SHOWHIDDEN) | (CLS_NOHIDEOFFLINE));

+		ResetCList(hwndDlg);

+		RebuildList(hwndDlg, hItemNew, hItemUnknown);

+		CheckDlgButton(hwndDlg, IDC_SHOWNOTIFY, db_get_b(NULL, SRMMMOD, SRMSGSET_SHOWTYPING, SRMSGDEFSET_SHOWTYPING));

+		CheckDlgButton(hwndDlg, IDC_TYPEWIN, db_get_b(NULL, SRMMMOD, SRMSGSET_SHOWTYPINGWIN, SRMSGDEFSET_SHOWTYPINGWIN));

+		CheckDlgButton(hwndDlg, IDC_TYPETRAY, db_get_b(NULL, SRMMMOD, SRMSGSET_SHOWTYPINGNOWIN, SRMSGDEFSET_SHOWTYPINGNOWIN));

+		CheckDlgButton(hwndDlg, IDC_NOTIFYTRAY, db_get_b(NULL, SRMMMOD, SRMSGSET_SHOWTYPINGCLIST, SRMSGDEFSET_SHOWTYPINGCLIST));

+		CheckDlgButton(hwndDlg, IDC_NOTIFYBALLOON, !db_get_b(NULL, SRMMMOD, SRMSGSET_SHOWTYPINGCLIST, SRMSGDEFSET_SHOWTYPINGCLIST));

+		EnableWindow(GetDlgItem(hwndDlg, IDC_TYPEWIN), IsDlgButtonChecked(hwndDlg, IDC_SHOWNOTIFY));

+		EnableWindow(GetDlgItem(hwndDlg, IDC_TYPETRAY), IsDlgButtonChecked(hwndDlg, IDC_SHOWNOTIFY));

+		EnableWindow(GetDlgItem(hwndDlg, IDC_NOTIFYTRAY), IsDlgButtonChecked(hwndDlg, IDC_TYPETRAY));

+		EnableWindow(GetDlgItem(hwndDlg, IDC_NOTIFYBALLOON), IsDlgButtonChecked(hwndDlg, IDC_TYPETRAY));

+		if (!ServiceExists(MS_CLIST_SYSTRAY_NOTIFY)) {

+			EnableWindow(GetDlgItem(hwndDlg, IDC_NOTIFYBALLOON), FALSE);

+			CheckDlgButton(hwndDlg, IDC_NOTIFYTRAY, BST_CHECKED);

+			SetWindowText(GetDlgItem(hwndDlg, IDC_NOTIFYBALLOON), TranslateT("Show balloon popup (unsupported system)"));

+		}

+		break;

+

+	case WM_COMMAND:

+		switch (LOWORD(wParam)) {

+		case IDC_TYPETRAY:

+			if (IsDlgButtonChecked(hwndDlg, IDC_TYPETRAY)) {

+				if (!ServiceExists(MS_CLIST_SYSTRAY_NOTIFY)) {

+					EnableWindow(GetDlgItem(hwndDlg, IDC_NOTIFYTRAY), TRUE);

+				}

+				else {

+					EnableWindow(GetDlgItem(hwndDlg, IDC_NOTIFYTRAY), TRUE);

+					EnableWindow(GetDlgItem(hwndDlg, IDC_NOTIFYBALLOON), TRUE);

+				}

 			}

-			SetWindowLongPtr(GetDlgItem(hwndDlg, IDC_CLIST), GWL_STYLE, GetWindowLongPtr(GetDlgItem(hwndDlg, IDC_CLIST), GWL_STYLE) | (CLS_SHOWHIDDEN) | (CLS_NOHIDEOFFLINE));

-			ResetCList(hwndDlg);

-			RebuildList(hwndDlg, hItemNew, hItemUnknown);

-			CheckDlgButton(hwndDlg, IDC_SHOWNOTIFY, db_get_b(NULL, SRMMMOD, SRMSGSET_SHOWTYPING, SRMSGDEFSET_SHOWTYPING));

-			CheckDlgButton(hwndDlg, IDC_TYPEWIN, db_get_b(NULL, SRMMMOD, SRMSGSET_SHOWTYPINGWIN, SRMSGDEFSET_SHOWTYPINGWIN));

-			CheckDlgButton(hwndDlg, IDC_TYPETRAY, db_get_b(NULL, SRMMMOD, SRMSGSET_SHOWTYPINGNOWIN, SRMSGDEFSET_SHOWTYPINGNOWIN));

-			CheckDlgButton(hwndDlg, IDC_NOTIFYTRAY, db_get_b(NULL, SRMMMOD, SRMSGSET_SHOWTYPINGCLIST, SRMSGDEFSET_SHOWTYPINGCLIST));

-			CheckDlgButton(hwndDlg, IDC_NOTIFYBALLOON, !db_get_b(NULL, SRMMMOD, SRMSGSET_SHOWTYPINGCLIST, SRMSGDEFSET_SHOWTYPINGCLIST));

-			EnableWindow(GetDlgItem(hwndDlg, IDC_TYPEWIN), IsDlgButtonChecked(hwndDlg, IDC_SHOWNOTIFY));

-			EnableWindow(GetDlgItem(hwndDlg, IDC_TYPETRAY), IsDlgButtonChecked(hwndDlg, IDC_SHOWNOTIFY));

-			EnableWindow(GetDlgItem(hwndDlg, IDC_NOTIFYTRAY), IsDlgButtonChecked(hwndDlg, IDC_TYPETRAY));

-			EnableWindow(GetDlgItem(hwndDlg, IDC_NOTIFYBALLOON), IsDlgButtonChecked(hwndDlg, IDC_TYPETRAY));

-			if (!ServiceExists(MS_CLIST_SYSTRAY_NOTIFY)) {

+			else {

+				EnableWindow(GetDlgItem(hwndDlg, IDC_NOTIFYTRAY), FALSE);

 				EnableWindow(GetDlgItem(hwndDlg, IDC_NOTIFYBALLOON), FALSE);

-				CheckDlgButton(hwndDlg, IDC_NOTIFYTRAY, BST_CHECKED);

-				SetWindowText(GetDlgItem(hwndDlg, IDC_NOTIFYBALLOON), TranslateT("Show balloon popup (unsupported system)"));

 			}

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

 			break;

-		case WM_COMMAND:

-			switch (LOWORD(wParam)) {

-				case IDC_TYPETRAY:

-					if (IsDlgButtonChecked(hwndDlg, IDC_TYPETRAY)) {

-						if (!ServiceExists(MS_CLIST_SYSTRAY_NOTIFY)) {

-							EnableWindow(GetDlgItem(hwndDlg, IDC_NOTIFYTRAY), TRUE);

-						}

-						else {

-							EnableWindow(GetDlgItem(hwndDlg, IDC_NOTIFYTRAY), TRUE);

-							EnableWindow(GetDlgItem(hwndDlg, IDC_NOTIFYBALLOON), TRUE);

-						}

-					}

-					else {

-						EnableWindow(GetDlgItem(hwndDlg, IDC_NOTIFYTRAY), FALSE);

-						EnableWindow(GetDlgItem(hwndDlg, IDC_NOTIFYBALLOON), FALSE);

-					}

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

-					break;

-				case IDC_SHOWNOTIFY:

-					EnableWindow(GetDlgItem(hwndDlg, IDC_TYPEWIN), IsDlgButtonChecked(hwndDlg, IDC_SHOWNOTIFY));

-					EnableWindow(GetDlgItem(hwndDlg, IDC_TYPETRAY), IsDlgButtonChecked(hwndDlg, IDC_SHOWNOTIFY));

-					EnableWindow(GetDlgItem(hwndDlg, IDC_NOTIFYTRAY), IsDlgButtonChecked(hwndDlg, IDC_SHOWNOTIFY));

-					EnableWindow(GetDlgItem(hwndDlg, IDC_NOTIFYBALLOON), IsDlgButtonChecked(hwndDlg, IDC_SHOWNOTIFY)

-								 && ServiceExists(MS_CLIST_SYSTRAY_NOTIFY));

-					//fall-thru

-				case IDC_TYPEWIN:

-				case IDC_NOTIFYTRAY:

-				case IDC_NOTIFYBALLOON:

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

-					break;

+		case IDC_SHOWNOTIFY:

+			EnableWindow(GetDlgItem(hwndDlg, IDC_TYPEWIN), IsDlgButtonChecked(hwndDlg, IDC_SHOWNOTIFY));

+			EnableWindow(GetDlgItem(hwndDlg, IDC_TYPETRAY), IsDlgButtonChecked(hwndDlg, IDC_SHOWNOTIFY));

+			EnableWindow(GetDlgItem(hwndDlg, IDC_NOTIFYTRAY), IsDlgButtonChecked(hwndDlg, IDC_SHOWNOTIFY));

+			EnableWindow(GetDlgItem(hwndDlg, IDC_NOTIFYBALLOON), IsDlgButtonChecked(hwndDlg, IDC_SHOWNOTIFY)

+				&& ServiceExists(MS_CLIST_SYSTRAY_NOTIFY));

+			//fall-thru

+		case IDC_TYPEWIN:

+		case IDC_NOTIFYTRAY:

+		case IDC_NOTIFYBALLOON:

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

+			break;

+		}

+		break;

+

+	case WM_NOTIFY:

+		switch (((NMHDR *) lParam)->idFrom) {

+		case IDC_CLIST:

+			switch (((NMHDR *) lParam)->code) {

+			case CLN_OPTIONSCHANGED:

+				ResetCList(hwndDlg);

+				break;

+			case CLN_CHECKCHANGED:

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

+				break;

 			}

 			break;

-		case WM_NOTIFY:

-			switch (((NMHDR *) lParam)->idFrom) {

-				case IDC_CLIST:

-					switch (((NMHDR *) lParam)->code) {

-						case CLN_OPTIONSCHANGED:

-							ResetCList(hwndDlg);

-							break;

-						case CLN_CHECKCHANGED:

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

-							break;

-					}

-					break;

-				case 0:

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

-						case PSN_APPLY:

-						{

-							SaveList(hwndDlg, hItemNew, hItemUnknown);

-							db_set_b(NULL, SRMMMOD, SRMSGSET_SHOWTYPING, (BYTE) IsDlgButtonChecked(hwndDlg, IDC_SHOWNOTIFY));

-							db_set_b(NULL, SRMMMOD, SRMSGSET_SHOWTYPINGWIN, (BYTE) IsDlgButtonChecked(hwndDlg, IDC_TYPEWIN));

-							db_set_b(NULL, SRMMMOD, SRMSGSET_SHOWTYPINGNOWIN, (BYTE) IsDlgButtonChecked(hwndDlg, IDC_TYPETRAY));

-							db_set_b(NULL, SRMMMOD, SRMSGSET_SHOWTYPINGCLIST, (BYTE) IsDlgButtonChecked(hwndDlg, IDC_NOTIFYTRAY));

-							ReloadGlobals();

-							WindowList_Broadcast(g_dat.hMessageWindowList, DM_OPTIONSAPPLIED, 0, 0);

-						}

-					}

-					break;

+		case 0:

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

+			case PSN_APPLY:

+				SaveList(hwndDlg, hItemNew, hItemUnknown);

+				db_set_b(NULL, SRMMMOD, SRMSGSET_SHOWTYPING, (BYTE) IsDlgButtonChecked(hwndDlg, IDC_SHOWNOTIFY));

+				db_set_b(NULL, SRMMMOD, SRMSGSET_SHOWTYPINGWIN, (BYTE) IsDlgButtonChecked(hwndDlg, IDC_TYPEWIN));

+				db_set_b(NULL, SRMMMOD, SRMSGSET_SHOWTYPINGNOWIN, (BYTE) IsDlgButtonChecked(hwndDlg, IDC_TYPETRAY));

+				db_set_b(NULL, SRMMMOD, SRMSGSET_SHOWTYPINGCLIST, (BYTE) IsDlgButtonChecked(hwndDlg, IDC_NOTIFYTRAY));

+				ReloadGlobals();

+				WindowList_Broadcast(g_dat.hMessageWindowList, DM_OPTIONSAPPLIED, 0, 0);

 			}

 			break;

+		}

+		break;

 	}

 	return FALSE;

 }