ICQ-WIM:

- advanced options moved to the separate dialog;
- option added to launch a browser on tray icon click;
- now additional email events aren't added if one is already active;
- duplicate notification removed

1 files changed, 32 insertions, 14 deletions

diff --git a/protocols/ICQ-WIM/res/resources.rc b/protocols/ICQ-WIM/res/resources.rc
index 6e3fe41527..1abfa72b0d 100644
--- a/protocols/ICQ-WIM/res/resources.rc
+++ b/protocols/ICQ-WIM/res/resources.rc
@@ -47,29 +47,38 @@ BEGIN
     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, 125
 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,74
+    GROUPBOX        "ICQ",IDC_STATIC,1,0,305,62
     RTEXT           "UIN/e-mail:",IDC_STATIC,10,14,79,8
     EDITTEXT        IDC_UIN,98,12,106,12,ES_AUTOHSCROLL
     RTEXT           "Password:",IDC_STATIC,10,30,79,8
     EDITTEXT        IDC_PASSWORD,98,29,106,12,ES_PASSWORD | ES_AUTOHSCROLL
     CONTROL         "Do not open chat windows on creation",IDC_HIDECHATS,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,47,285,10
-    CONTROL         "Use tray icon notifications",IDC_USETRAYICON,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,59,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
+    CONTROL         "Use tray icon notifications",IDC_USETRAYICON,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,73,285,10
+    PUSHBUTTON      "Sign in/sign up using phone",IDC_REGISTER,165,106,142,14
+    GROUPBOX        "E-mail",IDC_STATIC,1,62,306,40
+    CONTROL         "Launch mailbox in a browser on click",IDC_LAUNCH_MAILBOX,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,21,86,281,10
+END
+
+IDD_OPTIONS_ADV DIALOGEX 0, 0, 310, 86
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
+EXSTYLE WS_EX_CONTROLPARENT
+FONT 8, "MS Shell Dlg", 0, 0, 0x1
+BEGIN
+    LTEXT           "If a contact goes Offline, set this status instead and cache it for given timeout in seconds (0 - disabled)",IDC_STATIC,12,16,204,23
+    EDITTEXT        IDC_DIFF1,221,13,54,12,ES_AUTOHSCROLL
+    CONTROL         "",IDC_SPIN1,"msctls_updown32",UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS,275,12,11,14
+    COMBOBOX        IDC_STATUS1,221,28,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,49,204,23
+    EDITTEXT        IDC_DIFF2,221,46,54,12,ES_AUTOHSCROLL
+    CONTROL         "",IDC_SPIN2,"msctls_updown32",UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS,275,45,11,14
+    COMBOBOX        IDC_STATUS2,221,61,81,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
 END
 
 IDD_GROUPCHAT_INVITE DIALOGEX 0, 0, 215, 263
@@ -142,7 +151,11 @@ BEGIN
 
     IDD_OPTIONS_FULL, DIALOG
     BEGIN
-        BOTTOMMARGIN, 169
+        BOTTOMMARGIN, 120
+    END
+
+    IDD_OPTIONS_ADV, DIALOG
+    BEGIN
     END
 
     IDD_GROUPCHAT_INVITE, DIALOG
@@ -204,6 +217,11 @@ BEGIN
     0
 END
 
+IDD_OPTIONS_ADV AFX_DIALOG_LAYOUT
+BEGIN
+    0
+END
+
 
 #ifdef APSTUDIO_INVOKED
 /////////////////////////////////////////////////////////////////////////////