From 9c8a88727fbc6fde7798c6af9092458dad793ed7 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Sun, 24 Sep 2023 22:13:27 +0300
Subject: Popup+: code cleaning

---
 plugins/Popup/src/main.cpp      |  1 -
 plugins/Popup/src/srmm_menu.cpp | 39 ++++++++++++---------------------------
 plugins/Popup/src/srmm_menu.h   |  1 -
 3 files changed, 12 insertions(+), 29 deletions(-)

(limited to 'plugins/Popup')

diff --git a/plugins/Popup/src/main.cpp b/plugins/Popup/src/main.cpp
index affb110364..a4be8a5395 100644
--- a/plugins/Popup/src/main.cpp
+++ b/plugins/Popup/src/main.cpp
@@ -413,7 +413,6 @@ int CMPlugin::Unload()
 
 	OptAdv_UnregisterVfx();
 	PopupHistoryUnload();
-	SrmmMenu_Unload();
 
 	UnregisterClass(MAKEINTATOM(g_wndClass.cPopupWnd2), g_plugin.getInst());
 	UnregisterClass(L"PopupEditBox", g_plugin.getInst());
diff --git a/plugins/Popup/src/srmm_menu.cpp b/plugins/Popup/src/srmm_menu.cpp
index ea23d5303a..ce3359302a 100644
--- a/plugins/Popup/src/srmm_menu.cpp
+++ b/plugins/Popup/src/srmm_menu.cpp
@@ -29,8 +29,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 	on current active mode for user.
 	*************************************************************************************/
 
-static MWindowList hDialogsList = nullptr;
-
 static void SrmmMenu_UpdateIcon(MCONTACT hContact)
 {
 	if (!hContact)
@@ -38,26 +36,22 @@ static void SrmmMenu_UpdateIcon(MCONTACT hContact)
 
 	int mode = g_plugin.getByte(hContact, "ShowMode", PU_SHOWMODE_AUTO);
 
-	for (int i = 0; i < 4; i++)
-		Srmm_SetIconFlags(hContact, MODULENAME, i, (i == mode) ? 0 : MBF_HIDDEN);
+	for (int i = 0; i < 3; i++) {
+		uint32_t dwFlags = 0;
+		if (i == 0 && mode == PU_SHOWMODE_BLOCK)
+			dwFlags = MBF_DISABLED;
+		else if (i != mode)
+			dwFlags = MBF_HIDDEN;
+		Srmm_SetIconFlags(hContact, MODULENAME, i, dwFlags);
+	}
 }
 
 static int SrmmMenu_ProcessEvent(WPARAM uType, LPARAM lParam)
 {
 	auto *pDlg = (CSrmmBaseDialog *)lParam;
 
-	if (uType == MSG_WINDOW_EVT_OPEN) {
-		if (!hDialogsList)
-			hDialogsList = WindowList_Create();
-
-		WindowList_Add(hDialogsList, pDlg->GetHwnd(), pDlg->m_hContact);
+	if (uType == MSG_WINDOW_EVT_OPEN)
 		SrmmMenu_UpdateIcon(pDlg->m_hContact);
-	}
-	else if (uType == MSG_WINDOW_EVT_CLOSING) {
-		if (hDialogsList)
-			WindowList_Remove(hDialogsList, pDlg->GetHwnd());
-	}
-
 	return 0;
 }
 
@@ -82,7 +76,7 @@ static int SrmmMenu_ProcessIconClick(WPARAM hContact, LPARAM lParam)
 
 		CheckMenuItem(hMenu, 1 + mode, MF_BYCOMMAND | MF_CHECKED);
 
-		mode = TrackPopupMenu(hMenu, TPM_RETURNCMD, sicd->clickLocation.x, sicd->clickLocation.y, 0, WindowList_Find(hDialogsList, hContact), nullptr);
+		mode = TrackPopupMenu(hMenu, TPM_RETURNCMD, sicd->clickLocation.x, sicd->clickLocation.y, 0, Srmm_FindWindow(hContact), nullptr);
 		if (mode) {
 			g_plugin.setByte(hContact, "ShowMode", mode - 1);
 			SrmmMenu_UpdateIcon(hContact);
@@ -103,7 +97,8 @@ void SrmmMenu_Load()
 
 	sid.dwId = 0;
 	sid.szTooltip.a = LPGEN("Popup Mode: Auto");
-	sid.hIcon = sid.hIconDisabled = Skin_LoadIcon(SKINICON_OTHER_POPUP);
+	sid.hIcon = Skin_LoadIcon(SKINICON_OTHER_POPUP);
+	sid.hIconDisabled = Skin_LoadIcon(SKINICON_OTHER_NOPOPUP);
 	Srmm_AddIcon(&sid, &g_plugin);
 
 	sid.dwId = 1;
@@ -116,16 +111,6 @@ void SrmmMenu_Load()
 	sid.hIcon = sid.hIconDisabled = g_plugin.getIcon(IDI_OPT_FULLSCREEN);
 	Srmm_AddIcon(&sid, &g_plugin);
 
-	sid.dwId = 3;
-	sid.szTooltip.a = LPGEN("Popup Mode: Block contact");
-	sid.hIcon = sid.hIconDisabled = Skin_LoadIcon(SKINICON_OTHER_NOPOPUP);
-	Srmm_AddIcon(&sid, &g_plugin);
-
 	HookEvent(ME_MSG_ICONPRESSED, SrmmMenu_ProcessIconClick);
 	HookEvent(ME_MSG_WINDOWEVENT, SrmmMenu_ProcessEvent);
 }
-
-void SrmmMenu_Unload()
-{
-	WindowList_Destroy(hDialogsList);
-}
diff --git a/plugins/Popup/src/srmm_menu.h b/plugins/Popup/src/srmm_menu.h
index 54c445ed1e..31405bfd14 100644
--- a/plugins/Popup/src/srmm_menu.h
+++ b/plugins/Popup/src/srmm_menu.h
@@ -25,6 +25,5 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #define __srmm_menu_h__
 
 void SrmmMenu_Load();
-void SrmmMenu_Unload();
 
 #endif // __srmm_menu_h__
-- 
cgit v1.2.3