pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

fpbrowser: Simplifies the OnTerminate event

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@1923 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
sekelsenmat
2011-09-08 07:42:24 +00:00
parent 06530a1991
commit 6c92813485
3 changed files with 7 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
applications/fpbrowser/fpbrowser.lpi
View File

@ -92,7 +92,7 @@
<CompilerOptions> <CompilerOptions>
<Version Value="10"/> <Version Value="10"/>
<SearchPaths> <SearchPaths>
<OtherUnitFiles Value="../../components/thtmlport/package"/> <OtherUnitFiles Value="../../Wcomponents/thtmlport/package"/>
</SearchPaths> </SearchPaths>
<Parsing> <Parsing>
<SyntaxOptions> <SyntaxOptions>

12
applications/fpbrowser/mainform.pas
View File

@ -165,7 +165,7 @@ type
MyPageLoader: TPageLoader; MyPageLoader: TPageLoader;
procedure LoadURL(AURL: string); procedure LoadURL(AURL: string);
procedure HandlePageLoaderProgress(APercent: Integer); procedure HandlePageLoaderProgress(APercent: Integer);
procedure HandlePageLoaderTerminated(APageLoader: TPageLoader); procedure HandlePageLoaderTerminated(Sender: TObject);
end; end;
var var
@ -1042,7 +1042,7 @@ begin
MyPageLoaderThread.URL := AURL; MyPageLoaderThread.URL := AURL;
MyPageLoaderThread.PageLoader := MyPageLoader; MyPageLoaderThread.PageLoader := MyPageLoader;
MyPageLoaderThread.OnPageLoadProgress := HandlePageLoaderProgress; MyPageLoaderThread.OnPageLoadProgress := HandlePageLoaderProgress;
MyPageLoaderThread.OnPageLoadTerminated := HandlePageLoaderTerminated; MyPageLoaderThread.OnTerminate := HandlePageLoaderTerminated;
MyPageLoaderThread.FreeOnTerminate := True; MyPageLoaderThread.FreeOnTerminate := True;
MyPageLoaderThread.Resume; MyPageLoaderThread.Resume;
end; end;
@ -1052,16 +1052,16 @@ begin
end; end;
procedure TformBrowser.HandlePageLoaderTerminated(APageLoader: TPageLoader); procedure TformBrowser.HandlePageLoaderTerminated(Sender: TObject);
begin begin
Viewer.LoadFromString(APageLoader.Contents); Viewer.LoadFromString(MyPageLoader.Contents);
Caption := Viewer.DocumentTitle; Caption := Viewer.DocumentTitle;
// Load source and debug info // Load source and debug info
memoSource.Lines.Clear(); memoSource.Lines.Clear();
memoSource.Lines.AddStrings(APageLoader.ContentsList); memoSource.Lines.AddStrings(MyPageLoader.ContentsList);
memoDebug.Lines.Clear(); memoDebug.Lines.Clear();
memoDebug.Lines.AddStrings(APageLoader.DebugInfo); memoDebug.Lines.AddStrings(MyPageLoader.DebugInfo);
end; end;
procedure TformBrowser.Timer1Timer(Sender: TObject); procedure TformBrowser.Timer1Timer(Sender: TObject);

10
applications/fpbrowser/pageloader.pas
View File

@ -25,14 +25,12 @@ type
end; end;
TOnPageLoadProgress = procedure (APercent: Integer) of object; TOnPageLoadProgress = procedure (APercent: Integer) of object;
TOnPageLoadTerminated = procedure (APageLoader: TPageLoader) of object;
{ TPageLoaderThread } { TPageLoaderThread }
TPageLoaderThread = class(TThread) TPageLoaderThread = class(TThread)
private private
FOnPageLoadProgress: TOnPageLoadProgress; FOnPageLoadProgress: TOnPageLoadProgress;
FOnPageLoadTerminated: TOnPageLoadTerminated;
public public
PageLoader: TPageLoader; PageLoader: TPageLoader;
Progress: Integer; Progress: Integer;
@ -40,9 +38,7 @@ type
destructor Destroy; override; destructor Destroy; override;
procedure Execute; override; procedure Execute; override;
procedure CallPageLoadProgress; procedure CallPageLoadProgress;
procedure CallPageLoadTerminated;
property OnPageLoadProgress: TOnPageLoadProgress read FOnPageLoadProgress write FOnPageLoadProgress; property OnPageLoadProgress: TOnPageLoadProgress read FOnPageLoadProgress write FOnPageLoadProgress;
property OnPageLoadTerminated: TOnPageLoadTerminated read FOnPageLoadTerminated write FOnPageLoadTerminated;
end; end;
implementation implementation
@ -59,7 +55,6 @@ end;
procedure TPageLoaderThread.Execute; procedure TPageLoaderThread.Execute;
begin begin
PageLoader.LoadFromURL(URL); PageLoader.LoadFromURL(URL);
Synchronize(CallPageLoadTerminated);
end; end;
procedure TPageLoaderThread.CallPageLoadProgress; procedure TPageLoaderThread.CallPageLoadProgress;
@ -67,11 +62,6 @@ begin
end; end;
procedure TPageLoaderThread.CallPageLoadTerminated;
begin
if Assigned(FOnPageLoadTerminated) then FOnPageLoadTerminated(PageLoader);
end;
{ TPageLoader } { TPageLoader }
constructor TPageLoader.Create; constructor TPageLoader.Create;