[GRASS-SVN] r49247 - in grass/trunk/gui/wxpython: gui_modules xml

[svn_grass at osgeo.org]

Author: martinl
Date: 2011-11-14 10:33:42 -0800 (Mon, 14 Nov 2011)
New Revision: 49247

Modified:
   grass/trunk/gui/wxpython/gui_modules/gdialogs.py
   grass/trunk/gui/wxpython/xml/menudata.xml
Log:
wxGUI: some cosmetics in import/external link dialogs


Modified: grass/trunk/gui/wxpython/gui_modules/gdialogs.py
===================================================================
--- grass/trunk/gui/wxpython/gui_modules/gdialogs.py	2011-11-14 16:26:12 UTC (rev 49246)
+++ grass/trunk/gui/wxpython/gui_modules/gdialogs.py	2011-11-14 18:33:42 UTC (rev 49247)
@@ -1595,19 +1595,20 @@
         btnsizer = wx.BoxSizer(orient = wx.HORIZONTAL)
         
         btnsizer.Add(item = self.btn_cmd, proportion = 0,
-                     flag = wx.ALL | wx.ALIGN_CENTER,
+                     flag = wx.RIGHT | wx.ALIGN_CENTER,
                      border = 10)
         
-        btnsizer.Add(item = self.btn_run, proportion = 0,
-                     flag = wx.ALL | wx.ALIGN_CENTER,
+        btnsizer.Add(item = self.btn_cancel, proportion = 0,
+                     flag = wx.LEFT | wx.RIGHT | wx.ALIGN_CENTER,
                      border = 10)
         
-        btnsizer.Add(item = self.btn_cancel, proportion = 0,
-                     flag = wx.ALL | wx.ALIGN_CENTER,
+        btnsizer.Add(item = self.btn_run, proportion = 0,
+                     flag = wx.RIGHT | wx.ALIGN_CENTER,
                      border = 10)
         
         dialogSizer.Add(item = btnsizer, proportion = 0,
-                        flag = wx.ALIGN_CENTER)
+                        flag = wx.ALIGN_CENTER_VERTICAL | wx.BOTTOM | wx.ALIGN_RIGHT,
+                        border = 10)
         
         # dialogSizer.SetSizeHints(self.panel)
         self.panel.SetAutoLayout(True)
@@ -1802,7 +1803,7 @@
     def OnCmdDialog(self, event):
         """!Show command dialog"""
         name = self._getCommand()
-        menuform.GUI(parent = self, modal = True).ParseCommand(cmd = [name])
+        menuform.GUI(parent = self, modal = False).ParseCommand(cmd = [name])
 
 class GdalOutputDialog(wx.Dialog):
     def __init__(self, parent, id = wx.ID_ANY, ogr = False,
@@ -1826,6 +1827,9 @@
         self.panel = wx.Panel(parent = self, id = wx.ID_ANY)
 
         # buttons
+        self.btnCmd = wx.Button(parent = self.panel, id = wx.ID_ANY,
+                                label = _("Command dialog"))
+        self.btnCmd.Bind(wx.EVT_BUTTON, self.OnCmdDialog)
         self.btnCancel = wx.Button(parent = self.panel, id = wx.ID_CANCEL)
         self.btnCancel.SetToolTipString(_("Close dialog"))
         self.btnOk = wx.Button(parent = self.panel, id = wx.ID_OK)
@@ -1848,14 +1852,20 @@
         dialogSizer.Add(item = self.dsnInput, proportion = 0,
                         flag = wx.EXPAND)
 
-        btnSizer = wx.StdDialogButtonSizer()
-        btnSizer.AddButton(self.btnOk)
-        btnSizer.AddButton(self.btnCancel)
-        btnSizer.Realize()
+        btnSizer = wx.BoxSizer(orient = wx.HORIZONTAL)
+        btnSizer.Add(item = self.btnCmd, proportion = 0,
+                     flag = wx.RIGHT | wx.ALIGN_CENTER,
+                     border = 10)
+        btnSizer.Add(item = self.btnCancel, proportion = 0,
+                     flag = wx.LEFT | wx.RIGHT | wx.ALIGN_CENTER,
+                     border = 10)
+        btnSizer.Add(item = self.btnOk, proportion = 0,
+                     flag = wx.RIGHT | wx.ALIGN_CENTER,
+                     border = 10)
         
         dialogSizer.Add(item = btnSizer, proportion = 0,
-                        flag = wx.EXPAND | wx.ALIGN_CENTER_VERTICAL | wx.ALL,
-                        border = 5)
+                        flag = wx.ALIGN_CENTER_VERTICAL | wx.BOTTOM | wx.TOP | wx.ALIGN_RIGHT,
+                        border = 10)
         
         self.panel.SetAutoLayout(True)
         self.panel.SetSizer(dialogSizer)
@@ -1866,6 +1876,9 @@
         self.SetSize((size.width, size.height))
         self.Layout()
         
+    def OnCmdDialog(self, event):
+        menuform.GUI(parent = self, modal = True).ParseCommand(cmd = ['v.external.out'])
+    
     def OnCancel(self, event):
         self.Destroy()
         

Modified: grass/trunk/gui/wxpython/xml/menudata.xml
===================================================================
--- grass/trunk/gui/wxpython/xml/menudata.xml	2011-11-14 16:26:12 UTC (rev 49246)
+++ grass/trunk/gui/wxpython/xml/menudata.xml	2011-11-14 18:33:42 UTC (rev 49247)
@@ -575,7 +575,7 @@
 	      <label>Output format for vector data</label>
 	      <help>Defines vector output format utilizing OGR library.</help>
 	      <keywords>vector,export,output,external</keywords>
-              <handler>OnMenuCmd</handler>
+              <handler>OnVectorOutputFormat</handler>
 	      <command>v.external.out</command>
 	    </menuitem>
 	  </items>