The branch, master has been updated via 226c0053c56d1aa173ac1d31e0b7e0accb0315bb (commit) from d553677502781c5f5520ec2c41f067d054df9465 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 226c0053c56d1aa173ac1d31e0b7e0accb0315bb Author: Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> Date: Fri Oct 26 14:54:25 2012 +0200 add descriptions for some configuration details ----------------------------------------------------------------------- Summary of changes: x2goclientconfig.cpp | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) The diff of changes is: diff --git a/x2goclientconfig.cpp b/x2goclientconfig.cpp index d96c871..45bfd49 100644 --- a/x2goclientconfig.cpp +++ b/x2goclientconfig.cpp @@ -38,7 +38,7 @@ X2GoClientConfig::X2GoClientConfig() initDetail(&showStatusBar, (bool)true, "--show-status-bar", "settings.General.showStatus", tr("Display status bar")); initDetail(&clientSSHPort, (int)22, "--client-ssh-port", "settings.General.clientport", tr("Clientside SSH port for file system export usage")); - + initDetail(&trayEnabled, (bool)false, QString::null, "settings.trayicon.enabled", tr("Display icon in system tray")); initDetail(&trayMinimize, (bool)false, QString::null, "settings.trayicon.mintotray", tr("Hide to system tray when minimized")); initDetail(&trayHideOnClose, (bool)false, QString::null, "settings.trayicon.noclose", tr("Hide to system tray when closed")); @@ -65,15 +65,16 @@ X2GoClientConfig::X2GoClientConfig() tr("add RSA key fingerprint to ~/.ssh/known_hosts")); initDetail(&disallowSessionEdit, (bool)false, "--no-session-edit", QString::null, tr("not allow user to edit preconfigured sessions")); - initDetail(&defaultAutoLogin, (bool)false, "--autologin", QString::null, tr("")); - initDetail(&defaultBrockerAutoLogin, (bool)false, "--broker-autologin", QString::null, tr("")); - initDetail(&defaultNoBrockerAuth, (bool)false, "--broker-noauth", QString::null, tr("")); + initDetail(&defaultAutoLogin, (bool)false, "--autologin", QString::null, tr("try SSH autologin by default")); + initDetail(&defaultBrockerAutoLogin, (bool)false, "--broker-autologin", QString::null, + tr("try broker authentication with SSH autologin")); + initDetail(&defaultNoBrockerAuth, (bool)false, "--broker-noauth", QString::null, tr("try broker authentication without password")); initDetail(&defaultDpi, (int)0, "--dpi", QString::null, tr("set dpi of x2goagent, default - not set")); initDetail(&defaultLink, (QString)"adsl", "--link", QString::null, tr("<modem|isdn|adsl|wan|lan> set default link type, default 'adsl'")); initDetail(&defaultPack, (QString)"16m-jpeg-9", "--pack", QString::null, tr("set default pack method, default '16m-jpeg-9'")); - initDetail(&defaultSound, (bool)true, "--sound", QString::null, tr("")); + initDetail(&defaultSound, (bool)true, "--sound", QString::null, tr("enable or disable sound by default")); initDetail(&defaultSessionGeometry, (QString)"1024x768", "--geometry", QString::null, tr("<W>x<H>|fullscreen set default geometry, default value '800x600'")); initDetail(&defaultKbdLayout, (QString)tr("us"), "--kbd-layout", QString::null, @@ -83,25 +84,26 @@ X2GoClientConfig::X2GoClientConfig() initDetail(&sessionConfigFile, (QString)QString::null, "--session-conf", QString::null, tr("path to alternative session config")); - initDetail(&defaultSessionName, (QString)QString::null, "--session", QString::null, tr("Start specified session")); - initDetail(&defaultSessionId, (QString)QString::null, "--sessionid", QString::null, tr("")); + initDetail(&defaultSessionName, (QString)QString::null, "--session", QString::null, tr("start specified session")); + initDetail(&defaultSessionId, (QString)QString::null, "--sessionid", QString::null, tr("start specified session with specified ID")); initDetail(&defaultUserName, (QString)QString::null, "--user", QString::null, tr("select specified user")); initDetail(&defaultSessionCommand, (QString)QString::null, "--command", QString::null, tr("Set default command, default value 'KDE'")); initDetail(&defaultSSHPort, (int)22, "--ssh-port", QString::null, tr("default SSH port, default 22")); - initDetail(&defaultSSHKey, (QString)QString::null, "--ssh-key", QString::null, tr("")); + initDetail(&defaultSSHKey, (QString)QString::null, "--ssh-key", QString::null, tr("ssh key in form [user@][server:][port:]<key>")); - initDetail(&brokerUrl, (QString)QString::null, "--broker-url", QString::null, tr("")); - initDetail(&brokerSSHKey, (QString)QString::null, "--broker-ssh-key", QString::null, tr("")); - initDetail(&brokerName, (QString)QString::null, "--broker-name", QString::null, tr("")); - initDetail(&authId, (QString)QString::null, "--auth-id", QString::null, tr("")); + initDetail(&brokerUrl, (QString)QString::null, "--broker-url", QString::null, tr("url of a broker")); + initDetail(&brokerSSHKey, (QString)QString::null, "--broker-ssh-key", QString::null, tr("SSH key for broker authentication")); + initDetail(&brokerName, (QString)QString::null, "--broker-name", QString::null, tr("Name of broker to display in X2Go Client")); + initDetail(&authId, (QString)QString::null, "--auth-id", QString::null, tr("File with authentication ID")); initDetail(&autoStartApp, (QString)QString::null, "--autostart", QString::null, tr("launch \"app\" by session start in \"published applications\" mode")); initDetail(&homeDirectory, (QString)QDir::homePath(), "--home", QString::null, tr("set users home directory")); - initDetail(&readExportsFrom, (QString)QString::null, "--read-exports-from", QString::null, tr("")); + initDetail(&readExportsFrom, (QString)QString::null, "--read-exports-from", QString::null, + tr("Read FS exports from this directory (thin client mode)")); } void X2GoClientConfig::initDetail(X2GoClientConfigDetail* detail, QVariant value, QString commandLineParameter, hooks/post-receive -- x2goclient2.git (X2Go Client 2 (rewrite of x2goclient.git)) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goclient2.git" (X2Go Client 2 (rewrite of x2goclient.git)).