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

ide: store codetools options: update merge info, store files relative to config

Browse Source
This commit is contained in:
mattias 2025-01-30 10:11:37 +01:00
parent 8d5abae84f
commit 71cedcf83b
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
ide/codetoolsoptions.pas
View File

@ -452,6 +452,13 @@ var
FileVersion: integer; FileVersion: integer;
AJumpCentered: Boolean; AJumpCentered: Boolean;
function f(const aFilename: string): string;
begin
Result:=SetDirSeparators(aFilename);
if not FilenameIsAbsolute(aFilename) then
Result:=TrimFilename(AppendPathDelim(GetPrimaryConfigPath)+aFilename);
end;
procedure LoadGlobalDefineTemplates; procedure LoadGlobalDefineTemplates;
begin begin
// delete old one // delete old one
@ -642,15 +649,14 @@ begin
FIndentOnPaste := FIndentOnPaste :=
XMLConfig.GetValue('CodeToolsOptions/Indentation/OnPaste/Enabled',true); XMLConfig.GetValue('CodeToolsOptions/Indentation/OnPaste/Enabled',true);
fIndentationFilename := fIndentationFilename :=
XMLConfig.GetValue('CodeToolsOptions/Indentation/FileName' f(XMLConfig.GetValue('CodeToolsOptions/Indentation/FileName', DefaultIndentationFilename));
, TrimFilename(AppendPathDelim(GetPrimaryConfigPath)+DefaultIndentationFilename));
FIndentContextSensitive := FIndentContextSensitive :=
XMLConfig.GetValue('CodeToolsOptions/Indentation/ContextSensitive',true); XMLConfig.GetValue('CodeToolsOptions/Indentation/ContextSensitive',true);
// code completion templates // code completion templates
FCodeCompletionTemplateFileName := FCodeCompletionTemplateFileName :=
XMLConfig.GetValue('CodeToolsOptions/CodeCompletionTemplate/FileName' f(XMLConfig.GetValue('CodeToolsOptions/CodeCompletionTemplate/FileName',
, DefaultCodeCompletionFilename); DefaultCodeCompletionFilename));
XMLConfig.Free; XMLConfig.Free;
except except
@ -664,11 +670,16 @@ procedure TCodeToolsOptions.Save;
var var
XMLConfig: TXMLConfig; XMLConfig: TXMLConfig;
function f(const aFilename: string): string;
begin
Result:=CreateRelativePath(aFilename,GetPrimaryConfigPath);
end;
procedure SaveGlobalDefineTemplates; procedure SaveGlobalDefineTemplates;
begin begin
if FGlobalDefineTemplates<>nil then if FGlobalDefineTemplates<>nil then
FGlobalDefineTemplates.SaveToXMLConfig(XMLConfig, FGlobalDefineTemplates.SaveToXMLConfig(XMLConfig,
'CodeToolsGlobalDefines/',true,false,true,false); 'CodeToolsGlobalDefines/',true,false,true,true);
end; end;
begin begin
@ -832,13 +843,13 @@ begin
XMLConfig.SetDeleteValue('CodeToolsOptions/Indentation/OnPaste/Enabled' XMLConfig.SetDeleteValue('CodeToolsOptions/Indentation/OnPaste/Enabled'
, FIndentOnPaste, true); , FIndentOnPaste, true);
XMLConfig.SetDeleteValue('CodeToolsOptions/Indentation/FileName' XMLConfig.SetDeleteValue('CodeToolsOptions/Indentation/FileName'
, fIndentationFilename, ''); , f(fIndentationFilename), DefaultIndentationFilename);
XMLConfig.SetDeleteValue('CodeToolsOptions/Indentation/ContextSensitive' XMLConfig.SetDeleteValue('CodeToolsOptions/Indentation/ContextSensitive'
, FIndentContextSensitive, true); , FIndentContextSensitive, true);
// code completion templates // code completion templates
XMLConfig.SetDeleteValue('CodeToolsOptions/CodeCompletionTemplate/FileName' XMLConfig.SetDeleteValue('CodeToolsOptions/CodeCompletionTemplate/FileName'
, FCodeCompletionTemplateFileName, DefaultCodeCompletionFilename); , f(FCodeCompletionTemplateFileName), DefaultCodeCompletionFilename);
XMLConfig.Flush; XMLConfig.Flush;
XMLConfig.Free; XMLConfig.Free;