diff options
| author | MikalaiR <nikolay.romanovich@narod.ru> | 2015-04-21 15:09:00 +0000 |
|---|---|---|
| committer | MikalaiR <nikolay.romanovich@narod.ru> | 2015-04-21 15:09:00 +0000 |
| commit | 13e81e8e2b7e05f1cc62f8cd18aa4bdef68b8252 (patch) | |
| tree | 44e6da6c186fced53ba7ad9fa3a616bb26037e37 | |
| parent | 0363e5f2a3df0b3cbe4fe58ac44bac2eae25d5f7 (diff) | |
SkypeWeb: New chat icon changed.
git-svn-id: http://svn.miranda-ng.org/main/trunk@13012 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
| -rw-r--r-- | protocols/SkypeWeb/SkypeWeb_10.vcxproj | 3 | ||||
| -rw-r--r-- | protocols/SkypeWeb/SkypeWeb_10.vcxproj.filters | 5 | ||||
| -rw-r--r-- | protocols/SkypeWeb/res/resource.rc | 9 | ||||
| -rw-r--r-- | protocols/SkypeWeb/src/resource.h | 3 | ||||
| -rw-r--r-- | protocols/SkypeWeb/src/skype_icons.cpp | 3 | ||||
| -rw-r--r-- | protocols/SkypeWeb/src/skype_menus.cpp | 2 |
6 files changed, 22 insertions, 3 deletions
diff --git a/protocols/SkypeWeb/SkypeWeb_10.vcxproj b/protocols/SkypeWeb/SkypeWeb_10.vcxproj index 100563adff..6906ab6274 100644 --- a/protocols/SkypeWeb/SkypeWeb_10.vcxproj +++ b/protocols/SkypeWeb/SkypeWeb_10.vcxproj @@ -253,6 +253,9 @@ <ItemGroup>
<Image Include="res\icons\skype.ico" />
</ItemGroup>
+ <ItemGroup>
+ <Image Include="res\Icons\conference.ico" />
+ </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
diff --git a/protocols/SkypeWeb/SkypeWeb_10.vcxproj.filters b/protocols/SkypeWeb/SkypeWeb_10.vcxproj.filters index 13680565b6..0947b77cc2 100644 --- a/protocols/SkypeWeb/SkypeWeb_10.vcxproj.filters +++ b/protocols/SkypeWeb/SkypeWeb_10.vcxproj.filters @@ -163,4 +163,9 @@ <Filter>Resource Files\Icons</Filter>
</Image>
</ItemGroup>
+ <ItemGroup>
+ <Image Include="res\Icons\conference.ico">
+ <Filter>Resource Files\Icons</Filter>
+ </Image>
+ </ItemGroup>
</Project>
\ No newline at end of file diff --git a/protocols/SkypeWeb/res/resource.rc b/protocols/SkypeWeb/res/resource.rc index 0b71e5b789..a3121d183b 100644 --- a/protocols/SkypeWeb/res/resource.rc +++ b/protocols/SkypeWeb/res/resource.rc @@ -38,6 +38,15 @@ IDI_SKYPE ICON "icons\\skype.ico" 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_CONFERENCE ICON "Icons\\conference.ico"
+
#ifdef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
diff --git a/protocols/SkypeWeb/src/resource.h b/protocols/SkypeWeb/src/resource.h index b7520ae226..9712713f87 100644 --- a/protocols/SkypeWeb/src/resource.h +++ b/protocols/SkypeWeb/src/resource.h @@ -12,6 +12,7 @@ #define IDC_SAVEPERMANENTLY 108
#define IDD_GC_CREATE 111
#define IDD_GC_INVITE 112
+#define IDI_CONFERENCE 114
#define IDC_AUTOSYNC 1028
#define IDC_LOCALTIME 1029
#define IDC_RADIO1 1030
@@ -28,7 +29,7 @@ //
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE 113
+#define _APS_NEXT_RESOURCE_VALUE 115
#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 bfa62b478e..75865a8794 100644 --- a/protocols/SkypeWeb/src/skype_icons.cpp +++ b/protocols/SkypeWeb/src/skype_icons.cpp @@ -20,8 +20,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. IconInfo CSkypeProto::Icons[] =
{
{ LPGENT("Protocol icon"), "main", IDI_SKYPE },
+ { LPGENT("Create new chat icon"), "conference", IDI_CONFERENCE }
};
-
void CSkypeProto::InitIcons()
{
TCHAR szFile[MAX_PATH];
@@ -45,6 +45,7 @@ void CSkypeProto::InitIcons() sid.iDefaultIndex = -Icons[i].IconId;
Icons[i].Handle = Skin_AddIcon(&sid);
}
+
}
HANDLE CSkypeProto::GetIconHandle(const char *name)
diff --git a/protocols/SkypeWeb/src/skype_menus.cpp b/protocols/SkypeWeb/src/skype_menus.cpp index 3dce8a1566..775fe7b01c 100644 --- a/protocols/SkypeWeb/src/skype_menus.cpp +++ b/protocols/SkypeWeb/src/skype_menus.cpp @@ -121,7 +121,7 @@ int CSkypeProto::OnInitStatusMenu() CreateProtoService(tDest, &CSkypeProto::SvcCreateChat);
mi.ptszName = LPGENT("Create new chat");
mi.position = SMI_POSITION + PMI_CREATECHAT;
- mi.icolibItem = LoadSkinnedIconHandle(SKINICON_CHAT_JOIN);
+ mi.icolibItem = GetIconHandle("conference");
Menu_AddProtoMenuItem(&mi);
return 0;
|