The branch, twofactorauth has been updated via 5ea8099a87cea6efe6c44a6b2e70c170559cffd2 (commit) from e78605cd95d364854e42909d519303e3e769b371 (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: debian/changelog | 1 + pyhoca/wxgui/menus_taskbar.py | 10 ++++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index df71477..2ee297a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -60,6 +60,7 @@ pyhoca-gui (0.1.2.0-0~x2go1) UNRELEASED; urgency=low - Provide icons for category submenus. - Provide 'en' as default language if --lang has not been given on the command line (MS Windows issue). + - Published Applications on MS Windows: icon size is 16x16. * Depend on Python X2Go 0.1.2.0. * Install GNOME icons via dh_links. * Install X2Go icons with explicit install paths. diff --git a/pyhoca/wxgui/menus_taskbar.py b/pyhoca/wxgui/menus_taskbar.py index 11731b8..05a4ba7 100644 --- a/pyhoca/wxgui/menus_taskbar.py +++ b/pyhoca/wxgui/menus_taskbar.py @@ -420,12 +420,18 @@ 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: - _menu_item.SetBitmap(wx.Bitmap('%s/PyHoca/22x22/x2go-logo-grey.png' % _icons_location)) + if x2go.defaults.X2GOCLIENT_OS == 'Windows': + _menu_item.SetBitmap(wx.Bitmap('%s/PyHoca/16x16/x2go-logo-grey.png' % _icons_location)) + else: + _menu_item.SetBitmap(wx.Bitmap('%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]): _icon_image = wx.ImageFromStream(StringIO.StringIO(_menu_entry_icon_decoded)) - _icon_bitmap = wx.BitmapFromImage(_icon_image.Scale(22,22)) + if x2go.defaults.X2GOCLIENT_OS == 'Windows': + _icon_bitmap = wx.BitmapFromImage(_icon_image.Scale(16,16)) + else: + _icon_bitmap = wx.BitmapFromImage(_icon_image.Scale(22,22)) _menu_item.SetBitmap(_icon_bitmap) _category_map[_menu_entry_cat][0].AppendItem(_menu_item) 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)).