The branch, build-59a18b6e3b5d3f1dd8f07f26433d37fe5984a57d has been updated via 19ece3551adb36c82ee6c93eff3aef0f3e102203 (commit) from f77d4e74480b8e21513dac98b8822d4925c11f62 (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 | 30 ++++++++++++++++++------------ 2 files changed, 19 insertions(+), 12 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index eb32b6a..a753683 100644 --- a/debian/changelog +++ b/debian/changelog @@ -32,6 +32,7 @@ pyhoca-gui (0.1.2.0-0~x2go1) UNRELEASED; urgency=low - Use x2golistmounts to detect server-side unsharing of client-side folders. - Remove pointed brackets from new/derived session profile names. + - Mark master sessions with a marker ,,(*)'', * 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 571bd7c..01c4488 100644 --- a/pyhoca/wxgui/menus_taskbar.py +++ b/pyhoca/wxgui/menus_taskbar.py @@ -373,26 +373,32 @@ class PyHocaGUI_Menu_TaskbarSessionProfile(wx.Menu): state = _(u'Running') elif _session_list[session_name].status == 'S': state = _(u'Suspended') - session_submenu = self.AppendMenu(id=_s_id, text=u'%s: »%s«' % (state, session_name), - submenu=PyHocaGUI_Menu_TaskbarSessionActions(self._PyHocaGUI, caller=self, - profile_name=profile_name, - session_name=session_name, - status=_session_list[session_name].status, - ) - ) - if self._PyHocaGUI._temp_disabled_session_names.has_key(profile_name) and session_name in self._PyHocaGUI._temp_disabled_session_names[profile_name]: - session_submenu.Enable(False) + session = self._PyHocaGUI.get_session_of_session_name(session_name, return_object=True) + _marker = '' + if session and session.is_master_session(): + _marker = '(*)' + if session: + session_submenu = self.AppendMenu(id=_s_id, text=u'%s: »%s« %s' % (state, session_name, _marker), + submenu=PyHocaGUI_Menu_TaskbarSessionActions(self._PyHocaGUI, caller=self, + profile_name=profile_name, + session_name=session_name, + status=_session_list[session_name].status, + ) + ) + if self._PyHocaGUI._temp_disabled_session_names.has_key(profile_name) and session_name in self._PyHocaGUI._temp_disabled_session_names[profile_name]: + session_submenu.Enable(False) if _session_list.keys(): self.Append(id=ID_CLEANSESSIONS, text=_(u"&Clean all sessions")) self.AppendSeparator() + self.Append(id=ID_EDITPROFILEWHILECONNECTED, text=_(u"Customize &profile")) if current_profile_config['useexports'] and self._PyHocaGUI._X2goClient__profile_is_folder_sharing_available(profile_name=profile_name): _shared_folders = self.AppendMenu(id=ID_SHARELOCALFOLDER, text=_(u"Shared &folders"), - submenu=PyHocaGUI_Menu_TaskbarProfileSharedFolders(self._PyHocaGUI, caller=self, - profile_name=profile_name) - ) + submenu=PyHocaGUI_Menu_TaskbarProfileSharedFolders(self._PyHocaGUI, caller=self, + profile_name=profile_name) + ) if not self._PyHocaGUI._X2goClient__client_associated_sessions_of_profile_name(profile_name=profile_name, return_objects=False): _shared_folders.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)).