Changeset 23 for trunk/Forms/FormBrowse.pas

Timestamp:

Apr 4, 2025, 9:22:05 AM (2 weeks ago)

Author:

chronos

Message:

• Modified: All unit renamed to names without U prefix.
• Modified: Removed global form variables.
• Modified: Code cleanup.

File:

• trunk/Forms/FormBrowse.pas (moved) (moved from trunk/Forms/UFormBrowse.pas ) (8 diffs)

trunk/Forms/FormBrowse.pas

@@ -1 @@
-unit UFormBrowse;
+unit FormBrowse;
 
 interface
@@ -5 +5 @@
 uses
   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, ComCtrls,
-  ExtCtrls, Menus, ActnList, FindFile, UVCS, Contnrs, LazFileUtils;
+  ExtCtrls, Menus, ActnList, FindFile, VCS, Generics.Collections, LazFileUtils;
 
 type
@@ -45 +45 @@
       Selected: Boolean);
   private
-    FileList: TObjectList;
+    FileList: TFileStatusList;
   public
     Directory: string;
@@ -52 +52 @@
   end;
 
-var
-  FormBrowse: TFormBrowse;
-
 
 implementation
 
 uses
-  UCore, UFormLog;
+  Core, FormLog;
 
 {$R *.lfm}
@@ -96 +93 @@
 
 procedure TFormBrowse.ALogShowExecute(Sender: TObject);
-begin
-  FormLog.FileName := Directory + DirectorySeparator + ListView1.Selected.Caption;
-  FormLog.ShowModal;
+var
+  FormLog: TFormLog;
+begin
+  FormLog := TFormLog.Create(nil);
+  try
+    FormLog.FileName := Directory + DirectorySeparator + ListView1.Selected.Caption;
+    FormLog.ShowModal;
+  finally
+    FormLog.Free;
+  end;
 end;
 
 procedure TFormBrowse.AAddExecute(Sender: TObject);
 begin
-  Core.Project.WorkingCopy.Add(Directory + DirectorySeparator + ListView1.Selected.Caption);
+  Core.Core.Project.WorkingCopy.Add(Directory + DirectorySeparator + ListView1.Selected.Caption);
 end;
 
@@ -126 +130 @@
 begin
   if InputQuery('Rename', 'Enter new name', NewName) then
-    Core.Project.WorkingCopy.Move(Directory + DirectorySeparator + ListView1.Selected.Caption, NewName);
+    Core.Core.Project.WorkingCopy.Move(Directory + DirectorySeparator + ListView1.Selected.Caption, NewName);
 end;
 
 procedure TFormBrowse.FormCreate(Sender: TObject);
 begin
-  FileList := TObjectList.Create;
+  FileList := TFileStatusList.Create;
 end;
 
 procedure TFormBrowse.FormDestroy(Sender: TObject);
 begin
-  FileList.Free;
+  FreeAndNil(FileList);
 end;
 
@@ -155 +159 @@
 begin
   FileList.Clear;
-  if Assigned(Core.Project) then begin
+  if Assigned(Core.Core.Project) then begin
   FileStatusList := TFileStatusList.Create;
   try
-  Core.Project.WorkingCopy.GetStatus(Directory, FileStatusList);
+  Core.Core.Project.WorkingCopy.GetStatus(Directory, FileStatusList);
 
   if DirectoryExistsUTF8(Directory) then begin
@@ -172 +176 @@
         NewFileItem.FileName := FoundFileList[I];
         RelativeName := NewFileItem.FileName;
-        if Copy(RelativeName, 1, Length(Core.Project.WorkingCopy.Path)) = Core.Project.WorkingCopy.Path then
-          Delete(RelativeName, 1, Length(Core.Project.WorkingCopy.Path));
+        if Copy(RelativeName, 1, Length(Core.Core.Project.WorkingCopy.Path)) = Core.Core.Project.WorkingCopy.Path then
+          Delete(RelativeName, 1, Length(Core.Core.Project.WorkingCopy.Path));
         if Copy(RelativeName, 1, 1) = DirectorySeparator then
           Delete(RelativeName, 1, Length(DirectorySeparator));