wxGUI: use [r|v].import for simplified import with wizard and r.in.gdal|v.in.ogr for standard import

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

gui/wxpython/lmgr/frame.py

@@ -326,9 +326,9 @@ class GMFrame(wx.Frame):
         # create 'command output' text area
         self._gconsole = GConsole(
             guiparent=self, giface=self._giface,
-            ignoredCmdPattern='^d\..*|^r[3]?\.mapcalc$|^i.group$|^r.in.gdal$|'
+            ignoredCmdPattern='^d\..*|^r[3]?\.mapcalc$|^i.group$|^r.import$|'
             '^r.external$|^r.external.out$|'
-            '^v.in.ogr$|^v.external$|^v.external.out$|'
+            '^v.import$|^v.external$|^v.external.out$|'
             '^cd$|^cd .*')
         self.goutput = GConsoleWindow(
             parent=self.notebook,
@@ -715,13 +715,13 @@ class GMFrame(wx.Frame):
             self.OnMapCalculator(event=None, cmd=command)
         elif command[0] == 'i.group':
             self.OnEditImageryGroups(event=None, cmd=command)
-        elif command[0] == 'r.in.gdal':
+        elif command[0] == 'r.import':
             self.OnImportGdalLayers(event=None, cmd=command)
         elif command[0] == 'r.external':
             self.OnLinkGdalLayers(event=None, cmd=command)
         elif command[0] == 'r.external.out':
             self.OnRasterOutputFormat(event=None)
-        elif command[0] == 'v.in.ogr':
+        elif command[0] == 'v.import':
             self.OnImportOgrLayers(event=None, cmd=command)
         elif command[0] == 'v.external':
             self.OnLinkOgrLayers(event=None, cmd=command)

gui/wxpython/xml/toolboxes.xml

@@ -252,9 +252,9 @@
   <toolbox name="ImportRasterData">
     <label>Import raster data</label>
     <items>
-      <wxgui-item name="CommonFormatsImport"/>
-      <module-item name="r.import">
-        <label>Import of common formats with reprojection</label>
+      <wxgui-item name="CommonRasterFormats"/>
+      <module-item name="r.in.gdal">
+        <label>Import of common raster formats</label>
       </module-item>
       <separator/>
       <module-item name="r.in.xyz">
@@ -304,9 +304,9 @@
   <toolbox name="ImportVectorData">
     <label>Import vector data</label>
     <items>
-      <wxgui-item name="CommonImportFormats"/>
-      <module-item name="v.import">
-        <label>Import of common formats with reprojection</label>
+      <wxgui-item name="CommonVectorFormats"/>
+      <module-item name="v.in.ogr">
+        <label>Import of common vector formats</label>
       </module-item>
       <separator/>
       <module-item name="v.in.ascii">

gui/wxpython/xml/wxgui_items.xml

@@ -211,17 +211,17 @@
     <handler>OnDisplayCloseAll</handler>
     <description>Close all open map display windows</description>
   </wxgui-item>
-  <wxgui-item name="CommonFormatsImport">
-    <label>Common formats import</label>
+  <wxgui-item name="CommonRasterFormats">
+    <label>Simplified raster import with reprojection</label>
     <handler>OnImportGdalLayers</handler>
-    <related-module>r.in.gdal</related-module>
+    <related-module>r.import</related-module>
     <description>Imports raster data into a GRASS raster map using GDAL library.</description>
     <keywords>raster,import</keywords>
   </wxgui-item>
-  <wxgui-item name="CommonImportFormats">
-    <label>Common import formats</label>
+  <wxgui-item name="CommonVectorFormats">
+    <label>Simplified vector import with reprojection</label>
     <handler>OnImportOgrLayers</handler>
-    <related-module>v.in.ogr</related-module>
+    <related-module>v.import</related-module>
     <description>Imports vector data into a GRASS vector map using OGR library.</description>
     <keywords>vector,import</keywords>
   </wxgui-item>