From 3acc3adbcba5afbb0527a4385e6b2f0c63e960da Mon Sep 17 00:00:00 2001 From: Alexander Lantsev Date: Mon, 1 Jul 2013 19:00:11 +0000 Subject: Skype: - removed ignore command - block command behavior like in official client now - added blocked list in account options - added history sync Note: this commit may contain non-working code git-svn-id: http://svn.miranda-ng.org/main/trunk@5203 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/Skype/res/Resource.rc | 43 ++++++++++++++++++++++++++++++++-------- protocols/Skype/res/ignore.ico | Bin 5430 -> 0 bytes 2 files changed, 35 insertions(+), 8 deletions(-) delete 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 1910b12816..97f84d3a8b 100644 --- a/protocols/Skype/res/Resource.rc +++ b/protocols/Skype/res/Resource.rc @@ -225,15 +225,31 @@ BEGIN LTEXT "Default group:",IDC_STATIC,15,122,61,8 END -IDD_IGNORE_LIST DIALOGEX 0, 0, 296, 262 +IDD_OPT_BLOCKED DIALOGEX 0, 0, 305, 230 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD +EXSTYLE WS_EX_CONTROLPARENT +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + CONTROL "",IDC_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,7,291,194 + COMBOBOX IDC_CONTACTS,7,206,231,30,CBS_DROPDOWN | CBS_SORT | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Block",IDC_BLOCK,248,206,50,13,WS_DISABLED +END + +IDD_BLOCK DIALOGEX 0, 0, 295, 170 STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_CONTROLPARENT -CAPTION "Ignore list" +CAPTION "Block this person" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - CONTROL "Server side ignore list\nControl ignore list 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 + CONTROL "%s",IDC_HEADERBAR,"MHeaderbarCtrl",0x0,0,0,295,25 + LTEXT "Are you sure you want to block %s?\nThey won't be able to contact you\nand won't appear in your Contact List.",IDC_MESSAGE,6,32,282,27 + CONTROL "Remove from your Contact List",IDC_REMOVE_FROM_CL, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,67,282,10 + GROUPBOX "Abuse",IDC_STATIC,6,84,282,40 + LTEXT "You can also report abuse from this user.",IDC_STATIC,12,96,270,8 + CONTROL "Report abuse",IDC_REPORT_ABUSE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,108,270,10 + DEFPUSHBUTTON "Cancel",IDCANCEL,238,147,50,14 + PUSHBUTTON "Block",IDOK,185,147,50,14 END @@ -352,11 +368,23 @@ BEGIN BOTTOMMARGIN, 231 END - IDD_IGNORE_LIST, DIALOG + IDD_OPT_BLOCKED, DIALOG + BEGIN + LEFTMARGIN, 7 + VERTGUIDE, 298 + TOPMARGIN, 7 + BOTTOMMARGIN, 223 + END + + IDD_BLOCK, DIALOG BEGIN + RIGHTMARGIN, 293 VERTGUIDE, 6 + VERTGUIDE, 12 + VERTGUIDE, 282 VERTGUIDE, 288 - HORZGUIDE, 254 + BOTTOMMARGIN, 169 + HORZGUIDE, 161 END END #endif // APSTUDIO_INVOKED @@ -384,7 +412,6 @@ 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_IGNORE ICON "ignore.ico" IDI_BLOCK ICON "block.ico" IDI_CONFERENCE ICON "conference.ico" IDI_CONTACT ICON "contact.ico" diff --git a/protocols/Skype/res/ignore.ico b/protocols/Skype/res/ignore.ico deleted file mode 100644 index d21e262467..0000000000 Binary files a/protocols/Skype/res/ignore.ico and /dev/null differ -- cgit v1.2.3