Changeset 145 for trunk/Core.pas

Timestamp:

Jun 5, 2023, 6:44:57 PM (11 months ago)

Author:

chronos

Message:

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

File:

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

trunk/Core.pas

@@ -1 @@
-unit UCore;
+unit Core;
 
 interface
 
 uses
-  Classes, SysUtils, FileUtil, UApplicationInfo, ULastOpenedList, UProject,
-  UTranslator, UTarget, URegistry, Registry, Graphics, Controls, UScaleDPI,
-  UPersistentForm, UTheme, UAboutDialog, UBFTarget;
+  Classes, SysUtils, FileUtil, ApplicationInfo, LastOpenedList, Project,
+  Translator, Target, RegistryEx, Registry, Graphics, Controls, ScaleDPI,
+  PersistentForm, Theme, AboutDialog, BFTarget, Forms;
 
 type
@@ -25 +25 @@
     procedure TranslatorTranslate(Sender: TObject);
   private
+    FOnCurrentTargetChange: TNotifyEvent;
+    FOnTargetChangeState: TNotifyEvent;
+    FOnTargetLog: TLogEvent;
+    FormMain: TForm;
     FCurrentTarget: TTarget;
     StoredDimension: TControlDimension;
@@ -31 +35 @@
     procedure SetCurrentTarget(AValue: TTarget);
     procedure ScaleDPI;
+    procedure TargetChangeStateExecute(Sender: TObject);
+    procedure TargetLogExecute(Lines: TStrings);
     procedure TargetMessageExecute(Text: string);
   public
@@ -49 +55 @@
     procedure SaveToRegistry(Context: TRegistryContext);
     property CurrentTarget: TTarget read FCurrentTarget write SetCurrentTarget;
+    property OnTargetLog: TLogEvent read FOnTargetLog write FOnTargetLog;
+    property OnTargetChangeState: TNotifyEvent read FOnTargetChangeState
+      write FOnTargetChangeState;
+    property OnCurrentTargetChange: TNotifyEvent read FOnCurrentTargetChange
+      write FOnCurrentTargetChange;
   end;
 
@@ -60 +71 @@
 
 uses
-  UFormMain, Forms, LazFileUtils,
+  LazFileUtils, FormMain,
   // Targets
-  UTargetInterpretter, UTargetFPC, UTargetJava, UTargetDelphi, UTargetJavascript,
-  UTargetPHP, UTargetC, UTargetPython, UTargetCSharp;
+  TargetInterpretter, TargetFPC, TargetJava, TargetDelphi, TargetJavascript,
+  TargetPHP, TargetC, TargetPython, TargetCSharp;
 
 const
@@ -103 +114 @@
     ApplicationInfo.RegistryKey + '\' + RecentFilesRegKey);
   LoadFromRegistry(Core.ApplicationInfo.GetRegistryContext);
+
+  FormMain := TFormMain.Create(nil);
+  FormMain.Show;
 end;
 
@@ -112 +126 @@
   FreeAndNil(Project);
   FreeAndNil(StoredDimension);
+  FreeAndNil(FormMain);
 end;
 
 procedure TCore.TranslatorTranslate(Sender: TObject);
 begin
-  UTarget.UpdateTranslation;
+  Target.UpdateTranslation;
 end;
 
@@ -140 +155 @@
 
 procedure TCore.LoadFromRegistry(Context: TRegistryContext);
+var
+  TargetName: string;
 begin
   with TRegistryEx.Create do
   try
     CurrentContext := Context;
+    Optimizations.AddSub := ReadBoolWithDefault('OptimizationAddSubEnabled', True);
+    Optimizations.SetZero := ReadBoolWithDefault('OptimizationSetZeroEnabled', True);
+    Optimizations.Merge := ReadBoolWithDefault('OptimizationMerge', True);
+    Optimizations.CopyMultiply := ReadBoolWithDefault('OptimizationCopyMultiplyEnabled', True);
+    Optimizations.RelativeIndexes := ReadBoolWithDefault('OptimizationRelativeIndexesEnabled', True);
     OpenProjectOnStart := ReadBoolWithDefault('OpenProjectOnStart', True);
     if ValueExists('LanguageCode') then
@@ -157 +179 @@
     OptionsFormTabIndex := ReadIntegerWithDefault('OptionsFormTabIndex', 0);
     ThemeManager.Theme := ThemeManager.Themes.FindByName(ReadStringWithDefault('Theme', 'System'));
+
+    TargetName := ReadStringWithDefault('TargetName', 'Interpretter');
+    CurrentTarget := Targets.FindByName(TargetName);
+    if not Assigned(CurrentTarget) then
+      CurrentTarget := TTarget(Core.Targets[0]);
   finally
     Free;
@@ -171 +198 @@
   try
     CurrentContext := Context;
+    WriteString('TargetName', Core.CurrentTarget.Name);
+    WriteBool('OptimizationAddSubEnabled', Optimizations.AddSub);
+    WriteBool('OptimizationSetZeroEnabled', Optimizations.SetZero);
+    WriteBool('OptimizationMerge', Optimizations.Merge);
+    WriteBool('OptimizationCopyMultiplyEnabled', Optimizations.CopyMultiply);
+    WriteBool('OptimizationRelativeIndexesEnabled', Optimizations.RelativeIndexes);
     WriteBool('OpenProjectOnStart', OpenProjectOnStart);
     WriteBool('DPIAuto', ScaleDPI1.AutoDetect);
@@ -198 +231 @@
     Targets[I].OnChangeState := nil;
   if Assigned(FCurrentTarget) then begin
-    FCurrentTarget.OnChangeState := FormMain.TargetStateChanged;
-    FCurrentTarget.OnLog := FormMain.TargetLogExecute;
+    FCurrentTarget.OnChangeState := TargetChangeStateExecute;
+    FCurrentTarget.OnLog := TargetLogExecute;
     FCurrentTarget.OptimizationLevel := OptimizationLevel;
     if FCurrentTarget is TBFTarget then begin
@@ -206 +239 @@
     end;
   end;
-  FormMain.UpdateTargetList;
-  FormMain.UpdateInterface;
+  if Assigned(OnCurrentTargetChange) then
+    FOnCurrentTargetChange(Self);
+end;
+
+procedure TCore.TargetChangeStateExecute(Sender: TObject);
+begin
+  if Assigned(FOnTargetChangeState) then
+    FOnTargetChangeState(Sender);
+end;
+
+procedure TCore.TargetLogExecute(Lines: TStrings);
+begin
+
 end;