chat log icons are back

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

2 files changed, 191 insertions, 198 deletions

diff --git a/src/core/stdchat/src/options.cpp b/src/core/stdchat/src/options.cpp
index 326d253369..5fefef89ad 100644
--- a/src/core/stdchat/src/options.cpp
+++ b/src/core/stdchat/src/options.cpp
@@ -40,7 +40,7 @@ static const struct branch_t branch1[] = {
 	{ LPGENT("Send message by pressing the 'Enter' key"), "SendOnEnter", 0, 1},

 	{ LPGENT("Send message by pressing the 'Enter' key twice"), "SendOnDblEnter", 0,0},

 	{ LPGENT("Flash window when someone speaks"), "FlashWindow", 0,0},

-	{ LPGENT("Flash window when a word is highlighted"), "bFlashWindowHighlight", 0,1},

+	{ LPGENT("Flash window when a word is highlighted"), "FlashWindowHighlight", 0,1},

 	{ LPGENT("Show list of users in the chat room"), "ShowNicklist", 0,1},

 	{ LPGENT("Show button for sending messages"), "ShowSend", 0, 0},

 	{ LPGENT("Show buttons for controlling the chat room"), "ShowTopButtons", 0,1},

@@ -59,9 +59,9 @@ static const struct branch_t branch1[] = {
 static const struct branch_t branch2[] = {

 	{ LPGENT("Prefix all events with a timestamp"), "ShowTimeStamp", 0,1},

 	{ LPGENT("Only prefix with timestamp if it has changed"), "ShowTimeStampIfChanged", 0,0},

-	{ LPGENT("Timestamp has same color as the event"), "bTimeStampEventColour", 0,0},

-	{ LPGENT("Indent the second line of a message"), "bLogIndentEnabled", 0,1},

-	{ LPGENT("Limit user names in the message log to 20 characters"), "bLogLimitNames", 0,1},

+	{ LPGENT("Timestamp has same color as the event"), "TimeStampEventColour", 0,0},

+	{ LPGENT("Indent the second line of a message"), "LogIndentEnabled", 0,1},

+	{ LPGENT("Limit user names in the message log to 20 characters"), "LogLimitNames", 0,1},

 	{ LPGENT("Add \':\' to auto-completed user names"), "AddColonToAutoComplete", 0, 1},

 	{ LPGENT("Strip colors from messages in the log"), "StripFormatting", 0, 0},

 	{ LPGENT("Enable the \'event filter\' for new rooms"), "FilterEnabled", 0,0}

@@ -97,7 +97,7 @@ static const struct branch_t branch4[] = {
 };

 

 static const struct branch_t branch5[] = {

-	{ LPGENT("Show icons in tray only when the chat room is not active"), "bTrayIconInactiveOnly", 0, 1},

+	{ LPGENT("Show icons in tray only when the chat room is not active"), "TrayIconInactiveOnly", 0, 1},

 	{ LPGENT("Show icon in tray for topic changes"), "TrayIconFlags", GC_EVENT_TOPIC, 0},

 	{ LPGENT("Show icon in tray for users joining"), "TrayIconFlags", GC_EVENT_JOIN, 0},

 	{ LPGENT("Show icon in tray for users disconnecting"), "TrayIconFlags", GC_EVENT_QUIT, 0},

@@ -424,9 +424,9 @@ static INT_PTR CALLBACK DlgProcOptions1(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPA
 				g_Settings.dwTrayIconFlags = db_get_dw(NULL, "Chat", "TrayIconFlags", 0x1000);

 				g_Settings.dwPopupFlags = db_get_dw(NULL, "Chat", "PopupFlags", 0x0000);

 				g_Settings.bStripFormat = db_get_b(NULL, "Chat", "TrimFormatting", 0) != 0;

-				g_Settings.bTrayIconInactiveOnly = db_get_b(NULL, "Chat", "bTrayIconInactiveOnly", 1) != 0;

+				g_Settings.bTrayIconInactiveOnly = db_get_b(NULL, "Chat", "TrayIconInactiveOnly", 1) != 0;

 				g_Settings.bPopupInactiveOnly = db_get_b(NULL, "Chat", "PopupInactiveOnly", 1) != 0;

-				g_Settings.bLogIndentEnabled = db_get_b(NULL, "Chat", "bLogIndentEnabled", 1) != 0;

+				g_Settings.bLogIndentEnabled = db_get_b(NULL, "Chat", "LogIndentEnabled", 1) != 0;

 

 				if (b != db_get_b(NULL, "Chat", "Tabs", 1)) {

 					pci->SM_BroadcastMessage(NULL, GC_CLOSEWINDOW, 0, 1, FALSE);

@@ -541,7 +541,7 @@ static INT_PTR CALLBACK DlgProcOptions2(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPA
 				}

 			}

 			break;

-		

+

 		case IDC_HIGHLIGHT:

 			EnableWindow(GetDlgItem(hwndDlg, IDC_HIGHLIGHTWORDS), IsDlgButtonChecked(hwndDlg, IDC_HIGHLIGHT) == BST_CHECKED?TRUE:FALSE);

 			break;

@@ -614,10 +614,10 @@ static INT_PTR CALLBACK DlgProcOptions2(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPA
 			else db_unset(NULL, "Chat", "HeaderOutgoing");

 

 			g_Settings.bHighlightEnabled = IsDlgButtonChecked(hwndDlg, IDC_HIGHLIGHT) == BST_CHECKED;

-			db_set_b(NULL, "Chat", "bHighlightEnabled", g_Settings.bHighlightEnabled);

+			db_set_b(NULL, "Chat", "HighlightEnabled", g_Settings.bHighlightEnabled);

 

 			g_Settings.bLoggingEnabled = IsDlgButtonChecked(hwndDlg, IDC_LOGGING) == BST_CHECKED;

-			db_set_b(NULL, "Chat", "bLoggingEnabled", g_Settings.bLoggingEnabled);

+			db_set_b(NULL, "Chat", "LoggingEnabled", g_Settings.bLoggingEnabled);

 

 			iLen = SendDlgItemMessage(hwndDlg, IDC_SPIN2, UDM_GETPOS, 0, 0);

 			db_set_w(NULL, "Chat", "LogLimit", (WORD)iLen);

diff --git a/src/core/stdmsg/src/msgoptions.cpp b/src/core/stdmsg/src/msgoptions.cpp
index eee8d6f2ac..98b4fc8520 100644
--- a/src/core/stdmsg/src/msgoptions.cpp
+++ b/src/core/stdmsg/src/msgoptions.cpp
@@ -185,11 +185,11 @@ static DWORD MakeCheckBoxTreeFlags(HWND hwndTree)
 static INT_PTR CALLBACK DlgProcOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)

 {

 	switch (msg) {

-		case WM_INITDIALOG:

+	case WM_INITDIALOG:

+		TranslateDialogDefault(hwndDlg);

 		{

 			DWORD avatarHeight, msgTimeout;

 

-			TranslateDialogDefault(hwndDlg);

 			SetWindowLongPtr(GetDlgItem(hwndDlg, IDC_POPLIST), GWL_STYLE, GetWindowLongPtr(GetDlgItem(hwndDlg, IDC_POPLIST), GWL_STYLE) | TVS_NOHSCROLL | TVS_CHECKBOXES);

 			FillCheckBoxTree(GetDlgItem(hwndDlg, IDC_POPLIST), statusValues, SIZEOF(statusValues), db_get_dw(NULL, SRMMMOD, SRMSGSET_POPFLAGS, SRMSGDEFSET_POPFLAGS));

 			CheckDlgButton(hwndDlg, IDC_DONOTSTEALFOCUS, db_get_b(NULL, SRMMMOD, SRMSGSET_DONOTSTEALFOCUS, SRMSGDEFSET_DONOTSTEALFOCUS));

@@ -220,109 +220,102 @@ static INT_PTR CALLBACK DlgProcOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 			SetDlgItemInt(hwndDlg, IDC_SECONDS, msgTimeout >= SRMSGSET_MSGTIMEOUT_MIN ? msgTimeout / 1000 : SRMSGDEFSET_MSGTIMEOUT / 1000, FALSE);

 			EnableWindow(GetDlgItem(hwndDlg, IDC_CASCADE), !IsDlgButtonChecked(hwndDlg, IDC_SAVEPERCONTACT));

 			EnableWindow(GetDlgItem(hwndDlg, IDC_CTRLSUPPORT), !IsDlgButtonChecked(hwndDlg, IDC_AUTOCLOSE));

-			return TRUE;

 		}

-		case WM_COMMAND:

-			switch (LOWORD(wParam)) {

-				case IDC_AUTOMIN:

-					CheckDlgButton(hwndDlg, IDC_AUTOCLOSE, BST_UNCHECKED);

-					break;

-				case IDC_AUTOCLOSE:

-					CheckDlgButton(hwndDlg, IDC_AUTOMIN, BST_UNCHECKED);

-					EnableWindow(GetDlgItem(hwndDlg, IDC_CTRLSUPPORT), !IsDlgButtonChecked(hwndDlg, IDC_AUTOCLOSE));

-					break;

-				case IDC_SENDONENTER:

-					CheckDlgButton(hwndDlg, IDC_SENDONDBLENTER, BST_UNCHECKED);

-					break;

-				case IDC_SENDONDBLENTER:

-					CheckDlgButton(hwndDlg, IDC_SENDONENTER, BST_UNCHECKED);

-					break;

-				case IDC_SAVEPERCONTACT:

-					EnableWindow(GetDlgItem(hwndDlg, IDC_CASCADE), !IsDlgButtonChecked(hwndDlg, IDC_SAVEPERCONTACT));

-					break;

-				case IDC_SECONDS:

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

-						return 0;

-					break;

-				case IDC_AVATARSUPPORT:

-					EnableWindow(GetDlgItem(hwndDlg, IDC_LIMITAVATARH), IsDlgButtonChecked(hwndDlg, IDC_AVATARSUPPORT));

-					if (!IsDlgButtonChecked(hwndDlg, IDC_AVATARSUPPORT))

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

-					else EnableWindow(GetDlgItem(hwndDlg, IDC_AVATARHEIGHT), IsDlgButtonChecked(hwndDlg, IDC_LIMITAVATARH));

-					break;

-				case IDC_LIMITAVATARH:

-					EnableWindow(GetDlgItem(hwndDlg, IDC_AVATARHEIGHT), IsDlgButtonChecked(hwndDlg, IDC_LIMITAVATARH));

-					break;

-				case IDC_AVATARHEIGHT:

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

-						return 0;

-					break;

-			}

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

+		return TRUE;

+	case WM_COMMAND:

+		switch (LOWORD(wParam)) {

+		case IDC_AUTOMIN:

+			CheckDlgButton(hwndDlg, IDC_AUTOCLOSE, BST_UNCHECKED);

 			break;

-		case WM_NOTIFY:

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

-                case IDC_POPLIST:

-                    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))

-                            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);

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

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

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

-                            }

-                    }

-                    break;

-				case 0:

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

-						case PSN_APPLY:

-						{

-							DWORD avatarHeight, msgTimeout;

-

-							db_set_dw(NULL, SRMMMOD, SRMSGSET_POPFLAGS, MakeCheckBoxTreeFlags(GetDlgItem(hwndDlg, IDC_POPLIST)));

-							db_set_b(NULL, SRMMMOD, SRMSGSET_DONOTSTEALFOCUS, (BYTE) IsDlgButtonChecked(hwndDlg, IDC_DONOTSTEALFOCUS));

-							db_set_b(NULL, SRMMMOD, SRMSGSET_SHOWBUTTONLINE, (BYTE) IsDlgButtonChecked(hwndDlg, IDC_SHOWBUTTONLINE));

-							db_set_b(NULL, SRMMMOD, SRMSGSET_SHOWINFOLINE, (BYTE) IsDlgButtonChecked(hwndDlg, IDC_SHOWINFOLINE));

-							db_set_b(NULL, SRMMMOD, SRMSGSET_AUTOMIN, (BYTE) IsDlgButtonChecked(hwndDlg, IDC_AUTOMIN));

-							db_set_b(NULL, SRMMMOD, SRMSGSET_AUTOCLOSE, (BYTE) IsDlgButtonChecked(hwndDlg, IDC_AUTOCLOSE));

-							db_set_b(NULL, SRMMMOD, SRMSGSET_SAVEPERCONTACT, (BYTE) IsDlgButtonChecked(hwndDlg, IDC_SAVEPERCONTACT));

-							db_set_b(NULL, SRMMMOD, SRMSGSET_CASCADE, (BYTE) IsDlgButtonChecked(hwndDlg, IDC_CASCADE));

-							db_set_b(NULL, SRMMMOD, SRMSGSET_SENDONENTER, (BYTE) IsDlgButtonChecked(hwndDlg, IDC_SENDONENTER));

-							db_set_b(NULL, SRMMMOD, SRMSGSET_SENDONDBLENTER, (BYTE) IsDlgButtonChecked(hwndDlg, IDC_SENDONDBLENTER));

-							db_set_b(NULL, SRMMMOD, SRMSGSET_STATUSICON, (BYTE) IsDlgButtonChecked(hwndDlg, IDC_STATUSWIN));

-

-							db_set_b(NULL, SRMMMOD, SRMSGSET_AVATARENABLE, (BYTE) IsDlgButtonChecked(hwndDlg, IDC_AVATARSUPPORT));

-							db_set_b(NULL, SRMMMOD, SRMSGSET_LIMITAVHEIGHT, (BYTE) IsDlgButtonChecked(hwndDlg, IDC_LIMITAVATARH));

-							avatarHeight = GetDlgItemInt(hwndDlg, IDC_AVATARHEIGHT, NULL, TRUE);

-							db_set_dw(NULL, SRMMMOD, SRMSGSET_AVHEIGHT, avatarHeight<=0?SRMSGDEFSET_AVHEIGHT:avatarHeight);

-

-							db_set_b(NULL, SRMMMOD, SRMSGSET_SENDBUTTON, (BYTE) IsDlgButtonChecked(hwndDlg, IDC_SHOWSENDBTN));

-							db_set_b(NULL, SRMMMOD, SRMSGSET_CHARCOUNT, (BYTE) IsDlgButtonChecked(hwndDlg, IDC_CHARCOUNT));

-							db_set_b(NULL, SRMMMOD, SRMSGSET_CTRLSUPPORT, (BYTE) IsDlgButtonChecked(hwndDlg, IDC_CTRLSUPPORT));

-							db_set_b(NULL, SRMMMOD, SRMSGSET_DELTEMP, (BYTE) IsDlgButtonChecked(hwndDlg, IDC_DELTEMP));

-							db_set_b(NULL, SRMMMOD, SRMSGSET_FLASHCOUNT, (BYTE) GetDlgItemInt(hwndDlg, IDC_NFLASHES, NULL, TRUE));

-

-							msgTimeout = GetDlgItemInt(hwndDlg, IDC_SECONDS, NULL, TRUE) * 1000;

-							if (msgTimeout < SRMSGSET_MSGTIMEOUT_MIN) msgTimeout = SRMSGDEFSET_MSGTIMEOUT;

-							db_set_dw(NULL, SRMMMOD, SRMSGSET_MSGTIMEOUT, msgTimeout);

-

-							ReloadGlobals();

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

-							return TRUE;

-						}

-					}

-					break;

-			}

+		case IDC_AUTOCLOSE:

+			CheckDlgButton(hwndDlg, IDC_AUTOMIN, BST_UNCHECKED);

+			EnableWindow(GetDlgItem(hwndDlg, IDC_CTRLSUPPORT), !IsDlgButtonChecked(hwndDlg, IDC_AUTOCLOSE));

+			break;

+		case IDC_SENDONENTER:

+			CheckDlgButton(hwndDlg, IDC_SENDONDBLENTER, BST_UNCHECKED);

+			break;

+		case IDC_SENDONDBLENTER:

+			CheckDlgButton(hwndDlg, IDC_SENDONENTER, BST_UNCHECKED);

+			break;

+		case IDC_SAVEPERCONTACT:

+			EnableWindow(GetDlgItem(hwndDlg, IDC_CASCADE), !IsDlgButtonChecked(hwndDlg, IDC_SAVEPERCONTACT));

+			break;

+		case IDC_SECONDS:

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

+				return 0;

+			break;

+		case IDC_AVATARSUPPORT:

+			EnableWindow(GetDlgItem(hwndDlg, IDC_LIMITAVATARH), IsDlgButtonChecked(hwndDlg, IDC_AVATARSUPPORT));

+			if (!IsDlgButtonChecked(hwndDlg, IDC_AVATARSUPPORT))

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

+			else EnableWindow(GetDlgItem(hwndDlg, IDC_AVATARHEIGHT), IsDlgButtonChecked(hwndDlg, IDC_LIMITAVATARH));

+			break;

+		case IDC_LIMITAVATARH:

+			EnableWindow(GetDlgItem(hwndDlg, IDC_AVATARHEIGHT), IsDlgButtonChecked(hwndDlg, IDC_LIMITAVATARH));

 			break;

-		case WM_DESTROY:

+		case IDC_AVATARHEIGHT:

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

+				return 0;

 			break;

+		}

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

+		break;

+	case WM_NOTIFY:

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

+		case IDC_POPLIST:

+			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))

+				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);

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

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

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

+				}

+			}

+			break;

+		case 0:

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

+			case PSN_APPLY:

+				db_set_dw(NULL, SRMMMOD, SRMSGSET_POPFLAGS, MakeCheckBoxTreeFlags(GetDlgItem(hwndDlg, IDC_POPLIST)));

+				db_set_b(NULL, SRMMMOD, SRMSGSET_DONOTSTEALFOCUS, (BYTE)IsDlgButtonChecked(hwndDlg, IDC_DONOTSTEALFOCUS));

+				db_set_b(NULL, SRMMMOD, SRMSGSET_SHOWBUTTONLINE, (BYTE)IsDlgButtonChecked(hwndDlg, IDC_SHOWBUTTONLINE));

+				db_set_b(NULL, SRMMMOD, SRMSGSET_SHOWINFOLINE, (BYTE)IsDlgButtonChecked(hwndDlg, IDC_SHOWINFOLINE));

+				db_set_b(NULL, SRMMMOD, SRMSGSET_AUTOMIN, (BYTE)IsDlgButtonChecked(hwndDlg, IDC_AUTOMIN));

+				db_set_b(NULL, SRMMMOD, SRMSGSET_AUTOCLOSE, (BYTE)IsDlgButtonChecked(hwndDlg, IDC_AUTOCLOSE));

+				db_set_b(NULL, SRMMMOD, SRMSGSET_SAVEPERCONTACT, (BYTE)IsDlgButtonChecked(hwndDlg, IDC_SAVEPERCONTACT));

+				db_set_b(NULL, SRMMMOD, SRMSGSET_CASCADE, (BYTE)IsDlgButtonChecked(hwndDlg, IDC_CASCADE));

+				db_set_b(NULL, SRMMMOD, SRMSGSET_SENDONENTER, (BYTE)IsDlgButtonChecked(hwndDlg, IDC_SENDONENTER));

+				db_set_b(NULL, SRMMMOD, SRMSGSET_SENDONDBLENTER, (BYTE)IsDlgButtonChecked(hwndDlg, IDC_SENDONDBLENTER));

+				db_set_b(NULL, SRMMMOD, SRMSGSET_STATUSICON, (BYTE)IsDlgButtonChecked(hwndDlg, IDC_STATUSWIN));

+

+				db_set_b(NULL, SRMMMOD, SRMSGSET_AVATARENABLE, (BYTE)IsDlgButtonChecked(hwndDlg, IDC_AVATARSUPPORT));

+				db_set_b(NULL, SRMMMOD, SRMSGSET_LIMITAVHEIGHT, (BYTE)IsDlgButtonChecked(hwndDlg, IDC_LIMITAVATARH));

+				DWORD avatarHeight = GetDlgItemInt(hwndDlg, IDC_AVATARHEIGHT, NULL, TRUE);

+				db_set_dw(NULL, SRMMMOD, SRMSGSET_AVHEIGHT, avatarHeight <= 0 ? SRMSGDEFSET_AVHEIGHT : avatarHeight);

+

+				db_set_b(NULL, SRMMMOD, SRMSGSET_SENDBUTTON, (BYTE)IsDlgButtonChecked(hwndDlg, IDC_SHOWSENDBTN));

+				db_set_b(NULL, SRMMMOD, SRMSGSET_CHARCOUNT, (BYTE)IsDlgButtonChecked(hwndDlg, IDC_CHARCOUNT));

+				db_set_b(NULL, SRMMMOD, SRMSGSET_CTRLSUPPORT, (BYTE)IsDlgButtonChecked(hwndDlg, IDC_CTRLSUPPORT));

+				db_set_b(NULL, SRMMMOD, SRMSGSET_DELTEMP, (BYTE)IsDlgButtonChecked(hwndDlg, IDC_DELTEMP));

+				db_set_b(NULL, SRMMMOD, SRMSGSET_FLASHCOUNT, (BYTE)GetDlgItemInt(hwndDlg, IDC_NFLASHES, NULL, TRUE));

+

+				DWORD msgTimeout = GetDlgItemInt(hwndDlg, IDC_SECONDS, NULL, TRUE) * 1000;

+				if (msgTimeout < SRMSGSET_MSGTIMEOUT_MIN) msgTimeout = SRMSGDEFSET_MSGTIMEOUT;

+				db_set_dw(NULL, SRMMMOD, SRMSGSET_MSGTIMEOUT, msgTimeout);

+

+				ReloadGlobals();

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

+				return TRUE;

+			}

+		}

+		break;

 	}

 	return FALSE;

 }

@@ -332,98 +325,98 @@ static INT_PTR CALLBACK DlgProcLogOptions(HWND hwndDlg, UINT msg, WPARAM wParam,
 	static HBRUSH hBkgColourBrush;

 

 	switch (msg) {

-		case WM_INITDIALOG:

-			TranslateDialogDefault(hwndDlg);

-			switch (db_get_b(NULL, SRMMMOD, SRMSGSET_LOADHISTORY, SRMSGDEFSET_LOADHISTORY)) {

-				case LOADHISTORY_UNREAD:

-					CheckDlgButton(hwndDlg, IDC_LOADUNREAD, BST_CHECKED);

-					break;

-				case LOADHISTORY_COUNT:

-					CheckDlgButton(hwndDlg, IDC_LOADCOUNT, BST_CHECKED);

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

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

-					break;

-				case LOADHISTORY_TIME:

-					CheckDlgButton(hwndDlg, IDC_LOADTIME, BST_CHECKED);

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

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

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

-					break;

-			}

-			SendDlgItemMessage(hwndDlg, IDC_LOADCOUNTSPIN, UDM_SETRANGE, 0, MAKELONG(100, 0));

-			SendDlgItemMessage(hwndDlg, IDC_LOADCOUNTSPIN, UDM_SETPOS, 0, db_get_w(NULL, SRMMMOD, SRMSGSET_LOADCOUNT, SRMSGDEFSET_LOADCOUNT));

-			SendDlgItemMessage(hwndDlg, IDC_LOADTIMESPIN, UDM_SETRANGE, 0, MAKELONG(12 * 60, 0));

-			SendDlgItemMessage(hwndDlg, IDC_LOADTIMESPIN, UDM_SETPOS, 0, db_get_w(NULL, SRMMMOD, SRMSGSET_LOADTIME, SRMSGDEFSET_LOADTIME));

-

-			CheckDlgButton(hwndDlg, IDC_SHOWLOGICONS, db_get_b(NULL, SRMMMOD, SRMSGSET_SHOWLOGICONS, SRMSGDEFSET_SHOWLOGICONS));

-			CheckDlgButton(hwndDlg, IDC_SHOWNAMES, !db_get_b(NULL, SRMMMOD, SRMSGSET_HIDENAMES, SRMSGDEFSET_HIDENAMES));

-			CheckDlgButton(hwndDlg, IDC_SHOWTIMES, db_get_b(NULL, SRMMMOD, SRMSGSET_SHOWTIME, SRMSGDEFSET_SHOWTIME));

+	case WM_INITDIALOG:

+		TranslateDialogDefault(hwndDlg);

+		switch (db_get_b(NULL, SRMMMOD, SRMSGSET_LOADHISTORY, SRMSGDEFSET_LOADHISTORY)) {

+		case LOADHISTORY_UNREAD:

+			CheckDlgButton(hwndDlg, IDC_LOADUNREAD, BST_CHECKED);

+			break;

+		case LOADHISTORY_COUNT:

+			CheckDlgButton(hwndDlg, IDC_LOADCOUNT, BST_CHECKED);

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

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

+			break;

+		case LOADHISTORY_TIME:

+			CheckDlgButton(hwndDlg, IDC_LOADTIME, BST_CHECKED);

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

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

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

+			break;

+		}

+		SendDlgItemMessage(hwndDlg, IDC_LOADCOUNTSPIN, UDM_SETRANGE, 0, MAKELONG(100, 0));

+		SendDlgItemMessage(hwndDlg, IDC_LOADCOUNTSPIN, UDM_SETPOS, 0, db_get_w(NULL, SRMMMOD, SRMSGSET_LOADCOUNT, SRMSGDEFSET_LOADCOUNT));

+		SendDlgItemMessage(hwndDlg, IDC_LOADTIMESPIN, UDM_SETRANGE, 0, MAKELONG(12 * 60, 0));

+		SendDlgItemMessage(hwndDlg, IDC_LOADTIMESPIN, UDM_SETPOS, 0, db_get_w(NULL, SRMMMOD, SRMSGSET_LOADTIME, SRMSGDEFSET_LOADTIME));

+

+		CheckDlgButton(hwndDlg, IDC_SHOWLOGICONS, db_get_b(NULL, SRMMMOD, SRMSGSET_SHOWLOGICONS, SRMSGDEFSET_SHOWLOGICONS));

+		CheckDlgButton(hwndDlg, IDC_SHOWNAMES, !db_get_b(NULL, SRMMMOD, SRMSGSET_HIDENAMES, SRMSGDEFSET_HIDENAMES));

+		CheckDlgButton(hwndDlg, IDC_SHOWTIMES, db_get_b(NULL, SRMMMOD, SRMSGSET_SHOWTIME, SRMSGDEFSET_SHOWTIME));

+		EnableWindow(GetDlgItem(hwndDlg, IDC_SHOWSECS), IsDlgButtonChecked(hwndDlg, IDC_SHOWTIMES));

+		CheckDlgButton(hwndDlg, IDC_SHOWSECS, db_get_b(NULL, SRMMMOD, SRMSGSET_SHOWSECS, SRMSGDEFSET_SHOWSECS));

+		EnableWindow(GetDlgItem(hwndDlg, IDC_SHOWDATES), IsDlgButtonChecked(hwndDlg, IDC_SHOWTIMES));

+		CheckDlgButton(hwndDlg, IDC_SHOWDATES, db_get_b(NULL, SRMMMOD, SRMSGSET_SHOWDATE, SRMSGDEFSET_SHOWDATE));

+		CheckDlgButton(hwndDlg, IDC_SHOWSTATUSCHANGES, db_get_b(NULL, SRMMMOD, SRMSGSET_SHOWSTATUSCH, SRMSGDEFSET_SHOWSTATUSCH));

+		CheckDlgButton(hwndDlg, IDC_SHOWFORMATTING, db_get_b(NULL, SRMMMOD, SRMSGSET_SHOWFORMAT, SRMSGDEFSET_SHOWFORMAT));

+		return TRUE;

+

+	case WM_COMMAND:

+		switch (LOWORD(wParam)) {

+		case IDC_LOADUNREAD:

+		case IDC_LOADCOUNT:

+		case IDC_LOADTIME:

+			EnableWindow(GetDlgItem(hwndDlg, IDC_LOADCOUNTN), IsDlgButtonChecked(hwndDlg, IDC_LOADCOUNT));

+			EnableWindow(GetDlgItem(hwndDlg, IDC_LOADCOUNTSPIN), IsDlgButtonChecked(hwndDlg, IDC_LOADCOUNT));

+			EnableWindow(GetDlgItem(hwndDlg, IDC_LOADTIMEN), IsDlgButtonChecked(hwndDlg, IDC_LOADTIME));

+			EnableWindow(GetDlgItem(hwndDlg, IDC_LOADTIMESPIN), IsDlgButtonChecked(hwndDlg, IDC_LOADTIME));

+			EnableWindow(GetDlgItem(hwndDlg, IDC_STMINSOLD), IsDlgButtonChecked(hwndDlg, IDC_LOADTIME));

+			break;

+

+		case IDC_SHOWTIMES:

 			EnableWindow(GetDlgItem(hwndDlg, IDC_SHOWSECS), IsDlgButtonChecked(hwndDlg, IDC_SHOWTIMES));

-			CheckDlgButton(hwndDlg, IDC_SHOWSECS, db_get_b(NULL, SRMMMOD, SRMSGSET_SHOWSECS, SRMSGDEFSET_SHOWSECS));

 			EnableWindow(GetDlgItem(hwndDlg, IDC_SHOWDATES), IsDlgButtonChecked(hwndDlg, IDC_SHOWTIMES));

-			CheckDlgButton(hwndDlg, IDC_SHOWDATES, db_get_b(NULL, SRMMMOD, SRMSGSET_SHOWDATE, SRMSGDEFSET_SHOWDATE));

-			CheckDlgButton(hwndDlg, IDC_SHOWSTATUSCHANGES, db_get_b(NULL, SRMMMOD, SRMSGSET_SHOWSTATUSCH, SRMSGDEFSET_SHOWSTATUSCH));

-			CheckDlgButton(hwndDlg, IDC_SHOWFORMATTING, db_get_b(NULL, SRMMMOD, SRMSGSET_SHOWFORMAT, SRMSGDEFSET_SHOWFORMAT));

-			return TRUE;

-

-		case WM_COMMAND:

-			switch (LOWORD(wParam)) {

-				case IDC_LOADUNREAD:

-				case IDC_LOADCOUNT:

-				case IDC_LOADTIME:

-					EnableWindow(GetDlgItem(hwndDlg, IDC_LOADCOUNTN), IsDlgButtonChecked(hwndDlg, IDC_LOADCOUNT));

-					EnableWindow(GetDlgItem(hwndDlg, IDC_LOADCOUNTSPIN), IsDlgButtonChecked(hwndDlg, IDC_LOADCOUNT));

-					EnableWindow(GetDlgItem(hwndDlg, IDC_LOADTIMEN), IsDlgButtonChecked(hwndDlg, IDC_LOADTIME));

-					EnableWindow(GetDlgItem(hwndDlg, IDC_LOADTIMESPIN), IsDlgButtonChecked(hwndDlg, IDC_LOADTIME));

-					EnableWindow(GetDlgItem(hwndDlg, IDC_STMINSOLD), IsDlgButtonChecked(hwndDlg, IDC_LOADTIME));

-					break;

-

-				case IDC_SHOWTIMES:

-					EnableWindow(GetDlgItem(hwndDlg, IDC_SHOWSECS), IsDlgButtonChecked(hwndDlg, IDC_SHOWTIMES));

-					EnableWindow(GetDlgItem(hwndDlg, IDC_SHOWDATES), IsDlgButtonChecked(hwndDlg, IDC_SHOWTIMES));

-					break;

-

-				case IDC_LOADCOUNTN:

-				case IDC_LOADTIMEN:

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

-						return TRUE;

-					break;

-			}

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

 			break;

-		case WM_NOTIFY:

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

-				case 0:

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

-						case PSN_APPLY:

-							if (IsDlgButtonChecked(hwndDlg, IDC_LOADCOUNT))

-								db_set_b(NULL, SRMMMOD, SRMSGSET_LOADHISTORY, LOADHISTORY_COUNT);

-							else if (IsDlgButtonChecked(hwndDlg, IDC_LOADTIME))

-								db_set_b(NULL, SRMMMOD, SRMSGSET_LOADHISTORY, LOADHISTORY_TIME);

-							else

-								db_set_b(NULL, SRMMMOD, SRMSGSET_LOADHISTORY, LOADHISTORY_UNREAD);

-							db_set_w(NULL, SRMMMOD, SRMSGSET_LOADCOUNT, (WORD) SendDlgItemMessage(hwndDlg, IDC_LOADCOUNTSPIN, UDM_GETPOS, 0, 0));

-							db_set_w(NULL, SRMMMOD, SRMSGSET_LOADTIME, (WORD) SendDlgItemMessage(hwndDlg, IDC_LOADTIMESPIN, UDM_GETPOS, 0, 0));

-							db_set_b(NULL, SRMMMOD, SRMSGSET_SHOWLOGICONS, (BYTE) IsDlgButtonChecked(hwndDlg, IDC_SHOWLOGICONS));

-							db_set_b(NULL, SRMMMOD, SRMSGSET_HIDENAMES, (BYTE) ! IsDlgButtonChecked(hwndDlg, IDC_SHOWNAMES));

-							db_set_b(NULL, SRMMMOD, SRMSGSET_SHOWTIME, (BYTE) IsDlgButtonChecked(hwndDlg, IDC_SHOWTIMES));

-							db_set_b(NULL, SRMMMOD, SRMSGSET_SHOWSECS, (BYTE) IsDlgButtonChecked(hwndDlg, IDC_SHOWSECS));

-							db_set_b(NULL, SRMMMOD, SRMSGSET_SHOWDATE, (BYTE) IsDlgButtonChecked(hwndDlg, IDC_SHOWDATES));

-							db_set_b(NULL, SRMMMOD, SRMSGSET_SHOWSTATUSCH, (BYTE) IsDlgButtonChecked(hwndDlg, IDC_SHOWSTATUSCHANGES));

-							db_set_b(NULL, SRMMMOD, SRMSGSET_SHOWFORMAT, (BYTE) IsDlgButtonChecked(hwndDlg, IDC_SHOWFORMATTING));

-

-							FreeMsgLogIcons();

-							LoadMsgLogIcons();

-							ReloadGlobals();

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

-							return TRUE;

-					}

-					break;

-			}

+

+		case IDC_LOADCOUNTN:

+		case IDC_LOADTIMEN:

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

+				return TRUE;

 			break;

-		case WM_DESTROY:

-			DeleteObject(hBkgColourBrush);

+		}

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

+		break;

+	case WM_NOTIFY:

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

+		case 0:

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

+			case PSN_APPLY:

+				if (IsDlgButtonChecked(hwndDlg, IDC_LOADCOUNT))

+					db_set_b(NULL, SRMMMOD, SRMSGSET_LOADHISTORY, LOADHISTORY_COUNT);

+				else if (IsDlgButtonChecked(hwndDlg, IDC_LOADTIME))

+					db_set_b(NULL, SRMMMOD, SRMSGSET_LOADHISTORY, LOADHISTORY_TIME);

+				else

+					db_set_b(NULL, SRMMMOD, SRMSGSET_LOADHISTORY, LOADHISTORY_UNREAD);

+				db_set_w(NULL, SRMMMOD, SRMSGSET_LOADCOUNT, (WORD)SendDlgItemMessage(hwndDlg, IDC_LOADCOUNTSPIN, UDM_GETPOS, 0, 0));

+				db_set_w(NULL, SRMMMOD, SRMSGSET_LOADTIME, (WORD)SendDlgItemMessage(hwndDlg, IDC_LOADTIMESPIN, UDM_GETPOS, 0, 0));

+				db_set_b(NULL, SRMMMOD, SRMSGSET_SHOWLOGICONS, (BYTE)IsDlgButtonChecked(hwndDlg, IDC_SHOWLOGICONS));

+				db_set_b(NULL, SRMMMOD, SRMSGSET_HIDENAMES, (BYTE)!IsDlgButtonChecked(hwndDlg, IDC_SHOWNAMES));

+				db_set_b(NULL, SRMMMOD, SRMSGSET_SHOWTIME, (BYTE)IsDlgButtonChecked(hwndDlg, IDC_SHOWTIMES));

+				db_set_b(NULL, SRMMMOD, SRMSGSET_SHOWSECS, (BYTE)IsDlgButtonChecked(hwndDlg, IDC_SHOWSECS));

+				db_set_b(NULL, SRMMMOD, SRMSGSET_SHOWDATE, (BYTE)IsDlgButtonChecked(hwndDlg, IDC_SHOWDATES));

+				db_set_b(NULL, SRMMMOD, SRMSGSET_SHOWSTATUSCH, (BYTE)IsDlgButtonChecked(hwndDlg, IDC_SHOWSTATUSCHANGES));

+				db_set_b(NULL, SRMMMOD, SRMSGSET_SHOWFORMAT, (BYTE)IsDlgButtonChecked(hwndDlg, IDC_SHOWFORMATTING));

+

+				FreeMsgLogIcons();

+				LoadMsgLogIcons();

+				ReloadGlobals();

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

+				return TRUE;

+			}

 			break;

+		}

+		break;

+	case WM_DESTROY:

+		DeleteObject(hBkgColourBrush);

+		break;

 	}

 	return FALSE;

 }