[X2Go-Commits] pyhoca-gui.git - build-59a18b6e3b5d3f1dd8f07f26433d37fe5984a57d (branch) updated: 0.1.0.0-7-gc872fa5
X2Go dev team
git-admin at x2go.org
Tue Aug 27 13:21:36 CEST 2013
The branch, build-59a18b6e3b5d3f1dd8f07f26433d37fe5984a57d has been updated
via c872fa52321b9170a39223b9322ffd4f48a60733 (commit)
from ef384ce5425f6f8b918637c8f51e6bed0c3589a9 (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 | 21 +++++++++++----------
1 file changed, 11 insertions(+), 10 deletions(-)
The diff of changes is:
diff --git a/pyhoca/wxgui/menus_taskbar.py b/pyhoca/wxgui/menus_taskbar.py
index f321c55..d3ce9d1 100644
--- a/pyhoca/wxgui/menus_taskbar.py
+++ b/pyhoca/wxgui/menus_taskbar.py
@@ -85,8 +85,9 @@ class PyHocaGUI_Menu_TaskbarOptionsManager(wx.Menu):
ID_PROFILEMANAGER = wx.NewId()
_maintain_profiles_item = self.AppendMenu(id=ID_PROFILEMANAGER,
text=_(u"Profile Manager"),
- submenu=PyHocaGUI_Menu_TaskbarProfileNames(self._PyHocaGUI,
+ submenu=PyHocaGUI_Menu_TaskbarProfileNames(self._PyHocaGUI,
caller=self,
+ filter_profiles=[],
disabled_profiles=self._PyHocaGUI.client_connected_profiles(return_profile_names=True),
submenu=PyHocaGUI_Menu_TaskbarManageProfile,
group_menus=False,
@@ -270,10 +271,10 @@ class PyHocaGUI_Menu_TaskbarProfileNames(wx.Menu):
_profile_names = self._PyHocaGUI.session_profiles.profile_names
_profile_names.sort()
+ _profile_groups = []
if group_menus:
# grouping of session profile menus
- _profile_groups = []
for profile_name in _profile_names:
if len(profile_name.split('/')) >= 2:
_group_name = profile_name.split('/')[0]
@@ -294,6 +295,8 @@ class PyHocaGUI_Menu_TaskbarProfileNames(wx.Menu):
submenu=PyHocaGUI_Menu_TaskbarProfileNames(self._PyHocaGUI,
caller=self,
sub_profile_items=_sub_profile_items,
+ filter_profiles=[],
+ disabled_profiles=disabled_profiles,
bind_method=bind_method,
group_name=profile_group,
group_menus=False)
@@ -318,26 +321,23 @@ class PyHocaGUI_Menu_TaskbarProfileNames(wx.Menu):
_sub.Enable(False)
else:
_item = self.Append(text=_menu_profile_name, id=_this_id)
+
if disabled_profiles and _real_profile_name in disabled_profiles:
_item.Enable(False)
if bind_method is not None:
self._PyHocaGUI.Bind(wx.EVT_MENU, bind_method, id=_this_id)
self._PyHocaGUI.Bind(wx.EVT_UPDATE_UI, self.OnUpdateUI, id=_this_id)
- if not _profile_names:
- if not filter_profiles:
- _dummy = self.Append(text=_(u'No session profiles defined'), id=wx.NewId())
- else:
- _dummy = self.Append(text=_(u'All session profiles are connected'), id=wx.NewId())
+ if not group_name and (not _profile_groups and not _profile_names) and not filter_profiles:
+ _dummy = self.Append(text=_(u'No session profiles defined'), id=wx.NewId())
_dummy.Enable(False)
-
def OnUpdateUI(self, evt):
profile_name = self._PyHocaGUI._eventid_profilenames_map[evt.GetId()]
if profile_name in self._PyHocaGUI._temp_disabled_profile_names:
self._pyhoca_logger('Updating UI, temporarily disabling session profile %s' % profile_name)
self.Enable(id=evt.GetId(), enable=False)
- elif profile_name not in self._PyHocaGUI._temp_disabled_profile_names:
+ elif profile_name not in self._PyHocaGUI._temp_disabled_profile_names and profile_name not in self._PyHocaGUI.client_connected_sessions(return_profile_names=True):
self._pyhoca_logger('Updating UI, re-enabling session profile %s' % profile_name)
self.Enable(id=evt.GetId(), enable=True)
@@ -365,7 +365,8 @@ class PyHocaGUI_Menu_TaskbarSessionManager(wx.Menu):
text=_auth_menu_text,
submenu=PyHocaGUI_Menu_TaskbarProfileNames(self._PyHocaGUI,
caller=self,
- filter_profiles=self._PyHocaGUI.client_connected_sessions(return_profile_names=True),
+ filter_profiles=[],
+ disabled_profiles=self._PyHocaGUI.client_connected_sessions(return_profile_names=True),
bind_method=self._PyHocaGUI.OnSessionAuthenticate))
self.AppendSeparator()
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