Hide previous tabs, change auto commit to commitRetaining

	modified:   querywindow.lfm
	modified:   querywindow.lrs
	modified:   querywindow.pas

querywindow.lfm

@@ -17,7 +17,7 @@ object fmQueryWindow: TfmQueryWindow
   OnShow = FormShow
   PopupMenu = pmTab
   Position = poScreenCenter
-  LCLVersion = '1.2.2.0'
+  LCLVersion = '1.2.4.0'
   object Panel1: TPanel
     Left = 0
     Height = 60
@@ -192,9 +192,9 @@ object fmQueryWindow: TfmQueryWindow
       end
       object cxAutoCommit: TCheckBox
         Left = 396
-        Height = 17
+        Height = 24
         Top = 2
-        Width = 81
+        Width = 116
         Caption = 'Auto Commit'
         Checked = True
         State = cbChecked

querywindow.lrs

@@ -7,7 +7,7 @@ LazarusResources.Add('TfmQueryWindow','FORMDATA',[
   +'clForm'#10'KeyPreview'#9#4'Menu'#7#9'MainMenu1'#7'OnClose'#7#9'FormClose'#8
   +'OnCreate'#7#10'FormCreate'#9'OnDestroy'#7#11'FormDestroy'#9'OnKeyDown'#7#11
   +'FormKeyDown'#6'OnShow'#7#8'FormShow'#9'PopupMenu'#7#5'pmTab'#8'Position'#7
-  +#14'poScreenCenter'#10'LCLVersion'#6#7'1.2.2.0'#0#6'TPanel'#6'Panel1'#4'Left'
+  +#14'poScreenCenter'#10'LCLVersion'#6#7'1.2.4.0'#0#6'TPanel'#6'Panel1'#4'Left'
   +#2#0#6'Height'#2'<'#3'Top'#2#0#5'Width'#3#208#2#5'Align'#7#5'alTop'#12'Clien'
   +'tHeight'#2'<'#11'ClientWidth'#3#208#2#5'Color'#7#6'clForm'#11'ParentColor'#8
   +#8'TabOrder'#2#1#0#7'TBitBtn'#7'bbClose'#4'Left'#3#180#2#6'Height'#2#24#3'To'
@@ -52,8 +52,8 @@ LazarusResources.Add('TfmQueryWindow','FORMDATA',[
   +'geIndex'#2#10#7'OnClick'#7#24'tbRollbackRetainingClick'#14'ParentShowHint'#8
   +#8'ShowHint'#9#0#0#11'TToolButton'#11'ToolButton1'#4'Left'#3#130#1#3'Top'#2#2
   +#5'Width'#2#10#7'Caption'#6#11'ToolButton1'#5'Style'#7#12'tbsSeparator'#0#0#9
-  +'TCheckBox'#12'cxAutoCommit'#4'Left'#3#140#1#6'Height'#2#17#3'Top'#2#2#5'Wid'
-  +'th'#2'Q'#7'Caption'#6#11'Auto Commit'#7'Checked'#9#5'State'#7#9'cbChecked'#8
+  +'TCheckBox'#12'cxAutoCommit'#4'Left'#3#140#1#6'Height'#2#24#3'Top'#2#2#5'Wid'
+  +'th'#2't'#7'Caption'#6#11'Auto Commit'#7'Checked'#9#5'State'#7#9'cbChecked'#8
   +'TabOrder'#2#0#0#0#0#0#9'TSplitter'#9'Splitter1'#6'Cursor'#7#8'crVSplit'#4'L'
   +'eft'#2#0#6'Height'#2#12#3'Top'#3'J'#1#5'Width'#3#208#2#5'Align'#7#5'alTop'
   +#12'ResizeAnchor'#7#5'akTop'#0#0#6'TPanel'#14'pnlOutputPanel'#4'Left'#2#0#6

querywindow.pas

@@ -203,6 +203,7 @@ type
     procedure EnableApplyButton;
     function GetTableName(SQLText: string): string;
     procedure CommitResultClick(Sender: TObject);
+    procedure HidePreviousResultTabs;
   protected
     // This procedure will receive the events that are logged by the connection:
     procedure GetLogEvent(Sender: TSQLConnection; EventType: TDBEventType; Const Msg : String);
@@ -498,6 +499,15 @@ begin
   (Sender as TBitBtn).Visible:= False;
 end;
 
+procedure TfmQueryWindow.HidePreviousResultTabs;
+var
+  i: Integer;
+begin
+  for i:= 0 to ComponentCount - 1 do
+    if (Components[i] is TTabSheet) and ((Components[i] as TControl).Parent = pgOutputPageCtl) then
+      (Components[i] as TTabSheet).TabVisible:= False;
+end;
+
 procedure TfmQueryWindow.GetLogEvent(Sender: TSQLConnection;
   EventType: TDBEventType; const Msg: String);
 // Used to log everything sent through the connection
@@ -1245,7 +1255,7 @@ begin
 
               // Auto commit
               if cxAutoCommit.Checked then
-                FSQLTrans.Commit;
+                FSQLTrans.CommitRetaining;
               FQT.Free;
             end
             else
@@ -1276,7 +1286,7 @@ begin
 
                 // Auto commit
                 if cxAutoCommit.Checked then
-                  FSQLTrans.Commit;
+                  FSQLTrans.CommitRetaining;
               finally
                 FQT.Free;
               end;
@@ -1402,7 +1412,7 @@ begin
 
       // Auto commit
       if cxAutoCommit.Checked then
-        FSQLTrans.Commit;
+        FSQLTrans.CommitRetaining;
 
       Result:= True;
       meResult.Lines.Text:= FormatDateTime('hh:nn:ss.z', Now) + ' - Script Executed. It took (H:M:S.MS) ' +
@@ -2039,6 +2049,7 @@ begin
     exit;
   end;
   FStartLine:= 0;
+  HidePreviousResultTabs;
 
   // Disable buttons to prevent query interrupt
   tbRun.Enabled:= False;