diff options
| author | George Hazan <ghazan@miranda.im> | 2019-03-07 13:00:51 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2019-03-07 13:00:51 +0300 |
| commit | 00f5e35c664bd8b2b1b00de3353aa0c3e70f5423 (patch) | |
| tree | 5766fc5e1bb1886b664e280b65d503a594838883 /plugins/NewEventNotify | |
| parent | e855b0922f15871e8deb07562f3d5c8ba675bf93 (diff) | |
duplicate popup icons moved into global skin
Diffstat (limited to 'plugins/NewEventNotify')
| -rw-r--r-- | plugins/NewEventNotify/res/popup.ico | bin | 1150 -> 0 bytes | |||
| -rw-r--r-- | plugins/NewEventNotify/res/popup_no.ico | bin | 1150 -> 0 bytes | |||
| -rw-r--r-- | plugins/NewEventNotify/res/resource.rc | 9 | ||||
| -rw-r--r-- | plugins/NewEventNotify/src/menuitem.cpp | 6 | ||||
| -rw-r--r-- | plugins/NewEventNotify/src/resource.h | 3 |
5 files changed, 3 insertions, 15 deletions
diff --git a/plugins/NewEventNotify/res/popup.ico b/plugins/NewEventNotify/res/popup.ico Binary files differdeleted file mode 100644 index 152171fc56..0000000000 --- a/plugins/NewEventNotify/res/popup.ico +++ /dev/null diff --git a/plugins/NewEventNotify/res/popup_no.ico b/plugins/NewEventNotify/res/popup_no.ico Binary files differdeleted file mode 100644 index d86f9c68ac..0000000000 --- a/plugins/NewEventNotify/res/popup_no.ico +++ /dev/null diff --git a/plugins/NewEventNotify/res/resource.rc b/plugins/NewEventNotify/res/resource.rc index 68fa73ed46..e8866f9698 100644 --- a/plugins/NewEventNotify/res/resource.rc +++ b/plugins/NewEventNotify/res/resource.rc @@ -175,15 +175,6 @@ BEGIN END
#endif // APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Icon
-//
-
-// Icon with lowest ID value placed first to ensure application icon
-// remains consistent on all systems.
-IDI_ENABLED ICON "popup.ico"
-IDI_DISABLED ICON "popup_no.ico"
#endif // English (U.S.) resources
/////////////////////////////////////////////////////////////////////////////
diff --git a/plugins/NewEventNotify/src/menuitem.cpp b/plugins/NewEventNotify/src/menuitem.cpp index eccf612334..c077bf25be 100644 --- a/plugins/NewEventNotify/src/menuitem.cpp +++ b/plugins/NewEventNotify/src/menuitem.cpp @@ -40,9 +40,9 @@ static INT_PTR MenuitemNotifyCmd(WPARAM, LPARAM) int MenuitemUpdate(BOOL bStatus)
{
if (bStatus)
- Menu_ModifyItem(hMenuitemNotify, MENUITEM_DISABLE, LoadIcon(g_plugin.getInst(), MAKEINTRESOURCE(IDI_ENABLED)));
+ Menu_ModifyItem(hMenuitemNotify, MENUITEM_DISABLE, Skin_LoadIcon(SKINICON_OTHER_POPUP));
else
- Menu_ModifyItem(hMenuitemNotify, MENUITEM_ENABLE, LoadIcon(g_plugin.getInst(), MAKEINTRESOURCE(IDI_DISABLED)));
+ Menu_ModifyItem(hMenuitemNotify, MENUITEM_ENABLE, Skin_LoadIcon(SKINICON_OTHER_NOPOPUP));
return 0;
}
@@ -56,7 +56,7 @@ int MenuitemInit(BOOL bStatus) SET_UID(mi, 0x7aed93f7, 0x835, 0x4ff6, 0xb1, 0x34, 0xae, 0x0, 0x21, 0x2a, 0xd7, 0x81);
mi.root = hRoot;
mi.position = 1;
- mi.hIcolibItem = LoadIcon(g_plugin.getInst(), MAKEINTRESOURCE(IDI_ENABLED));
+ mi.hIcolibItem = Skin_LoadIcon(SKINICON_OTHER_POPUP);
mi.pszService = MS_NEN_MENUNOTIFY;
mi.flags = 0;
hMenuitemNotify = Menu_AddMainMenuItem(&mi);
diff --git a/plugins/NewEventNotify/src/resource.h b/plugins/NewEventNotify/src/resource.h index 679a27ed70..07feaa4615 100644 --- a/plugins/NewEventNotify/src/resource.h +++ b/plugins/NewEventNotify/src/resource.h @@ -3,9 +3,6 @@ // Used by ..\res\resource.rc
//
#define IDD_OPT 101
-#define IDI_ENABLED 106
-#define IDI_ICON2 107
-#define IDI_DISABLED 107
#define IDC_PREVIEW 1000
#define IDC_CHKNOTIFY_MESSAGE 1001
#define IDC_CHKNOTIFY_FILE 1003
|