icq10: options dialog

1 files changed, 7 insertions, 98 deletions

diff --git a/protocols/Icq10/res/resources.rc b/protocols/Icq10/res/resources.rc
index 424b919f93..5a845f575e 100644
--- a/protocols/Icq10/res/resources.rc
+++ b/protocols/Icq10/res/resources.rc
@@ -23,7 +23,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 // Dialog
 //
 
-IDD_ICQACCOUNT DIALOGEX 0, 0, 186, 68
+IDD_OPTIONS_ACCMGR DIALOGEX 0, 0, 186, 68
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
 EXSTYLE WS_EX_CONTROLPARENT
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
@@ -31,110 +31,19 @@ BEGIN
     LTEXT           "ICQ Number:",IDC_STATIC,0,0,53,12
     EDITTEXT        IDC_UIN,54,0,131,12,ES_AUTOHSCROLL
     LTEXT           "Password:",IDC_STATIC,0,16,53,12
-    EDITTEXT        IDC_PW,54,16,131,12,ES_PASSWORD | ES_AUTOHSCROLL
-    CONTROL         "Create a new ICQ account",IDC_REGISTER,"Hyperlink",WS_TABSTOP,0,49,174,12
+    EDITTEXT        IDC_PASSWORD,54,16,131,12,ES_PASSWORD | ES_AUTOHSCROLL
 END
 
-IDD_OPT_ICQ DIALOGEX 0, 0, 310, 234
+IDD_OPTIONS_FULL DIALOGEX 0, 0, 310, 234
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
 EXSTYLE WS_EX_CONTROLPARENT
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
-    GROUPBOX        "ICQ",IDC_STICQGROUP,4,0,302,93
-    RTEXT           "ICQ number:",IDC_STATIC11,12,14,51,8
-    EDITTEXT        IDC_ICQNUM,68,12,106,12,ES_AUTOHSCROLL
-    RTEXT           "Password:",IDC_STATIC12,12,28,51,8
+    GROUPBOX        "ICQ",IDC_STATIC,4,0,302,93
+    RTEXT           "ICQ number:",IDC_STATIC,12,14,51,8
+    EDITTEXT        IDC_UIN,68,12,106,12,ES_AUTOHSCROLL
+    RTEXT           "Password:",IDC_STATIC,12,28,51,8
     EDITTEXT        IDC_PASSWORD,68,26,106,12,ES_PASSWORD | ES_AUTOHSCROLL
-    LTEXT           "Hint: If you don't enter your password here, Miranda will ask for the password every time you try to go online.",IDC_STATIC,12,43,286,19
-    CONTROL         "Retrieve a lost password or ICQ number",IDC_LOOKUPLINK,
-                    "Hyperlink",WS_TABSTOP,12,78,286,8
-    CONTROL         "Create a new ICQ account using the ICQ website",IDC_NEWUINLINK,
-                    "Hyperlink",WS_TABSTOP,12,66,286,8
-    GROUPBOX        "Connection settings",IDC_STATIC,4,94,302,136
-    LTEXT           "Login Server:",IDC_STATIC,12,108,55,8
-    EDITTEXT        IDC_ICQSERVER,68,106,106,12,ES_AUTOHSCROLL
-    LTEXT           "Port:",IDC_STATIC,182,108,25,8
-    EDITTEXT        IDC_ICQPORT,208,106,29,12,ES_AUTOHSCROLL | ES_NUMBER
-    PUSHBUTTON      "Default",IDC_RESETSERVER,241,106,56,12
-    LTEXT           "Hint: Use port 0 to connect on a random port. Try port 80 or port 443 if you are having problems connecting through an http proxy server.",IDC_STATIC,12,120,286,18
-    CONTROL         "Secure Connection (SSL)",IDC_SSL,"Button",BS_AUTOCHECKBOX | BS_TOP | WS_TABSTOP,12,138,290,10
-    CONTROL         "Secure (MD5) login",IDC_MD5LOGIN,"Button",BS_AUTOCHECKBOX | BS_TOP | WS_TABSTOP,12,150,290,10
-    CONTROL         "Legacy fix (for ICQ Groupware or IServerD only)",IDC_LEGACY,
-                    "Button",BS_AUTOCHECKBOX | BS_TOP | WS_TABSTOP,12,162,290,10
-    CONTROL         "Send 'Keep-alives' (enable this if you use a proxy server and frequently get disconnected)",IDC_KEEPALIVE,
-                    "Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | WS_TABSTOP,12,174,290,18
-    CONTROL         "Ignore concurrent error messages",IDC_NOERRMULTI,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,192,290,10
-    LTEXT           "Show connection error messages:",IDC_STATIC,12,204,290,8
-    CONTROL         "Slider1",IDC_LOGLEVEL,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,12,216,58,10
-    LTEXT           "",IDC_LEVELDESCR,72,216,230,10,SS_NOPREFIX
-END
-
-IDD_OPT_POPUPS DIALOGEX 0, 0, 314, 251
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
-EXSTYLE WS_EX_CONTROLPARENT
-FONT 8, "MS Shell Dlg", 0, 0, 0x1
-BEGIN
-    GROUPBOX        "Options",IDC_STATIC,4,4,305,71
-    CONTROL         "Enable popup support",IDC_POPUPS_ENABLED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,19,216,10
-    CONTROL         "Display errors using popups",IDC_POPUPS_LOG_ENABLED,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,37,216,10
-    CONTROL         "Display popup when spambot is detected",IDC_POPUPS_SPAM_ENABLED,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,50,216,10
-    GROUPBOX        "Look && Feel",IDC_STATIC,4,80,305,160
-    LTEXT           "Back Color",IDC_STATIC,80,93,42,8
-    LTEXT           "Text Color",IDC_STATIC,130,93,40,8
-    LTEXT           "Timeout",IDC_STATIC,182,93,60,8
-    LTEXT           "Note",IDC_STATIC,12,105,60,8
-    CONTROL         "",IDC_POPUP_LOG0_BACKCOLOR,"ColourPicker",WS_TABSTOP,80,104,39,10
-    CONTROL         "",IDC_POPUP_LOG0_TEXTCOLOR,"ColourPicker",WS_TABSTOP,130,104,39,10
-    EDITTEXT        IDC_POPUP_LOG0_TIMEOUT,182,103,34,12,ES_AUTOHSCROLL | ES_NUMBER
-    LTEXT           "Warning",IDC_STATIC,12,120,60,8
-    CONTROL         "",IDC_POPUP_LOG1_BACKCOLOR,"ColourPicker",WS_TABSTOP,80,119,39,10
-    CONTROL         "",IDC_POPUP_LOG1_TEXTCOLOR,"ColourPicker",WS_TABSTOP,130,119,39,10
-    EDITTEXT        IDC_POPUP_LOG1_TIMEOUT,182,118,34,12,ES_AUTOHSCROLL | ES_NUMBER
-    LTEXT           "Error",IDC_STATIC,12,135,60,8
-    CONTROL         "",IDC_POPUP_LOG2_BACKCOLOR,"ColourPicker",WS_TABSTOP,80,134,39,10
-    CONTROL         "",IDC_POPUP_LOG2_TEXTCOLOR,"ColourPicker",WS_TABSTOP,130,134,39,10
-    EDITTEXT        IDC_POPUP_LOG2_TIMEOUT,182,133,34,12,ES_AUTOHSCROLL | ES_NUMBER
-    LTEXT           "Fatal",IDC_STATIC,12,150,60,8
-    CONTROL         "",IDC_POPUP_LOG3_BACKCOLOR,"ColourPicker",WS_TABSTOP,80,149,39,10
-    CONTROL         "",IDC_POPUP_LOG3_TEXTCOLOR,"ColourPicker",WS_TABSTOP,130,149,39,10
-    EDITTEXT        IDC_POPUP_LOG3_TIMEOUT,182,148,34,12,ES_AUTOHSCROLL | ES_NUMBER
-    LTEXT           "Spam detected",IDC_STATIC,12,165,60,8
-    CONTROL         "",IDC_POPUP_SPAM_BACKCOLOR,"ColourPicker",WS_TABSTOP,80,164,39,10
-    CONTROL         "",IDC_POPUP_SPAM_TEXTCOLOR,"ColourPicker",WS_TABSTOP,130,164,39,10
-    EDITTEXT        IDC_POPUP_SPAM_TIMEOUT,182,163,34,12,ES_AUTOHSCROLL | ES_NUMBER
-    CONTROL         "&Use Windows colors",IDC_USEWINCOLORS,"Button",BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,12,183,220,8
-    CONTROL         "Use system &icons",IDC_USESYSICONS,"Button",BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,12,211,220,8
-    DEFPUSHBUTTON   "Previe&w",IDC_PREVIEW,247,192,52,12
-    CONTROL         "Use default colors",IDC_USEDEFCOLORS,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,12,196,221,10
-END
-
-IDD_INFO_ICQ DIALOGEX 0, 0, 222, 132
-STYLE DS_SETFONT | DS_3DLOOK | DS_FIXEDSYS | WS_CHILD
-EXSTYLE WS_EX_CONTROLPARENT
-FONT 8, "MS Shell Dlg", 0, 0, 0x1
-BEGIN
-    LTEXT           "UIN:",IDC_UINSTATIC,5,5,71,8
-    EDITTEXT        IDC_UIN,74,5,143,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
-    LTEXT           "External IP:",IDC_STATIC,5,18,71,8
-    EDITTEXT        IDC_IP,74,18,74,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
-    LTEXT           "Internal IP:",IDC_STATIC,5,31,71,8
-    EDITTEXT        IDC_REALIP,74,31,139,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
-    LTEXT           "Port:",IDC_STATIC,5,44,71,8
-    EDITTEXT        IDC_PORT,74,44,141,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
-    LTEXT           "Protocol Version:",IDC_STATIC,5,57,71,8
-    EDITTEXT        IDC_VERSION,74,57,142,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
-    LTEXT           "User Client:",IDC_STATIC,5,70,71,8
-    EDITTEXT        IDC_MIRVER,74,70,141,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
-    LTEXT           "Online since:",IDC_STATIC,5,83,71,8
-    EDITTEXT        IDC_ONLINESINCE,74,83,139,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
-    LTEXT           "System up since:",IDC_SUPTIME,5,96,71,8
-    EDITTEXT        IDC_SYSTEMUPTIME,74,96,139,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
-    LTEXT           "Idle since:",IDC_STATIC,5,109,71,8
-    EDITTEXT        IDC_IDLETIME,74,109,139,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
-    LTEXT           "Status:",IDC_STATIC,5,122,71,8
-    EDITTEXT        IDC_STATUS,74,122,139,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
 END
 
 /////////////////////////////////////////////////////////////////////////////