From 00f5e35c664bd8b2b1b00de3353aa0c3e70f5423 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Thu, 7 Mar 2019 13:00:51 +0300 Subject: duplicate popup icons moved into global skin --- plugins/WhoUsesMyFiles/res/popup.ico | Bin 1150 -> 0 bytes plugins/WhoUsesMyFiles/res/popup_no.ico | Bin 1150 -> 0 bytes plugins/WhoUsesMyFiles/res/resource.rc | 4 ++-- plugins/WhoUsesMyFiles/src/resource.h | 2 -- plugins/WhoUsesMyFiles/src/stdafx.h | 1 + plugins/WhoUsesMyFiles/src/wumfplug.cpp | 8 ++++---- 6 files changed, 7 insertions(+), 8 deletions(-) delete mode 100644 plugins/WhoUsesMyFiles/res/popup.ico delete mode 100644 plugins/WhoUsesMyFiles/res/popup_no.ico (limited to 'plugins/WhoUsesMyFiles') diff --git a/plugins/WhoUsesMyFiles/res/popup.ico b/plugins/WhoUsesMyFiles/res/popup.ico deleted file mode 100644 index 152171fc56..0000000000 Binary files a/plugins/WhoUsesMyFiles/res/popup.ico and /dev/null differ diff --git a/plugins/WhoUsesMyFiles/res/popup_no.ico b/plugins/WhoUsesMyFiles/res/popup_no.ico deleted file mode 100644 index d86f9c68ac..0000000000 Binary files a/plugins/WhoUsesMyFiles/res/popup_no.ico and /dev/null differ diff --git a/plugins/WhoUsesMyFiles/res/resource.rc b/plugins/WhoUsesMyFiles/res/resource.rc index 6bad043bd4..ae02eca06a 100644 --- a/plugins/WhoUsesMyFiles/res/resource.rc +++ b/plugins/WhoUsesMyFiles/res/resource.rc @@ -132,9 +132,9 @@ END // Icon with lowest ID value placed first to ensure application icon // remains consistent on all systems. -IDI_POPUP ICON "popup.ico" -IDI_NOPOPUP ICON "popup_no.ico" + IDI_DRIVE ICON "drive.ico" + #endif // English (United States) resources ///////////////////////////////////////////////////////////////////////////// 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 #include #include +#include #include #include #include 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