[X2Go-Commits] pyhoca-gui.git - build-59a18b6e3b5d3f1dd8f07f26433d37fe5984a57d (branch) updated: 0.1.0.10-182-g3c72825
X2Go dev team
git-admin at x2go.org
Tue Aug 27 13:22:15 CEST 2013
The branch, build-59a18b6e3b5d3f1dd8f07f26433d37fe5984a57d has been updated
via 3c72825fc5519d1e6733489535c1c91cb2a88767 (commit)
from d0347ac0ec771cc951fb20b9ed4ebb8992834248 (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 | 2 ++
pyhoca/wxgui/menus_taskbar.py | 14 +++++++-------
2 files changed, 9 insertions(+), 7 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 42c44af..14bd388 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -96,6 +96,8 @@ pyhoca-gui (0.1.2.0-0~x2go1) UNRELEASED; urgency=low
- Add cmdline option --disable-notifications.
- Drop unused cmdline option --username. Introduce new cmdline option
--remember-username.
+ - Implement X2Go-Top category in .desktop files that get used in the
+ context of published applications.
* 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 46092af..ddb4104 100644
--- a/pyhoca/wxgui/menus_taskbar.py
+++ b/pyhoca/wxgui/menus_taskbar.py
@@ -376,7 +376,7 @@ def _generate_Menu_PublishedApplications(_PyHocaGUI, caller=None, profile_name=N
'System': (_(u'System'), os.path.normpath('%s/PyHoca/%s/applications-system.png' % (_icons_location, _icon_size), ), ),
'Utilities': (_(u'Utilities'), os.path.normpath('%s/PyHoca/%s/applications-utilities.png' % (_icons_location, _icon_size), ), ),
'Other Applications': (_(u'Other Applications'), os.path.normpath('%s/PyHoca/%s/applications-other.png' % (_icons_location, _icon_size), ), ),
- 'NO_SUBMENUS': ('NO_SUBMENUS', os.path.normpath('%s/PyHoca/%s/x2go-logo-grey.png' % (_icons_location, _icon_size), ), ),
+ 'TOP': ('TOP', os.path.normpath('%s/PyHoca/%s/x2go-logo-grey.png' % (_icons_location, _icon_size), ), ),
}
_PyHocaGUI._eventid_pubapp_execmap[profile_name] = {}
@@ -492,13 +492,13 @@ class PyHocaGUI_Menu_TaskbarSessionProfile(wx.Menu):
_category_map = _generate_Menu_PublishedApplications(self._PyHocaGUI, caller=self, profile_name=profile_name, session_name=_pubapp_session.get_session_name())
_category_names = _category_map.keys()
_category_names.sort()
- for cat_name in [ _cn for _cn in _category_names if _cn != 'NO_SUBMENUS' ]:
+ for cat_name in [ _cn for _cn in _category_names if _cn != 'TOP' ]:
_submenu = self.AppendMenu(id=wx.NewId(), text=cat_name, submenu=_category_map[cat_name][0])
_submenu.SetBitmap(wx.Bitmap(_category_map[cat_name][1]))
if _session_name_disabled:
_submenu.Enable(False)
- if 'NO_SUBMENUS' in _category_names:
- for _menu_item in _category_map['NO_SUBMENUS'][0].GetMenuItems():
+ if 'TOP' in _category_names:
+ for _menu_item in _category_map['TOP'][0].GetMenuItems():
_item = self.AppendItem(item=_menu_item)
if _session_name_disabled:
_item.Enable(False)
@@ -558,13 +558,13 @@ class PyHocaGUI_Menu_TaskbarSessionProfile(wx.Menu):
_category_map = _generate_Menu_PublishedApplications(self._PyHocaGUI, caller=self, profile_name=profile_name, session_name=_pubapp_session.get_session_name())
_category_names = _category_map.keys()
_category_names.sort()
- for cat_name in [ _cn for _cn in _category_names if _cn != 'NO_SUBMENUS' ]:
+ for cat_name in [ _cn for _cn in _category_names if _cn != 'TOP' ]:
_submenu = self.AppendMenu(id=wx.NewId(), text=cat_name, submenu=_category_map[cat_name][0])
_submenu.SetBitmap(wx.Bitmap(_category_map[cat_name][1]))
if _session_name_disabled:
_submenu.Enable(False)
- if 'NO_SUBMENUS' in _category_names:
- for _menu_item in _category_map['NO_SUBMENUS'][0].GetMenuItems():
+ if 'TOP' in _category_names:
+ for _menu_item in _category_map['TOP'][0].GetMenuItems():
_item = self.AppendItem(item=_menu_item)
if _session_name_disabled:
_item.Enable(False)
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