wxGUI/dbmgr: apply query when closing SQL builder

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

gui/wxpython/dbmgr/manager.py

@@ -2037,7 +2037,7 @@ class AttributeManager(wx.Frame):
             self.builder = SQLFrame(parent = self, id = wx.ID_ANY,
                                     title = _("SQL Builder"),
                                     vectmap = self.vectorName,
-                                    evtheader = self.OnBuilderEvt)
+                                    evtHandler = self.OnBuilderEvt)
             self.builder.Show()
         else:
             self.builder.Raise()
@@ -2046,6 +2046,10 @@ class AttributeManager(wx.Frame):
         if event == 'apply':
             sqlstr = self.builder.GetSQLStatement()
             self.FindWindowById(self.layerPage[self.layer]['statement']).SetValue(sqlstr)
+            # apply query
+            self.listOfSQLStatements.append(sqlstr)
+            self.OnApplySqlStatement(None)
+            # close builder on apply
             if self.builder.CloseOnApply():
                 self.builder = None
         elif event == 'close':

gui/wxpython/dbmgr/sqlbuilder.py

@@ -37,7 +37,7 @@ import grass.script as grass
 class SQLFrame(wx.Frame):
     """!SQL Frame class"""
     def __init__(self, parent, title, vectmap, id = wx.ID_ANY,
-                 layer = 1, qtype = "select", evtheader = None):
+                 layer = 1, qtype = "select", evtHandler = None):
         
         wx.Frame.__init__(self, parent, id, title)
         
@@ -45,7 +45,7 @@ class SQLFrame(wx.Frame):
                              wx.BITMAP_TYPE_ICO))
         
         self.parent = parent
-        self.evtHeader = evtheader
+        self.evtHandler = evtHandler
 
         #
         # variables
@@ -401,9 +401,9 @@ class SQLFrame(wx.Frame):
         
     def OnApply(self, event):
         """Apply button pressed"""
-        if self.evtHeader:
-            self.evtHeader(event = 'apply')
-
+        if self.evtHandler:
+            self.evtHandler(event = 'apply')
+        
         if self.close_onapply.IsChecked():
             self.Destroy()
             
@@ -435,8 +435,8 @@ class SQLFrame(wx.Frame):
     
     def OnClose(self, event):
         """!Close button pressed"""
-        if self.evtHeader:
-            self.evtHeader(event = 'close')
+        if self.evtHandler:
+            self.evtHandler(event = 'close')
         
         self.Destroy()