From 00f5e35c664bd8b2b1b00de3353aa0c3e70f5423 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Thu, 7 Mar 2019 13:00:51 +0300
Subject: duplicate popup icons moved into global skin

---
 plugins/WhoUsesMyFiles/src/resource.h   | 2 --
 plugins/WhoUsesMyFiles/src/stdafx.h     | 1 +
 plugins/WhoUsesMyFiles/src/wumfplug.cpp | 8 ++++----
 3 files changed, 5 insertions(+), 6 deletions(-)

(limited to 'plugins/WhoUsesMyFiles/src')

diff --git a/plugins/WhoUsesMyFiles/src/resource.h b/plugins/WhoUsesMyFiles/src/resource.h
index 31191a9918..54b8a30c84 100644
--- a/plugins/WhoUsesMyFiles/src/resource.h
+++ b/plugins/WhoUsesMyFiles/src/resource.h
@@ -3,8 +3,6 @@
 // Used by ..\res\resource.rc
 //
 #define IDD_OPTIONS                     101
-#define IDI_POPUP                       102
-#define IDI_NOPOPUP                     103
 #define IDI_DRIVE                       106
 #define IDD_CONNLIST                    107
 #define IDC_COLOR_SET                   1000
diff --git a/plugins/WhoUsesMyFiles/src/stdafx.h b/plugins/WhoUsesMyFiles/src/stdafx.h
index 31370ae51b..6a97ddac78 100644
--- a/plugins/WhoUsesMyFiles/src/stdafx.h
+++ b/plugins/WhoUsesMyFiles/src/stdafx.h
@@ -10,6 +10,7 @@
 #include <m_options.h>
 #include <m_langpack.h>
 #include <m_clist.h>
+#include <m_skin.h>
 #include <m_utils.h>
 #include <m_popup.h>
 #include <win2k.h>
diff --git a/plugins/WhoUsesMyFiles/src/wumfplug.cpp b/plugins/WhoUsesMyFiles/src/wumfplug.cpp
index b454001979..d1c15bafac 100644
--- a/plugins/WhoUsesMyFiles/src/wumfplug.cpp
+++ b/plugins/WhoUsesMyFiles/src/wumfplug.cpp
@@ -187,11 +187,11 @@ static INT_PTR WumfMenuCommand(WPARAM, LPARAM)
 {
 	if (WumfOptions.PopupsEnabled == TRUE) {
 		WumfOptions.PopupsEnabled = FALSE;
-		Menu_ModifyItem(hMenuItem, LPGENW("Enable WUMF popups"), LoadIcon(g_plugin.getInst(), MAKEINTRESOURCE(IDI_NOPOPUP)));
+		Menu_ModifyItem(hMenuItem, LPGENW("Enable WUMF popups"), Skin_LoadIcon(SKINICON_OTHER_NOPOPUP));
 	}
 	else {
 		WumfOptions.PopupsEnabled = TRUE;
-		Menu_ModifyItem(hMenuItem, LPGENW("Disable WUMF popups"), LoadIcon(g_plugin.getInst(), MAKEINTRESOURCE(IDI_POPUP)));
+		Menu_ModifyItem(hMenuItem, LPGENW("Disable WUMF popups"), Skin_LoadIcon(SKINICON_OTHER_POPUP));
 	}
 
 	g_plugin.setByte(POPUPS_ENABLED, (BYTE)WumfOptions.PopupsEnabled);
@@ -224,11 +224,11 @@ int CMPlugin::Load()
 	mi.root = g_plugin.addRootMenu(MO_MAIN, LPGENW("Popups"), 1999990000);
 	if (WumfOptions.PopupsEnabled == FALSE) {
 		mi.name.a = LPGEN("Enable WUMF popups");
-		mi.hIcolibItem = LoadIcon(g_plugin.getInst(), MAKEINTRESOURCE(IDI_NOPOPUP));
+		mi.hIcolibItem = Skin_LoadIcon(SKINICON_OTHER_NOPOPUP);
 	}
 	else {
 		mi.name.a = LPGEN("Disable WUMF popups");
-		mi.hIcolibItem = LoadIcon(g_plugin.getInst(), MAKEINTRESOURCE(IDI_POPUP));
+		mi.hIcolibItem = Skin_LoadIcon(SKINICON_OTHER_POPUP);
 	}
 	mi.pszService = MS_WUMF_SWITCHPOPUP;
 	hMenuItem = Menu_AddMainMenuItem(&mi);
-- 
cgit v1.2.3