paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-07 15:57:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

LHelp: Notify user if help file does not exist. Avoid adding empty help pages to the viewer.

Browse Source 
git-svn-id: trunk@57609 -
This commit is contained in:
wp 2018-04-06 09:57:37 +00:00
parent 830c014103
commit 456397d312
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
components/chmhelp/lhelp/lhelpcore.pas
View File

@ -280,7 +280,9 @@ begin
if OpenDialog1.Execute then
begin
if OpenURL('file://'+OpenDialog1.FileName) = Ord(srSuccess) then
AddRecentFile('file://'+OpenDialog1.FileName);
AddRecentFile('file://'+OpenDialog1.FileName)
else
MessageDlg(Format(slhelp_NotFound, [OpenDialog1.FileName]), mtError, [mbOK], 0);
RefreshState;
end;
finally
@ -571,9 +573,13 @@ end;
procedure THelpForm.OpenRecentItemClick(Sender: TObject);
var
Item: TRecentMenuItem absolute Sender;
res: DWord;
begin
OpenURL(Item.URL);
AddRecentFile(Item.URL);
res := OpenURL(Item.URL);
if res = Ord(srSuccess) then
AddRecentFile(Item.URL)
else
MessageDlg(Format(slhelp_NotFound, [Item.URL]), mtError, [mbOK], 0);
end;
procedure THelpForm.SendResponse(Response: DWord);
@ -860,6 +866,7 @@ var
fRealContentProvider: TBaseContentProviderClass;
fPage: TContentTab = nil;
I: Integer;
fIsNewPage: Boolean = false;
begin
Result := Ord(srInvalidURL);
fURLPrefix := GetURLPrefix;
@ -900,6 +907,7 @@ begin
if fPage = nil then
begin
// no existing page that can handle this content, so create one
fIsNewPage := true;
fPage := TContentTab.Create(PageControl);
fPage.ContentProvider := fRealContentProvider.Create(fPage, ImageList1);
fPage.ContentProvider.OnTitleChange := @ContentTitleChange;
@ -919,8 +927,11 @@ begin
RefreshState;
Result := Ord(srSuccess);
end
else
else begin
Result := Ord(srInvalidURL);
if fIsNewPage then
fPage.Free;
end;
if not fHide then
ShowOnTop;