Changeset 62 for branches/Transpascal/Forms

Timestamp:

Oct 15, 2010, 7:09:49 AM (15 years ago)

Author:

george

Message:

• Added: Windows for Code tree and compiled code.

Location:

branches/Transpascal/Forms

Files:

• UCodeForm.lfm (modified) (1 diff)
• UCodeTreeForm.lfm (added)
• UCodeTreeForm.pas (added)
• UCompiledForm.lfm (added)
• UCompiledForm.pas (added)
• UMainForm.lfm (modified) (5 diffs)
• UMainForm.pas (modified) (7 diffs)
• UProjectManager.pas (modified) (3 diffs)

branches/Transpascal/Forms/UCodeForm.lfm

@@ -69 +69 @@
         Priority = 0
       end>
+    Highlighter = SynPasSyn1
     Keystrokes = <    
       item

branches/Transpascal/Forms/UMainForm.lfm

@@ -1 +1 @@
 object MainForm: TMainForm
-  Left = 114
-  Height = 504
-  Top = 122
-  Width = 861
+  Left = 142
+  Height = 501
+  Top = 113
+  Width = 695
   Caption = 'Transpascal IDE'
-  ClientHeight = 504
-  ClientWidth = 861
+  ClientHeight = 482
+  ClientWidth = 695
   Font.Height = -11
   Font.Name = 'Tahoma'
@@ -20 +20 @@
     Left = 0
     Height = 5
-    Top = 480
-    Width = 861
+    Top = 477
+    Width = 695
     Align = alBottom
     ResizeAnchor = akBottom
@@ -27 +27 @@
   object DockPanel: TPanel
     Left = 0
-    Height = 454
+    Height = 451
     Top = 26
-    Width = 861
+    Width = 695
     Align = alClient
     BevelOuter = bvNone
@@ -38 +38 @@
     Height = 26
     Top = 0
-    Width = 861
+    Width = 695
     Caption = 'ToolBar1'
     TabOrder = 2
@@ -47 +47 @@
       Width = 100
       ItemHeight = 13
+      ItemIndex = 1
+      Items.Strings = (
+        'Pascal'
+        'C'
+        'AS8051'
+        'XML'
+      )
+      Style = csDropDownList
       TabOrder = 0
-      Text = 'ComboBox1'
+      Text = 'C'
     end
     object Button1: TButton

branches/Transpascal/Forms/UMainForm.pas

@@ -9 +9 @@
   Dialogs, StdCtrls, UCompiler, UProducerAsm8051,
   UProducerC, ComCtrls, ExtCtrls, SynEdit, SynHighlighterPas, UProducerTreeView,
-  UProducerPascal, Contnrs, UProject, FileUtil, Menus, ActnList, UCoolDocking;
+  UProducerPascal, Contnrs, UProject, FileUtil, Menus, ActnList, UCoolDocking,
+  UCompiledForm, UCodeTreeForm;
 
 const
@@ -51 +52 @@
     procedure Splitter2CanResize(Sender: TObject; var NewSize: Integer;
       var Accept: Boolean);
-    procedure TreeViewProjectChange(Sender: TObject; Node: TTreeNode);
   private
     procedure LoadErrorMessages;
     procedure UpdateProjectTree;
     procedure UpdateProjectGroup(Node: TTreeNode; Group: TProjectGroup);
-    function GetSource(Name: string; Source: TStringList): Boolean;
     procedure DockInit;
   public
     Project: TProject;
-    ProducerControl: TControl;
     Compiler: TCompiler;
+    function GetSource(Name: string; Source: TStringList): Boolean;
   end;
 
@@ -80 +79 @@
   I: Integer;
 begin
-  ProducerControl.Free;
   if ComboBox1.ItemIndex = 0 then begin
     Compiler.Producer.Free;
@@ -96 +94 @@
     Compiler.Producer.Free;
     Compiler.Producer := TProducerTreeView.Create;
-    ProducerControl := TTreeView.Create(Self);
-    ProducerControl.Parent := DockPanel;
-    ProducerControl.Align := alClient;
-//    TProducerTreeView(Compiler.Producer).TreeView := TTreeView(ProducerControl);
   end;
 
@@ -107 +101 @@
   with TProjectFile(Project.Items[0]) do begin
     Compiler.Compile(Parent.GetDir + Name, Source);
-  end;
-
-  if ComboBox1.ItemIndex = 0 then begin
-    ProducerControl := TMemo.Create(Self);
-    ProducerControl.Parent := DockPanel;
-    ProducerControl.Align := alClient;
-    ProducerControl.Font.Name := 'Courier New';
-    TMemo(ProducerControl).ScrollBars := ssAutoBoth;
-  end else
-  if ComboBox1.ItemIndex = 1 then begin
-    ProducerControl := TMemo.Create(Self);
-    ProducerControl.Parent := DockPanel;
-    ProducerControl.Align := alClient;
-    ProducerControl.Font.Name := 'Courier New';
-    TMemo(ProducerControl).ScrollBars := ssAutoBoth;
-  end else
-  if ComboBox1.ItemIndex = 2 then begin
-    ProducerControl := TMemo.Create(Self);
-    ProducerControl.Parent := DockPanel;
-    ProducerControl.Align := alClient;
-    ProducerControl.Font.Name := 'Courier New';
-    TMemo(ProducerControl).ScrollBars := ssAutoBoth;
-  end else
-  if ComboBox1.ItemIndex = 3 then begin
   end;
 
@@ -219 +189 @@
 var
   Container1: TCoolDockConjoinForm;
+  Container2: TCoolDockConjoinForm;
 begin
   ProjectManager.ManualDock(DockPanel, nil, alLeft);
@@ -228 +199 @@
   Container1.ManualDock(DockPanel, nil, alRight);
 
-  CodeForm.ManualDock(Container1.Panel, nil, alTop);
-  CodeForm.Show;
+  CodeTreeForm.ManualDock(DockPanel, nil, alLeft);
+  CodeTreeForm.Show;
+  Container1.Parent.Parent.Width := MainForm.Width;
+
+  Container2 := TCoolDockManager(DockPanel.DockManager).CreateContainer(alRight);
+  Container2.Caption := 'Panel';
+  Container2.Name := 'Tools2';
+  Container2.ManualDock(Container1.Panel, nil, alRight);
+
   MessagesForm.ManualDock(Container1.Panel, nil, alBottom);
   MessagesForm.Show;
 
+  CodeForm.ManualDock(Container2.Panel, nil, alTop);
+  CodeForm.Show;
+
+  CompiledForm.ManualDock(Container2.Panel, nil, alTop);
+  CompiledForm.Show;
+
+  TCoolDockManager(Container2.Panel.DockManager).DockStyle := dsTabs;
+
   ProjectManager.Parent.Parent.Width := 200;
-  CodeForm.Parent.Parent.Height := MainForm.Height;
+  Container2.Parent.Parent.Height := MainForm.Height;
 end;
 

branches/Transpascal/Forms/UProjectManager.pas

@@ -1 +1 @@
 unit UProjectManager;
-
-{$mode objfpc}{$H+}
 
 interface
@@ -30 +28 @@
 
 uses
-  UMainForm, UCodeForm;
+  UMainForm, UCodeForm, UCompiledForm, UCodeTreeForm, UProducerTreeView;
 
 { TProjectManager }
@@ -45 +43 @@
       FileName := Compiler.CompiledFolder + DirectorySeparator +
         Compiler.Producer.ClassName + DirectorySeparator + ExtractFileNameOnly(TProjectFile(Node.Data).Name) + Compiler.Producer.FileExtension;
-      if ProducerControl is TMemo then
         if FileExists(FileName) then
-        TMemo(ProducerControl).Lines.LoadFromFile(FileName) else
-          TMemo(ProducerControl).Lines.Clear;
-      //if ProducerControl is TTreeView then
-      //  TTreeView(ProducerControl).Assign(TProjectFile(Node.Data).ProducedCode);
+        CompiledForm.SynEdit1.Lines.LoadFromFile(FileName) else
+          CompiledForm.SynEdit1.Lines.Clear;
+
+      // Load code tree view
+      Compiler.Producer.Free;
+      Compiler.Producer := TProducerTreeView.Create;
+      Compiler.Init;
+      Compiler.Parser.OnGetSource := GetSource;
+      with TProjectFile(Project.Items[0]) do begin
+        Compiler.Compile(Parent.GetDir + Name, Source);
+      end;
+      //CodeTreeForm.TreeView1.Assign(TProducerTreeView(Compiler.Producer).TreeView);
     end;
   end;