浏览代码

wxGUI: hide 'digitize' tool if vdigit is not available

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@36984 15284696-431f-4ddb-bdfa-cd5b030d7da7
Martin Landa 16 年之前
父节点
当前提交
30444310d7

+ 4 - 1
gui/wxpython/gui_modules/toolbars.py

@@ -32,6 +32,7 @@ import gcmd
 import gdialogs
 import gdialogs
 import vdigit
 import vdigit
 from vdigit import VDigitSettingsDialog as VDigitSettingsDialog
 from vdigit import VDigitSettingsDialog as VDigitSettingsDialog
+from vdigit import hasVDigit
 from debug import Debug as Debug
 from debug import Debug as Debug
 from icon import Icons as Icons
 from icon import Icons as Icons
 from preferences import globalSettings as UserSettings
 from preferences import globalSettings as UserSettings
@@ -161,8 +162,10 @@ class MapToolbar(AbstractToolbar):
         
         
         # optional tools
         # optional tools
         self.combo = wx.ComboBox(parent=self.toolbar, id=wx.ID_ANY, value=_('2D view'),
         self.combo = wx.ComboBox(parent=self.toolbar, id=wx.ID_ANY, value=_('2D view'),
-                                 choices=[_('2D view'), _('3D view'), _('Digitize')], 
+                                 choices=[_('2D view'), _('3D view')], 
                                  style=wx.CB_READONLY, size=(90, -1))
                                  style=wx.CB_READONLY, size=(90, -1))
+        if hasVDigit:
+            self.combo.Append(_('Digitize'))
         
         
         self.comboid = self.toolbar.AddControl(self.combo)
         self.comboid = self.toolbar.AddControl(self.combo)
         self.mapdisplay.Bind(wx.EVT_COMBOBOX, self.OnSelectTool, self.comboid)
         self.mapdisplay.Bind(wx.EVT_COMBOBOX, self.OnSelectTool, self.comboid)

+ 2 - 0
gui/wxpython/gui_modules/vdigit.py

@@ -54,8 +54,10 @@ try:
     import grass7_wxvdigit as wxvdigit
     import grass7_wxvdigit as wxvdigit
     GV_LINES = wxvdigit.GV_LINES
     GV_LINES = wxvdigit.GV_LINES
     PseudoDC = wxvdigit.PseudoDC
     PseudoDC = wxvdigit.PseudoDC
+    hasVDigit = True
     digitErr = ''
     digitErr = ''
 except ImportError, err:
 except ImportError, err:
+    hasVDigit = False
     GV_LINES = None
     GV_LINES = None
     PseudoDC = wx.PseudoDC
     PseudoDC = wx.PseudoDC
     digitErr = err
     digitErr = err

+ 1 - 0
gui/wxpython/gui_modules/wxgui_utils.py

@@ -289,6 +289,7 @@ class LayerTree(treemixin.DragAndDrop, CT.CustomTreeCtrl):
             self.Bind (wx.EVT_MENU, self.lmgr.OnShowAttributeTable, id=self.popupID4)
             self.Bind (wx.EVT_MENU, self.lmgr.OnShowAttributeTable, id=self.popupID4)
 
 
             self.popupMenu.Append(self.popupID5, text=_("Start editing"))
             self.popupMenu.Append(self.popupID5, text=_("Start editing"))
+            self.popupMenu.Enable(self.popupID5, False)
             self.popupMenu.Append(self.popupID6, text=_("Stop editing"))
             self.popupMenu.Append(self.popupID6, text=_("Stop editing"))
             self.popupMenu.Enable(self.popupID6, False)
             self.popupMenu.Enable(self.popupID6, False)
             self.Bind (wx.EVT_MENU, self.OnStartEditing, id=self.popupID5)
             self.Bind (wx.EVT_MENU, self.OnStartEditing, id=self.popupID5)