You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by jm...@apache.org on 2016/08/10 23:50:46 UTC

[2/3] incubator-guacamole-client git commit: GUACAMOLE-5: Add "read-only" parameter to all protocols.

GUACAMOLE-5: Add "read-only" parameter to all protocols.


Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/commit/94ce151f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/94ce151f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/94ce151f

Branch: refs/heads/master
Commit: 94ce151f69a7cbe5b98f86d9f7997c498955bb6c
Parents: 14365ff
Author: Michael Jumper <mj...@apache.org>
Authored: Sun Aug 7 21:21:57 2016 -0700
Committer: Michael Jumper <mj...@apache.org>
Committed: Sun Aug 7 22:53:32 2016 -0700

----------------------------------------------------------------------
 .../org/apache/guacamole/protocols/rdp.json      | 19 +++++++++++++++++++
 .../org/apache/guacamole/protocols/ssh.json      | 19 +++++++++++++++++++
 .../org/apache/guacamole/protocols/telnet.json   | 19 +++++++++++++++++++
 .../org/apache/guacamole/protocols/vnc.json      | 14 ++++++++++++++
 guacamole/src/main/webapp/translations/de.json   |  3 +++
 guacamole/src/main/webapp/translations/en.json   |  3 +++
 guacamole/src/main/webapp/translations/fr.json   |  3 +++
 guacamole/src/main/webapp/translations/nl.json   |  3 +++
 guacamole/src/main/webapp/translations/ru.json   |  3 +++
 9 files changed, 86 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/94ce151f/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/rdp.json
----------------------------------------------------------------------
diff --git a/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/rdp.json b/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/rdp.json
index 9ff5d51..cfe51d6 100644
--- a/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/rdp.json
+++ b/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/rdp.json
@@ -106,6 +106,11 @@
                     "name"    : "resize-method",
                     "type"    : "ENUM",
                     "options" : [ "", "reconnect", "display-update" ]
+                },
+                {
+                    "name"    : "read-only",
+                    "type"    : "BOOLEAN",
+                    "options" : [ "true" ]
                 }
             ]
         },
@@ -280,5 +285,19 @@
             ]
         }
 
+    ],
+    "sharingProfileForms" : [
+
+        {
+            "name"  : "display",
+            "fields" : [
+                {
+                    "name"    : "read-only",
+                    "type"    : "BOOLEAN",
+                    "options" : [ "true" ]
+                }
+            ]
+        }
+
     ]
 }

http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/94ce151f/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 36e3a0e..93cef92 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
@@ -54,6 +54,11 @@
                     "name"  : "font-size",
                     "type"  : "ENUM",
                     "options" : [ "", "8", "9", "10", "11", "12", "14", "18", "24", "30", "36", "48", "60", "72", "96" ]
+                },
+                {
+                    "name"    : "read-only",
+                    "type"    : "BOOLEAN",
+                    "options" : [ "true" ]
                 }
             ]
         },
@@ -117,5 +122,19 @@
             ]
         }
 
+    ],
+    "sharingProfileForms" : [
+
+        {
+            "name"  : "display",
+            "fields" : [
+                {
+                    "name"    : "read-only",
+                    "type"    : "BOOLEAN",
+                    "options" : [ "true" ]
+                }
+            ]
+        }
+
     ]
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/94ce151f/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 2a4f9dd..ea9c9fa 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
@@ -50,6 +50,11 @@
                     "name"  : "font-size",
                     "type"  : "ENUM",
                     "options" : [ "", "8", "9", "10", "11", "12", "14", "18", "24", "30", "36", "48", "60", "72", "96" ]
+                },
+                {
+                    "name"    : "read-only",
+                    "type"    : "BOOLEAN",
+                    "options" : [ "true" ]
                 }
             ]
         },
@@ -92,5 +97,19 @@
             ]
         }
 
+    ],
+    "sharingProfileForms" : [
+
+        {
+            "name"  : "display",
+            "fields" : [
+                {
+                    "name"    : "read-only",
+                    "type"    : "BOOLEAN",
+                    "options" : [ "true" ]
+                }
+            ]
+        }
+
     ]
 }

http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/94ce151f/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/vnc.json
----------------------------------------------------------------------
diff --git a/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/vnc.json b/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/vnc.json
index 76222e8..4d42f55 100644
--- a/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/vnc.json
+++ b/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/vnc.json
@@ -150,5 +150,19 @@
             ]
         }
 
+    ],
+    "sharingProfileForms" : [
+
+        {
+            "name"  : "display",
+            "fields" : [
+                {
+                    "name"    : "read-only",
+                    "type"    : "BOOLEAN",
+                    "options" : [ "true" ]
+                }
+            ]
+        }
+
     ]
 }

http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/94ce151f/guacamole/src/main/webapp/translations/de.json
----------------------------------------------------------------------
diff --git a/guacamole/src/main/webapp/translations/de.json b/guacamole/src/main/webapp/translations/de.json
index fd30030..67c8a15 100644
--- a/guacamole/src/main/webapp/translations/de.json
+++ b/guacamole/src/main/webapp/translations/de.json
@@ -292,6 +292,7 @@
         "FIELD_HEADER_INITIAL_PROGRAM" : "Startprogramm:",
         "FIELD_HEADER_PASSWORD"        : "Passwort:",
         "FIELD_HEADER_PORT"            : "Port:",
+        "FIELD_HEADER_READ_ONLY"       : "Nur-Lesen:",
         "FIELD_HEADER_REMOTE_APP_ARGS" : "Parameter:",
         "FIELD_HEADER_REMOTE_APP_DIR"  : "Arbeitsverzeichnis:",
         "FIELD_HEADER_REMOTE_APP"      : "Programm:",
@@ -354,6 +355,7 @@
         "FIELD_HEADER_PASSPHRASE"  : "Passphrase:",
         "FIELD_HEADER_PORT"        : "Port:",
         "FIELD_HEADER_PRIVATE_KEY" : "Privater Schl�ssel:",
+        "FIELD_HEADER_READ_ONLY"   : "Nur-Lesen:",
 
         "FIELD_OPTION_COLOR_SCHEME_BLACK_WHITE" : "Schwarz auf Wei�",
         "FIELD_OPTION_COLOR_SCHEME_EMPTY"       : "",
@@ -397,6 +399,7 @@
         "FIELD_HEADER_PASSWORD"       : "Passwort:",
         "FIELD_HEADER_PASSWORD_REGEX" : "Regul�re Passwortersetzungen:",
         "FIELD_HEADER_PORT"           : "Port:",
+        "FIELD_HEADER_READ_ONLY"      : "Nur-Lesen:",
 
         "FIELD_OPTION_COLOR_SCHEME_BLACK_WHITE" : "Schwarz auf Wei�",
         "FIELD_OPTION_COLOR_SCHEME_EMPTY"       : "",

http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/94ce151f/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 e991436..01f332e 100644
--- a/guacamole/src/main/webapp/translations/en.json
+++ b/guacamole/src/main/webapp/translations/en.json
@@ -304,6 +304,7 @@
         "FIELD_HEADER_PORT"            : "Port:",
         "FIELD_HEADER_PRECONNECTION_BLOB" : "Preconnection BLOB (VM ID):",
         "FIELD_HEADER_PRECONNECTION_ID"   : "RDP source ID:",
+        "FIELD_HEADER_READ_ONLY"      : "Read-only:",
         "FIELD_HEADER_RECORDING_NAME" : "Recording name:",
         "FIELD_HEADER_RECORDING_PATH" : "Recording path:",
         "FIELD_HEADER_RESIZE_METHOD" : "Resize method:",
@@ -378,6 +379,7 @@
         "FIELD_HEADER_PASSPHRASE"  : "Passphrase:",
         "FIELD_HEADER_PORT"        : "Port:",
         "FIELD_HEADER_PRIVATE_KEY" : "Private key:",
+        "FIELD_HEADER_READ_ONLY"   : "Read-only:",
         "FIELD_HEADER_RECORDING_NAME" : "Recording name:",
         "FIELD_HEADER_RECORDING_PATH" : "Recording path:",
         "FIELD_HEADER_TYPESCRIPT_NAME" : "Typescript name:",
@@ -429,6 +431,7 @@
         "FIELD_HEADER_PASSWORD"       : "Password:",
         "FIELD_HEADER_PASSWORD_REGEX" : "Password regular expression:",
         "FIELD_HEADER_PORT"           : "Port:",
+        "FIELD_HEADER_READ_ONLY"      : "Read-only:",
         "FIELD_HEADER_RECORDING_NAME" : "Recording name:",
         "FIELD_HEADER_RECORDING_PATH" : "Recording path:",
         "FIELD_HEADER_TYPESCRIPT_NAME" : "Typescript name:",

http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/94ce151f/guacamole/src/main/webapp/translations/fr.json
----------------------------------------------------------------------
diff --git a/guacamole/src/main/webapp/translations/fr.json b/guacamole/src/main/webapp/translations/fr.json
index 2fc9abd..b219997 100644
--- a/guacamole/src/main/webapp/translations/fr.json
+++ b/guacamole/src/main/webapp/translations/fr.json
@@ -294,6 +294,7 @@
         "FIELD_HEADER_PORT"            : "Port:",
         "FIELD_HEADER_PRECONNECTION_BLOB" : "Pr�-connexion BLOB (VM ID):",
         "FIELD_HEADER_PRECONNECTION_ID"   : "Source RDP ID:",
+        "FIELD_HEADER_READ_ONLY"       : "Lecture seule:",
         "FIELD_HEADER_REMOTE_APP_ARGS" : "Param�tres:",
         "FIELD_HEADER_REMOTE_APP_DIR"  : "R�pertoire de travail:",
         "FIELD_HEADER_REMOTE_APP"      : "Programme:",
@@ -357,6 +358,7 @@
         "FIELD_HEADER_PASSPHRASE"  : "Phrase secr�te:",
         "FIELD_HEADER_PORT"        : "Port:",
         "FIELD_HEADER_PRIVATE_KEY" : "Cl� priv�e:",
+        "FIELD_HEADER_READ_ONLY"   : "Lecture seule:",
 
         "FIELD_OPTION_COLOR_SCHEME_BLACK_WHITE" : "Noir sur blanc",
         "FIELD_OPTION_COLOR_SCHEME_EMPTY"       : "",
@@ -400,6 +402,7 @@
         "FIELD_HEADER_PASSWORD"       : "Mot de passe:",
         "FIELD_HEADER_PASSWORD_REGEX" : "Expression r�guli�re Mot de passe:",
         "FIELD_HEADER_PORT"           : "Port:",
+        "FIELD_HEADER_READ_ONLY"      : "Lecture seule:",
 
         "FIELD_OPTION_COLOR_SCHEME_BLACK_WHITE" : "Noir sur blanc",
         "FIELD_OPTION_COLOR_SCHEME_EMPTY"       : "",

http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/94ce151f/guacamole/src/main/webapp/translations/nl.json
----------------------------------------------------------------------
diff --git a/guacamole/src/main/webapp/translations/nl.json b/guacamole/src/main/webapp/translations/nl.json
index 1438145..413ebbd 100644
--- a/guacamole/src/main/webapp/translations/nl.json
+++ b/guacamole/src/main/webapp/translations/nl.json
@@ -295,6 +295,7 @@
         "FIELD_HEADER_PORT"            : "Poort:",
         "FIELD_HEADER_PRECONNECTION_BLOB" : "Voor te bereiden BLOB (VM ID):",
         "FIELD_HEADER_PRECONNECTION_ID"   : "RDP bron ID:",
+        "FIELD_HEADER_READ_ONLY"      : "Alleen lezen:",
         "FIELD_HEADER_RECORDING_NAME" : "Opname naam:",
         "FIELD_HEADER_RECORDING_PATH" : "Opname map:",
         "FIELD_HEADER_RESIZE_METHOD" : "Schaal methode:",
@@ -369,6 +370,7 @@
         "FIELD_HEADER_PASSPHRASE"  : "Wachtwoordzin:",
         "FIELD_HEADER_PORT"        : "Poort:",
         "FIELD_HEADER_PRIVATE_KEY" : "Persoonlijke sleutel:",
+        "FIELD_HEADER_READ_ONLY"   : "Alleen lezen:",
         "FIELD_HEADER_RECORDING_NAME" : "Opname naam:",
         "FIELD_HEADER_RECORDING_PATH" : "Opname map:",
         "FIELD_HEADER_TYPESCRIPT_NAME" : "Typescript naam:",
@@ -420,6 +422,7 @@
         "FIELD_HEADER_PASSWORD"       : "Wachtwoord:",
         "FIELD_HEADER_PASSWORD_REGEX" : "Wachtwoord reguliere expressie:",
         "FIELD_HEADER_PORT"           : "Poort:",
+        "FIELD_HEADER_READ_ONLY"      : "Alleen lezen:",
         "FIELD_HEADER_RECORDING_NAME" : "Opname naam:",
         "FIELD_HEADER_RECORDING_PATH" : "Opname map:",
         "FIELD_HEADER_TYPESCRIPT_NAME" : "Typescript naam:",

http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/94ce151f/guacamole/src/main/webapp/translations/ru.json
----------------------------------------------------------------------
diff --git a/guacamole/src/main/webapp/translations/ru.json b/guacamole/src/main/webapp/translations/ru.json
index a391240..8f2ef69 100644
--- a/guacamole/src/main/webapp/translations/ru.json
+++ b/guacamole/src/main/webapp/translations/ru.json
@@ -271,6 +271,7 @@
         "FIELD_HEADER_INITIAL_PROGRAM" : "\u0417\u0430\u043f\u0443\u0441\u043a \u043f\u0440\u043e\u0433\u0440\u0430\u043c\u043c \u043f\u0440\u0438 \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u0438:",
         "FIELD_HEADER_PASSWORD"        : "\u041f\u0430\u0440\u043e\u043b\u044c:",
         "FIELD_HEADER_PORT"            : "\u041f\u043e\u0440\u0442:",
+        "FIELD_HEADER_READ_ONLY"       : "\u0422\u043e\u043b\u044c\u043a\u043e \u043f\u0440\u043e\u0441\u043c\u043e\u0442\u0440:",
         "FIELD_HEADER_REMOTE_APP_ARGS" : "\u041f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u044b RemoteApp:",
         "FIELD_HEADER_REMOTE_APP_DIR"  : "\u0420\u0430\u0431\u043e\u0447\u0438\u0439 \u043a\u0430\u0442\u0430\u043b\u043e\u0433 RemoteApp:",
         "FIELD_HEADER_REMOTE_APP"      : "\u041f\u0440\u043e\u0433\u0440\u0430\u043c\u043c\u044b RemoteApp:",
@@ -322,6 +323,7 @@
         "FIELD_HEADER_PASSPHRASE"  : "\u0421\u0435\u043a\u0440\u0435\u0442\u043d\u0430\u044f \u0444\u0440\u0430\u0437\u0430:",
         "FIELD_HEADER_PORT"        : "\u041f\u043e\u0440\u0442:",
         "FIELD_HEADER_PRIVATE_KEY" : "\u041f\u0440\u0438\u0432\u0430\u0442\u043d\u044b\u0439 \u043a\u043b\u044e\u0447:",
+        "FIELD_HEADER_READ_ONLY"   : "\u0422\u043e\u043b\u044c\u043a\u043e \u043f\u0440\u043e\u0441\u043c\u043e\u0442\u0440:",
 
         "FIELD_OPTION_FONT_SIZE_8"     : "8",
         "FIELD_OPTION_FONT_SIZE_9"     : "9",
@@ -352,6 +354,7 @@
         "FIELD_HEADER_PASSWORD"       : "\u041f\u0430\u0440\u043e\u043b\u044c:",
         "FIELD_HEADER_PASSWORD_REGEX" : "\u0420\u0435\u0433\u0443\u043b\u044f\u0440\u043d\u043e\u0435 \u0432\u044b\u0440\u0430\u0436\u0435\u043d\u0438\u0435 \u0434\u043b\u044f \u043f\u0430\u0440\u043e\u043b\u044f:",
         "FIELD_HEADER_PORT"           : "\u041f\u043e\u0440\u0442:",
+        "FIELD_HEADER_READ_ONLY"      : "\u0422\u043e\u043b\u044c\u043a\u043e \u043f\u0440\u043e\u0441\u043c\u043e\u0442\u0440:",
 
         "FIELD_OPTION_FONT_SIZE_8"     : "8",
         "FIELD_OPTION_FONT_SIZE_9"     : "9",