1
0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-01-09 17:38:00 +00:00

Rename the 'Words' config panel to 'Copy'.

Now its remit is widened to include not just the character-classes
list box, but also anything else related specifically to _copying_
rather than _pasting_, i.e. the terminal -> clipboard direction.

This allows me to move the Windows-specific 'write RTF to clipboard'
option into the newly named Copy panel, which gets it _out_ of the
main Selection panel which had just overflowed due to the new option
added by the previous commit.

(It looks a little asymmetric that there's no corresponding Paste
panel now! But since it would currently contain a single checkbox,
I'll wait until there's more to put in it...)
This commit is contained in:
Simon Tatham 2018-03-11 18:57:13 +00:00
parent 10c9104822
commit b2b8f6c3d4
2 changed files with 8 additions and 8 deletions

View File

@ -1976,18 +1976,18 @@ void setup_config_box(struct controlbox *b, int midsession,
CONF_ctrlshiftcv, CONF_ctrlshiftcv_custom);
s = ctrl_getset(b, "Window/Selection", "paste",
"Control pasting of text");
"Control pasting of text from clipboard to terminal");
ctrl_checkbox(s, "Permit control characters in pasted text",
NO_SHORTCUT, HELPCTX(no_help),
conf_checkbox_handler, I(CONF_paste_controls));
/*
* The Window/Selection/Words panel.
* The Window/Selection/Copy panel.
*/
ctrl_settitle(b, "Window/Selection/Words",
"Options controlling word-by-word selection");
ctrl_settitle(b, "Window/Selection/Copy",
"Options controlling copying from terminal to clipboard");
s = ctrl_getset(b, "Window/Selection/Words", "charclass",
s = ctrl_getset(b, "Window/Selection/Copy", "charclass",
"Classes of character that group together");
ccd = (struct charclass_data *)
ctrl_alloc(b, sizeof(struct charclass_data));

View File

@ -268,9 +268,9 @@ void win_setup_config_box(struct controlbox *b, HWND *hwndp, int has_help,
/*
* RTF paste is Windows-specific.
*/
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',
s = ctrl_getset(b, "Window/Selection/Copy", "format",
"Formatting of copied characters");
ctrl_checkbox(s, "Copy to clipboard in RTF as well as plain text", 'f',
HELPCTX(selection_rtf),
conf_checkbox_handler, I(CONF_rtf_paste));