The branch, twofactorauth has been updated via 00eb8532ef893c3d853a4a0f787e108de2a4957c (commit) from 30a7ca8d427693cdb70677b520a9d851b804442f (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: img/{pyhoca-splash.png => pyhoca-about-logo.png} | Bin 53243 -> 53243 bytes pyhoca/wxgui/about.py | 50 ++++++---------------- pyhoca/wxgui/logon.py | 5 +++ pyhoca/wxgui/menus_taskbar.py | 5 +++ pyhoca/wxgui/notify.py | 2 +- pyhoca/wxgui/taskbar.py | 5 +++ 6 files changed, 28 insertions(+), 39 deletions(-) copy img/{pyhoca-splash.png => pyhoca-about-logo.png} (100%) The diff of changes is: diff --git a/img/pyhoca-splash.png b/img/pyhoca-about-logo.png similarity index 100% copy from img/pyhoca-splash.png copy to img/pyhoca-about-logo.png diff --git a/pyhoca/wxgui/about.py b/pyhoca/wxgui/about.py index 6322cb0..b5d85ca 100644 --- a/pyhoca/wxgui/about.py +++ b/pyhoca/wxgui/about.py @@ -20,6 +20,13 @@ modules ={} +import os + +try: + import wxversion + wxversion.select('2.9') +except: pass + try: import wxversion wxversion.select('2.8') @@ -28,23 +35,11 @@ except: pass # Python X2go import x2go -import gevent -import gevent.monkey -gevent.monkey.patch_all() - +# wxPython import wx -import wx.lib.scrolledpanel as scrolled -import wx.lib.mixins.listctrl as listmix - -import time -import sys -import platform -import types -import copy -import threading # PyHoca-GUI modules -# ... NONE ... +import basepath class PyHocaGUI_AboutFrame(wx.Frame): """\ @@ -56,32 +51,11 @@ 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=(350,280)) + wx.Frame.__init__(self, None, -1, 'About PyHoca-GUI...', size=(400,300)) self.Bind(wx.EVT_CLOSE, self.OnClose) - menuBar = wx.MenuBar() - menu = wx.Menu() - m_exit = menu.Append(wx.ID_EXIT, "E&xit\tAlt-X", "Close window and exit program.") - self.Bind(wx.EVT_MENU, self.OnClose, m_exit) - menuBar.Append(menu, "&File") - self.SetMenuBar(menuBar) - - self.statusbar = self.CreateStatusBar() - - panel = wx.Panel(self) - box = wx.BoxSizer(wx.VERTICAL) - - m_text = wx.StaticText(panel, -1, "Hello World!") - m_text.SetFont(wx.Font(14, wx.SWISS, wx.NORMAL, wx.BOLD)) - m_text.SetSize(m_text.GetBestSize()) - box.Add(m_text, 0, wx.ALL, 10) - - m_close = wx.Button(panel, wx.ID_CLOSE, "Close") - m_close.Bind(wx.EVT_BUTTON, self.OnClose) - box.Add(m_close, 0, wx.ALL, 10) - - panel.SetSizer(box) - panel.Layout() + _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 self.CenterOnScreen() def OnClose(self, evt): diff --git a/pyhoca/wxgui/logon.py b/pyhoca/wxgui/logon.py index 42babe8..622aca0 100644 --- a/pyhoca/wxgui/logon.py +++ b/pyhoca/wxgui/logon.py @@ -22,6 +22,11 @@ modules ={} try: import wxversion + wxversion.select('2.9') +except: pass + +try: + import wxversion wxversion.select('2.8') except: pass diff --git a/pyhoca/wxgui/menus_taskbar.py b/pyhoca/wxgui/menus_taskbar.py index 7e3c346..d205be5 100644 --- a/pyhoca/wxgui/menus_taskbar.py +++ b/pyhoca/wxgui/menus_taskbar.py @@ -20,6 +20,11 @@ try: import wxversion + wxversion.select('2.9') +except: pass + +try: + import wxversion wxversion.select('2.8') except: pass diff --git a/pyhoca/wxgui/notify.py b/pyhoca/wxgui/notify.py index b381c83..8a720db 100644 --- a/pyhoca/wxgui/notify.py +++ b/pyhoca/wxgui/notify.py @@ -150,7 +150,7 @@ class notificationmessage_NotifierPopup(object): _notification_msg = wx.NotificationMessage() _notification_msg.SetTitle(title) _notification_msg.SetMessage(text) - #_notification_msg.SetParent(self._PyHocaGUI) + _notification_msg.SetParent(self._PyHocaGUI.about) _notification_msg.SetFlags(icon) _notification_msg.Show(timeout=1) except: diff --git a/pyhoca/wxgui/taskbar.py b/pyhoca/wxgui/taskbar.py index 70cca91..36882ed 100644 --- a/pyhoca/wxgui/taskbar.py +++ b/pyhoca/wxgui/taskbar.py @@ -22,6 +22,11 @@ modules ={} try: import wxversion + wxversion.select('2.9') +except: pass + +try: + import wxversion wxversion.select('2.8') except: pass 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)).