This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch bugfix/help-cmd in repository x2goclient. from 6f55b84 help.cpp: complete pretty printer function. new 082af3f help.cpp: "copy" old command line parameters. new d80caf9 help.cpp: document broker options. Fixes: #851. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 2 ++ src/help.cpp | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+) -- Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch bugfix/help-cmd in repository x2goclient. commit 082af3f6c298edce89e81c7675c565f513daa886 Author: Mihai Moldovan <ionic@ionic.de> Date: Wed Apr 22 10:25:34 2015 +0200 help.cpp: "copy" old command line parameters. --- debian/changelog | 1 + src/help.cpp | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+) diff --git a/debian/changelog b/debian/changelog index 59502eb..4be5e47 100644 --- a/debian/changelog +++ b/debian/changelog @@ -264,6 +264,7 @@ x2goclient (4.0.4.0-0x2go1) UNRELEASED; urgency=low - help.cpp: get terminal window sizes on UNIX-based and Windows operating systems. - help.cpp: complete pretty printer function. + - help.cpp: "copy" old command line parameters. [ Fernando Pedemonte ] * New upstream release (4.0.4.0): diff --git a/src/help.cpp b/src/help.cpp index 8ef5811..44a2f41 100644 --- a/src/help.cpp +++ b/src/help.cpp @@ -79,7 +79,58 @@ help::prelude_t build_prelude () { } help::params_t help::build_params () { + params_t ret (); +# define ADD_OPT(param, desc) do { ret.append (params_elem_t (params, tr (desc))) } while (0) + ADD_OPT ("--help", "Shows this message."); + ADD_OPT ("--version", "Prints version information."); + + if (QFile::exists (":/txt/changelog")) { + ADD_OPT ("--changelog", "Shows the changelog."); + } + + if (QFile::exists (":/txt/git-info")) { + ADD_OPT ("--git-info", "Shows git information as used at compile this. [Deprecated: please use --version.]"); + } + + ADD_OPT ("--help-pack", "Shows available pack methods."); + ADD_OPT ("--debug", "Enables extensive debug output to the console. On Windows also enables PulseAudio logging to a file in the \".x2go/pulse\" in the USERPROFILE directory. The logs are not deleted when X2Go Client terminates."); + ADD_OPT ("--no-menu", "Hides menu bar."); + ADD_OPT ("--no-session-edit", "Disables session editing."); + ADD_OPT ("--maximize", "Starts maximized."); + ADD_OPT ("--hide", "Starts hidden (minimized to system tray where available.)"); + ADD_OPT ("--portable", "Starts in \"portable\" mode."); + ADD_OPT ("--pgp-card", "Forces OpenPGP smart card authentication."); + ADD_OPT ("--xinerama", "Enables Xinerama by default.") + ADD_OPT ("--ldap-printing", "Allows client side printing in LDAP mode."); + ADD_OPT ("--thinclient", "Enables thinclient mode. Starts without a window manager."); + ADD_OPT ("--haltbt", "Enables shutdown button."); + ADD_OPT ("--add-to-known-hosts", "Adds RSA key fingerprint to \".ssh/known_hosts\" if authenticity of the server can't be determined."); + ADD_OPT ("--ldap=<host:port:dn>", "Starts with LDAP support. Example: --ldap=ldapserver:389:o=organization,c=de"); + ADD_OPT ("--ldap1=<host:port>", "Defines the first LDAP failover server."); + ADD_OPT ("--ldap2=<host:port>", "Defines the second LDAP failover server."); + ADD_OPT ("--ssh-port=<port>", "Defines the remote SSH server port. Default: 22."); + ADD_OPT ("--client-ssh-port=<port>", "Defines the local machine's SSH server port. Needed for Client-Side Printing and File Sharing support. Default: 22."); + ADD_OPT ("--command=<cmd>", "Sets the default command. Default: 'KDE' (Desktop Session)"); + ADD_OPT ("--session=<session>", "Starts the session named \"session\"."); + ADD_OPT ("--user=<username>", "Sets the user name for connecting to the remote SSH server to \"username\"."); + ADD_OPT ("--geometry=<<W>x<H>|fullscreen>", "Sets the default window geometry. Default: 800x600."); + ADD_OPT ("--dpi=<dpi>", "Sets the remote X2Go Agent's DPI value to \"dpi\". Default: same as local display."); + ADD_OPT ("--link=<modem|isdn|adsl|wan|lan>", "Sets the default link type. Default: \"adsl\"."); + ADD_OPT ("--pack=<packmethod>", "Sets default pack method. Default: \"16m-jpeg-9\"."); + ADD_OPT ("--clipboard=<both|client|server|none>", "Sets the default clipboard mode. Default: \"both\"."); + ADD_OPT ("--kbd-layout=<layout>", "Sets the default keyboard layout to \"layout\". \"layout\" may be a comma-separated list."); + ADD_OPT ("--kbd-type=<type>", "Sets the default keyboard type."); + ADD_OPT ("--home=<dir>", "Sets the user's home directory."); + ADD_OPT ("--set-kbd=<0|1>", "Enables or disables overwriting the current keyboard settings."); + ADD_OPT ("--autostart=<app>", "Automatically launches the application \"app\" on session start in Published Applications mode."); + ADD_OPT ("--session-conf=<file>", "Defines an alternative session config file path."); + ADD_OPT ("--tray-icon", "Force-enables session system tray icon."); + ADD_OPT ("--close-disconnect", "Automatically closes X2Go Client after a disconnect."); + ADD_OPT ("--hide-foldersharing", "Hides all Folder-Sharing-related options."); +# undef ADD_OPT + + return (ret); } help::data_t help::build_data () { -- Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch bugfix/help-cmd in repository x2goclient. commit d80caf9d37bf6063c7c174eef0327afc5a5f5fc5 Author: Mihai Moldovan <ionic@ionic.de> Date: Wed Apr 22 10:26:29 2015 +0200 help.cpp: document broker options. Fixes: #851. --- debian/changelog | 1 + src/help.cpp | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 4be5e47..9f826ae 100644 --- a/debian/changelog +++ b/debian/changelog @@ -265,6 +265,7 @@ x2goclient (4.0.4.0-0x2go1) UNRELEASED; urgency=low systems. - help.cpp: complete pretty printer function. - help.cpp: "copy" old command line parameters. + - help.cpp: document broker options. Fixes: #851. [ Fernando Pedemonte ] * New upstream release (4.0.4.0): diff --git a/src/help.cpp b/src/help.cpp index 44a2f41..3930560 100644 --- a/src/help.cpp +++ b/src/help.cpp @@ -128,6 +128,11 @@ help::params_t help::build_params () { ADD_OPT ("--tray-icon", "Force-enables session system tray icon."); ADD_OPT ("--close-disconnect", "Automatically closes X2Go Client after a disconnect."); ADD_OPT ("--hide-foldersharing", "Hides all Folder-Sharing-related options."); + ADD_OPT ("--broker-name=<name>", "Sets the broker name to display in X2Go Client. This parameter is optional."); + ADD_OPT ("--broker-url=<protocol>://[username@]<host>[:port]/path", "Sets the URL of the session broker. \"protocol\" must be one of \"http\", \"https\" or \"ssh\". If \"username@\" is provided, it will be pasted into the authorization dialog of X2Go Client. URL examples are: https://x2gobroker.org/cgi-bin/x2gobroker.cgi, ssh://user@x2gobroker.org:22/usr/lib/x2go/x2gobroker.pl"); + ADD_OPT ("--broker-ssh-key=<path to key>", "Sets the path to an SSH key to use for authentication against an SSH session broker. The client's behavior is undefined if this flag is used for non-SSH session brokers."); + ADD_OPT ("--broker-autologin", "Enables the use of the default SSH key or SSH agent for authentication against an SSH session broker. The client's behavior is undefined if this flag is used for non-SSH session brokers."); + ADD_OPT ("--broker-noauth", "Does not ask for user credentials during session broker authentication. This can be useful if you are using an HTTP(S) session broker without authentication. If you run an HTTP(S) server without authentication, but with user-specific profiles, then put the user name into the broker URL (refer to --broker-url.) The user name then will be extracted from the broker URL and be sent to the session broker. The client's behavior is undefined if this flag is used f [...] # undef ADD_OPT return (ret); -- Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
-
git-admin＠x2go.org