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

Changed chm idepkg so that helplabel cannot be blank

Browse Source 
git-svn-id: trunk@23316 -
This commit is contained in:
andrew 2009-12-29 16:45:26 +00:00
parent 4f2c331030
commit 2fc46bc8e1
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,6 +39,7 @@ type
function GetHelpEXE: String; function GetHelpEXE: String;
function DBFindViewer(HelpDB: THelpDatabase; const MimeType: string; function DBFindViewer(HelpDB: THelpDatabase; const MimeType: string;
var ErrMsg: string; out Viewer: THelpViewer): TShowHelpResult; var ErrMsg: string; out Viewer: THelpViewer): TShowHelpResult;
function GetHelpLabel: String;
protected protected
function GetFileNameAndURL(RawUrl: String; out FileName: String; out URL: String): Boolean; function GetFileNameAndURL(RawUrl: String; out FileName: String; out URL: String): Boolean;
procedure SetHelpEXE(AValue: String); procedure SetHelpEXE(AValue: String);
@ -60,7 +61,7 @@ type
function GetLocalizedName: string; override; function GetLocalizedName: string; override;
published published
property HelpEXE: String read GetHelpEXE write SetHelpEXE; property HelpEXE: String read GetHelpEXE write SetHelpEXE;
property HelpLabel: String read fHelpLabel write SetHelpLabel; property HelpLabel: String read GetHelpLabel write SetHelpLabel;
property HelpFilesPath: String read fChmsFilePath write fChmsFilePath; property HelpFilesPath: String read fChmsFilePath write fChmsFilePath;
end; end;
@ -104,6 +105,13 @@ begin
Result:=shrSuccess; Result:=shrSuccess;
end; end;
function TChmHelpViewer.GetHelpLabel: String;
begin
if Length(fHelpLabel) = 0 then
fHelpLabel := 'lazhelp';
Result := fHelpLabel;
end;
function TChmHelpViewer.GetHelpEXE: String; function TChmHelpViewer.GetHelpEXE: String;
begin begin
if fHelpExe <> '' then if fHelpExe <> '' then
@ -354,7 +362,7 @@ begin
FileName := DocsDir+FileName; FileName := DocsDir+FileName;
fHelpConnection.StartHelpServer(fHelpLabel, HelpExe); fHelpConnection.StartHelpServer(HelpLabel, HelpExe);
Res := fHelpConnection.OpenURL(FileName, Url); Res := fHelpConnection.OpenURL(FileName, Url);
case Res of case Res of