wxGUI: simplify import/link menu items

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

gui/wxpython/gui_modules/gdialogs.py

@@ -971,11 +971,16 @@ class ImportDialog(wx.Dialog):
         self.btn_cancel.SetToolTipString(_("Close dialog"))
         self.btn_cancel.Bind(wx.EVT_BUTTON, self.OnCancel)
         # run
-        self.btn_run = wx.Button(parent=self.panel, id=wx.ID_OK)
+        self.btn_run = wx.Button(parent=self.panel, id=wx.ID_OK, label = _("&Import"))
+        self.btn_run.SetToolTipString(_("Import selected layers"))
         self.btn_run.SetDefault()
         self.btn_run.Enable(False)
         self.btn_run.Bind(wx.EVT_BUTTON, self.OnRun)
-
+        # run command dialog
+        self.btn_cmd = wx.Button(parent = self.panel, id = wx.ID_ANY,
+                                 label = _("Command dialog"))
+        self.btn_cmd.Bind(wx.EVT_BUTTON, self.OnCmdDialog)
+        
     def doLayout(self):
         """!Do layout"""
         dialogSizer = wx.BoxSizer(wx.VERTICAL)
@@ -1010,7 +1015,7 @@ class ImportDialog(wx.Dialog):
         #
         btnsizer = wx.BoxSizer(orient=wx.HORIZONTAL)
         
-        btnsizer.Add(item=self.btn_cancel, proportion=0,
+        btnsizer.Add(item=self.btn_cmd, proportion=0,
                      flag=wx.ALL | wx.ALIGN_CENTER,
                      border=10)
         
@@ -1018,6 +1023,10 @@ class ImportDialog(wx.Dialog):
                      flag=wx.ALL | wx.ALIGN_CENTER,
                      border=10)
         
+        btnsizer.Add(item=self.btn_cancel, proportion=0,
+                     flag=wx.ALL | wx.ALIGN_CENTER,
+                     border=10)
+        
         dialogSizer.Add(item=btnsizer, proportion=0,
                         flag=wx.ALIGN_CENTER)
         
@@ -1041,6 +1050,10 @@ class ImportDialog(wx.Dialog):
     def OnRun(self, event):
         """!Import/Link data (each layes as separate vector map)"""
         pass
+
+    def OnCmdDialog(self, event):
+        """!Show command dialog"""
+        pass
     
     def AddLayers(self, returncode, cmd = None):
         """!Add imported/linked layers into layer tree"""
@@ -1085,6 +1098,8 @@ class GdalImportDialog(ImportDialog):
     """!Dialog for bulk import of various raster/vector data"""
     def __init__(self, parent, ogr = False, link = False):
         self.link = link
+        self.ogr  = ogr
+        
         if ogr:
             ImportDialog.__init__(self, parent, type = 'ogr')
             if link:
@@ -1114,9 +1129,17 @@ class GdalImportDialog(ImportDialog):
         if link:
             self.btn_run.SetLabel(_("&Link"))
             self.btn_run.SetToolTipString(_("Link selected layers"))
+            if ogr:
+                self.btn_cmd.SetToolTipString(_('Open %s dialog') % 'v.external')
+            else:
+                self.btn_cmd.SetToolTipString(_('Open %s dialog') % 'r.external')
         else:
             self.btn_run.SetLabel(_("&Import"))
             self.btn_run.SetToolTipString(_("Import selected layers"))
+            if ogr:
+                self.btn_cmd.SetToolTipString(_('Open %s dialog') % 'v.in.ogr')
+            else:
+                self.btn_cmd.SetToolTipString(_('Open %s dialog') % 'r.in.gdal')
         
         self.doLayout()
 
@@ -1171,6 +1194,22 @@ class GdalImportDialog(ImportDialog):
                                        onDone = self.AddLayers)
         
         self.OnCancel()
+
+    def OnCmdDialog(self, event):
+        """!Show command dialog"""
+        if self.link:
+            if self.ogr:
+                name = 'v.external'
+            else:
+                name = 'r.external'
+        else:
+            if self.ogr:
+                name = 'v.in.ogr'
+            else:
+                name = 'r.in.gdal'
+        
+        menuform.GUI().ParseCommand(cmd = [name],
+                                    parentframe = self, modal = True)
         
 class DxfImportDialog(ImportDialog):
     """!Dialog for bulk import of DXF layers""" 
@@ -1246,6 +1285,11 @@ class DxfImportDialog(ImportDialog):
             self.btn_run.Enable(True)
         else:
             self.btn_run.Enable(False)
+
+    def OnCmdDialog(self, event):
+        """!Show command dialog"""
+        menuform.GUI().ParseCommand(cmd = ['v.in.dxf'],
+                                    parentframe = self, modal = True)
         
 class LayersList(wx.ListCtrl, listmix.ListCtrlAutoWidthMixin,
                  listmix.CheckListCtrlMixin, listmix.TextEditMixin):

gui/wxpython/wxgui.py

@@ -958,26 +958,31 @@ class GMFrame(wx.Frame):
     def OnImportDxfFile(self, event):
         """!Convert multiple DXF layers to GRASS vector map layers"""
         dlg = gdialogs.DxfImportDialog(parent=self)
+        dlg.CentreOnScreen()
         dlg.ShowModal()
 
     def OnImportGdalLayers(self, event):
         """!Convert multiple GDAL layers to GRASS raster map layers"""
         dlg = gdialogs.GdalImportDialog(parent=self)
+        dlg.CentreOnScreen()
         dlg.ShowModal()
 
     def OnLinkGdalLayers(self, event):
         """!Link multiple GDAL layers to GRASS raster map layers"""
         dlg = gdialogs.GdalImportDialog(parent=self, link = True)
+        dlg.CentreOnScreen()
         dlg.ShowModal()
         
     def OnImportOgrLayers(self, event):
         """!Convert multiple OGR layers to GRASS vector map layers"""
         dlg = gdialogs.GdalImportDialog(parent=self, ogr = True)
+        dlg.CentreOnScreen()
         dlg.ShowModal()
         
     def OnLinkOgrLayers(self, event):
         """!Links multiple OGR layers to GRASS vector map layers"""
         dlg = gdialogs.GdalImportDialog(parent=self, ogr = True, link = True)
+        dlg.CentreOnScreen()
         dlg.ShowModal()
         
     def OnImportWMS(self, event):

gui/wxpython/xml/menudata.xml

@@ -57,26 +57,15 @@
 	      <label>Import raster data</label>
 	      <help>Import raster data into a GRASS map layer using GDAL.</help>
 	      <keywords>raster,import</keywords>
-	      <handler>OnMenuCmd</handler>
-	      <command>r.in.gdal</command>
-	    </menuitem>
-	    <menuitem>
-	      <label>Bulk import of raster data</label>
-	      <help>Converts multiple GDAL supported layers to GRASS raster maps.</help>
 	      <handler>OnImportGdalLayers</handler>
+	      <command>r.in.gdal</command>
 	    </menuitem>
-	    <separator />
 	    <menuitem>
 	      <label>Link raster data</label>
 	      <help>Link GDAL supported raster data as a pseudo GRASS raster map layer.</help>
 	      <keywords>raster,import</keywords>
-              <handler>OnMenuCmd</handler>
-	      <command>r.external</command>
-	    </menuitem>
-	    <menuitem>
-	      <label>Bulk link of raster data</label>
-	      <help>Link multiple GDAL supported raster maps as pseudo GRASS raster map layers.</help>
               <handler>OnLinkGdalLayers</handler>
+	      <command>r.external</command>
 	    </menuitem>
 	    <separator />
 	    <menuitem>
@@ -165,26 +154,15 @@
 	      <label>Import vector data</label>
 	      <help>Converts vector layers into a GRASS vector map using OGR.</help>
 	      <keywords>vector,import</keywords>
-	      <handler>OnMenuCmd</handler>
-	      <command>v.in.ogr</command>
-	    </menuitem>
-	    <menuitem>
-	      <label>Bulk import of vector data</label>
-	      <help>Converts multiple OGR supported layers into GRASS vector maps.</help>
 	      <handler>OnImportOgrLayers</handler>
+	      <command>v.in.ogr</command>
 	    </menuitem>
-	    <separator />
 	    <menuitem>
 	      <label>Link vector data</label>
 	      <help>Creates a new pseudo-vector map as a link to an OGR-supported layer.</help>
 	      <keywords>vector,external,ogr</keywords>
-              <handler>OnMenuCmd</handler>
-	      <command>v.external</command>
-	    </menuitem>
-	    <menuitem>
-	      <label>Bulk link of vector data</label>
-	      <help>Creates multiple new pseduo-vector maps as a read-only links using OGR.</help>
               <handler>OnLinkOgrLayers</handler>
+	      <command>v.external</command>
 	    </menuitem>
 	    <separator />
 	    <menuitem>
@@ -220,13 +198,8 @@
 	      <label>DXF import</label>
 	      <help>Converts files in DXF format to GRASS vector map format.</help>
 	      <keywords>vector,import,dxf</keywords>
-	      <handler>OnMenuCmd</handler>
-	      <command>v.in.dxf</command>
-	    </menuitem>
-	    <menuitem>
-	      <label>Bulk import of DXF</label>
-	      <help>Converts multiple DXF layers to GRASS vector maps.</help>
 	      <handler>OnImportDxfFile</handler>
+	      <command>v.in.dxf</command>
 	    </menuitem>
 	    <separator />
 	    <menuitem>