[X2go-Commits] pyhoca-gui.git - master (branch) updated: 0.1.0.10-231-g98159cb

X2Go dev team git-admin at x2go.org
Fri Apr 20 01:01:10 CEST 2012


The branch, master has been updated
       via  98159cb25485cc9ecd9f2fb761781702156ba236 (commit)
      from  94d76420b3ce9db86873841a14bbe56fd4ecebd5 (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 98159cb25485cc9ecd9f2fb761781702156ba236
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Apr 20 01:01:04 2012 +0200

    menu separator fix

-----------------------------------------------------------------------

Summary of changes:
 pyhoca/wxgui/menus_taskbar.py |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

The diff of changes is:
diff --git a/pyhoca/wxgui/menus_taskbar.py b/pyhoca/wxgui/menus_taskbar.py
index a4dcb79..e8386e0 100644
--- a/pyhoca/wxgui/menus_taskbar.py
+++ b/pyhoca/wxgui/menus_taskbar.py
@@ -504,9 +504,9 @@ class PyHocaGUI_Menu_TaskbarSessionProfile(wx.Menu):
 
                 if current_profile_config['command'] == '' and current_profile_config['published']:
 
+                    _pubapp_sessions = [ _pas for _pas in self._PyHocaGUI.client_pubapp_sessions_of_profile_name(profile_name, return_objects=True) if _pas.is_running() ]
                     if (not self._PyHocaGUI.restricted_trayicon and not (self._PyHocaGUI.disconnect_on_suspend and self._PyHocaGUI.disconnect_on_terminate)) or (profile_name in self._PyHocaGUI._temp_launching_pubapp_profiles):
                         self.AppendSeparator()
-                    _pubapp_sessions = [ _pas for _pas in self._PyHocaGUI.client_pubapp_sessions_of_profile_name(profile_name, return_objects=True) if _pas.is_running() ]
                     if _pubapp_sessions:
                         _pubapp_session = _pubapp_sessions[0]
                         if _pub_app_start_item is not None:
@@ -515,6 +515,8 @@ 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()
+                        if (not self._PyHocaGUI.restricted_trayicon and not (self._PyHocaGUI.disconnect_on_suspend and self._PyHocaGUI.disconnect_on_terminate)) or (profile_name in self._PyHocaGUI._temp_launching_pubapp_profiles and _category_names):
+                            self.AppendSeparator()
                         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]))


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