Changeset 61 for trunk/IDE

Timestamp:

Jul 17, 2012, 9:15:42 AM (12 years ago)

Author:

chronos

Message:

• Added: Form with text output of executed external producer tool.
• Fixed: Template for new unit mustn't initialize new project but only add unit file to project.
• Added: Project manager file deletion and rename.

Location:

trunk/IDE

Files:

• Forms/UFormExternalProducerOutput.lfm (added)
• Forms/UFormExternalProducerOutput.lrt (added)
• Forms/UFormExternalProducerOutput.pas (added)
• Forms/UFormMain.lfm (modified) (2 diffs)
• Forms/UFormMain.lrt (modified) (1 diff)
• Forms/UFormMain.pas (modified) (8 diffs)
• Forms/UFormProject.lfm (modified) (1 diff)
• Forms/UFormProject.pas (modified) (5 diffs)
• Forms/UFormProjectNew.pas (modified) (1 diff)
• Languages/Transpascal.cs.po (modified) (8 diffs)
• Languages/Transpascal.po (modified) (4 diffs)
• Transpascal.lpi (modified) (3 diffs)
• Transpascal.lpr (modified) (3 diffs)
• UProject.pas (modified) (1 diff)
• UProjectTemplates.pas (modified) (6 diffs)

trunk/IDE/Forms/UFormMain.lfm

@@ -116 +116 @@
     Top = 26
     Width = 200
-    ActivePage = TabSheetTargetProject
+    ActivePage = TabSheetExternalProducer
     Align = alRight
-    TabIndex = 2
+    TabIndex = 3
     TabOrder = 3
     TabPosition = tpRight
@@ -129 +129 @@
     object TabSheetTargetProject: TTabSheet
       Caption = 'Target project'
+    end
+    object TabSheetExternalProducer: TTabSheet
+      Caption = 'External producer'
     end
   end

trunk/IDE/Forms/UFormMain.lrt

@@ -3 +3 @@
 TFORMMAIN.TABSHEETCODETREE.CAPTION=Code Tree
 TFORMMAIN.TABSHEETTARGETPROJECT.CAPTION=Target project
+TFORMMAIN.TABSHEETEXTERNALPRODUCER.CAPTION=External producer
 TFORMMAIN.TABSHEETMESSAGES.CAPTION=Messages
 TFORMMAIN.TABSHEETBREAKPOINTS.CAPTION=Breakpoints

trunk/IDE/Forms/UFormMain.pas

@@ -90 +90 @@
     Splitter2: TSplitter;
     Splitter3: TSplitter;
+    TabSheetExternalProducer: TTabSheet;
     TabSheetProject: TTabSheet;
     TabSheetCodeTree: TTabSheet;
@@ -143 +144 @@
     procedure UpdateMenu;
     procedure UpdateTitle;
+    procedure ProducerProcessOutput(Text: string);
   public
     procedure LoadFromRegistry(Root: HKEY; Key: string);
@@ -162 +164 @@
   UCore, UFormMessages, UFormSourceCode, UFormProject, UCommon, UFormAbout, UFormOptions,
   UFormTargets, UTarget, UExecutor, UFormProjectNew,
-  UFormTargetProject;
+  UFormTargetProject, UFormExternalProducerOutput;
 
 { TFormMain }
@@ -189 +191 @@
       Compiler.Compile;
       TargetProject.Files.LoadFromList(Compiler.TargetFiles.Files);
+      TargetProject.MainSource := TProjectFile(TargetProject.Files.First);
       FormTargetProject.UpdateInterface;
+
+      FormExternalProducerOutput.Memo1.Clear;
+      if Assigned(Compiler.Target.Producer) then
+      with Compiler.Target.Producer do begin
+        FormExternalProducerOutput.Memo1.Lines.Add(CompilerPath + ' ' + Format(CompilerParameters, [TargetProject.MainSource.AbsoluteFileName]));
+        ExternalExecute(CompilerPath + ' ' + Format(CompilerParameters, [TargetProject.MainSource.AbsoluteFileName]));
+      end;
     end;
     FormProject.TreeViewProjectChange(Self, FormProject.TreeViewProject.Selected);
@@ -344 +354 @@
   FormTargetCode.Align := alClient;
   FormTargetCode.Show;
+  FormExternalProducerOutput.ManualDock(TabSheetExternalProducer, nil, alClient);
+  FormExternalProducerOutput.Align := alClient;
+  FormExternalProducerOutput.Show;
   PageControlRight.TabIndex := 0;
   PageControlBottom.TabIndex := 0;
@@ -446 +459 @@
 end;
 
+procedure TFormMain.ProducerProcessOutput(Text: string);
+begin
+  FormExternalProducerOutput.Memo1.Lines.Add(Text);
+end;
+
 procedure TFormMain.FormClose(Sender: TObject; var Action: TCloseAction);
 begin
@@ -453 +471 @@
 
 procedure TFormMain.FormCreate(Sender: TObject);
-begin
+var
+  I: Integer;
+begin
+  with Core.Compiler.Targets do
+  for I := 0 to Count - 1 do
+  with TTarget(Items[I]) do
+  if Assigned(Producer) then
+    Producer.OnProcessOutput := ProducerProcessOutput;
 end;
 
@@ -517 +542 @@
   if FormProjectNew.ShowModal = mrOk then begin
     if Assigned(FormProjectNew.ListView1.Selected) then begin
-      Core.ProjectNew;
+      if TProjectTemplate(FormProjectNew.ListView1.Selected.Data).IsProject then
+        Core.ProjectNew;
       TProjectTemplate(FormProjectNew.ListView1.Selected.Data).InitProject(Core.Project);
     end;

trunk/IDE/Forms/UFormProject.lfm

@@ -19 +19 @@
     TabOrder = 0
     OnChange = TreeViewProjectChange
+    OnDblClick = TreeViewProjectDblClick
     Options = [tvoAutoItemHeight, tvoHideSelection, tvoKeepCollapsedNodes, tvoReadOnly, tvoShowButtons, tvoShowLines, tvoShowRoot, tvoToolTips, tvoThemedDraw]
   end

trunk/IDE/Forms/UFormProject.pas

@@ -29 +29 @@
     procedure AShowExecute(Sender: TObject);
     procedure TreeViewProjectChange(Sender: TObject; Node: TTreeNode);
+    procedure TreeViewProjectDblClick(Sender: TObject);
   private
     procedure UpdateProjectFiles(Node: TTreeNode; Files: TProjectFileList);
@@ -46 +47 @@
   UCore, UFormMain, UFormSourceCode, UFormTargetCode, UFormCodeTree;
 
+resourcestring
+  SRenameSourceFile = 'Rename source file';
+  SEnterNewFileName = 'Enter new file name';
+
 { TFormProject }
 
@@ -54 +59 @@
   if Assigned(Node) then begin
     if TProjectFile(Node.Data) is TProjectFile then begin
-      ProjectFile := TProjectFile(Node.Data);
-      SynEditSource.Lines.Assign(TProjectFile(Node.Data).Source);
+      TreeViewProject.PopupMenu := PopupMenuFile;
+      AShow.Execute;
 (*        if FileExists(TProjectFile(Node.Data).ProducedFileName) then
         CompiledForm.SynEdit1.Lines.LoadFromFile(FileName) else
@@ -78 +83 @@
       //CodeTreeForm.TreeView1.Assign(TProducerTreeView(Compiler.Producer).TreeView);
       *)
-    end;
+    end else
+      TreeViewProject.PopupMenu := nil;
   end;
+end;
+
+procedure TFormProject.TreeViewProjectDblClick(Sender: TObject);
+begin
+  AShow.Execute;
 end;
 
@@ -95 +106 @@
 procedure TFormProject.ADeleteExecute(Sender: TObject);
 begin
-
+  if Assigned(TreeViewProject.Selected) then
+    Core.Project.Files.Remove(TreeViewProject.Selected.Data);
+  UpdateProjectTree;
 end;
 
 procedure TFormProject.ARenameExecute(Sender: TObject);
+var
+  NewName: string;
 begin
-
+  if Assigned(TreeViewProject.Selected) then begin
+    NewName := TProjectFile(TreeViewProject.Selected.Data).FileName;
+    if InputQuery(SRenameSourceFile, SEnterNewFileName, NewName) then
+      TProjectFile(TreeViewProject.Selected.Data).FileName := NewName;
+    UpdateProjectTree;
+  end;
 end;
 
 procedure TFormProject.AShowExecute(Sender: TObject);
 begin
-
+  if Assigned(TreeViewProject.Selected) then
+  FormSourceCode.SynEditSource.Lines.Assign(TProjectFile(TreeViewProject.Selected.Data).Source);
 end;
 

trunk/IDE/Forms/UFormProjectNew.pas

@@ -74 +74 @@
     with Core do
     for I := 0 to ProjectTemplates.Count - 1 do
-    with TProjectTemplate(ProjectTemplates[I]) do begin
+    with TProjectTemplate(ProjectTemplates[I]) do
+    if (not Assigned(Core.Project) and IsProject) or Assigned(Core.Project) then begin
       NewItem := ListView1.Items.Add;
       NewItem.Caption := Name;

trunk/IDE/Languages/Transpascal.cs.po

@@ -108 +108 @@
 msgstr "Cesta překladače:"
 
+#: tformexternalproduceroutput.caption
+msgctxt "tformexternalproduceroutput.caption"
+msgid "External producer"
+msgstr "Vnější generátor"
+
 #: tformmain.aabout.caption
 msgctxt "tformmain.aabout.caption"
@@ -319 +324 @@
 msgstr "Strom kódu"
 
+#: tformmain.tabsheetexternalproducer.caption
+msgctxt "tformmain.tabsheetexternalproducer.caption"
+msgid "External producer"
+msgstr "Vnější generátor"
+
 #: tformmain.tabsheetmessages.caption
 msgctxt "tformmain.tabsheetmessages.caption"
@@ -460 +470 @@
 msgctxt "tformtargetoptions.buttonexecutorselect.caption"
 msgid "Select..."
-msgstr ""
+msgstr "Výběr..."
 
 #: tformtargetoptions.buttonproducerselect.caption
 msgctxt "tformtargetoptions.buttonproducerselect.caption"
 msgid "Select..."
-msgstr ""
+msgstr "Výběr..."
 
 #: tformtargetoptions.caption
 msgctxt "tformtargetoptions.caption"
 msgid "Target options"
-msgstr ""
+msgstr "Volby cíle"
 
 #: tformtargetoptions.label1.caption
 msgid "Name:"
-msgstr ""
+msgstr "Jméno:"
 
 #: tformtargetoptions.label2.caption
@@ -483 +493 @@
 #: tformtargetoptions.label3.caption
 msgid "Executor path:"
-msgstr ""
+msgstr "Cesta vykonávače:"
 
 #: tformtargetoptions.labelname.caption
 msgid "    "
-msgstr ""
+msgstr "   "
 
 #: tformtargetproject.caption
@@ -501 +511 @@
 msgctxt "tformtargets.atargetoptions.hint"
 msgid "Target options"
-msgstr ""
+msgstr "Volby cíle"
 
 #: tformtargets.caption
@@ -514 +524 @@
 
 #: tformtargets.listview1.columns[1].caption
-#, fuzzy
 #| msgid "Execution path"
 msgctxt "tformtargets.listview1.columns[1].caption"
 msgid "Compiler path"
-msgstr "Cesta vykonání"
+msgstr "Cesta překladače"
 
 #: tformtargets.listview1.columns[2].caption
 msgid "Executor path"
-msgstr ""
+msgstr "Cesta vykonávače"
 
 #: tmainform.aabout.caption
@@ -845 +854 @@
 msgstr "Nový projekt"
 
+#: uformproject.senternewfilename
+msgid "Enter new file name"
+msgstr "Zadejte nové jméno souboru"
+
+#: uformproject.srenamesourcefile
+msgid "Rename source file"
+msgstr "Přejmenování zdrojového souboru"
+
 #: uformtargets.scompileroptions
 msgctxt "uformtargets.scompileroptions"
@@ -865 +882 @@
 msgstr "Nový projekt"
 
+#: uprojecttemplates.sconsoleapplication
+msgid "Console application"
+msgstr "Konzolová aplikace"
+
+#: uprojecttemplates.sguiapplication
+msgid "GUI application"
+msgstr "GUI aplikace"
+
+#: uprojecttemplates.spackage
+msgid "Package"
+msgstr "Balíček"
+
+#: uprojecttemplates.sunit
+msgid "Unit"
+msgstr "Jednotka"
+

trunk/IDE/Languages/Transpascal.po

@@ -100 +100 @@
 msgstr ""
 
+#: tformexternalproduceroutput.caption
+msgctxt "tformexternalproduceroutput.caption"
+msgid "External producer"
+msgstr ""
+
 #: tformmain.aabout.caption
 msgctxt "TFORMMAIN.AABOUT.CAPTION"
@@ -310 +315 @@
 msgstr ""
 
+#: tformmain.tabsheetexternalproducer.caption
+msgctxt "TFORMMAIN.TABSHEETEXTERNALPRODUCER.CAPTION"
+msgid "External producer"
+msgstr ""
+
 #: tformmain.tabsheetmessages.caption
 msgctxt "TFORMMAIN.TABSHEETMESSAGES.CAPTION"
@@ -833 +843 @@
 msgstr ""
 
+#: uformproject.senternewfilename
+msgid "Enter new file name"
+msgstr ""
+
+#: uformproject.srenamesourcefile
+msgid "Rename source file"
+msgstr ""
+
 #: uformtargets.scompileroptions
 msgctxt "uformtargets.scompileroptions"
@@ -853 +871 @@
 msgstr ""
 
+#: uprojecttemplates.sconsoleapplication
+msgid "Console application"
+msgstr ""
+
+#: uprojecttemplates.sguiapplication
+msgid "GUI application"
+msgstr ""
+
+#: uprojecttemplates.spackage
+msgid "Package"
+msgstr ""
+
+#: uprojecttemplates.sunit
+msgid "Unit"
+msgstr ""
+

trunk/IDE/Transpascal.lpi

@@ -106 +106 @@
       </Item7>
     </RequiredPackages>
-    <Units Count="17">
+    <Units Count="18">
       <Unit0>
         <Filename Value="Transpascal.lpr"/>
@@ -166 +166 @@
         <IsPartOfProject Value="True"/>
         <ComponentName Value="FormCodeTree"/>
+        <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="UFormCodeTree"/>
@@ -228 +229 @@
         <UnitName Value="UFormTargetOptions"/>
       </Unit16>
+      <Unit17>
+        <Filename Value="Forms\UFormExternalProducerOutput.pas"/>
+        <IsPartOfProject Value="True"/>
+        <ComponentName Value="FormExternalProducerOutput"/>
+        <ResourceBaseClass Value="Form"/>
+        <UnitName Value="UFormExternalProducerOutput"/>
+      </Unit17>
     </Units>
   </ProjectOptions>

trunk/IDE/Transpascal.lpr

@@ -14 +14 @@
   UFormAbout, UFormOptions, UFormTargets,
 UFormProjectNew, UProjectTemplates, UFormTargetProject, UCore, 
-UFormTargetOptions;
+UFormTargetOptions, UFormExternalProducerOutput;
 
 {$R *.res}
@@ -32 +32 @@
 
   Application.Initialize;
+  Application.CreateForm(TCore, Core);
   Application.CreateForm(TFormMain, FormMain);
   Application.CreateForm(TFormProject, FormProject);
@@ -43 +44 @@
   Application.CreateForm(TFormProjectNew, FormProjectNew);
   Application.CreateForm(TFormTargetProject, FormTargetProject);
-  Application.CreateForm(TCore, Core);
   Application.CreateForm(TFormTargetOptions, FormTargetOptions);
+  Application.CreateForm(TFormExternalProducerOutput, FormExternalProducerOutput
+    );
   Application.Run;
 end.

trunk/IDE/UProject.pas

@@ -98 +98 @@
     Name: string;
     Description: TStringList;
+    IsProject: Boolean;
     procedure InitProject(var Project: TProject); virtual;
     constructor Create; virtual;

trunk/IDE/UProjectTemplates.pas

@@ -41 +41 @@
 implementation
 
+resourcestring
+  SConsoleApplication = 'Console application';
+  SUnit = 'Unit';
+  SPackage = 'Package';
+  SGUIApplication = 'GUI application';
+
 { TProjectTemplateUnit }
 
@@ -46 +52 @@
 begin
   inherited Create;
-  Name := 'Unit';
+  Name := SUnit;
+  IsProject := False;
 end;
 
@@ -64 +71 @@
     Add('end.');
   end;
-  Project.MainSource := NewFile;
 end;
 
@@ -72 +78 @@
 begin
   inherited Create;
-  Name := 'Package';
+  Name := SPackage;
+  IsProject := True;
 end;
 
@@ -97 +104 @@
 begin
   inherited Create;
-  Name := 'GUI application';
+  Name := SGUIApplication;
+  IsProject := True;
 end;
 
@@ -128 +136 @@
 begin
   inherited Create;
-  Name := 'Console application';
+  Name := SConsoleApplication;
+  IsProject := True;
 end;