[X2Go-Commits] [pyhoca-gui] 04/04: Re-order cmdline sections (man page, defaults.py).

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository pyhoca-gui.

commit 5543711895f14121cbcb98f54a55415b1c28706b
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Mar 17 14:19:14 2014 +0100

    Re-order cmdline sections (man page, defaults.py).
---
 debian/changelog         |    1 +
 man/man1/pyhoca-gui.1    |   11 +++++++----
 pyhoca/wxgui/defaults.py |   11 ++++++++++-
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 22de7e4..59e98ba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,6 +26,7 @@ pyhoca-gui (0.5.0.0-0x2go1) UNRELEASED; urgency=low
       for future versions of Python X2Go (>= 0.5.0.0).
     - Focus the user name field on logon if no user name is stored in the
       session profile.
+    - Re-order cmdline sections (man page, defaults.py).
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Wed, 08 Jan 2014 21:28:37 +0100
 
diff --git a/man/man1/pyhoca-gui.1 b/man/man1/pyhoca-gui.1
index 97eeb65..de03803 100644
--- a/man/man1/pyhoca-gui.1
+++ b/man/man1/pyhoca-gui.1
@@ -55,7 +55,7 @@ Enable debugging code of the unterlying Python X2Go module.
 .TP
 \*(T<\fB\-\-libdebug-sftpxfer\fR\*(T>
 Enable debugging code of Python X2Go's sFTP server code (very verbose, and it may even reveal promiscuous data).
-.SH GUI OPTIONS
+.SH SESSION RELATED OPTIONS
 .TP
 \*(T<\fB\-P, \-\-session-profile\fR\*(T>
 The name of the session profile to be used to make the connection. You can actually pass a komma-separated list of
@@ -124,6 +124,12 @@ Disconnect from a server if a session on that server has been suspended.
 \*(T<\fB\-\-disconnect-on-terminate\fR\*(T>
 Disconnect from a server if a session on that server has been terminated.
 .TP
+\*(T<\fB\-\-display <hostname>:<screennumber>\fR\*(T>
+Set the DISPLAY environment variable to <hostname>:<screennumber>.
+.SH BRANDING OPTIONS
+The \fBpyhoca-gui\fR provides some feature that allow to easily brand its appearance. Here some options
+for tweaking the \fBpyhoca-gui\fR appearance and behaviour.
+.TP
 \*(T<\fB\-\-splash-image\fR \fI<your-splash-image>\fR\*(T>
 Define an alternative splash image that gets shown on application startup (PNG files only, full path or filename as found in <share>/img).
 .TP
@@ -149,9 +155,6 @@ Grey-out the profile manager menu items and thus disable all profile management
 \*(T<\fB\-\-disable-notifications\fR\*(T>
 Disable all applet notifications.
 .TP
-\*(T<\fB\-\-display <hostname>:<screennumber>\fR\*(T>
-Set the DISPLAY environment variable to <hostname>:<screennumber>.
-.TP
 \*(T<\fB\-\-logon\-window\-position\fR \fI<x-pos>x<y-pos>\fR\*(T>
 Give a custom position for the logon window, use negative values to position relative to right/bottom border.
 .TP
diff --git a/pyhoca/wxgui/defaults.py b/pyhoca/wxgui/defaults.py
index c6f6615..64086e0 100644
--- a/pyhoca/wxgui/defaults.py
+++ b/pyhoca/wxgui/defaults.py
@@ -40,12 +40,15 @@ else:
     _config_backends = ('FILE')
 
 default_options = {
+
+  # common
   'debug': False,
   'quiet': False,
   'libdebug': False,
   'libdebug_sftpxfer': False,
   'version': False,
 
+  # session related options
   'session_profile': '',
   'remember_username': False,
   'non_interactive': False,
@@ -63,6 +66,9 @@ default_options = {
   'resume_all_on_connect': False,
   'disconnect_on_suspend': False,
   'disconnect_on_terminate': False,
+  'display': '',
+
+  # branding
   'splash_image': '',
   'about_image': '',
   'disable_splash': False,
@@ -70,9 +76,10 @@ default_options = {
   'disable_printingprefs': False,
   'disable_profilemanager': False,
   'disable_notifications': False,
-  'display': '',
   'logon_window_position': False,
   'published_applications_no_submenus': 10,
+
+  # backends
   'backend_controlsession': '',
   'backend_terminalsession': '',
   'backend_serversessioninfo': '',
@@ -81,6 +88,8 @@ default_options = {
   'backend_sessionprofiles': '',
   'backend_clientsettings': '',
   'backend_clientprinting': '',
+
+  # file locations
   'client_rootdir': '',
   'sessions_rootdir': '',
   'ssh_rootdir': '',

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/pyhoca-gui.git