Add context help support for Proxy panel

[originally from svn r1974]

diff --git a/doc/config.but b/doc/config.but
index 50f16e7cff1a1f6f7df955148f6125ae5e8f6687..4193681fbc1fdc8c2bbe01a608d03da69d9f5bd5 100644 (file)
--- a/doc/config.but
+++ b/doc/config.but
@@ -1,4 +1,4 @@
-\versionid $Id: config.but,v 1.40 2002/09/21 16:07:43 simon Exp $
+\versionid $Id: config.but,v 1.41 2002/09/23 09:55:11 jacob Exp $
 
 \C{config} Configuring PuTTY
 
@@ -1375,6 +1375,8 @@ The Nagle algorithm is disabled by default.
 
 \H{config-proxy} The Proxy panel
 
+\cfg{winhelp-topic}{proxy.main}
+
 The Proxy panel allows you to configure PuTTY to use various types
 of proxy in order to make its network connections. The settings in
 this panel affect the primary network connection forming your PuTTY
@@ -1383,6 +1385,8 @@ forwarding (see \k{using-port-forwarding}).
 
 \S{config-proxy-type} Setting the proxy type
 
+\cfg{winhelp-topic}{proxy.type}
+
 The \q{Proxy type} radio buttons allow you to configure what type of
 proxy you want PuTTY to use for its network connections. The default
 setting is \q{None}; in this mode no proxy is used for any
@@ -1403,6 +1407,8 @@ PuTTY to use this type of proxy.
 
 \S{config-proxy-exclude} Excluding parts of the network from proxying
 
+\cfg{winhelp-topic}{proxy.exclude}
+
 Typically you will only need to use a proxy to connect to non-local
 parts of your network; for example, your proxy might be required for
 connections outside your company's internal network. In the
@@ -1430,6 +1436,8 @@ This excludes both of the above ranges at once.
 
 \S{config-proxy-auth} Username and password
 
+\cfg{winhelp-topic}{proxy.auth}
+
 If your proxy requires authentication, you can enter a username and
 a password in the \q{Username} and \q{Password} boxes.
 
@@ -1445,6 +1453,8 @@ passwords.
 
 \S{config-proxy-command} Specifying the Telnet proxy command
 
+\cfg{winhelp-topic}{proxy.command}
+
 If you are using the Telnet proxy type, the usual command required
 by the firewall's Telnet server is \c{connect}, followed by a host
 name and a port number. If your proxy needs a different command,
@@ -1462,6 +1472,8 @@ literal \c{%} sign, enter \c{%%}.
 
 \S{config-proxy-socksver} Selecting the version of the SOCKS protocol
 
+\cfg{winhelp-topic}{proxy.socksver}
+
 SOCKS servers exist in two versions: version 5
 (\W{http://www.ietf.org/rfc/rfc1928.txt}{RFC 1928}) and the earlier
 version 4. The \q{SOCKS Version} radio buttons allow you to select

diff --git a/windlg.c b/windlg.c
index e13cfa12ac6b42cc3e20972846ea2fe0699948fb..5c8d048db1e9774a88d075d075fd4bdd69fe2f2f 100644 (file)
--- a/windlg.c
+++ b/windlg.c
@@ -865,6 +865,33 @@ char *help_context_cmd(int id)
       case IDC_NODELAY:
         return "JI(`',`connection.nodelay')";
 
+      case IDC_PROXYTYPESTATIC:
+      case IDC_PROXYTYPENONE:
+      case IDC_PROXYTYPEHTTP:
+      case IDC_PROXYTYPESOCKS:
+      case IDC_PROXYTYPETELNET:
+        return "JI(`',`proxy.type')";
+      case IDC_PROXYHOSTSTATIC:
+      case IDC_PROXYHOSTEDIT:
+      case IDC_PROXYPORTSTATIC:
+      case IDC_PROXYPORTEDIT:
+        return "JI(`',`proxy.main')";
+      case IDC_PROXYEXCLUDESTATIC:
+      case IDC_PROXYEXCLUDEEDIT:
+        return "JI(`',`proxy.exclude')";
+      case IDC_PROXYUSERSTATIC:
+      case IDC_PROXYUSEREDIT:
+      case IDC_PROXYPASSSTATIC:
+      case IDC_PROXYPASSEDIT:
+        return "JI(`',`proxy.auth')";
+      case IDC_PROXYTELNETCMDSTATIC:
+      case IDC_PROXYTELNETCMDEDIT:
+        return "JI(`',`proxy.command')";
+      case IDC_PROXYSOCKSVERSTATIC:
+      case IDC_PROXYSOCKSVER5:
+      case IDC_PROXYSOCKSVER4:
+        return "JI(`',`proxy.socksver')";
+
       case IDC_TSSTATIC:
       case IDC_TSEDIT:
         return "JI(`',`telnet.termspeed')";