From 5d45f1a869d63df95cd46c3e1dbb3d8d684565d7 Mon Sep 17 00:00:00 2001 From: MikalaiR Date: Tue, 28 Apr 2015 14:44:38 +0000 Subject: SkypeWeb: Block/Unblock icons (thx dracosha). git-svn-id: http://svn.miranda-ng.org/main/trunk@13227 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/SkypeWeb/SkypeWeb_10.vcxproj | 12 +++++------- protocols/SkypeWeb/SkypeWeb_10.vcxproj.filters | 14 ++++++++------ protocols/SkypeWeb/res/Icons/user_block.ico | Bin 0 -> 1150 bytes protocols/SkypeWeb/res/Icons/user_unblock.ico | Bin 0 -> 1150 bytes protocols/SkypeWeb/res/resource.rc | 4 +++- protocols/SkypeWeb/src/resource.h | 4 +++- protocols/SkypeWeb/src/skype_icons.cpp | 4 +++- protocols/SkypeWeb/src/skype_menus.cpp | 4 ++-- protocols/SkypeWeb/src/skype_messages.cpp | 3 +++ 9 files changed, 27 insertions(+), 18 deletions(-) create mode 100644 protocols/SkypeWeb/res/Icons/user_block.ico create mode 100644 protocols/SkypeWeb/res/Icons/user_unblock.ico diff --git a/protocols/SkypeWeb/SkypeWeb_10.vcxproj b/protocols/SkypeWeb/SkypeWeb_10.vcxproj index 95afaaa302..89f4162b2a 100644 --- a/protocols/SkypeWeb/SkypeWeb_10.vcxproj +++ b/protocols/SkypeWeb/SkypeWeb_10.vcxproj @@ -251,13 +251,11 @@ - - - - - - - + + + + + diff --git a/protocols/SkypeWeb/SkypeWeb_10.vcxproj.filters b/protocols/SkypeWeb/SkypeWeb_10.vcxproj.filters index d3a22b1443..d3efd5bb68 100644 --- a/protocols/SkypeWeb/SkypeWeb_10.vcxproj.filters +++ b/protocols/SkypeWeb/SkypeWeb_10.vcxproj.filters @@ -162,14 +162,16 @@ Resource Files\Icons - - - + Resource Files\Icons - - - + + Resource Files\Icons + + + Resource Files\Icons + + Resource Files\Icons diff --git a/protocols/SkypeWeb/res/Icons/user_block.ico b/protocols/SkypeWeb/res/Icons/user_block.ico new file mode 100644 index 0000000000..1adf67eee2 Binary files /dev/null and b/protocols/SkypeWeb/res/Icons/user_block.ico differ diff --git a/protocols/SkypeWeb/res/Icons/user_unblock.ico b/protocols/SkypeWeb/res/Icons/user_unblock.ico new file mode 100644 index 0000000000..d983a7cde5 Binary files /dev/null and b/protocols/SkypeWeb/res/Icons/user_unblock.ico differ diff --git a/protocols/SkypeWeb/res/resource.rc b/protocols/SkypeWeb/res/resource.rc index 79ff5df4d3..822b053251 100644 --- a/protocols/SkypeWeb/res/resource.rc +++ b/protocols/SkypeWeb/res/resource.rc @@ -26,9 +26,11 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_DEFAULT // Icon with lowest ID value placed first to ensure application icon // remains consistent on all systems. -IDI_SKYPE ICON "icons\\skype.ico" +IDI_SKYPE ICON "Icons\\skype.ico" IDI_CONFERENCE ICON "Icons\\conference.ico" IDI_SYNCHISTORY ICON "Icons\\sync_history.ico" +IDI_BLOCKUSER ICON "Icons\\user_block.ico" +IDI_UNBLOCKUSER ICON "Icons\\user_unblock.ico" #endif // Нейтральный (по умолчанию) resources ///////////////////////////////////////////////////////////////////////////// diff --git a/protocols/SkypeWeb/src/resource.h b/protocols/SkypeWeb/src/resource.h index db55d16082..cc6ecaf79b 100644 --- a/protocols/SkypeWeb/src/resource.h +++ b/protocols/SkypeWeb/src/resource.h @@ -14,6 +14,8 @@ #define IDD_GC_INVITE 112 #define IDI_CONFERENCE 114 #define IDI_SYNCHISTORY 117 +#define IDI_BLOCKUSER 118 +#define IDI_UNBLOCKUSER 119 #define IDC_AUTOSYNC 1028 #define IDC_LOCALTIME 1029 #define IDC_RADIO1 1030 @@ -30,7 +32,7 @@ // #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 119 +#define _APS_NEXT_RESOURCE_VALUE 120 #define _APS_NEXT_COMMAND_VALUE 40001 #define _APS_NEXT_CONTROL_VALUE 1042 #define _APS_NEXT_SYMED_VALUE 101 diff --git a/protocols/SkypeWeb/src/skype_icons.cpp b/protocols/SkypeWeb/src/skype_icons.cpp index 6027b6d3bc..a5e12cde4b 100644 --- a/protocols/SkypeWeb/src/skype_icons.cpp +++ b/protocols/SkypeWeb/src/skype_icons.cpp @@ -21,7 +21,9 @@ IconInfo CSkypeProto::Icons[] = { { LPGENT("Protocol icon"), "main", IDI_SKYPE }, { LPGENT("Create new chat icon"), "conference", IDI_CONFERENCE }, - { LPGENT("Sync history icon"), "synchistory", IDI_SYNCHISTORY} + { LPGENT("Sync history icon"), "synchistory", IDI_SYNCHISTORY}, + { LPGENT("Block user icon"), "user_block", IDI_BLOCKUSER }, + { LPGENT("Unblock user icon"), "user_unblock", IDI_UNBLOCKUSER } }; void CSkypeProto::InitIcons() { diff --git a/protocols/SkypeWeb/src/skype_menus.cpp b/protocols/SkypeWeb/src/skype_menus.cpp index ab4a4f34f2..b953444a38 100644 --- a/protocols/SkypeWeb/src/skype_menus.cpp +++ b/protocols/SkypeWeb/src/skype_menus.cpp @@ -89,14 +89,14 @@ void CSkypeProto::InitMenus() mi.pszService = MODULE"/BlockContact"; mi.ptszName = LPGENT("Block contact"); mi.position = CMI_POSITION + CMI_BLOCK; - mi.icolibItem = LoadSkinnedIcon(SKINICON_OTHER_DELETE); + mi.icolibItem = GetIconHandle("user_block"); ContactMenuItems[CMI_BLOCK] = Menu_AddContactMenuItem(&mi); CreateServiceFunction(mi.pszService, GlobalService<&CSkypeProto::BlockContact>); mi.pszService = MODULE"/UnblockContact"; mi.ptszName = LPGENT("Unblock contact"); mi.position = CMI_POSITION + CMI_UNBLOCK; - mi.icolibItem = LoadSkinnedIcon(SKINICON_OTHER_ADDCONTACT); + mi.icolibItem = GetIconHandle("user_unblock"); ContactMenuItems[CMI_UNBLOCK] = Menu_AddContactMenuItem(&mi); CreateServiceFunction(mi.pszService, GlobalService<&CSkypeProto::UnblockContact>); } diff --git a/protocols/SkypeWeb/src/skype_messages.cpp b/protocols/SkypeWeb/src/skype_messages.cpp index f1ecd66091..b5cb528aa7 100644 --- a/protocols/SkypeWeb/src/skype_messages.cpp +++ b/protocols/SkypeWeb/src/skype_messages.cpp @@ -336,6 +336,9 @@ void CSkypeProto::OnPrivateMessageEvent(JSONNODE *node) } } } + else if (!mir_strcmpi(messageType, "RichText/Location")){} + else if (!mir_strcmpi(messageType, "RichText/UriObject")){} //Picture + else if (!mir_strcmpi(messageType, "RichText/Contacts")){} } int CSkypeProto::OnDbEventRead(WPARAM hContact, LPARAM hDbEvent) -- cgit v1.2.3