From 119f9233647a964c46be1c0bc0cf2829361a688e Mon Sep 17 00:00:00 2001 From: Alexander Lantsev Date: Wed, 19 Jun 2013 20:13:00 +0000 Subject: Skype: - added bookmarks for chat rooms (contact menu, srmm button bar, bookmark list window) - added "ignore command" for contact - added "block command" for contact (contact removed from clist and ignored) - changed icons git-svn-id: http://svn.miranda-ng.org/main/trunk@5047 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/Skype/res/Resource.rc | 264 ++++++++++++++++------------------ protocols/Skype/res/block.ico | Bin 0 -> 1150 bytes protocols/Skype/res/bookmark.ico | Bin 0 -> 5430 bytes protocols/Skype/res/conf_invite.ico | Bin 5430 -> 5430 bytes protocols/Skype/res/conf_spawn.ico | Bin 5430 -> 5430 bytes protocols/Skype/res/delete.ico | Bin 0 -> 1150 bytes protocols/Skype/res/ignore.ico | Bin 0 -> 1150 bytes protocols/Skype/res/send_contacts.ico | Bin 5430 -> 5430 bytes 8 files changed, 122 insertions(+), 142 deletions(-) create mode 100644 protocols/Skype/res/block.ico create mode 100644 protocols/Skype/res/bookmark.ico create mode 100644 protocols/Skype/res/delete.ico create mode 100644 protocols/Skype/res/ignore.ico (limited to 'protocols/Skype/res') diff --git a/protocols/Skype/res/Resource.rc b/protocols/Skype/res/Resource.rc index 1ab8bdbb5a..c80ea60be2 100644 --- a/protocols/Skype/res/Resource.rc +++ b/protocols/Skype/res/Resource.rc @@ -13,11 +13,11 @@ #undef APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// -// Neutral resources +// Neutral (Default) resources -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEU) -LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL -#pragma code_page(1250) +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEUD) +LANGUAGE LANG_NEUTRAL, SUBLANG_DEFAULT +#pragma code_page(1251) ///////////////////////////////////////////////////////////////////////////// // @@ -90,64 +90,6 @@ BEGIN EDITTEXT IDC_CHAT_GUIDLINE4,84,164,152,14,ES_AUTOHSCROLL END - -///////////////////////////////////////////////////////////////////////////// -// -// DESIGNINFO -// - -#ifdef APSTUDIO_INVOKED -GUIDELINES DESIGNINFO -BEGIN - IDD_CHATROOM_INVITE, DIALOG - BEGIN - RIGHTMARGIN, 188 - TOPMARGIN, 4 - BOTTOMMARGIN, 173 - END - - IDD_CHATROOM_CREATE, DIALOG - BEGIN - RIGHTMARGIN, 375 - VERTGUIDE, 7 - VERTGUIDE, 181 - VERTGUIDE, 188 - VERTGUIDE, 198 - VERTGUIDE, 368 - TOPMARGIN, 4 - BOTTOMMARGIN, 223 - END - - IDD_CHATROOM_CONFIG, DIALOG - BEGIN - RIGHTMARGIN, 241 - VERTGUIDE, 5 - VERTGUIDE, 16 - VERTGUIDE, 78 - VERTGUIDE, 84 - VERTGUIDE, 236 - TOPMARGIN, 4 - BOTTOMMARGIN, 310 - END -END -#endif // APSTUDIO_INVOKED - -#endif // Neutral resources -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// -// Neutral (Default) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEUD) -LANGUAGE LANG_NEUTRAL, SUBLANG_DEFAULT -#pragma code_page(1250) - -///////////////////////////////////////////////////////////////////////////// -// -// Dialog -// - IDD_PASSWORD_REQUEST DIALOGEX 0, 0, 157, 71 STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Enter password" @@ -182,22 +124,22 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD EXSTYLE WS_EX_CONTROLPARENT FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - LTEXT "Full name:",IDC_STATIC,5,7,51,8 - EDITTEXT IDC_FULLNAME,58,5,159,12,ES_AUTOHSCROLL - LTEXT "Date of birth:",IDC_STATIC,5,20,51,8 - COMBOBOX IDC_BIRTH_DAY,58,18,25,12,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + LTEXT "Full name:",IDC_STATIC,6,7,54,8 + EDITTEXT IDC_FULLNAME,60,5,156,12,ES_AUTOHSCROLL + LTEXT "Date of birth:",IDC_STATIC,6,20,54,8 + COMBOBOX IDC_BIRTH_DAY,60,18,25,12,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_BIRTH_MONTH,84,18,25,12,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_BIRTH_YEAR,110,18,35,12,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP - LTEXT "Gender:",IDC_STATIC,5,34,51,8 - COMBOBOX IDC_GENDER,58,32,62,52,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP - LTEXT "Homepage:",IDC_STATIC,6,119,51,8 - EDITTEXT IDC_HOMEPAGE,58,117,159,12,ES_AUTOHSCROLL - LTEXT "Language:",IDC_STATIC,6,47,51,8 - COMBOBOX IDC_LANGUAGE,58,46,86,52,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP - LTEXT "About:",IDC_STATIC,5,90,51,8 - EDITTEXT IDC_ABOUT,57,88,159,24,ES_MULTILINE | WS_VSCROLL - LTEXT "Mood:",IDC_STATIC,6,62,51,8 - EDITTEXT IDC_MOOD,58,61,159,24,ES_MULTILINE | WS_VSCROLL + COMBOBOX IDC_BIRTH_YEAR,109,18,35,12,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + LTEXT "Gender:",IDC_STATIC,6,34,54,8 + COMBOBOX IDC_GENDER,60,32,84,52,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + LTEXT "Homepage:",IDC_STATIC,6,119,54,8 + EDITTEXT IDC_HOMEPAGE,60,117,156,12,ES_AUTOHSCROLL + LTEXT "Language:",IDC_STATIC,6,47,54,8 + COMBOBOX IDC_LANGUAGE,60,46,84,52,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + LTEXT "About:",IDC_STATIC,6,90,54,8 + EDITTEXT IDC_ABOUT,60,88,156,24,ES_MULTILINE | WS_VSCROLL + LTEXT "Mood:",IDC_STATIC,6,62,54,8 + EDITTEXT IDC_MOOD,60,61,156,24,ES_MULTILINE | WS_VSCROLL END IDD_OWNINFO_CONTACT DIALOGEX 0, 0, 222, 132 @@ -249,6 +191,51 @@ BEGIN PUSHBUTTON "Cancel",IDCANCEL,142,69,51,14 END +IDD_ACCMGR DIALOGEX 0, 0, 199, 92 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_SYSMENU +EXSTYLE WS_EX_CONTROLPARENT +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + LTEXT "Skype name:",IDC_STATIC,12,8,54,12 + EDITTEXT IDC_SL,66,7,120,12,ES_AUTOHSCROLL + LTEXT "Password:",IDC_STATIC,12,24,54,12 + EDITTEXT IDC_PW,66,23,120,12,ES_PASSWORD | ES_AUTOHSCROLL + PUSHBUTTON "Register new account",IDC_REGISTER,66,39,120,14,WS_DISABLED +END + +IDD_OPT_MAIN DIALOGEX 0, 0, 305, 238 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD +EXSTYLE WS_EX_CONTROLPARENT +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + GROUPBOX "Account",IDC_STATIC,7,7,291,60 + LTEXT "Skype name:",IDC_STATIC,15,19,63,8 + EDITTEXT IDC_SL,78,17,121,13,ES_AUTOHSCROLL + LTEXT "Password:",IDC_STATIC,15,35,63,8 + EDITTEXT IDC_PW,78,33,121,13,ES_PASSWORD | ES_AUTOHSCROLL + GROUPBOX "Connection",IDC_STATIC,7,69,291,47 + LTEXT "Use port",IDC_STATIC,15,81,63,8 + EDITTEXT IDC_PORT,78,79,30,14,ES_AUTOHSCROLL | ES_NUMBER + LTEXT "for incoming connections",IDC_STATIC,115,81,176,8 + CONTROL "Use ports 80 and 443 as alternative incoming",IDC_USE_ALT_PORTS, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,97,276,10 + PUSHBUTTON "Register new account",IDC_REGISTER,204,17,87,14,WS_DISABLED + PUSHBUTTON "Change password",IDC_CHANGE_PWD,204,33,87,14,WS_DISABLED + EDITTEXT IDC_GROUP,78,120,121,14,ES_AUTOHSCROLL + LTEXT "Default group:",IDC_STATIC,15,121,63,8 +END + +IDD_BOOKMARKS DIALOGEX 0, 0, 296, 262 +STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_CONTROLPARENT +CAPTION "Skype bookmarks" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + CONTROL "Server side bookmarks\nControl conference bookmarks on server.",IDC_HEADERBAR, + "MHeaderbarCtrl",0x0,0,0,296,25 + CONTROL "List1",IDC_BM_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,6,38,282,216 +END + ///////////////////////////////////////////////////////////////////////////// // @@ -258,6 +245,37 @@ END #ifdef APSTUDIO_INVOKED GUIDELINES DESIGNINFO BEGIN + IDD_CHATROOM_INVITE, DIALOG + BEGIN + RIGHTMARGIN, 188 + TOPMARGIN, 4 + BOTTOMMARGIN, 173 + END + + IDD_CHATROOM_CREATE, DIALOG + BEGIN + RIGHTMARGIN, 375 + VERTGUIDE, 7 + VERTGUIDE, 181 + VERTGUIDE, 188 + VERTGUIDE, 198 + VERTGUIDE, 368 + TOPMARGIN, 4 + BOTTOMMARGIN, 223 + END + + IDD_CHATROOM_CONFIG, DIALOG + BEGIN + RIGHTMARGIN, 241 + VERTGUIDE, 5 + VERTGUIDE, 16 + VERTGUIDE, 78 + VERTGUIDE, 84 + VERTGUIDE, 236 + TOPMARGIN, 4 + BOTTOMMARGIN, 310 + END + IDD_PASSWORD_REQUEST, DIALOG BEGIN LEFTMARGIN, 7 @@ -282,6 +300,10 @@ BEGIN IDD_OWNINFO_PERSONAL, DIALOG BEGIN + VERTGUIDE, 6 + VERTGUIDE, 60 + VERTGUIDE, 144 + VERTGUIDE, 216 END IDD_OWNINFO_CONTACT, DIALOG @@ -303,76 +325,14 @@ BEGIN TOPMARGIN, 7 BOTTOMMARGIN, 83 END -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) - -///////////////////////////////////////////////////////////////////////////// -// -// Dialog -// - -IDD_ACCMGR DIALOGEX 0, 0, 199, 92 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_SYSMENU -EXSTYLE WS_EX_CONTROLPARENT -FONT 8, "MS Shell Dlg", 400, 0, 0x1 -BEGIN - LTEXT "Skype name:",IDC_STATIC,14,8,46,12 - EDITTEXT IDC_SL,66,7,119,12,ES_AUTOHSCROLL - LTEXT "Password:",IDC_STATIC,14,24,46,12 - EDITTEXT IDC_PW,66,23,119,12,ES_PASSWORD | ES_AUTOHSCROLL - PUSHBUTTON "Register new account",IDC_REGISTER,66,39,119,14,WS_DISABLED -END - -IDD_OPT_MAIN DIALOGEX 0, 0, 305, 238 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD -EXSTYLE WS_EX_CONTROLPARENT -FONT 8, "MS Shell Dlg", 400, 0, 0x1 -BEGIN - GROUPBOX "Account",IDC_STATIC,7,7,291,60 - LTEXT "Skype name:",IDC_STATIC,15,19,57,8 - EDITTEXT IDC_SL,78,17,121,13,ES_AUTOHSCROLL - LTEXT "Password:",IDC_STATIC,15,35,57,8 - EDITTEXT IDC_PW,78,33,121,13,ES_PASSWORD | ES_AUTOHSCROLL - GROUPBOX "Connection",IDC_STATIC,7,69,291,47 - LTEXT "Use port",IDC_STATIC,15,81,57,8 - EDITTEXT IDC_PORT,78,79,30,14,ES_AUTOHSCROLL | ES_NUMBER - LTEXT "for incoming connections",IDC_STATIC,115,81,176,8 - CONTROL "Use ports 80 and 443 as alternative incoming",IDC_USE_ALT_PORTS, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,97,276,10 - PUSHBUTTON "Register new account",IDC_REGISTER,204,17,87,14,WS_DISABLED - PUSHBUTTON "Change password",IDC_CHANGE_PWD,204,33,87,14,WS_DISABLED - EDITTEXT IDC_GROUP,78,120,121,14,ES_AUTOHSCROLL - LTEXT "Default group:",IDC_STATIC,15,121,57,8 -END - -///////////////////////////////////////////////////////////////////////////// -// -// DESIGNINFO -// - -#ifdef APSTUDIO_INVOKED -GUIDELINES DESIGNINFO -BEGIN IDD_ACCMGR, DIALOG BEGIN LEFTMARGIN, 7 RIGHTMARGIN, 192 - VERTGUIDE, 14 - VERTGUIDE, 60 + VERTGUIDE, 12 VERTGUIDE, 66 - VERTGUIDE, 185 + VERTGUIDE, 186 TOPMARGIN, 7 BOTTOMMARGIN, 85 END @@ -381,7 +341,6 @@ BEGIN BEGIN LEFTMARGIN, 7 VERTGUIDE, 15 - VERTGUIDE, 72 VERTGUIDE, 78 VERTGUIDE, 108 VERTGUIDE, 115 @@ -392,9 +351,26 @@ BEGIN TOPMARGIN, 7 BOTTOMMARGIN, 231 END + + IDD_BOOKMARKS, DIALOG + BEGIN + VERTGUIDE, 6 + VERTGUIDE, 288 + HORZGUIDE, 254 + END 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) ///////////////////////////////////////////////////////////////////////////// // @@ -408,6 +384,10 @@ IDI_CALL ICON "call.ico" IDI_CONF_INVITE ICON "conf_invite.ico" IDI_CONF_SPAWN ICON "conf_spawn.ico" IDI_SEND_CONTACTS ICON "send_contacts.ico" +IDI_DELETE ICON "delete.ico" +IDI_BOOKMARK ICON "bookmark.ico" +IDI_IGNORE ICON "ignore.ico" +IDI_BLOCK ICON "block.ico" ///////////////////////////////////////////////////////////////////////////// // diff --git a/protocols/Skype/res/block.ico b/protocols/Skype/res/block.ico new file mode 100644 index 0000000000..26c0a6d040 Binary files /dev/null and b/protocols/Skype/res/block.ico differ diff --git a/protocols/Skype/res/bookmark.ico b/protocols/Skype/res/bookmark.ico new file mode 100644 index 0000000000..63052a4a45 Binary files /dev/null and b/protocols/Skype/res/bookmark.ico differ diff --git a/protocols/Skype/res/conf_invite.ico b/protocols/Skype/res/conf_invite.ico index 51c5dce0b6..785cff9b52 100644 Binary files a/protocols/Skype/res/conf_invite.ico and b/protocols/Skype/res/conf_invite.ico differ diff --git a/protocols/Skype/res/conf_spawn.ico b/protocols/Skype/res/conf_spawn.ico index 69e0773f11..85948b134a 100644 Binary files a/protocols/Skype/res/conf_spawn.ico and b/protocols/Skype/res/conf_spawn.ico differ diff --git a/protocols/Skype/res/delete.ico b/protocols/Skype/res/delete.ico new file mode 100644 index 0000000000..ac630347c2 Binary files /dev/null and b/protocols/Skype/res/delete.ico differ diff --git a/protocols/Skype/res/ignore.ico b/protocols/Skype/res/ignore.ico new file mode 100644 index 0000000000..d8801af182 Binary files /dev/null and b/protocols/Skype/res/ignore.ico differ diff --git a/protocols/Skype/res/send_contacts.ico b/protocols/Skype/res/send_contacts.ico index 32b5105c15..c29ed475e0 100644 Binary files a/protocols/Skype/res/send_contacts.ico and b/protocols/Skype/res/send_contacts.ico differ -- cgit v1.2.3