From 00381fc7bed1aaf2008172c0f4b9e5a53e465bc7 Mon Sep 17 00:00:00 2001 From: simon Date: Thu, 20 Nov 2003 18:33:22 +0000 Subject: [PATCH] Move the `translation of line drawing characters when pasting' option from the Selection panel to the Translation panel (where it fits at least as well). This frees a line in the Selection panel which I'm about to use for an additional mouse handling option. git-svn-id: svn://svn.tartarus.org/sgt/putty@3564 cda61777-01e9-0310-a592-d414129be87e --- config.c | 11 ++++------- doc/config.but | 28 ++++++++++++++-------------- wincfg.c | 4 ++-- 3 files changed, 20 insertions(+), 23 deletions(-) diff --git a/config.c b/config.c index 3189c0bd..25c6f474 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"); diff --git a/doc/config.but b/doc/config.but index 65edebe6..5153a14f 100644 --- a/doc/config.but +++ b/doc/config.but @@ -1,4 +1,4 @@ -\versionid $Id: config.but,v 1.71 2003/10/08 21:39:54 jacob Exp $ +\versionid $Id: config.but,v 1.72 2003/11/20 18:33:22 simon Exp $ \C{config} Configuring PuTTY @@ -1142,12 +1142,7 @@ You should use this option if none of the other options works. in Unicode. For good Unicode-supporting fonts this is probably the most reliable and functional option. -\H{config-selection} The Selection panel - -The Selection panel allows you to control the way copy and paste -work in the PuTTY window. - -\S{config-linedrawpaste} Controlling the pasting of line drawing +\S{config-linedrawpaste} Controlling copy and paste of line drawing characters \cfg{winhelp-topic}{selection.linedraw} @@ -1156,18 +1151,23 @@ By default, when you copy and paste a piece of the PuTTY screen that contains VT100 line and box drawing characters, PuTTY will paste them in the form they appear on the screen: either Unicode line drawing code points, or the \q{poor man's} line-drawing characters -\c{+}, \c{-} and \c{|}. The checkbox \q{Paste VT100 line drawing -chars as lqqqk} disables this feature, so line-drawing characters -will be pasted as the ASCII characters that were printed to produce -them. This will typically mean they come out mostly as \c{q} and -\c{x}, with a scattering of \c{jklmntuvw} at the corners. This might -be useful if you were trying to recreate the same box layout in -another program, for example. +\c{+}, \c{-} and \c{|}. The checkbox \q{Copy and paste VT100 line +drawing chars as lqqqk} disables this feature, so line-drawing +characters will be pasted as the ASCII characters that were printed +to produce them. This will typically mean they come out mostly as +\c{q} and \c{x}, with a scattering of \c{jklmntuvw} at the corners. +This might be useful if you were trying to recreate the same box +layout in another program, for example. Note that this option only applies to line-drawing characters which \e{were} printed by using the VT100 mechanism. Line-drawing characters displayed using Unicode will paste as Unicode always. +\H{config-selection} The Selection panel + +The Selection panel allows you to control the way copy and paste +work in the PuTTY window. + \S{config-rtfpaste} Pasting in Rich Text Format \cfg{winhelp-topic}{selection.rtf} diff --git a/wincfg.c b/wincfg.c index 4c3d8a94..ffb18113 100644 --- a/wincfg.c +++ b/wincfg.c @@ -233,8 +233,8 @@ void win_setup_config_box(struct controlbox *b, HWND *hwndp, int has_help, /* * RTF paste is Windows-specific. */ - s = ctrl_getset(b, "Window/Selection", "trans", - "Translation of pasted characters"); + s = ctrl_getset(b, "Window/Selection", "format", + "Formatting of pasted characters"); ctrl_checkbox(s, "Paste to clipboard in RTF as well as plain text", 'f', HELPCTX(selection_rtf), dlg_stdcheckbox_handler, I(offsetof(Config,rtf_paste))); -- 2.11.0