Changeset 34 for trunk/Components/Common/UJobProgressView.pas

Timestamp:

Nov 25, 2017, 12:27:33 AM (7 years ago)

Author:

chronos

Message:

• Modified: Improved New game window.
• Modified: Used newer version of Common and CoolTranslator packages.

Location:

trunk

Files:

• . (modified) (1 prop)
• Components/Common/UJobProgressView.pas (modified) (13 diffs)

trunk

@@ -3 +3 @@
 backup
 tunneler.exe
+tunneler.dbg
+tunneler.lps
 heaptrclog.trc
-tunneler.lps
+Components/Common/Languages/*.mo
+Components/CoolTranslator/Demo/lib

@@ -3 +3 @@
 backup
 tunneler.exe
+tunneler.dbg
+tunneler.lps
 heaptrclog.trc
-tunneler.lps
+Components/Common/Languages/*.mo
+Components/CoolTranslator/Demo/lib

trunk/Components/Common/UJobProgressView.pas

@@ -111 +111 @@
     Finished: Boolean;
     FOnJobFinish: TJobProgressViewMethod;
+    FOnOwnerDraw: TNotifyEvent;
+    FOwnerDraw: Boolean;
     FShowDelay: Integer;
     FTerminate: Boolean;
@@ -116 +118 @@
     TotalStartTime: TDateTime;
     Log: TStringList;
-    Form: TFormJobProgressView;
     procedure SetTerminate(const AValue: Boolean);
     procedure UpdateProgress;
@@ -122 +123 @@
     procedure StartJobs;
     procedure UpdateHeight;
+    procedure JobProgressChange(Sender: TObject);
   public
+    Form: TFormJobProgressView;
     Jobs: TObjectList; // TListObject<TJob>
     CurrentJob: TJob;
@@ -136 +139 @@
     property Terminate: Boolean read FTerminate write SetTerminate;
   published
+    property OwnerDraw: Boolean read FOwnerDraw write FOwnerDraw;
     property ShowDelay: Integer read FShowDelay write FShowDelay;
     property AutoClose: Boolean read FAutoClose write FAutoClose;
     property OnJobFinish: TJobProgressViewMethod read FOnJobFinish
       write FOnJobFinish;
+    property OnOwnerDraw: TNotifyEvent read FOnOwnerDraw
+      write FOnOwnerDraw;
   end;
 
@@ -160 +166 @@
   STotalEstimatedTime = 'Total estimated time: %s';
   SFinished = 'Finished';
+  SOperations = 'Operations';
 
 procedure Register;
 begin
-  RegisterComponents('Samples', [TJobProgressView]);
+  RegisterComponents('Common', [TJobProgressView]);
 end;
 
@@ -196 +203 @@
   NewJob.Progress.Max := 100;
   NewJob.Progress.Reset;
+  NewJob.Progress.OnChange := JobProgressChange;
   Jobs.Add(NewJob);
   //ReloadJobList;
@@ -212 +220 @@
   Terminate := False;
 
-  Form.BringToFront;
+  if not OwnerDraw then Form.BringToFront;
 
   Finished := False;
@@ -244 +252 @@
       CurrentJobIndex := I;
       CurrentJob := TJob(Jobs[I]);
+      JobProgressChange(Self);
       StartTime := Now;
       Form.LabelEstimatedTimePart.Caption := Format(SEstimatedTime, ['']);
@@ -339 +348 @@
 end;
 
+procedure TJobProgressView.JobProgressChange(Sender: TObject);
+begin
+  if Assigned(FOnOwnerDraw) then
+    FOnOwnerDraw(Self);
+end;
+
 procedure TFormJobProgressView.TimerUpdateTimer(Sender: TObject);
 var
@@ -357 +372 @@
   if not Visible then begin
     TimerUpdate.Interval := UpdateInterval;
-    Show;
+    if not JobProgressView.OwnerDraw then Show;
   end;
 end;
@@ -509 +524 @@
 destructor TJobProgressView.Destroy;
 begin
-  Log.Free;
-  Jobs.Free;
-  inherited Destroy;
+  FreeAndNil(Log);
+  FreeAndNil(Jobs);
+  inherited;
 end;
 
@@ -519 +534 @@
     FLock.Acquire;
     FMax := AValue;
+    if FMax < 1 then FMax := 1;
     if FValue >= FMax then FValue := FMax;
   finally
@@ -610 +626 @@
 begin
   Progress.Free;
-  inherited Destroy;
+  inherited;
 end;
 

@@ -3 +3 @@
 backup
 tunneler.exe
+tunneler.dbg
+tunneler.lps
 heaptrclog.trc
-tunneler.lps
+Components/Common/Languages/*.mo
+Components/CoolTranslator/Demo/lib