wxGUI: layer manager toolbar moved to toolbar.py

settings icon added to the toolbar


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

gui/wxpython/gui_modules/toolbars.py

@@ -13,7 +13,8 @@ Classes:
  - NvizToolbar
  - ModelToolbar
  - HistogramToolbar
- 
+ - LayerManagerToolbar
+
 (C) 2007-2010 by the GRASS Development Team
 This program is free software under the GNU General Public License
 (>=v2). Read the file COPYING that comes with GRASS for details.
@@ -1450,7 +1451,7 @@ class ModelToolbar(AbstractToolbar):
             )
 
 class HistogramToolbar(AbstractToolbar):
-    """!Histogram modeler toolbar (see histogram.py)
+    """!Histogram toolbar (see histogram.py)
     """
     def __init__(self, parent):
         AbstractToolbar.__init__(self, parent)
@@ -1496,4 +1497,82 @@ class HistogramToolbar(AbstractToolbar):
              wx.ITEM_NORMAL, Icons["quit"].GetLabel(), Icons["quit"].GetDesc(),
              self.parent.OnQuit)
             )
+
+class LayerManagerToolbar(AbstractToolbar):
+    """!Layer Manager 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.newdisplay = wx.NewId()
+        self.workspaceLoad = wx.NewId()
+        self.workspaceOpen = wx.NewId()
+        self.workspaceSave = wx.NewId()
+        self.addrast = wx.NewId()
+        self.addshaded = wx.NewId()
+        self.addvect = wx.NewId()
+        self.addthematic = wx.NewId()
+        self.addcmd = wx.NewId()
+        self.addgrp = wx.NewId()
+        self.addovl = wx.NewId()
+        self.delcmd = wx.NewId()
+        self.attribute = wx.NewId()
+        self.preferences = wx.NewId()
+        
+        # tool, label, bitmap, kind, shortHelp, longHelp, handler
+        return (
+            (self.newdisplay, 'newdisplay', Icons["newdisplay"].GetBitmap(),
+             wx.ITEM_NORMAL, Icons["newdisplay"].GetLabel(), Icons["newdisplay"].GetDesc(),
+             self.parent.OnNewDisplay),
+            ('', '', '', '', '', '', ''),
+            (self.workspaceLoad, 'workspaceLoad', Icons["workspaceLoad"].GetBitmap(),
+             wx.ITEM_NORMAL, Icons["workspaceLoad"].GetLabel(), Icons["workspaceLoad"].GetDesc(),
+             self.parent.OnWorkspace),
+            (self.workspaceOpen, 'workspaceOpen', Icons["workspaceOpen"].GetBitmap(),
+             wx.ITEM_NORMAL, Icons["workspaceOpen"].GetLabel(), Icons["workspaceOpen"].GetDesc(),
+             self.parent.OnWorkspaceOpen),
+            (self.workspaceSave, 'workspaceSave', Icons["workspaceSave"].GetBitmap(),
+             wx.ITEM_NORMAL, Icons["workspaceSave"].GetLabel(), Icons["workspaceSave"].GetDesc(),
+             self.parent.OnWorkspaceSave),
+            ('', '', '', '', '', '', ''),
+            (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.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.parent.OnAddVectorMisc),
+            (self.addcmd, 'addcmd',  Icons["addcmd"].GetBitmap(),
+             wx.ITEM_NORMAL, Icons["addcmd"].GetLabel(), Icons["addcmd"].GetDesc(),
+             self.parent.OnAddCommand),
+            (self.addgrp, 'addgrp',  Icons["addgrp"].GetBitmap(),
+             wx.ITEM_NORMAL, Icons["addgrp"].GetLabel(), Icons["addgrp"].GetDesc(),
+             self.parent.OnAddGroup),
+            (self.addovl, 'addovl',  Icons["addovl"].GetBitmap(),
+             wx.ITEM_NORMAL, Icons["addovl"].GetLabel(), Icons["addovl"].GetDesc(),
+             self.parent.OnAddOverlay),
+            (self.delcmd, 'delcmd',  Icons["delcmd"].GetBitmap(),
+             wx.ITEM_NORMAL, Icons["delcmd"].GetLabel(), Icons["delcmd"].GetDesc(),
+             self.parent.OnDeleteLayer),
+            ('', '', '', '', '', '', ''),
+            (self.attribute, 'attrtable', Icons["attrtable"].GetBitmap(),
+             wx.ITEM_NORMAL, Icons["attrtable"].GetLabel(), Icons["attrtable"].GetDesc(),
+             self.parent.OnShowAttributeTable),
+            ('', '', '', '', '', '', ''),
+            (self.preferences, 'preferences', Icons["settings"].GetBitmap(),
+             wx.ITEM_NORMAL, Icons["settings"].GetLabel(), Icons["settings"].GetDesc(),
+             self.parent.OnPreferences)
+            )
     

gui/wxpython/icons/grass2_icons.py

@@ -60,7 +60,6 @@ IconsGrass2 = {
     "digDispAttr" : 'attributes-display.png',
     ## general
     "digUndo" : 'undo.png',
-    "digSettings" : 'settings.png',
     "digAdditionalTools" : 'tools.png',
     # layer manager
     "newdisplay" : 'monitor-create.png',
@@ -89,7 +88,6 @@ IconsGrass2 = {
     # profile analysis
     "transect"     : 'layer-raster-profile.png',
     "profiledraw"  : 'show.png',
-    "profileopt"   : 'settings.png',
     "datasave"     : 'save.png',
     # georectify
     "grGcpSet"     : 'gcp-create.png',
@@ -101,9 +99,6 @@ IconsGrass2 = {
     "grGcpAdd"     : 'gcp-add.png',
     "grGcpDelete"  : 'gcp-delete.png',
     "grGcpReload"  : 'reload.png',
-    "grSettings"   : 'settings.png',
-    # nviz
-    "nvizSettings"   : 'settings.png',
     # modeler
     "modelActionAdd" : 'module-add.png',
     "modelDataAdd"   : 'data-add.png',
@@ -112,6 +107,7 @@ IconsGrass2 = {
     "modelValidate"  : 'check.png',
     "imageSave"      : 'image-export.png',
     "pythonSave"     : 'python-export.png',
-    "modelSettings"  : 'settings.png',
     "modelProperties" : 'options.png',
+    # various
+    "settings"       : 'settings.png',
     }

gui/wxpython/icons/grass_icons.py

@@ -48,7 +48,6 @@ IconsGrass = {
     "digDispAttr" : 'display.attributes.gif',
     ## general
     "digUndo" : wx.ART_ERROR, # FIXME
-    "digSettings" : 'settings.gif',
     "digAdditionalTools" : wx.ART_ERROR, # FIXME
     # layer manager
     "newdisplay" : 'gui-startmon.gif',
@@ -90,7 +89,6 @@ IconsGrass = {
     "profile"    : 'gui-profile.gif',
     "transect"   : 'gui-profiledefine.gif',
     "datasave"   : 'file-save.gif',
-    # "profiledraw": 'gui-profiledraw.gif',
     "profiledraw" : 'gui-display.gif',
     "profileopt" : 'gui-profileopt.gif',
     # georectify
@@ -103,9 +101,6 @@ IconsGrass = {
     "grGcpAdd"     : wx.ART_NEW, # FIXME
     "grGcpDelete"  : wx.ART_DELETE, # FIXME
     "grGcpReload"  : 'gui-redraw.gif',
-    "grSettings"   : 'edit-color.gif', 
-    # nviz 
-    "nvizSettings" : 'edit-color.gif',
     # modeler
     "modelActionAdd" : wx.ART_ERROR,
     "modelDataAdd"   : wx.ART_ERROR,
@@ -114,6 +109,7 @@ IconsGrass = {
     "modelValidate"  : wx.ART_ERROR,
     "imageSave"      : wx.ART_ERROR,
     "pythonSave"     : wx.ART_ERROR,
-    "modelSettings"  : wx.ART_ERROR,
     "modelProperties" : wx.ART_ERROR,
+    # various
+    "settings"       : 'edit-color.gif',
     }

gui/wxpython/icons/icon.py

@@ -228,6 +228,8 @@ Icons = {
                              label=_("Add text layer")),
     "addrast3d"  : MetaIcon (img=Icons["addrast3d"],
                              label=_("Add 3D raster map")),
+    "settings"   : MetaIcon (img=Icons["settings"],
+                             label=_("Show GUI settings")),
     # digit
     "digAddPoint": MetaIcon (img=Icons["digAddPoint"],
                              label=_("Digitize new point"),
@@ -268,7 +270,7 @@ Icons = {
     "digRemoveVertex": MetaIcon (img=Icons["digRemoveVertex"],
                                  label=_("Remove vertex"),
                                  desc=_("Left: Select; Middle: Unselect; Right: Confirm")),
-    "digSettings": MetaIcon (img=Icons["digSettings"],
+    "digSettings": MetaIcon (img=Icons["settings"],
                              label=_("Settings"),
                              desc=_("Settings dialog for digitization tool")),
     "digSplitLine": MetaIcon (img=Icons["digSplitLine"],
@@ -294,7 +296,7 @@ Icons = {
                              label=_("Profile surface map")),
     "profiledraw": MetaIcon (img=Icons["profiledraw"],
                              label=_("Draw/re-draw profile")),
-    "profileopt" : MetaIcon (img=Icons["profileopt"],
+    "profileopt" : MetaIcon (img=Icons["settings"],
                              label=_("Profile options")),
     "datasave"   : MetaIcon (img=Icons["datasave"],
                              label=_("Save profile data to csv file")),
@@ -330,11 +332,11 @@ Icons = {
                               label=_("Reload GCPs from selected POINTS file")),
     'grGcpQuit' : MetaIcon (img=Icons["quit"],
                             label=_("Quit georectification module")),
-    "grSettings": MetaIcon (img=Icons["grSettings"],
+    "grSettings": MetaIcon (img=Icons["settings"],
                             label=_("Settings"),
                             desc=_("Settings dialog for georectification tool")),
     # nviz
-    "nvizSettings": MetaIcon (img=Icons["nvizSettings"],
+    "nvizSettings": MetaIcon (img=Icons["settings"],
                               label=_("3D view mode tools"),
                               desc=_("Show/hide 3D view mode tools dialog")),
     "nvizQuit": MetaIcon (img=Icons["quit"],
@@ -361,7 +363,7 @@ Icons = {
                            label=_("Run entire model")),
     "modelValidate" : MetaIcon (img=Icons["modelValidate"],
                                 label=_("Validate entire model")),
-    "modelSettings" : MetaIcon (img=Icons["modelSettings"],
+    "modelSettings" : MetaIcon (img=Icons["settings"],
                                 label=_("Show modeler settings")),
     "modelProperties" : MetaIcon (img=Icons["modelProperties"],
                                   label=_("Show model properties")),

gui/wxpython/icons/silk_icons.py

@@ -63,7 +63,6 @@ IconsSilk = {
     "digDispAttr" : 'table.png',
     ## general
     "digUndo" : 'arrow_undo.png',
-    "digSettings" : 'color_swatch.png',
     "digAdditionalTools" : 'plugin.png',
     # layer manager
     "newdisplay" : 'application_add.png',
@@ -104,9 +103,6 @@ IconsSilk = {
     "grGcpAdd"     : 'bullet_add.png', 
     "grGcpDelete"  : 'bullet_delete.png',
     "grGcpReload"  : 'arrow_refresh.png',
-    "grSettings"   : 'color_swatch.png',
-    # nviz
-    "nvizSettings"   : 'color_swatch.png',
     # modeler
     "modelActionAdd" : wx.ART_ERROR,
     "modelDataAdd"   : wx.ART_ERROR,
@@ -115,6 +111,7 @@ IconsSilk = {
     "modelValidate"  : wx.ART_ERROR,
     "imageSave"      : wx.ART_ERROR,
     "pythonSave"     : wx.ART_ERROR,
-    "modelSettings"  : wx.ART_ERROR,
     "modelProperties" : wx.ART_ERROR,
+    # various
+    "settings"     : 'color_swatch.png',
     }

gui/wxpython/wxgui.py

@@ -39,16 +39,7 @@ import gettext
 gettext.install('grasswxpy', os.path.join(os.getenv("GISBASE"), 'locale'), unicode=True)
 
 import gui_modules
-gmpath = gui_modules.__path__[0]
-sys.path.append(gmpath)
-
-import images
-imagepath = images.__path__[0]
-sys.path.append(imagepath)
-
-import icons
-gmpath = icons.__path__[0]
-sys.path.append(gmpath)
+sys.path.append(gui_modules.__path__[0])
 
 import gui_modules.globalvar as globalvar
 if not os.getenv("GRASS_WXBUNDLED"):
@@ -65,8 +56,7 @@ except ImportError:
     import wx.lib.customtreectrl as CT
 import wx.lib.flatnotebook as FN
 
-grassPath = os.path.join(globalvar.ETCDIR, "python")
-sys.path.append(grassPath)
+sys.path.append(os.path.join(globalvar.ETCDIR, "python"))
 from grass.script import core as grass
 
 import gui_modules.utils as utils
@@ -95,6 +85,7 @@ from   gui_modules.debug import Debug
 from   gui_modules.ghelp import MenuTreeWindow
 from   gui_modules.ghelp import AboutWindow
 from   gui_modules.ghelp import InstallExtensionWindow
+from   gui_modules.toolbars import LayerManagerToolbar
 from   icons.icon import Icons
 
 UserSettings = preferences.globalSettings
@@ -138,7 +129,8 @@ class GMFrame(wx.Frame):
         self.menucmd = self.menubar.GetCmd()
         self.statusbar = self.CreateStatusBar(number=1)
         self.notebook  = self.__createNoteBook()
-        self.toolbar   = self.__createToolBar()
+        self.toolbar = LayerManagerToolbar(parent = self)
+        self.SetToolBar(self.toolbar)
         
         # bindings
         self.Bind(wx.EVT_CLOSE,    self.OnCloseWindow)
@@ -228,19 +220,7 @@ class GMFrame(wx.Frame):
         self.gm_cb.Bind(FN.EVT_FLATNOTEBOOK_PAGE_CLOSING, self.OnCBPageClosed)
         
         return self.notebook
-
-    def __createToolBar(self):
-        """!Creates toolbar"""
-
-        self.toolbar = self.CreateToolBar()
-        self.toolbar.SetToolBitmapSize(globalvar.toolbarSize)
-
-        for each in self.ToolbarData():
-            self.AddToolbarButton(self.toolbar, *each)
-        self.toolbar.Realize()
-
-        return self.toolbar
-
+    
     def WorkspaceChanged(self):
         """!Update window title"""
         if not self.workspaceChanged:
@@ -992,50 +972,7 @@ class GMFrame(wx.Frame):
         win = vclean.VectorCleaningFrame(parent = self, cmd = cmd[0])
         win.CentreOnScreen()
         win.Show()
-
-    def AddToolbarButton(self, toolbar, label, icon, help, handler):
-        """!Adds button to the given toolbar"""
-
-        if not label:
-            toolbar.AddSeparator()
-            return
-        tool = toolbar.AddLabelTool(id=wx.ID_ANY, label=label, bitmap=icon, shortHelp=help)
-        self.Bind(wx.EVT_TOOL, handler, tool)
-
-    def ToolbarData(self):
-
-        return   (
-                 ('newdisplay', Icons["newdisplay"].GetBitmap(),
-                  Icons["newdisplay"].GetLabel(), self.OnNewDisplay),
-                 ('', '', '', ''),
-                 ('workspaceLoad', Icons["workspaceLoad"].GetBitmap(),
-                  Icons["workspaceLoad"].GetLabel(), self.OnWorkspace),
-                 ('workspaceOpen', Icons["workspaceOpen"].GetBitmap(),
-                  Icons["workspaceOpen"].GetLabel(), self.OnWorkspaceOpen),
-                 ('workspaceSave', Icons["workspaceSave"].GetBitmap(),
-                  Icons["workspaceSave"].GetLabel(), self.OnWorkspaceSave),
-                 ('', '', '', ''),
-                 ('addrast', Icons["addrast"].GetBitmap(),
-                  Icons["addrast"].GetLabel(), self.OnAddRaster),
-                 ('addshaded', Icons["addshaded"].GetBitmap(),
-                  _("Add various raster-based map layers"), self.OnAddRasterMisc),
-                 ('addvect', Icons["addvect"].GetBitmap(),
-                  Icons["addvect"].GetLabel(), self.OnAddVector),
-                 ('addthematic', Icons["addthematic"].GetBitmap(),
-                  _("Add various vector-based map layers"), self.OnAddVectorMisc),
-                 ('addcmd',  Icons["addcmd"].GetBitmap(),
-                  Icons["addcmd"].GetLabel(),  self.OnAddCommand),
-                 ('addgrp',  Icons["addgrp"].GetBitmap(),
-                  Icons["addgrp"].GetLabel(), self.OnAddGroup),
-                 ('addovl',  Icons["addovl"].GetBitmap(),
-                  Icons["addovl"].GetLabel(), self.OnAddOverlay),
-                 ('delcmd',  Icons["delcmd"].GetBitmap(),
-                  Icons["delcmd"].GetLabel(), self.OnDeleteLayer),
-                 ('', '', '', ''),
-                 ('attrtable', Icons["attrtable"].GetBitmap(),
-                  Icons["attrtable"].GetLabel(), self.OnShowAttributeTable)
-                  )
-
+        
     def OnImportDxfFile(self, event):
         """!Convert multiple DXF layers to GRASS vector map layers"""
         dlg = gdialogs.DxfImportDialog(parent=self)