The branch, build-59a18b6e3b5d3f1dd8f07f26433d37fe5984a57d has been updated via 649af1a6598de6243fb793f96c27ee4d964c1721 (commit) from 4e9ababbb27bb1718f35ea4a2b38805e4d0d87a7 (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/menus_taskbar.py | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) The diff of changes is: diff --git a/pyhoca/wxgui/menus_taskbar.py b/pyhoca/wxgui/menus_taskbar.py index fb443c2..d5071bd 100644 --- a/pyhoca/wxgui/menus_taskbar.py +++ b/pyhoca/wxgui/menus_taskbar.py @@ -332,16 +332,16 @@ def _generate_Menu_PublishedApplications(_PyHocaGUI, caller=None, profile_name=N _lang = _PyHocaGUI.lang _category_map = { - _(u'Multimedia'): (wx.Menu(), '%s/PyHoca/22x22/applications-multimedia.png' % _icons_location), - _(u'Development'): (wx.Menu(), '%s/PyHoca/22x22/applications-development.png' % _icons_location), - _(u'Education'): (wx.Menu(), '%s/PyHoca/22x22/applications-education.png' % _icons_location), - _(u'Games'): (wx.Menu(), '%s/PyHoca/22x22/applications-games.png' % _icons_location), - _(u'Graphics'): (wx.Menu(), '%s/PyHoca/22x22/applications-graphics.png' % _icons_location), - _(u'Internet'): (wx.Menu(), '%s/PyHoca/22x22/applications-internet.png' % _icons_location), - _(u'Office Applications'): (wx.Menu(), '%s/PyHoca/22x22/applications-office.png' % _icons_location), - _(u'System'): (wx.Menu(), '%s/PyHoca/22x22/applications-system.png' % _icons_location), - _(u'Utilities'): (wx.Menu(), '%s/PyHoca/22x22/applications-utilities.png' % _icons_location), - _(u'Other Applications'): (wx.Menu(), '%s/PyHoca/22x22/applications-other.png' % _icons_location), + _(u'Multimedia'): (wx.Menu(), os.path.normpath('%s/PyHoca/22x22/applications-multimedia.png' % _icons_location)), + _(u'Development'): (wx.Menu(), os.path.normpath('%s/PyHoca/22x22/applications-development.png' % _icons_location)), + _(u'Education'): (wx.Menu(), os.path.normpath('%s/PyHoca/22x22/applications-education.png' % _icons_location)), + _(u'Games'): (wx.Menu(), os.path.normpath('%s/PyHoca/22x22/applications-games.png' % _icons_location)), + _(u'Graphics'): (wx.Menu(), os.path.normpath('%s/PyHoca/22x22/applications-graphics.png' % _icons_location)), + _(u'Internet'): (wx.Menu(), os.path.normpath('%s/PyHoca/22x22/applications-internet.png' % _icons_location)), + _(u'Office Applications'): (wx.Menu(), os.path.normpath('%s/PyHoca/22x22/applications-office.png' % _icons_location)), + _(u'System'): (wx.Menu(), os.path.normpath('%s/PyHoca/22x22/applications-system.png' % _icons_location)), + _(u'Utilities'): (wx.Menu(), os.path.normpath('%s/PyHoca/22x22/applications-utilities.png' % _icons_location)), + _(u'Other Applications'): (wx.Menu(), os.path.normpath('%s/PyHoca/22x22/applications-other.png' % _icons_location)), } _empty_menus = _category_map.keys() @@ -421,9 +421,9 @@ def _generate_Menu_PublishedApplications(_PyHocaGUI, caller=None, profile_name=N _menu_item = wx.MenuItem(_category_map[_menu_entry_cat][0], id=_pubapp_id, text=_menu_entry_name, help=_menu_entry_comment) if not _menu_entry_icon: if x2go.defaults.X2GOCLIENT_OS == 'Windows': - _menu_item.SetBitmap(wx.Bitmap('%s/PyHoca/16x16/x2go-logo-grey.png' % _icons_location)) + _menu_item.SetBitmap(wx.Bitmap(os.path.normpath('%s/PyHoca/16x16/x2go-logo-grey.png' % _icons_location))) else: - _menu_item.SetBitmap(wx.Bitmap('%s/PyHoca/22x22/x2go-logo-grey.png' % _icons_location)) + _menu_item.SetBitmap(wx.Bitmap(os.path.normpath('%s/PyHoca/22x22/x2go-logo-grey.png' % _icons_location))) else: _menu_entry_icon_decoded = base64.b64decode(_menu_entry_icon) if not re.match('^<\?(xml|XML).*version=.*encoding=.*standalone=.*\?>.*', _menu_entry_icon_decoded.split('\n')[0]): 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)).