chat log icons are back

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

14 files changed, 243 insertions, 245 deletions

diff --git a/include/m_chat.h b/include/m_chat.h
index 51ca20a9b3..0845defe19 100644
--- a/include/m_chat.h
+++ b/include/m_chat.h
@@ -232,7 +232,7 @@ struct GCSESSION
 	and what session it is related to. The GCDEST structure and its members are ALWAYS

 	used (but the members can be NULL in some occasions). Depending on what type of event

 	you are sending, the members of GCEVENT have different usage. Each event and how to

-	use the members are discussed below. The "bAddToLog" and "time" members are always valid

+	use the members are discussed below. The "AddToLog" and "time" members are always valid

 	and always mean the same. bAddToLog = TRUE means that the event is added to the disk log

 	(at least when this makes sense). This can be used by Jabber for instance, when

 	it needs to add channel history to the window, but without logging to disk.

diff --git a/include/m_chat_int.h b/include/m_chat_int.h
index 34affee3d5..4b8c95acfb 100644
--- a/include/m_chat_int.h
+++ b/include/m_chat_int.h
@@ -399,6 +399,8 @@ struct CHAT_MANAGER
 	HANDLE hBuildMenuEvent, hSendEvent;

 	FONTINFO aFonts[OPTIONS_FONTCOUNT];

 	SESSION_INFO *wndList;

+	int *logIconBmpSize;

+	PBYTE *pLogIconBmpBits;

 

 	// user-defined custom callbacks

 	void (*OnCreateModule)(MODULEINFO*);

diff --git a/plugins/Scriver/src/chat/options.cpp b/plugins/Scriver/src/chat/options.cpp
index 565449481e..25db35293c 100644
--- a/plugins/Scriver/src/chat/options.cpp
+++ b/plugins/Scriver/src/chat/options.cpp
@@ -36,7 +36,7 @@ struct branch_t
 

 static struct branch_t branch1[] = {

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

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

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

 	{ LPGENT("Show chat user list"), "ShowNicklist", 0, 1, NULL },

 	{ LPGENT("Enable button context menus"), "RightClickFilter", 0, 0, NULL },

 	{ LPGENT("Show topic on your contact list (if supported)"), "TopicOnClist", 0, 0, NULL },

@@ -54,9 +54,9 @@ static struct branch_t branch2[] = {
 		GC_EVENT_KICK | GC_EVENT_NOTICE | GC_EVENT_NICK | GC_EVENT_INFORMATION | GC_EVENT_ADDSTATUS, 0, NULL },

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

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

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

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

-	{ LPGENT("Limit user names to 20 characters"), "bLogLimitNames", 0, 1, NULL },

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

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

+	{ LPGENT("Limit user names to 20 characters"), "LogLimitNames", 0, 1, NULL },

 	{ LPGENT("Strip colors from messages"), "StripFormatting", 0, 0, NULL },

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

 };

@@ -76,7 +76,7 @@ static struct branch_t branch3[] = {
 };

 

 static struct branch_t branch4[] = {

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

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

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

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

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

@@ -365,7 +365,7 @@ INT_PTR CALLBACK DlgProcOptions2(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPARAM lPa
 			TCHAR tszTooltipText[2048];

 			RECT rect;

 

-			mir_sntprintf(tszTooltipText, SIZEOF(tszTooltipText), 

+			mir_sntprintf(tszTooltipText, SIZEOF(tszTooltipText),

 				_T("%s - %s\n%s - %s\n%s - %s\n\n")

 				_T("%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n\n")

 				_T("%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s"),

@@ -581,10 +581,10 @@ INT_PTR CALLBACK DlgProcOptions2(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPARAM lPa
 			else db_unset(NULL, "Chat", "HeaderOutgoing");

 

 			g_Settings.bHighlightEnabled = IsDlgButtonChecked(hwndDlg, IDC_CHAT_HIGHLIGHT) == BST_CHECKED ? TRUE : FALSE;

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

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

 

 			g_Settings.bLoggingEnabled = IsDlgButtonChecked(hwndDlg, IDC_CHAT_LOGGING) == BST_CHECKED ? TRUE : FALSE;

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

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

 

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

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

@@ -600,9 +600,9 @@ INT_PTR CALLBACK DlgProcOptions2(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPARAM 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) ? TRUE : FALSE;

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

 

 			pci->MM_FontsChanged();

 			pci->SM_BroadcastMessage(NULL, GC_SETWNDPROPS, 0, 0, TRUE);

@@ -621,7 +621,7 @@ INT_PTR CALLBACK DlgProcOptions2(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPARAM lPa
 			DestroyWindow(hPathTip);

 			hPathTip = 0;

 		}

-		

+

 		BYTE b = TreeView_GetItemState(GetDlgItem(hwndDlg, IDC_CHAT_CHECKBOXES), hListHeading2, TVIS_EXPANDED)&TVIS_EXPANDED?1:0;

 		db_set_b(NULL, "Chat", "Branch2Exp", b);

 		b = TreeView_GetItemState(GetDlgItem(hwndDlg, IDC_CHAT_CHECKBOXES), hListHeading3, TVIS_EXPANDED)&TVIS_EXPANDED?1:0;

diff --git a/plugins/TabSRMM/src/chat/log.cpp b/plugins/TabSRMM/src/chat/log.cpp
index 8c32c07e32..45dd01be43 100644
--- a/plugins/TabSRMM/src/chat/log.cpp
+++ b/plugins/TabSRMM/src/chat/log.cpp
@@ -42,14 +42,11 @@
  * the srmm module and then modified to fit the chat module.

  */

 

-static PBYTE	pLogIconBmpBits[14];

-static int		logIconBmpSize[ SIZEOF(pLogIconBmpBits)];

-

-static int		logPixelSY = 0;

-static int		logPixelSX = 0;

-static char		*szDivider = "\\strike----------------------------------------------------------------------------\\strike0";

-static char		CHAT_rtfFontsGlobal[OPTIONS_FONTCOUNT + 2][RTFCACHELINESIZE];

-static char		*CHAT_rtffonts = 0;

+static int logPixelSY = 0;

+static int logPixelSX = 0;

+static char *szDivider = "\\strike----------------------------------------------------------------------------\\strike0";

+static char	CHAT_rtfFontsGlobal[OPTIONS_FONTCOUNT + 2][RTFCACHELINESIZE];

+static char	*CHAT_rtffonts = 0;

 

 /*

  * ieview MUC support - mostly from scriver

@@ -864,11 +861,11 @@ static char* Log_CreateRTF(LOGSTREAMDATA *streamData)
 			else if (g_Settings.dwIconFlags) {

 				int iIndex = lin->bIsHighlighted ? ICON_HIGHLIGHT : EventToIcon(lin);

 				Log_Append(&buffer, &bufferEnd, &bufferAlloced, "\\f0\\fs14");

-				while (bufferAlloced - bufferEnd < (logIconBmpSize[0] + 20))

+				while (bufferAlloced - bufferEnd < (pci->logIconBmpSize[0] + 20))

 					bufferAlloced += 4096;

 				buffer = (char *) mir_realloc(buffer, bufferAlloced);

-				CopyMemory(buffer + bufferEnd, pLogIconBmpBits[iIndex], logIconBmpSize[iIndex]);

-				bufferEnd += logIconBmpSize[iIndex];

+				CopyMemory(buffer + bufferEnd, pci->pLogIconBmpBits[iIndex], pci->logIconBmpSize[iIndex]);

+				bufferEnd += pci->logIconBmpSize[iIndex];

 			}

 

 			if (g_Settings.bTimeStampEventColour) {

@@ -917,7 +914,7 @@ static char* Log_CreateRTF(LOGSTREAMDATA *streamData)
 					while (ui) {

 						if (!lstrcmp(ui->pszNick, lin->ptszNick)) {

 							STATUSINFO *ti = pci->TM_FindStatus(streamData->si->pStatuses, pci->TM_WordToString(streamData->si->pStatuses, ui->Status));

-							if (ti && (UINT_PTR)ti->hIcon < streamData->si->iStatusCount) {

+							if (ti && (int)ti->hIcon < streamData->si->iStatusCount) {

 								pszIndicator[0] = szIndicators[(int)ti->hIcon];

 								crNickIndex = streamData->si->iStatusCount - (int)ti->hIcon; // color table's index is not zero-based

 							}

diff --git a/plugins/TabSRMM/src/chat/muchighlight.cpp b/plugins/TabSRMM/src/chat/muchighlight.cpp
index f4690a4645..f2161f769d 100644
--- a/plugins/TabSRMM/src/chat/muchighlight.cpp
+++ b/plugins/TabSRMM/src/chat/muchighlight.cpp
@@ -62,7 +62,7 @@ void CMUCHighlight::init()
 	if (0 == db_get_ts(0, "Chat", "HighlightNames", &dbv))

 		m_NickPatternString = dbv.ptszVal;

 

-	m_dwFlags = M.GetByte("Chat", "bHighlightEnabled", MATCH_TEXT);

+	m_dwFlags = M.GetByte("Chat", "HighlightEnabled", MATCH_TEXT);

 	m_fHighlightMe = (M.GetByte("Chat", "HighlightMe", 1) ? true : false);

 

 	__try {

@@ -270,7 +270,7 @@ INT_PTR CALLBACK CMUCHighlight::dlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, L
 				::db_free(&dbv);

 			}

 

-			DWORD dwFlags = M.GetByte("Chat", "bHighlightEnabled", MATCH_TEXT);

+			DWORD dwFlags = M.GetByte("Chat", "HighlightEnabled", MATCH_TEXT);

 

 			::CheckDlgButton(hwndDlg, IDC_HIGHLIGHTNICKENABLE, dwFlags & MATCH_NICKNAME ? BST_CHECKED : BST_UNCHECKED);

 			::CheckDlgButton(hwndDlg, IDC_HIGHLIGHTNICKUID, dwFlags & MATCH_UIN ? BST_CHECKED : BST_UNCHECKED);

@@ -335,7 +335,7 @@ INT_PTR CALLBACK CMUCHighlight::dlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, L
 					if (dwFlags & MATCH_NICKNAME)

 						dwFlags |= (::IsDlgButtonChecked(hwndDlg, IDC_HIGHLIGHTNICKUID) ? MATCH_UIN : 0);

 

-					db_set_b(0, "Chat", "bHighlightEnabled", dwFlags);

+					db_set_b(0, "Chat", "HighlightEnabled", dwFlags);

 					db_set_b(0, "Chat", "HighlightMe", ::IsDlgButtonChecked(hwndDlg, IDC_HIGHLIGHTME) ? 1 : 0);

 					g_Settings.Highlight->init();

 				}

diff --git a/plugins/TabSRMM/src/chat/options.cpp b/plugins/TabSRMM/src/chat/options.cpp
index 87d2f24f73..3527fd69ef 100644
--- a/plugins/TabSRMM/src/chat/options.cpp
+++ b/plugins/TabSRMM/src/chat/options.cpp
@@ -143,7 +143,7 @@ struct branch_t {
 static branch_t branch1[] = {

 	{ LPGENT("Open new chat rooms in the default container"), "DefaultContainer", 0, 1, NULL },

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

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

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

 	{ LPGENT("Create tabs or windows for highlight events"), "CreateWindowOnHighlight", 0, 0, NULL },

 	{ LPGENT("Activate chat window on highlight"), "AnnoyingHighlight", 0, 0, NULL },

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

@@ -162,9 +162,9 @@ static branch_t branch1[] = {
 static branch_t branch2[] = {

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

 	{ LPGENT("Timestamp only when event time differs"), "ShowTimeStampIfChanged", 0, 0, NULL },

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

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

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

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

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

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

 	{ LPGENT("Add a colon (:) to auto-completed user names"), "AddColonToAutoComplete", 0, 1, NULL },

 	{ LPGENT("Start private conversation on doubleclick in nick list (insert nick if unchecked)"), "DoubleClick4Privat", 0, 0, NULL },

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

@@ -926,11 +926,11 @@ INT_PTR CALLBACK DlgProcOptions2(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM
 				db_set_ts(NULL, "Chat", "LogDirectory", pszText1);

 				mir_free(pszText1);

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

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

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

 			}

 			else {

 				db_unset(NULL, "Chat", "LogDirectory");

-				db_set_b(0, "Chat", "bLoggingEnabled", 0);

+				db_set_b(0, "Chat", "LoggingEnabled", 0);

 			}

 			pci->SM_InvalidateLogDirectories();

 

@@ -1063,7 +1063,7 @@ INT_PTR CALLBACK DlgProcOptions3(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM
 		SendDlgItemMessage(hwndDlg, IDC_LOGICONTYPE, CB_SETCURSEL, (g_Settings.bLogSymbols ? 2 : (g_Settings.dwIconFlags ? 1 : 0)), 0);

 

 		CheckDlgButton(hwndDlg, IDC_NOPOPUPSFORCLOSEDWINDOWS, M.GetByte("Chat", "SkipWhenNoWindow", 0) ? BST_CHECKED : BST_UNCHECKED);

-		CheckDlgButton(hwndDlg, IDC_TRAYONLYFORINACTIVE, M.GetByte("Chat", "bTrayIconInactiveOnly", 0) ? BST_CHECKED : BST_UNCHECKED);

+		CheckDlgButton(hwndDlg, IDC_TRAYONLYFORINACTIVE, M.GetByte("Chat", "TrayIconInactiveOnly", 0) ? BST_CHECKED : BST_UNCHECKED);

 		break;

 

 	case WM_COMMAND:

@@ -1098,7 +1098,7 @@ INT_PTR CALLBACK DlgProcOptions3(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM
 				db_set_b(0, "Chat", "LogSymbols", lr == 2 ? 1 : 0);

 

 				db_set_b(0, "Chat", "SkipWhenNoWindow", IsDlgButtonChecked(hwndDlg, IDC_NOPOPUPSFORCLOSEDWINDOWS) ? 1 : 0);

-				db_set_b(0, "Chat", "bTrayIconInactiveOnly", IsDlgButtonChecked(hwndDlg, IDC_TRAYONLYFORINACTIVE) ? 1 : 0);

+				db_set_b(0, "Chat", "TrayIconInactiveOnly", IsDlgButtonChecked(hwndDlg, IDC_TRAYONLYFORINACTIVE) ? 1 : 0);

 

 				pci->ReloadSettings();

 				pci->MM_FontsChanged();

diff --git a/plugins/TabSRMM/src/themes.cpp b/plugins/TabSRMM/src/themes.cpp
index 04fda1e79e..bcda08d422 100644
--- a/plugins/TabSRMM/src/themes.cpp
+++ b/plugins/TabSRMM/src/themes.cpp
@@ -1950,7 +1950,7 @@ void CSkin::SkinDrawBGFromDC(HWND hwndClient, HWND hwnd, RECT *rcClient, HDC hdc
 }

 

 /**

- * draw an icon "bDimmed" (small amount of transparency applied)

+ * draw an icon "Dimmed" (small amount of transparency applied)

 */

 

 void CSkin::DrawDimmedIcon(HDC hdc, LONG left, LONG top, LONG dx, LONG dy, HICON hIcon, BYTE alpha)

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;

 }

diff --git a/src/modules/chat/chat.h b/src/modules/chat/chat.h
index 57e940de54..d16fa6bcd8 100644
--- a/src/modules/chat/chat.h
+++ b/src/modules/chat/chat.h
@@ -41,6 +41,9 @@ extern int g_cbSession, g_cbModuleInfo, g_iFontMode, g_iChatLang;
 extern TCHAR *g_szFontGroup;

 extern CRITICAL_SECTION cs;

 

+extern PBYTE pLogIconBmpBits[14];

+extern int logIconBmpSize[14];

+

 // log.c

 void   LoadMsgLogBitmaps(void);

 void   FreeMsgLogBitmaps(void);

diff --git a/src/modules/chat/chat_opts.cpp b/src/modules/chat/chat_opts.cpp
index 5d4656231d..e95ac3d5e7 100644
--- a/src/modules/chat/chat_opts.cpp
+++ b/src/modules/chat/chat_opts.cpp
@@ -195,24 +195,24 @@ static void InitSetting(TCHAR** ppPointer, char* pszSetting, TCHAR* pszDefault)
 

 void LoadGlobalSettings(void)

 {

-	g_Settings->bLogLimitNames = db_get_b(NULL, "Chat", "bLogLimitNames", 1) != 0;

+	g_Settings->bLogLimitNames = db_get_b(NULL, "Chat", "LogLimitNames", 1) != 0;

 	g_Settings->bShowTime = db_get_b(NULL, "Chat", "ShowTimeStamp", 1) != 0;

-	g_Settings->bSoundsFocus = db_get_b(NULL, "Chat", "bSoundsFocus", 0) != 0;

+	g_Settings->bSoundsFocus = db_get_b(NULL, "Chat", "SoundsFocus", 0) != 0;

 	g_Settings->bShowTimeIfChanged = (BOOL)db_get_b(NULL, "Chat", "ShowTimeStampIfChanged", 0) != 0;

-	g_Settings->bTimeStampEventColour = (BOOL)db_get_b(NULL, "Chat", "bTimeStampEventColour", 0) != 0;

+	g_Settings->bTimeStampEventColour = (BOOL)db_get_b(NULL, "Chat", "TimeStampEventColour", 0) != 0;

 	g_Settings->iEventLimit = db_get_w(NULL, "Chat", "LogLimit", 100);

 	g_Settings->dwIconFlags = db_get_dw(NULL, "Chat", "IconFlags", 0x0000);

 	g_Settings->dwTrayIconFlags = db_get_dw(NULL, "Chat", "TrayIconFlags", 0x1000);

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

 	g_Settings->LoggingLimit = db_get_w(NULL, "Chat", "LoggingLimit", 100);

-	g_Settings->bLoggingEnabled = (BOOL)db_get_b(NULL, "Chat", "bLoggingEnabled", 0) != 0;

+	g_Settings->bLoggingEnabled = (BOOL)db_get_b(NULL, "Chat", "LoggingEnabled", 0) != 0;

 	g_Settings->bFlashWindow = (BOOL)db_get_b(NULL, "Chat", "FlashWindow", 0) != 0;

-	g_Settings->bFlashWindowHighlight = (BOOL)db_get_b(NULL, "Chat", "bFlashWindowHighlight", false) != 0;

-	g_Settings->bHighlightEnabled = (BOOL)db_get_b(NULL, "Chat", "bHighlightEnabled", 1) != 0;

+	g_Settings->bFlashWindowHighlight = (BOOL)db_get_b(NULL, "Chat", "FlashWindowHighlight", false) != 0;

+	g_Settings->bHighlightEnabled = (BOOL)db_get_b(NULL, "Chat", "HighlightEnabled", 1) != 0;

 	g_Settings->crUserListColor = db_get_dw(NULL, "ChatFonts", "Font18Col", RGB(0, 0, 0));

 	g_Settings->crUserListHeadingsColor = db_get_dw(NULL, "ChatFonts", "Font19Col", RGB(170, 170, 170));

 	g_Settings->bStripFormat = (BOOL)db_get_b(NULL, "Chat", "StripFormatting", 0) != 0;

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

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

 	g_Settings->bPopupInactiveOnly = (BOOL)db_get_b(NULL, "Chat", "PopupInactiveOnly", 1) != 0;

 	g_Settings->bAddColonToAutoComplete = (BOOL)db_get_b(NULL, "Chat", "AddColonToAutoComplete", 1) != 0;

 	g_Settings->iPopupStyle = db_get_b(NULL, "Chat", "PopupStyle", 1);

@@ -234,7 +234,7 @@ void LoadGlobalSettings(void)
 	InitSetting(&g_Settings->pszHighlightWords, "HighlightWords", _T("%m"));

 

 	InitSetting(&g_Settings->pszLogDir, "LogDirectory", _T("%miranda_logpath%\\%proto%\\%userid%.log"));

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

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

 

 	LOGFONT lf;

 	if (g_Settings->MessageBoxFont)

diff --git a/src/modules/chat/chat_svc.cpp b/src/modules/chat/chat_svc.cpp
index 215221b394..eae370c191 100644
--- a/src/modules/chat/chat_svc.cpp
+++ b/src/modules/chat/chat_svc.cpp
@@ -76,7 +76,7 @@ static int FontsChanged(WPARAM wParam, LPARAM lParam)
 	LoadLogFonts();

 

 	SetIndentSize();

-	g_Settings->bLogIndentEnabled = (db_get_b(NULL, "Chat", "bLogIndentEnabled", 1) != 0) ? TRUE : FALSE;

+	g_Settings->bLogIndentEnabled = (db_get_b(NULL, "Chat", "LogIndentEnabled", 1) != 0) ? TRUE : FALSE;

 

 	ci.MM_FontsChanged();

 	ci.MM_FixColors();

diff --git a/src/modules/chat/log.cpp b/src/modules/chat/log.cpp
index 50aa1d2a2e..115b9fc907 100644
--- a/src/modules/chat/log.cpp
+++ b/src/modules/chat/log.cpp
@@ -25,8 +25,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 // The code for streaming the text is to a large extent copied from

 // the srmm module and then modified to fit the chat module.

 

-static PBYTE pLogIconBmpBits[14];

-static int logIconBmpSize[ SIZEOF(pLogIconBmpBits) ];

+PBYTE pLogIconBmpBits[14];

+int logIconBmpSize[ SIZEOF(pLogIconBmpBits) ];

 

 static int EventToIndex(LOGINFO * lin)

 {

diff --git a/src/modules/chat/manager.cpp b/src/modules/chat/manager.cpp
index a840f1a248..edc6b5fc69 100644
--- a/src/modules/chat/manager.cpp
+++ b/src/modules/chat/manager.cpp
@@ -1473,6 +1473,9 @@ INT_PTR SvcGetChatManager(WPARAM wParam, LPARAM lParam)
 	ci.RemoveFormatting = RemoveFormatting;

 	ci.ReloadSettings = LoadGlobalSettings;

 

+	ci.pLogIconBmpBits = pLogIconBmpBits;

+	ci.logIconBmpSize = logIconBmpSize;

+

 	LoadChatIcons();

 	RegisterFonts();

 	OptionsInit();