From 45d617c776da0bc5a38fda482cad018a1b2011fb Mon Sep 17 00:00:00 2001
From: Ansgar Becker <ansgarbecker@users.noreply.github.com>
Date: Tue, 3 Jul 2007 19:10:45 +0000
Subject: [PATCH] Move creation of tbl_properties_form from application startup
 to a place where it's done on demand.

Also removes a legacy procedure where that form was called, which is not linked to any control event.
---
 packages/delphi10/heidisql.dpr |  1 -
 packages/delphi11/heidisql.dpr |  1 -
 packages/delphi6/heidisql.dpr  |  1 -
 source/childwin.pas            |  2 +-
 source/main.pas                |  7 -------
 source/tbl_properties.dfm      |  1 +
 source/tbl_properties.pas      | 18 ++++++++++++++++--
 7 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/packages/delphi10/heidisql.dpr b/packages/delphi10/heidisql.dpr
index 95a0b990..ff96231a 100644
--- a/packages/delphi10/heidisql.dpr
+++ b/packages/delphi10/heidisql.dpr
@@ -45,7 +45,6 @@ begin
   Application.Title := APPNAME;
   Application.CreateForm(TMainForm, MainForm); debug('perf: Main created.');
 
-  Application.CreateForm(Ttbl_properties_form, tbl_properties_form); debug('perf: tbl_properties created.');
   Application.CreateForm(Ttablecomment, tablecomment); debug('perf: tablecomment created.');
   Application.CreateForm(Tloaddataform, loaddataform); debug('perf: loaddata created.');
   Application.CreateForm(TprintlistForm, printlistForm); debug('perf: printlist created.');
diff --git a/packages/delphi11/heidisql.dpr b/packages/delphi11/heidisql.dpr
index 1f9a1d96..4b48a38c 100644
--- a/packages/delphi11/heidisql.dpr
+++ b/packages/delphi11/heidisql.dpr
@@ -45,7 +45,6 @@ begin
   Application.CreateForm(TMainForm, MainForm);
   debug('perf: Main created.');
 
-  Application.CreateForm(Ttbl_properties_form, tbl_properties_form); debug('perf: tbl_properties created.');
   Application.CreateForm(Ttablecomment, tablecomment); debug('perf: tablecomment created.');
   Application.CreateForm(Tloaddataform, loaddataform); debug('perf: loaddata created.');
   Application.CreateForm(TprintlistForm, printlistForm); debug('perf: printlist created.');
diff --git a/packages/delphi6/heidisql.dpr b/packages/delphi6/heidisql.dpr
index 98c05398..cbff7a2c 100644
--- a/packages/delphi6/heidisql.dpr
+++ b/packages/delphi6/heidisql.dpr
@@ -35,7 +35,6 @@ begin
   Application.CreateForm(TMainForm, MainForm);
   Application.CreateForm(Tconnform, connform);
   Application.CreateForm(TFieldEditForm, FieldEditForm);
-  Application.CreateForm(Ttbl_properties_form, tbl_properties_form);
   Application.CreateForm(Ttablecomment, tablecomment);
   Application.CreateForm(Tloaddataform, loaddataform);
   Application.CreateForm(TUserManagerForm, UserManagerForm);
diff --git a/source/childwin.pas b/source/childwin.pas
index 59a7eb70..cf10bd64 100644
--- a/source/childwin.pas
+++ b/source/childwin.pas
@@ -3226,7 +3226,7 @@ end;
 
 procedure TMDIChild.MenuAdvancedPropertiesClick(Sender: TObject);
 begin
-  tbl_properties_form.showmodal;
+  tbl_properties_Window(self);
 end;
 
 
diff --git a/source/main.pas b/source/main.pas
index c0a1e4b3..18cf64ec 100644
--- a/source/main.pas
+++ b/source/main.pas
@@ -169,7 +169,6 @@ type
     procedure ButtonCreateDatabaseClick(Sender: TObject);
     procedure ButtonCreateTableClick(Sender: TObject);
     procedure ButtonDropDatabaseClick(Sender: TObject);
-    procedure ButtonAdvancedPropertiesClick(Sender: TObject);
     procedure ResetWindowOptions1Click(Sender: TObject);
     procedure ButtonImportTextfileClick(Sender: TObject);
     procedure MenuPreferencesClick(Sender: TObject);
@@ -641,12 +640,6 @@ begin
   ChildWin.CallSQLHelp( Sender );
 end;
 
-procedure TMainForm.ButtonAdvancedPropertiesClick(Sender: TObject);
-begin
-  // Show advanced table-properties
-  tbl_properties_form.showmodal;
-end;
-
 
 procedure TMainForm.ResetWindowOptions1Click(Sender: TObject);
 var
diff --git a/source/tbl_properties.dfm b/source/tbl_properties.dfm
index a7895a5a..a6f9f49f 100644
--- a/source/tbl_properties.dfm
+++ b/source/tbl_properties.dfm
@@ -121,6 +121,7 @@ object tbl_properties_form: Ttbl_properties_form
       Cancel = True
       Caption = 'Close'
       Default = True
+      ModalResult = 1
       TabOrder = 0
       OnClick = btnCloseClick
     end
diff --git a/source/tbl_properties.pas b/source/tbl_properties.pas
index 3e294ee8..ea6cc5f4 100644
--- a/source/tbl_properties.pas
+++ b/source/tbl_properties.pas
@@ -30,8 +30,7 @@ type
     procedure FormResize(Sender: TObject);
   end;
 
-var
-  tbl_properties_form: Ttbl_properties_form;
+  function tbl_properties_Window(AOwner: TComponent): Boolean;
 
 implementation
 
@@ -41,6 +40,21 @@ uses
 {$R *.DFM}
 
 
+{**
+  Create form on demand
+  @param TComponent Owner of form (should be calling form)
+  @return Boolean Form closed using modalresult mrOK
+}
+function tbl_properties_Window(AOwner: TComponent): Boolean;
+var
+  f : Ttbl_properties_form;
+begin
+  f := Ttbl_properties_form.Create(AOwner);
+  Result := (f.ShowModal=mrOK);
+  FreeAndNil(f);
+end;
+
+
 {***