Changeset 513 for Common

Timestamp:

Apr 19, 2018, 5:07:40 PM (7 years ago)

Author:

chronos

Message:

• Modified: Code cleanup.
• Modified: Center progress dialog to center of screen even with multiple jobs.

Location:

Common

Files:

• Demo/JobProgressView/JobProgressViewDemo.lpi (modified) (1 diff)
• Demo/JobProgressView/JobProgressViewDemo.lpr (modified) (1 diff)
• Demo/JobProgressView/UFormMain.lfm (modified) (2 diffs)
• Demo/JobProgressView/UFormMain.pas (modified) (4 diffs)
• UJobProgressView.pas (modified) (11 diffs)

Common/Demo/JobProgressView/JobProgressViewDemo.lpi

@@ -80 +80 @@
         <Filename Value="UFormMain.pas"/>
         <IsPartOfProject Value="True"/>
-        <ComponentName Value="Form1"/>
+        <ComponentName Value="FormMain"/>
         <ResourceBaseClass Value="Form"/>
       </Unit1>

Common/Demo/JobProgressView/JobProgressViewDemo.lpr

@@ -16 +16 @@
   RequireDerivedFormResource:=True;
   Application.Initialize;
-  Application.CreateForm(TForm1, Form1);
+  Application.CreateForm(TFormMain, FormMain);
   Application.Run;
 end.

Common/Demo/JobProgressView/UFormMain.lfm

@@ -1 @@
-object Form1: TForm1
-  Left = 515
+object FormMain: TFormMain
+  Left = 501
   Height = 480
-  Top = 252
+  Top = 296
   Width = 743
   Caption = 'JobProgressView demo'
@@ -89 +89 @@
     ShowDelay = 0
     AutoClose = False
-    left = 488
-    top = 72
+    left = 480
+    top = 120
   end
 end

Common/Demo/JobProgressView/UFormMain.pas

@@ -11 +11 @@
 type
 
-  { TForm1 }
+  { TFormMain }
 
-  TForm1 = class(TForm)
+  TFormMain = class(TForm)
     ButtonTest: TButton;
     CheckBoxAutoClose: TCheckBox;
@@ -32 +32 @@
 
 var
-  Form1: TForm1;
+  FormMain: TFormMain;
 
 implementation
@@ -38 +38 @@
 {$R *.lfm}
 
-{ TForm1 }
+{ TFormMain }
 
-procedure TForm1.ButtonTestClick(Sender: TObject);
+procedure TFormMain.ButtonTestClick(Sender: TObject);
 var
   I: Integer;
 begin
+  ButtonTest.Enabled := False;
   with JobProgressView1 do begin
     AutoClose := CheckBoxAutoClose.Checked;
@@ -52 +53 @@
     Start;
   end;
+  ButtonTest.Enabled := True;
 end;
 
-procedure TForm1.JobMethod(Job: TJob);
+procedure TFormMain.JobMethod(Job: TJob);
 var
   Count: Integer;

Common/UJobProgressView.pas

@@ -129 +129 @@
     TotalStartTime: TDateTime;
     Log: TStringList;
+    FForm: TFormJobProgressView;
     procedure SetTerminate(const AValue: Boolean);
     procedure UpdateProgress;
     procedure JobProgressChange(Sender: TObject);
   public
-    Form: TFormJobProgressView;
     Jobs: TJobs;
     CurrentJob: TJob;
@@ -140 +140 @@
     destructor Destroy; override;
     procedure Clear;
-    procedure AddJob(Title: string; Method: TJobProgressViewMethod;
-      NoThreaded: Boolean = False; WaitFor: Boolean = False);
+    function AddJob(Title: string; Method: TJobProgressViewMethod;
+      NoThreaded: Boolean = False; WaitFor: Boolean = False): TJob;
     procedure Start;
     procedure Stop;
     procedure TermSleep(Delay: Integer);
+    property Form: TFormJobProgressView read FForm;
     property Terminate: Boolean read FTerminate write SetTerminate;
   published
@@ -181 +182 @@
 end;
 
+{ TJobThread }
+
 procedure TJobThread.Execute;
 begin
@@ -198 +201 @@
 end;
 
-procedure TJobProgressView.AddJob(Title: string; Method: TJobProgressViewMethod;
-  NoThreaded: Boolean = False; WaitFor: Boolean = False);
+{ TFormJobProgressView }
+
+procedure TFormJobProgressView.UpdateHeight;
 var
-  NewJob: TJob;
-begin
-  NewJob := TJob.Create;
-  NewJob.ProgressView := Self;
-  NewJob.Title := Title;
-  NewJob.Method := Method;
-  NewJob.NoThreaded := NoThreaded;
-  NewJob.WaitFor := WaitFor;
-  NewJob.Progress.Max := 100;
-  NewJob.Progress.Reset;
-  NewJob.Progress.OnChange := JobProgressChange;
-  Jobs.Add(NewJob);
+  H: Integer;
+  PanelOperationsVisible: Boolean;
+  PanelOperationsHeight: Integer;
+  PanelProgressVisible: Boolean;
+  PanelProgressTotalVisible: Boolean;
+  PanelLogVisible: Boolean;
+  MemoLogHeight: Integer = 200;
+  I: Integer;
+  ItemRect: TRect;
+  MaxH: Integer;
+begin
+    H := PanelOperationsTitle.Height;
+    PanelOperationsVisible := JobProgressView.Jobs.Count > 0;
+    if PanelOperationsVisible <> PanelOperations.Visible then
+      PanelOperations.Visible := PanelOperationsVisible;
+    if ListViewJobs.Items.Count > 0 then begin
+      Maxh := 0;
+      for I := 0 to ListViewJobs.Items.Count - 1 do
+      begin
+        ItemRect := ListViewJobs.Items[i].DisplayRect(drBounds);
+        Maxh := Max(Maxh, ItemRect.Top + (ItemRect.Bottom - ItemRect.Top));
+      end;
+      PanelOperationsHeight := Scale96ToScreen(12) + Maxh;
+    end else PanelOperationsHeight := Scale96ToScreen(8);
+    if PanelOperationsHeight <> PanelOperations.Height then
+      PanelOperations.Height := PanelOperationsHeight;
+    if PanelOperationsVisible then
+      H := H + PanelOperations.Height;
+
+    PanelProgressVisible := (JobProgressView.Jobs.Count > 0) and not JobProgressView.Finished;
+    if PanelProgressVisible <> PanelProgress.Visible then
+      PanelProgress.Visible := PanelProgressVisible;
+    if PanelProgressVisible then
+      H := H + PanelProgress.Height;
+    PanelProgressTotalVisible := (JobProgressView.Jobs.Count > 1) and not JobProgressView.Finished;
+    if PanelProgressTotalVisible <> PanelProgressTotal.Visible then
+      PanelProgressTotal.Visible := PanelProgressTotalVisible;
+    if PanelProgressTotalVisible then
+      H := H + PanelProgressTotal.Height;
+    Constraints.MinHeight := H;
+    PanelLogVisible := MemoLog.Lines.Count > 0;
+    if PanelLogVisible <> PanelLog.Visible then
+      PanelLog.Visible := PanelLogVisible;
+    if PanelLogVisible then
+      H := H + Scale96ToScreen(MemoLogHeight);
+    if PanelText.Visible then
+      H := H + PanelText.Height;
+    if Height <> H then begin
+      Height := H;
+      Top := (Screen.Height - H) div 2;
+    end;
+end;
+
+procedure TFormJobProgressView.TimerUpdateTimer(Sender: TObject);
+var
+  ProgressBarPartVisible: Boolean;
+  ProgressBarTotalVisible: Boolean;
+begin
+  JobProgressView.UpdateProgress;
+  if Visible and (not ProgressBarPart.Visible) and
+  Assigned(JobProgressView.CurrentJob) and
+  (JobProgressView.CurrentJob.Progress.Value > 0) then begin
+    ProgressBarPartVisible := True;
+    if ProgressBarPartVisible <> ProgressBarPart.Visible then
+      ProgressBarPart.Visible := ProgressBarPartVisible;
+    ProgressBarTotalVisible := True;
+    if ProgressBarTotalVisible <> ProgressBarTotal.Visible then
+      ProgressBarTotal.Visible := ProgressBarTotalVisible;
+  end;
+  if not Visible then begin
+    TimerUpdate.Interval := UpdateInterval;
+    if not JobProgressView.OwnerDraw then Show;
+  end;
+  if Assigned(JobProgressView.CurrentJob) then begin
+    LabelText.Caption := JobProgressView.CurrentJob.Progress.Text;
+    if LabelText.Caption <> '' then begin
+      PanelText.Visible := True;
+      UpdateHeight;
+    end;
+  end;
+end;
+
+procedure TFormJobProgressView.FormDestroy(Sender:TObject);
+begin
+end;
+
+procedure TFormJobProgressView.ListViewJobsData(Sender: TObject; Item: TListItem);
+begin
+  if (Item.Index >= 0) and (Item.Index < JobProgressView.Jobs.Count) then
+  with TJob(JobProgressView.Jobs[Item.Index]) do begin
+    Item.Caption := Title;
+    if Item.Index = JobProgressView.CurrentJobIndex then Item.ImageIndex := 1
+      else if Finished then Item.ImageIndex := 0
+      else Item.ImageIndex := 2;
+    Item.Data := JobProgressView.Jobs[Item.Index];
+  end;
+end;
+
+procedure TFormJobProgressView.FormClose(Sender: TObject;
+  var CloseAction: TCloseAction);
+begin
+end;
+
+procedure TFormJobProgressView.FormCreate(Sender: TObject);
+begin
+  Caption := SPleaseWait;
+  try
+    //Animate1.FileName := ExtractFileDir(UTF8Encode(Application.ExeName)) +
+    //  DirectorySeparator + 'horse.avi';
+    //Animate1.Active := True;
+  except
+
+  end;
+end;
+
+procedure TFormJobProgressView.ReloadJobList;
+begin
+  // Workaround for not showing first line
+  //Form.ListViewJobs.Items.Count := Jobs.Count + 1;
+  //Form.ListViewJobs.Refresh;
+
+  if ListViewJobs.Items.Count <> JobProgressView.Jobs.Count then
+    ListViewJobs.Items.Count := JobProgressView.Jobs.Count;
+  ListViewJobs.Refresh;
+  Application.ProcessMessages;
+  UpdateHeight;
+end;
+
+procedure TFormJobProgressView.FormShow(Sender: TObject);
+begin
+  ReloadJobList;
+end;
+
+procedure TFormJobProgressView.FormHide(Sender: TObject);
+begin
+  JobProgressView.Jobs.Clear;
+  ReloadJobList;
+end;
+
+procedure TFormJobProgressView.FormCloseQuery(Sender: TObject; var CanClose: Boolean);
+begin
+  CanClose := JobProgressView.Finished;
+  JobProgressView.Terminate := True;
+  Caption := SPleaseWait + STerminate;
+end;
+
+
+{ TJobProgressView }
+
+function TJobProgressView.AddJob(Title: string; Method: TJobProgressViewMethod;
+  NoThreaded: Boolean = False; WaitFor: Boolean = False): TJob;
+begin
+  Result := TJob.Create;
+  Result.ProgressView := Self;
+  Result.Title := Title;
+  Result.Method := Method;
+  Result.NoThreaded := NoThreaded;
+  Result.WaitFor := WaitFor;
+  Result.Progress.Max := 100;
+  Result.Progress.Reset;
+  Result.Progress.OnChange := JobProgressChange;
+  Jobs.Add(Result);
   //ReloadJobList;
 end;
@@ -302 +456 @@
       Form.Hide;
     end;
-    //Clear;
+    if not Form.Visible then Clear;
     Form.Caption := SFinished;
     //LabelEstimatedTimePart.Visible := False;
@@ -311 +465 @@
 end;
 
-procedure TFormJobProgressView.UpdateHeight;
-var
-  H: Integer;
-  PanelOperationsVisible: Boolean;
-  PanelOperationsHeight: Integer;
-  PanelProgressVisible: Boolean;
-  PanelProgressTotalVisible: Boolean;
-  PanelLogVisible: Boolean;
-  MemoLogHeight: Integer = 200;
-  I: Integer;
-  ItemRect: TRect;
-  MaxH: Integer;
-begin
-    H := PanelOperationsTitle.Height;
-    PanelOperationsVisible := JobProgressView.Jobs.Count > 0;
-    if PanelOperationsVisible <> PanelOperations.Visible then
-      PanelOperations.Visible := PanelOperationsVisible;
-    if ListViewJobs.Items.Count > 0 then begin
-      Maxh := 0;
-      for I := 0 to ListViewJobs.Items.Count - 1 do
-      begin
-        ItemRect := ListViewJobs.Items[i].DisplayRect(drBounds);
-        Maxh := Max(Maxh, ItemRect.Top + (ItemRect.Bottom - ItemRect.Top));
-      end;
-      PanelOperationsHeight := Scale96ToScreen(12) + Maxh;
-    end else PanelOperationsHeight := Scale96ToScreen(8);
-    if PanelOperationsHeight <> PanelOperations.Height then
-      PanelOperations.Height := PanelOperationsHeight;
-    if PanelOperationsVisible then
-      H := H + PanelOperations.Height;
-
-    PanelProgressVisible := (JobProgressView.Jobs.Count > 0) and not JobProgressView.Finished;
-    if PanelProgressVisible <> PanelProgress.Visible then
-      PanelProgress.Visible := PanelProgressVisible;
-    if PanelProgressVisible then
-      H := H + PanelProgress.Height;
-    PanelProgressTotalVisible := (JobProgressView.Jobs.Count > 1) and not JobProgressView.Finished;
-    if PanelProgressTotalVisible <> PanelProgressTotal.Visible then
-      PanelProgressTotal.Visible := PanelProgressTotalVisible;
-    if PanelProgressTotalVisible then
-      H := H + PanelProgressTotal.Height;
-    Constraints.MinHeight := H;
-    PanelLogVisible := MemoLog.Lines.Count > 0;
-    if PanelLogVisible <> PanelLog.Visible then
-      PanelLog.Visible := PanelLogVisible;
-    if PanelLogVisible then
-      H := H + Scale96ToScreen(MemoLogHeight);
-    if PanelText.Visible then
-      H := H + PanelText.Height;
-    if Height <> H then Height := H;
-end;
-
 procedure TJobProgressView.JobProgressChange(Sender: TObject);
 begin
   if Assigned(FOnOwnerDraw) then
     FOnOwnerDraw(Self);
-end;
-
-procedure TFormJobProgressView.TimerUpdateTimer(Sender: TObject);
-var
-  ProgressBarPartVisible: Boolean;
-  ProgressBarTotalVisible: Boolean;
-begin
-  JobProgressView.UpdateProgress;
-  if Visible and (not ProgressBarPart.Visible) and
-  Assigned(JobProgressView.CurrentJob) and
-  (JobProgressView.CurrentJob.Progress.Value > 0) then begin
-    ProgressBarPartVisible := True;
-    if ProgressBarPartVisible <> ProgressBarPart.Visible then
-      ProgressBarPart.Visible := ProgressBarPartVisible;
-    ProgressBarTotalVisible := True;
-    if ProgressBarTotalVisible <> ProgressBarTotal.Visible then
-      ProgressBarTotal.Visible := ProgressBarTotalVisible;
-  end;
-  if not Visible then begin
-    TimerUpdate.Interval := UpdateInterval;
-    if not JobProgressView.OwnerDraw then Show;
-  end;
-  if Assigned(JobProgressView.CurrentJob) then begin
-    LabelText.Caption := JobProgressView.CurrentJob.Progress.Text;
-    if LabelText.Caption <> '' then begin
-      PanelText.Visible := True;
-      UpdateHeight;
-    end;
-  end;
-end;
-
-procedure TFormJobProgressView.FormDestroy(Sender:TObject);
-begin
-end;
-
-procedure TFormJobProgressView.ListViewJobsData(Sender: TObject; Item: TListItem);
-begin
-  if (Item.Index >= 0) and (Item.Index < JobProgressView.Jobs.Count) then
-  with TJob(JobProgressView.Jobs[Item.Index]) do begin
-    Item.Caption := Title;
-    if Item.Index = JobProgressView.CurrentJobIndex then Item.ImageIndex := 1
-      else if Finished then Item.ImageIndex := 0
-      else Item.ImageIndex := 2;
-    Item.Data := JobProgressView.Jobs[Item.Index];
-  end;
-end;
-
-procedure TFormJobProgressView.FormClose(Sender: TObject;
-  var CloseAction: TCloseAction);
-begin
-end;
-
-procedure TFormJobProgressView.FormCreate(Sender: TObject);
-begin
-  Caption := SPleaseWait;
-  try
-    //Animate1.FileName := ExtractFileDir(UTF8Encode(Application.ExeName)) +
-    //  DirectorySeparator + 'horse.avi';
-    //Animate1.Active := True;
-  except
-
-  end;
-end;
-
-procedure TFormJobProgressView.ReloadJobList;
-begin
-  // Workaround for not showing first line
-  //Form.ListViewJobs.Items.Count := Jobs.Count + 1;
-  //Form.ListViewJobs.Refresh;
-
-  if ListViewJobs.Items.Count <> JobProgressView.Jobs.Count then
-    ListViewJobs.Items.Count := JobProgressView.Jobs.Count;
-  ListViewJobs.Refresh;
-  Application.ProcessMessages;
-  UpdateHeight;
-end;
-
-procedure TFormJobProgressView.FormShow(Sender: TObject);
-begin
-  ReloadJobList;
-end;
-
-procedure TFormJobProgressView.FormHide(Sender: TObject);
-begin
-  JobProgressView.Jobs.Clear;
-  ReloadJobList;
 end;
 
@@ -471 +487 @@
     Sleep(Quantum);
   end;
-end;
-
-procedure TFormJobProgressView.FormCloseQuery(Sender: TObject; var CanClose: Boolean);
-begin
-  CanClose := JobProgressView.Finished;
-  JobProgressView.Terminate := True;
-  Caption := SPleaseWait + STerminate;
 end;
 
@@ -539 +548 @@
   inherited;
   if not (csDesigning in ComponentState) then begin
-    Form := TFormJobProgressView.Create(Self);
-    Form.JobProgressView := Self;
+    FForm := TFormJobProgressView.Create(Self);
+    FForm.JobProgressView := Self;
   end;
   Jobs := TJobs.Create;
   Log := TStringList.Create;
   //PanelOperationsTitle.Height := 80;
-  ShowDelay := 0; //1000; // ms
+  AutoClose := True;
+  ShowDelay := 0;
 end;
 
@@ -551 +561 @@
 begin
   Jobs.Clear;
+  Log.Clear;
   //ReloadJobList;
 end;
@@ -560 +571 @@
   inherited;
 end;
+
+{ TProgress }
 
 procedure TProgress.SetMax(const AValue: Integer);
@@ -606 +619 @@
 end;
 
-{ TProgress }
-
 procedure TProgress.Increment;
 begin