From 5729dd2d3c6cb2bd97e80b88ba6b37f4cb8aa17f Mon Sep 17 00:00:00 2001 From: Nick Couchman Date: Fri, 16 Feb 2018 23:48:37 -0500 Subject: [PATCH 1/5] GUACAMOLE-269: Add fields for controlling Backspace behavior. --- .../resources/org/apache/guacamole/protocols/ssh.json | 5 +++++ .../org/apache/guacamole/protocols/telnet.json | 11 +++++++++++ guacamole/src/main/webapp/translations/en.json | 11 ++++++++++- 3 files changed, 26 insertions(+), 1 deletion(-) diff --git a/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/ssh.json b/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/ssh.json index edc7bbbe0..952b77bb1 100644 --- a/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/ssh.json +++ b/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/ssh.json @@ -73,6 +73,11 @@ { "name" : "server-alive-interval", "type" : "NUMERIC" + }, + { + "name" : "backspace", + "type" : "ENUM", + "options" : [ "", "127", "8" ] } ] }, diff --git a/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/telnet.json b/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/telnet.json index 15dac41ff..7acdcd8c3 100644 --- a/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/telnet.json +++ b/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/telnet.json @@ -59,6 +59,17 @@ ] }, + { + "name" : "session", + "fields" : [ + { + "name" : "backspace", + "type" : "ENUM", + "options" : [ "", "127", "8" ] + } + ] + }, + { "name" : "typescript", "fields" : [ diff --git a/guacamole/src/main/webapp/translations/en.json b/guacamole/src/main/webapp/translations/en.json index ce657537e..c33b14fda 100644 --- a/guacamole/src/main/webapp/translations/en.json +++ b/guacamole/src/main/webapp/translations/en.json @@ -423,8 +423,9 @@ "PROTOCOL_SSH" : { + "FIELD_HEADER_BACKSPACE" : "Backspace key sends:", "FIELD_HEADER_COLOR_SCHEME" : "Color scheme:", - "FIELD_HEADER_COMMAND" : "Execute command:", + "FIELD_HEADER_COMMAND" : "Execute command:", "FIELD_HEADER_CREATE_RECORDING_PATH" : "Automatically create recording path:", "FIELD_HEADER_CREATE_TYPESCRIPT_PATH" : "Automatically create typescript path:", "FIELD_HEADER_FONT_NAME" : "Font name:", @@ -447,6 +448,9 @@ "FIELD_HEADER_TYPESCRIPT_NAME" : "Typescript name:", "FIELD_HEADER_TYPESCRIPT_PATH" : "Typescript path:", + "FIELD_OPTION_BACKSPACE_8" : "Backspace (Ctrl-H)", + "FIELD_OPTION_BACKSPACE_127" : "Delete (Ctrl-?)", + "FIELD_OPTION_COLOR_SCHEME_BLACK_WHITE" : "Black on white", "FIELD_OPTION_COLOR_SCHEME_EMPTY" : "", "FIELD_OPTION_COLOR_SCHEME_GRAY_BLACK" : "Gray on black", @@ -483,6 +487,7 @@ "PROTOCOL_TELNET" : { + "FIELD_HEADER_BACKSPACE" : "Backspace key sends:", "FIELD_HEADER_COLOR_SCHEME" : "Color scheme:", "FIELD_HEADER_CREATE_RECORDING_PATH" : "Automatically create recording path:", "FIELD_HEADER_CREATE_TYPESCRIPT_PATH" : "Automatically create typescript path:", @@ -502,6 +507,9 @@ "FIELD_HEADER_TYPESCRIPT_NAME" : "Typescript name:", "FIELD_HEADER_TYPESCRIPT_PATH" : "Typescript path:", + "FIELD_OPTION_BACKSPACE_0X08" : "Backspace (Ctrl-H)", + "FIELD_OPTION_BACKSPACE_0X7F" : "Delete (Ctrl-?)", + "FIELD_OPTION_COLOR_SCHEME_BLACK_WHITE" : "Black on white", "FIELD_OPTION_COLOR_SCHEME_EMPTY" : "", "FIELD_OPTION_COLOR_SCHEME_GRAY_BLACK" : "Gray on black", @@ -529,6 +537,7 @@ "SECTION_HEADER_AUTHENTICATION" : "Authentication", "SECTION_HEADER_DISPLAY" : "Display", "SECTION_HEADER_RECORDING" : "Screen Recording", + "SECTION_HEADER_SESSION" : "Session / Environment", "SECTION_HEADER_TYPESCRIPT" : "Typescript (Text Session Recording)", "SECTION_HEADER_NETWORK" : "Network" From 1f1d64e2c8a598bb70643399d2651fe21a17c227 Mon Sep 17 00:00:00 2001 From: Nick Couchman Date: Mon, 26 Feb 2018 15:14:41 -0500 Subject: [PATCH 2/5] GUACAMOLE-269: Move options to new section, fix translations. --- .../main/resources/org/apache/guacamole/protocols/ssh.json | 7 ++++++- .../resources/org/apache/guacamole/protocols/telnet.json | 2 +- guacamole/src/main/webapp/translations/en.json | 7 ++++--- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/ssh.json b/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/ssh.json index 952b77bb1..442214a3c 100644 --- a/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/ssh.json +++ b/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/ssh.json @@ -73,7 +73,12 @@ { "name" : "server-alive-interval", "type" : "NUMERIC" - }, + } + ] + }, + { + "name" : "behavior", + "fields" : [ { "name" : "backspace", "type" : "ENUM", diff --git a/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/telnet.json b/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/telnet.json index 7acdcd8c3..5b960f844 100644 --- a/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/telnet.json +++ b/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/telnet.json @@ -60,7 +60,7 @@ }, { - "name" : "session", + "name" : "behavior", "fields" : [ { "name" : "backspace", diff --git a/guacamole/src/main/webapp/translations/en.json b/guacamole/src/main/webapp/translations/en.json index c33b14fda..55da7f2a5 100644 --- a/guacamole/src/main/webapp/translations/en.json +++ b/guacamole/src/main/webapp/translations/en.json @@ -476,6 +476,7 @@ "NAME" : "SSH", "SECTION_HEADER_AUTHENTICATION" : "Authentication", + "SECTION_HEADER_BEHAVIOR" : "Terminal behavior", "SECTION_HEADER_DISPLAY" : "Display", "SECTION_HEADER_NETWORK" : "Network", "SECTION_HEADER_RECORDING" : "Screen Recording", @@ -507,8 +508,8 @@ "FIELD_HEADER_TYPESCRIPT_NAME" : "Typescript name:", "FIELD_HEADER_TYPESCRIPT_PATH" : "Typescript path:", - "FIELD_OPTION_BACKSPACE_0X08" : "Backspace (Ctrl-H)", - "FIELD_OPTION_BACKSPACE_0X7F" : "Delete (Ctrl-?)", + "FIELD_OPTION_BACKSPACE_127" : "Backspace (Ctrl-H)", + "FIELD_OPTION_BACKSPACE_8" : "Delete (Ctrl-?)", "FIELD_OPTION_COLOR_SCHEME_BLACK_WHITE" : "Black on white", "FIELD_OPTION_COLOR_SCHEME_EMPTY" : "", @@ -535,9 +536,9 @@ "NAME" : "Telnet", "SECTION_HEADER_AUTHENTICATION" : "Authentication", + "SECTION_HEADER_BEHAVIOR" : "Terminal behavior", "SECTION_HEADER_DISPLAY" : "Display", "SECTION_HEADER_RECORDING" : "Screen Recording", - "SECTION_HEADER_SESSION" : "Session / Environment", "SECTION_HEADER_TYPESCRIPT" : "Typescript (Text Session Recording)", "SECTION_HEADER_NETWORK" : "Network" From c9e8d2fc21b758bb05eee0e171de423b33990e23 Mon Sep 17 00:00:00 2001 From: Nick Couchman Date: Mon, 2 Apr 2018 16:25:37 -0400 Subject: [PATCH 3/5] GUACAMOLE-269: Fix option assocation for telnet. --- guacamole/src/main/webapp/translations/en.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/guacamole/src/main/webapp/translations/en.json b/guacamole/src/main/webapp/translations/en.json index 55da7f2a5..584e50680 100644 --- a/guacamole/src/main/webapp/translations/en.json +++ b/guacamole/src/main/webapp/translations/en.json @@ -508,8 +508,8 @@ "FIELD_HEADER_TYPESCRIPT_NAME" : "Typescript name:", "FIELD_HEADER_TYPESCRIPT_PATH" : "Typescript path:", - "FIELD_OPTION_BACKSPACE_127" : "Backspace (Ctrl-H)", - "FIELD_OPTION_BACKSPACE_8" : "Delete (Ctrl-?)", + "FIELD_OPTION_BACKSPACE_8" : "Backspace (Ctrl-H)", + "FIELD_OPTION_BACKSPACE_127" : "Delete (Ctrl-?)", "FIELD_OPTION_COLOR_SCHEME_BLACK_WHITE" : "Black on white", "FIELD_OPTION_COLOR_SCHEME_EMPTY" : "", From f03cd2bd8cf63d323b66e094e1cd66d30b93cc6d Mon Sep 17 00:00:00 2001 From: Nick Couchman Date: Mon, 2 Apr 2018 16:27:57 -0400 Subject: [PATCH 4/5] GUACAMOLE-269: Style tweak for translation spacing. --- guacamole/src/main/webapp/translations/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guacamole/src/main/webapp/translations/en.json b/guacamole/src/main/webapp/translations/en.json index 584e50680..251a02ff4 100644 --- a/guacamole/src/main/webapp/translations/en.json +++ b/guacamole/src/main/webapp/translations/en.json @@ -508,7 +508,7 @@ "FIELD_HEADER_TYPESCRIPT_NAME" : "Typescript name:", "FIELD_HEADER_TYPESCRIPT_PATH" : "Typescript path:", - "FIELD_OPTION_BACKSPACE_8" : "Backspace (Ctrl-H)", + "FIELD_OPTION_BACKSPACE_8" : "Backspace (Ctrl-H)", "FIELD_OPTION_BACKSPACE_127" : "Delete (Ctrl-?)", "FIELD_OPTION_COLOR_SCHEME_BLACK_WHITE" : "Black on white", From ae1d6dc279d98bccb1c1d642de8f812486ee1824 Mon Sep 17 00:00:00 2001 From: Nick Couchman Date: Mon, 2 Apr 2018 16:38:39 -0400 Subject: [PATCH 5/5] GUACAMOLE-269: Add translations for empty options. --- guacamole/src/main/webapp/translations/en.json | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/guacamole/src/main/webapp/translations/en.json b/guacamole/src/main/webapp/translations/en.json index 251a02ff4..a97406eb2 100644 --- a/guacamole/src/main/webapp/translations/en.json +++ b/guacamole/src/main/webapp/translations/en.json @@ -448,8 +448,9 @@ "FIELD_HEADER_TYPESCRIPT_NAME" : "Typescript name:", "FIELD_HEADER_TYPESCRIPT_PATH" : "Typescript path:", - "FIELD_OPTION_BACKSPACE_8" : "Backspace (Ctrl-H)", - "FIELD_OPTION_BACKSPACE_127" : "Delete (Ctrl-?)", + "FIELD_OPTION_BACKSPACE_EMPTY" : "", + "FIELD_OPTION_BACKSPACE_8" : "Backspace (Ctrl-H)", + "FIELD_OPTION_BACKSPACE_127" : "Delete (Ctrl-?)", "FIELD_OPTION_COLOR_SCHEME_BLACK_WHITE" : "Black on white", "FIELD_OPTION_COLOR_SCHEME_EMPTY" : "", @@ -508,8 +509,9 @@ "FIELD_HEADER_TYPESCRIPT_NAME" : "Typescript name:", "FIELD_HEADER_TYPESCRIPT_PATH" : "Typescript path:", - "FIELD_OPTION_BACKSPACE_8" : "Backspace (Ctrl-H)", - "FIELD_OPTION_BACKSPACE_127" : "Delete (Ctrl-?)", + "FIELD_OPTION_BACKSPACE_EMPTY" : "", + "FIELD_OPTION_BACKSPACE_8" : "Backspace (Ctrl-H)", + "FIELD_OPTION_BACKSPACE_127" : "Delete (Ctrl-?)", "FIELD_OPTION_COLOR_SCHEME_BLACK_WHITE" : "Black on white", "FIELD_OPTION_COLOR_SCHEME_EMPTY" : "",