The branch, twofactorauth has been updated via eda24f02e04566263d099fb5a87a12ff99cd52fd (commit) from 85a23059e92451076af3baca2006dae57fb5244f (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 | 6 ++++-- pyhoca/wxgui/splash.py | 54 ++++++++++++++++++++++++++++++++++++++++++++++ pyhoca/wxgui/taskbar.py | 2 -- 3 files changed, 58 insertions(+), 4 deletions(-) create mode 100644 pyhoca/wxgui/splash.py The diff of changes is: diff --git a/pyhoca/wxgui/frontend.py b/pyhoca/wxgui/frontend.py index d484a8e..f8c2370 100644 --- a/pyhoca/wxgui/frontend.py +++ b/pyhoca/wxgui/frontend.py @@ -61,6 +61,7 @@ import printingprefs import notify import basepath import messages +import splash wx.SetDefaultPyEncoding("utf-8") wx.InitAllImageHandlers() @@ -99,8 +100,9 @@ class PyHocaGUI(wx.App, x2go.X2goClient): """ wx.BeginBusyCursor() - splash_bitmap = wx.Bitmap(os.path.join(basepath.images_basepath, 'pyhoca-splash.png'), wx.BITMAP_TYPE_PNG) - wx.SplashScreen(splash_bitmap, splashStyle=wx.SPLASH_CENTRE_ON_SCREEN|wx.SPLASH_TIMEOUT, milliseconds=3000, parent=None, style=wx.SIMPLE_BORDER|wx.STAY_ON_TOP|wx.FRAME_NO_TASKBAR) + #splash_bitmap = wx.Bitmap(os.path.join(basepath.images_basepath, 'pyhoca-splash.png'), wx.BITMAP_TYPE_PNG) + #wx.SplashScreen(splash_bitmap, splashStyle=wx.SPLASH_CENTRE_ON_SCREEN|wx.SPLASH_TIMEOUT, milliseconds=3000, parent=None, style=wx.SIMPLE_BORDER|wx.STAY_ON_TOP|wx.FRAME_NO_TASKBAR) + splash.PyHocaGUI_SplashScreen() wx.Yield() _x2goclient_kwargs = { diff --git a/pyhoca/wxgui/splash.py b/pyhoca/wxgui/splash.py new file mode 100644 index 0000000..5be0483 --- /dev/null +++ b/pyhoca/wxgui/splash.py @@ -0,0 +1,54 @@ +# -*- coding: utf-8 -*- + +# Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2010-2011 by Dick Kniep <dick.kniep@lindix.nl> +# +# PyHoca GUI is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# PyHoca GUI is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the +# Free Software Foundation, Inc., +# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + +try: + import wxversion + wxversion.select('2.9') +except: pass + +try: + import wxversion + wxversion.select('2.8') +except: pass + +import wx +import os + +# PyHoca-GUI modules +import basepath + +class PyHocaGUI_SplashScreen(wx.SplashScreen): + def __init__(self): + splash_bitmap = wx.Bitmap(os.path.join(basepath.images_basepath, 'pyhoca-splash.png'), wx.BITMAP_TYPE_PNG) + wx.SplashScreen.__init__(self, + splash_bitmap, + splashStyle=wx.SPLASH_CENTRE_ON_SCREEN|wx.SPLASH_TIMEOUT, + milliseconds=3000, + parent=None, + style=wx.SIMPLE_BORDER|wx.STAY_ON_TOP|wx.FRAME_NO_TASKBAR + ) + self.Bind(wx.EVT_CLOSE, self.OnClose) + + def OnClose(self, evt): + # Make sure the default handler runs too so this window gets + # destroyed + evt.Skip() + self.Hide() + diff --git a/pyhoca/wxgui/taskbar.py b/pyhoca/wxgui/taskbar.py index b26b111..03f03af 100644 --- a/pyhoca/wxgui/taskbar.py +++ b/pyhoca/wxgui/taskbar.py @@ -38,8 +38,6 @@ import gevent.monkey gevent.monkey.patch_all() import wx -import wx.lib.scrolledpanel as scrolled -import wx.lib.mixins.listctrl as listmix if x2go.X2GOCLIENT_OS == 'Windows': import win32gui 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)).