The branch, master has been updated via d118ba6b089df9d28ae4b10d05a0e1994d9bbe8d (commit) from 72a92e5d645ef83875eb3556d92df669ace84580 (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 d118ba6b089df9d28ae4b10d05a0e1994d9bbe8d Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sun Apr 21 22:38:01 2013 +0200 As we got rid of the multiple notification icons in the system tray: On MS Windows, also use the PyHoca icon in the system tray. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 +++- pyhoca/wxgui/taskbar.py | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 584eaf8..00669cf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,7 +12,9 @@ pyhoca-gui (0.4.0.2-0~x2go1) UNRELEASED; urgency=low to the original authors: Giovanni Bajo and previously McMillan Enterprises, Inc. + Use TaskBarIcon.ShowBalloon() instead of wx.NotificationMessage for - notifications. + notifications. Let's us get rid of the multiple notification icons + in the system tray. + + On MS Windows, also use the PyHoca icon in the system tray. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Wed, 13 Feb 2013 12:51:24 +0100 diff --git a/pyhoca/wxgui/taskbar.py b/pyhoca/wxgui/taskbar.py index 97a666c..dad25b4 100644 --- a/pyhoca/wxgui/taskbar.py +++ b/pyhoca/wxgui/taskbar.py @@ -114,7 +114,7 @@ class PyHocaGUI_TaskBarIcon(wx.TaskBarIcon): """ if x2go.X2GOCLIENT_OS == 'Windows': icon_name = self._PyHocaGUI.tray_icon_connecting or self._PyHocaGUI.tray_icon - self.icon = MakeIcon(icon_name=icon_name, fallback_name='x2go-logo-ubuntu') + self.icon = MakeIcon(icon_name=icon_name, fallback_name='pyhoca-trayicon') self.SetIcon(self.icon, _(u"PyHoca-GUI\nConnecting you to ,,%s\'\'") % profile_name) else: icon_name = self._PyHocaGUI.tray_icon_connecting or self._PyHocaGUI.tray_icon @@ -128,7 +128,7 @@ class PyHocaGUI_TaskBarIcon(wx.TaskBarIcon): """ if x2go.X2GOCLIENT_OS == 'Windows': icon_name = self._PyHocaGUI.tray_icon - self.icon = MakeIcon(icon_name=icon_name, fallback_name='x2go-logo-ubuntu') + self.icon = MakeIcon(icon_name=icon_name, fallback_name='pyhoca-trayicon') self.SetIcon(self.icon, _(u"PyHoca-GUI\nConnecting you to X2Go...")) else: icon_name = self._PyHocaGUI.tray_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)).