Changeset 49 for trunk/IDE/Forms

Timestamp:

Mar 4, 2012, 5:26:20 PM (13 years ago)

Author:

chronos

Message:

• Added: Compiled target code now can be browsed using Target project navigation.

Location:

trunk/IDE/Forms

Files:

• UFormMain.lfm (modified) (12 diffs)
• UFormMain.lrt (modified) (2 diffs)
• UFormMain.pas (modified) (9 diffs)
• UFormTargetCode.pas (modified) (3 diffs)
• UFormTargetProject.lfm (added)
• UFormTargetProject.lrt (added)
• UFormTargetProject.pas (added)

trunk/IDE/Forms/UFormMain.lfm

@@ -99 +99 @@
     Top = 26
     Width = 200
-    ActivePage = TabSheetCompiledProject
+    ActivePage = TabSheetTargetProject
     Align = alRight
     TabIndex = 2
@@ -110 +110 @@
       Caption = 'Code Tree'
     end
-    object TabSheetCompiledProject: TTabSheet
+    object TabSheetTargetProject: TTabSheet
       Caption = 'Target project'
     end
@@ -579 +579 @@
     object MenuItem9: TMenuItem
       Caption = 'Help'
+      object MenuItem33: TMenuItem
+        Action = AHelp
+      end
       object MenuItem10: TMenuItem
         Action = AHomepage
@@ -584 +587 @@
       object MenuItem11: TMenuItem
         Action = AAbout
-        Bitmap.Data = {
-          36040000424D3604000000000000360000002800000010000000100000000100
-          2000000000000004000064000000640000000000000000000000000000000000
-          0000000000000000000000000000000000000000000000000000000000000000
-          0000000000000000000000000000000000000000000000000000000000000000
-          00000000000000000000916429FF855A24FF885015FF824A1DFF7E4719FF7944
-          17FF583C0EFF49340DFF00000000000000000000000000000000000000000000
-          000000000000A1692CFFC08858FFE0C9B4FFF7F1ECFFFEFDFCFFFEFDFCFFF5F0
-          ECFFDCC9B8FF9E7857FF473108FF000000000000000000000000000000000000
-          0000B2702BFFDBAB80FFF8EFE7FFE2BBA6FFCC7E56FFC15823FFC05722FFC97F
-          56FFDEBAA7FFF2EBE7FFB39376FF483108FF000000000000000000000000B677
-          34FFD6996BFFF9F0E7FFDDA488FFC75013FFC04E11FFDCA688FFFFFEFEFFB549
-          11FFB64A10FFD59E82FFF3ECE7FF9A7352FF49340DFF0000000000000000B479
-          3AFFEFD6C1FFEDC5B2FFDD5A1AFFD55617FFD25313FFD87D4DFFE3A686FFBB4C
-          11FFB34A12FFB64A10FFDEB9A6FFDCC9B8FF563C0DFF0000000000000000CD7F
-          45FFFCF4EDFFEC9772FFE86021FFE05A1DFFDB5819FFEDAA89FFFFFEFEFFC84E
-          12FFB94C11FFB34C13FFC77B53FFF6F0ECFF7A4319FF0000000000000000CD81
-          47FFFFFEFEFFF87A46FFF96829FFF66525FFF16020FFF18653FFFFFEFEFFF0BF
-          A8FFC55A24FFB64C15FFB75724FFFEFEFDFF7F481AFF0000000000000000CD84
-          4EFFFFFEFEFFFC814CFFFF7031FFFF6B2CFFFD6928FFF86523FFF49265FFFDF5
-          F1FFF4D4C5FFC65018FFBA5927FFFEFEFDFF834A1CFF0000000000000000D183
-          4CFFFCF7F1FFFAA582FFFF733AFFFF844EFFFFAE8AFFFE6C2DFFF76727FFF192
-          68FFFFFEFEFFE98354FFD78560FFF8F1ECFF81551FFF0000000000000000C483
-          41FFF0DAC3FFFAD1C0FFFF7940FFFF986EFFFFFEFEFFFFC9B2FFFD9164FFFAC6
-          AFFFFEF5F1FFF5773DFFEDC5B2FFE4CBB3FF905D21FF0000000000000000C484
-          45FFDCA277FFFCF4EDFFFABFA6FFFF7A43FFFFBB9EFFFFF6F3FFFFFEFEFFFEED
-          E5FFFA9970FFF3B69CFFF8F0E6FFBB8B56FF986426FF00000000000000000000
-          0000C48443FFE5B999FFFCF4EDFFFBD2C1FFFAA887FFFD8757FFFD8454FFF8A5
-          82FFF7CEBDFFFAF1E7FFD2A77AFFA36A2AFF0000000000000000000000000000
-          000000000000C58442FFDCA277FFF3DAC7FFFCF7F1FFFFFEFEFFFFFEFEFFFCF4
-          EDFFF1D6C0FFC7935DFFA66F33FF000000000000000000000000000000000000
-          00000000000000000000C58444FFC28342FFD89C6DFFD69668FFD49463FFD696
-          68FFB2793CFFB1783BFF00000000000000000000000000000000000000000000
-          0000000000000000000000000000000000000000000000000000000000000000
-          0000000000000000000000000000000000000000000000000000
-        }
       end
     end
@@ -633 +600 @@
       ImageIndex = 10
       OnExecute = AProjectNewExecute
+      ShortCut = 16462
     end
     object AProjectOpen: TAction
@@ -640 +608 @@
       ImageIndex = 7
       OnExecute = AProjectOpenExecute
+      ShortCut = 16463
     end
     object AProjectSave: TAction
@@ -673 +642 @@
       ImageIndex = 4
       OnExecute = AExitExecute
+      ShortCut = 16499
     end
     object ARun: TAction
@@ -682 +652 @@
     object AAbout: TAction
       Caption = 'About...'
-      ImageIndex = 5
       OnExecute = AAboutExecute
     end
@@ -697 +666 @@
       Category = 'View'
       Caption = 'Object inspector'
+      ShortCut = 122
     end
     object AViewSourceEditor: TAction
@@ -732 +702 @@
       Category = 'Run'
       Caption = 'Stop'
+      ImageIndex = 0
       ShortCut = 16497
     end
@@ -737 +708 @@
       Category = 'Run'
       Caption = 'Pause'
+      ImageIndex = 8
     end
     object AReset: TAction
@@ -761 +733 @@
       Caption = 'Run to cursor'
       ShortCut = 115
+    end
+    object AHelp: TAction
+      Caption = 'Help'
+      ImageIndex = 5
+      ShortCut = 112
     end
   end

trunk/IDE/Forms/UFormMain.lrt

@@ -2 +2 @@
 TFORMMAIN.TABSHEETPROJECT.CAPTION=Project
 TFORMMAIN.TABSHEETCODETREE.CAPTION=Code Tree
-TFORMMAIN.TABSHEETCOMPILEDPROJECT.CAPTION=Target project
+TFORMMAIN.TABSHEETTARGETPROJECT.CAPTION=Target project
 TFORMMAIN.TABSHEETMESSAGES.CAPTION=Messages
 TFORMMAIN.TABSHEETBREAKPOINTS.CAPTION=Breakpoints
@@ -45 +45 @@
 TFORMMAIN.ASTEPOUT.CAPTION=Step out
 TFORMMAIN.ARUNTOCURSOR.CAPTION=Run to cursor
+TFORMMAIN.AHELP.CAPTION=Help

trunk/IDE/Forms/UFormMain.pas

@@ -28 +28 @@
   TFormMain = class(TForm)
     ABuild: TAction;
+    AHelp: TAction;
     ARunToCursor: TAction;
     AStepOut: TAction;
@@ -82 +83 @@
     MenuItem31: TMenuItem;
     MenuItem32: TMenuItem;
+    MenuItem33: TMenuItem;
     MenuItemProducer: TMenuItem;
     MenuItem3: TMenuItem;
@@ -103 +105 @@
     TabSheetMessages: TTabSheet;
     TabSheetBreakpoints: TTabSheet;
-    TabSheetCompiledProject: TTabSheet;
+    TabSheetTargetProject: TTabSheet;
     TabSheetSource: TTabSheet;
     TabSheetTarget: TTabSheet;
@@ -150 +152 @@
     procedure ProjectOpen(FileName: string);
     procedure UpdateMenu;
+    procedure UpdateToolbar;
   public
     ReopenLastOpenedFile: Boolean;
@@ -172 +175 @@
   UFormMessages, UFormSourceCode, UFormProject, UCommon, UFormAbout, UFormOptions,
   UFormTargets, UTarget, UAnalyzer, UProducer, UExecutor, UFormProjectNew,
-  UProjectTemplates;
+  UProjectTemplates, UFormTargetProject;
 
 resourcestring
@@ -239 +242 @@
       Compiler.SourceFiles.Clear;
       Project.Files.DumpFileList(Compiler.SourceFiles);
-      Compiler.TargetFolder := ExtractFileDir(Project.FileName);
+      TargetProject.FileName := ExtractFileDir(Project.FileName) + DirectorySeparator +
+        Compiler.CompiledFolder + DirectorySeparator + Compiler.Target.Name +
+        DirectorySeparator + 'Target.tppr';
+      Compiler.TargetFolder := ExtractFileDir(TargetProject.FileName);
       Compiler.Compile;
+      TargetProject.Files.LoadFromList(Compiler.TargetFiles);
+      FormTargetProject.UpdateInterface;
     end;
     FormProject.TreeViewProjectChange(Self, FormProject.TreeViewProject.Selected);
@@ -332 +340 @@
 
   UpdateMenu;
+  UpdateToolbar;
   FormSourceCode.UpdateInterface;
+  FormTargetCode.UpdateInterface;
   FormProject.UpdateInterface;
 end;
@@ -350 +360 @@
   FormProject.Align := alClient;
   FormProject.Show;
+  FormTargetProject.ManualDock(TabSheetTargetProject, nil, alClient);
+  FormTargetProject.Align := alClient;
+  FormTargetProject.Show;
   FormCodeTree.ManualDock(TabSheetCodeTree, nil, alClient);
   FormCodeTree.Align := alClient;
@@ -473 +486 @@
 end;
 
+procedure TFormMain.UpdateToolbar;
+var
+  I: Integer;
+begin
+  for I := 0 to ToolBar1.ButtonCount - 1 do
+    TToolButton(ToolBar1.Buttons[I]).Hint := TToolButton(ToolBar1.Buttons[I]).Caption;
+end;
+
 procedure TFormMain.FormClose(Sender: TObject; var Action: TCloseAction);
 begin

trunk/IDE/Forms/UFormTargetCode.pas

@@ -8 +8 @@
   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, SynEdit,
   SynHighlighterMulti, SynHighlighterVB, SynHighlighterPas, SynHighlighterCpp,
-  SynHighlighterXML;
+  SynHighlighterXML, UProject;
 
 type
@@ -20 +20 @@
     SynXMLSyn1: TSynXMLSyn;
   private
-    { private declarations }
+    FProjectFile: TProjectFile;
+    procedure SetProjectFile(AValue: TProjectFile);
   public
-    { public declarations }
-  end; 
+    procedure UpdateInterface;
+    property ProjectFile: TProjectFile read FProjectFile write SetProjectFile;
+  end;
 
 var
@@ -32 +34 @@
 {$R *.lfm}
 
+uses
+  UFormMain;
+
+procedure TFormTargetCode.SetProjectFile(AValue: TProjectFile);
+begin
+  if FProjectFile = AValue then Exit;
+  FProjectFile := AValue;
+  if Assigned(AValue) then
+    SynEdit1.Lines.Assign(FProjectFile.Source)
+    else SynEdit1.ClearAll;
+end;
+
+procedure TFormTargetCode.UpdateInterface;
+begin
+  SynEdit1.Enabled := FormMain.Project.Active;
+  if not FormMain.Project.Active then SynEdit1.ClearAll;
+end;
+
+
 end.