Changeset 145 for trunk/Forms

Timestamp:

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

Author:

chronos

Message:

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

Location:

trunk/Forms

Files:

• FormCPU.lfm (moved) (moved from trunk/Forms/UFormCPU.lfm ) (8 diffs)
• FormCPU.lrj (moved) (moved from trunk/Forms/UFormCPU.lrj )
• FormCPU.pas (moved) (moved from trunk/Forms/UFormCPU.pas ) (4 diffs)
• FormCompileMultiple.lfm (moved) (moved from trunk/Forms/UFormCompileMultiple.lfm )
• FormCompileMultiple.lrj (moved) (moved from trunk/Forms/UFormCompileMultiple.lrj )
• FormCompileMultiple.pas (moved) (moved from trunk/Forms/UFormCompileMultiple.pas ) (7 diffs)
• FormInput.lfm (moved) (moved from trunk/Forms/UFormInput.lfm )
• FormInput.lrj (moved) (moved from trunk/Forms/UFormInput.lrj )
• FormInput.pas (moved) (moved from trunk/Forms/UFormInput.pas ) (3 diffs)
• FormLog.lfm (moved) (moved from trunk/Forms/UFormLog.lfm )
• FormLog.lrj (moved) (moved from trunk/Forms/UFormLog.lrj )
• FormLog.pas (moved) (moved from trunk/Forms/UFormLog.pas ) (4 diffs)
• FormMain.lfm (moved) (moved from trunk/Forms/UFormMain.lfm )
• FormMain.lrj (moved) (moved from trunk/Forms/UFormMain.lrj )
• FormMain.pas (moved) (moved from trunk/Forms/UFormMain.pas ) (34 diffs)
• FormMemory.lfm (moved) (moved from trunk/Forms/UFormMemory.lfm ) (1 diff)
• FormMemory.lrj (moved) (moved from trunk/Forms/UFormMemory.lrj )
• FormMemory.pas (moved) (moved from trunk/Forms/UFormMemory.pas ) (7 diffs)
• FormMessages.lfm (moved) (moved from trunk/Forms/UFormMessages.lfm ) (2 diffs)
• FormMessages.lrj (moved) (moved from trunk/Forms/UFormMessages.lrj )
• FormMessages.pas (moved) (moved from trunk/Forms/UFormMessages.pas ) (5 diffs)
• FormOptions.lfm (moved) (moved from trunk/Forms/UFormOptions.lfm )
• FormOptions.lrj (moved) (moved from trunk/Forms/UFormOptions.lrj )
• FormOptions.pas (moved) (moved from trunk/Forms/UFormOptions.pas ) (9 diffs)
• FormOutput.lfm (moved) (moved from trunk/Forms/UFormOutput.lfm ) (1 diff)
• FormOutput.lrj (moved) (moved from trunk/Forms/UFormOutput.lrj )
• FormOutput.pas (moved) (moved from trunk/Forms/UFormOutput.pas ) (3 diffs)
• FormSourceCode.lfm (moved) (moved from trunk/Forms/UFormSourceCode.lfm )
• FormSourceCode.lrj (moved) (moved from trunk/Forms/UFormSourceCode.lrj )
• FormSourceCode.pas (moved) (moved from trunk/Forms/UFormSourceCode.pas ) (9 diffs)
• FormTargetCode.lfm (moved) (moved from trunk/Forms/UFormTargetCode.lfm ) (7 diffs)
• FormTargetCode.pas (moved) (moved from trunk/Forms/UFormTargetCode.pas ) (3 diffs)
• FormTargetCore.lrj (moved) (moved from trunk/Forms/UFormTargetCode.lrj )
• FormTargetOptions.lfm (moved) (moved from trunk/Forms/UFormTargetOptions.lfm )
• FormTargetOptions.lrj (moved) (moved from trunk/Forms/UFormTargetOptions.lrj )
• FormTargetOptions.pas (moved) (moved from trunk/Forms/UFormTargetOptions.pas ) (5 diffs)
• FormTargets.lfm (moved) (moved from trunk/Forms/UFormTargets.lfm )
• FormTargets.lrj (moved) (moved from trunk/Forms/UFormTargets.lrj )
• FormTargets.pas (moved) (moved from trunk/Forms/UFormTargets.pas ) (8 diffs)

trunk/Forms/FormCPU.lfm

@@ -8 +8 @@
   ClientWidth = 621
   DesignTimePPI = 144
-  LCLVersion = '2.0.0.4'
+  OnCreate = FormCreate
+  LCLVersion = '2.2.6.0'
   object Label4: TLabel
     Left = 12
-    Height = 25
+    Height = 26
     Top = 72
-    Width = 104
+    Width = 112
     Caption = 'Step counter:'
     ParentColor = False
@@ -20 +21 @@
   object Label7: TLabel
     Left = 12
-    Height = 25
+    Height = 26
     Top = 108
-    Width = 54
+    Width = 57
     Caption = 'Speed:'
     ParentColor = False
@@ -29 +30 @@
   object LabelStepSpeed: TLabel
     Left = 288
-    Height = 25
+    Height = 26
     Top = 108
     Width = 15
@@ -38 +39 @@
   object LabelStepCounter: TLabel
     Left = 288
-    Height = 25
+    Height = 26
     Top = 72
     Width = 15
@@ -47 +48 @@
   object LabelMemoryPointer: TLabel
     Left = 288
-    Height = 25
+    Height = 26
     Top = 36
     Width = 15
@@ -56 +57 @@
   object LabelProgramPointer: TLabel
     Left = 288
-    Height = 25
+    Height = 26
     Top = 0
     Width = 15
@@ -65 +66 @@
   object Label3: TLabel
     Left = 12
-    Height = 25
+    Height = 26
     Top = 0
-    Width = 135
+    Width = 145
     Caption = 'Program pointer:'
     ParentColor = False
@@ -74 +75 @@
   object Label5: TLabel
     Left = 12
-    Height = 25
+    Height = 26
     Top = 36
-    Width = 133
+    Width = 141
     Caption = 'Memory pointer:'
     ParentColor = False

trunk/Forms/FormCPU.pas

@@ -1 @@
-unit UFormCPU;
+unit FormCPU;
 
 interface
@@ -20 +20 @@
     LabelStepCounter: TLabel;
     LabelStepSpeed: TLabel;
-  private
+    procedure FormCreate(Sender: TObject);
   public
     LastStepCounter: Integer;
@@ -29 +29 @@
   FormCPU: TFormCPU;
 
+
 implementation
 
 uses
-  UCore, UTargetInterpretter;
+  Core, TargetInterpretter;
 
 {$R *.lfm}
@@ -41 +42 @@
 { TFormCPU }
 
+procedure TFormCPU.FormCreate(Sender: TObject);
+begin
+  Core.Core.Translator.TranslateComponentRecursive(Self);
+  Core.Core.ThemeManager.UseTheme(Self);
+end;
+
 procedure TFormCPU.Reload;
 begin
-  if Core.CurrentTarget is TTargetInterpretter then
-  with TTargetInterpretter(Core.CurrentTarget) do begin
+  if Core.Core.CurrentTarget is TTargetInterpretter then
+  with TTargetInterpretter(Core.Core.CurrentTarget) do begin
     LabelProgramPointer.Caption := IntToStr(ProgramIndex);
     LabelMemoryPointer.Caption := IntToStr(MemoryPosition);

trunk/Forms/FormCompileMultiple.pas

@@ -1 @@
-unit UFormCompileMultiple;
+unit FormCompileMultiple;
 
 interface
@@ -5 +5 @@
 uses
   Classes, SysUtils, Forms, Controls, Graphics, Dialogs, StdCtrls, ComCtrls,
-  UTarget, fgl;
+  Target, fgl;
 
 type
@@ -20 +20 @@
     procedure FormDestroy(Sender: TObject);
     procedure FormShow(Sender: TObject);
-    procedure ListViewTargetsSelectItem(Sender: TObject; Item: TListItem;
-      Selected: Boolean);
   private
     FTargets: TTargets;
@@ -29 +27 @@
   end;
 
-var
-  FormCompileMultiple: TFormCompileMultiple;
-
 
 implementation
@@ -38 +33 @@
 
 uses
-  UCore;
+  Core;
 
 procedure TFormCompileMultiple.FormCreate(Sender: TObject);
 begin
-  Core.Translator.TranslateComponentRecursive(Self);
-  Core.ThemeManager.UseTheme(Self);
+  Core.Core.Translator.TranslateComponentRecursive(Self);
+  Core.Core.ThemeManager.UseTheme(Self);
 end;
 
@@ -49 +44 @@
   var CloseAction: TCloseAction);
 begin
-  Core.PersistentForm1.Save(Self);
+  Core.Core.PersistentForm1.Save(Self);
 end;
 
@@ -67 +62 @@
 procedure TFormCompileMultiple.FormShow(Sender: TObject);
 begin
-  Core.PersistentForm1.Load(Self);
+  Core.Core.PersistentForm1.Load(Self);
   ReloadList;
-end;
-
-procedure TFormCompileMultiple.ListViewTargetsSelectItem(Sender: TObject;
-  Item: TListItem; Selected: Boolean);
-begin
-
 end;
 

trunk/Forms/FormInput.pas

@@ -1 @@
-unit UFormInput;
+unit FormInput;
 
 interface
@@ -14 +14 @@
     MemoInput: TMemo;
     procedure MemoInputKeyPress(Sender: TObject; var Key: char);
-  private
-    { private declarations }
-  public
-    { public declarations }
   end;
-
-var
-  FormInput: TFormInput;
 
 
@@ -29 +22 @@
 
 uses
-  UCore, UTargetInterpretter;
+  Core, TargetInterpretter;
 
 procedure TFormInput.MemoInputKeyPress(Sender: TObject; var Key: char);
 begin
-  if Core.CurrentTarget is TTargetInterpretter then
-  with TTargetInterpretter(Core.CurrentTarget) do
+  if Core.Core.CurrentTarget is TTargetInterpretter then
+  with TTargetInterpretter(Core.Core.CurrentTarget) do
     Input := Input + Key;
 end;

trunk/Forms/FormLog.pas

@@ -1 @@
-unit UFormLog;
+unit FormLog;
 
 interface
@@ -13 +13 @@
     Memo1: TMemo;
     procedure FormCreate(Sender: TObject);
-  private
-    { private declarations }
-  public
-    { public declarations }
   end;
 
-var
-  FormLog: TFormLog;
 
 implementation
@@ -27 +21 @@
 
 uses
-  UCore;
+  Core;
 
 { TFormLog }
@@ -33 +27 @@
 procedure TFormLog.FormCreate(Sender: TObject);
 begin
-  Core.Translator.TranslateComponentRecursive(Self);
-  Core.ThemeManager.UseTheme(Self);
+  Core.Core.Translator.TranslateComponentRecursive(Self);
+  Core.Core.ThemeManager.UseTheme(Self);
 end;
 

trunk/Forms/FormMain.pas

@@ -1 @@
-unit UFormMain;
+unit FormMain;
 
 interface
 
 uses
-  Classes, SysUtils, FileUtil, Forms, Controls,
-  Graphics, Dialogs, Menus, ActnList, ComCtrls, ExtCtrls, UTarget, Registry,
-  URegistry, LazFileUtils;
+  Classes, SysUtils, FileUtil, Forms, Controls, FormCPU, FormInput,
+  Graphics, Dialogs, Menus, ActnList, ComCtrls, ExtCtrls, Target, Registry,
+  LazFileUtils, FormOptions, FormMessages, FormTargets,
+  FormOutput, FormMemory, FormSourceCode, FormTargetCode, FormLog,
+  FormCompileMultiple;
 
 type
@@ -144 +146 @@
     procedure TimerRefreshTimer(Sender: TObject);
   private
+    FormCPU: TFormCPU;
+    FormInput: TFormInput;
+    FormLog: TFormLog;
+    FormMemory: TFormMemory;
+    FormMessages: TFormMessages;
+    FormOutput: TFormOutput;
+    FormSourceCode: TFormSourceCode;
+    FormTargetCode: TFormTargetCode;
     procedure AProjectOpenRecentExecute(Sender: TObject);
     procedure MenuItemTargetClick(Sender: TObject);
@@ -151 +161 @@
     procedure DockInit;
     procedure LastOpenedListChange(Sender: TObject);
+    procedure CurrentTargetChangeExecute(Sender: TObject);
   public
     procedure MessagesChanged(Sender: TObject);
     procedure TargetLogExecute(Lines: TStrings);
     procedure TargetStateChanged(Sender: TObject);
-    procedure LoadFromRegistry(Context: TRegistryContext);
-    procedure SaveToRegistry(Context: TRegistryContext);
     procedure UpdateInterface;
     procedure UpdateStatusBar;
@@ -162 +171 @@
   end;
 
-var
-  FormMain: TFormMain;
-
 
 implementation
@@ -171 +177 @@
 
 uses
-  UCore, UFormCPU, UFormOptions, UFormMessages, UFormTargets, UFormOutput, UFormInput,
-  UFormMemory, UFormSourceCode, UFormTargetCode, UTargetInterpretter, UFormLog,
-  UBFTarget, UCommon, UFormCompileMultiple;
+  Core, TargetInterpretter, BFTarget, Common;
 
 resourcestring
@@ -195 +199 @@
 procedure TFormMain.FormShow(Sender: TObject);
 begin
-  Core.Init;
-  LoadFromRegistry(Core.ApplicationInfo.GetRegistryContext);
+  Core.Core.Init;
   PageControlMain.TabIndex := 0;
   try
-    if Core.OpenProjectOnStart and (Core.LastOpenedList.Items.Count > 0) and
-      FileExists(Core.LastOpenedList.Items[0]) then
-      ProjectOpen(Core.LastOpenedList.Items[0])
+    if Core.Core.OpenProjectOnStart and (Core.Core.LastOpenedList.Items.Count > 0) and
+      FileExists(Core.Core.LastOpenedList.Items[0]) then
+      ProjectOpen(Core.Core.LastOpenedList.Items[0])
       else AProjectNew.Execute;
   finally
@@ -209 +212 @@
     UpdateTargetList;
     DockInit;
-    Core.PersistentForm1.Load(Self, True);
-    Core.ThemeManager.UseTheme(Self);
+    Core.Core.PersistentForm1.Load(Self, True);
+    Core.Core.ThemeManager.UseTheme(Self);
     FormSourceCode.UpdateTheme;
   end;
-  Core.Messages.OnChange := FormMain.MessagesChanged;
+  Core.Core.Messages.OnChange := MessagesChanged;
 end;
 
@@ -232 +235 @@
 begin
   UpdateInterface;
-  if Core.CurrentTarget.State = rsPaused then
+  if Core.Core.CurrentTarget.State = rsPaused then
     AProgramShowExecutionPoint.Execute;
-  if Core.CurrentTarget.State = rsStopped then
-    Core.Messages.AddMessage(SProgramStopped);
+  if Core.Core.CurrentTarget.State = rsStopped then
+    Core.Core.Messages.AddMessage(SProgramStopped);
 end;
 
@@ -249 +252 @@
   if Sender is TMenuItem then
   with TMenuItem(Sender) do begin
-    Core.CurrentTarget := TTarget(Core.Targets[MenuIndex]);
+    Core.Core.CurrentTarget := Core.Core.Targets[MenuIndex];
     Checked := True;
     for I := 0 to Parent.Count - 1 do
@@ -258 +261 @@
 procedure TFormMain.ProjectOpen(FileName: string);
 begin
-  if Core.Project.Openned then
-    raise Exception.Create(SCloseProjectFirst);
-  FormSourceCode.SynEditSource.Lines.LoadFromFile(FileName);
-  Core.AddItemToLastOpenedList(FileName);
-  Core.Project.FileName := FileName;
-  Core.Project.Openned := True;
-  Core.CurrentTarget.Compiled := False;
+  with Core.Core do begin
+    if Project.Openned then
+      raise Exception.Create(SCloseProjectFirst);
+    FormSourceCode.SynEditSource.Lines.LoadFromFile(FileName);
+    AddItemToLastOpenedList(FileName);
+    Project.FileName := FileName;
+    Project.Openned := True;
+    CurrentTarget.Compiled := False;
+  end;
   UpdateInterface;
 end;
@@ -292 +297 @@
   DockForm(FormMemory, PanelMemory);
   DockForm(FormMessages, TabSheetMessages);
-  PageControlRight.Width := FormMain.Width div 3;
-  PageControlBottom.Height := FormMain.Height div 5;
+  PageControlRight.Width := Width div 3;
+  PageControlBottom.Height := Height div 5;
 end;
 
 procedure TFormMain.LastOpenedListChange(Sender: TObject);
 begin
-  Core.LastOpenedList.LoadToMenuItem(MenuItemOpenRecent, AProjectOpenRecentExecute);
-  Core.LastOpenedList.LoadToMenuItem(PopupMenuRecentFiles.Items, AProjectOpenRecentExecute);
-end;
-
-procedure TFormMain.LoadFromRegistry(Context: TRegistryContext);
-var
-  TargetName: string;
-begin
-  with TRegistryEx.Create do
-  try
-    CurrentContext := Context;
-    TargetName := ReadStringWithDefault('TargetName', 'Interpretter');
-    Core.CurrentTarget := Core.Targets.FindByName(TargetName);
-    if not Assigned(Core.CurrentTarget) then
-      Core.CurrentTarget := TTarget(Core.Targets[0]);
-    Core.Optimizations.AddSub := ReadBoolWithDefault('OptimizationAddSubEnabled', True);
-    Core.Optimizations.SetZero := ReadBoolWithDefault('OptimizationSetZeroEnabled', True);
-    Core.Optimizations.Merge := ReadBoolWithDefault('OptimizationMerge', True);
-    Core.Optimizations.CopyMultiply := ReadBoolWithDefault('OptimizationCopyMultiplyEnabled', True);
-    Core.Optimizations.RelativeIndexes := ReadBoolWithDefault('OptimizationRelativeIndexesEnabled', True);
-  finally
-    Free;
-  end;
-end;
-
-procedure TFormMain.SaveToRegistry(Context: TRegistryContext);
-begin
-  with TRegistryEx.Create do
-  try
-    CurrentContext := Context;
-    WriteString('TargetName', Core.CurrentTarget.Name);
-    WriteBool('OptimizationAddSubEnabled', Core.Optimizations.AddSub);
-    WriteBool('OptimizationSetZeroEnabled', Core.Optimizations.SetZero);
-    WriteBool('OptimizationMerge', Core.Optimizations.Merge);
-    WriteBool('OptimizationCopyMultiplyEnabled', Core.Optimizations.CopyMultiply);
-    WriteBool('OptimizationRelativeIndexesEnabled', Core.Optimizations.RelativeIndexes);
-  finally
-    Free;
-  end;
+  Core.Core.LastOpenedList.LoadToMenuItem(MenuItemOpenRecent, AProjectOpenRecentExecute);
+  Core.Core.LastOpenedList.LoadToMenuItem(PopupMenuRecentFiles.Items, AProjectOpenRecentExecute);
+end;
+
+procedure TFormMain.CurrentTargetChangeExecute(Sender: TObject);
+begin
+  UpdateTargetList;
+  UpdateInterface;
 end;
 
@@ -345 +319 @@
 begin
   Title := '';
-  if Core.Project.FileName <> '' then Title := Core.Project.FileName;
-  if Core.Project.Modified then Title := Title + ' (' + SChanged + ')';
-  Title:= Title + ' - ' + Core.ApplicationInfo.AppName;
-  Caption := Title;
-  AProjectSave.Enabled := Core.Project.Modified;
-  FormSourceCode.SynEditSource.Enabled := Core.Project.Openned;
-  AProjectClose.Enabled := Core.Project.Openned;
-  AProjectSaveAs.Enabled := Core.Project.Openned;
-  AProgramRun.Enabled := (tcRun in Core.CurrentTarget.Capabilities) and
-    Core.Project.Openned and (Core.CurrentTarget.State = rsStopped) or (Core.CurrentTarget.State = rsPaused);
-  AProgramPause.Enabled := (tcPause in Core.CurrentTarget.Capabilities) and
-    Core.Project.Openned and (Core.CurrentTarget.State = rsRunning);
-  AProgramStop.Enabled := (tcStop in Core.CurrentTarget.Capabilities) and
-    Core.Project.Openned and (Core.CurrentTarget.State <> rsStopped);
-  AProgramCompile.Enabled := (tcCompile in Core.CurrentTarget.Capabilities) and
-    Core.Project.Openned;
-  CanDebug := Core.DebugEnabled and Core.Project.Openned and
-    ((Core.CurrentTarget.State = rsPaused) or (Core.CurrentTarget.State = rsStopped));
-  AProgramStepInto.Enabled := CanDebug and (tcStepInto in Core.CurrentTarget.Capabilities);
-  AProgramStepOut.Enabled := CanDebug and (tcStepOut in Core.CurrentTarget.Capabilities);
-  AProgramRunToCursor.Enabled := CanDebug and (tcRunToCursor in Core.CurrentTarget.Capabilities);
-  AProgramStepOver.Enabled := CanDebug and (tcStepOver in Core.CurrentTarget.Capabilities);
-  AProgramShowExecutionPoint.Enabled := CanDebug and (tcPause in Core.CurrentTarget.Capabilities);
-  AShowSourcePosition.Enabled := Core.CurrentTarget.Compiled;
-  AShowTargetPosition.Enabled := Core.CurrentTarget.Compiled;
+  with Core.Core do begin
+    if Project.FileName <> '' then Title := Project.FileName;
+    if Project.Modified then Title := Title + ' (' + SChanged + ')';
+    Title:= Title + ' - ' + ApplicationInfo.AppName;
+    Caption := Title;
+    AProjectSave.Enabled := Project.Modified;
+    FormSourceCode.SynEditSource.Enabled := Project.Openned;
+    AProjectClose.Enabled := Project.Openned;
+    AProjectSaveAs.Enabled := Project.Openned;
+    AProgramRun.Enabled := (tcRun in CurrentTarget.Capabilities) and
+      Project.Openned and (CurrentTarget.State = rsStopped) or (CurrentTarget.State = rsPaused);
+    AProgramPause.Enabled := (tcPause in CurrentTarget.Capabilities) and
+      Project.Openned and (CurrentTarget.State = rsRunning);
+    AProgramStop.Enabled := (tcStop in CurrentTarget.Capabilities) and
+      Project.Openned and (CurrentTarget.State <> rsStopped);
+    AProgramCompile.Enabled := (tcCompile in CurrentTarget.Capabilities) and
+      Project.Openned;
+    CanDebug := DebugEnabled and Project.Openned and
+      ((CurrentTarget.State = rsPaused) or (CurrentTarget.State = rsStopped));
+    AProgramStepInto.Enabled := CanDebug and (tcStepInto in CurrentTarget.Capabilities);
+    AProgramStepOut.Enabled := CanDebug and (tcStepOut in CurrentTarget.Capabilities);
+    AProgramRunToCursor.Enabled := CanDebug and (tcRunToCursor in CurrentTarget.Capabilities);
+    AProgramStepOver.Enabled := CanDebug and (tcStepOver in CurrentTarget.Capabilities);
+    AProgramShowExecutionPoint.Enabled := CanDebug and (tcPause in CurrentTarget.Capabilities);
+    AShowSourcePosition.Enabled := CurrentTarget.Compiled;
+    AShowTargetPosition.Enabled := CurrentTarget.Compiled;
+  end;
   UpdateStatusBar;
 end;
@@ -383 +359 @@
   I: Integer;
 begin
-  Core.Targets.LoadToMenuItem(MenuItemTarget, MenuItemTargetClick, Core.CurrentTarget);
-  Core.Targets.LoadToMenuItem(PopupMenuTargets.Items, MenuItemTargetClick, Core.CurrentTarget);
+  Core.Core.Targets.LoadToMenuItem(MenuItemTarget, MenuItemTargetClick, Core.Core.CurrentTarget);
+  Core.Core.Targets.LoadToMenuItem(PopupMenuTargets.Items, MenuItemTargetClick, Core.Core.CurrentTarget);
 
   // Update toolbutton
-  I := Core.Targets.IndexOf(Core.CurrentTarget);
+  I := Core.Core.Targets.IndexOf(Core.Core.CurrentTarget);
   if I <> -1 then
-  with TTarget(Core.Targets[I]) do begin
+  with TTarget(Core.Core.Targets[I]) do begin
     ToolButtonTarget.ImageIndex := ImageIndex;
     ToolButtonTarget.Caption := Name;
@@ -398 +374 @@
 procedure TFormMain.FormCreate(Sender: TObject);
 begin
+  Core.Core.Translator.TranslateComponentRecursive(Self);
+  Core.Core.ThemeManager.UseTheme(Self);
+
+  FormSourceCode := TFormSourceCode.Create(nil);
+  FormCPU := TFormCPU.Create(nil);
+  FormInput := TFormInput.Create(nil);
+  FormLog := TFormLog.Create(nil);
+  FormMemory := TFormMemory.Create(nil);
+  FormMessages := TFormMessages.Create(nil);
+  FormOutput := TFormOutput.Create(nil);
+  FormTargetCode := TFormTargetCode.Create(nil);
+
   UpdateTargetList;
-  Core.LastOpenedList.OnChange := LastOpenedListChange;
+  with Core.Core do begin
+    LastOpenedList.OnChange := LastOpenedListChange;
+    OnCurrentTargetChange := CurrentTargetChangeExecute;
+    OnTargetChangeState := TargetStateChanged;
+    OnTargetLog := TargetLogExecute;
+  end;
 end;
 
 procedure TFormMain.FormDestroy(Sender: TObject);
 begin
-  SaveToRegistry(Core.ApplicationInfo.GetRegistryContext);
+  FreeAndNil(FormSourceCode);
+  FreeAndNil(FormCPU);
+  FreeAndNil(FormInput);
+  FreeAndNil(FormLog);
+  FreeAndNil(FormMemory);
+  FreeAndNil(FormMessages);
+  FreeAndNil(FormOutput);
+  FreeAndNil(FormTargetCode);
 end;
 
 procedure TFormMain.AProgramRunExecute(Sender: TObject);
 begin
-  if Core.CurrentTarget is TTargetInterpretter then
-    TTargetInterpretter(Core.CurrentTarget).Input := FormInput.MemoInput.Lines.Text;
-  if not Core.CurrentTarget.Compiled then AProgramCompile.Execute;
-  Core.CurrentTarget.Run;
-  Core.Messages.AddMessage(SProgramStarted);
+  if Core.Core.CurrentTarget is TTargetInterpretter then
+    TTargetInterpretter(Core.Core.CurrentTarget).Input := FormInput.MemoInput.Lines.Text;
+  if not Core.Core.CurrentTarget.Compiled then AProgramCompile.Execute;
+  Core.Core.CurrentTarget.Run;
+  Core.Core.Messages.AddMessage(SProgramStarted);
 end;
 
@@ -420 +420 @@
   DebugStep: TDebugStep;
 begin
-  DebugStep := Core.CurrentTarget.DebugSteps.SearchByTargetPos(FormTargetCode.SynEditTarget.SelStart - 1);
+  DebugStep := Core.Core.CurrentTarget.DebugSteps.SearchByTargetPos(FormTargetCode.SynEditTarget.SelStart - 1);
   if Assigned(DebugStep) then begin
     FormSourceCode.SynEditSource.SelStart := DebugStep.SourcePosition + 1;
@@ -431 +431 @@
   DebugStep: TDebugStep;
 begin
-  DebugStep := Core.CurrentTarget.DebugSteps.SearchBySourcePos(FormSourceCode.SynEditSource.SelStart - 1);
+  DebugStep := Core.Core.CurrentTarget.DebugSteps.SearchBySourcePos(FormSourceCode.SynEditSource.SelStart - 1);
   if Assigned(DebugStep) then begin
     FormTargetCode.SynEditTarget.SelStart := DebugStep.TargetPosition + 1;
@@ -461 +461 @@
 procedure TFormMain.FormClose(Sender: TObject; var CloseAction: TCloseAction);
 begin
-  Core.PersistentForm1.Save(Self);
+  Core.Core.PersistentForm1.Save(Self);
+  Application.Terminate;
 end;
 
 procedure TFormMain.FormCloseQuery(Sender: TObject; var CanClose: boolean);
 begin
-  if Core.Project.Modified then begin
+  if Core.Core.Project.Modified then begin
     AProjectClose.Execute;
-    if Core.Project.Openned then CanClose := False;
+    if Core.Core.Project.Openned then CanClose := False;
   end;
 end;
@@ -478 +479 @@
 
 procedure TFormMain.AOptionsExecute(Sender: TObject);
+var
+  FormOptions: TFormOptions;
 begin
   FormOptions := TFormOptions.Create(nil);
@@ -484 +487 @@
     if FormOptions.ShowModal = mrOK then begin
       FormOptions.Save;
-      if Assigned(Core.CurrentTarget) then begin
-        Core.CurrentTarget.OptimizationLevel := Core.OptimizationLevel;
-        if Core.CurrentTarget is TBFTarget then begin
-          TBFTarget(Core.CurrentTarget).CellSize := Core.CellSize;
-          TBFTarget(Core.CurrentTarget).MemorySize := Core.MemorySize;
+      if Assigned(Core.Core.CurrentTarget) then begin
+        Core.Core.CurrentTarget.OptimizationLevel := Core.Core.OptimizationLevel;
+        if Core.Core.CurrentTarget is TBFTarget then begin
+          TBFTarget(Core.Core.CurrentTarget).CellSize := Core.Core.CellSize;
+          TBFTarget(Core.Core.CurrentTarget).MemorySize := Core.Core.MemorySize;
         end;
       end;
-      Core.ThemeManager.UseTheme(Self);
+      Core.Core.ThemeManager.UseTheme(Self);
       FormSourceCode.UpdateTheme;
-      Core.SaveToRegistry(Core.ApplicationInfo.GetRegistryContext);
-      SaveToRegistry(Core.ApplicationInfo.GetRegistryContext);
+      Core.Core.SaveToRegistry(Core.Core.ApplicationInfo.GetRegistryContext);
     end;
   finally
@@ -503 +505 @@
 procedure TFormMain.AProgramCompileExecute(Sender: TObject);
 begin
-  with Core.CurrentTarget do
+  with Core.Core, CurrentTarget do
   try
-    Core.Messages.Clear;
+    Messages.Clear;
     AProgramStop.Execute;
     SourceCode := FormSourceCode.SynEditSource.Text;
-    ProjectFileName := Core.Project.FileName;
-    ProgramName := ExtractFileNameOnly(Core.Project.FileName);
-    if Core.CurrentTarget is TBFTarget then
-      TBFTarget(Core.CurrentTarget).Optimizations := Core.Optimizations;
-    DebugEnabled := Core.DebugEnabled;
-    Core.Messages.AddMessage(SCompileStart);
+    ProjectFileName := Project.FileName;
+    ProgramName := ExtractFileNameOnly(Project.FileName);
+    if CurrentTarget is TBFTarget then
+      TBFTarget(CurrentTarget).Optimizations := Optimizations;
+    DebugEnabled := DebugEnabled;
+    Messages.AddMessage(SCompileStart);
     Application.ProcessMessages;
     Compile;
-    Core.Messages.AppendMessage(SDone);
+    Messages.AppendMessage(SDone);
     FormTargetCode.SynEditTarget.Text := TargetCode;
-    FormTargetCode.SetHighlighter(Core.CurrentTarget.SourceExtension);
+    FormTargetCode.SetHighlighter(CurrentTarget.SourceExtension);
     UpdateInterface;
   except
@@ -533 +535 @@
   with TFormCompileMultiple.Create(nil) do
   try
-    Targets := Core.Targets;
+    Targets := Core.Core.Targets;
     if ShowModal = mrOk then begin
-      Core.Messages.Clear;
+      Core.Core.Messages.Clear;
       for I := 0 to Targets.Count - 1 do
       with Targets[I] do
@@ -542 +544 @@
         AProgramStop.Execute;
         SourceCode := FormSourceCode.SynEditSource.Text;
-        ProjectFileName := Core.Project.FileName;
-        ProgramName := ExtractFileNameOnly(Core.Project.FileName);
+        ProjectFileName := Core.Core.Project.FileName;
+        ProgramName := ExtractFileNameOnly(Core.Core.Project.FileName);
         if Targets[I] is TBFTarget then
-          TBFTarget(Targets[I]).Optimizations := Core.Optimizations;
-        DebugEnabled := Core.DebugEnabled;
-        Core.Messages.AddMessage(Name + ' ' + SCompileStart);
+          TBFTarget(Targets[I]).Optimizations := Core.Core.Optimizations;
+        DebugEnabled := Core.Core.DebugEnabled;
+        Core.Core.Messages.AddMessage(Name + ' ' + SCompileStart);
         Application.ProcessMessages;
         Compile;
-        Core.Messages.AppendMessage(SDone);
+        Core.Core.Messages.AppendMessage(SDone);
         FormTargetCode.SynEditTarget.Text := TargetCode;
-        FormTargetCode.SetHighlighter(Core.CurrentTarget.SourceExtension);
+        FormTargetCode.SetHighlighter(Core.Core.CurrentTarget.SourceExtension);
         UpdateInterface;
       except
@@ -569 +571 @@
   BreakPoint: TBreakPoint;
 begin
-  DebugStep := Core.CurrentTarget.DebugSteps.SearchBySourcePos(FormSourceCode.SynEditSource.SelStart - 1);
+  DebugStep := Core.Core.CurrentTarget.DebugSteps.SearchBySourcePos(FormSourceCode.SynEditSource.SelStart - 1);
   if Assigned(DebugStep) then begin
-    BreakPoint := Core.CurrentTarget.BreakPoints.SearchByTargetPos(DebugStep.ProgramPosition);
+    BreakPoint := Core.Core.CurrentTarget.BreakPoints.SearchByTargetPos(DebugStep.ProgramPosition);
     if Assigned(BreakPoint) then
-      Core.CurrentTarget.BreakPoints.Delete(Core.CurrentTarget.BreakPoints.IndexOf(BreakPoint))
-      else Core.CurrentTarget.BreakPoints.AddItem(DebugStep.ProgramPosition);
+      Core.Core.CurrentTarget.BreakPoints.Delete(Core.Core.CurrentTarget.BreakPoints.IndexOf(BreakPoint))
+      else Core.Core.CurrentTarget.BreakPoints.AddItem(DebugStep.ProgramPosition);
   end;
 end;
@@ -580 +582 @@
 procedure TFormMain.AAboutExecute(Sender: TObject);
 begin
-  Core.AboutDialog.Show;
+  Core.Core.AboutDialog.Show;
 end;
 
 procedure TFormMain.AProgramPauseExecute(Sender: TObject);
 begin
-  Core.CurrentTarget.Pause;
+  Core.Core.CurrentTarget.Pause;
 end;
 
@@ -592 +594 @@
   DebugStep: TDebugStep;
 begin
-  if Core.CurrentTarget.State = rsStopped then begin
-    if not Core.CurrentTarget.Compiled then AProgramCompile.Execute;
-    DebugStep := Core.CurrentTarget.DebugSteps.SearchBySourcePos(FormSourceCode.SynEditSource.SelStart - 1);
-    Core.CurrentTarget.BreakPoints.SetSystem(DebugStep.ProgramPosition);
+  if Core.Core.CurrentTarget.State = rsStopped then begin
+    if not Core.Core.CurrentTarget.Compiled then AProgramCompile.Execute;
+    DebugStep := Core.Core.CurrentTarget.DebugSteps.SearchBySourcePos(FormSourceCode.SynEditSource.SelStart - 1);
+    Core.Core.CurrentTarget.BreakPoints.SetSystem(DebugStep.ProgramPosition);
     AProgramRun.Execute;
   end else begin
-    DebugStep := Core.CurrentTarget.DebugSteps.SearchBySourcePos(FormSourceCode.SynEditSource.SelStart - 1);
-    Core.CurrentTarget.RunToCursor(DebugStep.ProgramPosition);
+    DebugStep := Core.Core.CurrentTarget.DebugSteps.SearchBySourcePos(FormSourceCode.SynEditSource.SelStart - 1);
+    Core.Core.CurrentTarget.RunToCursor(DebugStep.ProgramPosition);
   end;
 end;
@@ -607 +609 @@
   DebugStep: TDebugStep;
 begin
-  DebugStep := Core.CurrentTarget.DebugSteps.SearchByProgramPos(Core.CurrentTarget.ExecutionPosition);
+  DebugStep := Core.Core.CurrentTarget.DebugSteps.SearchByProgramPos(
+    Core.Core.CurrentTarget.ExecutionPosition);
   FormSourceCode.SynEditSource.SelStart := DebugStep.SourcePosition + 1;
   FormTargetCode.SynEditTarget.SelStart := DebugStep.TargetPosition + 1;
@@ -616 +619 @@
 procedure TFormMain.AProgramStepIntoExecute(Sender: TObject);
 begin
-  if Core.CurrentTarget.State = rsStopped then begin
-    if not Core.CurrentTarget.Compiled then AProgramCompile.Execute;
-    Core.CurrentTarget.BreakPoints.SetSystem(Core.CurrentTarget.DebugSteps.First.ProgramPosition);
+  if Core.Core.CurrentTarget.State = rsStopped then begin
+    if not Core.Core.CurrentTarget.Compiled then AProgramCompile.Execute;
+    Core.Core.CurrentTarget.BreakPoints.SetSystem(
+      Core.Core.CurrentTarget.DebugSteps.First.ProgramPosition);
     AProgramRun.Execute;
-  end else Core.CurrentTarget.StepInto;
+  end else Core.Core.CurrentTarget.StepInto;
 end;
 
 procedure TFormMain.AProgramStepOutExecute(Sender: TObject);
 begin
-  Core.CurrentTarget.StepOut;
+  Core.Core.CurrentTarget.StepOut;
 end;
 
 procedure TFormMain.AProgramStepOverExecute(Sender: TObject);
 begin
-  if Core.CurrentTarget.State = rsStopped then begin
-    if not Core.CurrentTarget.Compiled then AProgramCompile.Execute;
-    Core.CurrentTarget.BreakPoints.SetSystem(TDebugStep(Core.CurrentTarget.DebugSteps.First).ProgramPosition);
+  if Core.Core.CurrentTarget.State = rsStopped then begin
+    if not Core.Core.CurrentTarget.Compiled then AProgramCompile.Execute;
+    Core.Core.CurrentTarget.BreakPoints.SetSystem(
+      TDebugStep(Core.Core.CurrentTarget.DebugSteps.First).ProgramPosition);
     AProgramRun.Execute;
-  end else Core.CurrentTarget.StepOver;
+  end else Core.Core.CurrentTarget.StepOver;
 end;
 
 procedure TFormMain.AProgramStopExecute(Sender: TObject);
 begin
-  Core.CurrentTarget.Stop;
+  Core.Core.CurrentTarget.Stop;
 end;
 
@@ -647 +652 @@
 begin
   DialogResult := mrNo;
-  if Core.Project.Modified then begin
+  if Core.Core.Project.Modified then begin
     DialogResult := MessageDlg(SUnsavedChanges, SDoYouWantToSaveProject, mtConfirmation, [mbYes, mbNo, mbCancel], 0);
     if DialogResult = mrYes then begin
@@ -655 +660 @@
   if (DialogResult = mrNo) or (DialogResult = mrYes) then begin
     AProgramStop.Execute;
-    Core.Project.Openned := False;
+    Core.Core.Project.Openned := False;
     FormSourceCode.SynEditSource.Clear;
     UpdateInterface;
@@ -664 +669 @@
 begin
   AProjectClose.Execute;
-  if Core.Project.Openned then Exit;
-  Core.Project.FileName := CombinePaths(Core.DataDir, ExamplesDir + DirectorySeparator + SNewProject + '.b');
+  if Core.Core.Project.Openned then Exit;
+  Core.Core.Project.FileName := CombinePaths(Core.Core.DataDir, ExamplesDir + DirectorySeparator + SNewProject + '.b');
   FormSourceCode.SynEditSource.Clear;
-  Core.Project.Openned := True;
-  Core.CurrentTarget.Compiled := False;
+  Core.Core.Project.Openned := True;
+  Core.Core.CurrentTarget.Compiled := False;
   UpdateInterface;
 end;
@@ -676 +681 @@
   FileName: string;
 begin
-  FileName := Core.LastOpenedList.Items[TMenuItem(Sender).MenuIndex];
+  FileName := Core.Core.LastOpenedList.Items[TMenuItem(Sender).MenuIndex];
   if FileExists(FileName) then begin
     AProjectClose.Execute;
-    if Core.Project.Openned then Exit;
+    if Core.Core.Project.Openned then Exit;
     ProjectOpen(FileName);
   end else ShowMessage(Format(SFileNotFound, [FileName]));
@@ -688 +693 @@
   FileName: string;
 begin
-  if Core.LastOpenedList.Items.Count > 0 then
-    FileName := Core.LastOpenedList.Items[0]
-    else FileName := CombinePaths(Core.DataDir, ExamplesDir);
+  if Core.Core.LastOpenedList.Items.Count > 0 then
+    FileName := Core.Core.LastOpenedList.Items[0]
+    else FileName := CombinePaths(Core.Core.DataDir, ExamplesDir);
   OpenDialog1.InitialDir := ExtractFileDir(FileName);
   OpenDialog1.FileName := ExtractFileName(FileName);
   if OpenDialog1.Execute then begin
     AProjectClose.Execute;
-    if Core.Project.Openned then Exit;
+    if Core.Core.Project.Openned then Exit;
     ProjectOpen(OpenDialog1.FileName);
   end;
@@ -702 +707 @@
 procedure TFormMain.AProjectSaveAsExecute(Sender: TObject);
 begin
-  SaveDialog1.InitialDir := ExtractFileDir(Core.Project.FileName);
-  SaveDialog1.FileName := ExtractFileName(Core.Project.FileName);
+  SaveDialog1.InitialDir := ExtractFileDir(Core.Core.Project.FileName);
+  SaveDialog1.FileName := ExtractFileName(Core.Core.Project.FileName);
   if SaveDialog1.Execute then begin
     FormSourceCode.SynEditSource.Lines.SaveToFile(SaveDialog1.FileName);
-    Core.Project.FileName := SaveDialog1.FileName;
-    Core.AddItemToLastOpenedList(SaveDialog1.FileName);
-    Core.Project.Modified := False;
+    Core.Core.Project.FileName := SaveDialog1.FileName;
+    Core.Core.AddItemToLastOpenedList(SaveDialog1.FileName);
+    Core.Core.Project.Modified := False;
     UpdateInterface;
   end;
@@ -715 +720 @@
 procedure TFormMain.AProjectSaveExecute(Sender: TObject);
 begin
-  if Core.Project.Modified and FileExists(Core.Project.FileName) then begin
-    FormSourceCode.SynEditSource.Lines.SaveToFile(Core.Project.FileName);
-    Core.AddItemToLastOpenedList(Core.Project.FileName);
-    Core.Project.Modified := False;
+  if Core.Core.Project.Modified and FileExists(Core.Core.Project.FileName) then begin
+    FormSourceCode.SynEditSource.Lines.SaveToFile(Core.Core.Project.FileName);
+    Core.Core.AddItemToLastOpenedList(Core.Core.Project.FileName);
+    Core.Core.Project.Modified := False;
     UpdateInterface;
   end else AProjectSaveAs.Execute;

trunk/Forms/FormMemory.lfm

@@ -8 +8 @@
   ClientWidth = 1039
   DesignTimePPI = 144
+  OnCreate = FormCreate
   LCLVersion = '2.2.6.0'
   object Label6: TLabel

trunk/Forms/FormMemory.pas

@@ -1 @@
-unit UFormMemory;
+unit FormMemory;
 
 interface
@@ -17 +17 @@
     Label6: TLabel;
     ListViewMemory: TListView;
+    procedure FormCreate(Sender: TObject);
     procedure ListViewMemoryData(Sender: TObject; Item: TListItem);
   private
@@ -24 +25 @@
   end;
 
-var
-  FormMemory: TFormMemory;
 
 implementation
@@ -32 +31 @@
 
 uses
-  UCore, UTargetInterpretter;
+  Core, TargetInterpretter;
 
 { TFormMemory }
@@ -38 +37 @@
 procedure TFormMemory.Reload;
 begin
-  if Core.CurrentTarget is TTargetInterpretter then
-  with TTargetInterpretter(Core.CurrentTarget) do begin
+  if Core.Core.CurrentTarget is TTargetInterpretter then
+  with TTargetInterpretter(Core.Core.CurrentTarget) do begin
     if MemoryChanged then begin
       MemoryChanged := False;
@@ -55 +54 @@
   Address: Integer;
 begin
-  if Core.CurrentTarget is TTargetInterpretter then
-  with TTargetInterpretter(Core.CurrentTarget) do
+  if Core.Core.CurrentTarget is TTargetInterpretter then
+  with TTargetInterpretter(Core.Core.CurrentTarget) do
   if (Item.Index >= 0) and (Item.Index <= Trunc((MemoryMaxUsedAddr + 1) / RowSize)) then begin
     Item.Caption := IntToHex(Item.Index * RowSize, 8);
@@ -75 +74 @@
 end;
 
+procedure TFormMemory.FormCreate(Sender: TObject);
+begin
+  Core.Core.Translator.TranslateComponentRecursive(Self);
+  Core.Core.ThemeManager.UseTheme(Self);
+end;
+
 end.
 

trunk/Forms/FormMessages.lfm

@@ -9 +9 @@
   DesignTimePPI = 144
   OnCreate = FormCreate
-  LCLVersion = '2.0.0.4'
+  LCLVersion = '2.2.6.0'
   object ListView1: TListView
     Left = 0
@@ -18 +18 @@
     Columns = <    
       item
-        Width = 710
+        Width = 723
       end>
     OwnerData = True

trunk/Forms/FormMessages.pas

@@ -1 @@
-unit UFormMessages;
+unit FormMessages;
 
 interface
@@ -15 +15 @@
     procedure FormCreate(Sender: TObject);
     procedure ListView1Data(Sender: TObject; Item: TListItem);
-  private
-    { private declarations }
   public
     procedure Reload;
   end;
 
-var
-  FormMessages: TFormMessages;
 
 implementation
@@ -29 +25 @@
 
 uses
-  UCore, UTarget;
+  Core, Target;
 
 { TFormMessages }
@@ -35 +31 @@
 procedure TFormMessages.ListView1Data(Sender: TObject; Item: TListItem);
 begin
-  with Core do
+  with Core.Core do
   if (Item.Index >= 0) and (Item.Index < Messages.Count) then
   with Messages[Item.Index] do begin
@@ -45 +41 @@
 procedure TFormMessages.FormCreate(Sender: TObject);
 begin
+  Core.Core.Translator.TranslateComponentRecursive(Self);
+  Core.Core.ThemeManager.UseTheme(Self);
 end;
 
 procedure TFormMessages.Reload;
 begin
-  ListView1.Items.Count := Core.Messages.Count;
+  ListView1.Items.Count := Core.Core.Messages.Count;
   ListView1.Refresh;
 end;

trunk/Forms/FormOptions.pas

@@ -1 @@
-unit UFormOptions;
+unit FormOptions;
 
 interface
@@ -5 +5 @@
 uses
   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, StdCtrls,
-  Spin, ComCtrls, ExtCtrls, UTarget, UTheme;
+  Spin, ComCtrls, ExtCtrls, Target, Theme;
 
 type
@@ -47 +47 @@
     procedure FormCreate(Sender: TObject);
     procedure FormShow(Sender: TObject);
-  private
-    { private declarations }
   public
     procedure UpdateInterface;
@@ -55 +53 @@
   end;
 
-var
-  FormOptions: TFormOptions;
 
 implementation
@@ -63 +59 @@
 
 uses
-  UCore, ULanguages;
+  Core, Languages;
 
 { TFormOptions }
@@ -69 +65 @@
 procedure TFormOptions.FormShow(Sender: TObject);
 begin
-  Core.PersistentForm1.Load(Self);
+  Core.Core.PersistentForm1.Load(Self);
 end;
 
@@ -91 +87 @@
 procedure TFormOptions.Load;
 begin
-  ComboBoxLanguage.ItemIndex := ComboBoxLanguage.Items.IndexOfObject(Core.Translator.Language);
-  if ComboBoxLanguage.ItemIndex = -1 then ComboBoxLanguage.ItemIndex := 0;
-  ComboBoxTheme.ItemIndex := ComboBoxTheme.Items.IndexOfObject(Core.ThemeManager.Theme);
-  if ComboBoxTheme.ItemIndex = -1 then ComboBoxTheme.ItemIndex := 0;
-  CheckBoxReopenLastFile.Checked := Core.OpenProjectOnStart;
-  CheckBoxOptimizeAddSub.Checked := Core.Optimizations.AddSub;
-  CheckBoxOptimizeSetZero.Checked := Core.Optimizations.SetZero;
-  CheckBoxOptimizeMerge.Checked := Core.Optimizations.Merge;
-  CheckBoxOptimizeRelativeIndexes.Checked := Core.Optimizations.RelativeIndexes;
-  CheckBoxOptimizeCopyMultiply.Checked := Core.Optimizations.CopyMultiply;
-  SpinEditDPIX.Value := Core.ScaleDPI1.DPI.X;
-  SpinEditDPIY.Value := Core.ScaleDPI1.DPI.Y;
-  CheckBoxDPIAuto.Checked := Core.ScaleDPI1.AutoDetect;
-  ComboBoxOptimization.ItemIndex := Integer(Core.OptimizationLevel);
-  SpinEditCellSize.Value := Core.CellSize;
-  SpinEditMemorySize.Value := Core.MemorySize;
-  CheckBoxDebugEnabled.Checked := Core.DebugEnabled;
-  if Core.OptionsFormTabIndex < PageControl1.PageCount then
-    PageControl1.TabIndex := Core.OptionsFormTabIndex
-    else PageControl1.TabIndex := 0;
+  with Core.Core do begin
+    ComboBoxLanguage.ItemIndex := ComboBoxLanguage.Items.IndexOfObject(Translator.Language);
+    if ComboBoxLanguage.ItemIndex = -1 then ComboBoxLanguage.ItemIndex := 0;
+    ComboBoxTheme.ItemIndex := ComboBoxTheme.Items.IndexOfObject(ThemeManager.Theme);
+    if ComboBoxTheme.ItemIndex = -1 then ComboBoxTheme.ItemIndex := 0;
+    CheckBoxReopenLastFile.Checked := OpenProjectOnStart;
+    CheckBoxOptimizeAddSub.Checked := Optimizations.AddSub;
+    CheckBoxOptimizeSetZero.Checked := Optimizations.SetZero;
+    CheckBoxOptimizeMerge.Checked := Optimizations.Merge;
+    CheckBoxOptimizeRelativeIndexes.Checked := Optimizations.RelativeIndexes;
+    CheckBoxOptimizeCopyMultiply.Checked := Optimizations.CopyMultiply;
+    SpinEditDPIX.Value := ScaleDPI1.DPI.X;
+    SpinEditDPIY.Value := ScaleDPI1.DPI.Y;
+    CheckBoxDPIAuto.Checked := ScaleDPI1.AutoDetect;
+    ComboBoxOptimization.ItemIndex := Integer(OptimizationLevel);
+    SpinEditCellSize.Value := CellSize;
+    SpinEditMemorySize.Value := MemorySize;
+    CheckBoxDebugEnabled.Checked := DebugEnabled;
+    if OptionsFormTabIndex < PageControl1.PageCount then
+      PageControl1.TabIndex := OptionsFormTabIndex
+      else PageControl1.TabIndex := 0;
+  end;
   UpdateInterface;
 end;
@@ -116 +114 @@
 procedure TFormOptions.Save;
 begin
+  with Core.Core do begin
   if ComboBoxLanguage.ItemIndex <> -1 then
-    Core.Translator.Language := TLanguage(ComboBoxLanguage.Items.Objects[ComboBoxLanguage.ItemIndex]);
+    Translator.Language := TLanguage(ComboBoxLanguage.Items.Objects[ComboBoxLanguage.ItemIndex]);
   if ComboBoxTheme.ItemIndex <> -1 then
-    Core.ThemeManager.Theme := TTheme(ComboBoxTheme.Items.Objects[ComboBoxTheme.ItemIndex]);
-  Core.OpenProjectOnStart := CheckBoxReopenLastFile.Checked;
-  Core.ScaleDPI1.DPI := Point(SpinEditDPIX.Value, SpinEditDPIY.Value);
-  Core.ScaleDPI1.AutoDetect := CheckBoxDPIAuto.Checked;
-  Core.OptimizationLevel := TCompilerOptimization(ComboBoxOptimization.ItemIndex);
-  Core.CellSize := SpinEditCellSize.Value;
-  Core.MemorySize := SpinEditMemorySize.Value;
-  Core.Optimizations.AddSub := CheckBoxOptimizeAddSub.Checked;
-  Core.Optimizations.SetZero := CheckBoxOptimizeSetZero.Checked;
-  Core.Optimizations.Merge := CheckBoxOptimizeMerge.Checked;
-  Core.Optimizations.RelativeIndexes := CheckBoxOptimizeRelativeIndexes.Checked;
-  Core.Optimizations.CopyMultiply := CheckBoxOptimizeCopyMultiply.Checked;
-  Core.DebugEnabled := CheckBoxDebugEnabled.Checked;
-  Core.OptionsFormTabIndex := PageControl1.TabIndex;
+    ThemeManager.Theme := TTheme(ComboBoxTheme.Items.Objects[ComboBoxTheme.ItemIndex]);
+    OpenProjectOnStart := CheckBoxReopenLastFile.Checked;
+    ScaleDPI1.DPI := Point(SpinEditDPIX.Value, SpinEditDPIY.Value);
+    ScaleDPI1.AutoDetect := CheckBoxDPIAuto.Checked;
+    OptimizationLevel := TCompilerOptimization(ComboBoxOptimization.ItemIndex);
+    CellSize := SpinEditCellSize.Value;
+    MemorySize := SpinEditMemorySize.Value;
+    Optimizations.AddSub := CheckBoxOptimizeAddSub.Checked;
+    Optimizations.SetZero := CheckBoxOptimizeSetZero.Checked;
+    Optimizations.Merge := CheckBoxOptimizeMerge.Checked;
+    Optimizations.RelativeIndexes := CheckBoxOptimizeRelativeIndexes.Checked;
+    Optimizations.CopyMultiply := CheckBoxOptimizeCopyMultiply.Checked;
+    DebugEnabled := CheckBoxDebugEnabled.Checked;
+    OptionsFormTabIndex := PageControl1.TabIndex;
+  end;
 end;
 
@@ -157 +157 @@
   );
 begin
-  Core.PersistentForm1.Save(Self);
+  Core.Core.PersistentForm1.Save(Self);
 end;
 
 procedure TFormOptions.FormCreate(Sender: TObject);
 begin
-  Core.Translator.TranslateComponentRecursive(Self);
-  Core.ThemeManager.UseTheme(Self);
-  Core.ThemeManager.Themes.LoadToStrings(ComboBoxTheme.Items);
-  Core.Translator.LanguageListToStrings(ComboBoxLanguage.Items);
+  with Core.Core do begin
+    Translator.TranslateComponentRecursive(Self);
+    ThemeManager.UseTheme(Self);
+    ThemeManager.Themes.LoadToStrings(ComboBoxTheme.Items);
+    Translator.LanguageListToStrings(ComboBoxLanguage.Items);
+  end;
   ComboBoxOptimization.Items.Clear;
   ComboBoxOptimization.Items.Add(CompilerOptimizationText[coNone]);

trunk/Forms/FormOutput.lfm

@@ -8 +8 @@
   ClientWidth = 640
   DesignTimePPI = 144
+  OnCreate = FormCreate
   LCLVersion = '2.2.6.0'
   object Label2: TLabel

trunk/Forms/FormOutput.pas

@@ -1 @@
-unit UFormOutput;
+unit FormOutput;
 
 interface
@@ -13 +13 @@
     Label2: TLabel;
     MemoOutput: TMemo;
-  private
-    { private declarations }
+    procedure FormCreate(Sender: TObject);
   public
     procedure Reload;
   end;
-
-var
-  FormOutput: TFormOutput;
 
 
@@ -28 +24 @@
 
 uses
-  UCore, UTargetInterpretter;
+  Core, TargetInterpretter;
 
 { TFormOutput }
 
+procedure TFormOutput.FormCreate(Sender: TObject);
+begin
+  Core.Core.Translator.TranslateComponentRecursive(Self);
+  Core.Core.ThemeManager.UseTheme(Self);
+end;
+
 procedure TFormOutput.Reload;
 begin
-  if Core.CurrentTarget is TTargetInterpretter then
-  with TTargetInterpretter(Core.CurrentTarget) do begin
+  if Core.Core.CurrentTarget is TTargetInterpretter then
+  with TTargetInterpretter(Core.Core.CurrentTarget) do begin
     if OutputChanged then begin
       OutputChanged := False;

trunk/Forms/FormSourceCode.pas

@@ -1 @@
-unit UFormSourceCode;
+unit FormSourceCode;
 
 interface
@@ -6 +6 @@
   Classes, SysUtils, FileUtil, SynEdit, SynHighlighterIni, Forms, Controls,
   Graphics, Dialogs, Menus, ActnList,
-  SynEditHighlighter, SynHighlighterAny, SynHighlighterJava, UBFHighlighter;
+  SynEditHighlighter, SynHighlighterAny, SynHighlighterJava, BFHighlighter;
 
 type
@@ -60 +60 @@
   private
     BFHighlighter: TSynBrainFuckHl;
+    FOnUpdateInterface: TNotifyEvent;
+    FOnUpdateStatusBar: TNotifyEvent;
   public
     procedure UpdateInterface;
     procedure UpdateTheme;
+    property OnUpdateStatusBar: TNotifyEvent read FOnUpdateStatusBar
+      write FOnUpdateStatusBar;
+    property OnUpdateInterface: TNotifyEvent read FOnUpdateInterface
+      write FOnUpdateInterface;
   end;
 
-var
-  FormSourceCode: TFormSourceCode;
-
 
 implementation
@@ -74 +77 @@
 
 uses
-  UCore, UFormMain, UBFCodeTools;
+  Core, BFCodeTools;
 
 resourcestring
@@ -142 +145 @@
 procedure TFormSourceCode.FormCreate(Sender: TObject);
 begin
+  Core.Core.Translator.TranslateComponentRecursive(Self);
+  Core.Core.ThemeManager.UseTheme(Self);
+
   BFHighlighter := TSynBrainFuckHl.Create(nil);
   SynEditSource.Highlighter := BFHighlighter;
@@ -162 +168 @@
   clLightRed = TColor($8080FF);
 begin
-  if Core.ThemeManager.Theme.Name = 'Dark' then begin
+  if Core.Core.ThemeManager.Theme.Name = 'Dark' then begin
     BFHighlighter.IoAttri.Foreground := clWhite;
     BFHighlighter.LoopAttri.Foreground := clLightRed;
@@ -177 +183 @@
 procedure TFormSourceCode.MemoSourceChange(Sender: TObject);
 begin
-  Core.Project.Modified := True;
-  Core.CurrentTarget.Compiled := False;
-  FormMain.UpdateInterface;
+  Core.Core.Project.Modified := True;
+  Core.Core.CurrentTarget.Compiled := False;
+  if Assigned(FOnUpdateInterface) then
+    OnUpdateInterface(Self);
 end;
 
@@ -194 +201 @@
   Shift: TShiftState);
 begin
-  FormMain.UpdateStatusBar;
+  if Assigned(FOnUpdateStatusBar) then
+    FOnUpdateStatusBar(Self);
 end;
 
@@ -200 +208 @@
   Shift: TShiftState; X, Y: Integer);
 begin
-  FormMain.UpdateStatusBar;
+  if Assigned(FOnUpdateStatusBar) then
+    FOnUpdateStatusBar(Self);
 end;
 

trunk/Forms/FormTargetCode.lfm

@@ -1 +1 @@
 object FormTargetCode: TFormTargetCode
   Left = 555
-  Height = 435
+  Height = 522
   Top = 379
-  Width = 612
+  Width = 734
   Caption = 'Target code'
-  ClientHeight = 435
-  ClientWidth = 612
-  DesignTimePPI = 120
-  LCLVersion = '2.0.2.0'
+  ClientHeight = 522
+  ClientWidth = 734
+  DesignTimePPI = 144
+  OnCreate = FormCreate
+  LCLVersion = '2.2.6.0'
   inline SynEditTarget: TSynEdit
     Left = 0
-    Height = 435
+    Height = 522
     Top = 0
-    Width = 612
+    Width = 734
     Align = alClient
-    Font.Height = -13
+    Font.Height = -16
     Font.Name = 'Courier New'
     Font.Pitch = fpFixed
@@ -23 +24 @@
     PopupMenu = PopupMenuTarget
     TabOrder = 0
-    Gutter.Width = 68
+    Gutter.Width = 81
     Gutter.MouseActions = <>
     RightGutter.Width = 0
@@ -472 +473 @@
     inline SynLeftGutterPartList1: TSynGutterPartList
       object SynGutterMarks1: TSynGutterMarks
-        Width = 30
+        Width = 36
         MouseActions = <>
       end
       object SynGutterLineNumber1: TSynGutterLineNumber
-        Width = 17
+        Width = 21
         MouseActions = <>
         MarkupInfo.Background = clBtnFace
@@ -486 +487 @@
       end
       object SynGutterChanges1: TSynGutterChanges
-        Width = 5
+        Width = 6
         MouseActions = <>
         ModifiedColor = 59900
@@ -498 +499 @@
       end
       object SynGutterCodeFolding1: TSynGutterCodeFolding
-        Width = 13
+        Width = 15
         MouseActions = <>
         MarkupInfo.Background = clNone
@@ -509 +510 @@
   object PopupMenuTarget: TPopupMenu
     Images = Core.ImageListMain
-    left = 84
-    top = 100
+    Left = 101
+    Top = 120
     object MenuItem20: TMenuItem
       Action = AFormatCode
@@ -520 +521 @@
   object ActionList1: TActionList
     Images = Core.ImageListMain
-    left = 199
-    top = 39
+    Left = 239
+    Top = 47
     object AFormatCode: TAction
       Caption = 'Format code'

trunk/Forms/FormTargetCode.pas

@@ -1 @@
-unit UFormTargetCode;
+unit FormTargetCode;
 
 interface
@@ -23 +23 @@
     procedure AFormatCodeExecute(Sender: TObject);
     procedure AShrinkCodeExecute(Sender: TObject);
-  private
-    { private declarations }
+    procedure FormCreate(Sender: TObject);
   public
     procedure SetHighlighter(SourceExt: string);
   end;
 
-var
-  FormTargetCode: TFormTargetCode;
 
 implementation
 
 {$R *.lfm}
+
+uses
+  Core;
 
 { TFormTargetCode }
@@ -84 +84 @@
 end;
 
+procedure TFormTargetCode.FormCreate(Sender: TObject);
+begin
+  Core.Core.Translator.TranslateComponentRecursive(Self);
+  Core.Core.ThemeManager.UseTheme(Self);
+end;
+
 procedure TFormTargetCode.SetHighlighter(SourceExt: string);
 begin

trunk/Forms/FormTargetOptions.pas

@@ -1 @@
-unit UFormTargetOptions;
+unit FormTargetOptions;
 
 interface
@@ -5 +5 @@
 uses
   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, StdCtrls,
-  UTarget;
+  Target;
 
 type
@@ -26 +26 @@
     procedure FormCreate(Sender: TObject);
     procedure FormShow(Sender: TObject);
-  private
-    { private declarations }
   public
     procedure LoadControls(Target: TTarget);
     procedure SaveControls(Target: TTarget);
   end;
-
-var
-  FormTargetOptions: TFormTargetOptions;
 
 
@@ -42 +37 @@
 
 uses
-  UCore;
+  Core;
 
 { TFormTargetOptions }
@@ -61 +56 @@
   var CloseAction: TCloseAction);
 begin
-  Core.PersistentForm1.Save(Self);
+  Core.Core.PersistentForm1.Save(Self);
 end;
 
 procedure TFormTargetOptions.FormCreate(Sender: TObject);
 begin
-  Core.Translator.TranslateComponentRecursive(Self);
-  Core.ThemeManager.UseTheme(Self);
+  Core.Core.Translator.TranslateComponentRecursive(Self);
+  Core.Core.ThemeManager.UseTheme(Self);
 end;
 
 procedure TFormTargetOptions.FormShow(Sender: TObject);
 begin
-  Core.PersistentForm1.Load(Self);
+  Core.Core.PersistentForm1.Load(Self);
 end;
 

trunk/Forms/FormTargets.pas

@@ -1 @@
-unit UFormTargets;
+unit FormTargets;
 
 interface
@@ -18 +18 @@
     procedure ListView1DblClick(Sender: TObject);
     procedure ListView1KeyPress(Sender: TObject; var Key: char);
-  private
-    { private declarations }
   public
     procedure ReloadList;
   end; 
 
-var
-  FormTargets: TFormTargets;
 
 implementation
@@ -32 +28 @@
 
 uses
-  UCore, UTarget, UFormTargetOptions;
+  Core, Target, FormTargetOptions;
 
 { TFormTargets }
@@ -38 +34 @@
 procedure TFormTargets.FormShow(Sender: TObject);
 begin
-  Core.PersistentForm1.Load(Self);
+  Core.Core.PersistentForm1.Load(Self);
   ReloadList;
 end;
@@ -44 +40 @@
 procedure TFormTargets.FormCreate(Sender: TObject);
 begin
-  Core.Translator.TranslateComponentRecursive(Self);
-  Core.ThemeManager.UseTheme(Self);
+  Core.Core.Translator.TranslateComponentRecursive(Self);
+  Core.Core.ThemeManager.UseTheme(Self);
 end;
 
@@ -51 +47 @@
   );
 begin
-  Core.PersistentForm1.Save(Self);
+  Core.Core.PersistentForm1.Save(Self);
 end;
 
 procedure TFormTargets.ListView1Data(Sender: TObject; Item: TListItem);
 begin
-  if (Item.Index >= 0) and (Item.Index < Core.Targets.Count) then
-  with TTarget(Core.Targets[Item.Index]) do begin
+  if (Item.Index >= 0) and (Item.Index < Core.Core.Targets.Count) then
+  with TTarget(Core.Core.Targets[Item.Index]) do begin
     Item.Caption := Name;
-    Item.Data := Core.Targets[Item.Index];
+    Item.Data := Core.Core.Targets[Item.Index];
     Item.SubItems.Add(ExecutorPath);
     Item.SubItems.Add(CompilerPath);
@@ -66 +62 @@
 
 procedure TFormTargets.ListView1DblClick(Sender: TObject);
+var
+  FormTargetOptions: TFormTargetOptions;
 begin
   FormTargetOptions := TFormTargetOptions.Create(nil);
@@ -86 +84 @@
 procedure TFormTargets.ReloadList;
 begin
-  ListView1.Items.Count := Core.Targets.Count;
+  ListView1.Items.Count := Core.Core.Targets.Count;
   ListView1.Refresh;
 end;