X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/0f0a25075f6e788462506686cf538bc13a5beedb..cdd310bb1a216ee7713926b6cd813016fe5343ee:/config.c

diff --git a/config.c b/config.c
index e462ec25..03dcbf75 100644
--- a/config.c
+++ b/config.c
@@ -1149,7 +1149,7 @@ void setup_config_box(struct controlbox *b, struct sesslist *sesslist,
 		  'r', 100, HELPCTX(translation_codepage),
 		  codepage_handler, P(NULL), P(NULL));
 
-    str = dupprintf("Adjust how %s displays line drawing characters", appname);
+    str = dupprintf("Adjust how %s handles line drawing characters", appname);
     s = ctrl_getset(b, "Window/Translation", "linedraw", str);
     sfree(str);
     ctrl_radiobuttons(s, "Handling of line drawing characters:", NO_SHORTCUT,1,
@@ -1159,17 +1159,14 @@ void setup_config_box(struct controlbox *b, struct sesslist *sesslist,
 		      "Use Unicode line drawing code points",'u',I(VT_UNICODE),
 		      "Poor man's line drawing (+, - and |)",'p',I(VT_POORMAN),
 		      NULL);
+    ctrl_checkbox(s, "Copy and paste line drawing characters as lqqqk",'d',
+		  HELPCTX(selection_linedraw),
+		  dlg_stdcheckbox_handler, I(offsetof(Config,rawcnp)));
 
     /*
      * The Window/Selection panel.
      */
     ctrl_settitle(b, "Window/Selection", "Options controlling copy and paste");
-
-    s = ctrl_getset(b, "Window/Selection", "trans",
-		    "Translation of pasted characters");
-    ctrl_checkbox(s, "Paste VT100 line drawing chars as lqqqk",'d',
-		  HELPCTX(selection_linedraw),
-		  dlg_stdcheckbox_handler, I(offsetof(Config,rawcnp)));
 	
     s = ctrl_getset(b, "Window/Selection", "mouse",
 		    "Control use of mouse");
@@ -1264,6 +1261,10 @@ void setup_config_box(struct controlbox *b, struct sesslist *sesslist,
 			 HELPCTX(connection_termtype),
 			 dlg_stdeditbox_handler, I(offsetof(Config,termtype)),
 			 I(sizeof(((Config *)0)->termtype)));
+	    ctrl_editbox(s, "Terminal speeds", 's', 50,
+			 HELPCTX(connection_termspeed),
+			 dlg_stdeditbox_handler, I(offsetof(Config,termspeed)),
+			 I(sizeof(((Config *)0)->termspeed)));
 	    ctrl_editbox(s, "Auto-login username", 'u', 50,
 			 HELPCTX(connection_username),
 			 dlg_stdeditbox_handler, I(offsetof(Config,username)),
@@ -1295,14 +1296,15 @@ void setup_config_box(struct controlbox *b, struct sesslist *sesslist,
 	ctrl_settitle(b, "Connection/Proxy",
 		      "Options controlling proxy usage");
 
-	s = ctrl_getset(b, "Connection/Proxy", "basics", "Proxy basics");
-	ctrl_radiobuttons(s, "Proxy type:", 't', 4,
+	s = ctrl_getset(b, "Connection/Proxy", "basics", NULL);
+	ctrl_radiobuttons(s, "Proxy type:", 't', 3,
 			  HELPCTX(proxy_type),
 			  dlg_stdradiobutton_handler,
 			  I(offsetof(Config, proxy_type)),
 			  "None", I(PROXY_NONE),
+			  "SOCKS 4", I(PROXY_SOCKS4),
+			  "SOCKS 5", I(PROXY_SOCKS5),
 			  "HTTP", I(PROXY_HTTP),
-			  "SOCKS", I(PROXY_SOCKS),
 			  "Telnet", I(PROXY_TELNET),
 			  NULL);
 	ctrl_columns(s, 2, 80, 20);
@@ -1346,19 +1348,11 @@ void setup_config_box(struct controlbox *b, struct sesslist *sesslist,
 			 I(offsetof(Config,proxy_password)),
 			 I(sizeof(((Config *)0)->proxy_password)));
 	c->editbox.password = 1;
-
-	s = ctrl_getset(b, "Connection/Proxy", "misc",
-			"Miscellaneous proxy settings");
 	ctrl_editbox(s, "Telnet command", 'm', 100,
 		     HELPCTX(proxy_command),
 		     dlg_stdeditbox_handler,
 		     I(offsetof(Config,proxy_telnet_command)),
 		     I(sizeof(((Config *)0)->proxy_telnet_command)));
-	ctrl_radiobuttons(s, "SOCKS Version", 'v', 2,
-			  HELPCTX(proxy_socksver),
-			  dlg_stdradiobutton_handler,
-			  I(offsetof(Config, proxy_socks_version)),
-			  "Version 5", I(5), "Version 4", I(4), NULL);
     }
 
     /*
@@ -1375,10 +1369,6 @@ void setup_config_box(struct controlbox *b, struct sesslist *sesslist,
 	if (!midsession) {
 	    s = ctrl_getset(b, "Connection/Telnet", "data",
 			    "Data to send to the server");
-	    ctrl_editbox(s, "Terminal-speed string", 's', 50,
-			 HELPCTX(telnet_termspeed),
-			 dlg_stdeditbox_handler, I(offsetof(Config,termspeed)),
-			 I(sizeof(((Config *)0)->termspeed)));
 	    ctrl_text(s, "Environment variables:", HELPCTX(telnet_environ));
 	    ctrl_columns(s, 2, 80, 20);
 	    ed = (struct environ_data *)
@@ -1447,10 +1437,6 @@ void setup_config_box(struct controlbox *b, struct sesslist *sesslist,
 
 	s = ctrl_getset(b, "Connection/Rlogin", "data",
 			"Data to send to the server");
-	ctrl_editbox(s, "Terminal-speed string", 's', 50,
-		     HELPCTX(rlogin_termspeed),
-		     dlg_stdeditbox_handler, I(offsetof(Config,termspeed)),
-		     I(sizeof(((Config *)0)->termspeed)));
 	ctrl_editbox(s, "Local username:", 'l', 50,
 		     HELPCTX(rlogin_localuser),
 		     dlg_stdeditbox_handler, I(offsetof(Config,localusername)),
@@ -1501,7 +1487,7 @@ void setup_config_box(struct controlbox *b, struct sesslist *sesslist,
 			  cipherlist_handler, P(NULL));
 	c->listbox.height = 6;
 	
-	ctrl_checkbox(s, "Enable non-standard use of single-DES in SSH 2", 'i',
+	ctrl_checkbox(s, "Enable legacy use of single-DES in SSH 2", 'i',
 		      HELPCTX(ssh_ciphers),
 		      dlg_stdcheckbox_handler,
 		      I(offsetof(Config,ssh2_des_cbc)));