The branch, twofactorauth has been updated via ef2eada1d0f9159b569473c1124dca0178ba6e8b (commit) from 462262d97120ce16afdc10c550d5bc4f64078187 (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: README | 7 ++++--- TODO | 16 ++++++++++++---- man/pyhoca-gui.1 | 25 ++++++++++++++++++++----- pyhoca/wxgui/__init__.py | 2 +- pyhoca/wxgui/frontend.py | 4 ++-- 5 files changed, 39 insertions(+), 15 deletions(-) The diff of changes is: diff --git a/README b/README index 1461a63..57350aa 100644 --- a/README +++ b/README @@ -17,7 +17,9 @@ See http://www.gnu.org/licenses/gpl.html for a recent copy. === Current features === -* ??? +* session management (start/resume/suspend/terminate) +* profile management (in prep, do not use currently) +* options menu (not there yet) === How to use it === @@ -29,10 +31,9 @@ Please refer to the man page: Please refer to the TODO file that has been shipped with pyhoca-gui. - Thanks in advance for your feedback and contributions, -Kiel (Germany) & LJ Almere Haven (Netherlands), 20101116 +Kiel (Germany) & LJ Almere Haven (Netherlands), 20101208 Dick Kniep <dick.kniep@lindix.nl> Mike Gabriel <m.gabriel@das-netzwerkteam.de> diff --git a/TODO b/TODO index 8d5ffb3..cf1dead 100644 --- a/TODO +++ b/TODO @@ -4,11 +4,19 @@ pyhoca-gui - Copyright (C) 2010 by Dick Kniep <dick.kniep@lindix.nl> Published under the terms of the GNU General Public License. See http://www.gnu.org/licenses/gpl.html for a recent copy. - === pyhoca-gui TODOs === -* ??? - +* detect session suspend/terminate that were executed from another client + (or from within the session itself) +* get rid of stale/zombie nxproxy subprocesses +* continue sessions that are running on another server (for now: + suspend the session and then resume it) +* profile manager (sessions file based) +* profile manager (Windows registry based) +* options manager +* print dialog on incoming spool jobs +* a X2goMimeDropbox for exporting MIME type objects +* automatically launch XServer on Windows === pyhoca-gui Wishlist === @@ -17,7 +25,7 @@ See http://www.gnu.org/licenses/gpl.html for a recent copy. If you find any issues with this programme please let me know. -Kiel (Germany) & LJ Almere Haven (Netherlands), 20101116 +Kiel (Germany) & LJ Almere Haven (Netherlands), 20101208 Dick Kniep <dick.kniep@lindix.nl> Mike Gabriel <m.gabriel@das-netzwerkteam.de> diff --git a/man/pyhoca-gui.1 b/man/pyhoca-gui.1 index 597b8ef..f6f5561 100644 --- a/man/pyhoca-gui.1 +++ b/man/pyhoca-gui.1 @@ -32,6 +32,8 @@ pre-configured session profiles in the X2go profile manager and also configure t \fBpyhoca-gui\fR uses the same set of config files (\fBsettings\fR, \fBprinting\fR and \fBsessions\fR in ~/.x2goclient) as the original X2go Client application (by Heinz-M. Graesing and Oleksandr Schneydr) does. .PP +On Windows systems \fBpyhoca-gui\fR uses the same set of Windows registry keys and values as the original X2go Client application. +.PP See the included README and TODO for further information on \fBpyhoca-gui\fR. .SH COMMON OPTIONS \fBpyhoca-gui\fR accepts the following common options: @@ -50,16 +52,29 @@ 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 X2GO GUI OPTIONS +.SH GUI OPTIONS .TP \*(T<\fB\-u, \-\-username\fR \fI<USERNAME>\fR\*(T> Username for the session (default: currently logged in user). .TP -\*(T<\fB\-m, \-\-minimized\fR\*(T> -Start x2go gui minimized on the taskbar. +\*(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 +session profile names to this option. +.TP +\*(T<\fB\-\-auto-connect\fR\*(T> +Connect sessions via SSH public key authentication on application startup, if possible. +.TP +\*(T<\fB\-\-start-on-connect\fR\*(T> +Start a session directly after authentication (only if no suspended sessions are available). +.TP +\*(T<\fB\-\-resume-on-connect, \-\-resume-newest-on-connect\fR\*(T> +After authentication directly auto-resume the newest available running/suspended session. +.TP +\*(T<\fB\-\-resume-oldest-on-connect\fR\*(T> +After authentication directly auto-resume the oldest available running/suspended session. .TP -\*(T<\fB\-s, \-\-session-profile\fR\*(T> -The name of the session profile to be used to make the connection. +\*(T<\fB\-\-resume-all-on-connect\fR\*(T> +After authentication directly auto-resume all available running/suspended session. .SH "SEE ALSO" \fB/usr/share/doc/pyhoca-gui\fR .SH AUTHOR diff --git a/pyhoca/wxgui/__init__.py b/pyhoca/wxgui/__init__.py index c3b0113..576689c 100644 --- a/pyhoca/wxgui/__init__.py +++ b/pyhoca/wxgui/__init__.py @@ -18,6 +18,6 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -__VERSION__ = '0.1.0' +__VERSION__ = '0.0.1' from frontend import * \ No newline at end of file diff --git a/pyhoca/wxgui/frontend.py b/pyhoca/wxgui/frontend.py index ea4d702..8158807 100644 --- a/pyhoca/wxgui/frontend.py +++ b/pyhoca/wxgui/frontend.py @@ -357,7 +357,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient): while not self._X2goClient__has_session_terminated(session_uuid, session_name) and i <= 10: i +=1 gevent.sleep(1) - self.notifier.send(profile_name, 'X2go session has terminated...\n%s' % session_name, icon='session_suspend', timeout=8000) + self.notifier.send(profile_name, 'X2go session has terminated...\n%s' % session_name, icon='session_terminate', timeout=8000) _dummy = self._X2goClient__list_sessions(session_uuid, refresh_cache=True) def OnSessionTerminate(self, evt): @@ -400,7 +400,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient): # disconnect all profile sessions if self._X2goClient__server_is_alive(session_uuid): - self._X2goClient__disconnect_profile(profile_name) + self._X2goClient__disconnect_profile(self.current_profile_name) gevent.sleep(2) if not self._X2goClient__is_session_connected(session_uuid): self.notifier.send('%s - disconnect' % self.current_profile_name, 'X2go Profile is now disconnected.', icon='auth_disconnect', timeout=4000) hooks/post-receive -- pyhoca-gui.git (Python X2Go Client (wxPython GUI)) 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 "pyhoca-gui.git" (Python X2Go Client (wxPython GUI)).