Changeset 369 for Common/UJobProgressView.pas

Timestamp:

May 31, 2012, 6:26:07 AM (12 years ago)

Author:

chronos

Message:

• Fixed: In package Common TJobProgressView fixed handling of job resultstring and job termination.

File:

• Common/UJobProgressView.pas (modified) (7 diffs)

Common/UJobProgressView.pas

@@ -49 +49 @@
   TJob = class
   private
-    FResultString: string;
     FTerminate: Boolean;
     procedure SetTerminate(const AValue: Boolean);
@@ -211 +210 @@
 var
   I: Integer;
-  H: Integer;
 begin
   Terminate := False;
@@ -277 +275 @@
       end;
       Form.ProgressBarPart.Hide;
+      if Assigned(FOnJobFinish) then
+        FOnJobFinish(CurrentJob);
       if Terminate then Break;
       EndTime := Now;
       Finished := True;
-      if Assigned(FOnJobFinish) then
-        FOnJobFinish(CurrentJob);
       Inc(I);
     end;
@@ -427 +425 @@
   I: Integer;
 begin
+  if AValue = FTerminate then Exit;
   for I := 0 to Jobs.Count - 1 do
     TJob(Jobs[I]).Terminate := AValue;
@@ -440 +439 @@
   EstimatedTimePart: TDateTime;
   RemainingTime: TDateTime;
-  LabelEstimatedTimePartCaption: string;
-  LabelEstimatedTimePartVisible: Boolean;
 begin
   if Assigned(CurrentJob) then
@@ -480 +477 @@
 
 procedure TJobProgressView.ReloadJobList;
-var
-  OldImageIndex: Integer;
 begin
   UpdateHeight;
@@ -593 +588 @@
   if FTerminate = AValue then Exit;
   FTerminate := AValue;
-  if Assigned(Thread) then Thread.Terminate;
+  if AValue then begin
+    ProgressView.Terminate := AValue;
+    if Assigned(Thread) then Thread.Terminate;
+  end;
 end;