[PATCH setup] Make 'System Proxy Settings' the default, rather than 'Direct'

[Jon Turney]

Make 'System Proxy Settings' the default, rather than 'Direct', and re-order
the the network connection options so that option is first.

If you don't need a proxy, the system proxy setting should be for direct
connection, anyhow.

So, at the moment, this is just a button you're supposed to know you need to
press to make it work, when you are behind a proxy.

This setting is persisted (as 'net-method'), so this change only effects new
installations.
---
 net.cc | 6 +++---
 res.rc | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/net.cc b/net.cc
index 903f096..fa6f1e3 100644
--- a/net.cc
+++ b/net.cc
@@ -112,7 +112,7 @@ NetPage::OnInit ()
   std::string proxyString (ProxyOption);
 
   if (!NetIO::net_method)
-    NetIO::net_method = IDC_NET_DIRECT;
+    NetIO::net_method = IDC_NET_IE5;
 
   if (proxyString.size ())
   {
@@ -131,10 +131,10 @@ NetPage::OnInit ()
   CheckIfEnableNext();
 
   // Check to see if any radio buttons are selected. If not, select a default.
-  if (SendMessage (GetDlgItem (IDC_NET_IE5), BM_GETCHECK, 0, 0) != BST_CHECKED
+  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_DIRECT_LEGACY), BM_GETCHECK, 0, 0) != BST_CHECKED)
-    SendMessage (GetDlgItem (IDC_NET_DIRECT), BM_CLICK, 0, 0);
+    SendMessage (GetDlgItem (IDC_NET_IE5), BM_CLICK, 0, 0);
 }
 
 long
diff --git a/res.rc b/res.rc
index 3da9b11..a4d7e70 100644
--- a/res.rc
+++ b/res.rc
@@ -157,10 +157,10 @@ STYLE DS_MODALFRAME | DS_CENTER | WS_CHILD | WS_CAPTION | WS_SYSMENU
 CAPTION "Cygwin Setup - Select Connection Type"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL         "&Direct Connection",IDC_NET_DIRECT,"Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,60,55,73,10
     CONTROL         "Use &System Proxy Settings",IDC_NET_IE5,"Button",
-                    BS_AUTORADIOBUTTON | WS_TABSTOP,60,70,185,10
+                    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
     CONTROL         "Use HTTP/FTP &Proxy:",IDC_NET_PROXY,"Button",
                     BS_AUTORADIOBUTTON | WS_TABSTOP,60,85,88,10
     CONTROL         "&Direct Connection (legacy)",IDC_NET_DIRECT_LEGACY,"Button",
-- 
2.15.0