[X2Go-Commits] pyhoca-gui.git - build-59a18b6e3b5d3f1dd8f07f26433d37fe5984a57d (branch) updated: 26a6dae65464f73fdeb39f8e38e3951f3893a9be
X2Go dev team
git-admin at x2go.org
Tue Aug 27 13:20:57 CEST 2013
The branch, build-59a18b6e3b5d3f1dd8f07f26433d37fe5984a57d has been updated
via 26a6dae65464f73fdeb39f8e38e3951f3893a9be (commit)
from 1cdaab54e43c66b9bc218ef5684f71af4915fa08 (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 | 7 +----
debian/changelog | 27 +++++++++++++++++-
debian/control | 2 +-
man/pyhoca-gui.1 | 69 ++++++++++++++++++++++++++++++++++++++++++++--
pyhoca/wxgui/__init__.py | 2 +-
pyhoca/wxgui/frontend.py | 5 ++--
setup_py2exe.py | 6 ++--
8 files changed, 106 insertions(+), 19 deletions(-)
The diff of changes is:
diff --git a/README b/README
index 57350aa..ebe1969 100644
--- a/README
+++ b/README
@@ -18,8 +18,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)
+* profile management
+* audio, printing, local folder sharing
+* connect throug SSH proxy host (by forward tunneling)
=== How to use it ===
@@ -33,7 +34,7 @@ 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), 20101208
+Kiel (Germany) & LJ Almere Haven (Netherlands), 20101231
Dick Kniep <dick.kniep at lindix.nl>
Mike Gabriel <m.gabriel at das-netzwerkteam.de>
diff --git a/TODO b/TODO
index cf1dead..4264fd7 100644
--- a/TODO
+++ b/TODO
@@ -6,17 +6,12 @@ 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 ===
@@ -25,7 +20,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), 20101208
+Kiel (Germany) & LJ Almere Haven (Netherlands), 20101231
Dick Kniep <dick.kniep at lindix.nl>
Mike Gabriel <m.gabriel at das-netzwerkteam.de>
diff --git a/debian/changelog b/debian/changelog
index b67526c..7b2260f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,28 @@
+pyhoca-gui (0.0.18-0~nwt1) lucid maverick testing unstable; urgency=low
+
+ * bugfix release (enables profilemanager for release versions)
+
+ -- Mike Gabriel <m.gabriel at das-netzwerkteam.de> Fri, 31 Dec 2010 02:10:00 +0100
+
+pyhoca-gui (0.0.17-0~nwt1) lucid maverick testing unstable; urgency=low
+
+ * updated documentation
+ * updated man page
+
+ -- Mike Gabriel <m.gabriel at das-netzwerkteam.de> Fri, 31 Dec 2010 02:00:00 +0100
+
+pyhoca-gui (0.0.16-0~nwt3) lucid maverick testing unstable; urgency=low
+
+ * updated Python X2go dependency
+
+ -- Mike Gabriel <m.gabriel at das-netzwerkteam.de> Fri, 31 Dec 2010 01:05:00 +0100
+
+pyhoca-gui (0.0.16-0~nwt2) lucid maverick testing unstable; urgency=low
+
+ * updated Python X2go dependency
+
+ -- Mike Gabriel <m.gabriel at das-netzwerkteam.de> Fri, 31 Dec 2010 00:30:00 +0100
+
pyhoca-gui (0.0.16-0~nwt1) lucid maverick testing unstable; urgency=low
* implemented profile manager
@@ -7,7 +32,7 @@ pyhoca-gui (0.0.16-0~nwt1) lucid maverick testing unstable; urgency=low
* implemented local folder sharing for connected sessions
* added XMDCP support (still buggy)
- -- Mike Gabriel <m.gabriel at das-netzwerkteam.de> Fri, 30 Dec 2010 23:00:00 +0100
+ -- Mike Gabriel <m.gabriel at das-netzwerkteam.de> Thu, 30 Dec 2010 23:00:00 +0100
pyhoca-gui (0.0.15-0~nwt1) lucid maverick testing unstable; urgency=low
diff --git a/debian/control b/debian/control
index 2bc7112..8129078 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ XS-Python-Version: >= 2.6
Package: pyhoca-gui
Architecture: all
-Depends: ${misc:Depends}, python, python-x2go (>=0.0.25-0~nwt1),
+Depends: ${misc:Depends}, python, python-x2go (>=0.0.28-0~nwt1),
python-argparse, python-notify, python-setproctitle (>=1.0.1-1),
wx-common(>=2.8.10.0), python-wxtools (>=2.8.10.0)
Description: An graphical X2go client written in (wx)Python
diff --git a/man/pyhoca-gui.1 b/man/pyhoca-gui.1
index f8bbae9..94207cc 100644
--- a/man/pyhoca-gui.1
+++ b/man/pyhoca-gui.1
@@ -5,7 +5,7 @@
\\$2 \(la\\$1\(ra\\$3
..
.if \n(.g .mso www.tmac
-.TH pyhoca-gui 1 "21 Sep 2010" "Version 0.0.1" "X2go Application"
+.TH pyhoca-gui 1 "31 Dec 2010" "Version 0.0.18" "X2go Application"
.SH NAME
pyhoca-gui \- graphical X2go client applet written in Python
.SH SYNOPSIS
@@ -44,6 +44,9 @@ Display a help with all available command line options and exit.
\*(T<\fB\-V, \-\-version\fR\*(T>
Output version information and exit.
.TP
+\*(T<\fB\-d, \-\-quiet\fR\*(T>
+No output to stdout at all! Use this option on Windows!!!
+.TP
\*(T<\fB\-d, \-\-debug\fR\*(T>
Enable debugging output.
.TP
@@ -61,6 +64,9 @@ Username for the session (default: currently logged in user).
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\-\-show-profile-metatypes\fR\*(T>
+Show descriptive meta information on session profiles in menus (NOTE: this makes menus appear a bit more sluggish, use it mostly for debugging).
+.TP
\*(T<\fB\-\-auto-connect\fR\*(T>
Connect sessions via SSH public key authentication on application startup, if possible.
.TP
@@ -80,7 +86,66 @@ After authentication directly auto-resume all available running/suspended sessio
Grey-out the ,,Options'' menu item and thus disable the client configuration window.
.TP
\*(T<\fB\-\-disable-profilemanager\fR\*(T>
-Grey-out the profile manager menu items and thus disable all profile management functionalities.
+Grey-out the profile manager menu items and thus disable all profile management functionalities.B
+.TP
+\*(T<\fB\-\-display <hostname>:<screennumber>\fR\*(T>
+Set the DISPLAY environment variable to <hostname>:<screennumber>.
+.SH BACKEND OPTIONS
+\fBpyhoca-gui\fR supports transparent use of different data backends. For configuration three backends are common:
+FILE, GCONF (Linux only) and WINREG (Windows only). The default backend currently is the FILE backend
+on all platforms.
+.PP
+For client-server communication the only yet implemented backend is the STDOUT backend (as X2go server commands
+print their execution results to /dev/stdout. (But other communication backends might be possible in the future...).
+.PP
+In the same way we are focusing on a successor of the current NX3 agent/proxy tool. A change in the proxy backend
+will also be implemented as a backend.
+.TP
+\*(T<\fB\-\-backend-controlsession <CONTROLSESSION_BACKEND>\fR\*(T>
+Force usage of a certain CONTROLSESSION_BACKEND (do not use this unless you know exactly what you are doing).
+.TP
+\*(T<\fB\-\-backend-terminalsession <TERMINALSESSION_BACKEND>\fR\*(T>
+Force usage of a certain TERMINALSESSION_BACKEND (do not use this unless you know exactly what you are doing).
+.TP
+\*(T<\fB\-\-backend-serversessioninfo <SERVERSESSIONINFO_BACKEND>\fR\*(T>
+Force usage of a certain SERVERSESSIONINFO_BACKEND (do not use this unless you know exactly what you are doing).
+.TP
+\*(T<\fB\-\-backend-serversessionlist <SERVERSESSIONLIST_BACKEND>\fR\*(T>
+Force usage of a certain SERVERSESSIONLIST_BACKEND (do not use this unless you know exactly what you are doing).
+.TP
+\*(T<\fB\-\-backend-proxy <PROXY_BACKEND>\fR\*(T>
+Force usage of a certain PROXY_BACKEND (do not use this unless you know exactly what you are doing).
+.TP
+\*(T<\fB\-\-backend-sessionprofiles <SESSIONPROFILES_BACKEND>\fR\*(T>
+Use given backend for accessing session profiles, available backends on Linux: FILES, GCONF; on Windows: FILES, WINREG.
+.TP
+\*(T<\fB\-\-backend-clientsettings <CLIENTSETTINGS_BACKEND>\fR\*(T>
+Use given backend for accessing the client settings configuration, available backends on Linux: FILES, GCONF; on Windows: FILES, WINREG.
+.TP
+\*(T<\fB\-\-backend-clientprinting <CLIENTPRINTING_BACKEND>\fR\*(T>
+Use given backend for accessing the client printing configuration, available backends on Linux: FILES, GCONF; on Windows: FILES, WINREG.
+.SH PORTABLE OPTIONS
+.TP
+\*(T<\fB\-\-client-rootdir <CLIENT_ROOTDIR>\fR\*(T>
+Define an alternative location where to find plain text config files (default: <HOME>/.x2goclient).
+This option will set ,,--backend-profiles FILE'', ,,--backend-clientsettings FILE'' and ,,--backend-clientprinting FILE''
+.TP
+\*(T<\fB\-\-sessions-rootdir <SESSIONS_ROOTDIR>\fR\*(T>
+Define an alternative location for session runtime files (default: <HOME>/.x2go).
+.TP
+\*(T<\fB\-\-ssh-rootdir <SSH_ROOTDIR>\fR\*(T>
+Define an alternative location for user SSH files (default: <HOME>/.ssh).
+.SH WINDOWS OPTIONS
+There are some options that are only available on Windows:
+.TP
+\*(T<\fB\-\-start-xserver <SSH_ROOTDIR>\fR\*(T>
+Start an XServer (if available) before starting \fBpyhoca-gui\fR. The application will detect the best
+suitable XServer automatically, if more than one XServer is installed on your system (currently known:
+Xming, Cygwin-X).
+.TP
+\*(T<\fB\-\-preferred-xserver <XSERVER_NAME>\fR\*(T>
+Start either of the currently supported XServers: Xming, Cygwin-X -- make sure your preferred XServer is installed
+on your system.
.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 5ebc178..9434a18 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.0.16'
+__VERSION__ = '0.0.18'
from frontend import *
\ No newline at end of file
diff --git a/pyhoca/wxgui/frontend.py b/pyhoca/wxgui/frontend.py
index e0eb80a..00517d0 100644
--- a/pyhoca/wxgui/frontend.py
+++ b/pyhoca/wxgui/frontend.py
@@ -200,17 +200,16 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
self._pyhoca_logger('auto-connecting to %s session profile' % s.get_profile_name(), loglevel=x2go.log.loglevel_NOTICE)
gevent.spawn(self._auto_connect, session_uuid)
+ self.profilemanager_disabled = self.args.disable_profilemanager
+
###
### disable functionality for release versions
###
if os.environ.has_key('PYHOCAGUI_DEVELOPMENT') and os.environ['PYHOCAGUI_DEVELOPMENT'] == '1':
self.options_disabled = self.args.disable_options
- self.profilemanager_disabled = self.args.disable_profilemanager
else:
self._pyhoca_logger('the current release of %s does not support client configuration' % self.appname, loglevel=x2go.log.loglevel_WARN)
self.options_disabled = True
- self._pyhoca_logger('the current release of %s does not support profile management' % self.appname, loglevel=x2go.log.loglevel_WARN)
- self.profilemanager_disabled = True
if self.args.session_profile:
for profile_name in self.args.session_profile.split(','):
diff --git a/setup_py2exe.py b/setup_py2exe.py
index 0bcad5f..45dcd46 100644
--- a/setup_py2exe.py
+++ b/setup_py2exe.py
@@ -21,11 +21,13 @@ changelog and logo are included in dist
try:
# building from trunk
dll_data_files = [("Microsoft.VC90.CRT", glob(r'..\\..\\contrib\\ms-vc-runtime\\*.*'))]
- nxproxy_files = [("nxproxy", glob(r'..\\..\\contrib\\nxproxy-mswin\\*.*'))]
+ nxproxy_files = [("nxproxy", glob(r'..\\..\\contrib\\nxproxy-mswin\\nxproxy-3.0.4-2\\*.*'))]
+ pulseaudio_files = [("pulseaudio", glob(r'..\\..\\contrib\\pulseaudio-mswin\\pulseaudio-0.9.6\\*.*'))]
except:
# building from tag
dll_data_files = [("Microsoft.VC90.CRT", glob(r'..\\..\\..\\..\\contrib\\ms-vc-runtime\\*.*'))]
- nxproxy_files = [("nxproxy", glob(r'..\\..\\..\\..\\contrib\\nxproxy-mswin\\*.*'))]
+ nxproxy_files = [("nxproxy", glob(r'..\\..\\..\\..\\contrib\\nxproxy-mswin\\nxproxy-3.0.4-2\\*.*'))]
+ pulseaudio_files = [("pulseaudio", glob(r'..\\..\\..\\..\\contrib\\pulseaudio-mswin\\pulseaudio-0.9.6\\*.*'))]
icon_files = [
("icons\\PyHoca\\16x16", glob(r'icons\\PyHoca\\16x16\\*.*')),
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)).
More information about the x2go-commits
mailing list