From 02ed4455c23e3562d71bfc80a0e2c4fede8708f1 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 14 Jun 2015 13:17:26 +0000 Subject: - all icolib services removed; - IcoLib_* functions are bound directly to the code git-svn-id: http://svn.miranda-ng.org/main/trunk@14161 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/VKontakte/src/vk_proto.cpp | 40 ++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 20 deletions(-) (limited to 'protocols/VKontakte/src/vk_proto.cpp') diff --git a/protocols/VKontakte/src/vk_proto.cpp b/protocols/VKontakte/src/vk_proto.cpp index 37bf19cac7..af266530a7 100644 --- a/protocols/VKontakte/src/vk_proto.cpp +++ b/protocols/VKontakte/src/vk_proto.cpp @@ -208,28 +208,28 @@ void CVkProto::InitMenus() mir_snprintf(szService, "%s%s", m_szModuleName, PS_SETSTATUSMSG); mi.pszService = szService; mi.position = 10009 + PMI_SETSTATUSMSG; - mi.icolibItem = Skin_GetIconByHandle(GetIconHandle(IDI_STATUS)); + mi.icolibItem = IcoLib_GetIconByHandle(GetIconHandle(IDI_STATUS)); mi.pszName = LPGEN("Status message"); g_hProtoMenuItems[PMI_SETSTATUSMSG] = Menu_AddProtoMenuItem(&mi); mir_snprintf(szService, "%s%s", m_szModuleName, PS_WALLPOST); mi.pszService = szService; mi.position = 10009 + PMI_WALLPOST; - mi.icolibItem = Skin_GetIconByHandle(GetIconHandle(IDI_WALL)); + mi.icolibItem = IcoLib_GetIconByHandle(GetIconHandle(IDI_WALL)); mi.pszName = LPGEN("Send message to my wall"); g_hProtoMenuItems[PMI_WALLPOST] = Menu_AddProtoMenuItem(&mi); mir_snprintf(szService, "%s%s", m_szModuleName, PS_LOADVKNEWS); mi.pszService = szService; mi.position = 10009 + PMI_LOADVKNEWS; - mi.icolibItem = Skin_GetIconByHandle(GetIconHandle(IDI_NOTIFICATION)); + mi.icolibItem = IcoLib_GetIconByHandle(GetIconHandle(IDI_NOTIFICATION)); mi.pszName = LPGEN("Load news from VK"); g_hProtoMenuItems[PMI_LOADVKNEWS] = Menu_AddProtoMenuItem(&mi); mir_snprintf(szService, "%s%s", m_szModuleName, PS_VISITPROFILE); mi.pszService = szService; mi.position = 10009 + PMI_VISITPROFILE; - mi.icolibItem = Skin_GetIconByHandle(GetIconHandle(IDI_VISITPROFILE)); + mi.icolibItem = IcoLib_GetIconByHandle(GetIconHandle(IDI_VISITPROFILE)); mi.pszName = LPGEN("Visit profile"); g_hProtoMenuItems[PMI_VISITPROFILE] = Menu_AddProtoMenuItem(&mi); @@ -243,49 +243,49 @@ void CVkProto::InitMenus() mir_snprintf(szService, "%s%s", m_szModuleName, PS_WALLPOST); mi.position = -200001000 + CMI_WALLPOST; - mi.icolibItem = Skin_GetIconByHandle(GetIconHandle(IDI_WALL)); + mi.icolibItem = IcoLib_GetIconByHandle(GetIconHandle(IDI_WALL)); mi.ptszName = LPGENT("Send message to user\'s wall"); mi.pszService = szService; g_hContactMenuItems[CMI_WALLPOST] = Menu_AddContactMenuItem(&mi); mir_snprintf(szService, "%s%s", m_szModuleName, PS_ADDASFRIEND); mi.position = -200001000 + CMI_ADDASFRIEND; - mi.icolibItem = Skin_GetIconByHandle(GetIconHandle(IDI_FRIENDADD)); + mi.icolibItem = IcoLib_GetIconByHandle(GetIconHandle(IDI_FRIENDADD)); mi.ptszName = LPGENT("Add as friend"); mi.pszService = szService; g_hContactMenuItems[CMI_ADDASFRIEND] = Menu_AddContactMenuItem(&mi); mir_snprintf(szService, "%s%s", m_szModuleName, PS_DELETEFRIEND); mi.position = -200001000 + CMI_DELETEFRIEND; - mi.icolibItem = Skin_GetIconByHandle(GetIconHandle(IDI_FRIENDDEL)); + mi.icolibItem = IcoLib_GetIconByHandle(GetIconHandle(IDI_FRIENDDEL)); mi.ptszName = LPGENT("Delete from friend list"); mi.pszService = szService; g_hContactMenuItems[CMI_DELETEFRIEND] = Menu_AddContactMenuItem(&mi); mir_snprintf(szService, "%s%s", m_szModuleName, PS_BANUSER); mi.position = -200001000 + CMI_BANUSER; - mi.icolibItem = Skin_GetIconByHandle(GetIconHandle(IDI_BAN)); + mi.icolibItem = IcoLib_GetIconByHandle(GetIconHandle(IDI_BAN)); mi.ptszName = LPGENT("Ban user"); mi.pszService = szService; g_hContactMenuItems[CMI_BANUSER] = Menu_AddContactMenuItem(&mi); mir_snprintf(szService, "%s%s", m_szModuleName, PS_REPORTABUSE); mi.position = -200001000 + CMI_REPORTABUSE; - mi.icolibItem = Skin_GetIconByHandle(GetIconHandle(IDI_ABUSE)); + mi.icolibItem = IcoLib_GetIconByHandle(GetIconHandle(IDI_ABUSE)); mi.ptszName = LPGENT("Report abuse"); mi.pszService = szService; g_hContactMenuItems[CMI_REPORTABUSE] = Menu_AddContactMenuItem(&mi); mir_snprintf(szService, "%s%s", m_szModuleName, PS_DESTROYKICKCHAT); mi.position = -200001000 + CMI_DESTROYKICKCHAT; - mi.icolibItem = Skin_GetIconByHandle(GetIconHandle(IDI_FRIENDDEL)); + mi.icolibItem = IcoLib_GetIconByHandle(GetIconHandle(IDI_FRIENDDEL)); mi.ptszName = LPGENT("Destroy room"); mi.pszService = szService; g_hContactMenuItems[CMI_DESTROYKICKCHAT] = Menu_AddContactMenuItem(&mi); mir_snprintf(szService, "%s%s", m_szModuleName, PS_OPENBROADCAST); mi.position = -200001000 + CMI_OPENBROADCAST; - mi.icolibItem = Skin_GetIconByHandle(GetIconHandle(IDI_BROADCAST)); + mi.icolibItem = IcoLib_GetIconByHandle(GetIconHandle(IDI_BROADCAST)); mi.ptszName = LPGENT("Open broadcast"); mi.pszService = szService; g_hContactMenuItems[CMI_OPENBROADCAST] = Menu_AddContactMenuItem(&mi); @@ -293,14 +293,14 @@ void CVkProto::InitMenus() mir_snprintf(szService, "%s%s", m_szModuleName, PS_LOADVKNEWS); mi.pszService = szService; mi.position = -200001000 + CMI_LOADVKNEWS; - mi.icolibItem = Skin_GetIconByHandle(GetIconHandle(IDI_NOTIFICATION)); + mi.icolibItem = IcoLib_GetIconByHandle(GetIconHandle(IDI_NOTIFICATION)); mi.ptszName = LPGENT("Load news from VK"); g_hContactMenuItems[CMI_LOADVKNEWS] = Menu_AddContactMenuItem(&mi); // Sync history menu mir_snprintf(szService, "%s%s", m_szModuleName, PS_GETSERVERHISTORY); mi.position = -200001000 + CMI_GETSERVERHISTORY; - mi.icolibItem = Skin_GetIconByHandle(GetIconHandle(IDI_HISTORY)); + mi.icolibItem = IcoLib_GetIconByHandle(GetIconHandle(IDI_HISTORY)); mi.ptszName = LPGENT("Reload messages from vk.com..."); mi.pszService = szService; g_hContactMenuItems[CMI_GETSERVERHISTORY] = Menu_AddContactMenuItem(&mi); @@ -310,42 +310,42 @@ void CVkProto::InitMenus() mir_snprintf(szService, "%s%s", m_szModuleName, PS_GETSERVERHISTORYLAST1DAY); mi.position = -200001000 + CMI_GETSERVERHISTORY + 100 + CHMI_GETSERVERHISTORYLAST1DAY; - mi.icolibItem = Skin_GetIconByHandle(GetIconHandle(IDI_HISTORY)); + mi.icolibItem = IcoLib_GetIconByHandle(GetIconHandle(IDI_HISTORY)); mi.ptszName = LPGENT("for last 1 day"); mi.pszService = szService; g_hContactHistoryMenuItems[CHMI_GETSERVERHISTORYLAST1DAY] = Menu_AddContactMenuItem(&mi); mir_snprintf(szService, "%s%s", m_szModuleName, PS_GETSERVERHISTORYLAST3DAY); mi.position = -200001000 + CMI_GETSERVERHISTORY + 100 + CHMI_GETSERVERHISTORYLAST3DAY; - mi.icolibItem = Skin_GetIconByHandle(GetIconHandle(IDI_HISTORY)); + mi.icolibItem = IcoLib_GetIconByHandle(GetIconHandle(IDI_HISTORY)); mi.ptszName = LPGENT("for last 3 days"); mi.pszService = szService; g_hContactHistoryMenuItems[CHMI_GETSERVERHISTORYLAST3DAY] = Menu_AddContactMenuItem(&mi); mir_snprintf(szService, "%s%s", m_szModuleName, PS_GETSERVERHISTORYLAST7DAY); mi.position = -200001000 + CMI_GETSERVERHISTORY + 100 + CHMI_GETSERVERHISTORYLAST7DAY; - mi.icolibItem = Skin_GetIconByHandle(GetIconHandle(IDI_HISTORY)); + mi.icolibItem = IcoLib_GetIconByHandle(GetIconHandle(IDI_HISTORY)); mi.ptszName = LPGENT("for last week"); mi.pszService = szService; g_hContactHistoryMenuItems[CHMI_GETSERVERHISTORYLAST7DAY] = Menu_AddContactMenuItem(&mi); mir_snprintf(szService, "%s%s", m_szModuleName, PS_GETSERVERHISTORYLAST30DAY); mi.position = -200001000 + CMI_GETSERVERHISTORY + 100 + CHMI_GETSERVERHISTORYLAST30DAY; - mi.icolibItem = Skin_GetIconByHandle(GetIconHandle(IDI_HISTORY)); + mi.icolibItem = IcoLib_GetIconByHandle(GetIconHandle(IDI_HISTORY)); mi.ptszName = LPGENT("for last 30 days"); mi.pszService = szService; g_hContactHistoryMenuItems[CHMI_GETSERVERHISTORYLAST30DAY] = Menu_AddContactMenuItem(&mi); mir_snprintf(szService, "%s%s", m_szModuleName, PS_GETSERVERHISTORYLAST90DAY); mi.position = -200001000 + CMI_GETSERVERHISTORY + 100 + CHMI_GETSERVERHISTORYLAST90DAY; - mi.icolibItem = Skin_GetIconByHandle(GetIconHandle(IDI_HISTORY)); + mi.icolibItem = IcoLib_GetIconByHandle(GetIconHandle(IDI_HISTORY)); mi.ptszName = LPGENT("for last 90 days"); mi.pszService = szService; g_hContactHistoryMenuItems[CHMI_GETSERVERHISTORYLAST90DAY] = Menu_AddContactMenuItem(&mi); mir_snprintf(szService, "%s%s", m_szModuleName, PS_GETALLSERVERHISTORY); mi.position = -200001000 + CMI_GETSERVERHISTORY + 100 + CHMI_GETALLSERVERHISTORY; - mi.icolibItem = Skin_GetIconByHandle(GetIconHandle(IDI_HISTORY)); + mi.icolibItem = IcoLib_GetIconByHandle(GetIconHandle(IDI_HISTORY)); mi.ptszName = LPGENT("for all time"); mi.pszService = szService; g_hContactHistoryMenuItems[CHMI_GETALLSERVERHISTORY] = Menu_AddContactMenuItem(&mi); @@ -408,7 +408,7 @@ void CVkProto::InitPopups(void) mir_snprintf(name, "%s_%s", m_szModuleName, "Notification"); ppc.ptszDescription = desc; ppc.pszName = name; - ppc.hIcon = Skin_GetIconByHandle(GetIconHandle(IDI_NOTIFICATION)); + ppc.hIcon = IcoLib_GetIconByHandle(GetIconHandle(IDI_NOTIFICATION)); ppc.colorBack = RGB(190, 225, 255); //Blue ppc.colorText = RGB(255, 255, 255); //White ppc.iSeconds = 4; -- cgit v1.2.3