Changeset 75 for trunk/IDE/Core.pas

Timestamp:

Jun 4, 2024, 12:22:49 AM (4 weeks ago)

Author:

chronos

Message:

• Modified: Removed U prefix from unit names.
• Modified: Updated Common package.

File:

• trunk/IDE/Core.pas (moved) (moved from trunk/IDE/UCore.pas ) (10 diffs)

trunk/IDE/Core.pas

@@ -1 @@
-unit UCore;
-
-{$mode delphi}
+unit Core;
 
 interface
 
 uses
-  Classes, SysUtils, FileUtil, ULastOpenedList, UProject, UApplicationInfo,
-  UCompiler, URegistry, Registry, UDebugLog, UCoolTranslator, UTarget,
-  USourceCodePascal, UModularSystem;
+  Classes, SysUtils, FileUtil, LastOpenedList, Project, ApplicationInfo,
+  Compiler, Registry, RegistryEx, DebugLog, Translator, Target,
+  SourceCodePascal, ModularSystem;
 
 type
@@ -32 +30 @@
   TCore = class(TDataModule)
     ApplicationInfo: TApplicationInfo;
-    CoolTranslator1: TCoolTranslator;
+    Translator1: TTranslator;
     DebugLog1: TDebugLog;
     LastOpenedFiles: TLastOpenedList;
@@ -47 +45 @@
     LogParsing: Boolean;
     Project: TProject;
-    ProjectTemplates: TProjectTemplateList;
+    ProjectTemplates: TProjectTemplates;
     TargetProject: TProject;
     Compiler: TCustomCompiler;
@@ -69 +67 @@
 
 uses
-  UFormMain, UProjectTemplates, UIDEModulePascal, UModulePascal, UModuleGCC,
-  UModuleInterpretter, UModuleDelphi, UModulePHP, UModuleJava, UModuleASM8051;
+  FormMain, ProjectTemplates, IDEModulePascal, ModulePascal, ModuleGCC,
+  ModuleInterpretter, ModuleDelphi, ModulePHP, ModuleJava, ModuleASM8051;
 
 { TCore }
@@ -79 +77 @@
   Project.LoadFromFile(FileName);
   LastOpenedFiles.AddItem(FileName);
-  FormMain.UpdateInterface;
+  FormMain.FormMain.UpdateInterface;
 end;
 
@@ -102 +100 @@
   //Compiler.OnSaveTarget := SaveSourceFile;
   Project := TProject.Create;
-  ProjectTemplates := TProjectTemplateList.Create;
+  ProjectTemplates := TProjectTemplates.Create;
   TargetProject := TProject.Create;
   LastOpenedFiles := TLastOpenedList.Create(nil);
@@ -136 +134 @@
 procedure TCore.LastOpenedFilesChange(Sender: TObject);
 begin
-  LastOpenedFiles.LoadToMenuItem(FormMain.MenuItemOpenRecent,
-    FormMain.OpenRecentClick);
-  LastOpenedFiles.LoadToMenuItem(FormMain.PopupMenu1.Items,
-    FormMain.OpenRecentClick);
+  LastOpenedFiles.LoadToMenuItem(FormMain.FormMain.MenuItemOpenRecent,
+    FormMain.FormMain.OpenRecentClick);
+  LastOpenedFiles.LoadToMenuItem(FormMain.FormMain.PopupMenu1.Items,
+    FormMain.FormMain.OpenRecentClick);
 end;
 
 procedure TCore.ProjectChange(Sender: TObject);
 begin
-  FormMain.UpdateInterface;
+  FormMain.FormMain.UpdateInterface;
 end;
 
 function TCore.LoadSourceFile(FileName: string; var Content: string): Boolean;
 begin
-
 end;
 
 function TCore.SaveSourceFile(FileName: string; const Content: string): Boolean;
 begin
-
 end;
 
@@ -173 +169 @@
         else LogParsing := False;
       if ValueExists('LanguageCode') then
-        CoolTranslator1.Language := CoolTranslator1.Languages.SearchByCode(ReadString('LanguageCode'))
-        else CoolTranslator1.Language := CoolTranslator1.Languages.SearchByCode('');
+        Translator1.Language := Translator1.Languages.SearchByCode(ReadString('LanguageCode'))
+        else Translator1.Language := Translator1.Languages.SearchByCode('');
     finally
       Free;
     end;
-  LastOpenedFiles.LoadFromRegistry(RegContext(Root, Key + '\LastOpenedFiles')); //Root, Key + '\LastOpenedFiles');
+  LastOpenedFiles.LoadFromRegistry(TRegistryContext.Create(Root, Key + '\LastOpenedFiles')); //Root, Key + '\LastOpenedFiles');
   Compiler.LoadFromRegistry(Root, Key + '\Compiler');
-  FormMain.LoadFromRegistry(Root, Key);
+  FormMain.FormMain.LoadFromRegistry(Root, Key);
 end;
 
@@ -194 +190 @@
         else WriteString('TargetName', '');
       WriteBool('LogParsing', LogParsing);
-      if Assigned(CoolTranslator1.Language) and (CoolTranslator1.Language.Code <> '') then
-        WriteString('LanguageCode', CoolTranslator1.Language.Code)
+      if Assigned(Translator1.Language) and (Translator1.Language.Code <> '') then
+        WriteString('LanguageCode', Translator1.Language.Code)
         else WriteString('LanguageCode', '');
     finally
       Free;
     end;
-  LastOpenedFiles.SaveToRegistry(RegContext(Root, Key + '\LastOpenedFiles'));
+  LastOpenedFiles.SaveToRegistry(TRegistryContext.Create(Root, Key + '\LastOpenedFiles'));
   Compiler.SaveToRegistry(Root, Key + '\Compiler');
-  FormMain.SaveToRegistry(Root, Key);
+  FormMain.FormMain.SaveToRegistry(Root, Key);
 end;
 
@@ -237 +233 @@
     Name := 'System';
     Internal := True;
-    with TType(Body.Types.AddNew(TType.Create)) do begin
+    with Body.Types.AddNew do begin
       Name := 'Byte';
       Size := 1;
       Internal := True;
     end;
-    with TType(Body.Types.AddNew(TType.Create)) do begin
+    with Body.Types.AddNew do begin
       Name := 'ShortInt';
       Size := 1;
       Internal := True;
     end;
-    with TType(Body.Types.AddNew(TType.Create)) do begin
+    with Body.Types.AddNew do begin
       Name := 'Word';
       Size := 2;
       Internal := True;
     end;
-    with TType(Body.Types.AddNew(TType.Create)) do begin
+    with Body.Types.AddNew do begin
       Name := 'SmallInt';
       Size := 2;
       Internal := True;
     end;
-    with TType(Body.Types.AddNew(TType.Create)) do begin
+    with Body.Types.AddNew do begin
       Name := 'Cardinal';
       Size := 4;
       Internal := True;
     end;
-    with TType(Body.Types.AddNew(TType.Create)) do begin
+    with Body.Types.AddNew do begin
       Name := 'Integer';
       Size := 4;
       Internal := True;
     end;
-    with TType(Body.Types.AddNew(TType.Create)) do begin
+    with Body.Types.AddNew do begin
       Name := 'UInt64';
       Size := 8;
       Internal := True;
     end;
-    with TType(Body.Types.AddNew(TType.Create)) do begin
+    with Body.Types.AddNew do begin
       Name := 'Int64';
       Size := 8;
       Internal := True;
     end;
-    with TFunction(Body.Functions.AddNew(TFunction.Create)) do begin
+    with Body.Functions.AddNew do begin
       Name := 'WriteLn';
       Internal := True;