paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-09-04 19:20:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

IDE: Refactor, move code from TProjectBuildModes to TBuildMatrixOptions.

Browse Source 
git-svn-id: trunk@45416 -
This commit is contained in:
juha 2014-06-08 23:48:14 +00:00
parent 5e6a6142b5
commit 68d119347e
2 changed files with 27 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ide/modematrixopts.pas
View File

@ -143,6 +143,7 @@ type
procedure SaveToXMLConfig(Cfg: TXMLConfig; const aPath: string;
const SaveMode: TStrToBoolEvent);
function SaveAtOldXMLConfig(Cfg: TXMLConfig; const Path, ModeIdent: string): integer;
procedure SaveSessionEnabled(Cfg: TXMLConfig; const Path, ModeIdent: string; var Cnt: integer);
// queries
procedure AppendCustomOptions(Target, ActiveMode: string; var Options: string);
@ -606,6 +607,25 @@ begin
end;
end;
procedure TBuildMatrixOptions.SaveSessionEnabled(Cfg: TXMLConfig;
const Path, ModeIdent: string; var Cnt: integer);
var
MatrixOption: TBuildMatrixOption;
SubPath: String;
i: Integer;
begin
for i:=0 to Count-1 do begin
MatrixOption:=Items[i];
//debugln(['SaveSessionEnabled ',MatrixOption.AsString]);
if not MatrixOption.FitsMode(ModeIdent) then continue;
inc(Cnt);
SubPath:=Path+'Item'+IntToStr(Cnt)+'/';
//debugln(['SaveSessionEnabled ModeID="',CurMode.Identifier,'" OptionID="',MatrixOption.ID,'" ',MatrixOption.AsString]);
Cfg.SetDeleteValue(SubPath+'Mode',ModeIdent,'');
Cfg.SetDeleteValue(SubPath+'Option',MatrixOption.ID,'');
end;
end;
procedure TBuildMatrixOptions.AppendCustomOptions(Target, ActiveMode: string;
var Options: string);
var

36
ide/project.pp
View File

@ -681,8 +681,6 @@ type
procedure LoadOldFormat(const Path: string);
// Used by SaveToXMLConfig
procedure SaveMacroValuesAtOldPlace(const Path: string; aMode: TProjectBuildMode);
procedure SaveSessionEnabledNonSessionMatrixOptions(const Path: string;
MatrixOptions: TBuildMatrixOptions; var Cnt: integer);
public
constructor Create(AOwner: TComponent); override;
destructor Destroy; override;
@ -7154,31 +7152,6 @@ begin
FXMLConfig.SetDeleteValue(Path+'Count',Cnt,0);
end;
procedure TProjectBuildModes.SaveSessionEnabledNonSessionMatrixOptions(const Path: string;
MatrixOptions: TBuildMatrixOptions; var Cnt: integer);
var
i, j: Integer;
MatrixOption: TBuildMatrixOption;
CurMode: TProjectBuildMode;
SubPath: String;
begin
if MatrixOptions=nil then exit;
for i:=0 to MatrixOptions.Count-1 do begin
MatrixOption:=MatrixOptions[i];
//debugln(['SaveSessionEnabledNonSessionMatrixOptions ',MatrixOption.AsString]);
for j:=0 to Count-1 do begin
CurMode:=Items[j];
if not CurMode.InSession then continue;
if not MatrixOption.FitsMode(CurMode.Identifier) then continue;
inc(Cnt);
SubPath:=Path+'Item'+IntToStr(Cnt)+'/';
//debugln(['SaveSessionEnabledNonSessionMatrixOptions ModeID="',CurMode.Identifier,'" OptionID="',MatrixOption.ID,'" ',MatrixOption.AsString]);
FXMLConfig.SetDeleteValue(SubPath+'Mode',CurMode.Identifier,'');
FXMLConfig.SetDeleteValue(SubPath+'Option',MatrixOption.ID,'');
end;
end;
end;
// SaveToXMLConfig itself
procedure TProjectBuildModes.SaveToXMLConfig(XMLConfig: TXMLConfig; const Path: string;
SaveData, SaveSession: boolean);
@ -7238,8 +7211,13 @@ begin
// save what matrix options are enabled in session build modes
Cnt:=0;
SubPath:=Path+'BuildModes/SessionEnabledMatrixOptions/';
SaveSessionEnabledNonSessionMatrixOptions(SubPath,SharedMatrixOptions,Cnt);
SaveSessionEnabledNonSessionMatrixOptions(SubPath,FGlobalMatrixOptions,Cnt);
for i:=0 to Count-1 do
if Items[i].InSession then
SharedMatrixOptions.SaveSessionEnabled(FXMLConfig, SubPath, Items[i].Identifier, Cnt);
if Assigned(FGlobalMatrixOptions) then
for i:=0 to Count-1 do
if Items[i].InSession then
FGlobalMatrixOptions.SaveSessionEnabled(FXMLConfig, SubPath, Items[i].Identifier, Cnt);
FXMLConfig.SetDeleteValue(SubPath+'Count',Cnt,0);
end;
end;