[GRASS-SVN] r30432 - in grass/trunk/gui/wxpython: . gui_modules

[svn_grass at osgeo.org]

Author: martinl
Date: 2008-03-03 03:19:16 -0500 (Mon, 03 Mar 2008)
New Revision: 30432

Modified:
   grass/trunk/gui/wxpython/gis_set.py
   grass/trunk/gui/wxpython/gui_modules/mapdisp.py
   grass/trunk/gui/wxpython/gui_modules/menuform.py
   grass/trunk/gui/wxpython/gui_modules/sqlbuilder.py
   grass/trunk/gui/wxpython/wxgui.py
Log:
wxGUI: fix icon path, see r30431

Modified: grass/trunk/gui/wxpython/gis_set.py
===================================================================
--- grass/trunk/gui/wxpython/gis_set.py	2008-03-03 08:05:28 UTC (rev 30431)
+++ grass/trunk/gui/wxpython/gis_set.py	2008-03-03 08:19:16 UTC (rev 30432)
@@ -165,8 +165,8 @@
     def _set_properties(self):
         """Set frame properties"""
         self.SetTitle(_("Welcome to GRASS GIS"))
-        self.SetIcon(wx.Icon(os.path.join(globalvar.ETCDIR, "dm", "grass.gif"),
-                             wx.BITMAP_TYPE_GIF))
+        self.SetIcon(wx.Icon(os.path.join(globalvar.ETCDIR, "grass.ico"),
+                             wx.BITMAP_TYPE_ICO))
 
         self.lwelcome.SetForegroundColour(wx.Colour(35, 142, 35))
         self.lwelcome.SetFont(wx.Font(14, wx.DEFAULT, wx.NORMAL, wx.BOLD, 0, ""))

Modified: grass/trunk/gui/wxpython/gui_modules/mapdisp.py
===================================================================
--- grass/trunk/gui/wxpython/gui_modules/mapdisp.py	2008-03-03 08:05:28 UTC (rev 30431)
+++ grass/trunk/gui/wxpython/gui_modules/mapdisp.py	2008-03-03 08:19:16 UTC (rev 30432)
@@ -2158,8 +2158,9 @@
         #
         self.SetClientSize(size)
         self.iconsize = (16, 16)
-        self.SetIcon(wx.Icon(os.path.join(imagepath,'grass.map.gif'), wx.BITMAP_TYPE_ANY))
 
+        self.SetIcon(wx.Icon(os.path.join(globalvar.ETCDIR, 'grass_map.ico'), wx.BITMAP_TYPE_ICO))
+
         #
         # Fancy gui
         #

Modified: grass/trunk/gui/wxpython/gui_modules/menuform.py
===================================================================
--- grass/trunk/gui/wxpython/gui_modules/menuform.py	2008-03-03 08:05:28 UTC (rev 30431)
+++ grass/trunk/gui/wxpython/gui_modules/menuform.py	2008-03-03 08:19:16 UTC (rev 30432)
@@ -82,7 +82,7 @@
     wxbase = os.path.join(globalvar.ETCWXDIR)
 
 sys.path.append( wxbase)
-imagepath = os.path.join(wxbase,"images")
+imagepath = os.path.join(wxbase, "images")
 sys.path.append(imagepath)
 
 import grassenv
@@ -558,8 +558,9 @@
 
         # statusbar
         self.CreateStatusBar()
+
         # icon
-        self.SetIcon(wx.Icon(os.path.join(imagepath, 'grass.form.gif'), wx.BITMAP_TYPE_GIF))
+        self.SetIcon(wx.Icon(os.path.join(globalvar.ETCDIR, 'grass_dialog.ico'), wx.BITMAP_TYPE_ICO))
 
         # menu
         #         menu = wx.Menu()
@@ -594,7 +595,7 @@
         # GRASS logo
         self.logo = wx.StaticBitmap(parent=self.panel,
                                     bitmap=wx.Bitmap(name=os.path.join(imagepath,
-                                                                       'grass-tiny-logo.png'),
+                                                                       'grass_form.png'),
                                                      type=wx.BITMAP_TYPE_PNG))
         topsizer.Add (item=self.logo, proportion=0, border=3,
                       flag=wx.ALL | wx.ALIGN_CENTER_VERTICAL)

Modified: grass/trunk/gui/wxpython/gui_modules/sqlbuilder.py
===================================================================
--- grass/trunk/gui/wxpython/gui_modules/sqlbuilder.py	2008-03-03 08:05:28 UTC (rev 30431)
+++ grass/trunk/gui/wxpython/gui_modules/sqlbuilder.py	2008-03-03 08:19:16 UTC (rev 30432)
@@ -41,9 +41,7 @@
         wx.Frame.__init__(self, parent, id, title)
 
         self.SetTitle(_("GRASS SQL Builder: %s") % (qtype.upper()))
-        self.SetIcon(wx.Icon(os.path.join(imagepath, 
-                                          'grass_sql.png'),
-                             wx.BITMAP_TYPE_ANY))
+        self.SetIcon(wx.Icon(os.path.join(globalvar.ETCDIR, 'grass_sql.ico'), wx.BITMAP_TYPE_ICO))
 
         #
         # variables

Modified: grass/trunk/gui/wxpython/wxgui.py
===================================================================
--- grass/trunk/gui/wxpython/wxgui.py	2008-03-03 08:05:28 UTC (rev 30431)
+++ grass/trunk/gui/wxpython/wxgui.py	2008-03-03 08:19:16 UTC (rev 30432)
@@ -105,7 +105,7 @@
                           style=wx.DEFAULT_FRAME_STYLE)
         self.SetTitle(self.baseTitle)
 
-        self.SetIcon(wx.Icon(os.path.join(imagepath, 'grass.smlogo.gif'), wx.BITMAP_TYPE_ANY))
+        self.SetIcon(wx.Icon(os.path.join(globalvar.ETCDIR, 'grass.ico'), wx.BITMAP_TYPE_ICO))
 
         self._auimgr = wx.aui.AuiManager(self)