tabSRMM: code cleaning

6 files changed, 305 insertions, 317 deletions

diff --git a/plugins/TabSRMM/src/msgoptions.cpp b/plugins/TabSRMM/src/msgoptions.cpp
index 86fd0918b4..a017ca3435 100644
--- a/plugins/TabSRMM/src/msgoptions.cpp
+++ b/plugins/TabSRMM/src/msgoptions.cpp
@@ -565,6 +565,289 @@ public:
 

 /////////////////////////////////////////////////////////////////////////////////////////

 

+class CTemplateEditDlg : public CMsgDialog

+{

+	typedef CMsgDialog CSuper;

+

+	BOOL rtl;

+	BOOL changed;           // template in edit field is changed

+	BOOL selchanging;

+	int  inEdit;            // template currently in editor

+	BOOL updateInfo[TMPL_MAX];  // item states...

+

+	TTemplateSet *tSet;

+

+	CCtrlEdit edtText;

+	CCtrlButton btnResetAll, btnSave, btnForget, btnRevert, btnPreview;

+	CCtrlListBox listTemplates;

+	CCtrlHyperlink urlHelp;

+

+public:

+	CTemplateEditDlg(BOOL _rtl, HWND hwndParent) :

+		CSuper(IDD_TEMPLATEEDIT, 0),

+		rtl(_rtl),

+		edtText(this, IDC_EDITTEMPLATE),

+		urlHelp(this, IDC_VARIABLESHELP, "https://wiki.miranda-ng.org/index.php?title=Plugin:TabSRMM/en/Templates"),

+		btnSave(this, IDC_SAVETEMPLATE),

+		btnForget(this, IDC_FORGET),

+		btnRevert(this, IDC_REVERT),

+		btnPreview(this, IDC_UPDATEPREVIEW),

+		btnResetAll(this, IDC_RESETALLTEMPLATES),

+		listTemplates(this, IDC_TEMPLATELIST)

+	{

+		SetParent(hwndParent);

+

+		// set hContact to the first found contact so that we can use the Preview window properly

+		// also, set other parameters needed by the streaming function to display events

+		for (auto &cc : Contacts()) {

+			if (m_szProto = Proto_GetBaseAccountName(m_hContact)) {

+				m_hContact = cc;

+				break;

+			}

+		}

+

+		// empty contact list? create a temportary one, that will be automatically removed 

+		if (m_hContact == 0) {

+			m_hContact = db_add_contact();

+			Proto_AddToContact(m_hContact, m_szProto = META_PROTO);

+			Contact_Hide(m_hContact);

+			Contact_RemoveFromList(m_hContact);

+		}

+

+		m_pContainer = new TContainerData();

+		m_pContainer->LoadOverrideTheme();

+		tSet = rtl ? m_pContainer->m_rtl_templates : m_pContainer->m_ltr_templates;

+

+		listTemplates.OnDblClick = Callback(this, &CTemplateEditDlg::onDblClick_List);

+		listTemplates.OnSelChange = Callback(this, &CTemplateEditDlg::onSelChange_List);

+

+		edtText.OnChange = Callback(this, &CTemplateEditDlg::onChange_Text);

+

+		btnSave.OnClick = Callback(this, &CTemplateEditDlg::onClick_Save);

+		btnForget.OnClick = Callback(this, &CTemplateEditDlg::onClick_Forget);

+		btnRevert.OnClick = Callback(this, &CTemplateEditDlg::onClick_Revert);

+		btnPreview.OnClick = Callback(this, &CTemplateEditDlg::onClick_Preview);

+		btnResetAll.OnClick = Callback(this, &CTemplateEditDlg::onClick_Reset);

+	}

+

+	bool OnInitDialog() override

+	{

+		m_pLog = new CLogWindow(*this);

+

+		m_dwFlags = m_pContainer->m_theme.dwFlags;

+

+		m_cache = CContactCache::getContactCache(m_hContact);

+		m_cache->updateNick();

+		m_cache->updateUIN();

+		m_cache->updateStats(TSessionStats::INIT_TIMER);

+		GetMYUIN();

+

+		edtText.SendMsg(EM_LIMITTEXT, TEMPLATE_LENGTH - 1, 0);

+		SetWindowText(m_hwnd, TranslateT("Template set editor"));

+		Utils::enableDlgControl(m_hwnd, IDC_SAVETEMPLATE, FALSE);

+		Utils::enableDlgControl(m_hwnd, IDC_REVERT, FALSE);

+		Utils::enableDlgControl(m_hwnd, IDC_FORGET, FALSE);

+

+		HWND hwndList = GetDlgItem(m_hwnd, IDC_TEMPLATELIST);

+		for (auto &it : TemplateNames) {

+			int idx = ListBox_AddString(hwndList, TranslateW(_A2T(it)));

+			ListBox_SetItemData(hwndList, idx, idx);

+		}

+		Utils::enableDlgControl(m_hwndParent, IDC_MODIFY, FALSE);

+		Utils::enableDlgControl(m_hwndParent, IDC_RTLMODIFY, FALSE);

+

+		SendDlgItemMessage(m_hwnd, IDC_COLOR1, CPM_SETCOLOUR, 0, M.GetDword("cc1", SRMSGDEFSET_BKGCOLOUR));

+		SendDlgItemMessage(m_hwnd, IDC_COLOR2, CPM_SETCOLOUR, 0, M.GetDword("cc2", SRMSGDEFSET_BKGCOLOUR));

+		SendDlgItemMessage(m_hwnd, IDC_COLOR3, CPM_SETCOLOUR, 0, M.GetDword("cc3", SRMSGDEFSET_BKGCOLOUR));

+		SendDlgItemMessage(m_hwnd, IDC_COLOR4, CPM_SETCOLOUR, 0, M.GetDword("cc4", SRMSGDEFSET_BKGCOLOUR));

+		SendDlgItemMessage(m_hwnd, IDC_COLOR5, CPM_SETCOLOUR, 0, M.GetDword("cc5", SRMSGDEFSET_BKGCOLOUR));

+		edtText.SendMsg(EM_SETREADONLY, TRUE, 0);

+		return true;

+	}

+

+	void OnDestroy() override

+	{

+		Utils::enableDlgControl(m_hwndParent, IDC_MODIFY, TRUE);

+		Utils::enableDlgControl(m_hwndParent, IDC_RTLMODIFY, TRUE);

+

+		delete m_pContainer;

+

+		db_set_dw(0, SRMSGMOD_T, "cc1", SendDlgItemMessage(m_hwnd, IDC_COLOR1, CPM_GETCOLOUR, 0, 0));

+		db_set_dw(0, SRMSGMOD_T, "cc2", SendDlgItemMessage(m_hwnd, IDC_COLOR2, CPM_GETCOLOUR, 0, 0));

+		db_set_dw(0, SRMSGMOD_T, "cc3", SendDlgItemMessage(m_hwnd, IDC_COLOR3, CPM_GETCOLOUR, 0, 0));

+		db_set_dw(0, SRMSGMOD_T, "cc4", SendDlgItemMessage(m_hwnd, IDC_COLOR4, CPM_GETCOLOUR, 0, 0));

+		db_set_dw(0, SRMSGMOD_T, "cc5", SendDlgItemMessage(m_hwnd, IDC_COLOR5, CPM_GETCOLOUR, 0, 0));

+	}

+

+	INT_PTR DlgProc(UINT uMsg, WPARAM wParam, LPARAM lParam) override

+	{

+		if (uMsg == WM_DRAWITEM) {

+			DRAWITEMSTRUCT *dis = (DRAWITEMSTRUCT *)lParam;

+			int iItem = dis->itemData;

+			SetBkMode(dis->hDC, TRANSPARENT);

+			FillRect(dis->hDC, &dis->rcItem, GetSysColorBrush(COLOR_WINDOW));

+			if (dis->itemState & ODS_SELECTED) {

+				if (updateInfo[iItem] == TRUE) {

+					HBRUSH bkg = CreateSolidBrush(RGB(255, 0, 0));

+					HBRUSH oldBkg = (HBRUSH)SelectObject(dis->hDC, bkg);

+					FillRect(dis->hDC, &dis->rcItem, bkg);

+					SelectObject(dis->hDC, oldBkg);

+					DeleteObject(bkg);

+				}

+				else FillRect(dis->hDC, &dis->rcItem, GetSysColorBrush(COLOR_HIGHLIGHT));

+

+				SetTextColor(dis->hDC, GetSysColor(COLOR_HIGHLIGHTTEXT));

+			}

+			else {

+				if (updateInfo[iItem] == TRUE)

+					SetTextColor(dis->hDC, RGB(255, 0, 0));

+				else

+					SetTextColor(dis->hDC, GetSysColor(COLOR_WINDOWTEXT));

+			}

+			char *pszName = Translate(TemplateNames[iItem]);

+			TextOutA(dis->hDC, dis->rcItem.left, dis->rcItem.top, pszName, (int)mir_strlen(pszName));

+		}

+

+		return CSrmmBaseDialog::DlgProc(uMsg, wParam, lParam);

+	}

+

+	void onChange_Text(CCtrlEdit *)

+	{

+		if (!selchanging) {

+			changed = TRUE;

+			updateInfo[inEdit] = TRUE;

+			Utils::enableDlgControl(m_hwnd, IDC_SAVETEMPLATE, TRUE);

+			Utils::enableDlgControl(m_hwnd, IDC_FORGET, TRUE);

+			Utils::enableDlgControl(m_hwnd, IDC_TEMPLATELIST, FALSE);

+			Utils::enableDlgControl(m_hwnd, IDC_REVERT, TRUE);

+		}

+		InvalidateRect(GetDlgItem(m_hwnd, IDC_TEMPLATELIST), nullptr, FALSE);

+	}

+

+	void onClick_Forget(CCtrlButton *)

+	{

+		changed = FALSE;

+		updateInfo[inEdit] = FALSE;

+		selchanging = TRUE;

+		edtText.SetText(tSet->szTemplates[inEdit]);

+		SetFocus(edtText.GetHwnd());

+		InvalidateRect(GetDlgItem(m_hwnd, IDC_TEMPLATELIST), nullptr, FALSE);

+		Utils::enableDlgControl(m_hwnd, IDC_SAVETEMPLATE, FALSE);

+		Utils::enableDlgControl(m_hwnd, IDC_FORGET, FALSE);

+		Utils::enableDlgControl(m_hwnd, IDC_TEMPLATELIST, TRUE);

+		Utils::enableDlgControl(m_hwnd, IDC_REVERT, FALSE);

+		selchanging = FALSE;

+		edtText.SendMsg(EM_SETREADONLY, TRUE, 0);

+	}

+

+	void onClick_Preview(CCtrlButton *)

+	{

+		int iIndex = SendDlgItemMessage(m_hwnd, IDC_TEMPLATELIST, LB_GETCURSEL, 0, 0);

+		wchar_t szTemp[TEMPLATE_LENGTH + 2];

+

+		if (changed) {

+			memcpy(szTemp, tSet->szTemplates[inEdit], (TEMPLATE_LENGTH * sizeof(wchar_t)));

+			edtText.GetText(tSet->szTemplates[inEdit], TEMPLATE_LENGTH);

+		}

+

+		DBEVENTINFO dbei = {};

+		dbei.szModule = m_szProto;

+		dbei.timestamp = time(0);

+		dbei.eventType = (iIndex == 6) ? EVENTTYPE_STATUSCHANGE : EVENTTYPE_MESSAGE;

+		dbei.eventType = (iIndex == 7) ? EVENTTYPE_ERRMSG : dbei.eventType;

+		if (dbei.eventType == EVENTTYPE_ERRMSG)

+			dbei.szModule = (char *)L"Sample error message";

+		dbei.pBlob = (iIndex == 6) ? (BYTE *)"is now offline (was online)" : (BYTE *)"The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog.";

+		dbei.cbBlob = (int)mir_strlen((char *)dbei.pBlob) + 1;

+		dbei.flags = (iIndex == 1 || iIndex == 3 || iIndex == 5) ? DBEF_SENT : 0;

+		dbei.flags |= (rtl ? DBEF_RTL : 0);

+		m_lastEventTime = (iIndex == 4 || iIndex == 5) ? time(0) - 1 : 0;

+		m_iLastEventType = MAKELONG(dbei.flags, dbei.eventType);

+		m_dwFlags = MWF_LOG_ALL;

+		m_dwFlags = (rtl ? m_dwFlags | MWF_LOG_RTL : m_dwFlags & ~MWF_LOG_RTL);

+		m_dwFlags = (iIndex == 0 || iIndex == 1) ? m_dwFlags & ~MWF_LOG_GROUPMODE : m_dwFlags | MWF_LOG_GROUPMODE;

+		mir_snwprintf(m_wszMyNickname, L"My Nickname");

+		m_pLog->Clear();

+		LOG()->LogEvents(0, 1, true, &dbei);

+		if (changed)

+			memcpy(tSet->szTemplates[inEdit], szTemp, TEMPLATE_LENGTH * sizeof(wchar_t));

+	}

+

+	void onClick_Reset(CCtrlButton *)

+	{

+		if (MessageBox(m_hwnd, TranslateT("This will reset the template set to the default built-in templates. Are you sure you want to do this?"),

+			TranslateT("Template set editor"), MB_YESNO | MB_ICONQUESTION) == IDYES) {

+			db_set_b(0, rtl ? RTLTEMPLATES_MODULE : TEMPLATES_MODULE, "setup", 0);

+			LoadDefaultTemplates();

+			MessageBox(m_hwnd,

+				TranslateT("Template set was successfully reset, please close and reopen all message windows. This template editor window will now close."),

+				TranslateT("Template set editor"), MB_OK);

+			Close();

+		}

+	}

+

+	void onClick_Revert(CCtrlButton *)

+	{

+		changed = FALSE;

+		updateInfo[inEdit] = FALSE;

+		selchanging = TRUE;

+		memcpy(tSet->szTemplates[inEdit], LTR_Default.szTemplates[inEdit], sizeof(wchar_t) * TEMPLATE_LENGTH);

+		edtText.SetText(tSet->szTemplates[inEdit]);

+		db_unset(0, rtl ? RTLTEMPLATES_MODULE : TEMPLATES_MODULE, TemplateNames[inEdit]);

+		SetFocus(edtText.GetHwnd());

+		InvalidateRect(GetDlgItem(m_hwnd, IDC_TEMPLATELIST), nullptr, FALSE);

+		selchanging = FALSE;

+		Utils::enableDlgControl(m_hwnd, IDC_SAVETEMPLATE, FALSE);

+		Utils::enableDlgControl(m_hwnd, IDC_REVERT, FALSE);

+		Utils::enableDlgControl(m_hwnd, IDC_FORGET, FALSE);

+		Utils::enableDlgControl(m_hwnd, IDC_TEMPLATELIST, TRUE);

+		edtText.SendMsg(EM_SETREADONLY, TRUE, 0);

+	}

+

+	void onClick_Save(CCtrlButton *)

+	{

+		wchar_t newTemplate[TEMPLATE_LENGTH + 2];

+		edtText.GetText(newTemplate, _countof(newTemplate));

+		memcpy(tSet->szTemplates[inEdit], newTemplate, sizeof(wchar_t) * TEMPLATE_LENGTH);

+		changed = FALSE;

+		updateInfo[inEdit] = FALSE;

+		Utils::enableDlgControl(m_hwnd, IDC_SAVETEMPLATE, FALSE);

+		Utils::enableDlgControl(m_hwnd, IDC_FORGET, FALSE);

+		Utils::enableDlgControl(m_hwnd, IDC_TEMPLATELIST, TRUE);

+		Utils::enableDlgControl(m_hwnd, IDC_REVERT, FALSE);

+		InvalidateRect(GetDlgItem(m_hwnd, IDC_TEMPLATELIST), nullptr, FALSE);

+		db_set_ws(0, rtl ? RTLTEMPLATES_MODULE : TEMPLATES_MODULE, TemplateNames[inEdit], newTemplate);

+		edtText.SendMsg(EM_SETREADONLY, TRUE, 0);

+	}

+

+	void onDblClick_List(CCtrlListBox *)

+	{

+		LRESULT iIndex = SendDlgItemMessage(m_hwnd, IDC_TEMPLATELIST, LB_GETCURSEL, 0, 0);

+		if (iIndex != LB_ERR) {

+			edtText.SetText(tSet->szTemplates[iIndex]);

+			inEdit = iIndex;

+			changed = FALSE;

+			selchanging = FALSE;

+			SetFocus(edtText.GetHwnd());

+			edtText.SendMsg(EM_SETREADONLY, FALSE, 0);

+		}

+	}

+

+	void onSelChange_List(CCtrlListBox *)

+	{

+		LRESULT iIndex = SendDlgItemMessage(m_hwnd, IDC_TEMPLATELIST, LB_GETCURSEL, 0, 0);

+		selchanging = TRUE;

+		if (iIndex != LB_ERR) {

+			edtText.SetText(tSet->szTemplates[iIndex]);

+			inEdit = iIndex;

+			changed = FALSE;

+		}

+		edtText.SendMsg(EM_SETREADONLY, TRUE, 0);

+	}

+};

+

+/////////////////////////////////////////////////////////////////////////////////////////

+

 static UINT __ctrls[] = { IDC_INDENTSPIN, IDC_RINDENTSPIN, IDC_INDENTAMOUNT, IDC_RIGHTINDENT, IDC_MODIFY, IDC_RTLMODIFY };

 

 static TOptionListGroup lvGroupsLog[] =

diff --git a/plugins/TabSRMM/src/msgs.cpp b/plugins/TabSRMM/src/msgs.cpp
index d245b7e032..a01fe9a93a 100644
--- a/plugins/TabSRMM/src/msgs.cpp
+++ b/plugins/TabSRMM/src/msgs.cpp
@@ -37,7 +37,6 @@ HMODULE g_hMsftedit;
 

 static void UnloadIcons();

 

-void LoadDefaultTemplates();

 int OptInitialise(WPARAM wParam, LPARAM lParam);

 void Chat_AddIcons(HINSTANCE);

 

diff --git a/plugins/TabSRMM/src/msgs.h b/plugins/TabSRMM/src/msgs.h
index 31da231d74..8be03332b3 100644
--- a/plugins/TabSRMM/src/msgs.h
+++ b/plugins/TabSRMM/src/msgs.h
@@ -72,21 +72,25 @@
 #define MSGDLGFONTCOUNT 22

 #define CHATFONTCOUNT 19

 

-#define TMPL_MSGIN 0

-#define TMPL_MSGOUT 1

-#define TMPL_GRPSTARTIN 2

-#define TMPL_GRPSTARTOUT 3

-#define TMPL_GRPINNERIN 4

-#define TMPL_GRPINNEROUT 5

-#define TMPL_STATUSCHG 6

-#define TMPL_ERRMSG 7

+enum

+{

+	TMPL_MSGIN = 0,

+	TMPL_MSGOUT,

+	TMPL_GRPSTARTIN,

+	TMPL_GRPSTARTOUT,

+	TMPL_GRPINNERIN,

+	TMPL_GRPINNEROUT,

+	TMPL_STATUSCHG,

+	TMPL_ERRMSG,

+	TMPL_MAX

+};

 

 #define TEMPLATE_LENGTH 150

 #define CUSTOM_COLORS 5

 

 struct TTemplateSet {

 	BOOL valid;             // all templates populated (may still contain crap.. so it's only half-assed safety :)

-	wchar_t szTemplates[TMPL_ERRMSG + 1][TEMPLATE_LENGTH];      // the template strings

+	wchar_t szTemplates[TMPL_MAX][TEMPLATE_LENGTH];      // the template strings

 	char szSetName[20];     // everything in this world needs a name. so does this poor template set.

 };

 

@@ -620,43 +624,6 @@ public:
 	void  UpdateToolbarBG(void);

 };

 

-class CTemplateEditDlg : public CMsgDialog

-{

-	typedef CMsgDialog CSuper;

-

-	BOOL rtl;

-	BOOL changed;           // template in edit field is changed

-	BOOL selchanging;

-	int  inEdit;            // template currently in editor

-	BOOL updateInfo[TMPL_ERRMSG + 1];  // item states...

-

-	TTemplateSet *tSet;

-

-	CCtrlEdit edtText;

-	CCtrlButton btnResetAll, btnSave, btnForget, btnRevert, btnPreview;

-	CCtrlListBox listTemplates;

-	CCtrlHyperlink urlHelp;

-

-public:

-	CTemplateEditDlg(BOOL rtl, HWND hwndParent);

-

-	bool OnInitDialog() override;

-	void OnDestroy() override;

-

-	INT_PTR DlgProc(UINT uMsg, WPARAM wParam, LPARAM lParam) override;

-

-	void onChange_Text(CCtrlEdit*);

-

-	void onClick_Forget(CCtrlButton*);

-	void onClick_Preview(CCtrlButton*);

-	void onClick_Reset(CCtrlButton*);

-	void onClick_Revert(CCtrlButton*);

-	void onClick_Save(CCtrlButton*);

-

-	void onDblClick_List(CCtrlListBox*);

-	void onSelChange_List(CCtrlListBox*);

-};

-

 extern LIST<void> g_arUnreadWindows;

 

 #define MESSAGE_WINDOW_DATA_SIZE offsetof(_MessageWindowData, hdbEventFirst);

diff --git a/plugins/TabSRMM/src/stdafx.h b/plugins/TabSRMM/src/stdafx.h
index 9135106bc1..e6077bc3a4 100644
--- a/plugins/TabSRMM/src/stdafx.h
+++ b/plugins/TabSRMM/src/stdafx.h
@@ -217,18 +217,19 @@ extern CSkinItem SkinItems[];
 extern TContainerData *pFirstContainer, *pLastActiveContainer;

 extern ButtonSet g_ButtonSet;

 extern RECT rcLastStatusBarClick;

-extern TTemplateSet RTL_Active, LTR_Active;

+extern TTemplateSet RTL_Active, LTR_Active, LTR_Default, RTL_Default;

 extern LOGFONTA logfonts[MSGDLGFONTCOUNT + 2];

 extern COLORREF fontcolors[MSGDLGFONTCOUNT + 2];

 extern HINSTANCE hinstance;

 extern BOOL g_bIMGtagButton;

-extern char *TemplateNames[];

+extern char* TemplateNames[TMPL_MAX];

 extern HANDLE hUserPrefsWindowList;

 extern TCpTable cpTable[];

 

 extern pfnDoPopup oldDoPopup, oldLogToFile;

 extern pfnDoTrayIcon oldDoTrayIcon;

 

+void LoadDefaultTemplates();

 int  LoadSendRecvMessageModule(void);

 int  SplitmsgShutdown(void);

 int  Chat_Load(), Chat_Unload();

diff --git a/plugins/TabSRMM/src/templates.cpp b/plugins/TabSRMM/src/templates.cpp
index cb298ecfd2..e1a04f2ace 100644
--- a/plugins/TabSRMM/src/templates.cpp
+++ b/plugins/TabSRMM/src/templates.cpp
@@ -33,7 +33,7 @@
 * cannot be changed and may be used at any time to "revert" to a working layout
 */
 
-char *TemplateNames[] =
+char* TemplateNames[TMPL_MAX] =
 {
 	LPGEN("Message In"),
 	LPGEN("Message Out"),
@@ -82,7 +82,7 @@ TTemplateSet LTR_Active, RTL_Active;
 
 static void LoadTemplatesFrom(TTemplateSet *tSet, MCONTACT hContact, int rtl)
 {
-	for (int i = 0; i <= TMPL_ERRMSG; i++) {
+	for (int i = 0; i < TMPL_MAX; i++) {
 		DBVARIANT dbv = { 0 };
 		if (db_get_ws(hContact, rtl ? RTLTEMPLATES_MODULE : TEMPLATES_MODULE, TemplateNames[i], &dbv))
 			continue;
@@ -98,277 +98,15 @@ void LoadDefaultTemplates()
 	RTL_Active = RTL_Default;
 
 	if (db_get_b(0, RTLTEMPLATES_MODULE, "setup", 0) < 2) {
-		for (int i = 0; i <= TMPL_ERRMSG; i++)
+		for (int i = 0; i < TMPL_MAX; i++)
 			db_set_ws(0, RTLTEMPLATES_MODULE, TemplateNames[i], RTL_Default.szTemplates[i]);
 		db_set_b(0, RTLTEMPLATES_MODULE, "setup", 2);
 	}
 	if (db_get_b(0, TEMPLATES_MODULE, "setup", 0) < 2) {
-		for (int i = 0; i <= TMPL_ERRMSG; i++)
+		for (int i = 0; i < TMPL_MAX; i++)
 			db_set_ws(0, TEMPLATES_MODULE, TemplateNames[i], LTR_Default.szTemplates[i]);
 		db_set_b(0, TEMPLATES_MODULE, "setup", 2);
 	}
 	LoadTemplatesFrom(&LTR_Active, 0, 0);
 	LoadTemplatesFrom(&RTL_Active, 0, 1);
 }
-
-CTemplateEditDlg::CTemplateEditDlg(BOOL _rtl, HWND hwndParent) :
-	CSuper(IDD_TEMPLATEEDIT, 0),
-	rtl(_rtl),
-	edtText(this, IDC_EDITTEMPLATE),
-	urlHelp(this, IDC_VARIABLESHELP, "https://wiki.miranda-ng.org/index.php?title=Plugin:TabSRMM/en/Templates"),
-	btnSave(this, IDC_SAVETEMPLATE),
-	btnForget(this, IDC_FORGET),
-	btnRevert(this, IDC_REVERT),
-	btnPreview(this, IDC_UPDATEPREVIEW),
-	btnResetAll(this, IDC_RESETALLTEMPLATES),
-	listTemplates(this, IDC_TEMPLATELIST)
-{
-	SetParent(hwndParent);
-
-	// set hContact to the first found contact so that we can use the Preview window properly
-	// also, set other parameters needed by the streaming function to display events
-	for (auto &cc : Contacts()) {
-		if (m_szProto = Proto_GetBaseAccountName(m_hContact)) {
-			m_hContact = cc;
-			break;
-		}
-	}
-
-	// empty contact list? create a temportary one, that will be automatically removed 
-	if (m_hContact == 0) {
-		m_hContact = db_add_contact();
-		Proto_AddToContact(m_hContact, m_szProto = META_PROTO);
-		Contact_Hide(m_hContact);
-		Contact_RemoveFromList(m_hContact);
-	}
-
-	m_pContainer = new TContainerData();
-	m_pContainer->LoadOverrideTheme();
-	tSet = rtl ? m_pContainer->m_rtl_templates : m_pContainer->m_ltr_templates;
-
-	listTemplates.OnDblClick = Callback(this, &CTemplateEditDlg::onDblClick_List);
-	listTemplates.OnSelChange = Callback(this, &CTemplateEditDlg::onSelChange_List);
-
-	edtText.OnChange = Callback(this, &CTemplateEditDlg::onChange_Text);
-	
-	btnSave.OnClick = Callback(this, &CTemplateEditDlg::onClick_Save);
-	btnForget.OnClick = Callback(this, &CTemplateEditDlg::onClick_Forget);
-	btnRevert.OnClick = Callback(this, &CTemplateEditDlg::onClick_Revert);
-	btnPreview.OnClick = Callback(this, &CTemplateEditDlg::onClick_Preview);
-	btnResetAll.OnClick = Callback(this, &CTemplateEditDlg::onClick_Reset);
-}
-
-bool CTemplateEditDlg::OnInitDialog()
-{
-	m_pLog = new CLogWindow(*this);
-
-	m_dwFlags = m_pContainer->m_theme.dwFlags;
-
-	m_cache = CContactCache::getContactCache(m_hContact);
-	m_cache->updateNick();
-	m_cache->updateUIN();
-	m_cache->updateStats(TSessionStats::INIT_TIMER);
-	GetMYUIN();
-
-	edtText.SendMsg(EM_LIMITTEXT, TEMPLATE_LENGTH - 1, 0);
-	SetWindowText(m_hwnd, TranslateT("Template set editor"));
-	Utils::enableDlgControl(m_hwnd, IDC_SAVETEMPLATE, FALSE);
-	Utils::enableDlgControl(m_hwnd, IDC_REVERT, FALSE);
-	Utils::enableDlgControl(m_hwnd, IDC_FORGET, FALSE);
-
-	HWND hwndList = GetDlgItem(m_hwnd, IDC_TEMPLATELIST);
-	for (auto &it : TemplateNames) {
-		int idx = ListBox_AddString(hwndList, TranslateW(_A2T(it)));
-		ListBox_SetItemData(hwndList, idx, idx);
-	}
-	Utils::enableDlgControl(m_hwndParent, IDC_MODIFY, FALSE);
-	Utils::enableDlgControl(m_hwndParent, IDC_RTLMODIFY, FALSE);
-
-	SendDlgItemMessage(m_hwnd, IDC_COLOR1, CPM_SETCOLOUR, 0, M.GetDword("cc1", SRMSGDEFSET_BKGCOLOUR));
-	SendDlgItemMessage(m_hwnd, IDC_COLOR2, CPM_SETCOLOUR, 0, M.GetDword("cc2", SRMSGDEFSET_BKGCOLOUR));
-	SendDlgItemMessage(m_hwnd, IDC_COLOR3, CPM_SETCOLOUR, 0, M.GetDword("cc3", SRMSGDEFSET_BKGCOLOUR));
-	SendDlgItemMessage(m_hwnd, IDC_COLOR4, CPM_SETCOLOUR, 0, M.GetDword("cc4", SRMSGDEFSET_BKGCOLOUR));
-	SendDlgItemMessage(m_hwnd, IDC_COLOR5, CPM_SETCOLOUR, 0, M.GetDword("cc5", SRMSGDEFSET_BKGCOLOUR));
-	edtText.SendMsg(EM_SETREADONLY, TRUE, 0);
-	return true;
-}
-
-void CTemplateEditDlg::OnDestroy()
-{
-	Utils::enableDlgControl(m_hwndParent, IDC_MODIFY, TRUE);
-	Utils::enableDlgControl(m_hwndParent, IDC_RTLMODIFY, TRUE);
-
-	delete m_pContainer;
-
-	db_set_dw(0, SRMSGMOD_T, "cc1", SendDlgItemMessage(m_hwnd, IDC_COLOR1, CPM_GETCOLOUR, 0, 0));
-	db_set_dw(0, SRMSGMOD_T, "cc2", SendDlgItemMessage(m_hwnd, IDC_COLOR2, CPM_GETCOLOUR, 0, 0));
-	db_set_dw(0, SRMSGMOD_T, "cc3", SendDlgItemMessage(m_hwnd, IDC_COLOR3, CPM_GETCOLOUR, 0, 0));
-	db_set_dw(0, SRMSGMOD_T, "cc4", SendDlgItemMessage(m_hwnd, IDC_COLOR4, CPM_GETCOLOUR, 0, 0));
-	db_set_dw(0, SRMSGMOD_T, "cc5", SendDlgItemMessage(m_hwnd, IDC_COLOR5, CPM_GETCOLOUR, 0, 0));
-}
-
-void CTemplateEditDlg::onChange_Text(CCtrlEdit*)
-{
-	if (!selchanging) {
-		changed = TRUE;
-		updateInfo[inEdit] = TRUE;
-		Utils::enableDlgControl(m_hwnd, IDC_SAVETEMPLATE, TRUE);
-		Utils::enableDlgControl(m_hwnd, IDC_FORGET, TRUE);
-		Utils::enableDlgControl(m_hwnd, IDC_TEMPLATELIST, FALSE);
-		Utils::enableDlgControl(m_hwnd, IDC_REVERT, TRUE);
-	}
-	InvalidateRect(GetDlgItem(m_hwnd, IDC_TEMPLATELIST), nullptr, FALSE);
-}
-
-void CTemplateEditDlg::onClick_Forget(CCtrlButton*)
-{
-	changed = FALSE;
-	updateInfo[inEdit] = FALSE;
-	selchanging = TRUE;
-	edtText.SetText(tSet->szTemplates[inEdit]);
-	SetFocus(edtText.GetHwnd());
-	InvalidateRect(GetDlgItem(m_hwnd, IDC_TEMPLATELIST), nullptr, FALSE);
-	Utils::enableDlgControl(m_hwnd, IDC_SAVETEMPLATE, FALSE);
-	Utils::enableDlgControl(m_hwnd, IDC_FORGET, FALSE);
-	Utils::enableDlgControl(m_hwnd, IDC_TEMPLATELIST, TRUE);
-	Utils::enableDlgControl(m_hwnd, IDC_REVERT, FALSE);
-	selchanging = FALSE;
-	edtText.SendMsg(EM_SETREADONLY, TRUE, 0);
-}
-
-void CTemplateEditDlg::onClick_Preview(CCtrlButton*)
-{
-	int iIndex = SendDlgItemMessage(m_hwnd, IDC_TEMPLATELIST, LB_GETCURSEL, 0, 0);
-	wchar_t szTemp[TEMPLATE_LENGTH + 2];
-
-	if (changed) {
-		memcpy(szTemp, tSet->szTemplates[inEdit], (TEMPLATE_LENGTH * sizeof(wchar_t)));
-		edtText.GetText(tSet->szTemplates[inEdit], TEMPLATE_LENGTH);
-	}
-
-	DBEVENTINFO dbei = {};
-	dbei.szModule = m_szProto;
-	dbei.timestamp = time(0);
-	dbei.eventType = (iIndex == 6) ? EVENTTYPE_STATUSCHANGE : EVENTTYPE_MESSAGE;
-	dbei.eventType = (iIndex == 7) ? EVENTTYPE_ERRMSG : dbei.eventType;
-	if (dbei.eventType == EVENTTYPE_ERRMSG)
-		dbei.szModule = (char *)L"Sample error message";
-	dbei.pBlob = (iIndex == 6) ? (BYTE *)"is now offline (was online)" : (BYTE *)"The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog.";
-	dbei.cbBlob = (int)mir_strlen((char *)dbei.pBlob) + 1;
-	dbei.flags = (iIndex == 1 || iIndex == 3 || iIndex == 5) ? DBEF_SENT : 0;
-	dbei.flags |= (rtl ? DBEF_RTL : 0);
-	m_lastEventTime = (iIndex == 4 || iIndex == 5) ? time(0) - 1 : 0;
-	m_iLastEventType = MAKELONG(dbei.flags, dbei.eventType);
-	m_dwFlags = MWF_LOG_ALL;
-	m_dwFlags = (rtl ? m_dwFlags | MWF_LOG_RTL : m_dwFlags & ~MWF_LOG_RTL);
-	m_dwFlags = (iIndex == 0 || iIndex == 1) ? m_dwFlags & ~MWF_LOG_GROUPMODE : m_dwFlags | MWF_LOG_GROUPMODE;
-	mir_snwprintf(m_wszMyNickname, L"My Nickname");
-	m_pLog->Clear();
-	LOG()->LogEvents(0, 1, true, &dbei);
-	if (changed)
-		memcpy(tSet->szTemplates[inEdit], szTemp, TEMPLATE_LENGTH * sizeof(wchar_t));
-}
-
-void CTemplateEditDlg::onClick_Reset(CCtrlButton*)
-{
-	if (MessageBox(m_hwnd, TranslateT("This will reset the template set to the default built-in templates. Are you sure you want to do this?"),
-		TranslateT("Template set editor"), MB_YESNO | MB_ICONQUESTION) == IDYES) {
-		db_set_b(0, rtl ? RTLTEMPLATES_MODULE : TEMPLATES_MODULE, "setup", 0);
-		LoadDefaultTemplates();
-		MessageBox(m_hwnd,
-			TranslateT("Template set was successfully reset, please close and reopen all message windows. This template editor window will now close."),
-			TranslateT("Template set editor"), MB_OK);
-		Close();
-	}
-}
-
-void CTemplateEditDlg::onClick_Revert(CCtrlButton*)
-{
-	changed = FALSE;
-	updateInfo[inEdit] = FALSE;
-	selchanging = TRUE;
-	memcpy(tSet->szTemplates[inEdit], LTR_Default.szTemplates[inEdit], sizeof(wchar_t) * TEMPLATE_LENGTH);
-	edtText.SetText(tSet->szTemplates[inEdit]);
-	db_unset(0, rtl ? RTLTEMPLATES_MODULE : TEMPLATES_MODULE, TemplateNames[inEdit]);
-	SetFocus(edtText.GetHwnd());
-	InvalidateRect(GetDlgItem(m_hwnd, IDC_TEMPLATELIST), nullptr, FALSE);
-	selchanging = FALSE;
-	Utils::enableDlgControl(m_hwnd, IDC_SAVETEMPLATE, FALSE);
-	Utils::enableDlgControl(m_hwnd, IDC_REVERT, FALSE);
-	Utils::enableDlgControl(m_hwnd, IDC_FORGET, FALSE);
-	Utils::enableDlgControl(m_hwnd, IDC_TEMPLATELIST, TRUE);
-	edtText.SendMsg(EM_SETREADONLY, TRUE, 0);
-}
-
-void CTemplateEditDlg::onClick_Save(CCtrlButton*)
-{
-	wchar_t newTemplate[TEMPLATE_LENGTH + 2];
-	edtText.GetText(newTemplate, _countof(newTemplate));
-	memcpy(tSet->szTemplates[inEdit], newTemplate, sizeof(wchar_t) * TEMPLATE_LENGTH);
-	changed = FALSE;
-	updateInfo[inEdit] = FALSE;
-	Utils::enableDlgControl(m_hwnd, IDC_SAVETEMPLATE, FALSE);
-	Utils::enableDlgControl(m_hwnd, IDC_FORGET, FALSE);
-	Utils::enableDlgControl(m_hwnd, IDC_TEMPLATELIST, TRUE);
-	Utils::enableDlgControl(m_hwnd, IDC_REVERT, FALSE);
-	InvalidateRect(GetDlgItem(m_hwnd, IDC_TEMPLATELIST), nullptr, FALSE);
-	db_set_ws(0, rtl ? RTLTEMPLATES_MODULE : TEMPLATES_MODULE, TemplateNames[inEdit], newTemplate);
-	edtText.SendMsg(EM_SETREADONLY, TRUE, 0);
-}
-
-void CTemplateEditDlg::onDblClick_List(CCtrlListBox*)
-{
-	LRESULT iIndex = SendDlgItemMessage(m_hwnd, IDC_TEMPLATELIST, LB_GETCURSEL, 0, 0);
-	if (iIndex != LB_ERR) {
-		edtText.SetText(tSet->szTemplates[iIndex]);
-		inEdit = iIndex;
-		changed = FALSE;
-		selchanging = FALSE;
-		SetFocus(edtText.GetHwnd());
-		edtText.SendMsg(EM_SETREADONLY, FALSE, 0);
-	}
-}
-
-void CTemplateEditDlg::onSelChange_List(CCtrlListBox*)
-{
-	LRESULT iIndex = SendDlgItemMessage(m_hwnd, IDC_TEMPLATELIST, LB_GETCURSEL, 0, 0);
-	selchanging = TRUE;
-	if (iIndex != LB_ERR) {
-		edtText.SetText(tSet->szTemplates[iIndex]);
-		inEdit = iIndex;
-		changed = FALSE;
-	}
-	edtText.SendMsg(EM_SETREADONLY, TRUE, 0);
-}
-
-INT_PTR CTemplateEditDlg::DlgProc(UINT uMsg, WPARAM wParam, LPARAM lParam)
-{
-	if (uMsg == WM_DRAWITEM) {
-		DRAWITEMSTRUCT *dis = (DRAWITEMSTRUCT *)lParam;
-		int iItem = dis->itemData;
-		SetBkMode(dis->hDC, TRANSPARENT);
-		FillRect(dis->hDC, &dis->rcItem, GetSysColorBrush(COLOR_WINDOW));
-		if (dis->itemState & ODS_SELECTED) {
-			if (updateInfo[iItem] == TRUE) {
-				HBRUSH bkg = CreateSolidBrush(RGB(255, 0, 0));
-				HBRUSH oldBkg = (HBRUSH)SelectObject(dis->hDC, bkg);
-				FillRect(dis->hDC, &dis->rcItem, bkg);
-				SelectObject(dis->hDC, oldBkg);
-				DeleteObject(bkg);
-			}
-			else FillRect(dis->hDC, &dis->rcItem, GetSysColorBrush(COLOR_HIGHLIGHT));
-
-			SetTextColor(dis->hDC, GetSysColor(COLOR_HIGHLIGHTTEXT));
-		}
-		else {
-			if (updateInfo[iItem] == TRUE)
-				SetTextColor(dis->hDC, RGB(255, 0, 0));
-			else
-				SetTextColor(dis->hDC, GetSysColor(COLOR_WINDOWTEXT));
-		}
-		char *pszName = Translate(TemplateNames[iItem]);
-		TextOutA(dis->hDC, dis->rcItem.left, dis->rcItem.top, pszName, (int)mir_strlen(pszName));
-	}
-
-	return CSrmmBaseDialog::DlgProc(uMsg, wParam, lParam);
-}
diff --git a/plugins/TabSRMM/src/themeio.cpp b/plugins/TabSRMM/src/themeio.cpp
index 168db413fa..5b3b551d1d 100644
--- a/plugins/TabSRMM/src/themeio.cpp
+++ b/plugins/TabSRMM/src/themeio.cpp
@@ -222,7 +222,7 @@ void TSAPI WriteThemeToINI(const wchar_t *szIniFilenameT, CMsgDialog *dat)
 	WritePrivateProfileStringA("Message Log", "VGrid", _itoa(M.GetByte("wantvgrid", 0), szBuf, 10), szIniFilename);

 	WritePrivateProfileStringA("Message Log", "ExtraMicroLF", _itoa(M.GetByte("extramicrolf", 0), szBuf, 10), szIniFilename);

 

-	for (i = 0; i <= TMPL_ERRMSG; i++) {

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

 		T2Utf szLTR((dat == nullptr) ? LTR_Active.szTemplates[i] : dat->m_pContainer->m_ltr_templates->szTemplates[i]);

 		WritePrivateProfileStringA("Templates", TemplateNames[i], szLTR, szIniFilename);

 

@@ -368,7 +368,7 @@ void TSAPI ReadThemeFromINI(const wchar_t *szIniFilenameT, TContainerData *dat,
 

 	if (version >= 3) {

 		if (!noAdvanced && dwFlags & THEME_READ_TEMPLATES) {

-			for (i = 0; i <= TMPL_ERRMSG; i++) {

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

 				wchar_t *decoded = nullptr;

 

 				GetPrivateProfileStringA("Templates", TemplateNames[i], "[undef]", szTemplateBuffer, TEMPLATE_LENGTH * 3, szIniFilename);