From 854959cbc0a1bad2c086214be4d1a829b17a61f3 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sat, 1 Dec 2012 13:25:11 +0000 Subject: icolib: icon creation quirks git-svn-id: http://svn.miranda-ng.org/main/trunk@2588 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/QuickReplies/src/events.cpp | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'plugins/QuickReplies') diff --git a/plugins/QuickReplies/src/events.cpp b/plugins/QuickReplies/src/events.cpp index 4fdf1827fb..5729ee29cb 100644 --- a/plugins/QuickReplies/src/events.cpp +++ b/plugins/QuickReplies/src/events.cpp @@ -35,11 +35,8 @@ INT_PTR QuickRepliesService(WPARAM, LPARAM) int OnModulesLoaded(WPARAM wParam, LPARAM lParam) { UnhookEvent(hOnModulesLoaded); - HANDLE hIcon = NULL; - char buttonName[32]; - if (!ServiceExists(MS_QUICKREPLIES_SERVICE)) - { + if ( !ServiceExists(MS_QUICKREPLIES_SERVICE)) { iNumber = 0; hQuickRepliesService = CreateServiceFunction(MS_QUICKREPLIES_SERVICE, QuickRepliesService); } @@ -49,20 +46,23 @@ int OnModulesLoaded(WPARAM wParam, LPARAM lParam) hOnOptInitialized = HookEvent(ME_OPT_INITIALISE, OnOptInitialized); hOnButtonPressed = HookEvent(ME_MSG_BUTTONPRESSED, OnButtonPressed); - char buttonNameTranslated[32]; - mir_snprintf(buttonName, SIZEOF(buttonName), "Button %x", iNumber + 1); - mir_snprintf(buttonNameTranslated, SIZEOF(buttonNameTranslated), "%s %x",Translate("Button"), iNumber + 1); + if ( ServiceExists(MS_BB_ADDBUTTON)) { + char buttonNameTranslated[32], buttonName[32]; + mir_snprintf(buttonName, SIZEOF(buttonName), "Button %x", iNumber + 1); + mir_snprintf(buttonNameTranslated, SIZEOF(buttonNameTranslated), "%s %x",Translate("Button"), iNumber + 1); + + TCHAR tszPath[MAX_PATH]; + GetModuleFileName(hInstance, tszPath, SIZEOF(tszPath)); - SKINICONDESC sid = {0}; - sid.cbSize = sizeof(sid); - sid.pszSection = "TabSRMM/Quick Replies"; - sid.cx = sid.cy = 16; - sid.pszDescription = buttonNameTranslated; - sid.pszName = buttonName; - sid.hDefaultIcon = LoadIcon(hInstance, MAKEINTRESOURCE(IDI_QICON)); - hIcon = Skin_AddIcon(&sid); + SKINICONDESC sid = { sizeof(sid) }; + sid.pszSection = "TabSRMM/Quick Replies"; + sid.cx = sid.cy = 16; + sid.pszDescription = buttonNameTranslated; + sid.pszName = buttonName; + sid.ptszDefaultFile = tszPath; + sid.iDefaultIndex = -IDI_QICON; + HANDLE hIcon = Skin_AddIcon(&sid); - if (ServiceExists(MS_BB_ADDBUTTON)) { mir_snprintf(buttonName, SIZEOF(buttonName), MODULE_NAME" %x", iNumber + 1); BBButton bbd = {0}; -- cgit v1.2.3