[X2Go-Commits] pyhoca-gui.git - build-59a18b6e3b5d3f1dd8f07f26433d37fe5984a57d (branch) updated: fdb37826cf88130369e147080c51f6975e7b93cc
X2Go dev team
git-admin at x2go.org
Tue Aug 27 13:20:45 CEST 2013
The branch, build-59a18b6e3b5d3f1dd8f07f26433d37fe5984a57d has been updated
via fdb37826cf88130369e147080c51f6975e7b93cc (commit)
from e3fa250522b775ba2d60b702c5fc32d1f0e6624d (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/taskbar.py | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
The diff of changes is:
diff --git a/pyhoca/wxgui/taskbar.py b/pyhoca/wxgui/taskbar.py
index f8324d1..8ac1a01 100644
--- a/pyhoca/wxgui/taskbar.py
+++ b/pyhoca/wxgui/taskbar.py
@@ -90,11 +90,17 @@ class PyHocaGUI_TaskBarIcon(wx.TaskBarIcon):
def SetIconConnecting(self, profile_name):
self.icon = self.MakeIcon(icon_name='x2go-logo-ubuntu')
- self.SetIcon(self.icon, "PyHoca-GUI (Python X2goClient)\nCurrently connecting you to remote X2go server ,,%s\'\'" % profile_name)
+ if x2go.X2GOCLIENT_OS == 'Windows':
+ self.SetIcon(self.icon, "PyHoca-GUI\nConnecting you to ,,%s\'\'" % profile_name)
+ else:
+ self.SetIcon(self.icon, "PyHoca-GUI (Python X2goClient)\nCurrently connecting you to remote X2go server ,,%s\'\'" % profile_name)
def SetIconIdle(self):
self.icon = self.MakeIcon(icon_name='x2go-logo-ubuntu')
- self.SetIcon(self.icon, "PyHoca-GUI (Python X2goClient)\nClient for connecting you to a remote X2go server")
+ if x2go.X2GOCLIENT_OS == 'Windows':
+ self.SetIcon(self.icon, "PyHoca-GUI\nConnecting you to X2go...")
+ else:
+ self.SetIcon(self.icon, "PyHoca-GUI (Python X2goClient)\nClient for connecting you to a remote X2go server")
def CreateSessionManagerPopupMenu(self, evt):
"""\
@@ -128,7 +134,7 @@ class PyHocaGUI_TaskBarIcon(wx.TaskBarIcon):
img = wx.Image('%s/PyHoca/22x22/%s.png' % (_icons_location, icon_name))
elif "wxMAC" in wx.PlatformInfo:
img = wx.Image('%s/PyHoca/128x128/%s.png' % (_icons_location, icon_name))
- icon = wx.IconFromBitmap(img.ConvertToBitmap() )
+ icon = wx.IconFromBitmap(img.ConvertToBitmap())
return icon
def Close(self):
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