The branch, twofactorauth has been updated via baa6f17c8bba19f5d42d83c0509d2a3ed7539196 (commit) from 9d90de2d72881559cd529e8e7a0a8d1acd1aeb64 (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/about.py | 14 +++++++++++++- pyhoca/wxgui/frontend.py | 4 ++-- pyhoca/wxgui/notify.py | 4 ++-- pyhoca/wxgui/taskbar.py | 5 ++++- 4 files changed, 21 insertions(+), 6 deletions(-) The diff of changes is: diff --git a/pyhoca/wxgui/about.py b/pyhoca/wxgui/about.py index c7c29ab..cf4dca9 100644 --- a/pyhoca/wxgui/about.py +++ b/pyhoca/wxgui/about.py @@ -51,11 +51,23 @@ class PyHocaGUI_AboutFrame(wx.Frame): self._PyHocaGUI = _PyHocaGUI self._pyhoca_logger = self._PyHocaGUI._pyhoca_logger - wx.Frame.__init__(self, None, -1, 'About PyHoca-GUI...', size=(400,298)) + if x2go.X2GOCLIENT_OS == 'Windows': + wx.Frame.__init__(self, None, -1, 'About PyHoca-GUI...', size=(403,319)) + else: + wx.Frame.__init__(self, None, -1, 'About PyHoca-GUI...', size=(400,298)) self.Bind(wx.EVT_CLOSE, self.OnClose) _logo_bitmap = wx.StaticBitmap(self, wx.ID_ANY, wx.Bitmap(os.path.join(basepath.images_basepath, 'pyhoca-about-logo.png')), (0, 0)) self.bitmap = _logo_bitmap + + if x2go.X2GOCLIENT_OS == 'Windows': + _icon = wx.Bitmap(os.path.join(basepath.icons_basepath, os.path.normpath('PyHoca/16x16/pyhoca-winicon.png'))) + elif x2go.X2GOCLIENT_OS == 'Mac': + _icon = wx.Bitmap(os.path.join(basepath.icons_basepath, os.path.normpath('PyHoca/128x128/pyhoca-winicon.png'))) + else: + _icon = wx.Bitmap(os.path.join(basepath.icons_basepath, os.path.normpath('PyHoca/22x22/pyhoca-winicon.png'))) + self.icon = self.SetIcon(wx.IconFromBitmap(_icon)) + self.CenterOnScreen() def OnClose(self, evt): diff --git a/pyhoca/wxgui/frontend.py b/pyhoca/wxgui/frontend.py index 790ba70..bb498da 100644 --- a/pyhoca/wxgui/frontend.py +++ b/pyhoca/wxgui/frontend.py @@ -148,7 +148,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient): if x2go.X2GOCLIENT_OS in ('Linux', 'Mac'): self.notifier = notify.libnotify_NotifierPopup(self) if x2go.X2GOCLIENT_OS in ('Windows'): - self.notifier = notify.notificationmessage_NotifierPopup(self) + self.notifier = notify.notificationmessage_NotifierPopup(self.about) self._sub_windows = [] self._eventid_profilenames_map = {} @@ -464,7 +464,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient): STILL UNDOCUMENTED """ - self._pyhoca_logger('Showing the ,,About...\'\' window', loglevel=x2go.log.loglevel_WARN, ) + self._pyhoca_logger('Showing the ,,About...\'\' window', loglevel=x2go.log.loglevel_INFO, ) self.about.Show(True) def OnOptions(self, evt): diff --git a/pyhoca/wxgui/notify.py b/pyhoca/wxgui/notify.py index 8a720db..dddbe63 100644 --- a/pyhoca/wxgui/notify.py +++ b/pyhoca/wxgui/notify.py @@ -92,8 +92,8 @@ class notificationmessage_NotifierPopup(object): text = {} icon = {} - def __init__(self, _PyHocaGUI): - self._PyHocaGUI = _PyHocaGUI + def __init__(self, _about): + self._PyHocaGUI = _about._PyHocaGUI self._pyhoca_logger = self._PyHocaGUI._pyhoca_logger self.taskbar = self._PyHocaGUI.taskbar diff --git a/pyhoca/wxgui/taskbar.py b/pyhoca/wxgui/taskbar.py index 36882ed..7ff43f2 100644 --- a/pyhoca/wxgui/taskbar.py +++ b/pyhoca/wxgui/taskbar.py @@ -90,15 +90,18 @@ class PyHocaGUI_TaskBarIcon(wx.TaskBarIcon): def SetIconConnecting(self, profile_name): self.icon = self.MakeIcon(icon_name='pyhoca-trayicon') if x2go.X2GOCLIENT_OS == 'Windows': + self.icon = self.MakeIcon(icon_name='x2go-logo-ubuntu') self.SetIcon(self.icon, "PyHoca-GUI\nConnecting you to ,,%s\'\'" % profile_name) else: + self.icon = self.MakeIcon(icon_name='pyhoca-trayicon') self.SetIcon(self.icon, "PyHoca-GUI (Python X2goClient)\nCurrently connecting you to remote X2go server ,,%s\'\'" % profile_name) def SetIconIdle(self): - self.icon = self.MakeIcon(icon_name='pyhoca-trayicon') if x2go.X2GOCLIENT_OS == 'Windows': + self.icon = self.MakeIcon(icon_name='x2go-logo-ubuntu') self.SetIcon(self.icon, "PyHoca-GUI\nConnecting you to X2go...") else: + self.icon = self.MakeIcon(icon_name='pyhoca-trayicon') self.SetIcon(self.icon, "PyHoca-GUI (Python X2goClient)\nClient for connecting you to a remote X2go server") def CreateSessionManagerPopupMenu(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)).