Changeset 48 for trunk

Timestamp:

Mar 4, 2012, 4:28:12 PM (13 years ago)

Author:

chronos

Message:

• Added: New project and files templates.

Location:

trunk/IDE

Files:

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

trunk/IDE/Forms/UFormMain.lfm

@@ -629 +629 @@
     object AProjectNew: TAction
       Category = 'Project'
-      Caption = 'New'
+      Caption = 'New...'
       Hint = 'Create new project'
       ImageIndex = 10

trunk/IDE/Forms/UFormMain.lrt

@@ -16 +16 @@
 TFORMMAIN.MENUITEM22.CAPTION=-
 TFORMMAIN.MENUITEM9.CAPTION=Help
-TFORMMAIN.APROJECTNEW.CAPTION=New
+TFORMMAIN.APROJECTNEW.CAPTION=New...
 TFORMMAIN.APROJECTNEW.HINT=Create new project
 TFORMMAIN.APROJECTOPEN.CAPTION=Open...

trunk/IDE/Forms/UFormMain.pas

@@ -141 +141 @@
   private
     LastOpenedFiles: TLastOpenedList;
+    procedure ProjectTemplatesInit;
     procedure CompilerDebugLog(Text: string);
     procedure MenuItemTargetClick(Sender: TObject);
@@ -153 +154 @@
     LogParsing: Boolean;
     Project: TProject;
+    ProjectTemplates: TProjectTemplateList;
     TargetProject: TProject;
     Compiler: TCustomCompiler;
@@ -169 +171 @@
 uses
   UFormMessages, UFormSourceCode, UFormProject, UCommon, UFormAbout, UFormOptions,
-  UFormTargets, UTarget, UAnalyzer, UProducer, UExecutor;
+  UFormTargets, UTarget, UAnalyzer, UProducer, UExecutor, UFormProjectNew,
+  UProjectTemplates;
 
 resourcestring
@@ -239 +242 @@
       Compiler.Compile;
     end;
-    //FormProject.TreeViewProjectChange(Self, FormProject.TreeViewProject.Selected);
+    FormProject.TreeViewProjectChange(Self, FormProject.TreeViewProject.Selected);
     FormMessages.Reload;
 end;
@@ -483 +486 @@
   Compiler := TCustomCompiler.Create;
   Project := TProject.Create;
+  ProjectTemplates := TProjectTemplateList.Create;
   TargetProject := TProject.Create;
   LastOpenedFiles := TLastOpenedList.Create;
@@ -491 +495 @@
 procedure TFormMain.FormDestroy(Sender: TObject);
 begin
+  ProjectTemplates.Free;
   LastOpenedFiles.Free;
   TargetProject.Free;
@@ -497 +502 @@
 end;
 
+procedure TFormMain.ProjectTemplatesInit;
+begin
+  ProjectTemplates.AddTemplate(TProjectTemplateConsoleApp.Create);
+  ProjectTemplates.AddTemplate(TProjectTemplateGUIApp.Create);
+  ProjectTemplates.AddTemplate(TProjectTemplatePackage.Create);
+  ProjectTemplates.AddTemplate(TProjectTemplateUnit.Create);
+end;
+
 procedure TFormMain.CompilerDebugLog(Text: string);
 begin
@@ -514 +527 @@
   LoadFromRegistry(RegistryRootKey, ApplicationInfo.RegistryKey);
   DockInit;
+  ProjectTemplatesInit;
 
   if ReopenLastOpenedFile and (LastOpenedFiles.Count > 0) then begin
@@ -560 +574 @@
   NewFile: TProjectFile;
 begin
-  AProjectClose.Execute;
-  Project.Active := True;
-  Project.FileName := SNewProject;
-  Project.Files.AddFile('Unit1.pas');
+  if FormProjectNew.ShowModal = mrOk then begin
+    if Assigned(FormProjectNew.ListView1.Selected) then
+      TProjectTemplate(FormProjectNew.ListView1.Selected.Data).InitProject(Project);
+  end;
   UpdateInterface;
 end;

trunk/IDE/Languages/Transpascal.cs.po

@@ -139 +139 @@
 
 #: tformmain.aprojectnew.caption
+#| msgid "New"
 msgctxt "tformmain.aprojectnew.caption"
-msgid "New"
-msgstr "Nový"
+msgid "New..."
+msgstr "Nový..."
 
 #: tformmain.aprojectnew.hint
@@ -400 +401 @@
 msgid "Project manager"
 msgstr "Správce projektu"
+
+#: tformprojectnew.buttoncancel.caption
+msgctxt "tformprojectnew.buttoncancel.caption"
+msgid "Cancel"
+msgstr "Zrušit"
+
+#: tformprojectnew.buttonok.caption
+msgctxt "tformprojectnew.buttonok.caption"
+msgid "Ok"
+msgstr "Ok"
+
+#: tformprojectnew.caption
+msgid "New item"
+msgstr "Nová položka"
 
 #: tformsourcecode.caption
@@ -762 +777 @@
 msgstr "Nový projekt"
 
+#: uproject.snewproject
+msgctxt "uproject.snewproject"
+msgid "New project"
+msgstr "Nový projekt"
+

trunk/IDE/Languages/Transpascal.po

@@ -132 +132 @@
 #: tformmain.aprojectnew.caption
 msgctxt "TFORMMAIN.APROJECTNEW.CAPTION"
-msgid "New"
+msgid "New..."
 msgstr ""
 
@@ -393 +393 @@
 msgstr ""
 
+#: tformprojectnew.buttoncancel.caption
+msgctxt "TFORMPROJECTNEW.BUTTONCANCEL.CAPTION"
+msgid "Cancel"
+msgstr ""
+
+#: tformprojectnew.buttonok.caption
+msgctxt "TFORMPROJECTNEW.BUTTONOK.CAPTION"
+msgid "Ok"
+msgstr ""
+
+#: tformprojectnew.caption
+msgid "New item"
+msgstr ""
+
 #: tformsourcecode.caption
 msgctxt "TFORMSOURCECODE.CAPTION"
@@ -753 +767 @@
 msgstr ""
 
+#: uproject.snewproject
+msgctxt "uproject.snewproject"
+msgid "New project"
+msgstr ""
+

trunk/IDE/Transpascal.lpi

@@ -106 +106 @@
       </Item7>
     </RequiredPackages>
-    <Units Count="14">
+    <Units Count="16">
       <Unit0>
         <Filename Value="Transpascal.lpr"/>
@@ -201 +201 @@
         <UnitName Value="UFormCompilerSettings"/>
       </Unit13>
+      <Unit14>
+        <Filename Value="Forms\UFormProjectNew.pas"/>
+        <IsPartOfProject Value="True"/>
+        <ComponentName Value="FormProjectNew"/>
+        <ResourceBaseClass Value="Form"/>
+        <UnitName Value="UFormProjectNew"/>
+      </Unit14>
+      <Unit15>
+        <Filename Value="UProjectTemplates.pas"/>
+        <IsPartOfProject Value="True"/>
+        <UnitName Value="UProjectTemplates"/>
+      </Unit15>
     </Units>
   </ProjectOptions>

trunk/IDE/Transpascal.lpr

@@ -12 +12 @@
 UFormSourceCode, UFormMessages,
   UFormTargetCode, UFormCodeTree, TemplateGenerics, CoolTranslator, Common,
-  UFormAbout, UFormOptions, UFormTargets, UFormCompilerSettings;
+  UFormAbout, UFormOptions, UFormTargets, UFormCompilerSettings, 
+UFormProjectNew, UProjectTemplates;
 
 {$R *.res}
@@ -40 +41 @@
   Application.CreateForm(TFormCompilerSettings, FormCompilerSettings);
   Application.CreateForm(TFormTargets, FormTargets);
+  Application.CreateForm(TFormProjectNew, FormProjectNew);
   Application.Run;
 end.

trunk/IDE/UProject.pas

@@ -65 +65 @@
     procedure LoadFromXMLNode(Node: TDOMNode);
     function SearchFile(FileName: string): TProjectFile;
-    procedure AddFile(FileName: string);
+    function AddFile(FileName: string): TProjectFile;
   end;
 
@@ -91 +91 @@
   end;
 
+  { TProjectTemplate }
+
+  TProjectTemplate = class
+    Name: string;
+    Description: TStringList;
+    procedure InitProject(Project: TProject); virtual;
+    constructor Create; virtual;
+    destructor Destroy; override;
+  end;
+
+  { TProjectTemplateList }
+
+  TProjectTemplateList = class(TListObject)
+    procedure AddTemplate(Template: TProjectTemplate);
+  end;
+
+
 implementation
 
+resourcestring
+  SNewProject = 'New project';
+
+{ TProjectTemplateList }
+
+procedure TProjectTemplateList.AddTemplate(Template: TProjectTemplate);
+begin
+  Add(Template);
+end;
+
+{ TProjectTemplate }
+
+procedure TProjectTemplate.InitProject(Project: TProject);
+begin
+  Project.Active := False;
+  Project.Active := True;
+  Project.FileName := SNewProject;
+end;
+
+constructor TProjectTemplate.Create;
+begin
+  Description := TStringList.Create;
+end;
+
+destructor TProjectTemplate.Destroy;
+begin
+  Description.Free;
+  inherited Destroy;
+end;
+
 { TProjectPackageList }
 
@@ -114 +161 @@
 
 end;
-
-
 
 { TProjectGroup }
@@ -184 +229 @@
 end;
 
-procedure TProjectFileList.AddFile(FileName: string);
-var
-  NewFile: TProjectFile;
-begin
-  NewFile := TProjectFile(AddNew(TProjectFile.Create));
-  NewFile.Parent := Parent;
-  NewFile.FileName := FileName;
+function TProjectFileList.AddFile(FileName: string): TProjectFile;
+begin
+  Result := TProjectFile(AddNew(TProjectFile.Create));
+  Result.Parent := Parent;
+  Result.FileName := FileName;
 end;
 
@@ -234 +277 @@
       FileName := UTF8Encode(NewNode.TextContent);
   end;
-  if FileExistsUTF8(FileName) then Load;
+  if FileExistsUTF8(ExtractFileDir(Parent.FileName) + DirectorySeparator + FileName) then Load;
 end;