paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-05-15 00:12:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

ide: show IDE options dialog with loaded compiler options for package compiler options button instead of old compiler options dialog

Browse Source 
git-svn-id: trunk@29482 -
This commit is contained in:
paul 2011-02-12 13:40:08 +00:00
parent e9210bf352
commit dbc8aa6616
3 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ide/frames/buildmodeseditor.pas
View File

@ -773,8 +773,6 @@ end;
initialization
RegisterIDEOptionsEditor(GroupCompiler, TBuildModesEditorFrame,
CompilerOptionsBuildModes);
RegisterIDEOptionsEditor(GroupPkgCompiler, TBuildModesEditorFrame,
CompilerOptionsBuildModes);
end.

6
packager/packagedefs.pas
View File

@ -936,6 +936,8 @@ procedure PkgVersionSaveToXMLConfig(Version: TPkgVersion; XMLConfig: TXMLConfig;
procedure PkgVersionLoadFromXMLConfig(Version: TPkgVersion;
XMLConfig: TXMLConfig);
var
CurPackage: TLazPackage; // don't use it - only for options dialog
implementation
@ -2507,7 +2509,7 @@ end;
class function TLazPackage.GetInstance: TAbstractIDEOptions;
begin
Result := nil;
Result := CurPackage;
end;
procedure TLazPackage.BeginUpdate;
@ -3823,7 +3825,7 @@ end;
class function TPkgCompilerOptions.GetInstance: TAbstractIDEOptions;
begin
Result := nil;
Result := CurPackage.CompilerOptions;
end;
function TPkgCompilerOptions.IsActive: boolean;

17
packager/packageeditor.pas
View File

@ -1449,21 +1449,10 @@ begin
end;
procedure TPackageEditorForm.CompilerOptionsBitBtnClick(Sender: TObject);
var
CompilerOptsDlg: TfrmCompilerOptions;
begin
CompilerOptsDlg:=TfrmCompilerOptions.Create(Self);
CompilerOptsDlg.CompilerOpts:=LazPackage.CompilerOptions;
with CompilerOptsDlg do begin
LoadOptionsToForm();
Caption:=Format(lisPckEditCompilerOptionsForPackage,[LazPackage.IDAsString]);
ReadOnly:=LazPackage.ReadOnly;
if ShowModal=mrOk then begin
LazPackage.DefineTemplates.AllChanged;
MainIDEInterface.UpdateHighlighters;// highlighting depends on compiler mode
end;
Free;
end;
CurPackage := LazPackage;
// TODO: LazPackage.ReadOnly ?
LazarusIDE.DoOpenIDEOptions(nil, Format(lisPckEditCompilerOptionsForPackage, [LazPackage.IDAsString]), [TLazPackage, TPkgCompilerOptions]);
UpdateTitle;
UpdateButtons;
UpdateStatusBar;