[X2go-Commits] pyhoca-gui.git - master (branch) updated: 0.1.0.10-240-g6aa2c64

X2Go dev team git-admin at x2go.org
Tue May 15 08:33:29 CEST 2012


The branch, master has been updated
       via  6aa2c64cfd794a492ff85a4e52c3cee58b1175eb (commit)
      from  d244082e8fd6fac9818a79b917885cb0263535ad (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 6aa2c64cfd794a492ff85a4e52c3cee58b1175eb
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue May 15 08:33:13 2012 +0200

    Fallback to default splash image if the custom splash does not exist.

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog       |    1 +
 pyhoca/wxgui/splash.py |    9 ++++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index d5acf6d..6a933a3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -129,6 +129,7 @@ pyhoca-gui (0.1.2.0-0~x2go1) UNRELEASED; urgency=low
     - Add option --splash-image that allows to name a custom splash image
       that gets shown during application startup.
     - Only show splash if the splash image file does exist.
+    - Fallback to default splash image if the custom splash does not exist.
   * Depend on Python X2Go 0.1.2.0.
   * Install GNOME icons via dh_links.
   * Install X2Go icons with explicit install paths.
diff --git a/pyhoca/wxgui/splash.py b/pyhoca/wxgui/splash.py
index 1c892c9..d1b9ebc 100644
--- a/pyhoca/wxgui/splash.py
+++ b/pyhoca/wxgui/splash.py
@@ -37,12 +37,15 @@ import basepath
 class PyHocaGUI_SplashScreen(wx.SplashScreen):
     def __init__(self, splash_image=None):
 
-        if splash_image is None:
-            splash_image = 'pyhoca-splash.png'
-
         if os.path.basename(splash_image) == splash_image:
             splash_image = os.path.join(basepath.images_basepath, splash_image)
 
+        if not os.path.isfile(splash_image):
+            splash_image = None
+
+        if splash_image is None:
+            splash_image = os.path.join(basepath.images_basepath, 'pyhoca-splash.png')
+
         if os.path.isfile(splash_image):
             splash_wximage = wx.Image(splash_image, wx.BITMAP_TYPE_PNG, )
             splash_wximage.Rescale(400, int(float(400)/splash_wximage.Width*splash_wximage.Height))


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)).




More information about the x2go-commits mailing list