Changeset 369


Ignore:
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.
Location:
Common
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • Common/Common.lpk

    r368 r369  
    2121    <Description Value="Various libraries"/>
    2222    <License Value="GNU/GPL"/>
    23     <Version Minor="5"/>
     23    <Version Minor="6"/>
    2424    <Files Count="13">
    2525      <Item1>
  • Common/UJobProgressView.pas

    r368 r369  
    4949  TJob = class
    5050  private
    51     FResultString: string;
    5251    FTerminate: Boolean;
    5352    procedure SetTerminate(const AValue: Boolean);
     
    211210var
    212211  I: Integer;
    213   H: Integer;
    214212begin
    215213  Terminate := False;
     
    277275      end;
    278276      Form.ProgressBarPart.Hide;
     277      if Assigned(FOnJobFinish) then
     278        FOnJobFinish(CurrentJob);
    279279      if Terminate then Break;
    280280      EndTime := Now;
    281281      Finished := True;
    282       if Assigned(FOnJobFinish) then
    283         FOnJobFinish(CurrentJob);
    284282      Inc(I);
    285283    end;
     
    427425  I: Integer;
    428426begin
     427  if AValue = FTerminate then Exit;
    429428  for I := 0 to Jobs.Count - 1 do
    430429    TJob(Jobs[I]).Terminate := AValue;
     
    440439  EstimatedTimePart: TDateTime;
    441440  RemainingTime: TDateTime;
    442   LabelEstimatedTimePartCaption: string;
    443   LabelEstimatedTimePartVisible: Boolean;
    444441begin
    445442  if Assigned(CurrentJob) then
     
    480477
    481478procedure TJobProgressView.ReloadJobList;
    482 var
    483   OldImageIndex: Integer;
    484479begin
    485480  UpdateHeight;
     
    593588  if FTerminate = AValue then Exit;
    594589  FTerminate := AValue;
    595   if Assigned(Thread) then Thread.Terminate;
     590  if AValue then begin
     591    ProgressView.Terminate := AValue;
     592    if Assigned(Thread) then Thread.Terminate;
     593  end;
    596594end;
    597595
  • Common/ULastOpenedList.pas

    r366 r369  
    9191  with Registry do
    9292  try
     93    RootKey := Root;
    9394    OpenKey(Key, True);
    9495    for I := 0 to Count - 1 do
  • Common/UThreading.pas

    r305 r369  
    164164procedure Synchronize(Method: TMethodCall);
    165165var
    166   I: Integer;
    167166  Thread: TVirtualThread;
    168167begin
Note: See TracChangeset for help on using the changeset viewer.