Assign ATab object variable when queryWindow is already opened:

	modified:   TurboBird.lpi
	modified:   TurboBird.lpr
	modified:   main.pas
	modified:   permissionmanage.lfm
	modified:   permissionmanage.lrs
	modified:   tablemanage.lfm
	modified:   tablemanage.lrs
	modified:   tablemanage.pas

TurboBird.lpi

@@ -60,10 +60,11 @@
         <Filename Value="TurboBird.lpr"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="TurboBird"/>
-        <EditorIndex Value="10"/>
+        <IsVisibleTab Value="True"/>
+        <EditorIndex Value="8"/>
         <WindowIndex Value="0"/>
-        <TopLine Value="18"/>
-        <CursorPos X="28" Y="27"/>
+        <TopLine Value="1"/>
+        <CursorPos X="29" Y="18"/>
         <UsageCount Value="200"/>
         <Loaded Value="True"/>
       </Unit0>
@@ -73,11 +74,10 @@
         <ComponentName Value="fmMain"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="main"/>
-        <IsVisibleTab Value="True"/>
         <EditorIndex Value="1"/>
         <WindowIndex Value="0"/>
-        <TopLine Value="440"/>
-        <CursorPos X="32" Y="462"/>
+        <TopLine Value="2606"/>
+        <CursorPos X="36" Y="2613"/>
         <UsageCount Value="200"/>
         <Loaded Value="True"/>
         <LoadedDesigner Value="True"/>
@@ -99,7 +99,7 @@
         <ComponentName Value="fmReg"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="Reg"/>
-        <EditorIndex Value="11"/>
+        <EditorIndex Value="9"/>
         <WindowIndex Value="0"/>
         <TopLine Value="1"/>
         <CursorPos X="22" Y="269"/>
@@ -120,7 +120,7 @@
         <ComponentName Value="fmQueryWindow"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="QueryWindow"/>
-        <EditorIndex Value="8"/>
+        <EditorIndex Value="6"/>
         <WindowIndex Value="0"/>
         <TopLine Value="155"/>
         <CursorPos X="3" Y="162"/>
@@ -168,7 +168,7 @@
         <ComponentName Value="fmViewTrigger"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="ViewTrigger"/>
-        <EditorIndex Value="7"/>
+        <EditorIndex Value="5"/>
         <WindowIndex Value="0"/>
         <TopLine Value="19"/>
         <CursorPos X="72" Y="27"/>
@@ -465,13 +465,10 @@
         <ComponentName Value="dmSysTables"/>
         <ResourceBaseClass Value="DataModule"/>
         <UnitName Value="SysTables"/>
-        <EditorIndex Value="6"/>
         <WindowIndex Value="0"/>
         <TopLine Value="575"/>
         <CursorPos X="1" Y="615"/>
         <UsageCount Value="200"/>
-        <Loaded Value="True"/>
-        <LoadedDesigner Value="True"/>
       </Unit42>
       <Unit43>
         <Filename Value="/usr/lib/lazarus/0.9.28.2/components/synedit/syneditmiscclasses.pp"/>
@@ -567,7 +564,7 @@
         <ComponentName Value="fmUserPermissions"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="UserPermissions"/>
-        <EditorIndex Value="9"/>
+        <EditorIndex Value="7"/>
         <WindowIndex Value="0"/>
         <TopLine Value="6"/>
         <CursorPos X="8" Y="34"/>
@@ -589,13 +586,10 @@
         <ComponentName Value="fmTableManage"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="TableManage"/>
-        <EditorIndex Value="5"/>
         <WindowIndex Value="0"/>
         <TopLine Value="303"/>
-        <CursorPos X="16" Y="311"/>
+        <CursorPos X="53" Y="310"/>
         <UsageCount Value="152"/>
-        <Loaded Value="True"/>
-        <LoadedDesigner Value="True"/>
       </Unit55>
       <Unit56>
         <Filename Value="/usr/lib/lazarus/0.9.29/lcl/grids.pas"/>
@@ -643,7 +637,7 @@
       <Unit61>
         <Filename Value="unitfirebirdservices.pas"/>
         <UnitName Value="UnitFirebirdServices"/>
-        <EditorIndex Value="14"/>
+        <EditorIndex Value="12"/>
         <WindowIndex Value="0"/>
         <TopLine Value="1"/>
         <CursorPos X="1" Y="1"/>
@@ -726,8 +720,8 @@
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="PermissionManage"/>
         <WindowIndex Value="0"/>
-        <TopLine Value="310"/>
-        <CursorPos X="29" Y="331"/>
+        <TopLine Value="61"/>
+        <CursorPos X="44" Y="83"/>
         <UsageCount Value="105"/>
       </Unit70>
       <Unit71>
@@ -964,7 +958,7 @@
       <Unit99>
         <Filename Value="../../FromInternet/fpc2.4/fpc-2.4.4/packages/ibase/src/ibase60dyn.pp"/>
         <UnitName Value="ibase60dyn"/>
-        <EditorIndex Value="13"/>
+        <EditorIndex Value="11"/>
         <WindowIndex Value="0"/>
         <TopLine Value="1"/>
         <CursorPos X="1" Y="1"/>
@@ -973,7 +967,7 @@
       </Unit99>
       <Unit100>
         <Filename Value="../../FromInternet/fpc2.4/fpc-2.4.4/packages/ibase/src/ibase60.inc"/>
-        <EditorIndex Value="12"/>
+        <EditorIndex Value="10"/>
         <WindowIndex Value="0"/>
         <TopLine Value="1"/>
         <CursorPos X="50" Y="6"/>
@@ -981,127 +975,59 @@
         <Loaded Value="True"/>
       </Unit100>
     </Units>
-    <JumpHistory Count="30" HistoryIndex="29">
+    <JumpHistory Count="13" HistoryIndex="12">
       <Position1>
         <Filename Value="main.pas"/>
-        <Caret Line="1" Column="1" TopLine="1"/>
+        <Caret Line="3078" Column="23" TopLine="3043"/>
       </Position1>
       <Position2>
         <Filename Value="main.pas"/>
-        <Caret Line="3987" Column="1" TopLine="3946"/>
+        <Caret Line="3081" Column="10" TopLine="3047"/>
       </Position2>
       <Position3>
         <Filename Value="main.pas"/>
-        <Caret Line="1" Column="1" TopLine="1"/>
+        <Caret Line="3127" Column="11" TopLine="3088"/>
       </Position3>
       <Position4>
         <Filename Value="main.pas"/>
-        <Caret Line="14" Column="9" TopLine="1"/>
+        <Caret Line="3140" Column="18" TopLine="3106"/>
       </Position4>
       <Position5>
         <Filename Value="main.pas"/>
-        <Caret Line="16" Column="29" TopLine="1"/>
+        <Caret Line="3194" Column="23" TopLine="3153"/>
       </Position5>
       <Position6>
         <Filename Value="main.pas"/>
-        <Caret Line="17" Column="33" TopLine="1"/>
+        <Caret Line="3235" Column="25" TopLine="3212"/>
       </Position6>
       <Position7>
         <Filename Value="main.pas"/>
-        <Caret Line="55" Column="22" TopLine="21"/>
+        <Caret Line="3242" Column="12" TopLine="3212"/>
       </Position7>
       <Position8>
         <Filename Value="main.pas"/>
-        <Caret Line="90" Column="18" TopLine="56"/>
+        <Caret Line="2949" Column="35" TopLine="2932"/>
       </Position8>
       <Position9>
-        <Filename Value="main.pas"/>
-        <Caret Line="1" Column="1" TopLine="1"/>
+        <Filename Value="dbinfo.pas"/>
+        <Caret Line="9" Column="10" TopLine="1"/>
       </Position9>
       <Position10>
         <Filename Value="main.pas"/>
-        <Caret Line="379" Column="41" TopLine="353"/>
+        <Caret Line="449" Column="56" TopLine="440"/>
       </Position10>
       <Position11>
         <Filename Value="main.pas"/>
-        <Caret Line="389" Column="12" TopLine="355"/>
+        <Caret Line="662" Column="20" TopLine="656"/>
       </Position11>
       <Position12>
         <Filename Value="main.pas"/>
-        <Caret Line="390" Column="12" TopLine="356"/>
+        <Caret Line="2627" Column="1" TopLine="2606"/>
       </Position12>
       <Position13>
         <Filename Value="main.pas"/>
-        <Caret Line="436" Column="1" TopLine="398"/>
+        <Caret Line="662" Column="22" TopLine="656"/>
       </Position13>
-      <Position14>
-        <Filename Value="main.pas"/>
-        <Caret Line="1574" Column="21" TopLine="1537"/>
-      </Position14>
-      <Position15>
-        <Filename Value="main.pas"/>
-        <Caret Line="1623" Column="21" TopLine="1585"/>
-      </Position15>
-      <Position16>
-        <Filename Value="main.pas"/>
-        <Caret Line="2194" Column="1" TopLine="2171"/>
-      </Position16>
-      <Position17>
-        <Filename Value="main.pas"/>
-        <Caret Line="2262" Column="23" TopLine="2244"/>
-      </Position17>
-      <Position18>
-        <Filename Value="main.pas"/>
-        <Caret Line="2263" Column="12" TopLine="2244"/>
-      </Position18>
-      <Position19>
-        <Filename Value="main.pas"/>
-        <Caret Line="2629" Column="27" TopLine="2615"/>
-      </Position19>
-      <Position20>
-        <Filename Value="main.pas"/>
-        <Caret Line="2952" Column="23" TopLine="2916"/>
-      </Position20>
-      <Position21>
-        <Filename Value="main.pas"/>
-        <Caret Line="3078" Column="23" TopLine="3043"/>
-      </Position21>
-      <Position22>
-        <Filename Value="main.pas"/>
-        <Caret Line="3081" Column="10" TopLine="3047"/>
-      </Position22>
-      <Position23>
-        <Filename Value="main.pas"/>
-        <Caret Line="3127" Column="11" TopLine="3088"/>
-      </Position23>
-      <Position24>
-        <Filename Value="main.pas"/>
-        <Caret Line="3140" Column="18" TopLine="3106"/>
-      </Position24>
-      <Position25>
-        <Filename Value="main.pas"/>
-        <Caret Line="3194" Column="23" TopLine="3153"/>
-      </Position25>
-      <Position26>
-        <Filename Value="main.pas"/>
-        <Caret Line="3235" Column="25" TopLine="3212"/>
-      </Position26>
-      <Position27>
-        <Filename Value="main.pas"/>
-        <Caret Line="3242" Column="12" TopLine="3212"/>
-      </Position27>
-      <Position28>
-        <Filename Value="main.pas"/>
-        <Caret Line="2949" Column="35" TopLine="2932"/>
-      </Position28>
-      <Position29>
-        <Filename Value="dbinfo.pas"/>
-        <Caret Line="9" Column="10" TopLine="1"/>
-      </Position29>
-      <Position30>
-        <Filename Value="main.pas"/>
-        <Caret Line="449" Column="56" TopLine="440"/>
-      </Position30>
     </JumpHistory>
   </ProjectOptions>
   <CompilerOptions>

TurboBird.lpr

@@ -2,7 +2,7 @@
 {  TurboBird: FireBird database administration and management tool          }
 {  Developed by: Motaz Abdel Azeem http://code.sd/                          }
 {  Start development:  5.Dec.2009                                           }
-{  Last updated     : 29.Jan.2012                                           }
+{  Last updated     :  3.Feb.2012                                           }
 {  License          : GPL for GUI, LGPL for Units                           }
 {***************************************************************************}
 

main.pas

@@ -2622,7 +2622,10 @@ begin
     Result.Left:= 0;
     Result.Top:= 0;
     Result.Align:= alClient;
-  end;
+  end
+  else
+    ATab:= Result.Parent as TTabSheet;
+
   Result.Init(DatabaseIndex);
   ATab.Tag:= DatabaseIndex;
   Result.Caption:= ACaption;

permissionmanage.lfm

@@ -14,9 +14,9 @@ object fmPermissionManage: TfmPermissionManage
     Height = 361
     Top = 0
     Width = 501
-    ActivePage = tsRoles
+    ActivePage = tsTables
     Anchors = [akTop, akLeft, akRight, akBottom]
-    TabIndex = 2
+    TabIndex = 0
     TabOrder = 0
     object tsTables: TTabSheet
       Caption = 'Tables'

permissionmanage.lrs

@@ -6,8 +6,8 @@ LazarusResources.Add('TfmPermissionManage','FORMDATA',[
   +'ent'#12'ClientHeight'#3'i'#1#11'ClientWidth'#3#11#2#7'OnClose'#7#9'FormClos'
   +'e'#8'Position'#7#14'poScreenCenter'#10'LCLVersion'#6#6'0.9.31'#0#12'TPageCo'
   +'ntrol'#12'PageControl1'#4'Left'#2#0#6'Height'#3'i'#1#3'Top'#2#0#5'Width'#3
-  +#245#1#10'ActivePage'#7#7'tsRoles'#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRigh'
-  +'t'#8'akBottom'#0#8'TabIndex'#2#2#8'TabOrder'#2#0#0#9'TTabSheet'#8'tsTables'
+  +#245#1#10'ActivePage'#7#8'tsTables'#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRig'
+  +'ht'#8'akBottom'#0#8'TabIndex'#2#0#8'TabOrder'#2#0#0#9'TTabSheet'#8'tsTables'
   +#7'Caption'#6#6'Tables'#12'ClientHeight'#3'J'#1#11'ClientWidth'#3#241#1#0#6
   +'TLabel'#6'Label1'#4'Left'#2#12#6'Height'#2#18#3'Top'#2#10#5'Width'#2'C'#7'C'
   +'aption'#6#9'User/Role'#11'ParentColor'#8#0#0#6'TLabel'#6'Label2'#4'Left'#2

tablemanage.lfm

@@ -121,7 +121,7 @@ object fmTableManage: TfmTableManage
         TabOrder = 3
       end
       object bbRefresh: TBitBtn
-        Left = 644
+        Left = 654
         Height = 30
         Top = 344
         Width = 94
@@ -310,7 +310,7 @@ object fmTableManage: TfmTableManage
       ClientWidth = 748
       ImageIndex = 3
       object bbRefreshConstraint: TBitBtn
-        Left = 620
+        Left = 632
         Height = 30
         Top = 343
         Width = 99

tablemanage.lrs

@@ -37,7 +37,7 @@ LazarusResources.Add('TfmTableManage','FORMDATA',[
   +'rder'#2#2#0#0#7'TBitBtn'#6'edDrop'#4'Left'#3#240#0#6'Height'#2#30#3'Top'#3
   +'X'#1#5'Width'#2'K'#7'Anchors'#11#6'akLeft'#8'akBottom'#0#7'Caption'#6#4'Dro'
   +'p'#5'Color'#4#219#242#247#0#4'Kind'#7#8'bkIgnore'#7'OnClick'#7#11'edDropCli'
-  +'ck'#8'TabOrder'#2#3#0#0#7'TBitBtn'#9'bbRefresh'#4'Left'#3#132#2#6'Height'#2
+  +'ck'#8'TabOrder'#2#3#0#0#7'TBitBtn'#9'bbRefresh'#4'Left'#3#142#2#6'Height'#2
   +#30#3'Top'#3'X'#1#5'Width'#2'^'#7'Anchors'#11#7'akRight'#8'akBottom'#0#7'Cap'
   +'tion'#6#7'Refresh'#5'Color'#4#219#242#247#0#4'Kind'#7#7'bkRetry'#7'OnClick'
   +#7#14'bbRefreshClick'#8'TabOrder'#2#4#0#0#0#9'TTabSheet'#9'tsIndices'#7'Capt'
@@ -86,7 +86,7 @@ LazarusResources.Add('TfmTableManage','FORMDATA',[
   +#17'cbIndexTypeChange'#5'Style'#7#14'csDropDownList'#8'TabOrder'#2#5#4'Text'
   +#6#15'Secondary Index'#0#0#0#0#9'TTabSheet'#13'tsConstraints'#7'Caption'#6#11
   +'Constraints'#12'ClientHeight'#3'~'#1#11'ClientWidth'#3#236#2#10'ImageIndex'
-  +#2#3#0#7'TBitBtn'#19'bbRefreshConstraint'#4'Left'#3'l'#2#6'Height'#2#30#3'To'
+  +#2#3#0#7'TBitBtn'#19'bbRefreshConstraint'#4'Left'#3'x'#2#6'Height'#2#30#3'To'
   +'p'#3'W'#1#5'Width'#2'c'#7'Anchors'#11#7'akRight'#8'akBottom'#0#7'Caption'#6
   +#7'Refresh'#5'Color'#4#219#242#247#0#4'Kind'#7#7'bkRetry'#7'OnClick'#7#24'bb'
   +'RefreshConstraintClick'#8'TabOrder'#2#0#0#0#11'TStringGrid'#13'sgConstraint'

tablemanage.pas

@@ -303,26 +303,30 @@ end;
 procedure TfmTableManage.bbRefreshClick(Sender: TObject);
 begin
   fmMain.ViewTableFields(fTableName, fdbIndex, sgFields);
+  Parent.Show;
   Show;
-  fmMain.PageControl1.ActivePage:= Self.Parent as TTabSheet;
+  //fmMain.PageControl1.ActivePage:= Self.Parent as TTabSheet;
 end;
 
 procedure TfmTableManage.bbRefreshConstraintClick(Sender: TObject);
 begin
   SQLTrans.Commit;
   fmMain.FillAndShowConstraintsForm(Self, fTableName, fdbIndex);
+  Parent.Show;
   Show;
 end;
 
 procedure TfmTableManage.bbRefreshIndicesClick(Sender: TObject);
 begin
   fmMain.ShowIndicesManagement(Self, fdbIndex, fTableName);
+  Parent.Show;
   Show;
 end;
 
 procedure TfmTableManage.bbRefreshPermissionsClick(Sender: TObject);
 begin
   FillPermissions;
+  Parent.Show;
   Show;
 end;
 
@@ -330,6 +334,7 @@ procedure TfmTableManage.bbRefreshTriggersClick(Sender: TObject);
 begin
   SQLTrans.Commit;
   ViewTriggers;
+  Parent.Show;
   Show;
 end;
 
@@ -363,7 +368,7 @@ begin
     else
       UserType:= 2;
     fmPermissions:= TfmPermissionManage.Create(nil);
-    fmPermissions.Init(fdbIndex, fTableName, sgPermissions.Cells[0, sgPermissions.Row], UserType);
+    fmPermissions.Init(fdbIndex, fTableName, sgPermissions.Cells[0, sgPermissions.Row], UserType, @bbRefreshPermissionsClick);
     fmPermissions.Show;
   end
   else