From c68e738245aa8016899e4ee85619baaa7660c2e9 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sat, 19 Apr 2025 13:56:21 +0300 Subject: common code went to the core --- plugins/TabSRMM/src/msgdialog.cpp | 21 --------------------- plugins/TabSRMM/src/msgdlgother.cpp | 3 +-- plugins/TabSRMM/src/msgs.h | 2 -- 3 files changed, 1 insertion(+), 25 deletions(-) (limited to 'plugins/TabSRMM/src') diff --git a/plugins/TabSRMM/src/msgdialog.cpp b/plugins/TabSRMM/src/msgdialog.cpp index 5203733ad4..3689ee7b3d 100644 --- a/plugins/TabSRMM/src/msgdialog.cpp +++ b/plugins/TabSRMM/src/msgdialog.cpp @@ -332,9 +332,7 @@ CMsgDialog::CMsgDialog(int iDlgId, MCONTACT hContact) : m_btnQuote.OnClick = Callback(this, &CMsgDialog::onClick_Quote); if (m_si) { - m_btnFilter.OnClick = Callback(this, &CMsgDialog::onClick_Filter); m_btnNickList.OnClick = Callback(this, &CMsgDialog::onClick_ShowNickList); - m_nickList.OnDblClick = Callback(this, &CMsgDialog::onDblClick_List); } else { @@ -912,25 +910,6 @@ void CMsgDialog::onClick_CancelAdd(CCtrlButton*) Resize(); } -void CMsgDialog::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(); - UpdateTitle(); - } -} - void CMsgDialog::onClick_ShowNickList(CCtrlButton *pButton) { if (!pButton->Enabled() || m_si->iType == GCW_SERVER) diff --git a/plugins/TabSRMM/src/msgdlgother.cpp b/plugins/TabSRMM/src/msgdlgother.cpp index 346c758369..70f3efb37a 100644 --- a/plugins/TabSRMM/src/msgdlgother.cpp +++ b/plugins/TabSRMM/src/msgdlgother.cpp @@ -2365,8 +2365,7 @@ void CMsgDialog::UpdateTitle() switch (m_si->iType) { case GCW_CHATROOM: hIcon = Skin_LoadProtoIcon(m_si->pszModule, (m_wStatus <= ID_STATUS_OFFLINE) ? ID_STATUS_OFFLINE : m_wStatus); - wszTitle.Format((nUsers == 1) ? TranslateT("%s: chat room (%u user%s)") : TranslateT("%s: chat room (%u users%s)"), - szNick, nUsers, m_bFilterEnabled ? TranslateT(", event filter active") : L""); + wszTitle.Format((nUsers == 1) ? TranslateT("%s: chat room (%u user)") : TranslateT("%s: chat room (%u users)"), szNick, nUsers); break; case GCW_PRIVMESS: diff --git a/plugins/TabSRMM/src/msgs.h b/plugins/TabSRMM/src/msgs.h index d2ed22b642..3bb1339ac6 100644 --- a/plugins/TabSRMM/src/msgs.h +++ b/plugins/TabSRMM/src/msgs.h @@ -542,7 +542,6 @@ public: bool TabAutoComplete(); - HWND m_hwndFilter; BOOL m_iSavedSpaces; wchar_t *m_wszSearchQuery, *m_wszSearchResult; SESSION_INFO *m_pLastSession; @@ -557,7 +556,6 @@ public: void onClick_Ok(CCtrlButton *); void onClick_Add(CCtrlButton *); void onClick_Quote(CCtrlButton *); - void onClick_Filter(CCtrlButton *); void onClick_CancelAdd(CCtrlButton *); void onClick_ShowNickList(CCtrlButton *); -- cgit v1.2.3