From: Jon Turney <jon.turney@dronecode.org.uk>
To: cygwin-apps@cygwin.com
Cc: Jon Turney <jon.turney@dronecode.org.uk>
Subject: [PATCH setup] Make 'System Proxy Settings' the default, rather than 'Direct'
Date: Fri, 17 Nov 2017 14:41:00 -0000 [thread overview]
Message-ID: <20171117144057.36748-1-jon.turney@dronecode.org.uk> (raw)
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
reply other threads:[~2017-11-17 14:41 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171117144057.36748-1-jon.turney@dronecode.org.uk \
--to=jon.turney@dronecode.org.uk \
--cc=cygwin-apps@cygwin.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).