[GRASS-SVN] r43087 - in grass/trunk/gui/wxpython: gui_modules icons

[svn_grass at osgeo.org]

Author: martinl
Date: 2010-08-13 08:22:39 +0000 (Fri, 13 Aug 2010)
New Revision: 43087

Modified:
   grass/trunk/gui/wxpython/gui_modules/toolbars.py
   grass/trunk/gui/wxpython/icons/icon.py
Log:
wxGUI/GCPManager: use grass2 'help' icon


Modified: grass/trunk/gui/wxpython/gui_modules/toolbars.py
===================================================================
--- grass/trunk/gui/wxpython/gui_modules/toolbars.py	2010-08-13 08:17:23 UTC (rev 43086)
+++ grass/trunk/gui/wxpython/gui_modules/toolbars.py	2010-08-13 08:22:39 UTC (rev 43087)
@@ -399,12 +399,10 @@
             )
     
 class GCPDisplayToolbar(AbstractToolbar):
+    """!GCP Display toolbar
     """
-    GCP Display toolbar
-    """
     def __init__(self, parent):
-        """!
-        GCP Display toolbar constructor
+        """!GCP Display toolbar constructor
         """
         AbstractToolbar.__init__(self, parent)
         
@@ -487,8 +485,8 @@
             (self.settings, 'grSettings', Icons["grSettings"].GetBitmap(), 
              wx.ITEM_NORMAL, Icons["grSettings"].GetLabel(), Icons["grSettings"].GetDesc(),
              self.parent.OnSettings),
-            (self.helpid, 'grHelp', wx.ArtProvider.GetBitmap(id=wx.ART_HELP, client=wx.ART_TOOLBAR, size=globalvar.toolbarSize), 
-             wx.ITEM_NORMAL, _('Show Help'), _('Show Help for GCP Manager'),
+            (self.helpid, 'grHelp', Icons["grHelp"].GetBitmap(),
+             wx.ITEM_NORMAL, Icons["grHelp"].GetLabel(), Icons["grHelp"].GetDesc(),
              self.parent.OnHelp),
             ("", "", "", "", "", "", ""),
             (self.quit, 'grGcpQuit', Icons["grGcpQuit"].GetBitmap(), 
@@ -497,12 +495,10 @@
             )
     
 class GRToolbar(AbstractToolbar):
+    """!Georectification toolbar
     """
-    Georectification toolbar
-    """
     def __init__(self, parent, mapcontent):
-        """!
-        Georectification toolbar constructor
+        """!Georectification toolbar constructor
 
         @param parent reference to MapFrame
         @param mapcontent reference to render.Map (registred by MapFrame)
@@ -574,8 +570,8 @@
             event.Skip()
         
 class GCPToolbar(AbstractToolbar):
-    """!
-    Toolbar for managing ground control points during georectification
+    """!Toolbar for managing ground control points during
+    georectification
 
     @param parent reference to GCP widget
     """

Modified: grass/trunk/gui/wxpython/icons/icon.py
===================================================================
--- grass/trunk/gui/wxpython/icons/icon.py	2010-08-13 08:17:23 UTC (rev 43086)
+++ grass/trunk/gui/wxpython/icons/icon.py	2010-08-13 08:22:39 UTC (rev 43087)
@@ -334,6 +334,9 @@
     "grSettings": MetaIcon (img=Icons["settings"],
                             label=_("Settings"),
                             desc=_("Settings dialog for georectification tool")),
+    "grHelp": MetaIcon (img=Icons["help"],
+                        label=_('Show help'),
+                        desc = _('Show help for GCP Manager')),
     # nviz
     "nvizView": MetaIcon (img=Icons["nvizView"],
                           label=_("Switch to view control page")),