Changeset 53 for trunk/IDE/Forms/UFormMain.pas

Timestamp:

Jun 26, 2012, 7:23:47 AM (12 years ago)

Author:

chronos

Message:

• Modified: Created main UCore unit and moved non visual code from UFormMain to it.

File:

• trunk/IDE/Forms/UFormMain.pas (modified) (27 diffs)

trunk/IDE/Forms/UFormMain.pas

@@ -16 +16 @@
 
 type
-
-  { TCustomCompiler }
-
-  TCustomCompiler = class(TCompiler)
-    procedure LoadFromRegistry(Root: HKEY; Key: string);
-    procedure SaveToRegistry(Root: HKEY; Key: string);
-  end;
 
   { TFormMain }
@@ -54 +47 @@
     AProjectClose: TAction;
     ActionList1: TActionList;
-    CoolTranslator1: TCoolTranslator;
-    DebugLog1: TDebugLog;
     ImageList1: TImageList;
     MainMenu: TMainMenu;
@@ -150 +141 @@
     procedure FormDestroy(Sender: TObject);
   private
-    LastOpenedFiles: TLastOpenedList;
-    procedure ProjectTemplatesInit;
-    procedure CompilerDebugLog(Text: string);
     procedure MenuItemTargetClick(Sender: TObject);
-    procedure OpenRecentClick(Sender: TObject);
-    procedure LastOpenedFilesChange(Sender: TObject);
     procedure DockInit;
-    procedure LoadFromRegistry(Root: HKEY; Key: string);
-    procedure SaveToRegistry(Root: HKEY; Key: string);
-    procedure ProjectOpen(FileName: string);
     procedure UpdateMenu;
     procedure UpdateToolbar;
   public
-    ReopenLastOpenedFile: Boolean;
-    LogParsing: Boolean;
-    Project: TProject;
-    ProjectTemplates: TProjectTemplateList;
-    TargetProject: TProject;
-    Compiler: TCustomCompiler;
+    procedure LoadFromRegistry(Root: HKEY; Key: string);
+    procedure SaveToRegistry(Root: HKEY; Key: string);
+    procedure OpenRecentClick(Sender: TObject);
     function GetSource(Name: string; var SourceCode: string): Boolean;
     procedure UpdateInterface;
@@ -182 +162 @@
 
 uses
-  UFormMessages, UFormSourceCode, UFormProject, UCommon, UFormAbout, UFormOptions,
+  UCore, UFormMessages, UFormSourceCode, UFormProject, UCommon, UFormAbout, UFormOptions,
   UFormTargets, UTarget, UAnalyzer, UProducer, UExecutor, UFormProjectNew,
   UProjectTemplates, UFormTargetProject;
@@ -189 +169 @@
   SNewProject = 'New project';
 
-{ TCustomCompiler }
-
-procedure TCustomCompiler.LoadFromRegistry(Root: HKEY; Key: string);
-var
-  I: Integer;
-begin
-  with TRegistryEx.Create do
-    try
-      RootKey := Root;
-      for I := 0 to Targets.Count - 1 do
-      with TTarget(Targets[I]) do begin
-        OpenKey(Key + '\Targets\' + Name, True);
-        if ValueExists('CompilerPath') then
-          Producer.CompilerPath := ReadStringWithDefault('CompilerPath', Producer.CompilerPath);
-      end;
-      if ValueExists('SelectedTarget') then
-      Target := Targets.SearchBySysName(ReadString('SelectedTarget'))
-        else Target := nil;
-    finally
-      Free;
-    end;
-end;
-
-procedure TCustomCompiler.SaveToRegistry(Root: HKEY; Key: string);
-var
-  I: Integer;
-begin
-  with TRegistryEx.Create do
-    try
-      RootKey := Root;
-      for I := 0 to Targets.Count - 1 do
-      with TTarget(Targets[I]) do begin
-        OpenKey(Key + '\Targets\' + Name, True);
-        if Assigned(Producer) then begin
-          if Producer.CompilerPath <> '' then WriteString('CompilerPath', Producer.CompilerPath)
-            else DeleteValue('CompilerPath');
-        end;
-      end;
-      if Assigned(Target) then WriteString('SelectedTarget', Target.SysName)
-        else DeleteValue('SelectedTarget');
-    finally
-      Free;
-    end;
-end;
-
 { TFormMain }
 
@@ -239 +174 @@
 begin
   FormSourceCode.Save;
-
-  // Compile project file
+  with Core do begin
+    // Compile project file
     Compiler.Init;
 
@@ -262 +197 @@
     FormProject.TreeViewProjectChange(Self, FormProject.TreeViewProject.Selected);
     FormMessages.Reload;
+  end;
 end;
 
 procedure TFormMain.AResetExecute(Sender: TObject);
 begin
-  Compiler.Target.Executor.Reset;
+  Core.Compiler.Target.Executor.Reset;
 end;
 
@@ -272 +208 @@
 begin
   ABuildExecute(Self);
-  Compiler.Target.Executor.Run;
+  Core.Compiler.Target.Executor.Run;
 end;
 
 procedure TFormMain.ARunToCursorExecute(Sender: TObject);
 begin
-  Compiler.Target.Executor.RunToCursor(0); // determine position
+  Core.Compiler.Target.Executor.RunToCursor(0); // determine position
 end;
 
 procedure TFormMain.AStepInExecute(Sender: TObject);
 begin
-  Compiler.Target.Executor.StepIn;
+  Core.Compiler.Target.Executor.StepIn;
 end;
 
 procedure TFormMain.AStepOutExecute(Sender: TObject);
 begin
-  Compiler.Target.Executor.StepOut;
+  Core.Compiler.Target.Executor.StepOut;
 end;
 
 procedure TFormMain.AStepOverExecute(Sender: TObject);
 begin
-  Compiler.Target.Executor.StepOver;
+  Core.Compiler.Target.Executor.StepOver;
 end;
 
 procedure TFormMain.AStopExecute(Sender: TObject);
 begin
-  Compiler.Target.Executor.Stop;
+  Core.Compiler.Target.Executor.Stop;
 end;
 
@@ -340 +276 @@
   F: TFileStream;
 begin
-  FileName := ExtractFileDir(Project.FileName) + Name + '.pas';
+  FileName := ExtractFileDir(Core.Project.FileName) + Name + '.pas';
   if FileExists(FileName) then
   try
@@ -358 +294 @@
   Title: string;
 begin
+  with Core do begin
   Title := ApplicationInfo.Name;
   if Project.FileName <> '' then Title := Project.FileName + ' - ' + Title;
@@ -384 +321 @@
   AStepOver.Enabled := AStepIn.Enabled;
   ARunToCursor.Enabled := AStepIn.Enabled;
+  end;
 
   UpdateMenu;
@@ -460 +398 @@
       RootKey := Root;
       OpenKey(Key, True);
-      ReopenLastOpenedFile := ReadBoolWithDefault('ReopenLastOpenedFile', True);
-      Compiler.Target := Compiler.Targets.SearchBySysName(ReadStringWithDefault('TargetName', ''));
-      LogParsing := ReadBoolWithDefault('LogParsing', False);
-      if ValueExists('LanguageCode') then
-        CoolTranslator1.Language := CoolTranslator1.Languages.SearchByCode(ReadStringWithDefault('LanguageCode', ''))
-        else CoolTranslator1.Language := CoolTranslator1.Languages.SearchByCode('');
       PageControlRight.Width := ReadIntegerWithDefault('RightPanelWidth', 120);
       PageControlBottom.Height := ReadIntegerWithDefault('BottomPanelHeight', 100);
@@ -471 +403 @@
       Free;
     end;
-  LastOpenedFiles.LoadFromRegistry(RegistryRootKey, Key + '\LastOpenedFiles');
-  Compiler.LoadFromRegistry(RegistryRootKey, Key + '\Compiler');
 end;
 
@@ -481 +411 @@
       RootKey := Root;
       OpenKey(Key, True);
-      WriteBool('ReopenLastOpenedFile', ReopenLastOpenedFile);
-      if Assigned(Compiler.Target) then
-        WriteString('TargetName', Compiler.Target.SysName)
-        else DeleteValue('TargetName');
-      WriteBool('LogParsing', LogParsing);
-      if Assigned(CoolTranslator1.Language) and (CoolTranslator1.Language.Code <> '') then
-        WriteString('LanguageCode', CoolTranslator1.Language.Code)
-        else DeleteValue('LanguageCode');
       WriteInteger('RightPanelWidth', PageControlRight.Width);
       WriteInteger('BottomPanelHeight', PageControlBottom.Height);
@@ -494 +416 @@
       Free;
     end;
-  LastOpenedFiles.SaveToRegistry(RegistryRootKey, Key + '\LastOpenedFiles');
-  Compiler.SaveToRegistry(RegistryRootKey, Key + '\Compiler');
-end;
-
-procedure TFormMain.ProjectOpen(FileName: string);
-begin
-  Project.Active := True;
-  Project.LoadFromFile(FileName);
-  LastOpenedFiles.AddItem(FileName);
-  UpdateInterface;
 end;
 
@@ -509 +421 @@
 begin
   with TMenuItem(Sender) do begin
-    Compiler.Target := TTarget(Compiler.Targets[MenuIndex]);
+    Core.Compiler.Target := TTarget(Core.Compiler.Targets[MenuIndex]);
     UpdateInterface;
   end;
@@ -520 +432 @@
 begin
   MenuItemProducer.Clear;
+  with Core do
   for I := 0 to Compiler.Targets.Count - 1 do begin
     NewMenuItem := TMenuItem.Create(MenuItemProducer);
@@ -541 +454 @@
 begin
   AProjectClose.Execute;
-  SaveToRegistry(RegistryRootKey, ApplicationInfo.RegistryKey);
+  Core.SaveToRegistry(RegistryRootKey, ApplicationInfo.RegistryKey);
 end;
 
@@ -548 +461 @@
   I: Integer;
 begin
-  DeleteFile(DebugLog1.FileName);
-  Compiler := TCustomCompiler.Create;
-  Project := TProject.Create;
-  ProjectTemplates := TProjectTemplateList.Create;
-  TargetProject := TProject.Create;
-  LastOpenedFiles := TLastOpenedList.Create(nil);
-  LastOpenedFiles.OnChange := LastOpenedFilesChange;
-  LastOpenedFiles.ClickAction := OpenRecentClick;
 end;
 
 procedure TFormMain.FormDestroy(Sender: TObject);
 begin
-  ProjectTemplates.Free;
-  LastOpenedFiles.Free;
-  TargetProject.Free;
-  Project.Free;
-  Compiler.Free;
-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
-  DebugLog1.Add('', Text);
 end;
 
@@ -583 +470 @@
 begin
   if Sender is TMenuItem then
-    ProjectOpen(StringReplace(TMenuItem(Sender).Caption, '&', '', [rfReplaceAll]));
-end;
-
-procedure TFormMain.LastOpenedFilesChange(Sender: TObject);
-begin
-  LastOpenedFiles.LoadToMenuItem(MenuItemOpenRecent);
+    Core.ProjectOpen(StringReplace(TMenuItem(Sender).Caption, '&', '', [rfReplaceAll]));
 end;
 
@@ -595 +477 @@
   NewProjectFile: TProjectFile;
 begin
-  LoadFromRegistry(RegistryRootKey, ApplicationInfo.RegistryKey);
+  Core.LoadFromRegistry(RegistryRootKey, ApplicationInfo.RegistryKey);
   DockInit;
-  ProjectTemplatesInit;
-
-  if ReopenLastOpenedFile and (LastOpenedFiles.Items.Count > 0) then begin
-    ProjectOpen(LastOpenedFiles.Items[0]);
+  Core.ProjectTemplatesInit;
+
+  if Core.ReopenLastOpenedFile and (Core.LastOpenedFiles.Items.Count > 0) then begin
+    Core.ProjectOpen(Core.LastOpenedFiles.Items[0]);
   end;
 
@@ -614 +496 @@
 begin
   if OpenDialog1.Execute then begin
-    ProjectOpen(OpenDialog1.FileName);
+    Core.ProjectOpen(OpenDialog1.FileName);
   end;
 end;
@@ -621 +503 @@
 begin
   //if Project.Modified then ;
-  Project.Active := False;
+  Core.Project.Active := False;
   UpdateInterface;
 end;
@@ -642 +524 @@
 procedure TFormMain.APauseExecute(Sender: TObject);
 begin
-  Compiler.Target.Executor.Pause;
+  Core.Compiler.Target.Executor.Pause;
 end;
 
@@ -651 +533 @@
   if FormProjectNew.ShowModal = mrOk then begin
     if Assigned(FormProjectNew.ListView1.Selected) then
-      TProjectTemplate(FormProjectNew.ListView1.Selected.Data).InitProject(Project);
+      TProjectTemplate(FormProjectNew.ListView1.Selected.Data).InitProject(Core.Project);
   end;
   UpdateInterface;
@@ -659 +541 @@
 begin
   if SaveDialog1.Execute then begin
-    Project.Active := True;
-    Project.SaveToFile(SaveDialog1.FileName);
+    Core.Project.Active := True;
+    Core.Project.SaveToFile(SaveDialog1.FileName);
     FormSourceCode.Save;
-    Project.Save;
+    Core.Project.Save;
     UpdateInterface;
-    LastOpenedFiles.AddItem(SaveDialog1.FileName);
+    Core.LastOpenedFiles.AddItem(SaveDialog1.FileName);
   end;
 end;
@@ -671 +553 @@
 begin
   FormSourceCode.Save;
-  if not FileExistsUTF8(Project.FileName) then AProjectSaveAs.Execute
-    else Project.SaveToFile(Project.FileName);
+  if not FileExistsUTF8(Core.Project.FileName) then AProjectSaveAs.Execute
+    else Core.Project.SaveToFile(Core.Project.FileName);
 end;