wxGUI: Tools Toolbar introduced

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@46248 15284696-431f-4ddb-bdfa-cd5b030d7da7

gui/wxpython/gui_modules/mapdisp.py

@@ -127,7 +127,6 @@ class MapFrame(wx.Frame):
         #
         # Fancy gui
         #
-        # self._mgr = auimgr
         self._mgr = wx.aui.AuiManager(self)
 
         #
@@ -341,7 +340,7 @@ class MapFrame(wx.Frame):
                           Layer(0))
         self._mgr.AddPane(self.toolbars['vdigit'],
                           wx.aui.AuiPaneInfo().
-                          Name("vdigittoolbar").Caption(_("Vector digitizer toolbar")).
+                          Name("vdigittoolbar").Caption(_("Vector Digitizer Toolbar")).
                           ToolbarPane().Top().Row(1).
                           LeftDockable(False).RightDockable(False).
                           BottomDockable(False).TopDockable(True).
@@ -412,7 +411,7 @@ class MapFrame(wx.Frame):
                           Layer(0))
         self._mgr.AddPane(self.toolbars['nviz'],
                               wx.aui.AuiPaneInfo().
-                          Name("nviztoolbar").Caption(_("3D view toolbar")).
+                          Name("nviztoolbar").Caption(_("3D View Toolbar")).
                           ToolbarPane().Top().Row(1).
                           LeftDockable(False).RightDockable(False).
                           BottomDockable(False).TopDockable(True).
@@ -436,7 +435,7 @@ class MapFrame(wx.Frame):
             
             self._mgr.AddPane(self.toolbars['map'],
                               wx.aui.AuiPaneInfo().
-                              Name("maptoolbar").Caption(_("Map toolbar")).
+                              Name("maptoolbar").Caption(_("Map Toolbar")).
                               ToolbarPane().Top().
                               LeftDockable(False).RightDockable(False).
                               BottomDockable(False).TopDockable(True).
@@ -453,7 +452,7 @@ class MapFrame(wx.Frame):
             
             self._mgr.AddPane(self.toolbars['georect'],
                               wx.aui.AuiPaneInfo().
-                              Name("georecttoolbar").Caption(_("Georectification toolbar")).
+                              Name("georecttoolbar").Caption(_("Georectification Toolbar")).
                               ToolbarPane().Top().
                               LeftDockable(False).RightDockable(False).
                               BottomDockable(False).TopDockable(True).

gui/wxpython/gui_modules/toolbars.py

@@ -14,6 +14,7 @@ Classes:
  - ModelToolbar
  - HistogramToolbar
  - LayerManagerToolbar
+ - ToolsToolbar
 
 (C) 2007-2011 by the GRASS Development Team
 This program is free software under the GNU General Public License
@@ -1579,28 +1580,68 @@ class LayerManagerToolbar(AbstractToolbar):
         self.addovl = wx.NewId()
         self.delcmd = wx.NewId()
         self.attribute = wx.NewId()
-        self.vdigit = wx.NewId()
         self.preferences = wx.NewId()
-        self.modeler = wx.NewId() 
         
         icons = Icons['layerManager']
-        return self._getToolbarData(((self.newdisplay, 'newdisplay', icons["newdisplay"], self.parent.OnNewMenu),
+        return self._getToolbarData(((self.newdisplay, 'newdisplay', icons["newdisplay"],
+                                      self.parent.OnNewMenu),
                                      (None, ),
-                                     (self.workspaceLoad, 'workspaceLoad', icons["workspaceLoad"], self.parent.OnLoadMenu),
-                                     (self.workspaceOpen, 'workspaceOpen', icons["workspaceOpen"], self.parent.OnWorkspaceOpen),
-                                     (self.workspaceSave, 'workspaceSave', icons["workspaceSave"], self.parent.OnWorkspaceSave),
+                                     (self.workspaceLoad, 'workspaceLoad', icons["workspaceLoad"],
+                                      self.parent.OnLoadMenu),
+                                     (self.workspaceOpen, 'workspaceOpen', icons["workspaceOpen"],
+                                      self.parent.OnWorkspaceOpen),
+                                     (self.workspaceSave, 'workspaceSave', icons["workspaceSave"],
+                                      self.parent.OnWorkspaceSave),
                                      (None, ),
-                                     (self.addrast, 'addRast', icons["addRast"], self.parent.OnAddRaster),
-                                     (self.rastmisc, 'rastMisc', icons["rastMisc"], self.parent.OnAddRasterMisc),
-                                     (self.addvect, 'addVect', icons["addVect"], self.parent.OnAddVector),
-                                     (self.vectmisc, 'vectMisc', icons["vectMisc"], self.parent.OnAddVectorMisc),
-                                     (self.addgrp, 'addGroup',  icons["addGroup"], self.parent.OnAddGroup),
-                                     (self.addovl, 'addOverlay',  icons["addOverlay"], self.parent.OnAddOverlay),
-                                     (self.delcmd, 'delCmd',  icons["delCmd"], self.parent.OnDeleteLayer),
+                                     (self.addrast, 'addRast', icons["addRast"],
+                                      self.parent.OnAddRaster),
+                                     (self.rastmisc, 'rastMisc', icons["rastMisc"],
+                                      self.parent.OnAddRasterMisc),
+                                     (self.addvect, 'addVect', icons["addVect"],
+                                      self.parent.OnAddVector),
+                                     (self.vectmisc, 'vectMisc', icons["vectMisc"],
+                                      self.parent.OnAddVectorMisc),
+                                     (self.addgrp, 'addGroup',  icons["addGroup"],
+                                      self.parent.OnAddGroup),
+                                     (self.addovl, 'addOverlay',  icons["addOverlay"],
+                                      self.parent.OnAddOverlay),
+                                     (self.delcmd, 'delCmd',  icons["delCmd"],
+                                      self.parent.OnDeleteLayer),
                                      (None, ),
-                                     (self.vdigit, 'vdigit', icons["vdigit"], self.parent.OnVDigit),
-                                     (self.attribute, 'attrTable', icons["attrTable"], self.parent.OnShowAttributeTable),
+                                     (self.attribute, 'attrTable', icons["attrTable"],
+                                      self.parent.OnShowAttributeTable),
                                      (None, ),
-                                     (self.modeler, 'modeler', icons["modeler"], self.parent.OnGModeler),
-                                     (self.preferences, 'preferences', icons["settings"], self.parent.OnPreferences))
-                                    )
+                                     (self.preferences, 'preferences', icons["settings"],
+                                      self.parent.OnPreferences)
+                                     ))
+
+class ToolsToolbar(AbstractToolbar):
+    """!Layer Manager Tools toolbar (see wxgui.py)
+    """
+    def __init__(self, parent):
+        AbstractToolbar.__init__(self, parent)
+        
+        self.InitToolbar(self._toolbarData())
+        
+        # realize the toolbar
+        self.Realize()
+
+    def _toolbarData(self):
+        """!Toolbar data
+        """
+        self.georect = wx.NewId()
+        self.modeler = wx.NewId() 
+        self.vdigit = wx.NewId()
+        self.mapOutput = wx.NewId()
+        
+        icons = Icons['layerManager']
+        return self._getToolbarData(((self.vdigit, 'vdigit', icons["vdigit"],
+                                      self.parent.OnVDigit),
+                                     (self.georect, 'georectify', Icons["georectify"]["georectify"],
+                                      self.parent.OnGCPManager),
+                                     (self.modeler, 'modeler', icons["modeler"],
+                                      self.parent.OnGModeler),
+                                     (self.mapOutput, 'mapOutput', icons['mapOutput'],
+                                      self.parent.OnPsMap)
+                                     ))
+    

gui/wxpython/icons/icon.py

@@ -230,9 +230,11 @@ Icons = {
         'settings'   : MetaIcon(img = iconSet.get('settings', wx.ART_ERROR),
                                 label = _('Show GUI settings')),
         'modeler'    : MetaIcon(img = iconSet.get('modeler-main', wx.ART_ERROR),
-                                label = _('Start Graphical Modeler')),
-        "layerOptions"  : MetaIcon(img = iconSet.get('options', wx.ART_ERROR),
+                                label = _('Graphical Modeler')),
+        'layerOptions'  : MetaIcon(img = iconSet.get('options', wx.ART_ERROR),
                                    label = _('Set options')),
+        'mapOutput' : MetaIcon(img = iconSet.get('print-compose', wx.ART_ERROR),
+                               label = _('Hardcopy Map Ouput Utility')),
         },
     'vdigit' : {
         'addPoint'        : MetaIcon(img = iconSet.get('point-create', wx.ART_ERROR),

gui/wxpython/wxgui.py

@@ -82,7 +82,7 @@ from gui_modules import vclean
 from gui_modules import nviz_tools
 from gui_modules.debug import Debug
 from gui_modules.ghelp import MenuTreeWindow, AboutWindow, InstallExtensionWindow
-from gui_modules.toolbars import LayerManagerToolbar
+from gui_modules.toolbars import LayerManagerToolbar, ToolsToolbar
 from icons.icon import Icons
 
 UserSettings = preferences.globalSettings
@@ -128,8 +128,26 @@ class GMFrame(wx.Frame):
         self.menucmd = self.menubar.GetCmd()
         self.statusbar = self.CreateStatusBar(number=1)
         self.notebook  = self.__createNoteBook()
-        self.toolbar = LayerManagerToolbar(parent = self)
-        self.SetToolBar(self.toolbar)
+        self.toolbars = { 'main'  : LayerManagerToolbar(parent = self),
+                          'tools' : ToolsToolbar(parent = self) }
+        
+        # self.SetToolBar(self.toolbar)
+        self._auimgr.AddPane(self.toolbars['main'],
+                             wx.aui.AuiPaneInfo().
+                             Name("toolbar").Caption(_("Main Toolbar")).
+                             ToolbarPane().Top().
+                             LeftDockable(False).RightDockable(False).
+                             BottomDockable(False).TopDockable(True).
+                             CloseButton(False).Layer(3).
+                             BestSize((self.toolbars['main'].GetSize())))
+        self._auimgr.AddPane(self.toolbars['tools'],
+                             wx.aui.AuiPaneInfo().
+                             Name("toolbar").Caption(_("Tools Toolbar")).
+                             ToolbarPane().Top().
+                             LeftDockable(False).RightDockable(False).
+                             BottomDockable(False).TopDockable(True).
+                             CloseButton(False).Layer(2).
+                             BestSize((self.toolbars['tools'].GetSize())))
         
         # bindings
         self.Bind(wx.EVT_CLOSE,    self.OnCloseWindow)