IRC: custom reconnect code removed

git-svn-id: http://svn.miranda-ng.org/main/trunk@7048 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

1 files changed, 20 insertions, 30 deletions

diff --git a/protocols/IRCG/res/IRC.rc b/protocols/IRCG/res/IRC.rc
index 64081b3469..8a8efad8eb 100644
--- a/protocols/IRCG/res/IRC.rc
+++ b/protocols/IRCG/res/IRC.rc
@@ -16,10 +16,8 @@
 // Neutral resources

 

 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEU)

-#ifdef _WIN32

 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL

-#pragma code_page(1252)

-#endif //_WIN32

+#pragma code_page(1251)

 

 /////////////////////////////////////////////////////////////////////////////

 //

@@ -63,17 +61,14 @@ BEGIN
     CONTROL         "&Add",IDC_ADDSERVER,"MButtonClass",WS_DISABLED | WS_TABSTOP,16,116,27,14,WS_EX_NOACTIVATE | 0x10000000L

     CONTROL         "&Edit",IDC_EDITSERVER,"MButtonClass",WS_DISABLED | WS_TABSTOP,59,116,27,14,WS_EX_NOACTIVATE | 0x10000000L

     CONTROL         "&Del",IDC_DELETESERVER,"MButtonClass",WS_DISABLED | WS_TABSTOP,102,116,27,14,WS_EX_NOACTIVATE | 0x10000000L

-    EDITTEXT        IDC_NICK,158,16,63,13,ES_AUTOHSCROLL

-    EDITTEXT        IDC_NICK2,231,16,63,13,ES_AUTOHSCROLL

-    EDITTEXT        IDC_NAME,158,40,63,13,ES_AUTOHSCROLL

-    EDITTEXT        IDC_USERID,231,40,63,13,ES_AUTOHSCROLL

-    CONTROL         "Enable",IDC_IDENT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,158,73,46,15

-    EDITTEXT        IDC_IDENTSYSTEM,210,73,39,12,ES_AUTOHSCROLL

-    EDITTEXT        IDC_IDENTPORT,256,73,39,12,ES_AUTOHSCROLL | ES_NUMBER

-    CONTROL         "only while connecting",IDC_IDENT_TIMED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,171,87,124,11

-    CONTROL         "Enable",IDC_RETRY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,158,118,42,10

-    EDITTEXT        IDC_RETRYWAIT,210,116,39,12,ES_AUTOHSCROLL | ES_NUMBER,WS_EX_RIGHT

-    EDITTEXT        IDC_RETRYCOUNT,256,116,39,12,ES_AUTOHSCROLL | ES_NUMBER,WS_EX_RIGHT

+    EDITTEXT        IDC_NICK,237,13,63,13,ES_AUTOHSCROLL

+    EDITTEXT        IDC_NICK2,237,32,63,13,ES_AUTOHSCROLL

+    EDITTEXT        IDC_NAME,237,51,63,13,ES_AUTOHSCROLL

+    EDITTEXT        IDC_USERID,237,71,63,13,ES_AUTOHSCROLL

+    CONTROL         "Enable",IDC_IDENT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,158,106,46,15

+    EDITTEXT        IDC_IDENTSYSTEM,210,106,39,12,ES_AUTOHSCROLL

+    EDITTEXT        IDC_IDENTPORT,256,106,39,12,ES_AUTOHSCROLL | ES_NUMBER

+    CONTROL         "only while connecting",IDC_IDENT_TIMED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,171,120,124,11

     CONTROL         "Force visible (-i)",IDC_FORCEVISIBLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,145,134,10

     CONTROL         "Rejoin channel if kicked",IDC_REJOINONKICK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,156,134,10

     CONTROL         "Rejoin channels on reconnect",IDC_REJOINCHANNELS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,167,134,10

@@ -95,22 +90,19 @@ BEGIN
     CONTROL         "Enable",IDC_STARTUP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,11,73,10

     CONTROL         "Internet address",IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,10,45,81,8,WS_EX_TRANSPARENT

     LTEXT           "Port range",IDC_STATIC,10,67,69,8,0,WS_EX_TRANSPARENT

-    LTEXT           "Nick",IDC_STATIC,158,8,68,8,0,WS_EX_TRANSPARENT

-    LTEXT           "User ID (Ident)",IDC_STATIC,231,31,68,9,0,WS_EX_TRANSPARENT

-    LTEXT           "Full name (e-mail)",IDC_STATIC,158,31,68,9,0,WS_EX_TRANSPARENT

+    LTEXT           "Nick",IDC_STATIC,158,16,72,8,0,WS_EX_TRANSPARENT

+    LTEXT           "User ID (Ident)",IDC_STATIC,158,73,72,8,0,WS_EX_TRANSPARENT

+    LTEXT           "Full name (e-mail)",IDC_STATIC,158,53,72,8,0,WS_EX_TRANSPARENT

     LTEXT           "Password",IDC_STATIC,10,90,125,8,0,WS_EX_TRANSPARENT

     LTEXT           "Server name",IDC_STATIC,10,22,125,8,0,WS_EX_TRANSPARENT

     LTEXT           "->",IDC_STATIC,71,75,8,8

-    LTEXT           "Alternative nick",IDC_STATIC,231,8,68,8,0,WS_EX_TRANSPARENT

-    GROUPBOX        "Ident",IDC_STATIC,150,59,154,42

-    LTEXT           "System",IDC_STATIC,210,65,39,8,0,WS_EX_TRANSPARENT

-    LTEXT           "Port",IDC_STATIC,256,65,35,8,0,WS_EX_TRANSPARENT

+    LTEXT           "Alternative nick",IDC_STATIC,158,34,72,8,0,WS_EX_TRANSPARENT

+    GROUPBOX        "Ident",IDC_STATIC,150,92,154,42

+    LTEXT           "System",IDC_STATIC,210,98,39,8,0,WS_EX_TRANSPARENT

+    LTEXT           "Port",IDC_STATIC,256,98,35,8,0,WS_EX_TRANSPARENT

     GROUPBOX        "Default network",IDC_STATIC,2,0,142,134

-    GROUPBOX        "User info - Required",IDC_STATIC,150,0,154,59

+    GROUPBOX        "User info - Required",IDC_STATIC,150,0,154,90

     GROUPBOX        "Other",IDC_STATIC,2,134,302,92

-    GROUPBOX        "Reconnect",IDC_STATIC,150,101,154,33

-    LTEXT           "Wait (s)",IDC_STATIC,210,108,45,8,0,WS_EX_TRANSPARENT

-    LTEXT           "Retry count",IDC_STATIC,256,108,43,8,0,WS_EX_TRANSPARENT

     LTEXT           "Check every (s):",IDC_STATIC,158,190,108,8

     EDITTEXT        IDC_SSL,107,53,28,12,ES_AUTOHSCROLL | ES_READONLY | ES_NUMBER | NOT WS_TABSTOP,WS_EX_RIGHT

     LTEXT           "SSL",IDC_STATIC,107,45,28,8,0,WS_EX_TRANSPARENT

@@ -460,7 +452,7 @@ END
 //

 

 #ifdef APSTUDIO_INVOKED

-GUIDELINES DESIGNINFO 

+GUIDELINES DESIGNINFO

 BEGIN

     IDD_PREFS_CONNECT, DIALOG

     BEGIN

@@ -693,13 +685,11 @@ IDR_SERVERS             TEXT                    "..\\docs\\IRC_servers.ini"
 

 

 /////////////////////////////////////////////////////////////////////////////

-// 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

 

 #ifdef APSTUDIO_INVOKED

 /////////////////////////////////////////////////////////////////////////////

@@ -726,7 +716,7 @@ END
 

 #endif    // APSTUDIO_INVOKED

 

-#endif    // English (U.S.) resources

+#endif    // English (United States) resources

 /////////////////////////////////////////////////////////////////////////////