paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-08 10:48:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

# revisions: 44255

Browse Source 
git-svn-id: branches/fixes_3_2@45690 -
This commit is contained in:
marco 2020-06-24 18:09:54 +00:00
parent baf8b99261
commit 09e9b70562
1 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
packages/ide/fpini.pas
View File

@ -118,6 +118,7 @@ const
ieCompileMode = 'CompileMode';
iePalette = 'Palette';
ieHelpFiles = 'Files';
ieHelpFile = 'File';
ieDefaultTabSize = 'DefaultTabSize';
ieDefaultIndentSize = 'DefaultIndentSize';
ieDefaultEditorFlags='DefaultFlags';
@ -456,6 +457,7 @@ begin
SwitchesMode:=ts;
end;
{ Help }
{ Reading single string with help-file names }
S:=INIFile^.GetEntry(secHelp,ieHelpFiles,'');
repeat
P:=Pos(';',S); if P=0 then P:=length(S)+1;
@ -463,6 +465,13 @@ begin
if PS<>'' then HelpFiles^.Insert(NewStr(PS));
Delete(S,1,P);
until S='';
{ Reading separate strings with help-file names }
I:=1;
repeat
S:=INIFile^.GetEntry(secHelp,ieHelpFile + IntToStr(I),'');
inc(I);
if S<>'' then HelpFiles^.Insert(NewStr(S));
until S='';
{ Editor }
DefaultTabSize:=INIFile^.GetIntEntry(secEditor,ieDefaultTabSize,DefaultTabSize);
DefaultIndentSize:=INIFile^.GetIntEntry(secEditor,ieDefaultIndentSize,DefaultIndentSize);
@ -583,15 +592,9 @@ var INIFile: PINIFile;
S: string;
S1,S2,S3: string;
W: word;
BreakPointCount,WatchesCount:longint;
HelpFileCount, BreakPointCount,WatchesCount:longint;
I(*,OpenFileCount*): integer;
OK: boolean;
procedure ConcatName(P: PString);
begin
if (S<>'') then S:=S+';';
S:=S+P^;
end;
begin
{$ifdef Unix}
if not FromSaveAs and (DirOf(IniFileName)=DirOf(SystemIDEDir)) then
@ -679,10 +682,16 @@ begin
{ Compile }
INIFile^.SetEntry(secCompile,iePrimaryFile,PrimaryFile);
INIFile^.SetEntry(secCompile,ieCompileMode,SwitchesModeStr[SwitchesMode]);
{ Help }
S:='';
HelpFiles^.ForEach(@ConcatName);
INIFile^.SetEntry(secHelp,ieHelpFiles,EscapeIniText(S));
{ Deleting single string with help-files list }
INIFile^.DeleteEntry(secHelp, ieHelpFiles);
{ Saving help-files as separate strings }
{ Will it produce compatibility problems? }
HelpFileCount:=HelpFiles^.Count;
for I := 1 to HelpFileCount do
begin
S:=HelpFiles^.At(I-1)^;
INIFile^.SetEntry(secHelp, ieHelpFile + IntToStr(I), EscapeIniText(S));
end;
{ Editor }
INIFile^.SetIntEntry(secEditor,ieDefaultTabSize,DefaultTabSize);
INIFile^.SetIntEntry(secEditor,ieDefaultIndentSize,DefaultIndentSize);