Set corresponding label and progress bar visibility in progress dialog

1 files changed, 9 insertions, 8 deletions

diff --git a/UMain.pas b/UMain.pas
index 6d01b9a..2549b32 100644
--- a/UMain.pas
+++ b/UMain.pas
@@ -2451,7 +2451,7 @@ begin
     AWorkingThread.Engine := Engine;
     AWorkingThread.LeftPanel := LeftPanel;
     AWorkingThread.DataList := DataList;
-    AWorkingThread.WorkerProcedure := DeleteFilesWorker;
+    AWorkingThread.JobType := WORKER_JOB_DELETE;
     AWorkingThread.Resume;
     ProcessThreadEvents(AWorkingThread);
   finally
@@ -2646,7 +2646,8 @@ begin
 
     AWorkingThread.LeftPanel := LeftPanel;
     AWorkingThread.DataList := DataList;
-    AWorkingThread.WorkerProcedure := CopyFilesWorker;
+    if CopyMode then AWorkingThread.JobType := WORKER_JOB_COPY
+                else AWorkingThread.JobType := WORKER_JOB_MOVE;
 //    AWorkingThread.WorkerProcedure := DummyThreadWorker;
     AWorkingThread.ParamBool3 := CopyMode;
     AWorkingThread.ParamBool4 := False; 
@@ -2886,7 +2887,7 @@ begin
       AWorkingThread.DestEngine := Engine;
       AWorkingThread.LeftPanel := AListView = LeftListView;
       AWorkingThread.DataList := DataList;
-      AWorkingThread.WorkerProcedure := CopyFilesWorker;
+      AWorkingThread.JobType := WORKER_JOB_MOVE;
       AWorkingThread.ParamBool3 := False;
       AWorkingThread.ParamBool4 := True;
       AWorkingThread.ParamString1 := UTF8ToStr(NewText);
@@ -3251,7 +3252,7 @@ begin
     AWorkingThread.ParamInt64 := TargetSize;
     AWorkingThread.Engine := Engine;
     AWorkingThread.LeftPanel := LeftPanel;
-    AWorkingThread.WorkerProcedure := MergeFilesWorker;
+    AWorkingThread.JobType := WORKER_JOB_MERGE;
     AWorkingThread.Resume;
     ProcessThreadEvents(AWorkingThread);
     s := AWorkingThread.ParamString3;
@@ -3334,7 +3335,7 @@ begin
     AWorkingThread.ParamInt64 := MaxSize; 
     AWorkingThread.Engine := Engine;
     AWorkingThread.LeftPanel := LeftPanel;
-    AWorkingThread.WorkerProcedure := SplitFilesWorker;
+    AWorkingThread.JobType := WORKER_JOB_SPLIT;
     AWorkingThread.Resume;
     ProcessThreadEvents(AWorkingThread);
   finally
@@ -3986,7 +3987,7 @@ begin
         AWorkingThread.Engine := Engine;
         AWorkingThread.LeftPanel := LeftPanel;
         AWorkingThread.DataList := DataList;
-        AWorkingThread.WorkerProcedure := ChmodFilesWorker;
+        AWorkingThread.JobType := WORKER_JOB_CHMOD;
         AWorkingThread.Resume;
         ProcessThreadEvents(AWorkingThread);
       finally
@@ -4070,7 +4071,7 @@ begin
         AWorkingThread.Engine := Engine;
         AWorkingThread.LeftPanel := LeftPanel;
         AWorkingThread.DataList := DataList;
-        AWorkingThread.WorkerProcedure := ChownFilesWorker;
+        AWorkingThread.JobType := WORKER_JOB_CHOWN;
         AWorkingThread.Resume;
         ProcessThreadEvents(AWorkingThread);
       finally
@@ -6462,7 +6463,7 @@ begin
     AWorkingThread.ExtractFromVFSAll := ExtractAll;
     AWorkingThread.LeftPanel := LeftLastFocused;
     AWorkingThread.DataList := DataList;
-    AWorkingThread.WorkerProcedure := CopyFilesWorker;
+    AWorkingThread.JobType := WORKER_JOB_COPY;
     AWorkingThread.ParamBool3 := True;
     AWorkingThread.ParamBool4 := False;
     AWorkingThread.ParamBool5 := True;