Changeset 55 for branches/DelphiToC/Forms

Timestamp:

Aug 10, 2010, 1:48:38 PM (15 years ago)

Author:

george

Message:

Fix: View proper source file after click to error message.
Made partial changes to support unit interface and implementation sections.

Location:

branches/DelphiToC/Forms

Files:

• UMainForm.lfm (modified) (7 diffs)
• UMainForm.pas (modified) (7 diffs)

branches/DelphiToC/Forms/UMainForm.lfm

@@ -3 +3 @@
   Height = 494
   Top = 103
-  Width = 884
+  Width = 861
   Caption = 'Transpascal '
   ClientHeight = 494
-  ClientWidth = 884
+  ClientWidth = 861
   Font.Height = -11
   Font.Name = 'Tahoma'
@@ -16 +16 @@
   LCLVersion = '0.9.29'
   object ButtonCompile: TButton
-    Left = 736
+    Left = 713
     Height = 22
     Top = 397
@@ -28 +28 @@
     TabOrder = 0
   end
-  inline SynEdit1: TSynEdit
+  inline SynEditSource: TSynEdit
     Left = 248
     Height = 384
@@ -611 +611 @@
       end>
     Lines.Strings = (
-      'SynEdit1'
+      'SynEditSource'
     )
     BracketHighlightStyle = sbhsBoth
@@ -723 +723 @@
   end
   object ComboBox1: TComboBox
-    Left = 735
+    Left = 712
     Height = 21
     Top = 424
     Width = 144
-    Anchors = [akLeft, akRight, akBottom]
+    Anchors = [akRight, akBottom]
     ItemHeight = 13
     ItemIndex = 0
@@ -741 +741 @@
     Text = 'Pascal'
   end
-  object ListBox1: TListBox
+  object ListBoxMessages: TListBox
     Left = 8
     Height = 91
     Top = 398
-    Width = 720
+    Width = 697
     Anchors = [akLeft, akRight, akBottom]
     ItemHeight = 0
-    OnClick = ListBox1Click
+    OnClick = ListBoxMessagesClick
     TabOrder = 3
   end
@@ -755 +755 @@
     Height = 382
     Top = 8
-    Width = 231
+    Width = 208
     Anchors = [akTop, akLeft, akRight, akBottom]
     BevelOuter = bvNone

branches/DelphiToC/Forms/UMainForm.pas

@@ -20 +20 @@
     ButtonCompile: TButton;
     ComboBox1: TComboBox;
-    ListBox1: TListBox;
+    ListBoxMessages: TListBox;
     Panel1: TPanel;
-    SynEdit1: TSynEdit;
+    SynEditSource: TSynEdit;
     SynPasSyn1: TSynPasSyn;
     TreeViewProject: TTreeView;
@@ -31 +31 @@
     procedure FormCreate(Sender: TObject);
     procedure FormDestroy(Sender: TObject);
-    procedure ListBox1Click(Sender: TObject);
+    procedure ListBoxMessagesClick(Sender: TObject);
     procedure TreeViewProjectChange(Sender: TObject; Node: TTreeNode);
   private
@@ -79 +79 @@
 
   // Compile all project files
+  Compiler.Init;
   for I := 0 to Project.Items.Count - 1 do begin
-    if TProjectNode(Project.Items[I]) is TProjectFile then begin
-      Compiler.Compile(TProjectFile(Project.Items[I]).Source,
-        TProjectFile(Project.Items[I]).ProducedCode);
+    if TProjectNode(Project.Items[I]) is TProjectFile then
+    with TProjectFile(Project.Items[I]) do begin
+      Compiler.Compile(Parent.GetDir + Name, Source, ProducedCode);
     end;
   end;
@@ -113 +114 @@
 end;
 
-procedure TMainForm.ListBox1Click(Sender: TObject);
-begin
-  if ListBox1.ItemIndex <> - 1 then begin
-    SynEdit1.CaretXY := TErrorMessage(Compiler.ErrorMessages[ListBox1.ItemIndex]).Position;
-    SynEdit1.SetFocus;
+procedure TMainForm.ListBoxMessagesClick(Sender: TObject);
+var
+  ProjectFile: TProjectFile;
+begin
+  if ListBoxMessages.ItemIndex <> -1 then
+  with TErrorMessage(Compiler.ErrorMessages[ListBoxMessages.ItemIndex]) do begin
+    ProjectFile := Project.SearchFile(fileName);
+    if Assigned(ProjectFile) then
+      SynEditSource.Lines.Assign(ProjectFile.Source);
+    SynEditSource.CaretXY := Position;
+    SynEditSource.SetFocus;
   end;
 end;
@@ -125 +132 @@
   I: Integer;
 begin
-  ListBox1.Clear;
+  ListBoxMessages.Clear;
   for I := 0 to Compiler.ErrorMessages.Count - 1 do
   with TErrorMessage(Compiler.ErrorMessages[I]) do
-    MainForm.ListBox1.Items.Add('(' + IntToStr(Position.X) +
+    MainForm.ListBoxMessages.Items.Add(FileName + '(' + IntToStr(Position.X) +
       ',' + IntToStr(Position.Y) + ') ' + Text);
 end;
@@ -136 +143 @@
   if Assigned(Node) then begin
     if TProjectNode(Node.Data) is TProjectFile then begin
-      SynEdit1.Lines.Assign(TProjectFile(Node.Data).Source);
+      SynEditSource.Lines.Assign(TProjectFile(Node.Data).Source);
       if ProducerControl is TMemo then
         TMemo(ProducerControl).Lines.Assign(TProjectFile(Node.Data).ProducedCode);
@@ -193 +200 @@
   NewProjectFile: TProjectFile;
 begin
+  Project.RootDir := '../../Project/';
   Project.Name := 'Project';
+
   NewProjectFile := TProjectFile.Create;
+  NewProjectFile.Parent := Project;
   NewProjectFile.Name := 'Project.pas';
-  NewProjectFile.FileName := ProjectDir + 'Project.pas';
   Project.Items.Add(NewProjectFile);
+
   NewProjectFile := TProjectFile.Create;
+  NewProjectFile.Parent := Project;
   NewProjectFile.Name := 'System.pas';
-  NewProjectFile.FileName := ProjectDir + 'System.pas';
   Project.Items.Add(NewProjectFile);
+
+  NewProjectFile := TProjectFile.Create;
+  NewProjectFile.Parent := Project;
+  NewProjectFile.Name := 'Console.pas';
+  Project.Items.Add(NewProjectFile);
+
   Project.Load;
   UpdateProjectTree;