Changeset 47 for trunk/IDE/Forms

Timestamp:

Mar 4, 2012, 3:38:44 PM (13 years ago)

Author:

chronos

Message:

• Modified: Project now hold file list as linear list each include relative path to source instead of tree structure. This allow link to files outside of project folder.

Location:

trunk/IDE/Forms

Files:

• UFormMain.pas (modified) (4 diffs)
• UFormMessages.pas (modified) (1 diff)
• UFormProject.pas (modified) (4 diffs)

trunk/IDE/Forms/UFormMain.pas

@@ -232 +232 @@
       else Compiler.Analyzer.OnDebugLog := nil;
 
-    if Project.Items.Count > 0 then
-    with TProjectFile(Project.Items[0]) do begin
+    if Project.Files.Count > 0 then
+    with TProjectFile(Project.Files[0]) do begin
       Compiler.SourceFiles.Clear;
-      Project.DumpFileList(Compiler.SourceFiles);
-      Compiler.TargetFolder := Project.RootDir;
+      Project.Files.DumpFileList(Compiler.SourceFiles);
+      Compiler.TargetFolder := ExtractFileDir(Project.FileName);
       Compiler.Compile;
     end;
-    FormProject.TreeViewProjectChange(Self, FormProject.TreeViewProject.Selected);
+    //FormProject.TreeViewProjectChange(Self, FormProject.TreeViewProject.Selected);
     FormMessages.Reload;
 end;
@@ -283 +283 @@
   F: TFileStream;
 begin
-  FileName := Project.GetDir(True) + Name + '.pas';
+  FileName := ExtractFileDir(Project.FileName) + Name + '.pas';
   if FileExists(FileName) then
   try
@@ -302 +302 @@
 begin
   Title := ApplicationInfo.Name;
-  if Project.Name <> '' then Title := Project.Name + ' - ' + Title;
+  if Project.FileName <> '' then Title := Project.FileName + ' - ' + Title;
   if Project.Modified then Title := Title + ' *';
   Caption := Title;
@@ -557 +557 @@
 
 procedure TFormMain.AProjectNewExecute(Sender: TObject);
+var
+  NewFile: TProjectFile;
 begin
   AProjectClose.Execute;
   Project.Active := True;
-  Project.Name := SNewProject;
+  Project.FileName := SNewProject;
+  Project.Files.AddFile('Unit1.pas');
   UpdateInterface;
 end;

trunk/IDE/Forms/UFormMessages.pas

@@ -70 +70 @@
   if Assigned(ListView1.Selected) then
   with TErrorMessage(ListView1.Selected.Data) do begin
-    ProjectFile := Project.SearchFile(FileName);
+    ProjectFile := Project.Files.SearchFile(FileName);
     if Assigned(ProjectFile) then
       SynEditSource.Lines.Assign(ProjectFile.Source);

trunk/IDE/Forms/UFormProject.pas

@@ -15 +15 @@
     procedure TreeViewProjectChange(Sender: TObject; Node: TTreeNode);
   private
-    procedure UpdateProjectGroup(Node: TTreeNode; Group: TProjectGroup);
+    procedure UpdateProjectFiles(Node: TTreeNode; Files: TProjectFileList);
   public
     procedure UpdateProjectTree;
@@ -38 +38 @@
   with FormMain, FormSourceCode do
   if Assigned(Node) then begin
-    if TProjectNode(Node.Data) is TProjectFile then begin
+    if TProjectFile(Node.Data) is TProjectFile then begin
       ProjectFile := TProjectFile(Node.Data);
       SynEditSource.Lines.Assign(TProjectFile(Node.Data).Source);
@@ -75 +75 @@
     Clear;
     if Project.Active then begin
-      NewNode := AddChild(nil, Project.Name);
-      UpdateProjectGroup(NewNode, Project);
+      NewNode := AddChild(nil, ExtractFileNameOnly(Project.FileName));
+      UpdateProjectFiles(NewNode, Project.Files);
       NewNode.Expand(True);
     end;
@@ -92 +92 @@
 end;
 
-procedure TFormProject.UpdateProjectGroup(Node: TTreeNode; Group: TProjectGroup);
+procedure TFormProject.UpdateProjectFiles(Node: TTreeNode; Files: TProjectFileList);
 var
   I: Integer;
   NewNode: TTreeNode;
+  FileName: string;
+  NamePart: string;
+  SelNode: TTreeNode;
+  SubNode: TTreeNode;
 begin
-  with FormMain do
-  for I := 0 to Group.Items.Count - 1 do begin
-    NewNode := TreeViewProject.Items.AddChild(Node,
-      TProjectNode(Group.Items[I]).Name);
-    NewNode.Data := Pointer(Group.Items[I]);
-    if TProjectNode(Group.Items[I]) is TProjectGroup then
-      UpdateProjectGroup(NewNode, TProjectGroup(Group.Items[I]));
+  for I := 0 to Files.Count - 1 do begin
+    FileName := TProjectFile(Files[I]).FileName;
+    SelNode := Node;
+    while Pos(DirectorySeparator, FileName) > 0 do begin
+      NamePart := Copy(FileName, 1, Pos(DirectorySeparator, FileName) - 1);
+      Delete(FileName, 1, Length(NamePart) + 1);
+      SubNode := SelNode.FindNode(NamePart);
+      if Assigned(SubNode) then SelNode := SubNode
+      else begin
+        SelNode := TreeViewProject.Items.AddChild(SelNode, NamePart);
+      end;
+    end;
+    NewNode := TreeViewProject.Items.AddChild(SelNode, FileName);
+    NewNode.Data := Pointer(Files[I]);
   end;
 end;
 
-
-
 end.