From e82fece5a1e77d9394d94b84d8699b38d978b107 Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Fri, 5 Jul 2013 06:44:49 +0000 Subject: removed not used icons git-svn-id: http://svn.miranda-ng.org/main/trunk@5237 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/Skype/Skype_10.vcxproj | 11 ++--- protocols/Skype/Skype_10.vcxproj.filters | 33 ++++++--------- protocols/Skype/Skype_11.vcxproj | 11 ++--- protocols/Skype/Skype_11.vcxproj.filters | 33 ++++++--------- protocols/Skype/res/Resource.rc | 68 ++++++++++++------------------- protocols/Skype/res/conf_invite.ico | Bin 5430 -> 0 bytes protocols/Skype/res/conf_spawn.ico | Bin 5430 -> 0 bytes protocols/Skype/res/main.ico | Bin 5430 -> 0 bytes protocols/Skype/src/resource.h | 67 +++++++++++++----------------- 9 files changed, 85 insertions(+), 138 deletions(-) delete mode 100644 protocols/Skype/res/conf_invite.ico delete mode 100644 protocols/Skype/res/conf_spawn.ico delete mode 100644 protocols/Skype/res/main.ico 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 @@ - - - - - - - + + + + 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 @@ - - Resource Files\Icons - Resource Files\Bin Resource Files\Bin - - Resource Files\Icons - - - Resource Files\Icons - - - Resource Files\Icons - - - Resource Files\Icons - - - Resource Files\Icons - - - Resource Files\Icons - @@ -224,5 +203,17 @@ Resource Files\Icons + + Resource Files\Icons + + + Resource Files\Icons + + + Resource Files\Icons + + + Resource Files\Icons + \ 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 @@ - - - - - - - + + + + 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 @@ - - Resource Files\Icons - Resource Files\Bin Resource Files\Bin - - Resource Files\Icons - - - Resource Files\Icons - - - Resource Files\Icons - - - Resource Files\Icons - - - Resource Files\Icons - - - Resource Files\Icons - @@ -224,5 +203,17 @@ Resource Files\Icons + + Resource Files\Icons + + + Resource Files\Icons + + + Resource Files\Icons + + + Resource Files\Icons + \ 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 @@ -19,6 +19,30 @@ LANGUAGE LANG_NEUTRAL, 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" + ///////////////////////////////////////////////////////////////////////////// // // 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 Binary files a/protocols/Skype/res/conf_invite.ico and /dev/null differ diff --git a/protocols/Skype/res/conf_spawn.ico b/protocols/Skype/res/conf_spawn.ico deleted file mode 100644 index 85948b134a..0000000000 Binary files a/protocols/Skype/res/conf_spawn.ico and /dev/null differ diff --git a/protocols/Skype/res/main.ico b/protocols/Skype/res/main.ico deleted file mode 100644 index 1c37e9dc8c..0000000000 Binary files a/protocols/Skype/res/main.ico and /dev/null 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 -- cgit v1.2.3