You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by mj...@apache.org on 2018/04/02 20:42:15 UTC
[2/6] guacamole-client git commit: GUACAMOLE-269: Add fields for
controlling Backspace behavior.
GUACAMOLE-269: Add fields for controlling Backspace behavior.
Project: http://git-wip-us.apache.org/repos/asf/guacamole-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/guacamole-client/commit/5729dd2d
Tree: http://git-wip-us.apache.org/repos/asf/guacamole-client/tree/5729dd2d
Diff: http://git-wip-us.apache.org/repos/asf/guacamole-client/diff/5729dd2d
Branch: refs/heads/master
Commit: 5729dd2d3c6cb2bd97e80b88ba6b37f4cb8aa17f
Parents: 3d51a46
Author: Nick Couchman <vn...@apache.org>
Authored: Fri Feb 16 23:48:37 2018 -0500
Committer: Nick Couchman <vn...@apache.org>
Committed: Mon Apr 2 10:31:53 2018 -0400
----------------------------------------------------------------------
.../resources/org/apache/guacamole/protocols/ssh.json | 5 +++++
.../resources/org/apache/guacamole/protocols/telnet.json | 11 +++++++++++
guacamole/src/main/webapp/translations/en.json | 11 ++++++++++-
3 files changed, 26 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/5729dd2d/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/ssh.json
----------------------------------------------------------------------
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 edc7bbb..952b77b 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" ]
}
]
},
http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/5729dd2d/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/telnet.json
----------------------------------------------------------------------
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 15dac41..7acdcd8 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,6 +60,17 @@
},
{
+ "name" : "session",
+ "fields" : [
+ {
+ "name" : "backspace",
+ "type" : "ENUM",
+ "options" : [ "", "127", "8" ]
+ }
+ ]
+ },
+
+ {
"name" : "typescript",
"fields" : [
{
http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/5729dd2d/guacamole/src/main/webapp/translations/en.json
----------------------------------------------------------------------
diff --git a/guacamole/src/main/webapp/translations/en.json b/guacamole/src/main/webapp/translations/en.json
index ce65753..c33b14f 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"