From 3a1a68b6d509071389da7fdb28010126d1102ebe Mon Sep 17 00:00:00 2001 From: George Hazan Date: Thu, 2 Jun 2022 12:43:04 +0300 Subject: fixes #3082 (NewEventNotify: rename "Disable notification for group chats" to "Enable notification for group chats") --- plugins/NewEventNotify/src/main.cpp | 8 +++++++- plugins/NewEventNotify/src/options.cpp | 6 +----- plugins/NewEventNotify/src/stdafx.h | 3 +-- plugins/TabSRMM/src/chat_tools.cpp | 6 +++--- plugins/TabSRMM/src/eventpopups.cpp | 2 +- plugins/TabSRMM/src/nen.h | 2 +- 6 files changed, 14 insertions(+), 13 deletions(-) (limited to 'plugins') diff --git a/plugins/NewEventNotify/src/main.cpp b/plugins/NewEventNotify/src/main.cpp index 051177106e..60692ec06b 100644 --- a/plugins/NewEventNotify/src/main.cpp +++ b/plugins/NewEventNotify/src/main.cpp @@ -47,7 +47,8 @@ PLUGININFOEX pluginInfoEx = CMPlugin::CMPlugin() : PLUGIN(MODULENAME, pluginInfoEx), - bPopups(MODULENAME, "Popups", true) + bPopups(MODULENAME, "Popups", true), + bMucPopups(MODULENAME, "MucPopups", true) {} ///////////////////////////////////////////////////////////////////////////////////////// @@ -126,6 +127,11 @@ int CMPlugin::Load() delSetting(OPT_DISABLE); } + if (getBool(OPT_MUCDISABLE, false)) { + bMucPopups = false; + delSetting(OPT_MUCDISABLE); + } + HookEvent(ME_SYSTEM_MODULESLOADED, HookedInit); HookEvent(ME_OPT_INITIALISE, OptionsAdd); diff --git a/plugins/NewEventNotify/src/options.cpp b/plugins/NewEventNotify/src/options.cpp index c9f5354ea3..47d1d5d64a 100644 --- a/plugins/NewEventNotify/src/options.cpp +++ b/plugins/NewEventNotify/src/options.cpp @@ -26,8 +26,6 @@ void CMPlugin::OptionsRead(void) { - bMUCDisable = getBool(OPT_MUCDISABLE, false); - bPreview = getBool(OPT_PREVIEW, true); bMergePopup = getBool(OPT_MERGEPOPUP, true); bMsgWindowCheck = getBool(OPT_MSGWINDOWCHECK, true); @@ -72,8 +70,6 @@ void CMPlugin::OptionsRead(void) void CMPlugin::OptionsWrite(void) { - setByte(OPT_MUCDISABLE, bMUCDisable); - setByte(OPT_PREVIEW, bPreview); setByte(OPT_MERGEPOPUP, bMergePopup); setByte(OPT_MSGWINDOWCHECK, bMsgWindowCheck); @@ -208,7 +204,7 @@ public: auto *pwszSection = TranslateT("General options"); m_opts.AddOption(pwszSection, TranslateT("Show preview of event in popup"), g_plugin.bPreview); m_opts.AddOption(pwszSection, TranslateT("Enable event notifications for instant messages"), g_plugin.bPopups); - m_opts.AddOption(pwszSection, TranslateT("Disable event notifications for group chats"), g_plugin.bMUCDisable); + m_opts.AddOption(pwszSection, TranslateT("Enable event notifications for group chats"), g_plugin.bMucPopups); pwszSection = TranslateT("Notify me of..."); m_opts.AddOption(pwszSection, TranslateT("Message"), g_plugin.maskNotify, MASK_MESSAGE); diff --git a/plugins/NewEventNotify/src/stdafx.h b/plugins/NewEventNotify/src/stdafx.h index a83ef4c160..66f3e00283 100644 --- a/plugins/NewEventNotify/src/stdafx.h +++ b/plugins/NewEventNotify/src/stdafx.h @@ -148,9 +148,8 @@ struct CMPlugin : public PLUGIN void OptionsRead(void); void OptionsWrite(void); - CMOption bPopups; + CMOption bPopups, bMucPopups; - bool bMUCDisable; bool bPreview; bool bDisableNonMessage; bool bMsgWindowCheck; diff --git a/plugins/TabSRMM/src/chat_tools.cpp b/plugins/TabSRMM/src/chat_tools.cpp index d65fc14b60..7506931a8e 100644 --- a/plugins/TabSRMM/src/chat_tools.cpp +++ b/plugins/TabSRMM/src/chat_tools.cpp @@ -145,7 +145,7 @@ BOOL DoPopup(SESSION_INFO *si, GCEVENT *gce) } else bbStart = bbEnd = L""; - if (NEN::bMUCDisabled) // no popups at all. Period + if (!NEN::bMucPopups) // no popups at all. Period return 0; // check the status mode against the status mask @@ -224,7 +224,7 @@ BOOL DoSoundsFlashPopupTrayStuff(SESSION_INFO *si, GCEVENT *gce, BOOL bHighlight DoTrayIcon(si, gce); } - if (dat || !NEN::bMUCDisabled) + if (dat || NEN::bMucPopups) if (iMuteMode != CHATMODE_MUTE) DoPopup(si, gce); @@ -254,7 +254,7 @@ BOOL DoSoundsFlashPopupTrayStuff(SESSION_INFO *si, GCEVENT *gce, BOOL bHighlight // stupid thing to not create multiple popups for a QUIT event for instance if (bManyFix == 0) { // do popups - if (dat || !NEN::bMUCDisabled) + if (dat || NEN::bMucPopups) if (iMuteMode != CHATMODE_MUTE) DoPopup(si, gce); diff --git a/plugins/TabSRMM/src/eventpopups.cpp b/plugins/TabSRMM/src/eventpopups.cpp index 6810131760..37731f2f44 100644 --- a/plugins/TabSRMM/src/eventpopups.cpp +++ b/plugins/TabSRMM/src/eventpopups.cpp @@ -39,7 +39,7 @@ CMOption NEN::ActionLeft(NEN_MODULE, "ActionLeft", MASK_OPEN | MASK_DISMISS); CMOption NEN::ActionRight(NEN_MODULE, "ActionRight", MASK_DISMISS); -CMOption NEN::bMUCDisabled(NEN_MODULE, "MUCDisabled", false); +CMOption NEN::bMucPopups(NEN_MODULE, "MucPopups", true); CMOption NEN::bWindowCheck(NEN_MODULE, "WindowCheck", false); CMOption NEN::bNoSounds(NEN_MODULE, "NoSounds", false); CMOption NEN::bNoAutoPopup(NEN_MODULE, "NoAutoPopup", false); diff --git a/plugins/TabSRMM/src/nen.h b/plugins/TabSRMM/src/nen.h index e9889eb66c..bca0b37885 100644 --- a/plugins/TabSRMM/src/nen.h +++ b/plugins/TabSRMM/src/nen.h @@ -52,7 +52,7 @@ namespace NEN { extern CMOption ActionLeft, ActionRight; - extern CMOption bMUCDisabled, bWindowCheck, bNoSounds, bNoAutoPopup, bColDefaultErr; + extern CMOption bMucPopups, bWindowCheck, bNoSounds, bNoAutoPopup, bColDefaultErr; extern CMOption iDelayMsg, iDelayErr; extern CMOption colTextMsg, colBackMsg; -- cgit v1.2.3