The branch, master has been updated via 573ccd612a537b0e7c30f537051880dcd6bc0b08 (commit) from c7c9cb77bd436b75d2dc6d35ac3172c011304abb (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 ----------------------------------------------------------------- commit 573ccd612a537b0e7c30f537051880dcd6bc0b08 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Nov 15 12:06:58 2013 +0100 Allow for full path taskbar icon names, resolve tilde char in icon file path. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ pyhoca/wxgui/taskbar.py | 8 +++++++- 2 files changed, 9 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 133e4e6..32e3a61 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,8 @@ pyhoca-gui (0.4.0.9-0~x2go1) UNRELEASED; urgency=low - Become aware of new Python X2Go hook method (HOOK_desktop_sharing_denied). - Connect to sharable desktop session when selecting the session display with double click from the list of available desktop sessions. + - Allow for full path taskbar icon names, resolve tilde char in icon file + path. * /debian/copyright: + Update file. Add entry for file icon2exe.py. * /debian/control: diff --git a/pyhoca/wxgui/taskbar.py b/pyhoca/wxgui/taskbar.py index dad25b4..5b82260 100644 --- a/pyhoca/wxgui/taskbar.py +++ b/pyhoca/wxgui/taskbar.py @@ -71,7 +71,13 @@ def MakeIcon(icon_name, fallback_name='pyhoca-trayicon'): if icon_name is None: icon_name = fallback_name - icon_file = '%s/PyHoca/%s/%s.png' % (_icons_location, icon_size, icon_name) + icon_name = os.path.expanduser(icon_name) + if not icon_name.lower().endswith('.png'): + icon_name = '%s.png' % icon_name + + if not (os.path.isfile(str(icon_file)) or os.path.islink(str(icon_file))): + icon_file = '%s/PyHoca/%s/%s' % (_icons_location, icon_size, icon_name) + if not (os.path.isfile(str(icon_file)) or os.path.islink(str(icon_file))): icon_file = '%s/PyHoca/%s/%s.png' % (_icons_location, icon_size, fallback_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)).