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

* Lhelp: store fixed name in CHMHelp/Name instead of help label

Browse Source 
* LHelp: Compilation fix.

git-svn-id: trunk@46568 -
This commit is contained in:
reiniero 2014-10-16 07:40:48 +00:00
parent 4f5f2047fe
commit 615719c46f
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
components/chmhelp/packages/idehelp/lazchmhelp.pas
View File

@ -98,6 +98,11 @@ implementation
uses Process, MacroIntf, InterfaceBase, Forms, Dialogs, HelpFPDoc, IDEMsgIntf;
const
// Part of help name. Stored/retrieved in Lazarus options CHMHelp/Name.
// Do not localize.
CHMHelpName='lazhelp';
procedure Register;
var
ChmHelp: TChmHelpViewer;
@ -130,7 +135,7 @@ begin
// followed by string representation of last 5 digits of the processID
// padded with 00000 at the right
if Length(fHelpLabel) = 0 then
fHelpLabel := 'lazhelp'+copy(inttostr(GetProcessID)+'00000',1,5);
fHelpLabel := CHMHelpName+copy(inttostr(GetProcessID)+'00000',1,5);
Result := fHelpLabel;
end;
@ -196,15 +201,15 @@ end;
procedure TChmHelpViewer.SetChmsFilePath(const AValue: String);
var
HelpFilesPath: String;
CurrentHelpFilesPath: String;
begin
if fCHMSearchPath = AValue then Exit;
fCHMSearchPath := AppendPathDelim(AValue);
HelpFilesPath := GetHelpFilesPath;
CurrentHelpFilesPath := GetHelpFilesPath;
if Assigned(LangRefHelpDatabase) then
LangRefHelpDatabase.LoadKeywordList(HelpFilesPath);
LangRefHelpDatabase.LoadKeywordList(CurrentHelpFilesPath);
if Assigned(FPCDirectivesHelpDatabase) then
FPCDirectivesHelpDatabase.CHMSearchPath := HelpFilesPath;
FPCDirectivesHelpDatabase.CHMSearchPath := CurrentHelpFilesPath;
end;
procedure TChmHelpViewer.SetHelpEXE(AValue: String);
@ -612,7 +617,7 @@ procedure TChmHelpViewer.Save(Storage: TConfigStorage);
begin
Storage.SetDeleteValue('CHMHelp/Exe',HelpEXE,'');
Storage.SetDeleteValue('CHMHelp/ExeParams',HelpExeParams,'');
Storage.SetDeleteValue('CHMHelp/Name',HelpLabel,'lazhelp');
Storage.SetDeleteValue('CHMHelp/Name',CHMHelpName,CHMHelpName);
Storage.SetDeleteValue('CHMHelp/FilesPath',HelpFilesPath,'');
end;