mirror of
https://github.com/HeidiSQL/HeidiSQL.git
synced 2026-03-13 09:24:25 +08:00
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.
This commit is contained in:
@@ -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.');
|
||||
|
||||
@@ -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.');
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -3226,7 +3226,7 @@ end;
|
||||
|
||||
procedure TMDIChild.MenuAdvancedPropertiesClick(Sender: TObject);
|
||||
begin
|
||||
tbl_properties_form.showmodal;
|
||||
tbl_properties_Window(self);
|
||||
end;
|
||||
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -121,6 +121,7 @@ object tbl_properties_form: Ttbl_properties_form
|
||||
Cancel = True
|
||||
Caption = 'Close'
|
||||
Default = True
|
||||
ModalResult = 1
|
||||
TabOrder = 0
|
||||
OnClick = btnCloseClick
|
||||
end
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
{***
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user