From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 108682 invoked by alias); 17 Nov 2017 14:41:15 -0000 Mailing-List: contact cygwin-apps-help@cygwin.com; run by ezmlm Precedence: bulk Sender: cygwin-apps-owner@cygwin.com List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Mail-Followup-To: cygwin-apps@cygwin.com Received: (qmail 106163 invoked by uid 89); 17 Nov 2017 14:41:14 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-20.9 required=5.0 tests=AWL,BAYES_50,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,KAM_LAZY_DOMAIN_SECURITY,KB_WAM_FROM_NAME_SINGLEWORD,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.2 spammy=Settings, radio, STYLE, HX-Junkmail-Premium-Raw:NO_URI_HTTPS X-HELO: rgout06.bt.lon5.cpcloud.co.uk Received: from rgout0607.bt.lon5.cpcloud.co.uk (HELO rgout06.bt.lon5.cpcloud.co.uk) (65.20.0.134) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 17 Nov 2017 14:41:13 +0000 X-OWM-Source-IP: 31.51.207.28 (GB) X-OWM-Env-Sender: jonturney@btinternet.com X-Junkmail-Premium-Raw: score=8/50,refid=2.7.2:2017.11.17.142716:17:8.129,ip=,rules=__HAS_FROM, __TO_MALFORMED_2, __TO_NO_NAME, __HAS_CC_HDR, __CC_NAME, __CC_NAME_DIFF_FROM_ACC, __HAS_MSGID, __SANE_MSGID, __HAS_X_MAILER, __FROM_DOMAIN_IN_ANY_CC1, __LINES_OF_YELLING, __NO_HTML_TAG_RAW, BODYTEXTP_SIZE_3000_LESS, BODY_SIZE_2000_2999, __MIME_TEXT_P1, __MIME_TEXT_ONLY, LINES_OF_YELLING_3, HTML_00_01, HTML_00_10, BODY_SIZE_5000_LESS, __FROM_DOMAIN_IN_RCPT, __CC_REAL_NAMES, MULTIPLE_REAL_RCPTS, LEGITIMATE_SIGNS, NO_URI_FOUND, NO_CTA_URI_FOUND, __MIME_TEXT_P, NO_URI_HTTPS, BODY_SIZE_7000_LESS Received: from localhost.localdomain (31.51.207.28) by rgout06.bt.lon5.cpcloud.co.uk (9.0.019.13-1) (authenticated as jonturney@btinternet.com) id 5A025DDB00FBBC55; Fri, 17 Nov 2017 14:41:10 +0000 From: Jon Turney To: cygwin-apps@cygwin.com Cc: Jon Turney Subject: [PATCH setup] Make 'System Proxy Settings' the default, rather than 'Direct' Date: Fri, 17 Nov 2017 14:41:00 -0000 Message-Id: <20171117144057.36748-1-jon.turney@dronecode.org.uk> X-SW-Source: 2017-11/txt/msg00073.txt.bz2 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