ICQ-WIM:

- DWORD UIN dumped and replaced everywhere with CMStringW aimId;
- additional Email field removed from options, now UIN acts like email
- MRA is fully supported
- version bump

1 files changed, 23 insertions, 26 deletions

diff --git a/protocols/ICQ-WIM/res/resources.rc b/protocols/ICQ-WIM/res/resources.rc
index b2ccdc6a82..084705d83d 100644
--- a/protocols/ICQ-WIM/res/resources.rc
+++ b/protocols/ICQ-WIM/res/resources.rc
@@ -23,44 +23,40 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 // Dialog
 //
 
-IDD_OPTIONS_ACCMGR DIALOGEX 0, 0, 186, 69
+IDD_OPTIONS_ACCMGR DIALOGEX 0, 0, 189, 51
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
 EXSTYLE WS_EX_CONTROLPARENT
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
-    LTEXT           "ICQ number:",IDC_STATIC,0,2,53,8
+    LTEXT           "UIN/e-mail:",IDC_STATIC,0,2,53,8
     EDITTEXT        IDC_UIN,54,0,131,12,ES_AUTOHSCROLL
-    LTEXT           "Email:",IDC_STATIC,0,18,53,8
-    EDITTEXT        IDC_EMAIL,54,16,131,12,ES_AUTOHSCROLL
-    LTEXT           "Password:",IDC_STATIC,0,33,53,8
-    EDITTEXT        IDC_PASSWORD,54,32,131,12,ES_PASSWORD | ES_AUTOHSCROLL
-    PUSHBUTTON      "Sign in/sign up using phone",IDC_REGISTER,42,49,142,14
+    LTEXT           "Password:",IDC_STATIC,0,18,53,8
+    EDITTEXT        IDC_PASSWORD,54,17,131,12,ES_PASSWORD | ES_AUTOHSCROLL
+    PUSHBUTTON      "Sign in/sign up using phone",IDC_REGISTER,42,34,142,14
 END
 
-IDD_OPTIONS_FULL DIALOGEX 0, 0, 310, 174
+IDD_OPTIONS_FULL DIALOGEX 0, 0, 310, 161
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
 EXSTYLE WS_EX_CONTROLPARENT
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
-    GROUPBOX        "ICQ",IDC_STATIC,4,0,302,75
-    RTEXT           "ICQ number:",IDC_STATIC,12,14,51,8
+    GROUPBOX        "ICQ",IDC_STATIC,4,0,302,63
+    RTEXT           "UIN/e-mail:",IDC_STATIC,12,14,51,8
     EDITTEXT        IDC_UIN,68,12,106,12,ES_AUTOHSCROLL
-    RTEXT           "Email:",IDC_STATIC,12,29,51,8
-    EDITTEXT        IDC_EMAIL,68,27,106,12,ES_AUTOHSCROLL
-    RTEXT           "Password:",IDC_STATIC,12,43,51,8
-    EDITTEXT        IDC_PASSWORD,68,42,106,12,ES_PASSWORD | ES_AUTOHSCROLL
+    RTEXT           "Password:",IDC_STATIC,12,30,51,8
+    EDITTEXT        IDC_PASSWORD,68,29,106,12,ES_PASSWORD | ES_AUTOHSCROLL
     CONTROL         "Do not open chat windows on creation",IDC_HIDECHATS,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,61,285,10
-    GROUPBOX        "Advanced",IDC_STATIC,4,75,302,77
-    LTEXT           "If a contact goes Offline, set this status instead and cache it for given timeout in seconds (0 - disabled)",IDC_STATIC,12,88,204,23
-    EDITTEXT        IDC_DIFF1,221,85,54,12,ES_AUTOHSCROLL
-    CONTROL         "",IDC_SPIN1,"msctls_updown32",UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS,275,84,11,14
-    COMBOBOX        IDC_STATUS1,221,100,81,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT           "After that, set this status to a contact and move it offline after specified timeout in seconds (0 - disabled)",IDC_STATIC,12,121,204,23
-    EDITTEXT        IDC_DIFF2,221,118,54,12,ES_AUTOHSCROLL
-    CONTROL         "",IDC_SPIN2,"msctls_updown32",UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS,275,117,11,14
-    COMBOBOX        IDC_STATUS2,221,133,81,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    PUSHBUTTON      "Sign in/sign up using phone",IDC_REGISTER,165,155,142,14
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,48,285,10
+    GROUPBOX        "Advanced",IDC_STATIC,4,62,302,77
+    LTEXT           "If a contact goes Offline, set this status instead and cache it for given timeout in seconds (0 - disabled)",IDC_STATIC,12,75,204,23
+    EDITTEXT        IDC_DIFF1,221,72,54,12,ES_AUTOHSCROLL
+    CONTROL         "",IDC_SPIN1,"msctls_updown32",UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS,275,71,11,14
+    COMBOBOX        IDC_STATUS1,221,87,81,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT           "After that, set this status to a contact and move it offline after specified timeout in seconds (0 - disabled)",IDC_STATIC,12,108,204,23
+    EDITTEXT        IDC_DIFF2,221,105,54,12,ES_AUTOHSCROLL
+    CONTROL         "",IDC_SPIN2,"msctls_updown32",UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS,275,104,11,14
+    COMBOBOX        IDC_STATUS2,221,120,81,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    PUSHBUTTON      "Sign in/sign up using phone",IDC_REGISTER,165,143,142,14
 END
 
 IDD_GROUPCHAT_INVITE DIALOGEX 0, 0, 215, 263
@@ -128,11 +124,12 @@ GUIDELINES DESIGNINFO
 BEGIN
     IDD_OPTIONS_ACCMGR, DIALOG
     BEGIN
+        RIGHTMARGIN, 186
     END
 
     IDD_OPTIONS_FULL, DIALOG
     BEGIN
-        BOTTOMMARGIN, 169
+        BOTTOMMARGIN, 156
     END
 
     IDD_GROUPCHAT_INVITE, DIALOG