[X2Go-Commits] pyhoca-gui.git - build-59a18b6e3b5d3f1dd8f07f26433d37fe5984a57d (branch) updated: b1463825568b37e6cffef74d6a64f6730604f6c0
X2Go dev team
git-admin at x2go.org
Tue Aug 27 13:21:03 CEST 2013
The branch, build-59a18b6e3b5d3f1dd8f07f26433d37fe5984a57d has been updated
via b1463825568b37e6cffef74d6a64f6730604f6c0 (commit)
from 2a744200eae15eb6fb3d5ffd64b05e4bfec7442a (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:
pyhoca-gui | 4 +++-
pyhoca/wxgui/basepath.py | 6 ++++--
pyhoca/wxgui/frontend.py | 16 ++++++++++++----
pyhoca/wxgui/notify.py | 1 +
4 files changed, 20 insertions(+), 7 deletions(-)
The diff of changes is:
diff --git a/pyhoca-gui b/pyhoca-gui
index b9ab291..edf2f35 100755
--- a/pyhoca-gui
+++ b/pyhoca-gui
@@ -281,7 +281,9 @@ def main():
if _X2GOCLIENT_OS == 'Windows':
if args.lang:
lang = gettext.translation('pyhoca-gui', localedir=locale_basepath, languages=[args.lang], )
- lang.install()
+ else:
+ lang = gettext.translation('pyhoca-gui', localedir=locale_basepath, languages=['en'], )
+ lang.install()
else:
gettext.install('pyhoca-gui', localedir=locale_basepath, unicode=True)
diff --git a/pyhoca/wxgui/basepath.py b/pyhoca/wxgui/basepath.py
index 9cdb196..9b11e0a 100644
--- a/pyhoca/wxgui/basepath.py
+++ b/pyhoca/wxgui/basepath.py
@@ -25,8 +25,10 @@ if os.environ.has_key('PYHOCAGUI_DEVELOPMENT') and os.environ['PYHOCAGUI_DEVELOP
_base_location = os.path.abspath(os.path.curdir)
_icons_location = os.path.join(_base_location, 'icons')
_images_location = os.path.join(_base_location, 'img')
- _locale_location = os.path.join(_base_location, 'locale')
- if _X2GOCLIENT_OS == 'Windows':
+ if _X2GOCLIENT_OS != 'Windows':
+ _locale_location = os.path.join(_base_location, 'locale')
+ else:
+ _locale_location = os.path.join(_base_location, 'build', 'mo')
_nxproxy_location = os.path.join(_base_location, 'contrib', 'nxproxy-mswin', 'nxproxy.exe')
else:
if _X2GOCLIENT_OS == 'Windows':
diff --git a/pyhoca/wxgui/frontend.py b/pyhoca/wxgui/frontend.py
index e2bef1c..299aa6c 100644
--- a/pyhoca/wxgui/frontend.py
+++ b/pyhoca/wxgui/frontend.py
@@ -44,8 +44,6 @@ import gevent.monkey
gevent.monkey.patch_all()
import wx
-import wx.lib.scrolledpanel as scrolled
-import wx.lib.mixins.listctrl as listmix
import time
import sys
@@ -136,9 +134,11 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
_x2goclient_kwargs['ssh_rootdir'] = self.args.ssh_rootdir
if x2go.X2GOCLIENT_OS == 'Windows':
- _x2goclient_kwargs['start_xserver'] = self.args.start_xserver
- _x2goclient_kwargs['start_pulseaudio'] = self.args.start_pulseaudio
+ _x2goclient_kwargs['start_xserver'] = self.args.start_xserver
+ _x2goclient_kwargs['start_pulseaudio'] = self.args.start_pulseaudio
+ if x2go.X2GOCLIENT_OS == 'Windows' and self.args.start_pulseaudio and os.environ.has_key('PYHOCAGUI_DEVELOPMENT') and os.environ['PYHOCAGUI_DEVELOPMENT'] == '1':
+ _x2goclient_kwargs['pulseaudio_installdir'] = os.path.normpath('../../contrib/pulseaudio-mswin/pulseaudio-0.9.6')
x2go.X2goClient.__init__(self, **_x2goclient_kwargs)
self.SetAppName(self.appname)
self.SetVendorName(self.vendorname)
@@ -526,6 +526,14 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
def HOOK_on_control_session_death(self, profile_name):
self.notifier.send(_(u'%s - channel error') % profile_name, _(u'Lost connection to server %s unexpectedly! Try to re-authenticate to the server...') % profile_name, icon='session_warning', timeout=10000)
+
+ def HOOK_pulseaudio_server_startup_failed(self):
+ self.notifier.send(_(u'%s - audio error') % self.appname, _(u'The X2go PulseAudio system could not be started.'), icon='audio_error', timeout=10000)
+ def HOOK_pulseaudio_server_died(self):
+ self.notifier.send(_(u'%s - audio error') % self.appname, _(u'The X2go PulseAudio system has died unexpectedly.'), icon='audio_error', timeout=10000)
+ def HOOK_on_sound_tunnel_failed(self, profile_name='UNKNOWN', session_name='UNKNOWN'):
+ self.notifier.send(_(u'%s - audio problem') % profile_name, _(u'The audio connection could not be set up for this session.\n%s') % session_name, icon='session_warning', timeout=5000)
+
# this hook gets called from Python X2go classes if a print job is coming in and the print action is ,,DIALOG''...
def HOOK_open_print_dialog(self, filename, profile_name='UNKNOWN', session_name='UNKNOWN'):
self.notifier.send(_(u'%s - print job') % profile_name, _(u'Opening print job dialog not implemented yet!!!\n%s') % session_name, icon='session_printing', timeout=5000)
diff --git a/pyhoca/wxgui/notify.py b/pyhoca/wxgui/notify.py
index 33e3402..5f17abc 100644
--- a/pyhoca/wxgui/notify.py
+++ b/pyhoca/wxgui/notify.py
@@ -127,6 +127,7 @@ class notificationmessage_NotifierPopup(object):
pass
_icon_map_wx = {
+ 'audio_error': wx.ICON_ERROR,
'auth_success': wx.ICON_INFORMATION,
'auth_failed': wx.ICON_WARNING,
'auth_error': wx.ICON_ERROR,
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