The branch, twofactorauth has been updated via b07d1c9089f295c88773b3d5de529c593571fc97 (commit) from fe5057f7428bdf512dd9cf658a72b2152507658a (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/frontend.py | 7 ------- pyhoca/wxgui/notify.py | 7 ++++++- pyhoca/wxgui/taskbar.py | 4 +++- 3 files changed, 9 insertions(+), 9 deletions(-) The diff of changes is: diff --git a/pyhoca/wxgui/frontend.py b/pyhoca/wxgui/frontend.py index e2838d8..976c1db 100644 --- a/pyhoca/wxgui/frontend.py +++ b/pyhoca/wxgui/frontend.py @@ -310,7 +310,6 @@ class PyHocaGUI(wx.App, x2go.X2goClient): _logon_window = logon.PyHocaGUI_DialogBoxPassword(self, profile_name, caller=self ) self._sub_windows.append(_logon_window) if self._X2goClient__is_session_connected(session_uuid): - self._pyhoca_logger('public SSH key authentication to %s has been successful' % profile_name, x2go.loglevel_INFO, ) self.notifier.send('%s - connect' % profile_name, 'Public SSH key authentication has been successful.', timeout=4000) else: self._pyhoca_logger('public SSH key authentication to server failed, trying next auth-mechanism', x2go.loglevel_INFO, ) @@ -323,7 +322,6 @@ class PyHocaGUI(wx.App, x2go.X2goClient): """ _query_session = self._X2goClient__client_registered_sessions_of_name(self.current_profile_name)[0] session_uuid = self._X2goClient__register_session(profile_name=self.current_profile_name) - self._pyhoca_logger('starting new X2go session', x2go.loglevel_INFO, ) gevent.spawn(self._X2goClient__start_session, session_uuid) self.notifier.send(self.current_profile_name, 'New X2go session starting up...', timeout=10000) @@ -336,7 +334,6 @@ class PyHocaGUI(wx.App, x2go.X2goClient): _control_session = self._X2goClient__client_registered_sessions_of_name(self.current_profile_name)[0] session_uuid = _control_session.get_uuid() session_name = self._eventid_sessionnames_map[evt.GetId()] - self._pyhoca_logger('resuming X2go session %s' % session_name, x2go.loglevel_INFO, ) gevent.spawn(self._X2goClient__resume_session, session_uuid, session_name=session_name) self.notifier.send(self.current_profile_name, 'Resuming X2go session...\nSession: %s' % session_name, timeout=10000) self._eventid_sessionnames_map = {} @@ -349,7 +346,6 @@ class PyHocaGUI(wx.App, x2go.X2goClient): _control_session = self._X2goClient__client_registered_sessions_of_name(self.current_profile_name)[0] session_uuid = _control_session.get_uuid() session_name = self._eventid_sessionnames_map[evt.GetId()] - self._pyhoca_logger('suspending X2go session %s' % session_name, x2go.loglevel_INFO, ) gevent.spawn(self._X2goClient__suspend_session, session_uuid, session_name=session_name) gevent.sleep(2) if self._X2goClient__is_session_suspended(session_uuid, session_name): @@ -365,7 +361,6 @@ class PyHocaGUI(wx.App, x2go.X2goClient): _control_session = self._X2goClient__client_registered_sessions_of_name(self.current_profile_name)[0] session_uuid = _control_session.get_uuid() session_name = self._eventid_sessionnames_map[evt.GetId()] - self._pyhoca_logger('terminating X2go session %s' % session_name, x2go.loglevel_INFO, ) gevent.spawn(self._X2goClient__terminate_session, session_uuid, session_name=session_name) gevent.sleep(2) if self._X2goClient__has_session_terminated(session_uuid, session_name): @@ -380,7 +375,6 @@ class PyHocaGUI(wx.App, x2go.X2goClient): """ _control_session = self._X2goClient__client_registered_sessions_of_name(self.current_profile_name)[0] session_uuid = _control_session.get_uuid() - self._pyhoca_logger('cleaning all X2go sessions %s' % session_uuid, x2go.loglevel_INFO, ) session_names = self._X2goClient__server_running_sessions(session_uuid) + self._X2goClient__server_suspended_sessions(session_uuid) if session_names: _notify_text = 'Cleaning X2go sessions...' @@ -398,7 +392,6 @@ class PyHocaGUI(wx.App, x2go.X2goClient): session_uuid = _control_session.get_uuid() # disconnect control session - self._pyhoca_logger('disconnecting from X2go session %s' % session_uuid, x2go.loglevel_INFO, ) self._X2goClient__disconnect_session(session_uuid) gevent.sleep(2) if not self._X2goClient__is_session_connected(session_uuid): diff --git a/pyhoca/wxgui/notify.py b/pyhoca/wxgui/notify.py index d1a1d0e..aba1f2b 100644 --- a/pyhoca/wxgui/notify.py +++ b/pyhoca/wxgui/notify.py @@ -21,6 +21,7 @@ import wx, time, webbrowser import images from x2go import X2GOCLIENT_OS +from x2go import log if X2GOCLIENT_OS in ('Linux', 'Mac'): import pynotify import exceptions @@ -35,6 +36,7 @@ class libnotify_NotifierPopup(object): def __init__(self, _PyHocaGUI): self._PyHocaGUI = _PyHocaGUI + self._pyhoca_logger = self._PyHocaGUI._pyhoca_logger if not pynotify.init("PyHocaGUI"): raise NotSupportedException @@ -62,6 +64,7 @@ class libnotify_NotifierPopup(object): n.set_urgency(pynotify.URGENCY_NORMAL) n.set_timeout(timeout) + self._pyhoca_logger(text, loglevel=x2go.log.loglevel_NOTICE) if not n.show(): raise PyHocaNotificationException('could not notify user') @@ -77,7 +80,8 @@ class win32gui_NotifierPopup(object): def __init__(self, _PyHocaGUI): self._PyHocaGUI = _PyHocaGUI - self.taskbar = self._PyHocaGUI.taskbar + self._pyhoca_logger = self._PyHocaGUI._pyhoca_logger + self.taskbar = self._PyHBocaGUI.taskbar def prepare(self, context, title=None, text=None): if title is not None: @@ -99,6 +103,7 @@ class win32gui_NotifierPopup(object): pass self.taskbar.ShowBalloon(title, text, msec=timeout) + self._pyhoca_logger(text, loglevel=x2go.log.loglevel_NOTICE) def Close(self): pass diff --git a/pyhoca/wxgui/taskbar.py b/pyhoca/wxgui/taskbar.py index c5b8da6..c49caa9 100644 --- a/pyhoca/wxgui/taskbar.py +++ b/pyhoca/wxgui/taskbar.py @@ -128,11 +128,13 @@ class PyHocaGUI_TaskBarIcon(wx.TaskBarIcon): @param msec - Timeout for balloon tooltip, in milliseconds @param flags - one of wx.ICON_INFORMATION, wx.ICON_WARNING, wx.ICON_ERROR """ + + print 'SHOWING BALLOON!!!!!!!!!!!!!!!' if x2go.X2GOCLIENT_OS == 'Windows' and self.IsIconInstalled(): try: self.__SetBalloonTip(self.icon.GetHandle(), title, text, msec, flags) except Exception, e: - self._PyHocaGUI._pyhoca_logger(str(e)) + self._pyhoca_logger(str(e)) def __SetBalloonTip(self, hicon, title, msg, msec, flags): 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)).