From c4582dd65b444e5dae29ada7cc3f6c9a9c20edf3 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Sun, 2 Dec 2012 18:19:49 +0000
Subject: new easy standard way of registering icons: Icon_Register

git-svn-id: http://svn.miranda-ng.org/main/trunk@2601 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/BuddyExpectator/src/BuddyExpectator.cpp | 51 +++++++------------------
 1 file changed, 14 insertions(+), 37 deletions(-)

(limited to 'plugins/BuddyExpectator/src/BuddyExpectator.cpp')

diff --git a/plugins/BuddyExpectator/src/BuddyExpectator.cpp b/plugins/BuddyExpectator/src/BuddyExpectator.cpp
index 69942d594c..6ff1fe116a 100644
--- a/plugins/BuddyExpectator/src/BuddyExpectator.cpp
+++ b/plugins/BuddyExpectator/src/BuddyExpectator.cpp
@@ -48,7 +48,6 @@ HANDLE hHookExtraIconsRebuild = NULL;
 HANDLE hHookExtraIconsApply = NULL;
 
 HICON hIcon;
-HANDLE hEnabledIcon = NULL, hDisabledIcon = NULL;
 HANDLE hExtraIcon;
 
 // Popup Actions
@@ -71,6 +70,15 @@ PLUGININFOEX pluginInfo = {
 	{0xddf8aec9, 0x7d37, 0x49af, {0x9d, 0x22, 0xbb, 0xbc, 0x92, 0x0e, 0x6f, 0x05}}
 };
 
+static IconItem iconList[] =
+{
+	{ LPGEN("Tray/popup icon"), "main_icon",      IDI_MAINICON  },
+	{ LPGEN("Enabled"),         "enabled_icon",   IDI_ENABLED   },
+	{ LPGEN("Disabled"),        "disabled_icon",  IDI_DISABLED  },
+	{ LPGEN("Hide"),            "hide_icon",      IDI_HIDE      },
+	{ LPGEN("NeverHide"),       "neverhide_icon", IDI_NEVERHIDE }
+};
+
 BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
 {
 	hInst = hinstDLL;
@@ -480,13 +488,13 @@ int onPrebuildContactMenu(WPARAM wParam, LPARAM lParam)
    {
 		mi.flags |= CMIM_ICON | CMIM_NAME | CMIF_ICONFROMICOLIB | CMIF_TCHAR;
 		mi.ptszName = LPGENT("Disable Miss You");
-		mi.icolibItem = hEnabledIcon;
+		mi.icolibItem = iconList[1].hIcolib;
    }
    else
    {
 		mi.flags |= CMIM_ICON | CMIM_NAME | CMIF_ICONFROMICOLIB | CMIF_TCHAR;
 		mi.ptszName = LPGENT("Enable Miss You");
-		mi.icolibItem = hDisabledIcon;
+		mi.icolibItem = iconList[2].hIcolib;
    }
 
    CallService(MS_CLIST_MODIFYMENUITEM, (WPARAM)hContactMenu, (LPARAM)&mi);
@@ -657,6 +665,7 @@ int ModulesLoaded2(WPARAM wParam, LPARAM lParam)
 /**
  * Called when all the modules are loaded
  */
+
 int ModulesLoaded(WPARAM wParam, LPARAM lParam)
 {
 	hEventUserInfoInit = HookEvent(ME_USERINFO_INITIALISE, UserinfoInit);
@@ -675,39 +684,7 @@ int ModulesLoaded(WPARAM wParam, LPARAM lParam)
 
 	////////////////////////////////////////////////////////////////////////////
 
-	TCHAR szFile[MAX_PATH];
-	GetModuleFileName(hInst, szFile, MAX_PATH);
-
-	// IcoLib support
-	SKINICONDESC sid = { sizeof(sid) };
-	sid.ptszDefaultFile = szFile;
-	sid.flags = SIDF_ALL_TCHAR;
-	sid.ptszSection = LPGENT("BuddyExpectator");
-
-	sid.ptszDescription = LPGENT("Tray/popup icon");
-	sid.pszName = "main_icon";
-	sid.iDefaultIndex = -IDI_MAINICON;
-	Skin_AddIcon(&sid);
-
-	sid.ptszDescription = LPGENT("Enabled");
-	sid.pszName = "enabled_icon";
-	sid.iDefaultIndex = -IDI_ENABLED;
-	hEnabledIcon = Skin_AddIcon(&sid);
-
-	sid.ptszDescription = LPGENT("Disabled");
-	sid.pszName = "disabled_icon";
-	sid.iDefaultIndex = -IDI_DISABLED;
-	hDisabledIcon = Skin_AddIcon(&sid);
-
-	sid.ptszDescription = LPGENT("Hide");
-	sid.pszName = "hide_icon";
-	sid.iDefaultIndex = -IDI_HIDE;
-	Skin_AddIcon(&sid);
-
-	sid.ptszDescription = LPGENT("NeverHide");
-	sid.pszName = "neverhide_icon";
-	sid.iDefaultIndex = -IDI_NEVERHIDE;
-	Skin_AddIcon(&sid);
+	Icon_Register(hInst, "BuddyExpectator", iconList, SIZEOF(iconList));
 
 	hIcoLibIconsChanged = HookEvent(ME_SKIN2_ICONSCHANGED, onIconsChanged);
 
@@ -718,7 +695,7 @@ int ModulesLoaded(WPARAM wParam, LPARAM lParam)
 
 		CLISTMENUITEM mi = { sizeof(mi) };
 		mi.flags = CMIF_ICONFROMICOLIB | CMIF_TCHAR;
-		mi.icolibItem = hDisabledIcon;
+		mi.icolibItem = iconList[2].hIcolib;
 		mi.position = 200000;
 		mi.ptszName = LPGENT("Enable Miss You");
 		mi.pszService = "BuddyExpectator/actionMissYouClick";
-- 
cgit v1.2.3