From 8cfe261befe72935a8ae48ac8203021aa9e3fb14 Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Fri, 25 Aug 2017 08:26:58 +0300 Subject: MRA: icon added to icolib, not used icon removed (fixes #298) --- protocols/MRA/res/Chat.ico | Bin 1150 -> 0 bytes protocols/MRA/res/resource.rc | 1 - protocols/MRA/src/MraIcons.cpp | 10 ++++++++-- protocols/MRA/src/resource.h | 1 - 4 files changed, 8 insertions(+), 4 deletions(-) delete mode 100644 protocols/MRA/res/Chat.ico (limited to 'protocols') diff --git a/protocols/MRA/res/Chat.ico b/protocols/MRA/res/Chat.ico deleted file mode 100644 index 811fd94333..0000000000 Binary files a/protocols/MRA/res/Chat.ico and /dev/null differ diff --git a/protocols/MRA/res/resource.rc b/protocols/MRA/res/resource.rc index 964e8d247a..aa068ec25d 100644 --- a/protocols/MRA/res/resource.rc +++ b/protocols/MRA/res/resource.rc @@ -38,7 +38,6 @@ IDI_MAIL_NOTIFY ICON "MailNotify.ico" IDI_MRA_WEB_SEARCH ICON "WebSearch.ico" IDI_MRA_POSTCARD ICON "PostCards.ico" IDI_MRA_PHOTO ICON "Photo.ico" -IDI_MRA_CHAT ICON "Chat.ico" IDI_MRA_PHONE ICON "Phone.ico" IDI_BLOGSTATUS ICON "BlogStatus.ico" IDI_MRA_ALARM ICON "Alarm.ico" diff --git a/protocols/MRA/src/MraIcons.cpp b/protocols/MRA/src/MraIcons.cpp index ee5a2f35f5..5da2288ad1 100644 --- a/protocols/MRA/src/MraIcons.cpp +++ b/protocols/MRA/src/MraIcons.cpp @@ -3,6 +3,11 @@ HANDLE hXStatusAdvancedStatusIcons[MRA_XSTATUS_COUNT+4]; +IconItem gdiMainIcon[1] = +{ + { LPGEN("Main icon"), "main", IDI_MRA } +}; + IconItem gdiMenuItems[MAIN_MENU_ITEMS_COUNT] = { { MRA_GOTO_INBOX_STR, MRA_GOTO_INBOX, IDI_INBOX }, @@ -64,11 +69,12 @@ HICON IconLibGetIconEx(HANDLE hIcon, DWORD dwFlags) void IconsLoad() { - g_hMainIcon = (HICON)LoadImage(g_hInstance, MAKEINTRESOURCE(IDI_MRA), IMAGE_ICON, 0, 0, LR_SHARED); - + Icon_Register(g_hInstance, LPGEN("Protocols") "/" LPGEN("MRA"), gdiMainIcon, 1, "MRA_"); Icon_Register(g_hInstance, LPGEN("Protocols") "/" LPGEN("MRA") "/" LPGEN("Main Menu"), gdiMenuItems, MAIN_MENU_ITEMS_COUNT, "MRA_"); Icon_Register(g_hInstance, LPGEN("Protocols") "/" LPGEN("MRA") "/" LPGEN("Contact Menu"), gdiContactMenuItems, CONTACT_MENU_ITEMS_COUNT, "MRA_"); Icon_Register(g_hInstance, LPGEN("Protocols") "/" LPGEN("MRA") "/" LPGEN("Extra status"), gdiExtraStatusIconsItems, ADV_ICON_MAX, "MRA_"); + + g_hMainIcon = IconLibGetIcon(gdiMainIcon[0].hIcolib); } void InitXStatusIcons() diff --git a/protocols/MRA/src/resource.h b/protocols/MRA/src/resource.h index 081d1d43b5..b557ba8e37 100644 --- a/protocols/MRA/src/resource.h +++ b/protocols/MRA/src/resource.h @@ -18,7 +18,6 @@ #define IDI_MRA_POSTCARD 114 #define IDI_MRA_PHOTO 117 #define IDI_DELETED 118 -#define IDI_MRA_CHAT 120 #define IDI_MRA_PHONE 122 #define IDD_OPT_FILES 126 #define IDD_OPT_ACCOUNT 127 -- cgit v1.2.3