[X2Go-Commits] pyhoca-gui.git - build-59a18b6e3b5d3f1dd8f07f26433d37fe5984a57d (branch) updated: 0.1.0.3-6-g92fb4d7
X2Go dev team
git-admin at x2go.org
Tue Aug 27 13:21:39 CEST 2013
The branch, build-59a18b6e3b5d3f1dd8f07f26433d37fe5984a57d has been updated
via 92fb4d77d77319200a271577f1f73512441daea3 (commit)
from 0eff903c5a644d674ce31a6d8730a0a19aa5fcc1 (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:
debian/changelog | 9 +++++++++
pyhoca/wxgui/menus_taskbar.py | 21 +++++++++++++++++++--
2 files changed, 28 insertions(+), 2 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index e7568a8..21df6cc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+pyhoca-gui (0.1.0.4-0~x2go1) UNRELEASED; urgency=low
+
+ New upstream version (0.1.0.4):
+ - minor bug fixes
+ - only offer resume/transfer session for sessions with correct
+ color depth.
+
+ -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de> Fri, 24 Jun 2011 01:14:31 +0200
+
pyhoca-gui (0.1.0.3-0~x2go1) unstable; urgency=low
New upstream version (0.1.0.3):
diff --git a/pyhoca/wxgui/menus_taskbar.py b/pyhoca/wxgui/menus_taskbar.py
index f954a33..90d6b93 100644
--- a/pyhoca/wxgui/menus_taskbar.py
+++ b/pyhoca/wxgui/menus_taskbar.py
@@ -133,7 +133,9 @@ class PyHocaGUI_Menu_TaskbarSessionActions(wx.Menu):
wx.Menu.__init__(self)
ID_TRANSFERSESSION = wx.NewId()
+ ID_TRANSFERSESSION_DISABLED = wx.NewId()
ID_RESUMESESSION = wx.NewId()
+ ID_RESUMESESSION_DISABLED = wx.NewId()
ID_SUSPENDSESSION = wx.NewId()
ID_TERMINATESESSION = wx.NewId()
@@ -149,11 +151,26 @@ class PyHocaGUI_Menu_TaskbarSessionActions(wx.Menu):
self._PyHocaGUI._eventid_sessionnames_map[ID_SUSPENDSESSION] = \
self._PyHocaGUI._eventid_sessionnames_map[ID_TERMINATESESSION] = session_name
+ _s = self._PyHocaGUI.get_session_of_session_name(session_name, return_object=True)
+
if status == 'S':
- self.Append(text=_("Resume Session"), id=ID_RESUMESESSION)
+
+ if _s.is_color_depth_ok():
+ self.Append(text=_("Resume Session"), id=ID_RESUMESESSION)
+ else:
+ _rs = self.Append(text=_(u"Resume Session (disabled)"), id=ID_RESUMESESSION_DISABLED)
+ _rs.Enable(False)
+
elif status == 'R':
+
if not session_name in self._PyHocaGUI.client_associated_sessions_of_profile_name(profile_name, return_session_names=True):
- self.Append(text=_(u"Transfer Session"), id=ID_TRANSFERSESSION)
+
+ if _s.is_color_depth_ok():
+ self.Append(text=_(u"Transfer Session"), id=ID_TRANSFERSESSION)
+ else:
+ _ts = self.Append(text=_(u"Transfer Session (disabled)"), id=ID_TRANSFERSESSION_DISABLED)
+ _ts.Enable(False)
+
self.Append(text=_(u"Suspend Session"), id=ID_SUSPENDSESSION)
self.Append(text=_(u"Terminate Session"), id=ID_TERMINATESESSION)
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