summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--protocols/Skype/Skype_10.vcxproj11
-rw-r--r--protocols/Skype/Skype_10.vcxproj.filters33
-rw-r--r--protocols/Skype/Skype_11.vcxproj11
-rw-r--r--protocols/Skype/Skype_11.vcxproj.filters33
-rw-r--r--protocols/Skype/res/Resource.rc68
-rw-r--r--protocols/Skype/res/conf_invite.icobin5430 -> 0 bytes
-rw-r--r--protocols/Skype/res/conf_spawn.icobin5430 -> 0 bytes
-rw-r--r--protocols/Skype/res/main.icobin5430 -> 0 bytes
-rw-r--r--protocols/Skype/src/resource.h67
9 files changed, 85 insertions, 138 deletions
diff --git a/protocols/Skype/Skype_10.vcxproj b/protocols/Skype/Skype_10.vcxproj
index ba648329af..ade82ca246 100644
--- a/protocols/Skype/Skype_10.vcxproj
+++ b/protocols/Skype/Skype_10.vcxproj
@@ -267,15 +267,12 @@
<ItemGroup>
<None Include="..\..\..\SkypeKit\keypair.bin" />
<None Include="..\..\..\SkypeKit\SDK\bin\windows-x86\windows-x86-skypekit.exe" />
- <None Include="res\call.ico" />
- <None Include="res\conf_invite.ico" />
- <None Include="res\conf_spawn.ico" />
- <None Include="res\main.ico" />
- <None Include="res\block.ico" />
- <None Include="res\delete.ico" />
- <None Include="res\send_contacts.ico" />
</ItemGroup>
<ItemGroup>
+ <Image Include="res\call.ico" />
+ <Image Include="res\block.ico" />
+ <Image Include="res\delete.ico" />
+ <Image Include="res\send_contacts.ico" />
<Image Include="res\add_contacts.ico" />
<Image Include="res\conference.ico" />
<Image Include="res\contact.ico" />
diff --git a/protocols/Skype/Skype_10.vcxproj.filters b/protocols/Skype/Skype_10.vcxproj.filters
index b6d1e7155f..93937190b7 100644
--- a/protocols/Skype/Skype_10.vcxproj.filters
+++ b/protocols/Skype/Skype_10.vcxproj.filters
@@ -183,33 +183,12 @@
</ResourceCompile>
</ItemGroup>
<ItemGroup>
- <None Include="res\main.ico">
- <Filter>Resource Files\Icons</Filter>
- </None>
<None Include="..\..\..\SkypeKit\SDK\bin\windows-x86\windows-x86-skypekit.exe">
<Filter>Resource Files\Bin</Filter>
</None>
<None Include="..\..\..\SkypeKit\keypair.bin">
<Filter>Resource Files\Bin</Filter>
</None>
- <None Include="res\call.ico">
- <Filter>Resource Files\Icons</Filter>
- </None>
- <None Include="res\conf_invite.ico">
- <Filter>Resource Files\Icons</Filter>
- </None>
- <None Include="res\conf_spawn.ico">
- <Filter>Resource Files\Icons</Filter>
- </None>
- <None Include="res\send_contacts.ico">
- <Filter>Resource Files\Icons</Filter>
- </None>
- <None Include="res\block.ico">
- <Filter>Resource Files\Icons</Filter>
- </None>
- <None Include="res\delete.ico">
- <Filter>Resource Files\Icons</Filter>
- </None>
</ItemGroup>
<ItemGroup>
<Image Include="res\add_contacts.ico">
@@ -224,5 +203,17 @@
<Image Include="res\skype.ico">
<Filter>Resource Files\Icons</Filter>
</Image>
+ <Image Include="res\call.ico">
+ <Filter>Resource Files\Icons</Filter>
+ </Image>
+ <Image Include="res\send_contacts.ico">
+ <Filter>Resource Files\Icons</Filter>
+ </Image>
+ <None Include="res\block.ico">
+ <Filter>Resource Files\Icons</Filter>
+ </Image>
+ <Image Include="res\delete.ico">
+ <Filter>Resource Files\Icons</Filter>
+ </Image>
</ItemGroup>
</Project> \ No newline at end of file
diff --git a/protocols/Skype/Skype_11.vcxproj b/protocols/Skype/Skype_11.vcxproj
index 4d519677b7..5644bee958 100644
--- a/protocols/Skype/Skype_11.vcxproj
+++ b/protocols/Skype/Skype_11.vcxproj
@@ -269,19 +269,16 @@
<ItemGroup>
<None Include="..\..\..\SkypeKit\keypair.bin" />
<None Include="..\..\..\SkypeKit\SDK\bin\windows-x86\windows-x86-skypekit.exe" />
- <None Include="res\call.ico" />
- <None Include="res\conf_invite.ico" />
- <None Include="res\conf_spawn.ico" />
- <None Include="res\main.ico" />
- <None Include="res\block.ico" />
- <None Include="res\delete.ico" />
- <None Include="res\send_contacts.ico" />
</ItemGroup>
<ItemGroup>
<Image Include="res\add_contacts.ico" />
<Image Include="res\conference.ico" />
<Image Include="res\contact.ico" />
<Image Include="res\skype.ico" />
+ <Image Include="res\call.ico" />
+ <Image Include="res\block.ico" />
+ <Image Include="res\delete.ico" />
+ <Image Include="res\send_contacts.ico" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
diff --git a/protocols/Skype/Skype_11.vcxproj.filters b/protocols/Skype/Skype_11.vcxproj.filters
index b6d1e7155f..f44a2b7302 100644
--- a/protocols/Skype/Skype_11.vcxproj.filters
+++ b/protocols/Skype/Skype_11.vcxproj.filters
@@ -183,33 +183,12 @@
</ResourceCompile>
</ItemGroup>
<ItemGroup>
- <None Include="res\main.ico">
- <Filter>Resource Files\Icons</Filter>
- </None>
<None Include="..\..\..\SkypeKit\SDK\bin\windows-x86\windows-x86-skypekit.exe">
<Filter>Resource Files\Bin</Filter>
</None>
<None Include="..\..\..\SkypeKit\keypair.bin">
<Filter>Resource Files\Bin</Filter>
</None>
- <None Include="res\call.ico">
- <Filter>Resource Files\Icons</Filter>
- </None>
- <None Include="res\conf_invite.ico">
- <Filter>Resource Files\Icons</Filter>
- </None>
- <None Include="res\conf_spawn.ico">
- <Filter>Resource Files\Icons</Filter>
- </None>
- <None Include="res\send_contacts.ico">
- <Filter>Resource Files\Icons</Filter>
- </None>
- <None Include="res\block.ico">
- <Filter>Resource Files\Icons</Filter>
- </None>
- <None Include="res\delete.ico">
- <Filter>Resource Files\Icons</Filter>
- </None>
</ItemGroup>
<ItemGroup>
<Image Include="res\add_contacts.ico">
@@ -224,5 +203,17 @@
<Image Include="res\skype.ico">
<Filter>Resource Files\Icons</Filter>
</Image>
+ <Image Include="res\call.ico">
+ <Filter>Resource Files\Icons</Filter>
+ </Image>
+ <Image Include="res\send_contacts.ico">
+ <Filter>Resource Files\Icons</Filter>
+ </Image>
+ <Image Include="res\block.ico">
+ <Filter>Resource Files\Icons</Filter>
+ </Image>
+ <Image Include="res\delete.ico">
+ <Filter>Resource Files\Icons</Filter>
+ </Image>
</ItemGroup>
</Project> \ No newline at end of file
diff --git a/protocols/Skype/res/Resource.rc b/protocols/Skype/res/Resource.rc
index 25df418097..0b783eae8c 100644
--- a/protocols/Skype/res/Resource.rc
+++ b/protocols/Skype/res/Resource.rc
@@ -21,6 +21,30 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_DEFAULT
/////////////////////////////////////////////////////////////////////////////
//
+// Icon
+//
+
+// Icon with lowest ID value placed first to ensure application icon
+// remains consistent on all systems.
+IDI_SKYPE ICON "skype.ico"
+IDI_CALL ICON "call.ico"
+IDI_ADD_CONTACTS ICON "add_contacts.ico"
+IDI_SEND_CONTACTS ICON "send_contacts.ico"
+IDI_DELETE ICON "delete.ico"
+IDI_BLOCK ICON "block.ico"
+IDI_CONFERENCE ICON "conference.ico"
+IDI_CONTACT ICON "contact.ico"
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// BIN
+//
+
+IDR_RUNTIME BIN "..\\..\\..\\..\\SkypeKit\\SDK\\bin\\windows-x86\\windows-x86-skypekit.exe"
+IDR_KEY BIN "..\\..\\..\\..\\SkypeKit\\keypair.bin"
+
+/////////////////////////////////////////////////////////////////////////////
+//
// Dialog
//
@@ -322,14 +346,6 @@ BEGIN
VERTGUIDE, 216
END
- IDD_OWNINFO_CONTACT, DIALOG
- BEGIN
- END
-
- IDD_OWNINFO_HOME, DIALOG
- BEGIN
- END
-
IDD_PASSWORD_CHANGE, DIALOG
BEGIN
LEFTMARGIN, 7
@@ -389,40 +405,6 @@ BEGIN
END
#endif // APSTUDIO_INVOKED
-#endif // Neutral (Default) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-/////////////////////////////////////////////////////////////////////////////
-// Russian (Russia) 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_SKYPE ICON "skype.ico"
-IDI_CALL ICON "call.ico"
-IDI_ADD_CONTACTS ICON "add_contacts.ico"
-IDI_SEND_CONTACTS ICON "send_contacts.ico"
-IDI_DELETE ICON "delete.ico"
-IDI_BLOCK ICON "block.ico"
-IDI_CONFERENCE ICON "conference.ico"
-IDI_CONTACT ICON "contact.ico"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// BIN
-//
-
-IDR_RUNTIME BIN "..\\..\\..\\..\\SkypeKit\\SDK\\bin\\windows-x86\\windows-x86-skypekit.exe"
-IDR_KEY BIN "..\\..\\..\\..\\SkypeKit\\keypair.bin"
#ifdef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
@@ -449,7 +431,7 @@ END
#endif // APSTUDIO_INVOKED
-#endif // Russian (Russia) resources
+#endif // Neutral (Default) resources
/////////////////////////////////////////////////////////////////////////////
diff --git a/protocols/Skype/res/conf_invite.ico b/protocols/Skype/res/conf_invite.ico
deleted file mode 100644
index 785cff9b52..0000000000
--- a/protocols/Skype/res/conf_invite.ico
+++ /dev/null
Binary files differ
diff --git a/protocols/Skype/res/conf_spawn.ico b/protocols/Skype/res/conf_spawn.ico
deleted file mode 100644
index 85948b134a..0000000000
--- a/protocols/Skype/res/conf_spawn.ico
+++ /dev/null
Binary files differ
diff --git a/protocols/Skype/res/main.ico b/protocols/Skype/res/main.ico
deleted file mode 100644
index 1c37e9dc8c..0000000000
--- a/protocols/Skype/res/main.ico
+++ /dev/null
Binary files differ
diff --git a/protocols/Skype/src/resource.h b/protocols/Skype/src/resource.h
index 73ade12bde..fb2e2359e4 100644
--- a/protocols/Skype/src/resource.h
+++ b/protocols/Skype/src/resource.h
@@ -9,17 +9,19 @@
#define IDD_OWNINFO_HOME 13
#define IDD_OWNINFO_CONTACT 14
#define IDD_PASSWORD_CHANGE 15
-#define IDD_CHATROOM_INVITE 40
+#define IDD_CHATROOM_INVITE 16
+#define IDD_PASSWORD_REQUEST 17
+#define IDD_CHATROOM_CREATE 18
+#define IDD_CHATROOM_CONFIG 19
+#define IDD_OPT_BLOCKED 20
+#define IDD_IGNORE_LIST 21
+#define IDD_BLOCK 22
#define IDI_SKYPE 101
#define IDR_RUNTIME 102
-#define IDD_PASSWORD_REQUEST 106
#define IDR_KEY 107
#define IDI_CALL 108
-#define IDI_CONF_INVITE 109
#define IDI_ADD_CONTACTS 109
-#define IDI_SEND_CONTACTS 111
-#define IDD_CHATROOM_CREATE 111
-#define IDD_CHATROOM_CONFIG 112
+#define IDI_SEND_CONTACTS 110
#define IDI_DELETE 112
#define IDI_BLOCK 115
#define IDI_CONFERENCE 116
@@ -71,38 +73,25 @@
#define IDC_CHAT_TOPIC 1044
#define IDC_CHAT_GUIDLINE 1045
#define IDC_CHAT_JOINING 1046
-#define IDC_CHAT_GUIDLINE2 1046
-#define IDC_COMBO1 1047
-#define IDC_ROLES 1047
-#define IDC_CHAT_ROLES 1047
-#define IDC_CHAT_GUIDLINE3 1047
-#define IDC_CONTACTS 1047
-#define IDC_CHAT_JOINING2 1048
-#define IDC_CHAT_SECURED 1048
-#define IDC_CHAT_GUIDLINE4 1048
-#define IDC_EDIT1 1049
-#define IDC_CHAT_PASSWORD 1049
-#define IDC_CHAT_GUIDLINE5 1049
-#define IDC_EDIT2 1050
-#define IDC_CHAT_CONFIRMATION 1050
-#define IDC_EDIT3 1051
-#define IDC_CHAT_HINT 1051
-#define IDC_CHECK1 1052
-#define IDC_COMBO2 1053
-#define IDC_CHECK2 1054
-#define IDC_BLOCK 1054
-#define ID_CANCEL 1055
-#define IDC_REPORT_ABUSE 1057
-#define IDC_REMOVE_FROM_CL 1058
-#define IDC_MESSAGE 1060
-#define IDC_HEADERBAR 1320
-#define IDD_BOOKMARKS 3001
-#define IDD_IGNORE_LIST 3001
-#define IDD_BLOCK 3001
-#define IDC_BM_LIST 3002
-#define IDC_BC_LIST 3002
-#define IDC_LIST 3002
-#define IDD_OPT_BLOCKED 3002
+#define IDC_CHAT_GUIDLINE2 1047
+#define IDC_CHAT_ROLES 1048
+#define IDC_CHAT_GUIDLINE3 1049
+#define IDC_CONTACTS 1050
+#define IDC_CHAT_SECURED 1051
+#define IDC_CHAT_GUIDLINE4 1052
+#define IDC_CHAT_PASSWORD 1053
+#define IDC_CHAT_CONFIRMATION 1054
+#define IDC_CHAT_HINT 1055
+#define IDC_CHECK1 1056
+#define IDC_COMBO2 1057
+#define IDC_CHECK2 1058
+#define IDC_BLOCK 1059
+#define IDC_REPORT_ABUSE 1060
+#define IDC_REMOVE_FROM_CL 1061
+#define IDC_MESSAGE 1062
+#define IDC_HEADERBAR 1063
+#define IDC_BM_LIST 1064
+#define IDC_LIST 1065
// Next default values for new objects
//
@@ -110,7 +99,7 @@
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 118
#define _APS_NEXT_COMMAND_VALUE 40001
-#define _APS_NEXT_CONTROL_VALUE 1061
+#define _APS_NEXT_CONTROL_VALUE 1066
#define _APS_NEXT_SYMED_VALUE 101
#endif
#endif
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 11:25:34 +0000