diff options
| author | George Hazan <george.hazan@gmail.com> | 2012-10-22 11:49:33 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2012-10-22 11:49:33 +0000 |
| commit | eacd84efa1666b3afc4c98e632fa3bb4289a43c2 (patch) | |
| tree | 7ebde1d184f3a01c94cd93a230edef202ec495e3 | |
| parent | a8a2a1e55b5ae4ba2b770d02cb6909d9d2ff4387 (diff) | |
removed option to push MRA contact menu items to another contacts
git-svn-id: http://svn.miranda-ng.org/main/trunk@2041 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
| -rw-r--r-- | protocols/MRA/res/resource.rc | 342 | ||||
| -rw-r--r-- | protocols/MRA/src/MraConstans.h | 16 | ||||
| -rw-r--r-- | protocols/MRA/src/Mra_options.cpp | 4 | ||||
| -rw-r--r-- | protocols/MRA/src/Mra_svcs.cpp | 12 | ||||
| -rw-r--r-- | protocols/MRA/src/resource.h | 1 |
5 files changed, 180 insertions, 195 deletions
diff --git a/protocols/MRA/res/resource.rc b/protocols/MRA/res/resource.rc index b4c18790b9..ccc0d19ec0 100644 --- a/protocols/MRA/res/resource.rc +++ b/protocols/MRA/res/resource.rc @@ -18,10 +18,8 @@ // Neutral resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEU)
-#ifdef _WIN32
LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
#pragma code_page(1251)
-#endif //_WIN32
/////////////////////////////////////////////////////////////////////////////
//
@@ -62,8 +60,7 @@ BEGIN EDITTEXT IDC_LOGIN,54,0,131,12,ES_AUTOHSCROLL
LTEXT "Password:",IDC_STATIC,0,16,53,12
EDITTEXT IDC_PASSWORD,54,16,131,12,ES_PASSWORD | ES_AUTOHSCROLL
- CONTROL "Create a new account",IDC_NEW_ACCOUNT_LINK,
- "Hyperlink",WS_TABSTOP,0,40,174,12
+ CONTROL "Create a new account",IDC_NEW_ACCOUNT_LINK,"Hyperlink",WS_TABSTOP,0,40,174,12
END
IDD_OPT_CONNECTIONS DIALOGEX 0, 0, 295, 230
@@ -71,40 +68,38 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE EXSTYLE WS_EX_CONTROLPARENT
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- GROUPBOX "Configuration", IDC_GROUPCONFIG, 8, 7, 277, 208
- RTEXT "Login Server:", IDC_STATIC, 14, 19, 52, 8
- EDITTEXT IDC_SERVER, 72, 17, 140, 12, ES_AUTOHSCROLL
- RTEXT "Port:", IDC_STATIC, 14, 34, 52, 8
- EDITTEXT IDC_SERVERPORT, 72, 33, 33, 12, ES_AUTOHSCROLL | ES_NUMBER
- LTEXT "(2042, 443, 110, 25)", IDC_STATIC, 110, 35, 167, 10
- PUSHBUTTON "Default", IDC_BUTTON_DEFAULT, 217, 17, 60, 13
- CONTROL "Automatically request authorization on logon", IDC_AUTO_AUTH_REQ_ON_LOGON,
- "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 14, 50, 263, 8
- CONTROL "Automatically add contacts to server list on logon", IDC_AUTO_ADD_CONTACTS_TO_SERVER,
- "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 14, 61, 263, 8
- CONTROL "Automatically grant authorization to users in contact list", IDC_AUTO_AUTH_GRAND_IN_CLIST,
- "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 14, 72, 263, 8
- CONTROL "Automatically grant authorization to new users", IDC_AUTO_AUTH_GRAND_NEW_USERS,
- "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 14, 83, 263, 8
- CONTROL "Disable spam check", IDC_AUTO_AUTH_GRAND_NEW_USERS_DISABLE_SPAM_CHECK,
- "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 24, 94, 253, 8
- CONTROL "Notify me when a message delivery has failed", IDC_SLOWSEND,
- "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 14, 107, 263, 8
- CONTROL "Notify about new mail if increment", IDC_INCREMENTAL_NEW_MAIL_NOTIFY,
- "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 14, 118, 263, 8
- CONTROL "Notify about new mail tray icon", IDC_TRAYICON_NEW_MAIL_NOTIFY,
- "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 14, 129, 263, 8
- CONTROL "Click to Inbox", IDC_TRAYICON_NEW_MAIL_NOTIFY_CLICK_TO_INBOX,
- "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 24, 140, 253, 8
- CONTROL "Hide menu items for non-MRA contacts", IDC_HIDE_MENU_ITEMS_FOR_NON_MRA,
- "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 14, 151, 263, 8
- CONTROL "Show received formatted text (receive RTF)", IDC_RTF_RECEIVE_ENABLE,
- "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 14, 162, 263, 8
- CONTROL "Send formatted text (send RTF)", IDC_RTF_SEND_ENABLE,
- "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 14, 173, 263, 8
- PUSHBUTTON "Font", IDC_BUTTON_FONT, 23, 185, 42, 12
- CONTROL "", IDC_RTF_BGCOLOUR, "ColourPicker", WS_TABSTOP, 70, 186, 38, 11
- LTEXT "Background colour", IDC_STATIC, 112, 188, 157, 8
+ GROUPBOX "Configuration",IDC_GROUPCONFIG,8,7,277,185
+ RTEXT "Login Server:",IDC_STATIC,14,19,52,8
+ EDITTEXT IDC_SERVER,72,17,140,12,ES_AUTOHSCROLL
+ RTEXT "Port:",IDC_STATIC,14,34,52,8
+ EDITTEXT IDC_SERVERPORT,72,33,33,12,ES_AUTOHSCROLL | ES_NUMBER
+ LTEXT "(2042, 443, 110, 25)",IDC_STATIC,110,35,167,10
+ PUSHBUTTON "Default",IDC_BUTTON_DEFAULT,217,17,60,13
+ CONTROL "Automatically request authorization on logon",IDC_AUTO_AUTH_REQ_ON_LOGON,
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,50,263,8
+ CONTROL "Automatically add contacts to server list on logon",IDC_AUTO_ADD_CONTACTS_TO_SERVER,
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,61,263,8
+ CONTROL "Automatically grant authorization to users in contact list",IDC_AUTO_AUTH_GRAND_IN_CLIST,
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,72,263,8
+ CONTROL "Automatically grant authorization to new users",IDC_AUTO_AUTH_GRAND_NEW_USERS,
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,83,263,8
+ CONTROL "Disable spam check",IDC_AUTO_AUTH_GRAND_NEW_USERS_DISABLE_SPAM_CHECK,
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,24,94,253,8
+ CONTROL "Notify me when a message delivery has failed",IDC_SLOWSEND,
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,107,263,8
+ CONTROL "Notify about new mail if increment",IDC_INCREMENTAL_NEW_MAIL_NOTIFY,
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,118,263,8
+ CONTROL "Notify about new mail tray icon",IDC_TRAYICON_NEW_MAIL_NOTIFY,
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,129,263,8
+ CONTROL "Click to Inbox",IDC_TRAYICON_NEW_MAIL_NOTIFY_CLICK_TO_INBOX,
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,24,140,253,8
+ CONTROL "Show received formatted text (receive RTF)",IDC_RTF_RECEIVE_ENABLE,
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,151,263,8
+ CONTROL "Send formatted text (send RTF)",IDC_RTF_SEND_ENABLE,
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,162,263,8
+ LTEXT "Background colour",IDC_STATIC,112,175,157,8
+ PUSHBUTTON "Font",IDC_BUTTON_FONT,23,173,42,12
+ CONTROL "",IDC_RTF_BGCOLOUR,"ColourPicker",WS_TABSTOP,70,173,38,12
END
IDD_MRAADVANCEDSEARCH DIALOGEX 0, 0, 220, 235
@@ -112,39 +107,39 @@ STYLE DS_SETFONT | DS_3DLOOK | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_BORDER EXSTYLE WS_EX_CONTROLPARENT
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- GROUPBOX "Summary", IDC_SUMMARYGROUP, 8, 5, 205, 147
- LTEXT "Nickname:", IDC_STATIC, 15, 20, 50, 8
- EDITTEXT IDC_NICK, 65, 18, 139, 12, ES_AUTOHSCROLL
- LTEXT "First name:", IDC_STATIC, 15, 35, 50, 8
- EDITTEXT IDC_FIRSTNAME, 65, 33, 139, 12, ES_AUTOHSCROLL
- LTEXT "Last name:", IDC_STATIC, 15, 50, 50, 8
- EDITTEXT IDC_LASTNAME, 65, 48, 139, 12, ES_AUTOHSCROLL
- LTEXT "E-mail:", IDC_STATIC, 15, 65, 50, 8
- EDITTEXT IDC_EMAIL_USER, 65, 63, 69, 12, ES_AUTOHSCROLL
- CTEXT "@", IDC_STATIC, 137, 64, 9, 9
- COMBOBOX IDC_EMAIL_DOMAIN, 147, 63, 57, 71, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
- LTEXT "Gender:", IDC_STATIC, 15, 87, 50, 8
- COMBOBOX IDC_GENDER, 65, 85, 139, 47, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP
- LTEXT "Age:", IDC_STATIC, 15, 102, 50, 8
- RTEXT "from:", IDC_STATIC, 65, 102, 26, 9
- COMBOBOX IDC_AGERANGE_FROM, 94, 100, 37, 90, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
- RTEXT "to:", IDC_STATIC, 134, 102, 30, 9
- COMBOBOX IDC_AGERANGE_TO, 167, 100, 37, 90, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
- LTEXT "Birthday:", IDC_STATIC, 15, 118, 50, 8
- COMBOBOX IDC_BIRTHDAY_DAY, 65, 117, 29, 204, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
- COMBOBOX IDC_BIRTHDAY_MONTH, 102, 117, 59, 90, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
- COMBOBOX IDC_BIRTHDAY_YEAR, 167, 117, 37, 188, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
- LTEXT "Zodiak:", IDC_STATIC, 15, 134, 50, 8
- COMBOBOX IDC_ZODIAK, 65, 133, 139, 47, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
- GROUPBOX "Location", IDC_LOCATIONGROUP, 7, 157, 207, 60
- LTEXT "Country:", IDC_STATIC, 14, 170, 50, 8
- COMBOBOX IDC_COUNTRY, 64, 167, 143, 172, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP
- LTEXT "State:", IDC_STATIC, 14, 184, 50, 8
- COMBOBOX IDC_STATE, 64, 183, 143, 172, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
- CONTROL "Search online users only", IDC_ONLINEONLY, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 222, 143, 8
- LTEXT "City:", IDC_STATIC, 14, 200, 50, 8
- COMBOBOX IDC_CITY, 64, 199, 143, 172, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
- CONTROL "Remember", IDC_CHK_REMEMBER, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 157, 222, 56, 8
+ GROUPBOX "Summary",IDC_SUMMARYGROUP,8,5,205,147
+ LTEXT "Nickname:",IDC_STATIC,15,20,50,8
+ EDITTEXT IDC_NICK,65,18,139,12,ES_AUTOHSCROLL
+ LTEXT "First name:",IDC_STATIC,15,35,50,8
+ EDITTEXT IDC_FIRSTNAME,65,33,139,12,ES_AUTOHSCROLL
+ LTEXT "Last name:",IDC_STATIC,15,50,50,8
+ EDITTEXT IDC_LASTNAME,65,48,139,12,ES_AUTOHSCROLL
+ LTEXT "E-mail:",IDC_STATIC,15,65,50,8
+ EDITTEXT IDC_EMAIL_USER,65,63,69,12,ES_AUTOHSCROLL
+ CTEXT "@",IDC_STATIC,137,64,9,9
+ COMBOBOX IDC_EMAIL_DOMAIN,147,63,57,71,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
+ LTEXT "Gender:",IDC_STATIC,15,87,50,8
+ COMBOBOX IDC_GENDER,65,85,139,47,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+ LTEXT "Age:",IDC_STATIC,15,102,50,8
+ RTEXT "from:",IDC_STATIC,65,102,26,9
+ COMBOBOX IDC_AGERANGE_FROM,94,100,37,90,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+ RTEXT "to:",IDC_STATIC,134,102,30,9
+ COMBOBOX IDC_AGERANGE_TO,167,100,37,90,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+ LTEXT "Birthday:",IDC_STATIC,15,118,50,8
+ COMBOBOX IDC_BIRTHDAY_DAY,65,117,29,204,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+ COMBOBOX IDC_BIRTHDAY_MONTH,102,117,59,90,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
+ COMBOBOX IDC_BIRTHDAY_YEAR,167,117,37,188,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+ LTEXT "Zodiak:",IDC_STATIC,15,134,50,8
+ COMBOBOX IDC_ZODIAK,65,133,139,47,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+ GROUPBOX "Location",IDC_LOCATIONGROUP,7,157,207,60
+ LTEXT "Country:",IDC_STATIC,14,170,50,8
+ COMBOBOX IDC_COUNTRY,64,167,143,172,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+ LTEXT "State:",IDC_STATIC,14,184,50,8
+ COMBOBOX IDC_STATE,64,183,143,172,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
+ CONTROL "Search online users only",IDC_ONLINEONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,222,143,8
+ LTEXT "City:",IDC_STATIC,14,200,50,8
+ COMBOBOX IDC_CITY,64,199,143,172,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
+ CONTROL "Remember",IDC_CHK_REMEMBER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,157,222,56,8
END
IDD_OPT_AVATRS DIALOGEX 0, 0, 295, 195
@@ -152,21 +147,21 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE EXSTYLE WS_EX_CONTROLPARENT
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- GROUPBOX "Configuration", IDC_GROUPCONFIG, 8, 6, 277, 110
- CONTROL "Enable avatars support (loading)", IDC_ENABLE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 13, 18, 259, 9
- RTEXT "Server:", IDC_STATIC, 16, 31, 53, 8
- EDITTEXT IDC_SERVER, 72, 29, 140, 12, ES_AUTOHSCROLL
- RTEXT "Port:", IDC_STATIC, 16, 46, 53, 8
- EDITTEXT IDC_SERVERPORT, 72, 44, 34, 12, ES_AUTOHSCROLL | ES_NUMBER
- LTEXT "(80, 443, 2041)", IDC_STATIC, 110, 46, 103, 10
- PUSHBUTTON "Default", IDC_BUTTON_DEFAULT, 216, 29, 60, 13
- EDITTEXT IDC_UPD_CHECK_INTERVAL, 14, 71, 34, 12, ES_AUTOHSCROLL | ES_NUMBER
- LTEXT "Updates check interval, min", IDC_STATIC, 51, 72, 222, 8
- CONTROL "Return absolute path", IDC_RETURN_ABC_PATH, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 13, 89, 259, 9
- CONTROL "Delete avatar file with contact", IDC_DELETE_AVT_ON_CONTACT_DELETE,
- "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 13, 100, 259, 9
- CONTROL "Use keep-alive connections", IDC_USE_KEEPALIVE_CONN,
- "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 72, 59, 201, 9
+ GROUPBOX "Configuration",IDC_GROUPCONFIG,8,6,277,110
+ CONTROL "Enable avatars support (loading)",IDC_ENABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,18,259,9
+ RTEXT "Server:",IDC_STATIC,16,31,53,8
+ EDITTEXT IDC_SERVER,72,29,140,12,ES_AUTOHSCROLL
+ RTEXT "Port:",IDC_STATIC,16,46,53,8
+ EDITTEXT IDC_SERVERPORT,72,44,34,12,ES_AUTOHSCROLL | ES_NUMBER
+ LTEXT "(80, 443, 2041)",IDC_STATIC,110,46,103,10
+ PUSHBUTTON "Default",IDC_BUTTON_DEFAULT,216,29,60,13
+ EDITTEXT IDC_UPD_CHECK_INTERVAL,14,71,34,12,ES_AUTOHSCROLL | ES_NUMBER
+ LTEXT "Updates check interval, min",IDC_STATIC,51,72,222,8
+ CONTROL "Return absolute path",IDC_RETURN_ABC_PATH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,89,259,9
+ CONTROL "Delete avatar file with contact",IDC_DELETE_AVT_ON_CONTACT_DELETE,
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,100,259,9
+ CONTROL "Use keep-alive connections",IDC_USE_KEEPALIVE_CONN,
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,72,59,201,9
END
IDD_OPT_FILES DIALOGEX 0, 0, 295, 160
@@ -174,26 +169,26 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE EXSTYLE WS_EX_CONTROLPARENT
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- GROUPBOX "Files exchange", IDC_GROUPCONFIG2, 8, 7, 277, 143
- CONTROL "No out connection on send", IDC_FILE_SEND_NOOUTCONNECTIONONSEND,
- "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 25, 28, 244, 8
- CONTROL "No out connection on receive", IDC_FILE_SEND_NOOUTCONNECTIONONRECEIVE,
- "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 25, 39, 244, 8
- CONTROL "Out connections: ignory additional ports (443, 2041)", IDC_FILE_SEND_IGNORYADDITIONALPORTS,
- "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 25, 50, 244, 8
- CONTROL "Hide my IP addresses", IDC_FILE_SEND_HIDE_MY_ADDRESSES,
- "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 25, 61, 244, 8
- CONTROL "Add extra address", IDC_FILE_SEND_ADD_EXTRA_ADDRESS,
- "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 25, 72, 244, 8
- RTEXT "Your host (or router):", IDC_STATIC, 13, 84, 92, 8
- EDITTEXT IDC_FILE_SEND_EXTRA_ADDRESS, 108, 83, 170, 12, ES_AUTOHSCROLL
- LTEXT "File send block size:", IDC_STATIC, 14, 112, 263, 8
- EDITTEXT IDC_FILE_SEND_BLOCK_SIZE, 26, 123, 52, 12, ES_AUTOHSCROLL | ES_NUMBER
- LTEXT "512 - 65536 bytes", IDC_STATIC, 82, 125, 97, 10
- CONTROL "Enable direct connections", IDC_FILE_SEND_ENABLE_DIRECT_CONN,
- "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 14, 18, 263, 8
- CONTROL "Enable MRIM proxy connections", IDC_FILE_SEND_ENABLE_MRIMPROXY_CONS,
- "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 14, 98, 263, 8
+ GROUPBOX "Files exchange",IDC_GROUPCONFIG2,8,7,277,143
+ CONTROL "No out connection on send",IDC_FILE_SEND_NOOUTCONNECTIONONSEND,
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,25,28,244,8
+ CONTROL "No out connection on receive",IDC_FILE_SEND_NOOUTCONNECTIONONRECEIVE,
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,25,39,244,8
+ CONTROL "Out connections: ignory additional ports (443, 2041)",IDC_FILE_SEND_IGNORYADDITIONALPORTS,
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,25,50,244,8
+ CONTROL "Hide my IP addresses",IDC_FILE_SEND_HIDE_MY_ADDRESSES,
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,25,61,244,8
+ CONTROL "Add extra address",IDC_FILE_SEND_ADD_EXTRA_ADDRESS,
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,25,72,244,8
+ RTEXT "Your host (or router):",IDC_STATIC,13,84,92,8
+ EDITTEXT IDC_FILE_SEND_EXTRA_ADDRESS,108,83,170,12,ES_AUTOHSCROLL
+ LTEXT "File send block size:",IDC_STATIC,14,112,263,8
+ EDITTEXT IDC_FILE_SEND_BLOCK_SIZE,26,123,52,12,ES_AUTOHSCROLL | ES_NUMBER
+ LTEXT "512 - 65536 bytes",IDC_STATIC,82,125,97,10
+ CONTROL "Enable direct connections",IDC_FILE_SEND_ENABLE_DIRECT_CONN,
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,18,263,8
+ CONTROL "Enable MRIM proxy connections",IDC_FILE_SEND_ENABLE_MRIMPROXY_CONS,
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,98,263,8
END
IDD_OPT_ACCOUNT DIALOGEX 0, 0, 295, 149
@@ -201,16 +196,16 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE EXSTYLE WS_EX_CONTROLPARENT
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- GROUPBOX "Mail.ru Agent", IDC_GROUPMAIN, 9, 5, 276, 98, WS_GROUP
- RTEXT "Full e-mail:", IDC_STATIC, 14, 22, 52, 8
- EDITTEXT IDC_LOGIN, 72, 18, 100, 12, ES_AUTOHSCROLL
- LTEXT "Example: Petrov_Ivan@mail.ru", IDC_STATIC, 175, 19, 104, 10
- RTEXT "Password:", IDC_STATIC, 14, 37, 52, 8
- EDITTEXT IDC_PASSWORD, 72, 33, 100, 12, ES_PASSWORD | ES_AUTOHSCROLL
- CONTROL "Create a new Mail.ru account using the Mail.ru website", IDC_NEW_ACCOUNT_LINK,
- "Hyperlink", WS_TABSTOP, 18, 72, 258, 9
- CONTROL "Retrieve a lost password", IDC_LOOKUPLINK, "Hyperlink", WS_TABSTOP, 18, 85, 258, 9
- LTEXT "Leave empty if you dont want change password", IDC_STATIC, 72, 48, 212, 8
+ GROUPBOX "Mail.ru Agent",IDC_GROUPMAIN,9,5,276,98,WS_GROUP
+ RTEXT "Full e-mail:",IDC_STATIC,14,22,52,8
+ EDITTEXT IDC_LOGIN,72,18,100,12,ES_AUTOHSCROLL
+ LTEXT "Example: Petrov_Ivan@mail.ru",IDC_STATIC,175,19,104,10
+ RTEXT "Password:",IDC_STATIC,14,37,52,8
+ EDITTEXT IDC_PASSWORD,72,33,100,12,ES_PASSWORD | ES_AUTOHSCROLL
+ CONTROL "Create a new Mail.ru account using the Mail.ru website",IDC_NEW_ACCOUNT_LINK,
+ "Hyperlink",WS_TABSTOP,18,72,258,9
+ CONTROL "Retrieve a lost password",IDC_LOOKUPLINK,"Hyperlink",WS_TABSTOP,18,85,258,9
+ LTEXT "Leave empty if you dont want change password",IDC_STATIC,72,48,212,8
END
IDD_OPT_POPUPS DIALOGEX 0, 0, 295, 150
@@ -218,18 +213,18 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE EXSTYLE WS_EX_CONTROLPARENT
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- RTEXT "PopUp type", IDC_STATIC, 9, 11, 52, 8
- COMBOBOX IDC_COMBO_POPUP_TYPE, 65, 9, 220, 97, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
- GROUPBOX "Popup settings", IDC_GROUPMAIN, 9, 25, 276, 90, WS_GROUP
- CONTROL "Enable", IDC_CHK_ENABLE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 17, 38, 260, 10
- CONTROL "&Use Windows colors", IDC_CHK_USE_WIN_COLORS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 29, 50, 246, 10
- RTEXT "Back Color", IDC_STATIC, 29, 65, 57, 8
- CONTROL "", IDC_POPUP_BACKCOLOR, "ColourPicker", WS_TABSTOP, 92, 65, 38, 10
- RTEXT "Text Color", IDC_STATIC, 29, 80, 57, 8
- CONTROL "", IDC_POPUP_TEXTCOLOR, "ColourPicker", WS_TABSTOP, 92, 80, 38, 10
- RTEXT "Timeout", IDC_STATIC, 29, 96, 57, 8
- EDITTEXT IDC_POPUP_TIMEOUT, 92, 94, 38, 12, ES_AUTOHSCROLL | ES_NUMBER
- PUSHBUTTON "Previe&w", IDC_PREVIEW, 237, 119, 46, 12
+ RTEXT "PopUp type",IDC_STATIC,9,11,52,8
+ COMBOBOX IDC_COMBO_POPUP_TYPE,65,9,220,97,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+ GROUPBOX "Popup settings",IDC_GROUPMAIN,9,25,276,90,WS_GROUP
+ CONTROL "Enable",IDC_CHK_ENABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,38,260,10
+ CONTROL "&Use Windows colors",IDC_CHK_USE_WIN_COLORS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,29,50,246,10
+ RTEXT "Back Color",IDC_STATIC,29,65,57,8
+ CONTROL "",IDC_POPUP_BACKCOLOR,"ColourPicker",WS_TABSTOP,92,65,38,10
+ RTEXT "Text Color",IDC_STATIC,29,80,57,8
+ CONTROL "",IDC_POPUP_TEXTCOLOR,"ColourPicker",WS_TABSTOP,92,80,38,10
+ RTEXT "Timeout",IDC_STATIC,29,96,57,8
+ EDITTEXT IDC_POPUP_TIMEOUT,92,94,38,12,ES_AUTOHSCROLL | ES_NUMBER
+ PUSHBUTTON "Previe&w",IDC_PREVIEW,237,119,46,12
END
IDD_SETXSTATUS DIALOGEX 0, 0, 189, 98
@@ -238,13 +233,14 @@ EXSTYLE WS_EX_CONTROLPARENT CAPTION "Custom Status ""%s"" Details"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- DEFPUSHBUTTON "Closing in %d", IDOK, 49, 79, 91, 14
- LTEXT "Title:", IDC_STATIC, 5, 0, 179, 8
- EDITTEXT IDC_XTITLE, 5, 8, 179, 13
- LTEXT "Message:", IDC_STATIC, 5, 22, 179, 8
- EDITTEXT IDC_XMSG, 5, 31, 179, 43, ES_MULTILINE | ES_AUTOVSCROLL | ES_WANTRETURN | WS_VSCROLL
+ DEFPUSHBUTTON "Closing in %d",IDOK,49,79,91,14
+ LTEXT "Title:",IDC_STATIC,5,0,179,8
+ EDITTEXT IDC_XTITLE,5,8,179,13
+ LTEXT "Message:",IDC_STATIC,5,22,179,8
+ EDITTEXT IDC_XMSG,5,31,179,43,ES_MULTILINE | ES_AUTOVSCROLL | ES_WANTRETURN | WS_VSCROLL
END
+
/////////////////////////////////////////////////////////////////////////////
//
// DESIGNINFO
@@ -253,6 +249,10 @@ END #ifdef APSTUDIO_INVOKED
GUIDELINES DESIGNINFO
BEGIN
+ IDD_OPT_CONNECTIONS, DIALOG
+ BEGIN
+ END
+
IDD_MRAADVANCEDSEARCH, DIALOG
BEGIN
BOTTOMMARGIN, 230
@@ -262,6 +262,10 @@ BEGIN BEGIN
BOTTOMMARGIN, 150
END
+
+ IDD_OPT_ACCOUNT, DIALOG
+ BEGIN
+ END
END
#endif // APSTUDIO_INVOKED
@@ -270,13 +274,11 @@ END /////////////////////////////////////////////////////////////////////////////
-// Russian resources
+// Russian (Russia) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_RUS)
-#ifdef _WIN32
LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
#pragma code_page(1251)
-#endif //_WIN32
/////////////////////////////////////////////////////////////////////////////
//
@@ -297,39 +299,39 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE EXSTYLE WS_EX_CONTROLPARENT
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
- GROUPBOX "Configuration", IDC_GROUPCONFIG, 8, 6, 277, 197
- CONTROL "Enable Anti Spam", IDC_ENABLE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 13, 18, 259, 9
- CONTROL "Check temp contacts", IDC_CHK_TEMP_CONTACTS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 24, 29, 248, 9
- CONTROL "Delete spam bot contacts", IDC_DELETE_SPAMBOT_CONTACT,
- "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 34, 40, 238, 9
- EDITTEXT IDC_MAX_LANG_CHANGES, 23, 67, 33, 12, ES_AUTOHSCROLL | ES_NUMBER
- LTEXT "Max. language changes in message (0 - disabled)", IDC_STATIC, 59, 69, 220, 11
- CONTROL "Show pop up", IDC_SHOWPOPUP, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 24, 82, 248, 9
- CONTROL "Write to system history", IDC_WRITETOSYSTEMHISTORY,
- "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 24, 92, 248, 9
- CONTROL "Send spam report to server", IDC_SEND_SPAM_REPORT_TO_SERVER,
- "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 24, 102, 248, 9
- LTEXT "Bad words list", IDC_STATIC, 25, 115, 96, 11
- LISTBOX IDC_BAD_WORDS_LIST, 25, 127, 121, 71, LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
- EDITTEXT IDC_EDIT_BAD_WORD, 152, 171, 129, 12, ES_AUTOHSCROLL
- PUSHBUTTON "Add", IDC_BUTTON_ADD, 152, 186, 42, 14
- PUSHBUTTON "Remove", IDC_BUTTONREMOVE, 198, 186, 40, 14, BS_CENTER
- PUSHBUTTON "Default", IDC_BUTTON_DEFAULT, 242, 186, 40, 14, BS_CENTER
- CONTROL "Ignory non AlphaNumeric characters", IDC_CLN_NON_ALPHNUM,
- "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 24, 56, 248, 9
+ GROUPBOX "Configuration",IDC_GROUPCONFIG,8,6,277,197
+ CONTROL "Enable Anti Spam",IDC_ENABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,18,259,9
+ CONTROL "Check temp contacts",IDC_CHK_TEMP_CONTACTS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,24,29,248,9
+ CONTROL "Delete spam bot contacts",IDC_DELETE_SPAMBOT_CONTACT,
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,34,40,238,9
+ EDITTEXT IDC_MAX_LANG_CHANGES,23,67,33,12,ES_AUTOHSCROLL | ES_NUMBER
+ LTEXT "Max. language changes in message (0 - disabled)",IDC_STATIC,59,69,220,11
+ CONTROL "Show pop up",IDC_SHOWPOPUP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,24,82,248,9
+ CONTROL "Write to system history",IDC_WRITETOSYSTEMHISTORY,
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,24,92,248,9
+ CONTROL "Send spam report to server",IDC_SEND_SPAM_REPORT_TO_SERVER,
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,24,102,248,9
+ LTEXT "Bad words list",IDC_STATIC,25,115,96,11
+ LISTBOX IDC_BAD_WORDS_LIST,25,127,121,71,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
+ EDITTEXT IDC_EDIT_BAD_WORD,152,171,129,12,ES_AUTOHSCROLL
+ PUSHBUTTON "Add",IDC_BUTTON_ADD,152,186,42,14
+ PUSHBUTTON "Remove",IDC_BUTTONREMOVE,198,186,40,14,BS_CENTER
+ PUSHBUTTON "Default",IDC_BUTTON_DEFAULT,242,186,40,14,BS_CENTER
+ CONTROL "Ignory non AlphaNumeric characters",IDC_CLN_NON_ALPHNUM,
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,24,56,248,9
END
IDD_MINIBLOG DIALOGEX 0, 0, 256, 134
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
- DEFPUSHBUTTON "OK", IDOK, 76, 113, 50, 14, WS_DISABLED
- PUSHBUTTON "Cancel", IDCANCEL, 130, 113, 50, 14
- EDITTEXT IDC_USER_BLOG_STATUS_MSG, 7, 19, 242, 38, ES_MULTILINE | ES_READONLY
- EDITTEXT IDC_MSG_TO_SEND, 7, 61, 242, 38, ES_MULTILINE
- CONTROL "Notify", IDC_CHK_NOTIFY, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 102, 125, 9
- LTEXT "Writed:", IDC_STATIC_WRITED_TIME, 7, 7, 242, 11
- LTEXT "0/500", IDC_STATIC_CHARS_COUNTER, 211, 103, 38, 11, 0, WS_EX_RIGHT
+ DEFPUSHBUTTON "OK",IDOK,76,113,50,14,WS_DISABLED
+ PUSHBUTTON "Cancel",IDCANCEL,130,113,50,14
+ EDITTEXT IDC_USER_BLOG_STATUS_MSG,7,19,242,38,ES_MULTILINE | ES_READONLY
+ EDITTEXT IDC_MSG_TO_SEND,7,61,242,38,ES_MULTILINE
+ CONTROL "Notify",IDC_CHK_NOTIFY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,102,125,9
+ LTEXT "Writed:",IDC_STATIC_WRITED_TIME,7,7,242,11
+ LTEXT "0/500",IDC_STATIC_CHARS_COUNTER,211,103,38,11,0,WS_EX_RIGHT
END
@@ -379,18 +381,16 @@ END #endif // APSTUDIO_INVOKED
-#endif // Russian resources
+#endif // Russian (Russia) resources
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
+// English (United States) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
#pragma code_page(1252)
-#endif //_WIN32
/////////////////////////////////////////////////////////////////////////////
//
@@ -402,9 +402,9 @@ STYLE DS_SETFONT | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION CAPTION "Select e-mail"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
- LISTBOX IDC_LIST_EMAILS, 7, 7, 163, 133, LBS_SORT | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | NOT WS_BORDER | WS_VSCROLL | WS_TABSTOP, WS_EX_STATICEDGE
- DEFPUSHBUTTON "OK", IDOK, 39, 147, 51, 15
- PUSHBUTTON "Cancel", IDCANCEL, 93, 147, 51, 15
+ LISTBOX IDC_LIST_EMAILS,7,7,163,133,LBS_SORT | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | NOT WS_BORDER | WS_VSCROLL | WS_TABSTOP,WS_EX_STATICEDGE
+ DEFPUSHBUTTON "OK",IDOK,39,147,51,15
+ PUSHBUTTON "Cancel",IDCANCEL,93,147,51,15
END
@@ -426,7 +426,7 @@ BEGIN END
#endif // APSTUDIO_INVOKED
-#endif // English (U.S.) resources
+#endif // English (United States) resources
/////////////////////////////////////////////////////////////////////////////
diff --git a/protocols/MRA/src/MraConstans.h b/protocols/MRA/src/MraConstans.h index 17b73e5642..fd8cd7d16e 100644 --- a/protocols/MRA/src/MraConstans.h +++ b/protocols/MRA/src/MraConstans.h @@ -242,14 +242,14 @@ static const LPSTR lpcszMailRuDomains[] = #define MS_ICQ_SENDSMS "/SendSMS"
// Database setting names
-#define DBSETTING_CAPABILITIES "caps"
-#define DBSETTING_XSTATUSID "XStatusId"
-#define DBSETTING_XSTATUSNAME "XStatusName"
-#define DBSETTING_XSTATUSMSG "XStatusMsg"
-#define DBSETTING_BLOGSTATUSTIME "BlogStatusTime"
-#define DBSETTING_BLOGSTATUSID "BlogStatusID"
-#define DBSETTING_BLOGSTATUS "BlogStatus"
-#define DBSETTING_BLOGSTATUSMUSIC "ListeningTo"
+#define DBSETTING_CAPABILITIES "caps"
+#define DBSETTING_XSTATUSID "XStatusId"
+#define DBSETTING_XSTATUSNAME "XStatusName"
+#define DBSETTING_XSTATUSMSG "XStatusMsg"
+#define DBSETTING_BLOGSTATUSTIME "BlogStatusTime"
+#define DBSETTING_BLOGSTATUSID "BlogStatusID"
+#define DBSETTING_BLOGSTATUS "BlogStatus"
+#define DBSETTING_BLOGSTATUSMUSIC "ListeningTo"
#define CSSF_MASK_STATUS 0x0001 // status member valid for set/get
#define CSSF_MASK_NAME 0x0002 // pszName member valid for set/get
diff --git a/protocols/MRA/src/Mra_options.cpp b/protocols/MRA/src/Mra_options.cpp index c692f3e244..30e4be9759 100644 --- a/protocols/MRA/src/Mra_options.cpp +++ b/protocols/MRA/src/Mra_options.cpp @@ -134,8 +134,6 @@ INT_PTR CALLBACK DlgProcOptsConnections(HWND hWndDlg, UINT msg, WPARAM wParam, L CHECK_DLG_BUTTON(hWndDlg, IDC_TRAYICON_NEW_MAIL_NOTIFY_CLICK_TO_INBOX, ppro->mraGetByte(NULL, "TrayIconNewMailClkToInbox", MRA_DEFAULT_TRAYICON_NEW_MAIL_CLK_TO_INBOX));
EnableWindow(GetDlgItem(hWndDlg, IDC_TRAYICON_NEW_MAIL_NOTIFY_CLICK_TO_INBOX), ppro->mraGetByte(NULL, "TrayIconNewMailNotify", MRA_DEFAULT_TRAYICON_NEW_MAIL_NOTIFY));
- CHECK_DLG_BUTTON(hWndDlg, IDC_HIDE_MENU_ITEMS_FOR_NON_MRA, ppro->mraGetByte(NULL, "HideMenuItemsForNonMRAContacts", MRA_DEFAULT_HIDE_MENU_ITEMS_FOR_NON_MRA));
-
CHECK_DLG_BUTTON(hWndDlg, IDC_RTF_RECEIVE_ENABLE, ppro->mraGetByte(NULL, "RTFReceiveEnable", MRA_DEFAULT_RTF_RECEIVE_ENABLE));
CHECK_DLG_BUTTON(hWndDlg, IDC_RTF_SEND_ENABLE, ppro->mraGetByte(NULL, "RTFSendEnable", MRA_DEFAULT_RTF_SEND_ENABLE));
@@ -207,8 +205,6 @@ INT_PTR CALLBACK DlgProcOptsConnections(HWND hWndDlg, UINT msg, WPARAM wParam, L ppro->mraSetByte(NULL, "TrayIconNewMailNotify", IS_DLG_BUTTON_CHECKED(hWndDlg, IDC_TRAYICON_NEW_MAIL_NOTIFY));
ppro->mraSetByte(NULL, "TrayIconNewMailClkToInbox", IS_DLG_BUTTON_CHECKED(hWndDlg, IDC_TRAYICON_NEW_MAIL_NOTIFY_CLICK_TO_INBOX));
- ppro->mraSetByte(NULL, "HideMenuItemsForNonMRAContacts", IS_DLG_BUTTON_CHECKED(hWndDlg, IDC_HIDE_MENU_ITEMS_FOR_NON_MRA));
-
ppro->mraSetByte(NULL, "RTFReceiveEnable", IS_DLG_BUTTON_CHECKED(hWndDlg, IDC_RTF_RECEIVE_ENABLE));
ppro->mraSetByte(NULL, "RTFSendEnable", IS_DLG_BUTTON_CHECKED(hWndDlg, IDC_RTF_SEND_ENABLE));
ppro->mraSetDword(NULL, "RTFBackgroundColour", SEND_DLG_ITEM_MESSAGE(hWndDlg, IDC_RTF_BGCOLOUR, CPM_GETCOLOUR, 0, 0));
diff --git a/protocols/MRA/src/Mra_svcs.cpp b/protocols/MRA/src/Mra_svcs.cpp index 28c761a5c4..545f07ad2e 100644 --- a/protocols/MRA/src/Mra_svcs.cpp +++ b/protocols/MRA/src/Mra_svcs.cpp @@ -606,17 +606,7 @@ int CMraProto::MraRebuildContactMenu(WPARAM wParam, LPARAM lParam) mraGetStaticStringW(hContact, DBSETTING_BLOGSTATUS, NULL, 0, &dwBlogStatusMsgSize);
}
// non proto contact
- else {
- bHasEMail = FALSE;
- bHasEMailMR = FALSE;
- bChatAgent = FALSE;
- if (mraGetByte(NULL, "HideMenuItemsForNonMRAContacts", MRA_DEFAULT_HIDE_MENU_ITEMS_FOR_NON_MRA) == FALSE)
- if (IsContactMraProto(hContact) == FALSE)// избегаем добавления менюшек в контакты других копий MRA
- if (GetContactEMailCount(hContact, FALSE)) {
- bHasEMail = TRUE;
- if (GetContactEMailCount(hContact, TRUE)) bHasEMailMR = TRUE;
- }
- }
+ else bHasEMail = bHasEMailMR = bChatAgent = FALSE;
//"Request authorization"
CListShowMenuItem(hContactMenuItems[0], (m_bLoggedIn && bIsContactMRA));// && (dwContactSeverFlags&CONTACT_INTFLAG_NOT_AUTHORIZED)
diff --git a/protocols/MRA/src/resource.h b/protocols/MRA/src/resource.h index aa5469d599..f6eae9e9ff 100644 --- a/protocols/MRA/src/resource.h +++ b/protocols/MRA/src/resource.h @@ -41,7 +41,6 @@ #define IDC_SLOWSEND 1003
#define IDC_RETURN_ABC_PATH 1004
#define IDC_FILE_SEND_HIDE_MY_ADDRESSES 1004
-#define IDC_HIDE_MENU_ITEMS_FOR_NON_MRA 1004
#define IDC_RTF_SEND_ENABLE 1005
#define IDC_RTF_BGCOLOUR 1006
#define IDC_CVT_SMILES_ON_SEND_TEXT 1007
|