From b9deb8c122f8e8a04809ecec3057e2cbc4e79aef Mon Sep 17 00:00:00 2001 From: paul Date: Wed, 30 Dec 2009 15:45:14 +0000 Subject: [PATCH] ideintf, ide: implement custom caption for IDE options dialog, use another caption for project options git-svn-id: trunk@23328 - --- ide/main.pp | 14 +++++++++----- ideintf/lazideintf.pas | 3 ++- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ide/main.pp b/ide/main.pp index 5b9f335ed3..e12f01a601 100644 --- a/ide/main.pp +++ b/ide/main.pp @@ -355,7 +355,8 @@ type // Environment options dialog events procedure OnLoadIDEOptions(Sender: TObject; AOptions: TAbstractIDEOptions); procedure OnSaveIDEOptions(Sender: TObject; AOptions: TAbstractIDEOptions); - procedure DoOpenIDEOptions(AEditor: TAbstractIDEOptionsEditorClass; + procedure DoOpenIDEOptions(AEditor: TAbstractIDEOptionsEditorClass = nil; + ACaption: String = ''; AOptionsFilter: TAbstractIDEOptionsClass = nil); override; procedure DoEnvironmentOptionsBeforeRead(Sender: TObject); @@ -3703,7 +3704,7 @@ end; procedure TMainIDE.mnuProjectOptionsClicked(Sender: TObject); begin - DoOpenIDEOptions(nil, TAbstractIDEProjectOptions); + DoOpenIDEOptions(nil, dlgProjectOptions, TAbstractIDEProjectOptions); end; function TMainIDE.UpdateProjectPOFile(AProject: TProject): TModalResult; @@ -4128,7 +4129,7 @@ end; procedure TMainIDE.mnuEnvGeneralOptionsClicked(Sender: TObject); begin - DoOpenIDEOptions(nil); + DoOpenIDEOptions; end; //------------------------------------------------------------------------------ @@ -4185,14 +4186,17 @@ begin SaveDesktopSettings(AOptions as TEnvironmentOptions); end; -procedure TMainIDE.DoOpenIDEOptions(AEditor: TAbstractIDEOptionsEditorClass; - AOptionsFilter: TAbstractIDEOptionsClass = nil); +procedure TMainIDE.DoOpenIDEOptions(AEditor: TAbstractIDEOptionsEditorClass = nil; + ACaption: String = ''; + AOptionsFilter: TAbstractIDEOptionsClass = nil); var IDEOptionsDialog: TIDEOptionsDialog; begin IDEOptionsDialog := TIDEOptionsDialog.Create(nil); try + if ACaption <> '' then + IDEOptionsDialog.Caption := ACaption; if AOptionsFilter = nil then if AEditor <> nil then AOptionsFilter := AEditor.SupportedOptionsClass diff --git a/ideintf/lazideintf.pas b/ideintf/lazideintf.pas index 371e3cb6be..4cfba7c73d 100644 --- a/ideintf/lazideintf.pas +++ b/ideintf/lazideintf.pas @@ -215,7 +215,8 @@ type function GetPrimaryConfigPath: String; virtual; abstract; function GetSecondaryConfigPath: String; virtual; abstract; procedure CopySecondaryConfigFile(const AFilename: String); virtual; abstract; - procedure DoOpenIDEOptions(AEditor: TAbstractIDEOptionsEditorClass; + procedure DoOpenIDEOptions(AEditor: TAbstractIDEOptionsEditorClass = nil; + ACaption: String = ''; AOptionsFilter: TAbstractIDEOptionsClass = nil); virtual; abstract; // filenames, paths