From c68e738245aa8016899e4ee85619baaa7660c2e9 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Sat, 19 Apr 2025 13:56:21 +0300
Subject: common code went to the core

---
 src/mir_app/src/mir_app.def   | 17 +++++++++--------
 src/mir_app/src/mir_app64.def | 17 +++++++++--------
 src/mir_app/src/srmm_base.cpp | 19 +++++++++++++++++++
 3 files changed, 37 insertions(+), 16 deletions(-)

(limited to 'src/mir_app')

diff --git a/src/mir_app/src/mir_app.def b/src/mir_app/src/mir_app.def
index af9cf10b8c..4bc0d054c2 100644
--- a/src/mir_app/src/mir_app.def
+++ b/src/mir_app/src/mir_app.def
@@ -315,13 +315,15 @@ Chat_UpdateOptions @418 NONAME
 ?OnInitDialog@CSrmmBaseDialog@@MAE_NXZ @423 NONAME
 ?AddLog@CSrmmBaseDialog@@UAEXABULOGINFO@@@Z @425 NONAME
 ?UpdateNickList@CSrmmBaseDialog@@QAEXXZ @426 NONAME
-?onClick_BIU@CSrmmBaseDialog@@IAEXPAVCCtrlButton@@@Z @430 NONAME
-?onClick_BkColor@CSrmmBaseDialog@@IAEXPAVCCtrlButton@@@Z @431 NONAME
-?onClick_Color@CSrmmBaseDialog@@IAEXPAVCCtrlButton@@@Z @432 NONAME
-?RefreshButtonStatus@CSrmmBaseDialog@@IAEXXZ @433 NONAME
-?ProcessHotkeys@CSrmmBaseDialog@@IAE_NH_N00@Z @434 NONAME
-?onClick_History@CSrmmBaseDialog@@IAEXPAVCCtrlButton@@@Z @435 NONAME
-?onClick_ChanMgr@CSrmmBaseDialog@@IAEXPAVCCtrlButton@@@Z @436 NONAME
+?onClick_BIU@CSrmmBaseDialog@@AAEXPAVCCtrlButton@@@Z @427 NONAME
+?onClick_BkColor@CSrmmBaseDialog@@AAEXPAVCCtrlButton@@@Z @428 NONAME
+?onClick_Color@CSrmmBaseDialog@@AAEXPAVCCtrlButton@@@Z @429 NONAME
+?onClick_ChanMgr@CSrmmBaseDialog@@AAEXPAVCCtrlButton@@@Z @430 NONAME
+?onClick_CloseQuote@CSrmmBaseDialog@@AAEXPAVCCtrlButton@@@Z @431 NONAME
+?onClick_Filter@CSrmmBaseDialog@@AAEXPAVCCtrlButton@@@Z @432 NONAME
+?onClick_History@CSrmmBaseDialog@@AAEXPAVCCtrlButton@@@Z @433 NONAME
+?RefreshButtonStatus@CSrmmBaseDialog@@IAEXXZ @436 NONAME
+?ProcessHotkeys@CSrmmBaseDialog@@IAE_NH_N00@Z @437 NONAME
 ?WndProc_Message@CSrmmBaseDialog@@UAEJIIJ@Z @438 NONAME
 ?WndProc_Nicklist@CSrmmBaseDialog@@UAEJIIJ@Z @439 NONAME
 ?onDblClick_List@CSrmmBaseDialog@@IAEXPAVCCtrlListBox@@@Z @440 NONAME
@@ -899,7 +901,6 @@ Clist_GroupSaveExpanded @1003 NONAME
 ?Readonly@Contact@@YGXI_N@Z @1031 NONAME
 ?addButton@CMPluginBase@@QAEPAXPBUBBButton@@@Z @1032 NONAME
 ?SetQuoteEvent@CSrmmBaseDialog@@QAEXI@Z @1033 NONAME
-?onClick_CloseQuote@CSrmmBaseDialog@@IAEXPAVCCtrlButton@@@Z @1034 NONAME
 ?fetch@EventInfo@DB@@QAE_N_N@Z @1035 NONAME
 ?unload@EventInfo@DB@@QAEXXZ @1036 NONAME
 ?isAlertable@EventInfo@DB@@QBE_NXZ @1037 NONAME
diff --git a/src/mir_app/src/mir_app64.def b/src/mir_app/src/mir_app64.def
index 7b0063123a..708b5d4d6c 100644
--- a/src/mir_app/src/mir_app64.def
+++ b/src/mir_app/src/mir_app64.def
@@ -315,13 +315,15 @@ Chat_UpdateOptions @418 NONAME
 ?OnInitDialog@CSrmmBaseDialog@@MEAA_NXZ @423 NONAME
 ?AddLog@CSrmmBaseDialog@@UEAAXAEBULOGINFO@@@Z @425 NONAME
 ?UpdateNickList@CSrmmBaseDialog@@QEAAXXZ @426 NONAME
-?onClick_BIU@CSrmmBaseDialog@@IEAAXPEAVCCtrlButton@@@Z @430 NONAME
-?onClick_BkColor@CSrmmBaseDialog@@IEAAXPEAVCCtrlButton@@@Z @431 NONAME
-?onClick_Color@CSrmmBaseDialog@@IEAAXPEAVCCtrlButton@@@Z @432 NONAME
-?RefreshButtonStatus@CSrmmBaseDialog@@IEAAXXZ @433 NONAME
-?ProcessHotkeys@CSrmmBaseDialog@@IEAA_NH_N00@Z @434 NONAME
-?onClick_History@CSrmmBaseDialog@@IEAAXPEAVCCtrlButton@@@Z @435 NONAME
-?onClick_ChanMgr@CSrmmBaseDialog@@IEAAXPEAVCCtrlButton@@@Z @436 NONAME
+?onClick_BIU@CSrmmBaseDialog@@AEAAXPEAVCCtrlButton@@@Z @427 NONAME
+?onClick_BkColor@CSrmmBaseDialog@@AEAAXPEAVCCtrlButton@@@Z @428 NONAME
+?onClick_ChanMgr@CSrmmBaseDialog@@AEAAXPEAVCCtrlButton@@@Z @429 NONAME
+?onClick_CloseQuote@CSrmmBaseDialog@@AEAAXPEAVCCtrlButton@@@Z @430 NONAME
+?onClick_Color@CSrmmBaseDialog@@AEAAXPEAVCCtrlButton@@@Z @431 NONAME
+?onClick_Filter@CSrmmBaseDialog@@AEAAXPEAVCCtrlButton@@@Z @432 NONAME
+?onClick_History@CSrmmBaseDialog@@AEAAXPEAVCCtrlButton@@@Z @433 NONAME
+?RefreshButtonStatus@CSrmmBaseDialog@@IEAAXXZ @436 NONAME
+?ProcessHotkeys@CSrmmBaseDialog@@IEAA_NH_N00@Z @437 NONAME
 ?WndProc_Message@CSrmmBaseDialog@@UEAA_JI_K_J@Z @438 NONAME
 ?WndProc_Nicklist@CSrmmBaseDialog@@UEAA_JI_K_J@Z @439 NONAME
 ?onDblClick_List@CSrmmBaseDialog@@IEAAXPEAVCCtrlListBox@@@Z @440 NONAME
@@ -899,7 +901,6 @@ Clist_GroupSaveExpanded @1003 NONAME
 ?Readonly@Contact@@YAXI_N@Z @1031 NONAME
 ?addButton@CMPluginBase@@QEAAPEAXPEBUBBButton@@@Z @1032 NONAME
 ?SetQuoteEvent@CSrmmBaseDialog@@QEAAXI@Z @1033 NONAME
-?onClick_CloseQuote@CSrmmBaseDialog@@IEAAXPEAVCCtrlButton@@@Z @1034 NONAME
 ?fetch@EventInfo@DB@@QEAA_N_N@Z @1035 NONAME
 ?unload@EventInfo@DB@@QEAAXXZ @1036 NONAME
 ?isAlertable@EventInfo@DB@@QEBA_NXZ @1037 NONAME
diff --git a/src/mir_app/src/srmm_base.cpp b/src/mir_app/src/srmm_base.cpp
index bca6e49148..9277a662c1 100644
--- a/src/mir_app/src/srmm_base.cpp
+++ b/src/mir_app/src/srmm_base.cpp
@@ -61,6 +61,7 @@ CSrmmBaseDialog::CSrmmBaseDialog(CMPluginBase &pPlugin, int idDialog, MCONTACT h
 	m_btnBkColor.OnClick = Callback(this, &CSrmmBaseDialog::onClick_BkColor);
 	m_btnBold.OnClick = m_btnItalic.OnClick = m_btnUnderline.OnClick = m_btnStrikeout.OnClick = Callback(this, &CSrmmBaseDialog::onClick_BIU);
 
+	m_btnFilter.OnClick = Callback(this, &CSrmmBaseDialog::onClick_Filter);
 	m_btnHistory.OnClick = Callback(this, &CSrmmBaseDialog::onClick_History);
 	m_btnChannelMgr.OnClick = Callback(this, &CSrmmBaseDialog::onClick_ChanMgr);
 
@@ -984,6 +985,24 @@ void CSrmmBaseDialog::onClick_BIU(CCtrlButton *pButton)
 	m_message.SendMsg(EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&cf);
 }
 
+void CSrmmBaseDialog::onClick_Filter(CCtrlButton *pButton)
+{
+	if (!pButton->Enabled())
+		return;
+
+	m_bFilterEnabled = !m_bFilterEnabled;
+	UpdateFilterButton();
+
+	if (m_bFilterEnabled && !g_chatApi.bRightClickFilter)
+		ShowFilterMenu();
+	else {
+		if (m_hwndFilter)
+			SendMessage(m_hwndFilter, WM_CLOSE, 0, 0);
+
+		RedrawLog();
+	}
+}
+
 void CSrmmBaseDialog::onClick_History(CCtrlButton *pButton)
 {
 	if (!pButton->Enabled())
-- 
cgit v1.2.3