From de6bb955236c585b31d1a8594903e67f082de4fd Mon Sep 17 00:00:00 2001 From: Sergey Bolhovskoy Date: Wed, 8 Oct 2014 06:54:36 +0000 Subject: VKontakte: remove unneeded code add icons for popups, menu and statusbar git-svn-id: http://svn.miranda-ng.org/main/trunk@10740 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/VKontakte/res/add.ico | Bin 0 -> 1150 bytes protocols/VKontakte/res/ban.ico | Bin 0 -> 1150 bytes protocols/VKontakte/res/delete.ico | Bin 0 -> 1150 bytes protocols/VKontakte/res/history.ico | Bin 0 -> 1150 bytes protocols/VKontakte/res/home.ico | Bin 0 -> 1150 bytes protocols/VKontakte/res/notify.ico | Bin 0 -> 1150 bytes protocols/VKontakte/res/read.ico | Bin 0 -> 1150 bytes protocols/VKontakte/res/report.ico | Bin 0 -> 1150 bytes protocols/VKontakte/res/resource.rc | 26 ++++++++++++++++++++++++++ protocols/VKontakte/src/misc.cpp | 14 ++++++++++---- protocols/VKontakte/src/resource.h | 10 +++++++++- protocols/VKontakte/src/vk_proto.cpp | 16 +++++++--------- protocols/VKontakte/vk_10.vcxproj | 8 ++++++++ protocols/VKontakte/vk_10.vcxproj.filters | 24 ++++++++++++++++++++++++ protocols/VKontakte/vk_12.vcxproj | 11 +++++++++++ protocols/VKontakte/vk_12.vcxproj.filters | 29 +++++++++++++++++++++++++++++ 16 files changed, 124 insertions(+), 14 deletions(-) create mode 100644 protocols/VKontakte/res/add.ico create mode 100644 protocols/VKontakte/res/ban.ico create mode 100644 protocols/VKontakte/res/delete.ico create mode 100644 protocols/VKontakte/res/history.ico create mode 100644 protocols/VKontakte/res/home.ico create mode 100644 protocols/VKontakte/res/notify.ico create mode 100644 protocols/VKontakte/res/read.ico create mode 100644 protocols/VKontakte/res/report.ico (limited to 'protocols/VKontakte') diff --git a/protocols/VKontakte/res/add.ico b/protocols/VKontakte/res/add.ico new file mode 100644 index 0000000000..0cb414407a Binary files /dev/null and b/protocols/VKontakte/res/add.ico differ diff --git a/protocols/VKontakte/res/ban.ico b/protocols/VKontakte/res/ban.ico new file mode 100644 index 0000000000..badbeed73f Binary files /dev/null and b/protocols/VKontakte/res/ban.ico differ diff --git a/protocols/VKontakte/res/delete.ico b/protocols/VKontakte/res/delete.ico new file mode 100644 index 0000000000..a70de7dd0d Binary files /dev/null and b/protocols/VKontakte/res/delete.ico differ diff --git a/protocols/VKontakte/res/history.ico b/protocols/VKontakte/res/history.ico new file mode 100644 index 0000000000..a3f05dfee3 Binary files /dev/null and b/protocols/VKontakte/res/history.ico differ diff --git a/protocols/VKontakte/res/home.ico b/protocols/VKontakte/res/home.ico new file mode 100644 index 0000000000..e4ce48170b Binary files /dev/null and b/protocols/VKontakte/res/home.ico differ diff --git a/protocols/VKontakte/res/notify.ico b/protocols/VKontakte/res/notify.ico new file mode 100644 index 0000000000..74c04f2516 Binary files /dev/null and b/protocols/VKontakte/res/notify.ico differ diff --git a/protocols/VKontakte/res/read.ico b/protocols/VKontakte/res/read.ico new file mode 100644 index 0000000000..c5115966e9 Binary files /dev/null and b/protocols/VKontakte/res/read.ico differ diff --git a/protocols/VKontakte/res/report.ico b/protocols/VKontakte/res/report.ico new file mode 100644 index 0000000000..622f9ad196 Binary files /dev/null and b/protocols/VKontakte/res/report.ico differ diff --git a/protocols/VKontakte/res/resource.rc b/protocols/VKontakte/res/resource.rc index ec8fcd2ee7..8012848cef 100644 --- a/protocols/VKontakte/res/resource.rc +++ b/protocols/VKontakte/res/resource.rc @@ -11,6 +11,32 @@ ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// Русский (Россия) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_RUS) +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT +#pragma code_page(1251) + +///////////////////////////////////////////////////////////////////////////// +// +// Icon +// + +// Icon with lowest ID value placed first to ensure application icon +// remains consistent on all systems. +IDI_NOTIFICATION ICON "notify.ico" +IDI_FRIENDADD ICON "add.ico" +IDI_BAN ICON "ban.ico" +IDI_FRIENDDEL ICON "delete.ico" +IDI_READMSG ICON "read.ico" +IDI_ABUSE ICON "report.ico" +IDI_VISITPROFILE ICON "home.ico" +IDI_HISTORY ICON "history.ico" +#endif // Русский (Россия) resources +///////////////////////////////////////////////////////////////////////////// + + ///////////////////////////////////////////////////////////////////////////// // Английский (США) resources diff --git a/protocols/VKontakte/src/misc.cpp b/protocols/VKontakte/src/misc.cpp index 14b2d13a3d..e5f3b42194 100644 --- a/protocols/VKontakte/src/misc.cpp +++ b/protocols/VKontakte/src/misc.cpp @@ -157,7 +157,15 @@ void CVkProto::OnReceiveSmth(NETLIBHTTPREQUEST *reply, AsyncHttpRequest *pReq) static IconItem iconList[] = { - { LPGEN("Captcha form icon"), "key", IDI_KEYS } + { LPGEN("Captcha form icon"), "key", IDI_KEYS }, + { LPGEN("Notification icon"), "notification", IDI_NOTIFICATION }, + { LPGEN("Read message icon"), "read", IDI_READMSG }, + { LPGEN("Visit profile icon"), "profile", IDI_VISITPROFILE }, + { LPGEN("Load server history icon"), "history", IDI_HISTORY }, + { LPGEN("Add to friendlist icon"), "addfriend", IDI_FRIENDADD }, + { LPGEN("Delete from friendlist icon"), "delfriend", IDI_FRIENDDEL }, + { LPGEN("Report abuse icon"), "abuse", IDI_ABUSE }, + { LPGEN("Ban user icon"), "ban", IDI_BAN} }; void InitIcons() @@ -523,7 +531,6 @@ int CVkProto::OnProcessSrmmEvent(WPARAM, LPARAM lParam) return 0; } - void CVkProto::SetSrmmReadStatus(MCONTACT hContact) { time_t time = getDword(hContact, "LastMsgReadTime", 0); @@ -535,8 +542,7 @@ void CVkProto::SetSrmmReadStatus(MCONTACT hContact) StatusTextData st = { 0 }; st.cbSize = sizeof(st); - st.hIcon = LoadSkinnedIcon(SKINICON_OTHER_EMPTYBLOB); + st.hIcon = Skin_GetIconByHandle(GetIconHandle(IDI_READMSG)); mir_sntprintf(st.tszText, SIZEOF(st.tszText), TranslateT("Message read: %s"), ttime); - CallService(MS_MSG_SETSTATUSTEXT, (WPARAM)hContact, NULL); CallService(MS_MSG_SETSTATUSTEXT, (WPARAM)hContact, (LPARAM)&st); } \ No newline at end of file diff --git a/protocols/VKontakte/src/resource.h b/protocols/VKontakte/src/resource.h index 33e7184d77..9227d9f0f6 100644 --- a/protocols/VKontakte/src/resource.h +++ b/protocols/VKontakte/src/resource.h @@ -7,6 +7,14 @@ #define IDD_OPT_MAIN 103 #define IDD_INVITE 104 #define IDD_GC_CREATE 105 +#define IDI_NOTIFICATION 109 +#define IDI_FRIENDADD 110 +#define IDI_BAN 111 +#define IDI_FRIENDDEL 112 +#define IDI_READMSG 113 +#define IDI_ABUSE 114 +#define IDI_VISITPROFILE 115 +#define IDI_HISTORY 116 #define IDI_KEYS 203 #define IDC_LOGIN 1001 #define IDC_PASSWORD 1002 @@ -39,7 +47,7 @@ #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NO_MFC 1 -#define _APS_NEXT_RESOURCE_VALUE 108 +#define _APS_NEXT_RESOURCE_VALUE 117 #define _APS_NEXT_COMMAND_VALUE 40001 #define _APS_NEXT_CONTROL_VALUE 1030 #define _APS_NEXT_SYMED_VALUE 101 diff --git a/protocols/VKontakte/src/vk_proto.cpp b/protocols/VKontakte/src/vk_proto.cpp index cdd9f4e37a..e9941a417c 100644 --- a/protocols/VKontakte/src/vk_proto.cpp +++ b/protocols/VKontakte/src/vk_proto.cpp @@ -144,7 +144,7 @@ void CVkProto::InitMenus() mir_snprintf(szService, sizeof(szService), "%s%s", m_szModuleName, PS_VISITPROFILE); mi.pszService = szService; mi.position = 10009 + PMI_VISITPROFILE; - mi.icolibItem = LoadSkinnedIconHandle(SKINICON_EVENT_URL); + mi.icolibItem = Skin_GetIconByHandle(GetIconHandle(IDI_VISITPROFILE)); mi.pszName = LPGEN("Visit profile"); g_hProtoMenuItems[PMI_VISITPROFILE] = Menu_AddProtoMenuItem(&mi); @@ -158,35 +158,35 @@ void CVkProto::InitMenus() mir_snprintf(szService, sizeof(szService), "%s%s", m_szModuleName, PS_GETALLSERVERHISTORY); mi.position = -200001000 + CMI_GETALLSERVERHISTORY; - mi.icolibItem = LoadSkinnedIconHandle(SKINICON_OTHER_HISTORY); + mi.icolibItem = Skin_GetIconByHandle(GetIconHandle(IDI_HISTORY)); mi.ptszName = LPGENT("Reload all messages from vk.com"); mi.pszService = szService; g_hContactMenuItems[CMI_GETALLSERVERHISTORY] = Menu_AddContactMenuItem(&mi); mir_snprintf(szService, sizeof(szService), "%s%s", m_szModuleName, PS_ADDASFRIEND); mi.position = -200001000 + CMI_ADDASFRIEND; - mi.icolibItem = LoadSkinnedIconHandle(SKINICON_AUTH_ADD); + mi.icolibItem = Skin_GetIconByHandle(GetIconHandle(IDI_FRIENDADD)); mi.ptszName = LPGENT("Add as friend"); mi.pszService = szService; g_hContactMenuItems[CMI_ADDASFRIEND] = Menu_AddContactMenuItem(&mi); mir_snprintf(szService, sizeof(szService), "%s%s", m_szModuleName, PS_DELETEFRIEND); mi.position = -200001000 + CMI_DELETEFRIEND; - mi.icolibItem = LoadSkinnedIconHandle(SKINICON_AUTH_REVOKE); + mi.icolibItem = Skin_GetIconByHandle(GetIconHandle(IDI_FRIENDDEL)); mi.ptszName = LPGENT("Delete from friend list"); mi.pszService = szService; g_hContactMenuItems[CMI_DELETEFRIEND] = Menu_AddContactMenuItem(&mi); mir_snprintf(szService, sizeof(szService), "%s%s", m_szModuleName, PS_BANUSER); mi.position = -200001000 + CMI_BANUSER; - mi.icolibItem = LoadSkinnedIconHandle(SKINICON_OTHER_DELETE); + mi.icolibItem = Skin_GetIconByHandle(GetIconHandle(IDI_BAN)); mi.ptszName = LPGENT("Ban user"); mi.pszService = szService; g_hContactMenuItems[CMI_BANUSER] = Menu_AddContactMenuItem(&mi); mir_snprintf(szService, sizeof(szService), "%s%s", m_szModuleName, PS_REPORTABUSE); mi.position = -200001000 + CMI_REPORTABUSE; - mi.icolibItem = LoadSkinnedIconHandle(SKINICON_OTHER_MIRANDA); + mi.icolibItem = Skin_GetIconByHandle(GetIconHandle(IDI_ABUSE)); mi.ptszName = LPGENT("Report abuse"); mi.pszService = szService; g_hContactMenuItems[CMI_REPORTABUSE] = Menu_AddContactMenuItem(&mi); @@ -234,18 +234,16 @@ void CVkProto::InitPopups(void) ppc.colorText = RGB(255, 245, 225); //Yellow ppc.iSeconds = 60; m_hPopupClassError = Popup_RegisterClass(&ppc); - Skin_ReleaseIcon(ppc.hIcon); mir_sntprintf(desc, SIZEOF(desc), _T("%s %s"), m_tszUserName, TranslateT("Notification")); mir_snprintf(name, SIZEOF(name), "%s_%s", m_szModuleName, "Notification"); ppc.ptszDescription = desc; ppc.pszName = name; - ppc.hIcon = LoadSkinnedIcon(SKINICON_INFORMATION); + ppc.hIcon = Skin_GetIconByHandle(GetIconHandle(IDI_NOTIFICATION)); ppc.colorBack = RGB(190, 225, 255); //Blue ppc.colorText = RGB(255, 255, 255); //White ppc.iSeconds = 4; m_hPopupClassNotification = Popup_RegisterClass(&ppc); - Skin_ReleaseIcon(ppc.hIcon); } void CVkProto::MsgPopup(MCONTACT hContact, const TCHAR *szMsg, const TCHAR *szTitle, bool err) diff --git a/protocols/VKontakte/vk_10.vcxproj b/protocols/VKontakte/vk_10.vcxproj index 4d75bd6b9d..3694620959 100644 --- a/protocols/VKontakte/vk_10.vcxproj +++ b/protocols/VKontakte/vk_10.vcxproj @@ -202,7 +202,15 @@ + + + + + + + + diff --git a/protocols/VKontakte/vk_10.vcxproj.filters b/protocols/VKontakte/vk_10.vcxproj.filters index 218a220874..61d01e9ddc 100644 --- a/protocols/VKontakte/vk_10.vcxproj.filters +++ b/protocols/VKontakte/vk_10.vcxproj.filters @@ -81,5 +81,29 @@ Resource Files + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + \ No newline at end of file diff --git a/protocols/VKontakte/vk_12.vcxproj b/protocols/VKontakte/vk_12.vcxproj index d3cc9a4936..b272a53f2d 100644 --- a/protocols/VKontakte/vk_12.vcxproj +++ b/protocols/VKontakte/vk_12.vcxproj @@ -204,6 +204,17 @@ + + + + + + + + + + + diff --git a/protocols/VKontakte/vk_12.vcxproj.filters b/protocols/VKontakte/vk_12.vcxproj.filters index 823b6f6102..f48849cd87 100644 --- a/protocols/VKontakte/vk_12.vcxproj.filters +++ b/protocols/VKontakte/vk_12.vcxproj.filters @@ -77,4 +77,33 @@ Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + \ No newline at end of file -- cgit v1.2.3