[X2Go-Commits] pyhoca-gui.git - build-59a18b6e3b5d3f1dd8f07f26433d37fe5984a57d (branch) updated: 0.1.0.10-121-g77b2eba
X2Go dev team
git-admin at x2go.org
Tue Aug 27 13:22:08 CEST 2013
The branch, build-59a18b6e3b5d3f1dd8f07f26433d37fe5984a57d has been updated
via 77b2ebabe63fbf410cae2138ce6f1f39924e83ea (commit)
from 01200ab66a4cd89f3c03f2441c5a913d07e747a0 (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/wxgui/frontend.py | 20 ++++++++++----------
pyhoca/wxgui/menus_taskbar.py | 5 ++++-
2 files changed, 14 insertions(+), 11 deletions(-)
The diff of changes is:
diff --git a/pyhoca/wxgui/frontend.py b/pyhoca/wxgui/frontend.py
index 02fb033..df7a5cb 100644
--- a/pyhoca/wxgui/frontend.py
+++ b/pyhoca/wxgui/frontend.py
@@ -252,13 +252,8 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
self._pyhoca_logger('the current release of %s does not support client configuration' % self.appname, loglevel=x2go.log.loglevel_WARN)
self.options_disabled = True
- if self.args.auto_connect or self.args.single_session_profile:
- gevent.spawn(self._auto_connect)
-
if self.args.session_profile:
for profile_name in self.args.session_profile.split(','):
- if not self._X2goClient__client_registered_sessions_of_profile_name(profile_name):
- continue
_dummy_id = wx.NewId()
self._eventid_profilenames_map[_dummy_id] = profile_name
evt = wx.CommandEvent()
@@ -268,6 +263,10 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
self._pyhoca_logger('opening default session profile %s' % profile_name, loglevel=x2go.log.loglevel_NOTICE)
self.OnSessionAuthenticate(evt)
+ if self.args.auto_connect or self.args.single_session_profile:
+ gevent.spawn(self._auto_connect)
+
+
def _auto_connect(self):
# wait for splash to appear
@@ -275,13 +274,11 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
gevent.sleep(1)
if not self.args.single_session_profile:
self._X2goClient__register_all_session_profiles()
- else:
- self._X2goClient__register_session(profile_name=self.args.session_profile)
def session_auto_connect(self, session_uuid):
# override X2goClient method
- if (self.args.auto_connect and self._X2goClient__session_can_auto_connect(session_uuid)) or self.args.single_session_profile:
+ if self.args.auto_connect and self._X2goClient__session_can_auto_connect(session_uuid):
self._X2goClient__session_auto_connect(session_uuid)
def session_auto_start_or_resume(self, session_uuid, newest=True, oldest=False, all_suspended=False):
@@ -533,8 +530,11 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
self.current_profile_name = self._eventid_profilenames_map[evt.GetId()]
self.taskbar.SetIconConnecting(self.current_profile_name)
session_uuid = self._X2goClient__register_session(profile_name=self.current_profile_name)
- self._temp_disabled_profile_names.append(self.current_profile_name)
- gevent.spawn(self._do_authenticate, evt, session_uuid)
+ if session_uuid:
+ self._temp_disabled_profile_names.append(self.current_profile_name)
+ gevent.spawn(self._do_authenticate, evt, session_uuid)
+ elif self.args.session_profile:
+ self.notifier.send(_('Unknown Session Profile'), _(u'Unknown session profile %s') % self.current_profile_name, icon='profile_warning', timeout=10000)
def OnSessionStart(self, evt):
"""\
diff --git a/pyhoca/wxgui/menus_taskbar.py b/pyhoca/wxgui/menus_taskbar.py
index 728d02a..d372be5 100644
--- a/pyhoca/wxgui/menus_taskbar.py
+++ b/pyhoca/wxgui/menus_taskbar.py
@@ -622,7 +622,10 @@ class PyHocaGUI_Menu_TaskbarSessionProfile(wx.Menu):
self._PyHocaGUI.Bind(wx.EVT_MENU, self._PyHocaGUI.OnServerDisconnect, id=ID_DISCONNECT)
else:
ID_EXIT = wx.NewId()
- self.Append(id=ID_EXIT, text=_(u"Disconnect and E&xit"))
+ if self._PyHocaGUI.client_running_sessions_of_profile_name(profile_name=self._PyHocaGUI.args.session_profile):
+ self.Append(id=ID_EXIT, text=_(u"Suspend Sessions and E&xit"))
+ else:
+ self.Append(id=ID_EXIT, text=_(u"Disconnect and E&xit"))
self._PyHocaGUI.Bind(wx.EVT_MENU, self._PyHocaGUI.OnTaskbarExit, id=ID_EXIT)
self._PyHocaGUI.current_profile_name = profile_name
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