[GRASS-SVN] r46594 - in grass/branches/develbranch_6/gui/wxpython: . gui_modules icons

[svn_grass at osgeo.org]

Author: martinl
Date: 2011-06-07 11:10:26 -0700 (Tue, 07 Jun 2011)
New Revision: 46594

Modified:
   grass/branches/develbranch_6/gui/wxpython/gui_modules/toolbars.py
   grass/branches/develbranch_6/gui/wxpython/icons/icon.py
   grass/branches/develbranch_6/gui/wxpython/wxgui.py
Log:
wxGUI: no menu in workspace toolbar
       (merge r46593 from trunk)


Modified: grass/branches/develbranch_6/gui/wxpython/gui_modules/toolbars.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/gui_modules/toolbars.py	2011-06-07 18:07:46 UTC (rev 46593)
+++ grass/branches/develbranch_6/gui/wxpython/gui_modules/toolbars.py	2011-06-07 18:10:26 UTC (rev 46594)
@@ -1581,13 +1581,16 @@
         """!Toolbar data
         """
         self.newdisplay = wx.NewId()
+        self.workspaceNew = wx.NewId()
         self.workspaceOpen = wx.NewId()
         self.workspaceSave = wx.NewId()
         
         icons = Icons['layerManager']
         return self._getToolbarData(((self.newdisplay, 'newdisplay', icons["newdisplay"],
-                                      self.parent.OnNewMenu),
+                                      self.parent.OnNewDisplay),
                                      (None, ),
+                                     (self.workspaceNew, 'workspaceNew', icons["workspaceNew"],
+                                      self.parent.OnWorkspaceNew),
                                      (self.workspaceOpen, 'workspaceOpen', icons["workspaceOpen"],
                                       self.parent.OnWorkspaceOpen),
                                      (self.workspaceSave, 'workspaceSave', icons["workspaceSave"],

Modified: grass/branches/develbranch_6/gui/wxpython/icons/icon.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/icons/icon.py	2011-06-07 18:07:46 UTC (rev 46593)
+++ grass/branches/develbranch_6/gui/wxpython/icons/icon.py	2011-06-07 18:10:26 UTC (rev 46594)
@@ -207,7 +207,7 @@
         'addMulti'      : MetaIcon(img = iconSet.get('layer-open', wx.ART_ERROR),
                                    label = _('Add multiple raster or vector map layers (Ctrl+L)')),
         'import'        : MetaIcon(img = iconSet.get('layer-import', wx.ART_ERROR),
-                                   label = _('Import/link raster or vector data')),
+                                   label = _('Import raster or vector data')),
         'rastImport' : MetaIcon(img = iconSet.get('layer-import', wx.ART_ERROR),
                                 label = _('Import raster data')),
         'rastLink'   : MetaIcon(img = iconSet.get('layer-import', wx.ART_ERROR),

Modified: grass/branches/develbranch_6/gui/wxpython/wxgui.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/wxgui.py	2011-06-07 18:07:46 UTC (rev 46593)
+++ grass/branches/develbranch_6/gui/wxpython/wxgui.py	2011-06-07 18:10:26 UTC (rev 46594)
@@ -639,12 +639,6 @@
         self.PopupMenu(menu)
         menu.Destroy()
 
-    def OnNewMenu(self, event):
-        """!New display/workspace menu
-        """
-        self._popupMenu((('newdisplay', self.OnNewDisplay),
-                         ('workspaceNew',  self.OnWorkspaceNew)))
-
     def OnImportMenu(self, event):
         """!Import maps menu (import, link)
         """