Changeset 15 for trunk/Forms

Timestamp:

Jul 13, 2015, 11:44:23 AM (9 years ago)

Author:

chronos

Message:

• Added: Support for reading file status from working copy.

Location:

trunk/Forms

Files:

• UFormBrowse.lfm (modified) (4 diffs)
• UFormBrowse.pas (modified) (8 diffs)

trunk/Forms/UFormBrowse.lfm

@@ -1 +1 @@
 object FormBrowse: TFormBrowse
-  Left = 952
-  Height = 526
-  Top = 287
-  Width = 722
+  Left = 479
+  Height = 538
+  Top = 279
+  Width = 964
   Caption = 'Browse'
-  ClientHeight = 526
-  ClientWidth = 722
+  ClientHeight = 538
+  ClientWidth = 964
+  Menu = MainMenu1
   OnCreate = FormCreate
   OnDestroy = FormDestroy
@@ -13 +14 @@
   object TreeView1: TTreeView
     Left = 0
-    Height = 526
+    Height = 538
     Top = 0
     Width = 241
     Align = alLeft
-    DefaultItemHeight = 28
+    DefaultItemHeight = 24
     TabOrder = 0
   end
   object Splitter1: TSplitter
     Left = 241
-    Height = 526
+    Height = 538
     Top = 0
     Width = 5
@@ -28 +29 @@
   object ListView1: TListView
     Left = 246
-    Height = 526
+    Height = 538
     Top = 0
-    Width = 476
+    Width = 718
     Align = alClient
     Columns = <    
@@ -121 +122 @@
     end
   end
+  object MainMenu1: TMainMenu
+    left = 429
+    top = 516
+  end
 end

trunk/Forms/UFormBrowse.pas

@@ -7 +7 @@
 uses
   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, ComCtrls,
-  ExtCtrls, Menus, ActnList, UFindFile, UVCS;
+  ExtCtrls, Menus, ActnList, UFindFile, UVCS, Contnrs;
 
 type
@@ -23 +23 @@
     ActionList1: TActionList;
     ListView1: TListView;
+    MainMenu1: TMainMenu;
     MenuItem1: TMenuItem;
     MenuItem2: TMenuItem;
@@ -46 +47 @@
       Selected: Boolean);
   private
-    FileList: TStringList;
+    FileList: TObjectList;
   public
     Directory: string;
@@ -67 +68 @@
 procedure TFormBrowse.ListView1Data(Sender: TObject; Item: TListItem);
 begin
-  if (Item.Index >= 0) and (Item.Index < FileList.Count) then begin
-    Item.Caption := ExtractFileName(FileList[Item.Index]);
+  if (Item.Index >= 0) and (Item.Index < FileList.Count) then
+  with TFileStatus(FileList[Item.Index]) do begin
+    Item.Caption := ExtractFileName(FileName);
+    if State <> fssNonVersioned then begin
+      Item.SubItems.Add(Version);
+      Item.SubItems.Add(DateToStr(Time));
+      Item.SubItems.Add(Author);
+      Item.SubItems.Add(FileStatusStateText[State]);
+    end;
   end;
 end;
@@ -124 +132 @@
 procedure TFormBrowse.FormCreate(Sender: TObject);
 begin
-  FileList := TStringList.Create;
+  FileList := TObjectList.Create;
 end;
 
@@ -142 +150 @@
   FoundFileList: TStrings;
   I: Integer;
-begin
+  FileStatusList: TFileStatusList;
+  NewFileItem: TFileStatus;
+  FS: TFileStatus;
+  RelativeName: string;
+begin
+  FileList.Clear;
+  if Assigned(Core.Project) then begin
+  FileStatusList := TFileStatusList.Create;
+  try
+  Core.Project.WorkingCopy.GetStatus(Directory, FileStatusList);
+
   if DirectoryExistsUTF8(Directory) then begin
     FindFile := TFindFile.Create(nil);
@@ -150 +168 @@
       FindFile.InSubFolders := False;
       FoundFileList := FindFile.SearchForFiles;
-      FileList.Assign(FoundFileList);
+      //FoundFileList.Sort;
+      for I := 0 to FoundFileList.Count - 1 do begin
+        NewFileItem := TFileStatus.Create;
+        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, 1) = DirectorySeparator then
+          Delete(RelativeName, 1, Length(DirectorySeparator));
+        FS := FileStatusList.SearchByName(RelativeName);
+        if Assigned(FS) then begin
+          NewFileItem.Assign(FS);
+        end;
+        FileList.Add(NewFileItem);
+      end;
       for I := FileList.Count - 1 downto 0 do
-        if ExtractFileName(FileList[I]) = '.' then FileList.Delete(I);
-      FileList.Sort;
+        if ExtractFileName(TFileStatus(FileList[I]).FileName) = '.' then FileList.Delete(I);
       ListView1.Items.Count := FileList.Count;
     finally
@@ -159 +190 @@
     end;
   end else ListView1.Items.Count := 0;
+  finally
+    FileStatusList.Free;
+  end;
+  end;
   ListView1.Refresh;
 end;