[GRASS-SVN] r50864 - in grass/branches/develbranch_6/gui: icons wxpython/gui_core

[svn_grass at osgeo.org]

Author: martinl
Date: 2012-02-18 04:58:02 -0800 (Sat, 18 Feb 2012)
New Revision: 50864

Added:
   grass/branches/develbranch_6/gui/icons/grass-64x64.png
Modified:
   grass/branches/develbranch_6/gui/wxpython/gui_core/ghelp.py
Log:
add grass-64x64 logo (png)
    (merge r50863 from trunk)


Copied: grass/branches/develbranch_6/gui/icons/grass-64x64.png (from rev 50863, grass/trunk/gui/icons/grass-64x64.png)
===================================================================
(Binary files differ)

Modified: grass/branches/develbranch_6/gui/wxpython/gui_core/ghelp.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/gui_core/ghelp.py	2012-02-18 12:55:55 UTC (rev 50863)
+++ grass/branches/develbranch_6/gui/wxpython/gui_core/ghelp.py	2012-02-18 12:58:02 UTC (rev 50864)
@@ -398,10 +398,10 @@
         infoGridSizer = wx.GridBagSizer(vgap = 5, hgap = 5)
         infoGridSizer.AddGrowableCol(0)
         infoGridSizer.AddGrowableCol(1)
-        logo = os.path.join(globalvar.ETCDIR, "gui", "icons", "grass.ico")
+        logo = os.path.join(globalvar.ETCDIR, "gui", "icons", "grass-64x64.png")
         logoBitmap = wx.StaticBitmap(parent = infoTxt, id = wx.ID_ANY,
                                      bitmap = wx.Bitmap(name = logo,
-                                                        type = wx.BITMAP_TYPE_ICO))
+                                                        type = wx.BITMAP_TYPE_PNG))
         infoSizer.Add(item = logoBitmap, proportion = 0,
                       flag = wx.ALL | wx.ALIGN_CENTER, border = 25)