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 --- include/m_srmm_int.h | 18 ++++++++++-------- libs/win32/mir_app.lib | Bin 304098 -> 304498 bytes libs/win64/mir_app.lib | Bin 304238 -> 304648 bytes plugins/Scriver/src/msgdialog.cpp | 19 ------------------- plugins/Scriver/src/msgs.h | 2 -- plugins/TabSRMM/src/msgdialog.cpp | 21 --------------------- plugins/TabSRMM/src/msgdlgother.cpp | 3 +-- plugins/TabSRMM/src/msgs.h | 2 -- src/core/stdmsg/src/msgdialog.cpp | 19 ------------------- src/core/stdmsg/src/msgs.h | 2 -- src/mir_app/src/mir_app.def | 17 +++++++++-------- src/mir_app/src/mir_app64.def | 17 +++++++++-------- src/mir_app/src/srmm_base.cpp | 19 +++++++++++++++++++ 13 files changed, 48 insertions(+), 91 deletions(-) diff --git a/include/m_srmm_int.h b/include/m_srmm_int.h index a694a2bce3..bfcce6d31d 100644 --- a/include/m_srmm_int.h +++ b/include/m_srmm_int.h @@ -308,6 +308,15 @@ class MIR_APP_EXPORT CSrmmBaseDialog : public CDlgBase std::vector m_arDisplayedEvents; + void onClick_BIU(CCtrlButton *); + void onClick_Color(CCtrlButton *); + void onClick_BkColor(CCtrlButton *); + + void onClick_Filter(CCtrlButton *); + void onClick_ChanMgr(CCtrlButton *); + void onClick_History(CCtrlButton *); + void onClick_CloseQuote(CCtrlButton *); + protected: CSrmmBaseDialog(CMPluginBase &pPlugin, int idDialog, MCONTACT hContact); @@ -352,14 +361,6 @@ protected: CCtrlButton m_btnBold, m_btnItalic, m_btnUnderline, m_btnStrikeout; CCtrlButton m_btnHistory, m_btnChannelMgr, m_btnNickList, m_btnFilter; - void onClick_BIU(CCtrlButton *); - void onClick_Color(CCtrlButton *); - void onClick_BkColor(CCtrlButton *); - - void onClick_ChanMgr(CCtrlButton *); - void onClick_History(CCtrlButton *); - void onClick_CloseQuote(CCtrlButton *); - void onContextMenu(CContextMenuPos *); void onDblClick_List(CCtrlListBox *); @@ -373,6 +374,7 @@ public: COLORREF m_iFG, m_iBG; CTimer timerFlash, timerType, timerNickList, timerRedraw; + MWindow m_hwndFilter; void ClearLog(); bool IsSuitableEvent(const LOGINFO &lin) const; diff --git a/libs/win32/mir_app.lib b/libs/win32/mir_app.lib index d9ca86c2b9..ce5b668dea 100644 Binary files a/libs/win32/mir_app.lib and b/libs/win32/mir_app.lib differ diff --git a/libs/win64/mir_app.lib b/libs/win64/mir_app.lib index 1cc8ce2e5c..cfdf21d025 100644 Binary files a/libs/win64/mir_app.lib and b/libs/win64/mir_app.lib differ diff --git a/plugins/Scriver/src/msgdialog.cpp b/plugins/Scriver/src/msgdialog.cpp index 81149e2582..8a21ea8ecd 100644 --- a/plugins/Scriver/src/msgdialog.cpp +++ b/plugins/Scriver/src/msgdialog.cpp @@ -75,7 +75,6 @@ CMsgDialog::CMsgDialog(MCONTACT hContact, bool bIncoming) : m_btnQuote.OnClick = Callback(this, &CMsgDialog::onClick_Quote); if (isChat()) { - m_btnFilter.OnClick = Callback(this, &CMsgDialog::onClick_Filter); m_btnNickList.OnClick = Callback(this, &CMsgDialog::onClick_ShowList); m_splitterX.OnChange = Callback(this, &CMsgDialog::onChange_SplitterX); @@ -424,24 +423,6 @@ void CMsgDialog::onClick_ShowList(CCtrlButton *pButton) 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(); - } -} - ///////////////////////////////////////////////////////////////////////////////////////// void CMsgDialog::onChange_SplitterX(CSplitter *pSplitter) diff --git a/plugins/Scriver/src/msgs.h b/plugins/Scriver/src/msgs.h index 1b6e3572d9..caf2a9bffa 100644 --- a/plugins/Scriver/src/msgs.h +++ b/plugins/Scriver/src/msgs.h @@ -111,7 +111,6 @@ public: void onClick_Ok(CCtrlButton *); void onClick_Add(CCtrlButton *); - void onClick_Filter(CCtrlButton *); void onClick_Details(CCtrlButton *); void onClick_Quote(CCtrlButton *); void onClick_UserMenu(CCtrlButton *); @@ -166,7 +165,6 @@ public: } wchar_t *m_wszInitialText; - MWindow m_hwndFilter; void Reattach(HWND hwndContainer); }; 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 *); diff --git a/src/core/stdmsg/src/msgdialog.cpp b/src/core/stdmsg/src/msgdialog.cpp index a7d550fe3a..e76bca86c1 100644 --- a/src/core/stdmsg/src/msgdialog.cpp +++ b/src/core/stdmsg/src/msgdialog.cpp @@ -47,7 +47,6 @@ CMsgDialog::CMsgDialog(CTabbedWindow *pOwner, MCONTACT hContact) : m_iSplitterX = g_Settings.iSplitterX; m_splitterX.OnChange = Callback(this, &CMsgDialog::onSplitterX); - m_btnFilter.OnClick = Callback(this, &CMsgDialog::onClick_Filter); m_btnNickList.OnClick = Callback(this, &CMsgDialog::onClick_NickList); } @@ -263,24 +262,6 @@ void CMsgDialog::OnActivate() SetFocus(m_message.GetHwnd()); } -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(); - } -} - void CMsgDialog::onClick_NickList(CCtrlButton *pButton) { if (!pButton->Enabled() || m_si->iType == GCW_SERVER) diff --git a/src/core/stdmsg/src/msgs.h b/src/core/stdmsg/src/msgs.h index ecfd408996..438d70b1ad 100644 --- a/src/core/stdmsg/src/msgs.h +++ b/src/core/stdmsg/src/msgs.h @@ -101,7 +101,6 @@ public: void onChange_Text(CCtrlEdit *); void onClick_Ok(CCtrlButton *); - void onClick_Filter(CCtrlButton *); void onClick_NickList(CCtrlButton *); void UpdateReadChars(void); @@ -123,7 +122,6 @@ public: bool m_bIsAutoRTL = false; HBITMAP m_avatarPic = 0; wchar_t *m_wszInitialText = 0; - MWindow m_hwndFilter; int GetImageId() const; 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