The branch, master has been updated via e9478741990ca9cd8a4533f35503562954f82732 (commit) from a3d748dd39e1c1fc5711c0735a71e2cf558332d7 (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 e9478741990ca9cd8a4533f35503562954f82732 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Apr 13 01:28:37 2012 +0200 drop misleading self.current_profile_name property ----------------------------------------------------------------------- Summary of changes: pyhoca/wxgui/frontend.py | 132 +++++++++++++++++++++++---------------------- 1 files changed, 67 insertions(+), 65 deletions(-) The diff of changes is: diff --git a/pyhoca/wxgui/frontend.py b/pyhoca/wxgui/frontend.py index 109ac04..92d14ad 100644 --- a/pyhoca/wxgui/frontend.py +++ b/pyhoca/wxgui/frontend.py @@ -456,7 +456,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient): def _do_authenticate(self, evt, session_uuid): connect_failed = False - profile_name = self.current_profile_name + profile_name = self.get_session(session_uuid).get_profile_name() try: _can_session_auto_connect = self._X2goClient__session_can_auto_connect(session_uuid) _can_sshproxy_auto_connect = self._X2goClient__session_can_sshproxy_auto_connect(session_uuid) @@ -540,7 +540,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient): pass connect_failed = True except x2go.X2goRemoteHomeException, e: - self._PyHocaGUI.notifier.send(_(u'%s - missing home directory') % self.current_profile_name, _("The remote user's home directory does not exist."), icon='auth_error', timeout=4000) + self._PyHocaGUI.notifier.send(_(u'%s - missing home directory') % profile_name, _("The remote user's home directory does not exist."), icon='auth_error', timeout=4000) try: self._temp_disabled_profile_names.remove(profile_name) except ValueError: @@ -574,26 +574,26 @@ class PyHocaGUI(wx.App, x2go.X2goClient): STILL UNDOCUMENTED """ - self.current_profile_name = self._eventid_profilenames_map[evt.GetId()] - self.taskbar.SetIconConnecting(self.current_profile_name) + profile_name = self._eventid_profilenames_map[evt.GetId()] + self.taskbar.SetIconConnecting(profile_name) if session_uuid is None: - session_uuid = self._X2goClient__register_session(profile_name=self.current_profile_name) + session_uuid = self._X2goClient__register_session(profile_name=profile_name) if session_uuid: - self._temp_disabled_profile_names.append(self.current_profile_name) + self._temp_disabled_profile_names.append(profile_name) gevent.spawn(self._do_authenticate, evt, session_uuid) elif self.args.session_profile: - self.notifier.send(self.current_profile_name, _(u'Unknown session profile, configure before using it...'), icon='profile_warning', timeout=10000) - if not self.is_session_profile(self.current_profile_name): - profilemanager.PyHocaGUI_ProfileManager(self, 'ADD_EXPLICITLY', profile_name=self.current_profile_name) + self.notifier.send(profile_name, _(u'Unknown session profile, configure before using it...'), icon='profile_warning', timeout=10000) + if not self.is_session_profile(profile_name): + profilemanager.PyHocaGUI_ProfileManager(self, 'ADD_EXPLICITLY', profile_name=profile_name) def OnSessionStart(self, evt): """\ STILL UNDOCUMENTED """ - self.current_profile_name = self._eventid_profilenames_map[evt.GetId()] - _query_session = self._X2goClient__client_registered_sessions_of_profile_name(self.current_profile_name)[0] - session_uuid = self._X2goClient__register_session(profile_name=self.current_profile_name, published_applications=False) + profile_name = self._eventid_profilenames_map[evt.GetId()] + _query_session = self._X2goClient__client_registered_sessions_of_profile_name(profile_name)[0] + session_uuid = self._X2goClient__register_session(profile_name=profile_name, published_applications=False) if self._X2goClient__server_is_alive(session_uuid): gevent.spawn(self._X2goClient__start_session, session_uuid) _dummy = self._X2goClient__list_sessions(session_uuid, refresh_cache=True) @@ -603,27 +603,27 @@ class PyHocaGUI(wx.App, x2go.X2goClient): STILL UNDOCUMENTED """ - self.current_profile_name = self._eventid_profilenames_map[evt.GetId()] - gevent.spawn(self._init_pubapp_session, profile_name=self.current_profile_name) + profile_name = self._eventid_profilenames_map[evt.GetId()] + gevent.spawn(self._init_pubapp_session, profile_name=profile_name) def OnApplicationStart(self, evt): """\ STILL UNDOCUMENTED """ - self.current_profile_name = self._eventid_profilenames_map[evt.GetId()] + profile_name = self._eventid_profilenames_map[evt.GetId()] _application = self._eventid_applications_map[evt.GetId()] - _query_session = self._X2goClient__client_registered_sessions_of_profile_name(self.current_profile_name)[0] - session_uuid = self._X2goClient__register_session(profile_name=self.current_profile_name, cmd=_application, session_type="application") + _query_session = self._X2goClient__client_registered_sessions_of_profile_name(profile_name)[0] + session_uuid = self._X2goClient__register_session(profile_name=profile_name, cmd=_application, session_type="application") if self._X2goClient__server_is_alive(session_uuid): gevent.spawn(self._X2goClient__start_session, session_uuid) _dummy = self._X2goClient__list_sessions(session_uuid, refresh_cache=True) def OnPubAppExecution(self, evt): - self.current_profile_name = self._eventid_profilenames_map[evt.GetId()] + profile_name = self._eventid_profilenames_map[evt.GetId()] _session_name = self._eventid_sessionnames_map[evt.GetId()] try: - _exec = self._eventid_pubapp_execmap[self.current_profile_name][evt.GetId()] + _exec = self._eventid_pubapp_execmap[profile_name][evt.GetId()] _s = self.get_session_of_session_name(_session_name, return_object=True) if _s is not None and _s.is_alive(): _s._X2goSession__exec_published_application(exec_name=_exec) @@ -655,10 +655,10 @@ class PyHocaGUI(wx.App, x2go.X2goClient): STILL UNDOCUMENTED """ - self.current_profile_name = self._eventid_profilenames_map[evt.GetId()] - session_uuid = self._X2goClient__client_registered_sessions_of_profile_name(self.current_profile_name)[0] + profile_name = self._eventid_profilenames_map[evt.GetId()] + session_uuid = self._X2goClient__client_registered_sessions_of_profile_name(profile_name)[0] session_name = self._eventid_sessionnames_map[evt.GetId()] - self._disable_session_name(self.current_profile_name, session_name) + self._disable_session_name(profile_name, session_name) if self._X2goClient__server_is_alive(session_uuid): gevent.spawn(self._X2goClient__resume_session, session_name=session_name) _dummy = self._X2goClient__list_sessions(session_uuid, refresh_cache=True) @@ -669,10 +669,10 @@ class PyHocaGUI(wx.App, x2go.X2goClient): STILL UNDOCUMENTED """ - self.current_profile_name = self._eventid_profilenames_map[evt.GetId()] - session_uuid = self._X2goClient__client_registered_sessions_of_profile_name(self.current_profile_name)[0] + profile_name = self._eventid_profilenames_map[evt.GetId()] + session_uuid = self._X2goClient__client_registered_sessions_of_profile_name(profile_name)[0] session_name = self._eventid_sessionnames_map[evt.GetId()] - self._disable_session_name(self.current_profile_name, session_name) + self._disable_session_name(profile_name, session_name) gevent.spawn(self._X2goClient__suspend_session, session_uuid, session_name=session_name) self._eventid_sessionnames_map = {} if self.disconnect_on_suspend: @@ -683,10 +683,10 @@ class PyHocaGUI(wx.App, x2go.X2goClient): STILL UNDOCUMENTED """ - self.current_profile_name = self._eventid_profilenames_map[evt.GetId()] - session_uuid = self._X2goClient__client_registered_sessions_of_profile_name(self.current_profile_name)[0] + profile_name = self._eventid_profilenames_map[evt.GetId()] + session_uuid = self._X2goClient__client_registered_sessions_of_profile_name(profile_name)[0] session_name = self._eventid_sessionnames_map[evt.GetId()] - self._disable_session_name(self.current_profile_name, session_name) + self._disable_session_name(profile_name, session_name) gevent.spawn(self._X2goClient__terminate_session, session_uuid, session_name=session_name) self._eventid_sessionnames_map = {} if self.disconnect_on_terminate: @@ -697,21 +697,21 @@ class PyHocaGUI(wx.App, x2go.X2goClient): STILL UNDOCUMENTED """ - self.current_profile_name = self._eventid_profilenames_map[evt.GetId()] - session_uuid = self._X2goClient__client_registered_sessions_of_profile_name(self.current_profile_name)[0] + profile_name = self._eventid_profilenames_map[evt.GetId()] + session_uuid = self._X2goClient__client_registered_sessions_of_profile_name(profile_name)[0] session_list = self._X2goClient__list_sessions(session_uuid) if self._X2goClient__server_is_alive(session_uuid): if session_list: _notify_text = _(u'Cleaning X2Go sessions...') - if not self._hide_notifications_map.has_key(self.current_profile_name): - self._hide_notifications_map[self.current_profile_name] = [] + if not self._hide_notifications_map.has_key(profile_name): + self._hide_notifications_map[profile_name] = [] session_names = session_list.keys() session_names = [ _sn for _sn in session_names if not session_list[_sn].is_published_applications_provider() ] for session_name in session_names: _notify_text += '\n%s' % session_name - self._hide_notifications_map[self.current_profile_name].append(session_name) - self._disable_session_name(self.current_profile_name, session_name) - self.notifier.send(self.current_profile_name, _notify_text, icon='session_cleanall', timeout=10000) + self._hide_notifications_map[profile_name].append(session_name) + self._disable_session_name(profile_name, session_name) + self.notifier.send(profile_name, _notify_text, icon='session_cleanall', timeout=10000) gevent.spawn(self._X2goClient__clean_sessions, session_uuid, published_applications=False) def OnServerDisconnect(self, evt): @@ -719,25 +719,27 @@ class PyHocaGUI(wx.App, x2go.X2goClient): STILL UNDOCUMENTED """ - self.current_profile_name = self._eventid_profilenames_map[evt.GetId()] - session_uuids = self._X2goClient__client_registered_sessions_of_profile_name(self.current_profile_name) + profile_name = self._eventid_profilenames_map[evt.GetId()] + if profile_name not in self._temp_disabled_profile_names: + self._temp_disabled_profile_names.append(profile_name) + session_uuids = self._X2goClient__client_registered_sessions_of_profile_name(profile_name) if session_uuids: # disconnect all sessions of profile if self._X2goClient__server_is_alive(session_uuids[0]) and not self.args.single_session_profile: - self._hide_notifications_map[self.current_profile_name] = self._X2goClient__client_running_sessions_of_profile_name(self.current_profile_name, return_session_names=True) + self._hide_notifications_map[profile_name] = self._X2goClient__client_running_sessions_of_profile_name(profile_name, return_session_names=True) - gevent.spawn(self._X2goClient__disconnect_profile, self.current_profile_name) + gevent.spawn(self._X2goClient__disconnect_profile, profile_name) if self.exit_on_disconnect: - self._pyhoca_logger('Exiting %s because %s got disconnected.' % (self.appname, self.current_profile_name), loglevel=x2go.loglevel_NOTICE) + self._pyhoca_logger('Exiting %s because %s got disconnected.' % (self.appname, profile_name), loglevel=x2go.loglevel_NOTICE) self.WakeUpIdle() self.ExitMainLoop() else: - self.notifier.send(_(u'%s - disconnect') % self.current_profile_name, _(u'X2Go Profile is now disconnected.'), icon='auth_disconnect', timeout=4000) + self.notifier.send(_(u'%s - disconnect') % profile_name, _(u'X2Go Profile is now disconnected.'), icon='auth_disconnect', timeout=4000) try: - del self._temp_disabled_session_names[self.current_profile_name] + del self._temp_disabled_session_names[profile_name] except KeyError: pass @@ -754,46 +756,46 @@ class PyHocaGUI(wx.App, x2go.X2goClient): STILL UNDOCUMENTED """ - self.current_profile_name = self._eventid_profilenames_map[evt.GetId()] - self._pyhoca_logger('editing session profile %s' % self.current_profile_name, loglevel=x2go.log.loglevel_INFO, ) + profile_name = self._eventid_profilenames_map[evt.GetId()] + self._pyhoca_logger('editing session profile %s' % profile_name, loglevel=x2go.log.loglevel_INFO, ) if self.args.single_session_profile: _edit_action = "EDIT_EXPLICITLY" else: _edit_action = "EDIT" - profilemanager.PyHocaGUI_ProfileManager(self, _edit_action, profile_name=self.current_profile_name) + profilemanager.PyHocaGUI_ProfileManager(self, _edit_action, profile_name=profile_name) def OnProfileCopy(self, evt): """\ STILL UNDOCUMENTED """ - self.current_profile_name = self._eventid_profilenames_map[evt.GetId()] - self._pyhoca_logger('using session profile %s as template for new profile' % self.current_profile_name, loglevel=x2go.log.loglevel_INFO, ) - profilemanager.PyHocaGUI_ProfileManager(self, 'COPY', profile_name=self.current_profile_name) + profile_name = self._eventid_profilenames_map[evt.GetId()] + self._pyhoca_logger('using session profile %s as template for new profile' % profile_name, loglevel=x2go.log.loglevel_INFO, ) + profilemanager.PyHocaGUI_ProfileManager(self, 'COPY', profile_name=profile_name) def OnProfileEditWhileConnected(self, evt): """\ STILL UNDOCUMENTED """ - self.current_profile_name = self._eventid_profilenames_map[evt.GetId()] - self._pyhoca_logger('editing session profile %s' % self.current_profile_name, loglevel=x2go.log.loglevel_INFO, ) - profilemanager.PyHocaGUI_ProfileManager(self, 'EDIT_CONNECTED', profile_name=self.current_profile_name) + profile_name = self._eventid_profilenames_map[evt.GetId()] + self._pyhoca_logger('editing session profile %s' % profile_name, loglevel=x2go.log.loglevel_INFO, ) + profilemanager.PyHocaGUI_ProfileManager(self, 'EDIT_CONNECTED', profile_name=profile_name) def OnProfileDelete(self, evt): """\ STILL UNDOCUMENTED """ - self.current_profile_name = self._eventid_profilenames_map[evt.GetId()] + profile_name = self._eventid_profilenames_map[evt.GetId()] - m = messages.PyHoca_MessageWindow_NoYes(self, shortmsg='REALLY_DELETE_PROFILE', title=_(u'Really Delete Session Profile ,,%s\'\'?') % self.current_profile_name, icon='question', profile_name=self.current_profile_name) + m = messages.PyHoca_MessageWindow_NoYes(self, shortmsg='REALLY_DELETE_PROFILE', title=_(u'Really Delete Session Profile ,,%s\'\'?') % profile_name, icon='question', profile_name=profile_name) m.ShowModal() if m.Yes(): - self._pyhoca_logger('deleting session profile %s' % self.current_profile_name, loglevel=x2go.log.loglevel_INFO, ) + self._pyhoca_logger('deleting session profile %s' % profile_name, loglevel=x2go.log.loglevel_INFO, ) try: - self.session_profiles.delete_profile(self.current_profile_name) - self.notifier.send(title=_(u'%s - profile deleted') % self.current_profile_name, text=_(u'The session profile has been deleted.'), icon='profile_delete') + self.session_profiles.delete_profile(profile_name) + self.notifier.send(title=_(u'%s - profile deleted') % profile_name, text=_(u'The session profile has been deleted.'), icon='profile_delete') except: pass @@ -802,44 +804,44 @@ class PyHocaGUI(wx.App, x2go.X2goClient): STILL UNDOCUMENTED """ - self.current_profile_name = self._eventid_profilenames_map[evt.GetId()] + profile_name = self._eventid_profilenames_map[evt.GetId()] self._pyhoca_logger('Evoking file dialog for ,,Share Local Folder\'\' menu item action', loglevel=x2go.log.loglevel_NOTICE, ) shared_folder = os.path.expanduser('~') if not os.path.exists(shared_folder): shared_folder = os.getcwd() dlg = wx.DirDialog( - self.about, message=_(u"%s - share local folder with sessions of this profile") % self.current_profile_name, style=1, defaultPath=shared_folder) + self.about, message=_(u"%s - share local folder with sessions of this profile") % profile_name, style=1, defaultPath=shared_folder) # Show the dialog and retrieve the user response. If it is the OK response, # process the data. if dlg.ShowModal() == wx.ID_OK: # This returns a Python list of files that were selected. - self._X2goClient__share_local_folder_with_session(profile_name=self.current_profile_name, folder_name=str(dlg.GetPath())) + self._X2goClient__share_local_folder_with_session(profile_name=profile_name, folder_name=str(dlg.GetPath())) def OnUnshareAllLocalFolders(self, evt): """\ STILL UNDOCUMENTED """ - self.current_profile_name = self._eventid_profilenames_map[evt.GetId()] - self._X2goClient__unshare_all_local_folders_from_profile(profile_name=self.current_profile_name) + profile_name = self._eventid_profilenames_map[evt.GetId()] + self._X2goClient__unshare_all_local_folders_from_profile(profile_name=profile_name) def OnShareLocalFolder(self, evt): """\ STILL UNDOCUMENTED """ - self.current_profile_name = self._eventid_profilenames_map[evt.GetId()] + profile_name = self._eventid_profilenames_map[evt.GetId()] _share_folder = self._eventid_unshared_folders_map[evt.GetId()] - self._X2goClient__share_local_folder(profile_name=self.current_profile_name, local_path=_share_folder) + self._X2goClient__share_local_folder(profile_name=profile_name, local_path=_share_folder) def OnUnshareLocalFolder(self, evt): """\ STILL UNDOCUMENTED """ - self.current_profile_name = self._eventid_profilenames_map[evt.GetId()] + profile_name = self._eventid_profilenames_map[evt.GetId()] _unshare_folder = self._eventid_shared_folders_map[evt.GetId()] - self._X2goClient__unshare_local_folder_from_profile(profile_name=self.current_profile_name, local_path=_unshare_folder) + self._X2goClient__unshare_local_folder_from_profile(profile_name=profile_name, local_path=_unshare_folder) def OnListSessions(self, evt): """\ 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)).