Improvement: progress bar checking file movement

r57zone · Jan 30, 2021 · 9d05f69 · 9d05f69
1 parent bbdf72b
commit 9d05f69
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/Source/Languages/English.ini b/Source/Languages/English.ini
@@ -26,7 +26,7 @@ ID_RENAME_FILE=File is being renamed:
 ID_REMOVE_FILE=File is being deleted:
 ID_CREATE_FOLDER=Folder is being created:
 ID_REMOVE_FOLDER=Folder is being deleted:
-ID_CHECK_MOVE_FILES=Checking files for movement
+ID_CHECK_MOVE_FILES=Checking files for movement...
 
 ID_COMPLETED=Completed
 ID_COMPLETED_ERROR=Completed with errors

diff --git a/Source/Languages/Russian.ini b/Source/Languages/Russian.ini
@@ -26,7 +26,7 @@ ID_RENAME_FILE=
 ID_REMOVE_FILE=Идёт удаление файла:
 ID_CREATE_FOLDER=Идёт создание папки:
 ID_REMOVE_FOLDER=Идёт удаление папки:
-ID_CHECK_MOVE_FILES=Проверка файлов на перемещение
+ID_CHECK_MOVE_FILES=Проверка файлов на перемещение...
 
 ID_COMPLETED=Завершено
 ID_COMPLETED_ERROR=Завершено с ошибками

diff --git a/Source/Unit1.pas b/Source/Unit1.pas
@@ -302,7 +302,9 @@ procedure TMain.CheckRemoteFilesToMove; //Если файл был переме
   if Actions.Count = 0 then Exit;
   StatusText(ID_CHECK_MOVE_FILES);
 
-  for i:=0 to Actions.Count - 1 do
+  ProgressBar.Max:=Actions.Count;
+
+  for i:=0 to Actions.Count - 1 do begin
 		if Copy(Actions.Strings[i], 1, 7) = 'DELETE ' then begin
       ActionStr:=Actions.Strings[i];
 		  Delete(ActionStr, 1, 7);
@@ -330,9 +332,13 @@ procedure TMain.CheckRemoteFilesToMove; //Если файл был переме
 
       end;
     end;
+    ProgressBar.Position:=i + 1; //Отображаем прогресс
+  end;
 
   //Убираем исправленные действия
   Actions.Text:=StringReplace(Actions.Text, 'FIXED' + #13#10, '', [rfReplaceAll]);
+
+  ProgressBar.Position:=0;
 end;
 
 procedure TMain.ChooseAllBtnClick(Sender: TObject);
@@ -939,8 +945,8 @@ procedure TMain.StopBtnClick(Sender: TObject);
 
 procedure TMain.AboutBtnClick(Sender: TObject);
 begin
-  Application.MessageBox(PChar(Caption + ' 0.8.2' + #13#10 +
-  ID_LAST_UPDATE + ' 28.01.2021' + #13#10 +
+  Application.MessageBox(PChar(Caption + ' 0.8.3' + #13#10 +
+  ID_LAST_UPDATE + ' 30.01.2021' + #13#10 +
   'https://r57zone.github.io' + #13#10 +
   'r57zone@gmail.com'), PChar(ID_ABOUT_TITLE), MB_ICONINFORMATION);
 end;