[GRASS-SVN] r30054 - in grass/trunk/gui/wxpython: . icons icons/silk

[svn_grass at osgeo.org]

Author: martinl
Date: 2008-02-10 10:09:41 -0500 (Sun, 10 Feb 2008)
New Revision: 30054

Added:
   grass/trunk/gui/wxpython/icons/silk/bin_closed.png
Modified:
   grass/trunk/gui/wxpython/icons/icon.py
   grass/trunk/gui/wxpython/icons/silk/__init__.py
   grass/trunk/gui/wxpython/wxgui.py
Log:
wxGUI: icon cleaning (do not use ArtProvider icons)

Modified: grass/trunk/gui/wxpython/icons/icon.py
===================================================================
--- grass/trunk/gui/wxpython/icons/icon.py	2008-02-10 14:58:31 UTC (rev 30053)
+++ grass/trunk/gui/wxpython/icons/icon.py	2008-02-10 15:09:41 UTC (rev 30054)
@@ -81,9 +81,9 @@
     "addrast"    : 'element-cell.gif',
     "addvect"    : 'element-vector.gif',
     "addcmd"     : 'gui-cmd.gif',
-    "addgrp"     : wx.ART_ERROR,
+    "addgrp"     : 'gui-group.gif',
     "addovl"     : 'module-d.grid.gif',
-    "delcmd"     : wx.ART_ERROR,
+    "delcmd"     : 'edit-cut.gif',
     "attrtable"  : 'db-values.gif',
     "addrgb"     : 'module-d.rgb.gif',
     "addhis"     : 'channel-his.gif',

Modified: grass/trunk/gui/wxpython/icons/silk/__init__.py
===================================================================
--- grass/trunk/gui/wxpython/icons/silk/__init__.py	2008-02-10 14:58:31 UTC (rev 30053)
+++ grass/trunk/gui/wxpython/icons/silk/__init__.py	2008-02-10 15:09:41 UTC (rev 30054)
@@ -71,7 +71,7 @@
     "addovl"     : 'images.png',
     "addgrid"    : 'application_view_icons.png',
     "addlabels"  : 'tag_blue_add.png',
-    "delcmd"     : 'cross.png',
+    "delcmd"     : 'bin_closed.png',
     "attrtable"  : 'application_view_columns.png',
     "addrgb"     : 'rgb.png',
     "addhis"     : 'his.png',

Added: grass/trunk/gui/wxpython/icons/silk/bin_closed.png
===================================================================
(Binary files differ)


Property changes on: grass/trunk/gui/wxpython/icons/silk/bin_closed.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: grass/trunk/gui/wxpython/wxgui.py
===================================================================
--- grass/trunk/gui/wxpython/wxgui.py	2008-02-10 14:58:31 UTC (rev 30053)
+++ grass/trunk/gui/wxpython/wxgui.py	2008-02-10 15:09:41 UTC (rev 30054)
@@ -842,10 +842,10 @@
                  ('addrast', Icons["addrast"].GetBitmap(), Icons["addrast"].GetLabel(), self.OnRaster),
                  ('addvect', Icons["addvect"].GetBitmap(), Icons["addvect"].GetLabel(), self.OnVector),
                  ('addcmd',  Icons["addcmd"].GetBitmap(),  Icons["addcmd"].GetLabel(),  self.AddCommand),
-                 ('addgrp',  wx.ArtProvider.GetBitmap(wx.ART_FOLDER, wx.ART_TOOLBAR, (16,16)),  Icons["addgrp"].GetLabel(), self.AddGroup),
+                 ('addgrp',  Icons["addgrp"].GetBitmap(),  Icons["addgrp"].GetLabel(), self.AddGroup),
                  ('addovl',  Icons["addovl"].GetBitmap(),  Icons["addovl"].GetLabel(), self.OnOverlay),
                  ('addlabels',  Icons["addlabels"].GetBitmap(),  Icons["addlabels"].GetLabel(), self.AddLabels),
-                 ('delcmd',  wx.ArtProvider.GetBitmap(wx.ART_DELETE, wx.ART_TOOLBAR, (16,16)), 'Delete selected layer', self.DeleteLayer),
+                 ('delcmd',  Icons["delcmd"].GetBitmap(),  Icons["delcmd"].GetLabel(), self.DeleteLayer),
                  ('', '', '', ''),
                  ('attrtable', Icons["attrtable"].GetBitmap(), Icons["attrtable"].GetLabel(), self.ShowAttributeTable)
                   )