[X2Go-Commits] pyhoca-gui.git - twofactorauth (branch) updated: 0.1.0.10-242-ga4d4405

X2Go dev team git-admin at x2go.org
Sat Sep 14 15:56:10 CEST 2013


The branch, twofactorauth has been updated
       via  a4d4405105bf3221aa6abca05fc92862527b802a (commit)
      from  ebe0667c3c2a115e5dbdb7b1d08152c166b871a8 (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 |   17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

The diff of changes is:
diff --git a/pyhoca/wxgui/taskbar.py b/pyhoca/wxgui/taskbar.py
index 6bd81db..cafd03b 100644
--- a/pyhoca/wxgui/taskbar.py
+++ b/pyhoca/wxgui/taskbar.py
@@ -121,14 +121,21 @@ class PyHocaGUI_TaskBarIcon(wx.TaskBarIcon):
         The various platforms have different requirements for the
         icon size...
         """
-        if icon_name is None:
-            icon_name = fallback_name
         if "wxMSW" in wx.PlatformInfo:
-            img = wx.Image('%s/PyHoca/16x16/%s.png' % (_icons_location, icon_name))
+            icon_size = '16x16'
         elif "wxGTK" in wx.PlatformInfo:
-            img = wx.Image('%s/PyHoca/22x22/%s.png' % (_icons_location, icon_name))
+            icon_size = '22x22'
         elif "wxMAC" in wx.PlatformInfo:
-            img = wx.Image('%s/PyHoca/128x128/%s.png' % (_icons_location, icon_name))
+            icon_size = '128x128'
+
+        if icon_name is None:
+            icon_name = fallback_name
+
+        icon_file = '%s/PyHoca/%s/%s.png' % (_icons_location, icon_size, icon_name)
+        if not (os.path.isfile(icon_file) or os.path.islink(icon_file)):
+            icon_file = '%s/PyHoca/%s/%s.png' % (_icons_location, icon_size, fallback_name)
+
+        img = wx.Image(icon_file)
         icon = wx.IconFromBitmap(img.ConvertToBitmap())
         return icon
 


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