options refactoring (thx slotwin)

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

1 files changed, 666 insertions, 463 deletions

diff --git a/plugins/NewXstatusNotify/src/options.cpp b/plugins/NewXstatusNotify/src/options.cpp
index e7b3d3b9ba..d63f90feec 100644
--- a/plugins/NewXstatusNotify/src/options.cpp
+++ b/plugins/NewXstatusNotify/src/options.cpp
@@ -31,93 +31,121 @@ INT_PTR CALLBACK DlgProcAutoDisableOpts(HWND hwndDlg, UINT msg, WPARAM wParam, L
 

 void LoadTemplates()

 {

-	DBGetStringDefault(0, MODULE, "TPopupDelimiter", templates.PopupDelimiter, SIZEOF(templates.PopupDelimiter), DEFAULT_POPUP_DELIMITER);

-	DBGetStringDefault(0, MODULE, "TPopupChange", templates.PopupNewXstatus, SIZEOF(templates.PopupNewXstatus), DEFAULT_POPUP_NEW);

-	DBGetStringDefault(0, MODULE, "TPopupChangeMsg", templates.PopupNewMsg, SIZEOF(templates.PopupNewMsg), DEFAULT_POPUP_CHANGEMSG);

-	DBGetStringDefault(0, MODULE, "TPopupRemoval", templates.PopupRemove, SIZEOF(templates.PopupRemove), DEFAULT_POPUP_REMOVE);

-

-	DBGetStringDefault(0, MODULE, "TLogDelimiter", templates.LogDelimiter, SIZEOF(templates.LogDelimiter), DEFAULT_LOG_DELIMITER);

-	DBGetStringDefault(0, MODULE, "TLogChange", templates.LogNewXstatus, SIZEOF(templates.LogNewXstatus), DEFAULT_LOG_NEW);

-	DBGetStringDefault(0, MODULE, "TLogChangeMsg", templates.LogNewMsg, SIZEOF(templates.LogNewMsg), DEFAULT_LOG_CHANGEMSG);

-	DBGetStringDefault(0, MODULE, "TLogRemoval", templates.LogRemove, SIZEOF(templates.LogRemove), DEFAULT_LOG_REMOVE);

-	DBGetStringDefault(0, MODULE, "TLogOpening", templates.LogOpening, SIZEOF(templates.LogOpening), DEFAULT_LOG_OPENING);

-	templates.PopupFlags = db_get_b(0, MODULE, "TPopupFlags", NOTIFY_NEW_XSTATUS | NOTIFY_NEW_MESSAGE);

-	templates.LogFlags = db_get_b(0, MODULE, "TLogFlags", NOTIFY_NEW_XSTATUS | NOTIFY_NEW_MESSAGE | NOTIFY_OPENING_ML);

+	DBGetStringDefault(0, MODULE, "TPopupXChanged", templates.PopupXstatusChanged, SIZEOF(templates.PopupXstatusChanged), DEFAULT_POPUP_CHANGED);

+	DBGetStringDefault(0, MODULE, "TPopupXRemoved", templates.PopupXstatusRemoved, SIZEOF(templates.PopupXstatusRemoved), DEFAULT_POPUP_REMOVED);

+	DBGetStringDefault(0, MODULE, "TPopupXMsgChanged", templates.PopupXMsgChanged, SIZEOF(templates.PopupXMsgChanged), DEFAULT_POPUP_MSGCHANGED);

+	DBGetStringDefault(0, MODULE, "TPopupXMsgRemoved", templates.PopupXMsgRemoved, SIZEOF(templates.PopupXMsgRemoved), DEFAULT_POPUP_MSGREMOVED);

+

+	DBGetStringDefault(0, MODULE, "TLogXChanged", templates.LogXstatusChanged, SIZEOF(templates.LogXstatusChanged), DEFAULT_LOG_CHANGED);

+	DBGetStringDefault(0, MODULE, "TLogXRemoved", templates.LogXstatusRemoved, SIZEOF(templates.LogXstatusRemoved), DEFAULT_LOG_REMOVED);

+	DBGetStringDefault(0, MODULE, "TLogXMsgChanged", templates.LogXMsgChanged, SIZEOF(templates.LogXMsgChanged), DEFAULT_LOG_MSGCHANGED);

+	DBGetStringDefault(0, MODULE, "TLogXMsgRemoved", templates.LogXMsgRemoved, SIZEOF(templates.LogXMsgRemoved), DEFAULT_LOG_MSGREMOVED);

+	DBGetStringDefault(0, MODULE, "TLogXOpening", templates.LogXstatusOpening, SIZEOF(templates.LogXstatusOpening), DEFAULT_LOG_OPENING);

+

+	DBGetStringDefault(0, MODULE, "TLogSMsgChanged", templates.LogSMsgChanged, SIZEOF(templates.LogSMsgChanged), DEFAULT_LOG_SMSGCHANGED);

+	DBGetStringDefault(0, MODULE, "TLogSMsgRemoved", templates.LogSMsgRemoved, SIZEOF(templates.LogSMsgRemoved), DEFAULT_LOG_SMSGREMOVED);

+	DBGetStringDefault(0, MODULE, "TLogSMsgOpening", templates.LogSMsgOpening, SIZEOF(templates.LogSMsgOpening), DEFAULT_LOG_SMSGOPENING);

+

+	templates.PopupXFlags = db_get_b(0, MODULE, "TPopupXFlags", NOTIFY_NEW_XSTATUS | NOTIFY_NEW_MESSAGE);

+	templates.PopupSMsgFlags = db_get_b(0, MODULE, "TPopupSMsgFlags", NOTIFY_NEW_MESSAGE);

+	templates.LogXFlags = db_get_b(0, MODULE, "TLogXFlags", NOTIFY_NEW_XSTATUS | NOTIFY_NEW_MESSAGE | NOTIFY_OPENING_ML);

+	templates.LogSMsgFlags = db_get_b(0, MODULE, "TLogSMsgFlags", NOTIFY_NEW_MESSAGE | NOTIFY_OPENING_ML);

 }

 

-void LoadOptions() 

+void LoadOptions()

 {

 	// IDD_OPT_POPUP

-	opt.Colors = db_get_b(0,MODULE, "Colors", DEFAULT_COLORS);

-	opt.ShowGroup = db_get_b(0, MODULE, "ShowGroup", 0);

-	opt.ShowStatus = db_get_b(0, MODULE, "ShowStatus", 1);

-	opt.UseAlternativeText = db_get_b(0, MODULE, "UseAlternativeText", 0);

-	opt.ShowPreviousStatus = db_get_b(0, MODULE, "ShowPreviousStatus", 0);

-	opt.ReadAwayMsg = db_get_b(0, MODULE, "ReadAwayMsg", 0);

-	opt.PopupTimeout = db_get_dw(0, MODULE, "PopupTimeout", 0);

+	opt.Colors				= db_get_b(0, MODULE, "Colors", DEFAULT_COLORS);

+	opt.ShowGroup			= db_get_b(0, MODULE, "ShowGroup", 0);

+	opt.ShowStatus			= db_get_b(0, MODULE, "ShowStatus", 1);

+	opt.UseAlternativeText	= db_get_b(0, MODULE, "UseAlternativeText", 0);

+	opt.ShowPreviousStatus	= db_get_b(0, MODULE, "ShowPreviousStatus", 0);

+	opt.ReadAwayMsg			= db_get_b(0, MODULE, "ReadAwayMsg", 0);

+	opt.PopupTimeout		= db_get_dw(0, MODULE, "PopupTimeout", 0);

 	opt.PopupConnectionTimeout = db_get_dw(0, MODULE, "PopupConnectionTimeout", 15);

-	opt.LeftClickAction= db_get_b(0, MODULE, "LeftClickAction", 5);

-	opt.RightClickAction = db_get_b(0, MODULE, "RightClickAction", 1);

-	opt.IgnoreEmpty = db_get_b(0, MODULE, "IgnoreEmpty", 1);

+	opt.LeftClickAction		= db_get_b(0, MODULE, "LeftClickAction", 5);

+	opt.RightClickAction	= db_get_b(0, MODULE, "RightClickAction", 1);

 	// IDD_OPT_XPOPUP

-	opt.PDisableForMusic = db_get_b(0, MODULE, "PDisableForMusic", 1);

-	opt.PTruncateMsg = db_get_b(0, MODULE, "PTruncateMsg", 0);

-	opt.PMsgLen = db_get_dw(0, MODULE, "PMsgLen", 64);

+	opt.PXOnConnect			= db_get_b(0, MODULE, "PXOnConnect", 0);

+	opt.PXDisableForMusic	= db_get_b(0, MODULE, "PXDisableForMusic", 1);

+	opt.PXMsgTruncate		= db_get_b(0, MODULE, "PXMsgTruncate", 0);

+	opt.PXMsgLen				= db_get_dw(0, MODULE, "PXMsgLen", 64);

 	// IDD_OPT_GENERAL

-	opt.FromOffline = db_get_b(0, MODULE, "FromOffline", 1);

-	opt.AutoDisable = db_get_b(0, MODULE, "AutoDisable", 0);

-	opt.HiddenContactsToo = db_get_b(0, MODULE, "HiddenContactsToo", 0);

-	opt.UseIndSnd = db_get_b(0, MODULE, "UseIndSounds", 1);

-	opt.BlinkIcon = db_get_b(0, MODULE, "BlinkIcon", 0);

-	opt.BlinkIcon_Status = db_get_b(0, MODULE, "BlinkIcon_Status", 0);

-	opt.Log = db_get_b(0, MODULE, "Log", 0);

-	opt.LogToDB = db_get_b(0, MODULE, "LogToDB", 0);

-	opt.CheckMessageWindow = db_get_b(0, MODULE, "CheckMessageWindow", 1);

+	opt.FromOffline			= db_get_b(0, MODULE, "FromOffline", 1);

+	opt.AutoDisable			= db_get_b(0, MODULE, "AutoDisable", 0);

+	opt.HiddenContactsToo	= db_get_b(0, MODULE, "HiddenContactsToo", 0);

+	opt.UseIndSnd			= db_get_b(0, MODULE, "UseIndSounds", 1);

+	opt.BlinkIcon			= db_get_b(0, MODULE, "BlinkIcon", 0);

+	opt.BlinkIcon_Status	= db_get_b(0, MODULE, "BlinkIcon_Status", 0);

+	opt.BlinkIcon_ForMsgs	= db_get_b(0, MODULE, "BlinkIcon_ForMsgs", 0);

 	DBGetStringDefault(0, MODULE, "LogFilePath", opt.LogFilePath, MAX_PATH, _T(""));

 	// IDD_AUTODISABLE

-	opt.OnlyGlobalChanges = db_get_b(0, MODULE, "OnlyGlobalChanges", 0);

+	opt.OnlyGlobalChanges	= db_get_b(0, MODULE, "OnlyGlobalChanges", 0);

 	opt.DisablePopupGlobally = db_get_b(0, MODULE, "DisablePopupGlobally", 0);

 	opt.DisableSoundGlobally = db_get_b(0, MODULE, "DisableSoundGlobally", 0);

+	// IDD_OPT_LOG

+	opt.LogToFile			= db_get_b(0, MODULE, "LogToFile", 0);

+	opt.LogToDB				= db_get_b(0, MODULE, "LogToDB", 0);

+	opt.LogToDB_WinOpen		= db_get_b(0, MODULE, "LogToDB_WinOpen", 1);

+	opt.LogToDB_Remove		= db_get_b(0, MODULE, "LogToDB_Remove", 0);

+	opt.LogPrevious			= db_get_b(0, MODULE, "LogToPrevious", 0);

+	opt.SMsgLogToFile		= db_get_b(0, MODULE, "SMsgLogToFile", 0);

+	opt.SMsgLogToDB			= db_get_b(0, MODULE, "SMsgLogToDB", 0);

+	opt.SMsgLogToDB_WinOpen	= db_get_b(0, MODULE, "SMsgLogToDB_WinOpen", 1);

+	opt.SMsgLogToDB_Remove	= db_get_b(0, MODULE, "SMsgLogToDB_Remove", 0);

 	// IDD_OPT_XLOG

-	opt.EnableLogging = db_get_b(0, MODULE, "EnableLogging", 0);

-	opt.PreventIdentical = db_get_b(0, MODULE, "PreventIdentical", 1);

-	opt.KeepInHistory = db_get_b(0, MODULE, "KeepInHistory", 0);

-	opt.LDisableForMusic = db_get_b(0, MODULE, "LDisableForMusic", 1);

-	opt.LTruncateMsg = db_get_b(0, MODULE, "LTruncateMsg", 0);

-	opt.LMsgLen = db_get_dw(0, MODULE, "LMsgLen", 128);

-	//IDD_OPT_SMPOPUP

-	opt.PopupOnConnect = db_get_b(0, MODULE, "PopupOnConnect", 0);

+	opt.XLogToFile			= db_get_b(0, MODULE, "XLogToFile", 0);

+	opt.XLogToDB			= db_get_b(0, MODULE, "XLogToDB", 0);

+	opt.XLogToDB_WinOpen	= db_get_b(0, MODULE, "XLogToDB_WinOpen", 1);

+	opt.XLogToDB_Remove		= db_get_b(0, MODULE, "XLogToDB_Remove", 0);

+	opt.XLogDisableForMusic	= db_get_b(0, MODULE, "XLogDisableForMusic", 1);

+	// IDD_OPT_SMPOPUP

+	opt.PSMsgOnConnect		= db_get_b(0, MODULE, "PSMsgOnConnect", 0);

+	opt.PSMsgTruncate			= db_get_b(0, MODULE, "PSMsgTruncate", 0);

+	opt.PSMsgLen				= db_get_dw(0, MODULE, "PSMsgLen", 64);

 	// OTHER

-	opt.TempDisabled = db_get_b(0, MODULE, "TempDisable", 0);

-	opt.EnableLastSeen = db_get_b(0, MODULE, "EnableLastSeen", 0);

+	opt.TempDisabled		= db_get_b(0, MODULE, "TempDisable", 0);

+	opt.EnableLastSeen		= db_get_b(0, MODULE, "EnableLastSeen", 0);

 

 	LoadTemplates();

 }

 

 void SaveTemplates()

 {

-	db_set_ts(0, MODULE, "TPopupDelimiter", templates.PopupDelimiter);

-	db_set_ts(0, MODULE, "TPopupChange", templates.PopupNewXstatus);

-	db_set_ts(0, MODULE, "TPopupChangeMsg", templates.PopupNewMsg);

-	db_set_ts(0, MODULE, "TPopupRemoval", templates.PopupRemove);

-	db_set_ts(0, MODULE, "TLogDelimiter", templates.LogDelimiter);

-	db_set_ts(0, MODULE, "TLogChange", templates.LogNewXstatus);

-	db_set_ts(0, MODULE, "TLogChangeMsg", templates.LogNewMsg);

-	db_set_ts(0, MODULE, "TLogRemoval", templates.LogRemove);

-	db_set_ts(0, MODULE, "TLogOpening", templates.LogOpening);

-	db_set_b(0, MODULE, "TPopupFlags", templates.PopupFlags);

-	db_set_b(0, MODULE, "TLogFlags", templates.LogFlags);

+	db_set_ts(0, MODULE, "TPopupChanged", templates.PopupXstatusChanged);

+	db_set_ts(0, MODULE, "TPopupRemoved", templates.PopupXstatusRemoved);

+	db_set_ts(0, MODULE, "TPopupXMsgChanged", templates.PopupXMsgChanged);

+	db_set_ts(0, MODULE, "TPopupXMsgRemoved", templates.PopupXMsgRemoved);

+

+	db_set_ts(0, MODULE, "TLogXChanged", templates.LogXstatusChanged);

+	db_set_ts(0, MODULE, "TLogXRemoved", templates.LogXstatusRemoved);

+	db_set_ts(0, MODULE, "TLogXMsgChanged", templates.LogXMsgChanged);

+	db_set_ts(0, MODULE, "TLogXMsgRemoved", templates.LogXMsgRemoved);

+	db_set_ts(0, MODULE, "TLogXOpening", templates.LogXstatusOpening);

+

+	db_set_ts(0, MODULE, "TLogSMsgChanged", templates.LogSMsgChanged);

+	db_set_ts(0, MODULE, "TLogSMsgRemoved", templates.LogSMsgRemoved);

+	db_set_ts(0, MODULE, "TLogSMsgOpening", templates.LogSMsgOpening);

+

+	db_set_b(0, MODULE, "TPopupXFlags", templates.PopupXFlags);

+	db_set_b(0, MODULE, "TPopupSMsgFlags", templates.PopupSMsgFlags);

+	db_set_b(0, MODULE, "TLogXFlags", templates.LogXFlags);

+	db_set_b(0, MODULE, "TLogSMsgFlags", templates.LogSMsgFlags);

 

 	for (int i = 0; i < ProtoTemplates.getCount(); i++) {

 		PROTOTEMPLATE *prototemplate = ProtoTemplates[i];

 		TCHAR str[MAX_PATH];

-		mir_sntprintf(str, SIZEOF(str), _T("%s_TSMChange"), prototemplate->ProtoName);

+		mir_sntprintf(str, SIZEOF(str), _T("%s_TPopupSMsgChanged"), prototemplate->ProtoName);

 		char *szstr = mir_t2a(str);

-		db_set_ts(0, MODULE, szstr, prototemplate->ProtoTemplate);

+		db_set_ts(0, MODULE, szstr, prototemplate->ProtoTemplateMsg);

+		mir_sntprintf(str, SIZEOF(str), _T("%s_TPopupSMsgRemoved"), prototemplate->ProtoName);

+		szstr = mir_t2a(str);

+		db_set_ts(0, MODULE, szstr, prototemplate->ProtoTemplateRemoved);

+		mir_free(szstr);

 	}

 }

 

-void SaveOptions() 

+void SaveOptions()

 {

 	// IDD_OPT_POPUP

 	db_set_b(0, MODULE, "Colors", opt.Colors);

@@ -130,11 +158,11 @@ void SaveOptions()
 	db_set_dw(0, MODULE, "PopupConnectionTimeout", opt.PopupConnectionTimeout);

 	db_set_b(0, MODULE, "LeftClickAction", opt.LeftClickAction);

 	db_set_b(0, MODULE, "RightClickAction", opt.RightClickAction);

-	db_set_b(0, MODULE, "IgnoreEmpty", opt.IgnoreEmpty);

 	// IDD_OPT_XPOPUP

-	db_set_b(0, MODULE, "PDisableForMusic", opt.PDisableForMusic);

-	db_set_b(0, MODULE, "PTruncateMsg", opt.PTruncateMsg);

-	db_set_dw(0, MODULE, "PMsgLen", opt.PMsgLen);

+	db_set_b(0, MODULE, "PXOnConnect", opt.PXOnConnect);

+	db_set_b(0, MODULE, "PXDisableForMusic", opt.PXDisableForMusic);

+	db_set_b(0, MODULE, "PXMsgTruncate", opt.PXMsgTruncate);

+	db_set_dw(0, MODULE, "PXMsgLen", opt.PXMsgLen);

 	// IDD_OPT_GENERAL

 	db_set_b(0, MODULE, "FromOffline", opt.FromOffline);

 	db_set_b(0, MODULE, "AutoDisable", opt.AutoDisable);

@@ -142,23 +170,32 @@ void SaveOptions()
 	db_set_b(0, MODULE, "UseIndSounds", opt.UseIndSnd);

 	db_set_b(0, MODULE, "BlinkIcon", opt.BlinkIcon);

 	db_set_b(0, MODULE, "BlinkIcon_Status", opt.BlinkIcon_Status);

-	db_set_b(0, MODULE, "Log", opt.Log);

-	db_set_b(0, MODULE, "LogToDB", opt.LogToDB);

-	db_set_b(0, MODULE, "CheckMessageWindow", opt.CheckMessageWindow);

+	db_set_b(0, MODULE, "BlinkIcon_ForMsgs", opt.BlinkIcon_ForMsgs);

 	db_set_ws(0, MODULE, "LogFilePath", opt.LogFilePath);

 	// IDD_AUTODISABLE

 	db_set_b(0, MODULE, "OnlyGlobalChanges", opt.OnlyGlobalChanges);

 	db_set_b(0, MODULE, "DisablePopupGlobally", opt.DisablePopupGlobally);

 	db_set_b(0, MODULE, "DisableSoundGlobally", opt.DisableSoundGlobally);

+	// IDD_OPT_LOG

+	db_set_b(0, MODULE, "LogToFile", opt.LogToFile);

+	db_set_b(0, MODULE, "LogToDB", opt.LogToDB);

+	db_set_b(0, MODULE, "LogToDB_WinOpen", opt.LogToDB_WinOpen);

+	db_set_b(0, MODULE, "LogToDB_Remove", opt.LogToDB_Remove);

+	db_set_b(0, MODULE, "LogPrevious", opt.LogPrevious);

+	db_set_b(0, MODULE, "SMsgLogToFile", opt.SMsgLogToFile);

+	db_set_b(0, MODULE, "SMsgLogToDB", opt.SMsgLogToDB);

+	db_set_b(0, MODULE, "SMsgLogToDB_WinOpen", opt.SMsgLogToDB_WinOpen);

+	db_set_b(0, MODULE, "SMsgLogToDB_Remove", opt.SMsgLogToDB_Remove);

 	// IDD_OPT_XLOG

-	db_set_b(0, MODULE, "EnableLogging", opt.EnableLogging);

-	db_set_b(0, MODULE, "PreventIdentical", opt.PreventIdentical);

-	db_set_b(0, MODULE, "KeepInHistory", opt.KeepInHistory);

-	db_set_b(0, MODULE, "LDisableForMusic", opt.LDisableForMusic);

-	db_set_b(0, MODULE, "LTruncateMsg", opt.LTruncateMsg);

-	db_set_dw(0, MODULE, "LMsgLen", opt.LMsgLen);

-	//IDD_OPT_SMPOPUP

-	db_set_b(0, MODULE, "PopupOnConnect", opt.PopupOnConnect);

+	db_set_b(0, MODULE, "XLogToFile", opt.XLogToFile);

+	db_set_b(0, MODULE, "XLogToDB", opt.XLogToDB);

+	db_set_b(0, MODULE, "XLogToDB_WinOpen", opt.XLogToDB_WinOpen);

+	db_set_b(0, MODULE, "XLogToDB_Remove", opt.XLogToDB_Remove);

+	db_set_b(0, MODULE, "XLogDisableForMusic", opt.XLogDisableForMusic);

+	// IDD_OPT_SMPOPUP

+	db_set_b(0, MODULE, "PSMsgOnConnect", opt.PSMsgOnConnect);

+	db_set_b(0, MODULE, "PSMsgTruncate", opt.PSMsgTruncate);

+	db_set_dw(0, MODULE, "PSMsgLen", opt.PSMsgLen);

 }

 

 INT_PTR CALLBACK DlgProcGeneralOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)

@@ -175,20 +212,13 @@ INT_PTR CALLBACK DlgProcGeneralOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
 			CheckDlgButton(hwndDlg, IDC_USEINDIVSOUNDS, opt.UseIndSnd);

 			CheckDlgButton(hwndDlg, IDC_BLINKICON, opt.BlinkIcon);

 			CheckDlgButton(hwndDlg, IDC_BLINKICON_STATUS, opt.BlinkIcon_Status);

+			CheckDlgButton(hwndDlg, IDC_BLINKICON_FORMSGS, opt.BlinkIcon_ForMsgs);

 			EnableWindow(GetDlgItem(hwndDlg, IDC_BLINKICON_STATUS), opt.BlinkIcon);

+			EnableWindow(GetDlgItem(hwndDlg, IDC_BLINKICON_FORMSGS), opt.BlinkIcon);

 

-			CheckDlgButton(hwndDlg, IDC_LOG, opt.Log);

 			SetDlgItemText(hwndDlg, IDC_LOGFILE, opt.LogFilePath);

-			EnableWindow(GetDlgItem(hwndDlg, IDC_LOGFILE), opt.Log);

-			EnableWindow(GetDlgItem(hwndDlg, IDC_BT_CHOOSELOGFILE), opt.Log);

-			EnableWindow(GetDlgItem(hwndDlg, IDC_BT_VIEWLOG), opt.Log);

 

-			CheckDlgButton(hwndDlg, IDC_LOGTODB, opt.LogToDB);

-			CheckDlgButton(hwndDlg, IDC_CHECKMESSAGEWINDOW, opt.CheckMessageWindow);

-			EnableWindow(GetDlgItem(hwndDlg, IDC_CHECKMESSAGEWINDOW), opt.LogToDB);

-

-			for (int i = ID_STATUS_MIN; i <= ID_STATUS_MAX2; i++)

-			{

+			for (int i = ID_STATUS_MIN; i <= ID_STATUS_MAX2; i++) {

 				//Statuses notified

 				char status[8];

 				mir_snprintf(status, SIZEOF(status), "%d", i);

@@ -199,7 +229,7 @@ INT_PTR CALLBACK DlgProcGeneralOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
 			return TRUE;

 		case WM_COMMAND:

 		{

-			switch(LOWORD(wParam))

+			switch (LOWORD(wParam))

 			{

 				case IDC_CONFIGUREAUTODISABLE:

 					CreateDialog(hInst, MAKEINTRESOURCE(IDD_AUTODISABLE), hwndDlg, DlgProcAutoDisableOpts);

@@ -209,6 +239,7 @@ INT_PTR CALLBACK DlgProcGeneralOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
 					break;

 				case IDC_BLINKICON:

 					EnableWindow(GetDlgItem(hwndDlg, IDC_BLINKICON_STATUS), IsDlgButtonChecked(hwndDlg, IDC_BLINKICON));

+					EnableWindow(GetDlgItem(hwndDlg, IDC_BLINKICON_FORMSGS), IsDlgButtonChecked(hwndDlg, IDC_BLINKICON));

 					break;

 				case IDC_BT_VIEWLOG:

 					ShowLog(opt.LogFilePath);

@@ -235,14 +266,6 @@ INT_PTR CALLBACK DlgProcGeneralOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
 						SetDlgItemText(hwndDlg, IDC_LOGFILE, buff);

 					break;

 				}

-				case IDC_LOG:

-					EnableWindow(GetDlgItem(hwndDlg, IDC_LOGFILE), IsDlgButtonChecked(hwndDlg, IDC_LOG));

-					EnableWindow(GetDlgItem(hwndDlg, IDC_BT_CHOOSELOGFILE), IsDlgButtonChecked(hwndDlg, IDC_LOG));

-					EnableWindow(GetDlgItem(hwndDlg, IDC_BT_VIEWLOG), IsDlgButtonChecked(hwndDlg, IDC_LOG));

-					break;

-				case IDC_LOGTODB:

-					EnableWindow(GetDlgItem(hwndDlg, IDC_CHECKMESSAGEWINDOW), IsDlgButtonChecked(hwndDlg, IDC_LOGTODB));

-					break;

 			}

 

 			if (HIWORD(wParam) == BN_CLICKED || (HIWORD(wParam) == EN_CHANGE && (HWND)lParam == GetFocus()))

@@ -251,23 +274,18 @@ INT_PTR CALLBACK DlgProcGeneralOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
 			break;

 		}

 		case WM_NOTIFY:

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

-			{

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

 				opt.AutoDisable = IsDlgButtonChecked(hwndDlg, IDC_AUTODISABLE);

 				opt.BlinkIcon = IsDlgButtonChecked(hwndDlg, IDC_BLINKICON);

 				opt.BlinkIcon_Status = IsDlgButtonChecked(hwndDlg, IDC_BLINKICON_STATUS);

+				opt.BlinkIcon_ForMsgs = IsDlgButtonChecked(hwndDlg, IDC_BLINKICON_FORMSGS);

 				opt.HiddenContactsToo = IsDlgButtonChecked(hwndDlg, IDC_HIDDENCONTACTSTOO);

 				opt.UseIndSnd = IsDlgButtonChecked(hwndDlg, IDC_USEINDIVSOUNDS);

 

-				opt.Log = IsDlgButtonChecked(hwndDlg, IDC_LOG);

 				GetDlgItemText(hwndDlg, IDC_LOGFILE, opt.LogFilePath, SIZEOF(opt.LogFilePath));

 

-				opt.LogToDB = IsDlgButtonChecked(hwndDlg, IDC_LOGTODB);

-				opt.CheckMessageWindow = IsDlgButtonChecked(hwndDlg, IDC_CHECKMESSAGEWINDOW);

-

 				//Notified statuses

-				for (int i = ID_STATUS_MIN; i <= ID_STATUS_MAX2; i++)

-				{

+				for (int i = ID_STATUS_MIN; i <= ID_STATUS_MAX2; i++) {

 					char status[8];

 					mir_snprintf(status, SIZEOF(status), "%d", i);

 					db_set_b(NULL, MODULE, status, (BYTE)IsDlgButtonChecked(hwndDlg, i));

@@ -282,13 +300,6 @@ INT_PTR CALLBACK DlgProcGeneralOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
 	return FALSE;

 }

 

-void EnablePopupTextControls(HWND hwndDlg, BOOL bEnable)

-{

-	EnableWindow(GetDlgItem(hwndDlg, IDC_SHOWALTDESCS), bEnable);

-	EnableWindow(GetDlgItem(hwndDlg, IDC_SHOWPREVIOUSSTATUS), bEnable);

-	//EnableWindow(GetDlgItem(hwndDlg, IDC_READAWAYMSG), bEnable);

-}

-

 INT_PTR CALLBACK DlgProcPopupOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)

 {

 	switch (msg)

@@ -301,12 +312,11 @@ INT_PTR CALLBACK DlgProcPopupOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM
 			CheckDlgButton(hwndDlg, IDC_USEPOPUPCOLORS, (opt.Colors == POPUP_COLOR_POPUP) ? 1 : 0);

 			CheckDlgButton(hwndDlg, IDC_USEWINCOLORS, (opt.Colors == POPUP_COLOR_WINDOWS) ? 1 : 0);

 

-			for (int i = ID_STATUS_MIN; i <= ID_STATUS_MAX2 - 1; i++)

-			{

-				SendDlgItemMessage(hwndDlg, (i+2000), CPM_SETCOLOUR, 0, StatusList[Index(i)].colorBack);

-				SendDlgItemMessage(hwndDlg, (i+1000), CPM_SETCOLOUR, 0, StatusList[Index(i)].colorText);

-				EnableWindow(GetDlgItem(hwndDlg, (i+2000)), (opt.Colors == POPUP_COLOR_OWN));

-				EnableWindow(GetDlgItem(hwndDlg, (i+1000)), (opt.Colors == POPUP_COLOR_OWN));

+			for (int i = ID_STATUS_MIN; i <= ID_STATUS_MAX2; i++) {

+				SendDlgItemMessage(hwndDlg, (i + 2000), CPM_SETCOLOUR, 0, StatusList[Index(i)].colorBack);

+				SendDlgItemMessage(hwndDlg, (i + 1000), CPM_SETCOLOUR, 0, StatusList[Index(i)].colorText);

+				EnableWindow(GetDlgItem(hwndDlg, (i + 2000)), (opt.Colors == POPUP_COLOR_OWN));

+				EnableWindow(GetDlgItem(hwndDlg, (i + 1000)), (opt.Colors == POPUP_COLOR_OWN));

 			}

 

 			CheckDlgButton(hwndDlg, IDC_SHOWSTATUS, opt.ShowStatus);

@@ -314,7 +324,6 @@ INT_PTR CALLBACK DlgProcPopupOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM
 			CheckDlgButton(hwndDlg, IDC_READAWAYMSG, opt.ReadAwayMsg);

 			CheckDlgButton(hwndDlg, IDC_SHOWPREVIOUSSTATUS, opt.ShowPreviousStatus);

 			CheckDlgButton(hwndDlg, IDC_SHOWGROUP, opt.ShowGroup);

-			CheckDlgButton(hwndDlg, IDC_PUIGNOREREMOVE, opt.IgnoreEmpty);

 

 			SendDlgItemMessage(hwndDlg, IDC_TIMEOUT_VALUE, EM_LIMITTEXT, 3, 0);

 			SendDlgItemMessage(hwndDlg, IDC_TIMEOUT_VALUE_SPIN, UDM_SETRANGE32, -1, 999);

@@ -325,8 +334,7 @@ INT_PTR CALLBACK DlgProcPopupOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM
 			SetDlgItemInt(hwndDlg, IDC_CONNECTIONTIMEOUT_VALUE, opt.PopupConnectionTimeout, TRUE);

 

 			//Mouse actions

-			for (int i = 0; i < SIZEOF(PopupActions); i++)

-			{

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

 				SendMessage(GetDlgItem(hwndDlg, IDC_STATUS_LC), CB_SETITEMDATA, SendMessage(GetDlgItem(hwndDlg, IDC_STATUS_LC), CB_ADDSTRING, 0, (LPARAM)TranslateTS(PopupActions[i].Text)), PopupActions[i].Action);

 				SendMessage(GetDlgItem(hwndDlg, IDC_STATUS_RC), CB_SETITEMDATA, SendMessage(GetDlgItem(hwndDlg, IDC_STATUS_RC), CB_ADDSTRING, 0, (LPARAM)TranslateTS(PopupActions[i].Text)), PopupActions[i].Action);

 			}

@@ -334,17 +342,15 @@ INT_PTR CALLBACK DlgProcPopupOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM
 			SendDlgItemMessage(hwndDlg, IDC_STATUS_LC, CB_SETCURSEL, opt.LeftClickAction, 0);

 			SendDlgItemMessage(hwndDlg, IDC_STATUS_RC, CB_SETCURSEL, opt.RightClickAction, 0);

 

-			EnablePopupTextControls(hwndDlg, opt.ShowStatus);

+			SendMessage(hwndDlg, WM_USER + 1, (WPARAM)opt.ShowStatus, 0);

 

 			return TRUE;

 		}

 		case WM_COMMAND:

 		{

 			WORD idCtrl = LOWORD(wParam);

-			if (HIWORD(wParam) == CPN_COLOURCHANGED)

-			{

-				if (idCtrl > 40070)

-				{

+			if (HIWORD(wParam) == CPN_COLOURCHANGED) {

+				if (idCtrl > 40070) {

 					COLORREF colour = SendDlgItemMessage(hwndDlg, idCtrl, CPM_GETCOLOUR, 0, 0);

 					if ((idCtrl > 41070) && (idCtrl < 42070)) //Text colour

 						StatusList[Index(idCtrl - 1000)].colorText = colour;

@@ -355,78 +361,51 @@ INT_PTR CALLBACK DlgProcPopupOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM
 				}

 			}

 

-			if (HIWORD(wParam) == BN_CLICKED)

-			{

-				switch(idCtrl)

+			if (HIWORD(wParam) == BN_CLICKED) {

+				switch (idCtrl)

 				{

 					case IDC_USEOWNCOLORS:

 					case IDC_USEWINCOLORS:

 					case IDC_USEPOPUPCOLORS:

-					{

-						for (int i = ID_STATUS_MIN; i <= ID_STATUS_MAX2 - 1; i++)

-						{

-							EnableWindow(GetDlgItem(hwndDlg, (i+2000)), idCtrl == IDC_USEOWNCOLORS); //Background

-							EnableWindow(GetDlgItem(hwndDlg, (i+1000)), idCtrl == IDC_USEOWNCOLORS); //Text

+						for (int i = ID_STATUS_MIN; i <= ID_STATUS_MAX2; i++) {

+							EnableWindow(GetDlgItem(hwndDlg, (i + 2000)), idCtrl == IDC_USEOWNCOLORS); //Background

+							EnableWindow(GetDlgItem(hwndDlg, (i + 1000)), idCtrl == IDC_USEOWNCOLORS); //Text

 						}

-

 						break;

-					}

 					case IDC_SHOWSTATUS:

-					{

-						EnablePopupTextControls(hwndDlg, IsDlgButtonChecked(hwndDlg, IDC_SHOWSTATUS));

+						SendMessage(hwndDlg, WM_USER + 1, (WPARAM)IsDlgButtonChecked(hwndDlg, IDC_SHOWSTATUS), 0);

 						break;

-					}

 					case IDC_PREVIEW:

 					{

-						POPUPDATAT ppd = {0};

-						ppd.iSeconds = opt.PopupTimeout;

-

-						for (int i = ID_STATUS_MIN; i <= (ID_STATUS_MAX+1); i++)

-						{

-							WORD status = i <= ID_STATUS_MAX2 ? i : ID_STATUS_MIN;

-							ppd.lchIcon = LoadSkinnedIcon(StatusList[Index(status)].icon);

+						TCHAR str[MAX_SECONDLINE] = {0};

+						for (int i = ID_STATUS_MIN; i <= ID_STATUS_MAX; i++) {

+							_tcscpy(str, _T(""));

 

-							_tcscpy(ppd.lptzContactName, (TCHAR *)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, 0, GSMDF_TCHAR));

-							_tcscpy(ppd.lptzText, _T(""));

-

-							if (opt.ShowStatus)

-							{

+							if (opt.ShowStatus) {

 								if (opt.UseAlternativeText == 1)

-									_tcscpy(ppd.lptzText, StatusList[Index(status)].lpzUStatusText);

+									_tcscpy(str, _tcsninc(StatusList[Index(i)].lpzUStatusText, 4));

 								else

-									_tcscpy(ppd.lptzText, StatusList[Index(status)].lpzStandardText);

+									_tcscpy(str, StatusList[Index(i)].lpzStandardText);

 

-								if (opt.ShowPreviousStatus)

-								{

+								if (opt.ShowPreviousStatus) {

 									TCHAR buff[MAX_STATUSTEXT];

-									mir_sntprintf(buff, SIZEOF(buff), TranslateTS(STRING_SHOWPREVIOUSSTATUS), StatusList[Index(status)].lpzStandardText);

-									mir_sntprintf(ppd.lptzText, SIZEOF(ppd.lptzText), _T("%s %s"), ppd.lptzText, buff);

+									mir_sntprintf(buff, SIZEOF(buff), TranslateTS(STRING_SHOWPREVIOUSSTATUS), StatusList[Index(i)].lpzStandardText);

+									mir_sntprintf(str, SIZEOF(str), _T("%s %s"), str, buff);

 								}

 							}

 

-							if (opt.ReadAwayMsg)

-							{

-								if (ppd.lptzText[0]) _tcscat(ppd.lptzText, _T("\n"));

-								_tcscat(ppd.lptzText, TranslateT("This is status message"));

-							}

-

-							switch (opt.Colors)

-							{

-								case POPUP_COLOR_WINDOWS:

-									ppd.colorBack = GetSysColor(COLOR_BTNFACE);

-									ppd.colorText = GetSysColor(COLOR_WINDOWTEXT);

-									break;

-								case POPUP_COLOR_OWN:

-									ppd.colorBack = StatusList[Index(status)].colorBack;

-									ppd.colorText = StatusList[Index(status)].colorText;

-									break;

-								case POPUP_COLOR_POPUP:

-									ppd.colorBack = ppd.colorText = 0;

-									break;

+							if (opt.ReadAwayMsg) {

+								if (str[0])

+									_tcscat(str, _T("\n"));

+								_tcscat(str, TranslateT("This is status message"));

 							}

 

-							PUAddPopupT(&ppd);

+							ShowChangePopup(NULL, NULL, LoadSkinnedProtoIcon(NULL, i), i, str);

 						}

+						_tcscpy(str, TranslateT("This is extra status"));

+						ShowChangePopup(NULL, NULL, LoadSkinnedProtoIcon(NULL, ID_STATUS_ONLINE), ID_STATUS_EXTRASTATUS, str);

+						_tcscpy(str, TranslateT("This is status message"));

+						ShowChangePopup(NULL, NULL, LoadSkinnedProtoIcon(NULL, ID_STATUS_ONLINE), ID_STATUS_STATUSMSG, str);

 

 						return FALSE;

 					}

@@ -440,18 +419,16 @@ INT_PTR CALLBACK DlgProcPopupOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM
 		}

 		case WM_NOTIFY: 

 		{

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

-			{

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

 				char str[8];

 				DWORD ctlColour = 0;

-				for (int i = ID_STATUS_MIN; i <= ID_STATUS_MAX2 - 1; i++)

-				{

-					ctlColour = SendDlgItemMessage(hwndDlg, (i+2000), CPM_GETCOLOUR, 0, 0);

-					StatusList[Index(i)].colorBack = SendDlgItemMessage(hwndDlg, (i+2000), CPM_GETCOLOUR, 0, 0);

+				for (int i = ID_STATUS_MIN; i <= ID_STATUS_MAX2; i++) {

+					ctlColour = SendDlgItemMessage(hwndDlg, (i + 2000), CPM_GETCOLOUR, 0, 0);

+					StatusList[Index(i)].colorBack = SendDlgItemMessage(hwndDlg, (i + 2000), CPM_GETCOLOUR, 0, 0);

 					mir_snprintf(str, SIZEOF(str), "%ibg", i);

 					db_set_dw(0, MODULE, str, ctlColour);

 

-					ctlColour = SendDlgItemMessage(hwndDlg, (i+1000), CPM_GETCOLOUR, 0, 0);

+					ctlColour = SendDlgItemMessage(hwndDlg, (i + 1000), CPM_GETCOLOUR, 0, 0);

 					StatusList[Index(i)].colorText = ctlColour;

 					mir_snprintf(str, SIZEOF(str), "%itx", i);

 					db_set_dw(0, MODULE, str, ctlColour);

@@ -473,7 +450,6 @@ INT_PTR CALLBACK DlgProcPopupOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM
 				opt.PopupConnectionTimeout = GetDlgItemInt(hwndDlg, IDC_CONNECTIONTIMEOUT_VALUE, 0, TRUE);

 				opt.LeftClickAction = (BYTE)SendDlgItemMessage(hwndDlg, IDC_STATUS_LC, CB_GETCURSEL, 0, 0);

 				opt.RightClickAction = (BYTE)SendDlgItemMessage(hwndDlg, IDC_STATUS_RC, CB_GETCURSEL, 0, 0);

-				opt.IgnoreEmpty = IsDlgButtonChecked(hwndDlg, IDC_PUIGNOREREMOVE);

 

 				SaveOptions();

 				return TRUE;

@@ -481,6 +457,10 @@ INT_PTR CALLBACK DlgProcPopupOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM
 

 			break;

 		}

+		case WM_USER + 1:

+			EnableWindow(GetDlgItem(hwndDlg, IDC_SHOWALTDESCS), wParam);

+			EnableWindow(GetDlgItem(hwndDlg, IDC_SHOWPREVIOUSSTATUS), wParam);

+			return TRUE;

 	}

 

 	return FALSE;

@@ -488,121 +468,88 @@ INT_PTR CALLBACK DlgProcPopupOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM
 

 INT_PTR CALLBACK DlgProcAutoDisableOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)

 {

-	switch (msg)

-	{

-		case WM_INITDIALOG:

-		{

-			TranslateDialogDefault(hwndDlg);

-			CheckDlgButton(hwndDlg, IDC_CHK_PGLOBAL, opt.DisablePopupGlobally);

-			CheckDlgButton(hwndDlg, IDC_CHK_SGLOBAL, opt.DisableSoundGlobally);

-			CheckDlgButton(hwndDlg, IDC_CHK_ONLYGLOBAL, opt.OnlyGlobalChanges);

+	switch (msg) {

+	case WM_INITDIALOG:

+		TranslateDialogDefault(hwndDlg);

+		CheckDlgButton(hwndDlg, IDC_CHK_PGLOBAL, opt.DisablePopupGlobally);

+		CheckDlgButton(hwndDlg, IDC_CHK_SGLOBAL, opt.DisableSoundGlobally);

+		CheckDlgButton(hwndDlg, IDC_CHK_ONLYGLOBAL, opt.OnlyGlobalChanges);

+

+		char str[8];

+		for (int i = ID_STATUS_MIN; i <= ID_STATUS_MAX; i++) {

+			mir_snprintf(str, SIZEOF(str), "p%d", i);

+			CheckDlgButton(hwndDlg, i, db_get_b(0, MODULE, str, 0));

+		}

+

+		for (int i = ID_STATUS_MIN; i <= ID_STATUS_MAX; i++) {

+			mir_snprintf(str, SIZEOF(str), "s%d", i);

+			CheckDlgButton(hwndDlg, (i + 2000), db_get_b(NULL, MODULE, str, 0));

+		}

 

+		return TRUE;

+	case WM_COMMAND:

+		switch (LOWORD(wParam)) {

+		case IDC_OK:

 			char str[8];

-			for (int i = ID_STATUS_MIN; i <= ID_STATUS_MAX; i++)

-			{

+			opt.DisablePopupGlobally = IsDlgButtonChecked(hwndDlg, IDC_CHK_PGLOBAL);

+			opt.DisableSoundGlobally = IsDlgButtonChecked(hwndDlg, IDC_CHK_SGLOBAL);

+			opt.OnlyGlobalChanges = IsDlgButtonChecked(hwndDlg, IDC_CHK_ONLYGLOBAL);

+

+			for (int i = ID_STATUS_MIN; i <= ID_STATUS_MAX; i++) {

 				mir_snprintf(str, SIZEOF(str), "p%d", i);

-				CheckDlgButton(hwndDlg, i, db_get_b(0, MODULE, str, 0));

+				db_set_b(NULL, MODULE, str, IsDlgButtonChecked(hwndDlg, i));

 			}

 

-			for (int i = ID_STATUS_MIN; i <= ID_STATUS_MAX; i++)

-			{

+			for (int i = ID_STATUS_MIN; i <= ID_STATUS_MAX; i++) {

 				mir_snprintf(str, SIZEOF(str), "s%d", i);

-				CheckDlgButton(hwndDlg, (i+2000),db_get_b(NULL, MODULE, str, 0));

+				db_set_b(NULL, MODULE, str, IsDlgButtonChecked(hwndDlg, i + 2000));

 			}

 

-			return TRUE;

-		}

-		case WM_COMMAND:

-		{

-			switch (LOWORD(wParam))

-			{

-				case IDC_OK:

-					char str[8];

-					opt.DisablePopupGlobally = IsDlgButtonChecked(hwndDlg, IDC_CHK_PGLOBAL);

-					opt.DisableSoundGlobally = IsDlgButtonChecked(hwndDlg, IDC_CHK_SGLOBAL);

-					opt.OnlyGlobalChanges = IsDlgButtonChecked(hwndDlg, IDC_CHK_ONLYGLOBAL);

-

-					for (int i = ID_STATUS_MIN; i <= ID_STATUS_MAX; i++)

-					{

-						mir_snprintf(str, SIZEOF(str), "p%d", i);

-						db_set_b(NULL, MODULE, str, IsDlgButtonChecked(hwndDlg, i));

-					}

-					for (int i = ID_STATUS_MIN; i <= ID_STATUS_MAX; i++)

-					{

-						mir_snprintf(str, SIZEOF(str), "s%d", i);

-						db_set_b(NULL, MODULE, str, IsDlgButtonChecked(hwndDlg, i+2000));

-					}

-

-					SaveOptions();

-					//Fall through

-				case IDC_CANCEL:

-					DestroyWindow(hwndDlg);

-					break;

-			}

-			break;

-		}

-		case WM_CLOSE:

-		{

+			SaveOptions();

+			//Fall through

+		case IDC_CANCEL:

 			DestroyWindow(hwndDlg);

 			break;

 		}

+		break;

+	case WM_CLOSE:

+		DestroyWindow(hwndDlg);

+		break;

 	}

 

 	return FALSE;

 }

 

-int ResetTemplatesToDefault(HWND hwndDlg)

-{

-	int result = MessageBox(hwndDlg,

-		TranslateT("Do you want to reset all templates to default?"),

-		TranslateT("Reset templates"),

-		MB_ICONQUESTION | MB_YESNO);

-	if (result == IDYES)

-	{

-		SetDlgItemText(hwndDlg, IDC_ED_TDELIMITER, DEFAULT_POPUP_DELIMITER);

-		SetDlgItemText(hwndDlg, IDC_ED_TCHANGE, DEFAULT_POPUP_NEW);

-		SetDlgItemText(hwndDlg, IDC_ED_TCHANGEMSG, DEFAULT_POPUP_CHANGEMSG);

-		SetDlgItemText(hwndDlg, IDC_ED_TREMOVE, DEFAULT_POPUP_REMOVE);

-		SetDlgItemText(hwndDlg, IDC_POPUPTEXT, TranslateT(DEFAULT_POPUP_STATUSMESSAGE));

-		CheckDlgButton(hwndDlg, IDC_CHK_XSTATUSCHANGE, 1);

-		CheckDlgButton(hwndDlg, IDC_CHK_MSGCHANGE, 1);

-		CheckDlgButton(hwndDlg, IDC_CHK_REMOVE, 1);

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

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

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

-	}

-

-	return result;

-}

-

 INT_PTR CALLBACK DlgProcXPopupOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)

 {

-	switch (msg)

-	{

-		case WM_INITDIALOG:

+	switch (msg) {

+	case WM_INITDIALOG:

 		{

 			TranslateDialogDefault(hwndDlg);

 

 			SendDlgItemMessage(hwndDlg, IDC_ED_MSGLEN, EM_LIMITTEXT, 3, 0);

 			SendDlgItemMessage(hwndDlg, IDC_UD_MSGLEN, UDM_SETRANGE, 0, MAKELONG(999, 1));

 

-			CheckDlgButton(hwndDlg, IDC_CHK_DISABLEMUSIC, opt.PDisableForMusic);

-			CheckDlgButton(hwndDlg, IDC_CHK_CUTMSG, opt.PTruncateMsg);

-			SetDlgItemInt(hwndDlg, IDC_ED_MSGLEN, opt.PMsgLen, FALSE);

+			CheckDlgButton(hwndDlg, IDC_XONCONNECT, opt.PXOnConnect);

+			CheckDlgButton(hwndDlg, IDC_CHK_DISABLEMUSIC, opt.PXDisableForMusic);

+			CheckDlgButton(hwndDlg, IDC_CHK_CUTMSG, opt.PXMsgTruncate);

+			SetDlgItemInt(hwndDlg, IDC_ED_MSGLEN, opt.PXMsgLen, FALSE);

 

 			// Templates

-			CheckDlgButton(hwndDlg, IDC_CHK_XSTATUSCHANGE, templates.PopupFlags & NOTIFY_NEW_XSTATUS ? 1 : 0);

-			CheckDlgButton(hwndDlg, IDC_CHK_MSGCHANGE, templates.PopupFlags & NOTIFY_NEW_MESSAGE ? 1 : 0);

-			CheckDlgButton(hwndDlg, IDC_CHK_REMOVE, templates.PopupFlags & NOTIFY_REMOVE ? 1 : 0);

+			CheckDlgButton(hwndDlg, IDC_CHK_XSTATUSCHANGE, templates.PopupXFlags & NOTIFY_NEW_XSTATUS ? 1 : 0);

+			CheckDlgButton(hwndDlg, IDC_CHK_MSGCHANGE, templates.PopupXFlags & NOTIFY_NEW_MESSAGE ? 1 : 0);

+			CheckDlgButton(hwndDlg, IDC_CHK_REMOVE, templates.PopupXFlags & NOTIFY_REMOVE_XSTATUS ? 1 : 0);

+			CheckDlgButton(hwndDlg, IDC_CHK_MSGREMOVE, templates.PopupXFlags & NOTIFY_REMOVE_MESSAGE ? 1 : 0);

 

-			SetDlgItemText(hwndDlg, IDC_ED_TDELIMITER, templates.PopupDelimiter);

-			SetDlgItemText(hwndDlg, IDC_ED_TCHANGE, templates.PopupNewXstatus);

-			SetDlgItemText(hwndDlg, IDC_ED_TCHANGEMSG, templates.PopupNewMsg);

-			SetDlgItemText(hwndDlg, IDC_ED_TREMOVE, templates.PopupRemove);

+			SetDlgItemText(hwndDlg, IDC_ED_TCHANGE, templates.PopupXstatusChanged);

+			SetDlgItemText(hwndDlg, IDC_ED_TREMOVE, templates.PopupXstatusRemoved);

+			SetDlgItemText(hwndDlg, IDC_ED_TCHANGEMSG, templates.PopupXMsgChanged);

+			SetDlgItemText(hwndDlg, IDC_ED_TREMOVEMSG, templates.PopupXMsgRemoved);

 

-			EnableWindow(GetDlgItem(hwndDlg, IDC_ED_TCHANGE), templates.PopupFlags & NOTIFY_NEW_XSTATUS);

-			EnableWindow(GetDlgItem(hwndDlg, IDC_ED_TCHANGEMSG), templates.PopupFlags & NOTIFY_NEW_MESSAGE);

-			EnableWindow(GetDlgItem(hwndDlg, IDC_ED_TREMOVE), templates.PopupFlags & NOTIFY_REMOVE);

+			EnableWindow(GetDlgItem(hwndDlg, IDC_ED_TCHANGE), templates.PopupXFlags & NOTIFY_NEW_XSTATUS);

+			EnableWindow(GetDlgItem(hwndDlg, IDC_ED_TCHANGEMSG), templates.PopupXFlags & NOTIFY_NEW_MESSAGE);

+			EnableWindow(GetDlgItem(hwndDlg, IDC_ED_TREMOVE), templates.PopupXFlags & NOTIFY_REMOVE_XSTATUS);

+			EnableWindow(GetDlgItem(hwndDlg, IDC_ED_TREMOVEMSG), templates.PopupXFlags & NOTIFY_REMOVE_MESSAGE);

 

 			// Buttons

 			SendDlgItemMessage(hwndDlg, IDC_BT_VARIABLES, BUTTONADDTOOLTIP, (WPARAM)LPGENT("Show available variables"), BATF_TCHAR);

@@ -617,68 +564,71 @@ INT_PTR CALLBACK DlgProcXPopupOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM
 

 			return TRUE;

 		}

-		case WM_COMMAND:

+	case WM_COMMAND:

 		{

-			switch (HIWORD(wParam))

-			{

-				case BN_CLICKED:

-				{

-					switch (LOWORD(wParam))

-					{

-						case IDC_CHK_CUTMSG:

-							EnableWindow(GetDlgItem(hwndDlg, IDC_ED_MSGLEN), IsDlgButtonChecked(hwndDlg, IDC_CHK_CUTMSG));

-							break;

-						case IDC_CHK_XSTATUSCHANGE:

-							EnableWindow(GetDlgItem(hwndDlg, IDC_ED_TCHANGE), IsDlgButtonChecked(hwndDlg, IDC_CHK_XSTATUSCHANGE));

-							break;

-						case IDC_CHK_MSGCHANGE:

-							EnableWindow(GetDlgItem(hwndDlg, IDC_ED_TCHANGEMSG), IsDlgButtonChecked(hwndDlg, IDC_CHK_MSGCHANGE));

-							break;

-						case IDC_CHK_REMOVE:

-							EnableWindow(GetDlgItem(hwndDlg, IDC_ED_TREMOVE), IsDlgButtonChecked(hwndDlg, IDC_CHK_REMOVE));

-							break;

-						case IDC_BT_VARIABLES:

-							MessageBox(hwndDlg, VARIABLES_HELP_TEXT, TranslateT("Variables"), MB_OK | MB_ICONINFORMATION);

-							break;

-						case IDC_BT_RESET:

-							if (ResetTemplatesToDefault(hwndDlg) == IDYES) break;

-							else return FALSE;

-					}

-

-					if (LOWORD(wParam) != IDC_BT_VARIABLES)

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

-

-					break;

-				}

-				case EN_CHANGE:

-				{

-					if ((HWND)lParam == GetFocus())

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

-					break;

+			switch (HIWORD(wParam)) {

+			case BN_CLICKED:

+				switch (LOWORD(wParam)) {

+					case IDC_CHK_CUTMSG:

+						EnableWindow(GetDlgItem(hwndDlg, IDC_ED_MSGLEN), IsDlgButtonChecked(hwndDlg, IDC_CHK_CUTMSG));

+						break;

+					case IDC_CHK_XSTATUSCHANGE:

+						EnableWindow(GetDlgItem(hwndDlg, IDC_ED_TCHANGE), IsDlgButtonChecked(hwndDlg, IDC_CHK_XSTATUSCHANGE));

+						break;

+					case IDC_CHK_REMOVE:

+						EnableWindow(GetDlgItem(hwndDlg, IDC_ED_TREMOVE), IsDlgButtonChecked(hwndDlg, IDC_CHK_REMOVE));

+						break;

+					case IDC_CHK_MSGCHANGE:

+						EnableWindow(GetDlgItem(hwndDlg, IDC_ED_TCHANGEMSG), IsDlgButtonChecked(hwndDlg, IDC_CHK_MSGCHANGE));

+						break;

+					case IDC_CHK_MSGREMOVE:

+						EnableWindow(GetDlgItem(hwndDlg, IDC_ED_TREMOVEMSG), IsDlgButtonChecked(hwndDlg, IDC_CHK_MSGREMOVE));

+						break;

+					case IDC_BT_VARIABLES:

+						MessageBox(hwndDlg, VARIABLES_HELP_TEXT, TranslateT("Variables"), MB_OK | MB_ICONINFORMATION);

+						break;

+					case IDC_BT_RESET:

+						if (MessageBox(hwndDlg,

+							TranslateT("Do you want to reset all templates to default?"),

+							TranslateT("Reset templates"),

+							MB_ICONQUESTION | MB_YESNO) == IDYES)

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

+						else

+							return FALSE;

+						break;

 				}

 

+				if (LOWORD(wParam) != IDC_BT_VARIABLES)

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

+

+				break;

+			case EN_CHANGE:

+				if ((HWND)lParam == GetFocus())

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

+				break;

 			}

 

 			return TRUE;

 		}

-		case WM_NOTIFY:

+	case WM_NOTIFY:

 		{

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

-			{

-				opt.PDisableForMusic = IsDlgButtonChecked(hwndDlg, IDC_CHK_DISABLEMUSIC);

-				opt.PTruncateMsg = IsDlgButtonChecked(hwndDlg, IDC_CHK_CUTMSG);

-				opt.PMsgLen = GetDlgItemInt(hwndDlg, IDC_ED_MSGLEN, 0, FALSE);

-

-				templates.PopupFlags = 0;

-				templates.PopupFlags |= (IsDlgButtonChecked(hwndDlg, IDC_CHK_XSTATUSCHANGE) ? NOTIFY_NEW_XSTATUS : 0) |

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

+				opt.PXOnConnect = IsDlgButtonChecked(hwndDlg, IDC_XONCONNECT);

+				opt.PXDisableForMusic = IsDlgButtonChecked(hwndDlg, IDC_CHK_DISABLEMUSIC);

+				opt.PXMsgTruncate = IsDlgButtonChecked(hwndDlg, IDC_CHK_CUTMSG);

+				opt.PXMsgLen = GetDlgItemInt(hwndDlg, IDC_ED_MSGLEN, 0, FALSE);

+

+				templates.PopupXFlags = 0;

+				templates.PopupXFlags |= (IsDlgButtonChecked(hwndDlg, IDC_CHK_XSTATUSCHANGE) ? NOTIFY_NEW_XSTATUS : 0) |

 										(IsDlgButtonChecked(hwndDlg, IDC_CHK_MSGCHANGE) ? NOTIFY_NEW_MESSAGE : 0) |

-										(IsDlgButtonChecked(hwndDlg, IDC_CHK_REMOVE) ? NOTIFY_REMOVE : 0);

+										(IsDlgButtonChecked(hwndDlg, IDC_CHK_REMOVE) ? NOTIFY_REMOVE_XSTATUS : 0) |

+										(IsDlgButtonChecked(hwndDlg, IDC_CHK_MSGREMOVE) ? NOTIFY_REMOVE_MESSAGE : 0);

 

 				// Templates

-				GetDlgItemText(hwndDlg, IDC_ED_TDELIMITER, templates.PopupDelimiter, SIZEOF(templates.PopupDelimiter));

-				GetDlgItemText(hwndDlg, IDC_ED_TCHANGE, templates.PopupNewXstatus, SIZEOF(templates.PopupNewXstatus));

-				GetDlgItemText(hwndDlg, IDC_ED_TCHANGEMSG, templates.PopupNewMsg, SIZEOF(templates.PopupNewMsg));

-				GetDlgItemText(hwndDlg, IDC_ED_TREMOVE, templates.PopupRemove, SIZEOF(templates.PopupRemove));

+				GetDlgItemText(hwndDlg, IDC_ED_TCHANGE, templates.PopupXstatusChanged, SIZEOF(templates.PopupXstatusChanged));

+				GetDlgItemText(hwndDlg, IDC_ED_TREMOVE, templates.PopupXstatusRemoved, SIZEOF(templates.PopupXstatusRemoved));

+				GetDlgItemText(hwndDlg, IDC_ED_TCHANGEMSG, templates.PopupXMsgChanged, SIZEOF(templates.PopupXMsgChanged));

+				GetDlgItemText(hwndDlg, IDC_ED_TREMOVEMSG, templates.PopupXMsgRemoved, SIZEOF(templates.PopupXMsgRemoved));

 

 				// Save options to db

 				SaveOptions();

@@ -687,6 +637,23 @@ INT_PTR CALLBACK DlgProcXPopupOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM
 

 			return TRUE;

 		}

+	case WM_USER + 1:

+		SetDlgItemText(hwndDlg, IDC_ED_TCHANGE, DEFAULT_POPUP_CHANGED);

+		SetDlgItemText(hwndDlg, IDC_ED_TREMOVE, DEFAULT_POPUP_REMOVED);

+		SetDlgItemText(hwndDlg, IDC_ED_TCHANGEMSG, DEFAULT_POPUP_MSGCHANGED);

+		SetDlgItemText(hwndDlg, IDC_ED_TREMOVEMSG, DEFAULT_POPUP_MSGREMOVED);

+

+		CheckDlgButton(hwndDlg, IDC_CHK_XSTATUSCHANGE, 1);

+		CheckDlgButton(hwndDlg, IDC_CHK_REMOVE, 1);

+		CheckDlgButton(hwndDlg, IDC_CHK_MSGCHANGE, 1);

+		CheckDlgButton(hwndDlg, IDC_CHK_MSGREMOVE, 1);

+

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

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

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

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

+

+		return TRUE;

 	}

 

 	return FALSE;

@@ -694,16 +661,29 @@ INT_PTR CALLBACK DlgProcXPopupOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM
 

 bool IsSuitableProto(PROTOACCOUNT *pa)

 {

-	return ( pa != NULL && !pa->bDynDisabled && pa->bIsEnabled && CallProtoService( pa->szProtoName, PS_GETCAPS, PFLAGNUM_2, 0 ) != 0 );

+	return (pa != NULL && !pa->bDynDisabled && pa->bIsEnabled && CallProtoService(pa->szProtoName, PS_GETCAPS, PFLAGNUM_2, 0) != 0);

 }

 

 INT_PTR CALLBACK DlgProcSMPopupOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)

 {

 	switch (msg) {

 	case WM_INITDIALOG:

-		TranslateDialogDefault(hwndDlg);

 		{

-			CheckDlgButton(hwndDlg, IDC_ONCONNECT, opt.PopupOnConnect);

+			TranslateDialogDefault(hwndDlg);

+

+			SendDlgItemMessage(hwndDlg, IDC_ED_SMSGLEN, EM_LIMITTEXT, 3, 0);

+			SendDlgItemMessage(hwndDlg, IDC_UD_SMSGLEN, UDM_SETRANGE, 0, MAKELONG(999, 1));

+

+			CheckDlgButton(hwndDlg, IDC_ONCONNECT, opt.PSMsgOnConnect);

+			CheckDlgButton(hwndDlg, IDC_CHK_CUTSMSG, opt.PSMsgTruncate);

+			SetDlgItemInt(hwndDlg, IDC_ED_SMSGLEN, opt.PSMsgLen, FALSE);

+

+			// Templates

+			CheckDlgButton(hwndDlg, IDC_CHK_NEWSMSG, templates.PopupSMsgFlags & NOTIFY_NEW_MESSAGE ? 1 : 0);

+			CheckDlgButton(hwndDlg, IDC_CHK_SMSGREMOVE, templates.PopupSMsgFlags & NOTIFY_REMOVE_MESSAGE ? 1 : 0);

+

+			EnableWindow(GetDlgItem(hwndDlg, IDC_ED_TNEWSMSG), templates.PopupSMsgFlags & NOTIFY_NEW_MESSAGE);

+			EnableWindow(GetDlgItem(hwndDlg, IDC_ED_TSMSGREMOVE), templates.PopupSMsgFlags & NOTIFY_REMOVE_MESSAGE);

 

 			// Buttons

 			SendDlgItemMessage(hwndDlg, IDC_BT_VARIABLES, BUTTONADDTOOLTIP, (WPARAM)TranslateT("Show available variables"), BATF_TCHAR);

@@ -721,7 +701,7 @@ INT_PTR CALLBACK DlgProcSMPopupOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
 			SendMessage(hList, LVM_SETEXTENDEDLISTVIEWSTYLE, 0, LVS_EX_FULLROWSELECT | LVS_EX_CHECKBOXES);

 			LVCOLUMN lvCol = {0};

 			lvCol.mask = LVCF_WIDTH | LVCF_TEXT;

-			lvCol.pszText=TranslateT("Protocol");

+			lvCol.pszText = TranslateT("Protocol");

 			lvCol.cx = 118;

 			ListView_InsertColumn(hList, 0, &lvCol);

 			// fill the list

@@ -734,7 +714,7 @@ INT_PTR CALLBACK DlgProcSMPopupOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
 			PROTOACCOUNT** protos;

 			ProtoEnumAccounts(&count, &protos);

 

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

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

 				if (!IsSuitableProto(protos[i]))

 					continue;

 

@@ -744,15 +724,24 @@ INT_PTR CALLBACK DlgProcSMPopupOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
 				PROTOTEMPLATE *prototemplate = (PROTOTEMPLATE *)mir_alloc(sizeof(PROTOTEMPLATE));

 				prototemplate->ProtoName = protos[i]->tszAccountName;

 				TCHAR protoname[MAX_PATH] = {0};

-				mir_sntprintf(protoname, SIZEOF(protoname), _T("%s_TSMChange"), protos[i]->tszAccountName);

+				mir_sntprintf(protoname, SIZEOF(protoname), _T("%s_TPopupSMsgChanged"), protos[i]->tszAccountName);

 				char *szprotoname = mir_t2a(protoname);

 				DBVARIANT dbVar = {0};

 				db_get_ts(NULL, MODULE, szprotoname, &dbVar);

 				if (lstrcmp(dbVar.ptszVal, NULL) == 0) {

 					db_free(&dbVar);

-					_tcsncpy(prototemplate->ProtoTemplate, TranslateT(DEFAULT_POPUP_STATUSMESSAGE), SIZEOF(prototemplate->ProtoTemplate));

+					_tcsncpy(prototemplate->ProtoTemplateMsg, DEFAULT_POPUP_SMSGCHANGED, SIZEOF(prototemplate->ProtoTemplateMsg));

+				}

+				else _tcsncpy(prototemplate->ProtoTemplateMsg, dbVar.ptszVal, SIZEOF(prototemplate->ProtoTemplateMsg));

+

+				mir_sntprintf(protoname, SIZEOF(protoname), _T("%s_TPopupSMsgRemoved"), protos[i]->tszAccountName);

+				szprotoname = mir_t2a(protoname);

+				db_get_ts(NULL, MODULE, szprotoname, &dbVar);

+				if (lstrcmp(dbVar.ptszVal, NULL) == 0) {

+					db_free(&dbVar);

+					_tcsncpy(prototemplate->ProtoTemplateRemoved, DEFAULT_POPUP_SMSGREMOVED, SIZEOF(prototemplate->ProtoTemplateRemoved));

 				}

-				else _tcsncpy(prototemplate->ProtoTemplate, dbVar.ptszVal, SIZEOF(prototemplate->ProtoTemplate));

+				else _tcsncpy(prototemplate->ProtoTemplateRemoved, dbVar.ptszVal, SIZEOF(prototemplate->ProtoTemplateRemoved));

 

 				mir_free(szprotoname);

 				ListView_InsertItem(hList, &lvItem);

@@ -763,11 +752,13 @@ INT_PTR CALLBACK DlgProcSMPopupOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
 				ListView_SetCheckState(hList, lvItem.iItem, db_get_b(NULL, MODULE, dbSetting, TRUE));

 				lvItem.iItem++;

 			}

+

 			if (lvItem.iItem)

 			{

 				ListView_SetItemState(hList, 0, LVIS_SELECTED | LVIS_FOCUSED, LVIS_SELECTED | LVIS_FOCUSED);

 				PROTOTEMPLATE *prototemplate = ProtoTemplates[0];

-				SetDlgItemText(hwndDlg, IDC_POPUPTEXT, prototemplate->ProtoTemplate);

+				SetDlgItemText(hwndDlg, IDC_ED_TNEWSMSG, prototemplate->ProtoTemplateMsg);

+				SetDlgItemText(hwndDlg, IDC_ED_TSMSGREMOVE, prototemplate->ProtoTemplateRemoved);

 			}

 			UpdateListFlag = FALSE;

 		}

@@ -777,20 +768,33 @@ INT_PTR CALLBACK DlgProcSMPopupOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
 		switch (HIWORD(wParam)) {

 		case BN_CLICKED:

 			switch (LOWORD(wParam)) {

-				case IDC_BT_VARIABLES:

-					MessageBox(hwndDlg, VARIABLES_SM_HELP_TEXT, TranslateT("Variables"), MB_OK | MB_ICONINFORMATION);

-					break;

-

-				case IDC_BT_RESET:

-					if (ResetTemplatesToDefault(hwndDlg) == IDYES) break;

-					else return FALSE;

+			case IDC_CHK_CUTSMSG:

+				EnableWindow(GetDlgItem(hwndDlg, IDC_ED_SMSGLEN), IsDlgButtonChecked(hwndDlg, IDC_CHK_CUTSMSG));

+				break;

+			case IDC_CHK_NEWSMSG:

+				EnableWindow(GetDlgItem(hwndDlg, IDC_ED_TNEWSMSG), IsDlgButtonChecked(hwndDlg, IDC_CHK_NEWSMSG));

+				break;

+			case IDC_CHK_SMSGREMOVE:

+				EnableWindow(GetDlgItem(hwndDlg, IDC_ED_TSMSGREMOVE), IsDlgButtonChecked(hwndDlg, IDC_CHK_SMSGREMOVE));

+				break;

+			case IDC_BT_VARIABLES:

+				MessageBox(hwndDlg, VARIABLES_SM_HELP_TEXT, TranslateT("Variables"), MB_OK | MB_ICONINFORMATION);

+				break;

+			case IDC_BT_RESET:

+				if (MessageBox(hwndDlg,

+					TranslateT("Do you want to reset all templates to default?"),

+					TranslateT("Reset templates"),

+					MB_ICONQUESTION | MB_YESNO) == IDYES)

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

+				else

+					return FALSE;

+				break;

 			}

 

 			if (LOWORD(wParam) != IDC_BT_VARIABLES)

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

 

 			break;

-

 		case EN_CHANGE:

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

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

@@ -799,8 +803,8 @@ INT_PTR CALLBACK DlgProcSMPopupOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
 		return TRUE;

 

 	case WM_NOTIFY:

-		if (((NMHDR*)lParam)->idFrom == IDC_PROTOCOLLIST) {

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

+		if (((NMHDR *)lParam)->idFrom == IDC_PROTOCOLLIST) {

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

 			case LVN_ITEMCHANGED:

 				{

 					NMLISTVIEW *nmlv = (NMLISTVIEW *)lParam;

@@ -810,40 +814,49 @@ INT_PTR CALLBACK DlgProcSMPopupOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
 						PROTOTEMPLATE *prototemplate;

 						if (ListView_GetHotItem(hList) != ListView_GetSelectionMark(hList)) {

 							prototemplate = ProtoTemplates[ListView_GetSelectionMark(hList)];

-							GetDlgItemText(hwndDlg, IDC_POPUPTEXT, prototemplate->ProtoTemplate, MAX_PATH);

+							GetDlgItemText(hwndDlg, IDC_ED_TNEWSMSG, prototemplate->ProtoTemplateMsg, MAX_PATH);

+							GetDlgItemText(hwndDlg, IDC_ED_TSMSGREMOVE, prototemplate->ProtoTemplateRemoved, MAX_PATH);

 							ProtoTemplates.remove(ListView_GetSelectionMark(hList));

 							ProtoTemplates.insert(prototemplate, ListView_GetSelectionMark(hList));

 						}

 

 						LastItem = ListView_GetHotItem(hList);

 						prototemplate = ProtoTemplates[LastItem];

-						SetDlgItemText(hwndDlg, IDC_POPUPTEXT, prototemplate->ProtoTemplate);

+						SetDlgItemText(hwndDlg, IDC_ED_TNEWSMSG, prototemplate->ProtoTemplateMsg);

+						SetDlgItemText(hwndDlg, IDC_ED_TSMSGREMOVE, prototemplate->ProtoTemplateRemoved);

 					}

-					if ((nmlv->uNewState^nmlv->uOldState)&LVIS_STATEIMAGEMASK && !UpdateListFlag)

+					if ((nmlv->uNewState ^ nmlv->uOldState) & LVIS_STATEIMAGEMASK && !UpdateListFlag)

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

 				}

 				break;

 			}

 		}

 

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

-			opt.PopupOnConnect = IsDlgButtonChecked(hwndDlg, IDC_ONCONNECT);

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

+			opt.PSMsgOnConnect = IsDlgButtonChecked(hwndDlg, IDC_ONCONNECT);

+			opt.PSMsgTruncate = IsDlgButtonChecked(hwndDlg, IDC_CHK_CUTSMSG);

+			opt.PSMsgLen = GetDlgItemInt(hwndDlg, IDC_ED_SMSGLEN, 0, FALSE);

+

+			templates.PopupSMsgFlags = 0;

+			templates.PopupSMsgFlags |= (IsDlgButtonChecked(hwndDlg, IDC_CHK_NEWSMSG) ? NOTIFY_NEW_MESSAGE : 0) |

+										(IsDlgButtonChecked(hwndDlg, IDC_CHK_SMSGREMOVE) ? NOTIFY_REMOVE_MESSAGE : 0);

 

 			// Templates

 			PROTOTEMPLATE *prototemplate = ProtoTemplates[LastItem];

-			GetDlgItemText(hwndDlg, IDC_POPUPTEXT, prototemplate->ProtoTemplate, MAX_PATH);

+			GetDlgItemText(hwndDlg, IDC_ED_TNEWSMSG, prototemplate->ProtoTemplateMsg, MAX_PATH);

+			GetDlgItemText(hwndDlg, IDC_ED_TSMSGREMOVE, prototemplate->ProtoTemplateRemoved, MAX_PATH);

 			ProtoTemplates.remove(LastItem);

 			ProtoTemplates.insert(prototemplate, LastItem);

 

 			// Save options to db

 			SaveOptions();

 			SaveTemplates();

-			HWND hList = GetDlgItem(hwndDlg,IDC_PROTOCOLLIST);

+			HWND hList = GetDlgItem(hwndDlg, IDC_PROTOCOLLIST);

 			LVITEM lvItem = {0};

-			lvItem.mask=LVIF_PARAM;

-			for (int i=0;i<ListView_GetItemCount(hList);i++) {

-				lvItem.iItem=i;

-				lvItem.iSubItem=0;

+			lvItem.mask = LVIF_PARAM;

+			for (int i = 0; i < ListView_GetItemCount(hList); i++) {

+				lvItem.iItem = i;

+				lvItem.iSubItem = 0;

 				ListView_GetItem(hList, &lvItem);

 

 				char dbSetting[128];

@@ -853,6 +866,17 @@ INT_PTR CALLBACK DlgProcSMPopupOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
 		}

 

 		return TRUE;

+	case WM_USER + 1:

+		SetDlgItemText(hwndDlg, IDC_ED_TNEWSMSG, DEFAULT_POPUP_SMSGCHANGED);

+		SetDlgItemText(hwndDlg, IDC_ED_TSMSGREMOVE, DEFAULT_POPUP_SMSGREMOVED);

+

+		CheckDlgButton(hwndDlg, IDC_CHK_NEWSMSG, 1);

+		CheckDlgButton(hwndDlg, IDC_CHK_SMSGREMOVE, 1);

+

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

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

+

+		return TRUE;

 

 	case WM_DESTROY:

 		ProtoTemplates.destroy();

@@ -862,55 +886,31 @@ INT_PTR CALLBACK DlgProcSMPopupOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
 	return FALSE;

 }

 

-void EnableLogControls(HWND hwndDlg, BOOL state)

-{

-	EnableWindow(GetDlgItem(hwndDlg, IDC_CHK_SAVETOHISTORY), state);

-	EnableWindow(GetDlgItem(hwndDlg, IDC_CHK_PREVENTIDENTICAL), state);

-	EnableWindow(GetDlgItem(hwndDlg, IDC_CHK_DISABLEMUSIC), state);

-	EnableWindow(GetDlgItem(hwndDlg, IDC_CHK_CUTMSG), state);

-	EnableWindow(GetDlgItem(hwndDlg, IDC_ED_MSGLEN), state & IsDlgButtonChecked(hwndDlg, IDC_CHK_CUTMSG));

-	EnableWindow(GetDlgItem(hwndDlg, IDC_CHK_XSTATUSCHANGE), state);

-	EnableWindow(GetDlgItem(hwndDlg, IDC_CHK_MSGCHANGE), state);

-	EnableWindow(GetDlgItem(hwndDlg, IDC_CHK_REMOVE), state);

-	EnableWindow(GetDlgItem(hwndDlg, IDC_CHK_OPENING), state);

-	EnableWindow(GetDlgItem(hwndDlg, IDC_ED_TDELIMITER), state);

-	EnableWindow(GetDlgItem(hwndDlg, IDC_ED_TCHANGE), state & IsDlgButtonChecked(hwndDlg, IDC_CHK_XSTATUSCHANGE));

-	EnableWindow(GetDlgItem(hwndDlg, IDC_ED_TCHANGEMSG), state & IsDlgButtonChecked(hwndDlg, IDC_CHK_MSGCHANGE));

-	EnableWindow(GetDlgItem(hwndDlg, IDC_ED_TREMOVE), state & IsDlgButtonChecked(hwndDlg, IDC_CHK_REMOVE));

-	EnableWindow(GetDlgItem(hwndDlg, IDC_ED_TOPENING), state & IsDlgButtonChecked(hwndDlg, IDC_CHK_OPENING));

-	EnableWindow(GetDlgItem(hwndDlg, IDC_BT_VARIABLES), state);

-	EnableWindow(GetDlgItem(hwndDlg, IDC_BT_RESET), state);

-}

-

 INT_PTR CALLBACK DlgProcXLogOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)

 {

-	switch (msg)

-	{

-		case WM_INITDIALOG:

+	switch (msg) {

+	case WM_INITDIALOG:

 		{

 			TranslateDialogDefault(hwndDlg);

 

-			CheckDlgButton(hwndDlg, IDC_CHK_LOGGING, opt.EnableLogging);

-			CheckDlgButton(hwndDlg, IDC_CHK_SAVETOHISTORY, opt.KeepInHistory);

-			CheckDlgButton(hwndDlg, IDC_CHK_PREVENTIDENTICAL, opt.PreventIdentical);

-			CheckDlgButton(hwndDlg, IDC_CHK_DISABLEMUSIC, opt.LDisableForMusic);

-			CheckDlgButton(hwndDlg, IDC_CHK_CUTMSG, opt.LTruncateMsg);

-

-			SendDlgItemMessage(hwndDlg, IDC_ED_MSGLEN, EM_LIMITTEXT, 3, 0);

-			SendDlgItemMessage(hwndDlg, IDC_UD_MSGLEN, UDM_SETRANGE, 0, MAKELONG(999, 1));

-			SetDlgItemInt(hwndDlg, IDC_ED_MSGLEN, opt.LMsgLen, FALSE);

+			CheckDlgButton(hwndDlg, IDC_XLOGTOFILE, opt.XLogToFile);

+			CheckDlgButton(hwndDlg, IDC_XLOGTODB, opt.XLogToDB);

+			CheckDlgButton(hwndDlg, IDC_XLOGTODB_WINOPEN, opt.XLogToDB_WinOpen);

+			CheckDlgButton(hwndDlg, IDC_XLOGTODB_REMOVE, opt.XLogToDB_Remove);

+			CheckDlgButton(hwndDlg, IDC_CHK_DISABLEMUSIC, opt.XLogDisableForMusic);

 

 			//Templates

-			CheckDlgButton(hwndDlg, IDC_CHK_XSTATUSCHANGE, (templates.LogFlags & NOTIFY_NEW_XSTATUS) ? 1 : 0);

-			CheckDlgButton(hwndDlg, IDC_CHK_MSGCHANGE, (templates.LogFlags & NOTIFY_NEW_MESSAGE) ? 1 : 0);

-			CheckDlgButton(hwndDlg, IDC_CHK_REMOVE, (templates.LogFlags & NOTIFY_REMOVE) ? 1 : 0);

-			CheckDlgButton(hwndDlg, IDC_CHK_OPENING, (templates.LogFlags & NOTIFY_OPENING_ML) ? 1 : 0);

-

-			SetDlgItemText(hwndDlg, IDC_ED_TDELIMITER, templates.LogDelimiter);

-			SetDlgItemText(hwndDlg, IDC_ED_TCHANGE, templates.LogNewXstatus);

-			SetDlgItemText(hwndDlg, IDC_ED_TCHANGEMSG, templates.LogNewMsg);

-			SetDlgItemText(hwndDlg, IDC_ED_TREMOVE, templates.LogRemove);

-			SetDlgItemText(hwndDlg, IDC_ED_TOPENING, templates.LogOpening);

+			CheckDlgButton(hwndDlg, IDC_CHK_XSTATUSCHANGED, (templates.LogXFlags & NOTIFY_NEW_XSTATUS) ? 1 : 0);

+			CheckDlgButton(hwndDlg, IDC_CHK_XSTATUSREMOVED, (templates.LogXFlags & NOTIFY_REMOVE_XSTATUS) ? 1 : 0);

+			CheckDlgButton(hwndDlg, IDC_CHK_MSGCHANGED, (templates.LogXFlags & NOTIFY_NEW_MESSAGE) ? 1 : 0);

+			CheckDlgButton(hwndDlg, IDC_CHK_MSGREMOVED, (templates.LogXFlags & NOTIFY_REMOVE_MESSAGE) ? 1 : 0);

+			CheckDlgButton(hwndDlg, IDC_CHK_XSTATUSOPENING, (templates.LogXFlags & NOTIFY_OPENING_ML) ? 1 : 0);

+

+			SetDlgItemText(hwndDlg, IDC_ED_TXSTATUSCHANGED, templates.LogXstatusChanged);

+			SetDlgItemText(hwndDlg, IDC_ED_TXSTATUSREMOVED, templates.LogXstatusRemoved);

+			SetDlgItemText(hwndDlg, IDC_ED_TMSGCHANGED, templates.LogXMsgChanged);

+			SetDlgItemText(hwndDlg, IDC_ED_TMSGREMOVED, templates.LogXMsgRemoved);

+			SetDlgItemText(hwndDlg, IDC_ED_TXSTATUSOPENING, templates.LogXstatusOpening);

 

 			// Buttons

 			SendDlgItemMessage(hwndDlg, IDC_BT_VARIABLES, BUTTONADDTOOLTIP, (WPARAM)TranslateT("Show available variables"), BATF_TCHAR);

@@ -923,98 +923,296 @@ INT_PTR CALLBACK DlgProcXLogOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l
 			SendDlgItemMessage(hwndDlg, IDC_BT_RESET, BM_SETIMAGE, IMAGE_ICON, (LPARAM)hIcon);

 			DestroyIcon(hIcon);

 

-			EnableLogControls(hwndDlg, opt.EnableLogging);

+			SendMessage(hwndDlg, WM_USER + 2, (WPARAM)opt.XLogToFile || opt.XLogToDB, 0);

 

 			return TRUE;

 		}

-		case WM_COMMAND:

+	case WM_COMMAND:

 		{

-			switch (HIWORD(wParam))

-			{

-				case BN_CLICKED:

-				{

-					switch (LOWORD(wParam))

-					{

-						case IDC_CHK_LOGGING:

-							EnableLogControls(hwndDlg, IsDlgButtonChecked(hwndDlg, IDC_CHK_LOGGING) ? TRUE : FALSE);

-							break;

-						case IDC_CHK_CUTMSG:

-							EnableWindow(GetDlgItem(hwndDlg, IDC_ED_MSGLEN), IsDlgButtonChecked(hwndDlg, IDC_CHK_CUTMSG));

-							break;

-						case IDC_CHK_XSTATUSCHANGE:

-							EnableWindow(GetDlgItem(hwndDlg, IDC_ED_TCHANGE), IsDlgButtonChecked(hwndDlg, IDC_CHK_XSTATUSCHANGE));

-							break;

-						case IDC_CHK_MSGCHANGE:

-							EnableWindow(GetDlgItem(hwndDlg, IDC_ED_TCHANGEMSG), IsDlgButtonChecked(hwndDlg, IDC_CHK_MSGCHANGE));

-							break;

-						case IDC_CHK_REMOVE:

-							EnableWindow(GetDlgItem(hwndDlg, IDC_ED_TREMOVE), IsDlgButtonChecked(hwndDlg, IDC_CHK_REMOVE));

-							break;

-						case IDC_CHK_OPENING:

-							EnableWindow(GetDlgItem(hwndDlg, IDC_ED_TOPENING), IsDlgButtonChecked(hwndDlg, IDC_CHK_OPENING));

-							break;

-						case IDC_BT_VARIABLES:

-							MessageBox(hwndDlg, VARIABLES_HELP_TEXT, TranslateT("Variables"), MB_OK | MB_ICONINFORMATION);

-							break;

-						case IDC_BT_RESET:

-							if (ResetTemplatesToDefault(hwndDlg) == IDYES)

-							{

-								SetDlgItemText(hwndDlg, IDC_ED_TOPENING, DEFAULT_LOG_OPENING);

-								CheckDlgButton(hwndDlg, IDC_CHK_OPENING, 1);

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

-							}

-							else

-							{

-								return FALSE;

-							}

+			switch (HIWORD(wParam)) {

+			case BN_CLICKED:

+				switch (LOWORD(wParam)) {

+				case IDC_XLOGTOFILE:

+				case IDC_XLOGTODB:

+					SendMessage(hwndDlg, WM_USER + 2, (WPARAM)IsDlgButtonChecked(hwndDlg, IDC_XLOGTOFILE) || IsDlgButtonChecked(hwndDlg, IDC_XLOGTODB), 0);

+					break;

+				case IDC_XLOGTODB_WINOPEN:

+					EnableWindow(GetDlgItem(hwndDlg, IDC_XLOGTODB_REMOVE), IsDlgButtonChecked(hwndDlg, IDC_XLOGTODB_WINOPEN));

+					break;

+					case IDC_CHK_XSTATUSCHANGED:

+						EnableWindow(GetDlgItem(hwndDlg, IDC_ED_TXSTATUSCHANGED), IsDlgButtonChecked(hwndDlg, IDC_CHK_XSTATUSCHANGED));

+						break;

+					case IDC_CHK_XSTATUSREMOVED:

+						EnableWindow(GetDlgItem(hwndDlg, IDC_ED_TXSTATUSREMOVED), IsDlgButtonChecked(hwndDlg, IDC_CHK_XSTATUSREMOVED));

+						break;

+					case IDC_CHK_MSGCHANGED:

+						EnableWindow(GetDlgItem(hwndDlg, IDC_ED_TMSGCHANGED), IsDlgButtonChecked(hwndDlg, IDC_CHK_MSGCHANGED));

+						break;

+					case IDC_CHK_MSGREMOVED:

+						EnableWindow(GetDlgItem(hwndDlg, IDC_ED_TMSGREMOVED), IsDlgButtonChecked(hwndDlg, IDC_CHK_MSGREMOVED));

+						break;

+					case IDC_CHK_XSTATUSOPENING:

+						EnableWindow(GetDlgItem(hwndDlg, IDC_ED_TXSTATUSOPENING), IsDlgButtonChecked(hwndDlg, IDC_CHK_XSTATUSOPENING));

+						break;

+					case IDC_BT_VARIABLES:

+						MessageBox(hwndDlg, VARIABLES_HELP_TEXT, TranslateT("Variables"), MB_OK | MB_ICONINFORMATION);

+						break;

+				case IDC_BT_RESET:

+					if (MessageBox(hwndDlg,

+						TranslateT("Do you want to reset all templates to default?"),

+						TranslateT("Reset templates"),

+						MB_ICONQUESTION | MB_YESNO) == IDYES)

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

+					else

+						return FALSE;

+					break;

+				}

 

-							break;

-					}

+				if (LOWORD(wParam) != IDC_BT_VARIABLES)

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

 

-					if (LOWORD(wParam) != IDC_BT_VARIABLES)

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

+				break;

 

-					break;

-				}

+			case EN_CHANGE:

+				if ((HWND)lParam == GetFocus())

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

+				break;

+			}

+			return TRUE;

+		}

+	case WM_NOTIFY:

+		{

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

+				opt.XLogToFile = IsDlgButtonChecked(hwndDlg, IDC_XLOGTOFILE);

+				opt.XLogToDB = IsDlgButtonChecked(hwndDlg, IDC_XLOGTODB);

+				opt.XLogToDB_WinOpen = IsDlgButtonChecked(hwndDlg, IDC_XLOGTODB_WINOPEN);

+				opt.XLogToDB_Remove = IsDlgButtonChecked(hwndDlg, IDC_XLOGTODB_REMOVE);

+				opt.XLogDisableForMusic = IsDlgButtonChecked(hwndDlg, IDC_CHK_DISABLEMUSIC);

+

+				templates.LogXFlags = 0;

+				templates.LogXFlags |= (IsDlgButtonChecked(hwndDlg, IDC_CHK_XSTATUSCHANGED) ? NOTIFY_NEW_XSTATUS : 0) |

+										(IsDlgButtonChecked(hwndDlg, IDC_CHK_XSTATUSREMOVED) ? NOTIFY_REMOVE_XSTATUS : 0) |

+										(IsDlgButtonChecked(hwndDlg, IDC_CHK_MSGCHANGED) ? NOTIFY_NEW_MESSAGE : 0) |

+										(IsDlgButtonChecked(hwndDlg, IDC_CHK_MSGREMOVED) ? NOTIFY_REMOVE_MESSAGE : 0) |

+										(IsDlgButtonChecked(hwndDlg, IDC_CHK_XSTATUSOPENING) ? NOTIFY_OPENING_ML : 0);

 

-				case EN_CHANGE:

-				{

-					if ((HWND)lParam == GetFocus())

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

+				// Templates

+				GetDlgItemText(hwndDlg, IDC_ED_TXSTATUSCHANGED, templates.LogXstatusChanged, SIZEOF(templates.LogXstatusChanged));

+				GetDlgItemText(hwndDlg, IDC_ED_TXSTATUSREMOVED, templates.LogXstatusRemoved, SIZEOF(templates.LogXstatusRemoved));

+				GetDlgItemText(hwndDlg, IDC_ED_TMSGCHANGED, templates.LogXMsgChanged, SIZEOF(templates.LogXMsgChanged));

+				GetDlgItemText(hwndDlg, IDC_ED_TMSGREMOVED, templates.LogXMsgRemoved, SIZEOF(templates.LogXMsgRemoved));

+				GetDlgItemText(hwndDlg, IDC_ED_TXSTATUSOPENING, templates.LogXstatusOpening, SIZEOF(templates.LogXstatusOpening));

+

+				SaveOptions();

+				SaveTemplates();

+			}

+			return TRUE;

+		}

+	case WM_USER + 1:

+		CheckDlgButton(hwndDlg, IDC_CHK_XSTATUSCHANGED, 1);

+		CheckDlgButton(hwndDlg, IDC_CHK_XSTATUSREMOVED, 1);

+		CheckDlgButton(hwndDlg, IDC_CHK_MSGCHANGED, 1);

+		CheckDlgButton(hwndDlg, IDC_CHK_MSGREMOVED, 1);

+		CheckDlgButton(hwndDlg, IDC_CHK_XSTATUSOPENING, 1);

+

+		SetDlgItemText(hwndDlg, IDC_ED_TXSTATUSCHANGED, DEFAULT_LOG_CHANGED);

+		SetDlgItemText(hwndDlg, IDC_ED_TXSTATUSREMOVED, DEFAULT_LOG_REMOVED);

+		SetDlgItemText(hwndDlg, IDC_ED_TMSGCHANGED, DEFAULT_LOG_MSGCHANGED);

+		SetDlgItemText(hwndDlg, IDC_ED_TMSGREMOVED, DEFAULT_LOG_MSGREMOVED);

+		SetDlgItemText(hwndDlg, IDC_ED_TXSTATUSOPENING, DEFAULT_LOG_OPENING);

+

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

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

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

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

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

+

+		return TRUE;

+	case WM_USER + 2:

+		EnableWindow(GetDlgItem(hwndDlg, IDC_XLOGTODB_WINOPEN), IsDlgButtonChecked(hwndDlg, IDC_XLOGTODB));

+		EnableWindow(GetDlgItem(hwndDlg, IDC_XLOGTODB_REMOVE), IsDlgButtonChecked(hwndDlg, IDC_XLOGTODB) && IsDlgButtonChecked(hwndDlg, IDC_XLOGTODB_WINOPEN));

+

+		EnableWindow(GetDlgItem(hwndDlg, IDC_CHK_XSTATUSCHANGED), wParam);

+		EnableWindow(GetDlgItem(hwndDlg, IDC_CHK_XSTATUSREMOVED), wParam);

+		EnableWindow(GetDlgItem(hwndDlg, IDC_CHK_MSGCHANGED), wParam);

+		EnableWindow(GetDlgItem(hwndDlg, IDC_CHK_MSGREMOVED), wParam);

+		EnableWindow(GetDlgItem(hwndDlg, IDC_CHK_XSTATUSOPENING), wParam);

+

+		EnableWindow(GetDlgItem(hwndDlg, IDC_ED_TXSTATUSCHANGED), wParam && IsDlgButtonChecked(hwndDlg, IDC_CHK_XSTATUSCHANGED));

+		EnableWindow(GetDlgItem(hwndDlg, IDC_ED_TXSTATUSREMOVED), wParam && IsDlgButtonChecked(hwndDlg, IDC_CHK_XSTATUSREMOVED));

+		EnableWindow(GetDlgItem(hwndDlg, IDC_ED_TMSGCHANGED), wParam && IsDlgButtonChecked(hwndDlg, IDC_CHK_MSGCHANGED));

+		EnableWindow(GetDlgItem(hwndDlg, IDC_ED_TMSGREMOVED), wParam && IsDlgButtonChecked(hwndDlg, IDC_CHK_MSGREMOVED));

+		EnableWindow(GetDlgItem(hwndDlg, IDC_ED_TXSTATUSOPENING), wParam && IsDlgButtonChecked(hwndDlg, IDC_CHK_XSTATUSOPENING));

+

+		EnableWindow(GetDlgItem(hwndDlg, IDC_BT_VARIABLES), wParam);

+		EnableWindow(GetDlgItem(hwndDlg, IDC_BT_RESET), wParam);

+

+		return TRUE;

+	}

+

+	return FALSE;

+}

+

+INT_PTR CALLBACK DlgProcLogOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)

+{

+	switch (msg) {

+	case WM_INITDIALOG:

+		{

+			TranslateDialogDefault(hwndDlg);

+

+			CheckDlgButton(hwndDlg, IDC_LOGTOFILE, opt.LogToFile);

+			CheckDlgButton(hwndDlg, IDC_LOGTODB, opt.LogToDB);

+			CheckDlgButton(hwndDlg, IDC_LOGTODB_WINOPEN, opt.LogToDB_WinOpen);

+			CheckDlgButton(hwndDlg, IDC_LOGTODB_REMOVE, opt.LogToDB_Remove);

+			CheckDlgButton(hwndDlg, IDC_LOGPREVIOUS, opt.LogPrevious);

+			CheckDlgButton(hwndDlg, IDC_SMSGLOGTOFILE, opt.SMsgLogToFile);

+			CheckDlgButton(hwndDlg, IDC_SMSGLOGTODB, opt.SMsgLogToDB);

+			CheckDlgButton(hwndDlg, IDC_SMSGLOGTODB_WINOPEN, opt.SMsgLogToDB_WinOpen);

+			CheckDlgButton(hwndDlg, IDC_SMSGLOGTODB_REMOVE, opt.SMsgLogToDB_Remove);

+

+			//Templates

+			CheckDlgButton(hwndDlg, IDC_LOG_SMSGCHANGED, (templates.LogSMsgFlags & NOTIFY_NEW_MESSAGE) ? 1 : 0);

+			CheckDlgButton(hwndDlg, IDC_LOG_SMSGREMOVED, (templates.LogSMsgFlags & NOTIFY_REMOVE_MESSAGE) ? 1 : 0);

+			CheckDlgButton(hwndDlg, IDC_LOG_SMSGOPENING, (templates.LogSMsgFlags & NOTIFY_OPENING_ML) ? 1 : 0);

+

+			SetDlgItemText(hwndDlg, IDC_LOG_TSMSGCHANGED, templates.LogSMsgChanged);

+			SetDlgItemText(hwndDlg, IDC_LOG_TSMSGREMOVED, templates.LogSMsgRemoved);

+			SetDlgItemText(hwndDlg, IDC_LOG_TSMSGOPENING, templates.LogSMsgOpening);

+

+			// Buttons

+			SendDlgItemMessage(hwndDlg, IDC_BT_VARIABLES, BUTTONADDTOOLTIP, (WPARAM)TranslateT("Show available variables"), BATF_TCHAR);

+			HICON hIcon = LoadIcon(hInst, MAKEINTRESOURCE(IDI_VARIABLES));

+			SendDlgItemMessage(hwndDlg, IDC_BT_VARIABLES, BM_SETIMAGE, IMAGE_ICON, (LPARAM)hIcon);

+			DestroyIcon(hIcon);

+

+			SendDlgItemMessage(hwndDlg, IDC_BT_RESET, BUTTONADDTOOLTIP, (WPARAM)TranslateT("Reset all templates to default"), BATF_TCHAR);

+			hIcon = LoadIcon(hInst, MAKEINTRESOURCE(IDI_RESET));

+			SendDlgItemMessage(hwndDlg, IDC_BT_RESET, BM_SETIMAGE, IMAGE_ICON, (LPARAM)hIcon);

+			DestroyIcon(hIcon);

+

+			SendMessage(hwndDlg, WM_USER + 2, (WPARAM)opt.LogToFile || opt.LogToDB, 0);

+			SendMessage(hwndDlg, WM_USER + 3, (WPARAM)opt.SMsgLogToFile || opt.SMsgLogToDB, 0);

+

+			return TRUE;

+		}

+	case WM_COMMAND:

+		{

+			switch (HIWORD(wParam)) {

+			case BN_CLICKED:

+				switch (LOWORD(wParam)) {

+				case IDC_LOGTOFILE:

+				case IDC_LOGTODB:

+					SendMessage(hwndDlg, WM_USER + 2, (WPARAM)IsDlgButtonChecked(hwndDlg, IDC_LOGTOFILE) || IsDlgButtonChecked(hwndDlg, IDC_LOGTODB), 0);

+					break;

+				case IDC_SMSGLOGTOFILE:

+				case IDC_SMSGLOGTODB:

+					SendMessage(hwndDlg, WM_USER + 3, (WPARAM)IsDlgButtonChecked(hwndDlg, IDC_SMSGLOGTOFILE) || IsDlgButtonChecked(hwndDlg, IDC_SMSGLOGTODB), 0);

+					break;

+				case IDC_LOGTODB_WINOPEN:

+					EnableWindow(GetDlgItem(hwndDlg, IDC_LOGTODB_REMOVE), IsDlgButtonChecked(hwndDlg, IDC_LOGTODB_WINOPEN));

+					break;

+				case IDC_SMSGLOGTODB_WINOPEN:

+					EnableWindow(GetDlgItem(hwndDlg, IDC_SMSGLOGTODB_REMOVE), IsDlgButtonChecked(hwndDlg, IDC_SMSGLOGTODB_WINOPEN));

+					break;

+				case IDC_LOG_SMSGCHANGED:

+					EnableWindow(GetDlgItem(hwndDlg, IDC_LOG_TSMSGCHANGED), IsDlgButtonChecked(hwndDlg, IDC_LOG_SMSGCHANGED));

+					break;

+				case IDC_LOG_SMSGREMOVED:

+					EnableWindow(GetDlgItem(hwndDlg, IDC_LOG_TSMSGREMOVED), IsDlgButtonChecked(hwndDlg, IDC_LOG_SMSGREMOVED));

+					break;

+				case IDC_LOG_SMSGOPENING:

+					EnableWindow(GetDlgItem(hwndDlg, IDC_LOG_TSMSGOPENING), IsDlgButtonChecked(hwndDlg, IDC_LOG_SMSGOPENING));

+					break;

+				case IDC_BT_VARIABLES:

+					MessageBox(hwndDlg, VARIABLES_SM_HELP_TEXT, TranslateT("Variables"), MB_OK | MB_ICONINFORMATION);

+					break;

+				case IDC_BT_RESET:

+					if (MessageBox(hwndDlg,

+						TranslateT("Do you want to reset all templates to default?"),

+						TranslateT("Reset templates"),

+						MB_ICONQUESTION | MB_YESNO) == IDYES)

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

+					else

+						return FALSE;

 					break;

 				}

+

+				if (LOWORD(wParam) != IDC_BT_VARIABLES)

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

+

+				break;

+

+			case EN_CHANGE:

+				if ((HWND)lParam == GetFocus())

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

+				break;

 			}

 			return TRUE;

 		}

-		case WM_NOTIFY:

+	case WM_NOTIFY:

 		{

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

-			{

-				opt.EnableLogging = IsDlgButtonChecked(hwndDlg, IDC_CHK_LOGGING);

-				opt.KeepInHistory = IsDlgButtonChecked(hwndDlg, IDC_CHK_SAVETOHISTORY);

-				opt.PreventIdentical = IsDlgButtonChecked(hwndDlg, IDC_CHK_PREVENTIDENTICAL);

-				opt.LDisableForMusic = IsDlgButtonChecked(hwndDlg, IDC_CHK_DISABLEMUSIC);

-				opt.LTruncateMsg = IsDlgButtonChecked(hwndDlg, IDC_CHK_CUTMSG);

-				opt.LMsgLen = GetDlgItemInt(hwndDlg, IDC_ED_MSGLEN, 0, FALSE);

-

-				templates.LogFlags = 0;

-				templates.LogFlags |= (IsDlgButtonChecked(hwndDlg, IDC_CHK_XSTATUSCHANGE) ? NOTIFY_NEW_XSTATUS : 0) |

-										(IsDlgButtonChecked(hwndDlg, IDC_CHK_MSGCHANGE) ? NOTIFY_NEW_MESSAGE : 0) |

-										(IsDlgButtonChecked(hwndDlg, IDC_CHK_REMOVE) ? NOTIFY_REMOVE : 0) |

-										(IsDlgButtonChecked(hwndDlg, IDC_CHK_OPENING) ? NOTIFY_OPENING_ML : 0);

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

+				opt.LogToFile = IsDlgButtonChecked(hwndDlg, IDC_LOGTOFILE);

+				opt.LogToDB = IsDlgButtonChecked(hwndDlg, IDC_LOGTODB);

+				opt.LogToDB_WinOpen = IsDlgButtonChecked(hwndDlg, IDC_LOGTODB_WINOPEN);

+				opt.LogToDB_Remove = IsDlgButtonChecked(hwndDlg, IDC_LOGTODB_REMOVE);

+				opt.LogPrevious = IsDlgButtonChecked(hwndDlg, IDC_LOGPREVIOUS);

+				opt.SMsgLogToFile = IsDlgButtonChecked(hwndDlg, IDC_SMSGLOGTOFILE);

+				opt.SMsgLogToDB = IsDlgButtonChecked(hwndDlg, IDC_SMSGLOGTODB);

+				opt.SMsgLogToDB_WinOpen = IsDlgButtonChecked(hwndDlg, IDC_SMSGLOGTODB_WINOPEN);

+				opt.SMsgLogToDB_Remove = IsDlgButtonChecked(hwndDlg, IDC_SMSGLOGTODB_REMOVE);

+

+				templates.LogSMsgFlags = 0;

+				templates.LogSMsgFlags |= (IsDlgButtonChecked(hwndDlg, IDC_LOG_SMSGCHANGED) ? NOTIFY_NEW_MESSAGE : 0) |

+										(IsDlgButtonChecked(hwndDlg, IDC_LOG_SMSGREMOVED) ? NOTIFY_REMOVE_MESSAGE : 0) |

+										(IsDlgButtonChecked(hwndDlg, IDC_LOG_SMSGOPENING) ? NOTIFY_OPENING_ML : 0);

 

 				// Templates

-				GetDlgItemText(hwndDlg, IDC_ED_TDELIMITER, templates.LogDelimiter, SIZEOF(templates.LogDelimiter));

-				GetDlgItemText(hwndDlg, IDC_ED_TCHANGE, templates.LogNewXstatus, SIZEOF(templates.LogNewXstatus));

-				GetDlgItemText(hwndDlg, IDC_ED_TCHANGEMSG, templates.LogNewMsg, SIZEOF(templates.LogNewMsg));

-				GetDlgItemText(hwndDlg, IDC_ED_TREMOVE, templates.LogRemove, SIZEOF(templates.LogRemove));

-				GetDlgItemText(hwndDlg, IDC_ED_TOPENING, templates.LogOpening, SIZEOF(templates.LogOpening));

+				GetDlgItemText(hwndDlg, IDC_LOG_TSMSGCHANGED, templates.LogSMsgChanged, SIZEOF(templates.LogSMsgChanged));

+				GetDlgItemText(hwndDlg, IDC_LOG_TSMSGREMOVED, templates.LogSMsgRemoved, SIZEOF(templates.LogSMsgRemoved));

+				GetDlgItemText(hwndDlg, IDC_LOG_TSMSGOPENING, templates.LogSMsgOpening, SIZEOF(templates.LogSMsgOpening));

 

 				SaveOptions();

 				SaveTemplates();

 			}

 			return TRUE;

 		}

+	case WM_USER + 1:

+		CheckDlgButton(hwndDlg, IDC_LOG_SMSGCHANGED, 1);

+		CheckDlgButton(hwndDlg, IDC_LOG_SMSGREMOVED, 1);

+		CheckDlgButton(hwndDlg, IDC_LOG_SMSGOPENING, 1);

+

+		SetDlgItemText(hwndDlg, IDC_LOG_TSMSGCHANGED, DEFAULT_LOG_SMSGCHANGED);

+		SetDlgItemText(hwndDlg, IDC_LOG_TSMSGREMOVED, DEFAULT_LOG_SMSGREMOVED);

+		SetDlgItemText(hwndDlg, IDC_LOG_TSMSGOPENING, DEFAULT_LOG_SMSGOPENING);

+

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

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

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

+

+		return TRUE;

+	case WM_USER + 2:

+		EnableWindow(GetDlgItem(hwndDlg, IDC_LOGTODB_WINOPEN), IsDlgButtonChecked(hwndDlg, IDC_LOGTODB));

+		EnableWindow(GetDlgItem(hwndDlg, IDC_LOGTODB_REMOVE), IsDlgButtonChecked(hwndDlg, IDC_LOGTODB) && IsDlgButtonChecked(hwndDlg, IDC_LOGTODB_WINOPEN));

+		EnableWindow(GetDlgItem(hwndDlg, IDC_LOGPREVIOUS), wParam);

+

+		return TRUE;

+	case WM_USER + 3:

+		EnableWindow(GetDlgItem(hwndDlg, IDC_SMSGLOGTODB_WINOPEN), IsDlgButtonChecked(hwndDlg, IDC_SMSGLOGTODB));

+		EnableWindow(GetDlgItem(hwndDlg, IDC_SMSGLOGTODB_REMOVE), IsDlgButtonChecked(hwndDlg, IDC_SMSGLOGTODB) && IsDlgButtonChecked(hwndDlg, IDC_SMSGLOGTODB_WINOPEN));

+

+		EnableWindow(GetDlgItem(hwndDlg, IDC_LOG_SMSGCHANGED), wParam);

+		EnableWindow(GetDlgItem(hwndDlg, IDC_LOG_SMSGREMOVED), wParam);

+		EnableWindow(GetDlgItem(hwndDlg, IDC_LOG_SMSGOPENING), wParam);

+

+		EnableWindow(GetDlgItem(hwndDlg, IDC_LOG_TSMSGCHANGED), wParam && IsDlgButtonChecked(hwndDlg, IDC_LOG_SMSGCHANGED));

+		EnableWindow(GetDlgItem(hwndDlg, IDC_LOG_TSMSGREMOVED), wParam && IsDlgButtonChecked(hwndDlg, IDC_LOG_SMSGREMOVED));

+		EnableWindow(GetDlgItem(hwndDlg, IDC_LOG_TSMSGOPENING), wParam && IsDlgButtonChecked(hwndDlg, IDC_LOG_SMSGOPENING));

+

+		EnableWindow(GetDlgItem(hwndDlg, IDC_BT_VARIABLES), wParam);

+		EnableWindow(GetDlgItem(hwndDlg, IDC_BT_RESET), wParam);

+

+		return TRUE;

 	}

 

 	return FALSE;

@@ -1033,6 +1231,11 @@ int OptionsInitialize(WPARAM wParam, LPARAM)
 	odp.pfnDlgProc = DlgProcGeneralOpts;

 	Options_AddPage(wParam, &odp);

 

+	odp.pszTab = LPGEN("Logging");

+	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_LOG);

+	odp.pfnDlgProc = DlgProcLogOpts;

+	Options_AddPage(wParam, &odp);

+

 	odp.pszTab = LPGEN("Filtering");

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_FILTERS);

 	odp.pfnDlgProc = DlgProcFiltering;

@@ -1043,7 +1246,7 @@ int OptionsInitialize(WPARAM wParam, LPARAM)
 	odp.pfnDlgProc = DlgProcXLogOpts;

 	Options_AddPage(wParam, &odp);

 

-	if ( ServiceExists(MS_POPUP_ADDPOPUPT)) {

+	if (ServiceExists(MS_POPUP_ADDPOPUPT)) {

 		odp.pszTitle = LPGEN("Status Notify");

 		odp.pszGroup = LPGEN("Popups");

 		odp.pszTab = LPGEN("General");