[PATCH setup 2/5] Rename IDC_NET_IE5 to IDC_NET_PRECONFIG

[SZAVAI Gyula <szgyg at ludens dot elte dot hu>]

---
 ConnectionSetting.cc |  6 +++---
 net.cc               | 10 +++++-----
 netio.cc             |  6 +++---
 res.rc               |  2 +-
 resource.h           |  2 +-
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/ConnectionSetting.cc b/ConnectionSetting.cc
index 5baf76c..2370a20 100644
--- a/ConnectionSetting.cc
+++ b/ConnectionSetting.cc
@@ -39,7 +39,7 @@ ConnectionSetting::~ConnectionSetting ()
     case IDC_NET_DIRECT:
       UserSettings::instance().set("net-method", "Direct");
       break;
-    case IDC_NET_IE5:
+    case IDC_NET_PRECONFIG:
       UserSettings::instance().set("net-method", "IE");
       break;
     case IDC_NET_PROXY:
@@ -60,10 +60,10 @@ ConnectionSetting::typeFromString(const std::string& aType)
   if (!casecompare(aType, "Direct"))
     return IDC_NET_DIRECT;
   if (!casecompare(aType, "IE"))
-    return IDC_NET_IE5;
+    return IDC_NET_PRECONFIG;
   if (!casecompare(aType, "Proxy"))
     return IDC_NET_PROXY;
 
   /* A sanish default */
-  return IDC_NET_IE5;
+  return IDC_NET_PRECONFIG;
 }
diff --git a/net.cc b/net.cc
index 5ff3713..ad497ca 100644
--- a/net.cc
+++ b/net.cc
@@ -37,7 +37,7 @@ extern ThreeBarProgressPage Progress;
 
 static StringOption ProxyOption ("", 'p', "proxy", "HTTP/FTP proxy (host:port)", false);
 
-static int rb[] = { IDC_NET_IE5, IDC_NET_DIRECT, IDC_NET_PROXY, 0 };
+static int rb[] = { IDC_NET_PRECONFIG, IDC_NET_DIRECT, IDC_NET_PROXY, 0 };
 static bool doing_loading = false;
 
 void
@@ -46,7 +46,7 @@ NetPage::CheckIfEnableNext ()
   int e = 0, p = 0;
   DWORD ButtonFlags = PSWIZB_BACK;
 
-  if (NetIO::net_method == IDC_NET_IE5 ||
+  if (NetIO::net_method == IDC_NET_PRECONFIG ||
       NetIO::net_method == IDC_NET_DIRECT)
     e = 1;
   else if (NetIO::net_method == IDC_NET_PROXY)
@@ -111,7 +111,7 @@ NetPage::OnInit ()
   std::string proxyString (ProxyOption);
 
   if (!NetIO::net_method)
-    NetIO::net_method = IDC_NET_IE5;
+    NetIO::net_method = IDC_NET_PRECONFIG;
 
   if (proxyString.size ())
   {
@@ -132,7 +132,7 @@ NetPage::OnInit ()
   // Check to see if any radio buttons are selected. If not, select a default.
   if (SendMessage (GetDlgItem (IDC_NET_DIRECT), BM_GETCHECK, 0, 0) != BST_CHECKED
       && SendMessage (GetDlgItem (IDC_NET_PROXY), BM_GETCHECK, 0, 0) != BST_CHECKED)
-    SendMessage (GetDlgItem (IDC_NET_IE5), BM_CLICK, 0, 0);
+    SendMessage (GetDlgItem (IDC_NET_PRECONFIG), BM_CLICK, 0, 0);
 }
 
 long
@@ -164,7 +164,7 @@ NetPage::OnMessageCmd (int id, HWND hwndctl, UINT code)
 {
   switch (id)
     {
-    case IDC_NET_IE5:
+    case IDC_NET_PRECONFIG:
     case IDC_NET_DIRECT:
     case IDC_NET_PROXY:
     case IDC_PROXY_HOST:
diff --git a/netio.cc b/netio.cc
index 86bb69a..6c357fc 100644
--- a/netio.cc
+++ b/netio.cc
@@ -140,7 +140,7 @@ NetIO::open (char const *url, bool cachable)
 
   if (proto == file)
     rv = new NetIO_File (url);
-  else if (net_method == IDC_NET_IE5)
+  else if (net_method == IDC_NET_PRECONFIG)
     rv = new NetIO_IE5 (url, false, cachable);
   else if (net_method == IDC_NET_PROXY)
     rv = new NetIO_HTTP (url);
@@ -280,8 +280,8 @@ NetIO::net_method_name ()
 {
   switch (net_method)
     {
-    case IDC_NET_IE5:
-      return "IE5";
+    case IDC_NET_PRECONFIG:
+      return "Preconfig";
     case IDC_NET_DIRECT:
       return "Direct";
     case IDC_NET_PROXY:
diff --git a/res.rc b/res.rc
index d89dd33..dfcc4f4 100644
--- a/res.rc
+++ b/res.rc
@@ -157,7 +157,7 @@ STYLE DS_MODALFRAME | DS_CENTER | WS_CHILD | WS_CAPTION | WS_SYSMENU
 CAPTION "Cygwin Setup - Select Connection Type"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL         "Use &System Proxy Settings",IDC_NET_IE5,"Button",
+    CONTROL         "Use &System Proxy Settings",IDC_NET_PRECONFIG,"Button",
                     BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,60,55,185,10
     CONTROL         "&Direct Connection",IDC_NET_DIRECT,"Button",
                     BS_AUTORADIOBUTTON | WS_TABSTOP,60,70,73,10
diff --git a/resource.h b/resource.h
index 59c19da..12c2b0b 100644
--- a/resource.h
+++ b/resource.h
@@ -98,7 +98,7 @@
 #define IDC_SITE_NEXT                     508
 #define IDC_BACK                          509
 #define IDC_OTHER_URL                     510
-#define IDC_NET_IE5                       511
+#define IDC_NET_PRECONFIG                 511
 #define IDC_NET_DIRECT                    512
 #define IDC_NET_PROXY                     513
 #define IDC_PROXY_HOST                    514
-- 
2.14.3