summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/m_chat_int.h1
-rw-r--r--libs/win32/mir_app.libbin113352 -> 114164 bytes
-rw-r--r--libs/win64/mir_app.libbin108878 -> 109710 bytes
-rw-r--r--plugins/Scriver/src/chat_window.cpp7
-rw-r--r--plugins/Scriver/src/msgs.h1
-rw-r--r--plugins/TabSRMM/src/chat_window.cpp14
-rw-r--r--plugins/TabSRMM/src/msgs.h1
-rw-r--r--src/core/stdmsg/src/msgs.cpp4
-rw-r--r--src/mir_app/src/mir_app.def1
-rw-r--r--src/mir_app/src/mir_app64.def1
-rw-r--r--src/mir_app/src/srmm_base.cpp7
11 files changed, 14 insertions, 23 deletions
diff --git a/include/m_chat_int.h b/include/m_chat_int.h
index 5088fc69d5..47200cdc94 100644
--- a/include/m_chat_int.h
+++ b/include/m_chat_int.h
@@ -424,6 +424,7 @@ protected:
void onClick_Color(CCtrlButton*);
void onClick_BkColor(CCtrlButton*);
+ void onClick_ChanMgr(CCtrlButton*);
void onClick_History(CCtrlButton*);
public:
diff --git a/libs/win32/mir_app.lib b/libs/win32/mir_app.lib
index b351ed56b0..9513d41ade 100644
--- a/libs/win32/mir_app.lib
+++ b/libs/win32/mir_app.lib
Binary files differ
diff --git a/libs/win64/mir_app.lib b/libs/win64/mir_app.lib
index df671e8e39..7164b8202d 100644
--- a/libs/win64/mir_app.lib
+++ b/libs/win64/mir_app.lib
Binary files differ
diff --git a/plugins/Scriver/src/chat_window.cpp b/plugins/Scriver/src/chat_window.cpp
index 8bfbe4b327..6c43be27ca 100644
--- a/plugins/Scriver/src/chat_window.cpp
+++ b/plugins/Scriver/src/chat_window.cpp
@@ -759,7 +759,6 @@ CChatRoomDlg::CChatRoomDlg(SESSION_INFO *si)
m_btnOk.OnClick = Callback(this, &CChatRoomDlg::onClick_Ok);
m_btnFilter.OnClick = Callback(this, &CChatRoomDlg::onClick_Filter);
- m_btnChannelMgr.OnClick = Callback(this, &CChatRoomDlg::onClick_ChanMgr);
m_btnNickList.OnClick = Callback(this, &CChatRoomDlg::onClick_ShowList);
m_nickList.OnDblClick = Callback(this, &CChatRoomDlg::onDblClick_List);
@@ -944,12 +943,6 @@ void CChatRoomDlg::onClick_Ok(CCtrlButton *pButton)
SetFocus(m_message.GetHwnd());
}
-void CChatRoomDlg::onClick_ChanMgr(CCtrlButton *pButton)
-{
- if (pButton->Enabled())
- DoEventHook(GC_USER_CHANMGR, nullptr, nullptr, 0);
-}
-
void CChatRoomDlg::onClick_ShowList(CCtrlButton *pButton)
{
if (!pButton->Enabled() || m_si->iType == GCW_SERVER)
diff --git a/plugins/Scriver/src/msgs.h b/plugins/Scriver/src/msgs.h
index 5fba8353a2..d742939075 100644
--- a/plugins/Scriver/src/msgs.h
+++ b/plugins/Scriver/src/msgs.h
@@ -213,7 +213,6 @@ public:
void onClick_Ok(CCtrlButton*);
void onClick_Filter(CCtrlButton*);
- void onClick_ChanMgr(CCtrlButton*);
void onClick_ShowList(CCtrlButton*);
void onDblClick_List(CCtrlListBox*);
diff --git a/plugins/TabSRMM/src/chat_window.cpp b/plugins/TabSRMM/src/chat_window.cpp
index b9e94532df..c44124fda4 100644
--- a/plugins/TabSRMM/src/chat_window.cpp
+++ b/plugins/TabSRMM/src/chat_window.cpp
@@ -1388,7 +1388,6 @@ CChatRoomDlg::CChatRoomDlg(SESSION_INFO *si)
m_btnOk.OnClick = Callback(this, &CChatRoomDlg::onClick_OK);
m_btnFilter.OnClick = Callback(this, &CChatRoomDlg::onClick_Filter);
m_btnNickList.OnClick = Callback(this, &CChatRoomDlg::onClick_ShowNickList);
- m_btnChannelMgr.OnClick = Callback(this, &CChatRoomDlg::onClick_ChanMgr);
m_message.OnChange = Callback(this, &CChatRoomDlg::onChange_Message);
@@ -1602,8 +1601,7 @@ void CChatRoomDlg::onClick_Filter(CCtrlButton *pButton)
}
else m_bFilterEnabled = !m_bFilterEnabled;
- m_btnFilter.SendMsg(BUTTONSETOVERLAYICON,
- (LPARAM)(m_bFilterEnabled ? PluginConfig.g_iconOverlayEnabled : PluginConfig.g_iconOverlayDisabled), 0);
+ m_btnFilter.SendMsg(BUTTONSETOVERLAYICON, (LPARAM)(m_bFilterEnabled ? PluginConfig.g_iconOverlayEnabled : PluginConfig.g_iconOverlayDisabled), 0);
if (m_bFilterEnabled && M.GetByte(CHAT_MODULE, "RightClickFilter", 0) == 0) {
ShowFilterMenu();
@@ -1616,9 +1614,7 @@ void CChatRoomDlg::onClick_Filter(CCtrlButton *pButton)
void CChatRoomDlg::onClick_ShowNickList(CCtrlButton *pButton)
{
- if (!pButton->Enabled())
- return;
- if (m_si->iType == GCW_SERVER)
+ if (!pButton->Enabled() || m_si->iType == GCW_SERVER)
return;
m_bNicklistEnabled = !m_bNicklistEnabled;
@@ -1629,12 +1625,6 @@ void CChatRoomDlg::onClick_ShowNickList(CCtrlButton *pButton)
ScrollToBottom();
}
-void CChatRoomDlg::onClick_ChanMgr(CCtrlButton *pButton)
-{
- if (pButton->Enabled())
- DoEventHook(GC_USER_CHANMGR, nullptr, nullptr, 0);
-}
-
void CChatRoomDlg::onChange_Message(CCtrlEdit*)
{
if (m_pContainer->m_hwndActive == m_hwnd)
diff --git a/plugins/TabSRMM/src/msgs.h b/plugins/TabSRMM/src/msgs.h
index cbd24d1ca3..1bbefadf41 100644
--- a/plugins/TabSRMM/src/msgs.h
+++ b/plugins/TabSRMM/src/msgs.h
@@ -520,7 +520,6 @@ public:
void onClick_OK(CCtrlButton*);
void onClick_Filter(CCtrlButton*);
- void onClick_ChanMgr(CCtrlButton*);
void onClick_ShowNickList(CCtrlButton*);
void onChange_Message(CCtrlEdit*);
diff --git a/src/core/stdmsg/src/msgs.cpp b/src/core/stdmsg/src/msgs.cpp
index 906b0270a4..96e5600d9e 100644
--- a/src/core/stdmsg/src/msgs.cpp
+++ b/src/core/stdmsg/src/msgs.cpp
@@ -352,14 +352,14 @@ int RegisterToolbarIcons(WPARAM, LPARAM)
Srmm_AddButton(&bbd);
bbd.bbbFlags = BBBF_ISCHATBUTTON | BBBF_ISRSIDEBUTTON | BBBF_CREATEBYID;
- bbd.dwButtonID = IDC_CHANMGR;
+ bbd.dwButtonID = IDC_SRMM_CHANMGR;
bbd.dwDefPos = 30;
bbd.hIcon = GetIconHandle("settings");
bbd.pwszText = LPGENW("&Room settings");
bbd.pwszTooltip = LPGENW("Control this room (CTRL+O)");
Srmm_AddButton(&bbd);
- bbd.dwButtonID = IDC_SHOWNICKLIST;
+ bbd.dwButtonID = IDC_SRMM_NICKLIST;
bbd.dwDefPos = 20;
bbd.hIcon = GetIconHandle("nicklist");
bbd.pwszText = LPGENW("&Show/hide nick list");
diff --git a/src/mir_app/src/mir_app.def b/src/mir_app/src/mir_app.def
index 08d7355403..d4f666b55d 100644
--- a/src/mir_app/src/mir_app.def
+++ b/src/mir_app/src/mir_app.def
@@ -431,3 +431,4 @@ Chat_UpdateOptions @418 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
diff --git a/src/mir_app/src/mir_app64.def b/src/mir_app/src/mir_app64.def
index 380bc88347..bfced357d5 100644
--- a/src/mir_app/src/mir_app64.def
+++ b/src/mir_app/src/mir_app64.def
@@ -431,3 +431,4 @@ Chat_UpdateOptions @418 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
diff --git a/src/mir_app/src/srmm_base.cpp b/src/mir_app/src/srmm_base.cpp
index faf40ef1b3..a527c3cbc4 100644
--- a/src/mir_app/src/srmm_base.cpp
+++ b/src/mir_app/src/srmm_base.cpp
@@ -57,6 +57,7 @@ CSrmmBaseDialog::CSrmmBaseDialog(HINSTANCE hInst, int idDialog, SESSION_INFO *si
m_btnBold.OnClick = m_btnItalic.OnClick = m_btnUnderline.OnClick = Callback(this, &CSrmmBaseDialog::onClick_BIU);
m_btnHistory.OnClick = Callback(this, &CSrmmBaseDialog::onClick_History);
+ m_btnChannelMgr.OnClick = Callback(this, &CSrmmBaseDialog::onClick_ChanMgr);
if (si) {
m_hContact = si->hContact;
@@ -331,6 +332,12 @@ void CSrmmBaseDialog::onClick_History(CCtrlButton *pButton)
else CallService(MS_HISTORY_SHOWCONTACTHISTORY, m_hContact, 0);
}
+void CSrmmBaseDialog::onClick_ChanMgr(CCtrlButton *pButton)
+{
+ if (pButton->Enabled())
+ DoEventHook(GC_USER_CHANMGR, nullptr, nullptr, 0);
+}
+
/////////////////////////////////////////////////////////////////////////////////////////
bool CSrmmBaseDialog::ProcessHotkeys(int key, bool isShift, bool isCtrl, bool isAlt)
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-26 08:36:20 +0000