From a6fee0d53fb640868e010e0dc54b116d9d143ddf Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 28 Dec 2018 13:05:02 +0300 Subject: User added notifications: - old obsoleted ICQ-related junk like PF4_FORCEADDED & PF1_ADDED removed; - appropriate controls removed from auth dialogs and menus; - fixes #1680 (ICQ10: disable "Auth request" and "Send you are added" in "Add contact" dialog) --- src/mir_app/res/resource.rc | 7 ++----- src/mir_app/src/addcontact.cpp | 10 +--------- src/mir_app/src/ignore.cpp | 1 - src/mir_app/src/resource.h | 1 - 4 files changed, 3 insertions(+), 16 deletions(-) (limited to 'src/mir_app') diff --git a/src/mir_app/res/resource.rc b/src/mir_app/res/resource.rc index 5cc29b0ed6..bddc200d59 100644 --- a/src/mir_app/res/resource.rc +++ b/src/mir_app/res/resource.rc @@ -50,9 +50,8 @@ BEGIN PUSHBUTTON "&Cancel",IDCANCEL,139,135,71,14 EDITTEXT IDC_MYHANDLE,6,16,90,12,ES_AUTOHSCROLL COMBOBOX IDC_GROUP,112,16,110,60,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - CONTROL "Send ""You were added""",IDC_ADDED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,44,204,10 - CONTROL "Send authorization request",IDC_AUTH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,56,204,10 - CONTROL "Open contact's chat window",IDC_OPEN_WINDOW,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,68,204,10 + CONTROL "Send authorization request",IDC_AUTH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,44,204,10 + CONTROL "Open contact's chat window",IDC_OPEN_WINDOW,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,56,204,10 LTEXT "Custom name:",IDC_STATIC,6,4,70,10 LTEXT "Group:",IDC_STATIC,112,4,70,10 GROUPBOX "Options",IDC_STATIC,7,33,216,48 @@ -295,8 +294,6 @@ BEGIN CTEXT "Only the ticked contacts will be shown on the main contact list",IDC_STCHECKMARKS,8,227,297,8 CONTROL "",IDC_LIST,"CListControl",WS_TABSTOP | 0x3da,8,26,297,146,WS_EX_CLIENTEDGE GROUPBOX "Ignore",IDC_STATIC,0,0,313,240 - ICON IDI_ADDCONTACT,IDC_ADDED,96,202,20,20,SS_CENTERIMAGE - LTEXT "Added notification",IDC_STATIC,116,208,107,8,SS_NOPREFIX | SS_CENTERIMAGE ICON IDI_TYPING,IDC_TYPINGICON,221,172,20,20,SS_CENTERIMAGE LTEXT "Typing",IDC_STATIC,241,178,66,8,SS_NOPREFIX | SS_CENTERIMAGE END diff --git a/src/mir_app/src/addcontact.cpp b/src/mir_app/src/addcontact.cpp index 500aa2cae3..db2794f059 100644 --- a/src/mir_app/src/addcontact.cpp +++ b/src/mir_app/src/addcontact.cpp @@ -38,7 +38,7 @@ static wchar_t* sttDecodeString(DWORD dwFlags, MAllStrings &src) class CAddContactDlg : public CDlgBase { CCtrlEdit m_authReq, m_myHandle; - CCtrlCheck m_chkAdded, m_chkAuth, m_chkOpen; + CCtrlCheck m_chkAuth, m_chkOpen; CCtrlButton m_btnOk; CCtrlCombo m_group; @@ -52,7 +52,6 @@ protected: public: CAddContactDlg() : CDlgBase(g_plugin, IDD_ADDCONTACT), - m_chkAdded(this, IDC_ADDED), m_chkAuth(this, IDC_AUTH), m_chkOpen(this, IDC_OPEN_WINDOW), m_btnOk(this, IDOK), @@ -87,7 +86,6 @@ public: m_group.SetCurSel(groupSel); // By default check both checkboxes - m_chkAdded.SetState(true); m_chkAuth.SetState(true); // Set last choice @@ -95,9 +93,6 @@ public: m_chkOpen.SetState(true); DWORD flags = (m_szProto) ? CallProtoServiceInt(0, m_szProto, PS_GETCAPS, PFLAGNUM_4, 0) : 0; - if (flags & PF4_FORCEADDED) // force you were added requests for this protocol - m_chkAdded.Enable(false); - if (flags & PF4_FORCEAUTH) // force auth requests for this protocol m_chkAuth.Enable(false); @@ -153,9 +148,6 @@ public: db_unset(hContact, "CList", "NotOnList"); - if (m_chkAdded.GetState()) - ProtoChainSend(hContact, PSS_ADDED, 0, 0); - if (m_chkAuth.GetState()) { DWORD flags = CallProtoServiceInt(0, m_szProto, PS_GETCAPS, PFLAGNUM_4, 0); if (flags & PF4_NOCUSTOMAUTH) diff --git a/src/mir_app/src/ignore.cpp b/src/mir_app/src/ignore.cpp index e217fa5325..42b728a9aa 100644 --- a/src/mir_app/src/ignore.cpp +++ b/src/mir_app/src/ignore.cpp @@ -222,7 +222,6 @@ static INT_PTR CALLBACK DlgProcIgnoreOpts(HWND hwndDlg, UINT msg, WPARAM, LPARAM SendDlgItemMessage(hwndDlg, IDC_FILEICON, STM_SETICON, (WPARAM)hIcons[4], 0); SendDlgItemMessage(hwndDlg, IDC_ONLINEICON, STM_SETICON, (WPARAM)hIcons[5], 0); SendDlgItemMessage(hwndDlg, IDC_AUTHICON, STM_SETICON, (WPARAM)hIcons[6], 0); - SendDlgItemMessage(hwndDlg, IDC_ADDED, STM_SETICON, (WPARAM)hIcons[7], 0); SendDlgItemMessage(hwndDlg, IDC_TYPINGICON, STM_SETICON, (WPARAM)hIcons[8], 0); ResetListOptions(GetDlgItem(hwndDlg, IDC_LIST)); diff --git a/src/mir_app/src/resource.h b/src/mir_app/src/resource.h index 3900899fbd..712484569a 100644 --- a/src/mir_app/src/resource.h +++ b/src/mir_app/src/resource.h @@ -463,7 +463,6 @@ #define IDC_TOPLINE 1535 #define IDC_MYHANDLE 1540 #define IDC_GROUP 1541 -#define IDC_ADDED 1542 #define IDC_AUTH 1543 #define IDC_OPEN_WINDOW 1544 #define IDC_DELETEHISTORY 1560 -- cgit v1.2.3