[GRASS-SVN] r44787 - in grass/branches/develbranch_6/gui: icons/grass2 wxpython/gui_modules wxpython/icons

svn_grass at osgeo.org svn_grass at osgeo.org
Wed Dec 29 16:16:53 EST 2010 

Author: martinl
Date: 2010-12-29 13:16:53 -0800 (Wed, 29 Dec 2010)
New Revision: 44787

Added:
   grass/branches/develbranch_6/gui/icons/grass2/layer-raster-more.png
   grass/branches/develbranch_6/gui/icons/grass2/layer-vector-more.png
Modified:
   grass/branches/develbranch_6/gui/icons/grass2/move.png
   grass/branches/develbranch_6/gui/icons/grass2/zoom-extent.png
   grass/branches/develbranch_6/gui/wxpython/gui_modules/toolbars.py
   grass/branches/develbranch_6/gui/wxpython/icons/grass2_icons.py
   grass/branches/develbranch_6/gui/wxpython/icons/grass_icons.py
   grass/branches/develbranch_6/gui/wxpython/icons/icon.py
   grass/branches/develbranch_6/gui/wxpython/icons/silk_icons.py
Log:
grass2 icon set: layer-{raster|vector}-more.png icons added
(merge r44786 from trunk)


Copied: grass/branches/develbranch_6/gui/icons/grass2/layer-raster-more.png (from rev 44786, grass/trunk/gui/icons/grass2/layer-raster-more.png)
===================================================================
(Binary files differ)

Copied: grass/branches/develbranch_6/gui/icons/grass2/layer-vector-more.png (from rev 44786, grass/trunk/gui/icons/grass2/layer-vector-more.png)
===================================================================
(Binary files differ)


Property changes on: grass/branches/develbranch_6/gui/icons/grass2/move.png
___________________________________________________________________
Deleted: svn:executable
   - *


Property changes on: grass/branches/develbranch_6/gui/icons/grass2/zoom-extent.png
___________________________________________________________________
Deleted: svn:executable
   - *

Modified: grass/branches/develbranch_6/gui/wxpython/gui_modules/toolbars.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/gui_modules/toolbars.py	2010-12-29 21:15:28 UTC (rev 44786)
+++ grass/branches/develbranch_6/gui/wxpython/gui_modules/toolbars.py	2010-12-29 21:16:53 UTC (rev 44787)
@@ -1777,9 +1777,9 @@
         self.workspaceOpen = wx.NewId()
         self.workspaceSave = wx.NewId()
         self.addrast = wx.NewId()
-        self.addshaded = wx.NewId()
+        self.rastmisc = wx.NewId()
         self.addvect = wx.NewId()
-        self.addthematic = wx.NewId()
+        self.vectmisc = wx.NewId()
         self.addgrp = wx.NewId()
         self.addovl = wx.NewId()
         self.delcmd = wx.NewId()
@@ -1806,14 +1806,14 @@
             (self.addrast, 'addrast', Icons["addrast"].GetBitmap(),
              wx.ITEM_NORMAL, Icons["addrast"].GetLabel(), Icons["addrast"].GetDesc(),
              self.parent.OnAddRaster),
-            (self.addshaded, 'addshaded', Icons["addshaded"].GetBitmap(),
-             wx.ITEM_NORMAL, _("Add various raster-based map layers"), "",
+            (self.rastmisc, 'rastmisc', Icons["rastmisc"].GetBitmap(),
+             wx.ITEM_NORMAL, Icons["rastmisc"].GetLabel(), Icons["rastmisc"].GetDesc(),
              self.parent.OnAddRasterMisc),
             (self.addvect, 'addvect', Icons["addvect"].GetBitmap(),
              wx.ITEM_NORMAL, Icons["addvect"].GetLabel(), Icons["addvect"].GetDesc(),
              self.parent.OnAddVector),
-            (self.addthematic, 'addthematic', Icons["addthematic"].GetBitmap(),
-             wx.ITEM_NORMAL, _("Add various vector-based map layers"), "",
+            (self.vectmisc, 'vectmisc', Icons["vectmisc"].GetBitmap(),
+             wx.ITEM_NORMAL, Icons["vectmisc"].GetLabel(), Icons["vectmisc"].GetDesc(),
              self.parent.OnAddVectorMisc),
             (self.addgrp, 'addgrp',  Icons["addgrp"].GetBitmap(),
              wx.ITEM_NORMAL, Icons["addgrp"].GetLabel(), Icons["addgrp"].GetDesc(),

Modified: grass/branches/develbranch_6/gui/wxpython/icons/grass2_icons.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/icons/grass2_icons.py	2010-12-29 21:15:28 UTC (rev 44786)
+++ grass/branches/develbranch_6/gui/wxpython/icons/grass2_icons.py	2010-12-29 21:16:53 UTC (rev 44787)
@@ -69,11 +69,13 @@
     "fileOpen"   : 'open.png',
     "fileSave"   : 'save.png',
     "addrast"    : 'layer-raster-add.png',
+    "rastmisc"   : 'layer-raster-more.png',
     "addrast3d"  : 'layer-raster3d-add.png',
     "addshaded"  : 'layer-shaded-relief-add.png',
     "addrarrow"  : 'layer-aspect-arrow-add.png',
     "addrnum"    : 'layer-cell-cats-add.png',
     "addvect"    : 'layer-vector-add.png',
+    "vectmisc"   : 'layer-vector-more.png',
     "addcmd"     : 'layer-command-add.png',
     "addgrp"     : 'layer-group-add.png',
     "addovl"     : 'layer-grid-add.png',

Modified: grass/branches/develbranch_6/gui/wxpython/icons/grass_icons.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/icons/grass_icons.py	2010-12-29 21:15:28 UTC (rev 44786)
+++ grass/branches/develbranch_6/gui/wxpython/icons/grass_icons.py	2010-12-29 21:16:53 UTC (rev 44787)
@@ -57,8 +57,10 @@
     "fileOpen"   : 'file-open.gif',
     "fileSave"   : 'file-save.gif',
     "addrast"    : 'element-cell.gif',
+    "rastmisc"   : 'module-d.shadedmap.gif',
     "addrast3d"  : 'element-grid3.gif',
     "addvect"    : 'element-vector.gif',
+    "vectmisc"   : 'module-d.vect.thematic.gif',
     "addcmd"     : 'gui-cmd.gif',
     "addgrp"     : 'gui-group.gif',
     "addovl"     : 'module-d.grid.gif',

Modified: grass/branches/develbranch_6/gui/wxpython/icons/icon.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/icons/icon.py	2010-12-29 21:15:28 UTC (rev 44786)
+++ grass/branches/develbranch_6/gui/wxpython/icons/icon.py	2010-12-29 21:16:53 UTC (rev 44787)
@@ -188,8 +188,12 @@
                                 label=_("Save current workspace to file (Ctrl+S)")),
     "addrast"    : MetaIcon (img=Icons["addrast"],
                              label=_("Add raster map layer (Ctrl+R)")),
+    "rastmisc" : MetaIcon (img=Icons["rastmisc"],
+                             label=_("Add various raster map layers (RGB, HIS, shaded relief...)")),
     "addvect"    : MetaIcon (img=Icons["addvect"],
                              label=_("Add vector map layer (Ctrl+V)")),
+    "vectmisc" : MetaIcon (img=Icons["vectmisc"],
+                             label=_("Add various vector map layers (thematic, chart...)")),
     "addcmd"     : MetaIcon (img=Icons["addcmd"],
                              label=_("Add command layer")),
     "addgrp"     : MetaIcon (img=Icons["addgrp"],

Modified: grass/branches/develbranch_6/gui/wxpython/icons/silk_icons.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/icons/silk_icons.py	2010-12-29 21:15:28 UTC (rev 44786)
+++ grass/branches/develbranch_6/gui/wxpython/icons/silk_icons.py	2010-12-29 21:16:53 UTC (rev 44787)
@@ -72,11 +72,13 @@
     "fileOpen"   : 'folder.png',
     "fileSave"   : 'page_save.png',
     "addrast"    : 'image_add.png',
+    "rastmisc"   : 'picture_empty.png',
     "addrast3d"  : 'bricks.png',
     "addshaded"  : 'picture_empty.png',
     "addrarrow"  : 'arrow_inout.png',
     "addrnum"    : 'color_swatch.png',
     "addvect"    : 'map_add.png',
+    "vectmisc"   : 'thematic.png',
     "addcmd"     : 'cog_add.png',
     "addgrp"     : 'folder_add.png',
     "addovl"     : 'images.png',

More information about the grass-commit mailing list