Move creation of SQLhelp from application startup to a place where it's done on demand.

Move public property keyword to the private context as it is no longer accessed from outside.
This commit is contained in:
Ansgar Becker
2007-07-03 20:22:49 +00:00
parent c02ae7a711
commit 79c95bd9fd
5 changed files with 20 additions and 9 deletions

View File

@ -45,8 +45,6 @@ begin
Application.Title := APPNAME; Application.Title := APPNAME;
Application.CreateForm(TMainForm, MainForm); debug('perf: Main created.'); Application.CreateForm(TMainForm, MainForm); debug('perf: Main created.');
Application.CreateForm(TfrmSQLhelp, frmSQLhelp); debug('perf: frmSQLhelp created.');
try try
try try

View File

@ -45,8 +45,6 @@ begin
Application.CreateForm(TMainForm, MainForm); Application.CreateForm(TMainForm, MainForm);
debug('perf: Main created.'); debug('perf: Main created.');
Application.CreateForm(TfrmSQLhelp, frmSQLhelp); debug('perf: frmSQLhelp created.');
try try
try try

View File

@ -4290,8 +4290,7 @@ end;
procedure TMDIChild.CallSQLHelpWithKeyword( keyword: String ); procedure TMDIChild.CallSQLHelpWithKeyword( keyword: String );
begin begin
// Set help-keyword and show window // Set help-keyword and show window
frmSQLhelp.keyword := keyword; SQLhelpWindow(self, keyword);
frmSQLhelp.Show;
end; end;
procedure TMDIChild.ToolButton4Click(Sender: TObject); procedure TMDIChild.ToolButton4Click(Sender: TObject);

View File

@ -202,6 +202,7 @@ object frmSQLhelp: TfrmSQLhelp
Cancel = True Cancel = True
Caption = 'Close' Caption = 'Close'
Default = True Default = True
ModalResult = 1
TabOrder = 1 TabOrder = 1
OnClick = ButtonCloseClick OnClick = ButtonCloseClick
end end

View File

@ -40,9 +40,9 @@ type
private private
{ Private declarations } { Private declarations }
m : TMDIChild; m : TMDIChild;
Keyword: String;
public public
{ Public declarations } { Public declarations }
Keyword: String;
end; end;
const const
@ -51,8 +51,7 @@ type
ICONINDEX_CATEGORY_OPENED : Integer = 97; ICONINDEX_CATEGORY_OPENED : Integer = 97;
ICONINDEX_HELPITEM : Integer = 98; ICONINDEX_HELPITEM : Integer = 98;
var function SQLhelpWindow(AOwner: TComponent; Keyword: String = ''): Boolean;
frmSQLhelp : TfrmSQLhelp;
implementation implementation
@ -64,6 +63,22 @@ uses ZDataset, helpers, main, db;
{**
Create form on demand
@param TComponent Owner of form (should be calling form)
@return Boolean Form closed using modalresult mrOK
}
function SQLhelpWindow(AOwner: TComponent; Keyword: String = ''): Boolean;
var
f : TfrmSQLhelp;
begin
f := TfrmSQLhelp.Create(AOwner);
f.Keyword := Keyword;
Result := (f.ShowModal=mrOK);
FreeAndNil(f);
end;
{*** {***
Startup Startup
} }