Changeset 67 for trunk/Forms/UFormMain.pas

Timestamp:

Jan 17, 2015, 4:08:03 PM (10 years ago)

Author:

chronos

Message:

• Renamed: MainForm class to FormMain.
• Moved: CurrentTarget moved from FormMain to Core class.

File:

• trunk/Forms/UFormMain.pas (modified) (32 diffs)

trunk/Forms/UFormMain.pas

@@ -11 +11 @@
 type
 
-  { TMainForm }
-
-  TMainForm = class(TForm)
+  { TFormMain }
+
+  TFormMain = class(TForm)
     AViewLog: TAction;
     AProgramShowExecutionPoint: TAction;
@@ -140 +140 @@
     procedure TimerRefreshTimer(Sender: TObject);
   private
-    FCurrentTarget: TTarget;
-    procedure TargetLogExecute(Lines: TStrings);
-    procedure SetCurrentTarget(AValue: TTarget);
     procedure AProjectOpenRecentExecute(Sender: TObject);
-    procedure TargetStateChanged(Sender: TObject);
-    procedure MessagesChanged(Sender: TObject);
     procedure MenuItemTargetClick(Sender: TObject);
     procedure ProjectOpen(FileName: string);
@@ -152 +147 @@
     procedure LastOpenedListChange(Sender: TObject);
   public
+    procedure MessagesChanged(Sender: TObject);
+    procedure TargetLogExecute(Lines: TStrings);
+    procedure TargetStateChanged(Sender: TObject);
     procedure LoadFromRegistry(Root: HKEY; Key: string);
     procedure SaveToRegistry(Root: HKEY; Key: string);
@@ -157 +155 @@
     procedure UpdateStatusBar;
     procedure UpdateTargetList;
-    property CurrentTarget: TTarget read FCurrentTarget write SetCurrentTarget;
-  end;
-
-var
-  MainForm: TMainForm;
+  end;
+
+var
+  FormMain: TFormMain;
 
 
@@ -184 +181 @@
   SCloseProjectFirst = 'Project need to be closed before it can be openned';
 
-{ TMainForm }
-
-procedure TMainForm.SetCurrentTarget(AValue: TTarget);
-var
-  I: Integer;
-begin
-  if FCurrentTarget = AValue then Exit;
-  FCurrentTarget := AValue;
-  for I := 0 to Core.Targets.Count - 1 do
-    TTarget(Core.Targets[I]).OnChangeState := nil;
-  if Assigned(FCurrentTarget) then begin
-    FCurrentTarget.OnChangeState := TargetStateChanged;
-    FCurrentTarget.OnLog := TargetLogExecute;
-    FCurrentTarget.OptimizationLevel := Core.OptimizationLevel;
-    FCurrentTarget.Messages.OnChange := MessagesChanged;
-  end;
-  UpdateTargetList;
-  UpdateInterface;
-end;
-
-procedure TMainForm.FormShow(Sender: TObject);
+{ TFormMain }
+
+procedure TFormMain.FormShow(Sender: TObject);
 begin
   with Core.ScaleDPI do begin
@@ -222 +201 @@
 end;
 
-procedure TMainForm.TimerRefreshTimer(Sender: TObject);
+procedure TFormMain.TimerRefreshTimer(Sender: TObject);
 begin
   FormCPU.Reload;
@@ -229 +208 @@
 end;
 
-procedure TMainForm.TargetLogExecute(Lines: TStrings);
+procedure TFormMain.TargetLogExecute(Lines: TStrings);
 begin
   FormLog.Memo1.Lines.AddStrings(Lines);
 end;
 
-procedure TMainForm.TargetStateChanged(Sender: TObject);
+procedure TFormMain.TargetStateChanged(Sender: TObject);
 begin
   UpdateInterface;
-  if CurrentTarget.State = rsPaused then
+  if Core.CurrentTarget.State = rsPaused then
     AProgramShowExecutionPoint.Execute;
-  if CurrentTarget.State = rsStopped then CurrentTarget.Messages.AddMessage(SProgramStopped);
-end;
-
-procedure TMainForm.MessagesChanged(Sender: TObject);
+  if Core.CurrentTarget.State = rsStopped then
+  Core.CurrentTarget.Messages.AddMessage(SProgramStopped);
+end;
+
+procedure TFormMain.MessagesChanged(Sender: TObject);
 begin
   FormMessages.Reload;
 end;
 
-procedure TMainForm.MenuItemTargetClick(Sender: TObject);
+procedure TFormMain.MenuItemTargetClick(Sender: TObject);
 var
   I: Integer;
@@ -253 +233 @@
   if Sender is TMenuItem then
   with TMenuItem(Sender) do begin
-    CurrentTarget := TTarget(Core.Targets[MenuIndex]);
+    Core.CurrentTarget := TTarget(Core.Targets[MenuIndex]);
     Checked := True;
     for I := 0 to Parent.Count - 1 do
@@ -260 +240 @@
 end;
 
-procedure TMainForm.ProjectOpen(FileName: string);
+procedure TFormMain.ProjectOpen(FileName: string);
 begin
   if Core.Project.Openned then
@@ -268 +248 @@
   Core.Project.FileName := FileName;
   Core.Project.Openned := True;
-  CurrentTarget.Compiled := False;
+  Core.CurrentTarget.Compiled := False;
   UpdateInterface;
 end;
 
-procedure TMainForm.UpdateToolBarHints;
+procedure TFormMain.UpdateToolBarHints;
 var
   I: Integer;
@@ -280 +260 @@
 end;
 
-procedure TMainForm.DockInit;
+procedure TFormMain.DockInit;
 begin
   FormSourceCode.ManualDock(TabSheetSource, nil, alClient);
@@ -303 +283 @@
   FormMessages.Align := alClient;
   FormMessages.Show;
-  PageControlRight.Width := MainForm.Width div 3;
-  PageControlBottom.Height := MainForm.Height div 5;
-end;
-
-procedure TMainForm.LastOpenedListChange(Sender: TObject);
+  PageControlRight.Width := FormMain.Width div 3;
+  PageControlBottom.Height := FormMain.Height div 5;
+end;
+
+procedure TFormMain.LastOpenedListChange(Sender: TObject);
 begin
   Core.LastOpenedList.LoadToMenuItem(MenuItemOpenRecent, AProjectOpenRecentExecute);
@@ -313 +293 @@
 end;
 
-procedure TMainForm.LoadFromRegistry(Root: HKEY; Key: string);
+procedure TFormMain.LoadFromRegistry(Root: HKEY; Key: string);
 var
   TargetName: string;
@@ -322 +302 @@
     OpenKey(Key, True);
     TargetName := ReadStringWithDefault('TargetName', 'Interpretter');
-    CurrentTarget := Core.Targets.FindByName(TargetName);
-    if not Assigned(CurrentTarget) then CurrentTarget := TTarget(Core.Targets[0]);
+    Core.CurrentTarget := Core.Targets.FindByName(TargetName);
+    if not Assigned(Core.CurrentTarget) then
+      Core.CurrentTarget := TTarget(Core.Targets[0]);
   finally
     Free;
@@ -329 +310 @@
 end;
 
-procedure TMainForm.SaveToRegistry(Root: HKEY; Key: string);
+procedure TFormMain.SaveToRegistry(Root: HKEY; Key: string);
 begin
   with TRegistryEx.Create do
@@ -335 +316 @@
     RootKey := Root;
     OpenKey(Key, True);
-    WriteString('TargetName', CurrentTarget.Name);
+    WriteString('TargetName', Core.CurrentTarget.Name);
   finally
     Free;
@@ -341 +322 @@
 end;
 
-procedure TMainForm.UpdateInterface;
+procedure TFormMain.UpdateInterface;
 var
   Title: string;
@@ -354 +335 @@
   AProjectClose.Enabled := Core.Project.Openned;
   AProjectSaveAs.Enabled := Core.Project.Openned;
-  AProgramRun.Enabled := (tcRun in CurrentTarget.Capabilities) and
-    Core.Project.Openned and (CurrentTarget.State = rsStopped) or (CurrentTarget.State = rsPaused);
-  AProgramPause.Enabled := (tcPause in CurrentTarget.Capabilities) and
-    Core.Project.Openned and (CurrentTarget.State = rsRunning);
-  AProgramStop.Enabled := (tcStop in CurrentTarget.Capabilities) and
-    Core.Project.Openned and (CurrentTarget.State <> rsStopped);
-  AProgramCompile.Enabled := (tcCompile in CurrentTarget.Capabilities) and
+  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;
-  AProgramStepInto.Enabled := (tcStepInto in CurrentTarget.Capabilities) and
-    Core.Project.Openned and ((CurrentTarget.State = rsPaused) or (CurrentTarget.State = rsStopped));
-  AProgramStepOut.Enabled := (tcStepOut in CurrentTarget.Capabilities) and
-    Core.Project.Openned and (CurrentTarget.State = rsPaused);
-  AProgramRunToCursor.Enabled := (tcRunToCursor in CurrentTarget.Capabilities) and
-    Core.Project.Openned and ((CurrentTarget.State = rsPaused) or (CurrentTarget.State = rsStopped));
-  AProgramStepOver.Enabled := (tcStepOver in CurrentTarget.Capabilities) and
-    Core.Project.Openned and ((CurrentTarget.State = rsPaused) or (CurrentTarget.State = rsStopped));
-  AProgramShowExecutionPoint.Enabled := (tcPause in CurrentTarget.Capabilities) and
-    Core.Project.Openned and (CurrentTarget.State = rsPaused);
-  AShowSourcePosition.Enabled := CurrentTarget.Compiled;
-  AShowTargetPosition.Enabled := CurrentTarget.Compiled;
+  AProgramStepInto.Enabled := (tcStepInto in Core.CurrentTarget.Capabilities) and
+    Core.Project.Openned and ((Core.CurrentTarget.State = rsPaused) or (Core.CurrentTarget.State = rsStopped));
+  AProgramStepOut.Enabled := (tcStepOut in Core.CurrentTarget.Capabilities) and
+    Core.Project.Openned and (Core.CurrentTarget.State = rsPaused);
+  AProgramRunToCursor.Enabled := (tcRunToCursor in Core.CurrentTarget.Capabilities) and
+    Core.Project.Openned and ((Core.CurrentTarget.State = rsPaused) or (Core.CurrentTarget.State = rsStopped));
+  AProgramStepOver.Enabled := (tcStepOver in Core.CurrentTarget.Capabilities) and
+    Core.Project.Openned and ((Core.CurrentTarget.State = rsPaused) or (Core.CurrentTarget.State = rsStopped));
+  AProgramShowExecutionPoint.Enabled := (tcPause in Core.CurrentTarget.Capabilities) and
+    Core.Project.Openned and (Core.CurrentTarget.State = rsPaused);
+  AShowSourcePosition.Enabled := Core.CurrentTarget.Compiled;
+  AShowTargetPosition.Enabled := Core.CurrentTarget.Compiled;
   UpdateStatusBar;
 end;
 
-procedure TMainForm.UpdateStatusBar;
+procedure TFormMain.UpdateStatusBar;
 begin
   StatusBarMain.Panels[0].Text := IntToStr(FormSourceCode.MemoSource.CaretPos.X) +
@@ -383 +364 @@
 end;
 
-procedure TMainForm.UpdateTargetList;
+procedure TFormMain.UpdateTargetList;
 var
   I: Integer;
 begin
-  Core.Targets.LoadToMenuItem(MenuItemTarget, MenuItemTargetClick, CurrentTarget);
-  Core.Targets.LoadToMenuItem(PopupMenuTargets.Items, MenuItemTargetClick, CurrentTarget);
+  Core.Targets.LoadToMenuItem(MenuItemTarget, MenuItemTargetClick, Core.CurrentTarget);
+  Core.Targets.LoadToMenuItem(PopupMenuTargets.Items, MenuItemTargetClick, Core.CurrentTarget);
 
   // Update toolbutton
-  I := Core.Targets.IndexOf(CurrentTarget);
+  I := Core.Targets.IndexOf(Core.CurrentTarget);
   if I <> -1 then
   with TTarget(Core.Targets[I]) do begin
@@ -400 +381 @@
 end;
 
-procedure TMainForm.FormCreate(Sender: TObject);
+procedure TFormMain.FormCreate(Sender: TObject);
 begin
   UpdateTargetList;
@@ -406 +387 @@
 end;
 
-procedure TMainForm.FormDestroy(Sender: TObject);
+procedure TFormMain.FormDestroy(Sender: TObject);
 begin
   SaveToRegistry(HKEY(Core.ApplicationInfo.RegistryRoot), Core.ApplicationInfo.RegistryKey);
 end;
 
-procedure TMainForm.AProgramRunExecute(Sender: TObject);
-begin
-  if CurrentTarget is TTargetInterpretter then
-    TTargetInterpretter(CurrentTarget).Input := FormInput.MemoInput.Lines.Text;
-  if not CurrentTarget.Compiled then AProgramCompile.Execute;
-  CurrentTarget.Run;
-  CurrentTarget.Messages.AddMessage(SProgramStarted);
-end;
-
-procedure TMainForm.AShowSourcePositionExecute(Sender: TObject);
+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.CurrentTarget.Messages.AddMessage(SProgramStarted);
+end;
+
+procedure TFormMain.AShowSourcePositionExecute(Sender: TObject);
 var
   DebugStep: TDebugStep;
 begin
-  DebugStep := CurrentTarget.DebugSteps.SearchByTargetPos(FormTargetCode.MemoTarget.SelStart);
+  DebugStep := Core.CurrentTarget.DebugSteps.SearchByTargetPos(FormTargetCode.MemoTarget.SelStart);
   if Assigned(DebugStep) then begin
     FormSourceCode.MemoSource.SelStart := DebugStep.SourcePosition;
@@ -431 +412 @@
 end;
 
-procedure TMainForm.AShowTargetPositionExecute(Sender: TObject);
+procedure TFormMain.AShowTargetPositionExecute(Sender: TObject);
 var
   DebugStep: TDebugStep;
 begin
-  DebugStep := CurrentTarget.DebugSteps.SearchBySourcePos(FormSourceCode.MemoSource.SelStart);
+  DebugStep := Core.CurrentTarget.DebugSteps.SearchBySourcePos(FormSourceCode.MemoSource.SelStart);
   if Assigned(DebugStep) then begin
     FormTargetCode.MemoTarget.SelStart := DebugStep.TargetPosition;
@@ -442 +423 @@
 end;
 
-procedure TMainForm.AViewCompilersExecute(Sender: TObject);
+procedure TFormMain.AViewCompilersExecute(Sender: TObject);
 begin
   FormCompilers.Show;
 end;
 
-procedure TMainForm.AViewInterpretterExecute(Sender: TObject);
+procedure TFormMain.AViewInterpretterExecute(Sender: TObject);
 begin
   FormCPU.Show;
 end;
 
-procedure TMainForm.AViewLogExecute(Sender: TObject);
+procedure TFormMain.AViewLogExecute(Sender: TObject);
 begin
   FormLog.Show;
 end;
 
-procedure TMainForm.FormCloseQuery(Sender: TObject; var CanClose: boolean);
+procedure TFormMain.FormCloseQuery(Sender: TObject; var CanClose: boolean);
 begin
   if Core.Project.Modified then begin
@@ -465 +446 @@
 end;
 
-procedure TMainForm.AExitExecute(Sender: TObject);
+procedure TFormMain.AExitExecute(Sender: TObject);
 begin
   Close;
 end;
 
-procedure TMainForm.AOptionsExecute(Sender: TObject);
+procedure TFormMain.AOptionsExecute(Sender: TObject);
 begin
   OptionsForm.Load;
@@ -477 +458 @@
     //OptionsForm.SaveToInterpretter(CurrentTarget);
     OptionsForm.Save;
-    if Assigned(CurrentTarget) then
-      CurrentTarget.OptimizationLevel := Core.OptimizationLevel;
-  end;
-end;
-
-procedure TMainForm.AProgramCompileExecute(Sender: TObject);
-begin
-  with CurrentTarget do begin
+    if Assigned(Core.CurrentTarget) then
+      Core.CurrentTarget.OptimizationLevel := Core.OptimizationLevel;
+  end;
+end;
+
+procedure TFormMain.AProgramCompileExecute(Sender: TObject);
+begin
+  with Core.CurrentTarget do begin
     AProgramStop.Execute;
     SourceCode := FormSourceCode.MemoSource.Text;
     ProjectFileName := Core.Project.FileName;
     ProgramName := ExtractFileNameOnly(Core.Project.FileName);
-    CurrentTarget.Messages.AddMessage(SCompileStart);
+    Core.CurrentTarget.Messages.AddMessage(SCompileStart);
     Compile;
-    CurrentTarget.Messages.AppendMessage(SDone);
+    Core.CurrentTarget.Messages.AppendMessage(SDone);
     FormTargetCode.MemoTarget.Text := TargetCode;
     UpdateInterface;
@@ -497 +478 @@
 end;
 
-procedure TMainForm.ABreakpointToggleExecute(Sender: TObject);
+procedure TFormMain.ABreakpointToggleExecute(Sender: TObject);
 var
   DebugStep: TDebugStep;
   BreakPoint: TBreakPoint;
 begin
-  DebugStep := CurrentTarget.DebugSteps.SearchBySourcePos(FormSourceCode.MemoSource.SelStart);
+  DebugStep := Core.CurrentTarget.DebugSteps.SearchBySourcePos(FormSourceCode.MemoSource.SelStart);
   if Assigned(DebugStep) then begin
-    BreakPoint := CurrentTarget.BreakPoints.SearchByTargetPos(DebugStep.TargetPosition);
+    BreakPoint := Core.CurrentTarget.BreakPoints.SearchByTargetPos(DebugStep.TargetPosition);
     if Assigned(BreakPoint) then
-      CurrentTarget.BreakPoints.Delete(CurrentTarget.BreakPoints.IndexOf(BreakPoint))
-      else CurrentTarget.BreakPoints.AddItem(DebugStep.TargetPosition);
-  end;
-end;
-
-procedure TMainForm.AProgramPauseExecute(Sender: TObject);
-begin
-  CurrentTarget.Pause;
-end;
-
-procedure TMainForm.AProgramRunToCursorExecute(Sender: TObject);
+      Core.CurrentTarget.BreakPoints.Delete(Core.CurrentTarget.BreakPoints.IndexOf(BreakPoint))
+      else Core.CurrentTarget.BreakPoints.AddItem(DebugStep.TargetPosition);
+  end;
+end;
+
+procedure TFormMain.AProgramPauseExecute(Sender: TObject);
+begin
+  Core.CurrentTarget.Pause;
+end;
+
+procedure TFormMain.AProgramRunToCursorExecute(Sender: TObject);
 var
   DebugStep: TDebugStep;
 begin
-  if CurrentTarget.State = rsStopped then begin
-    if not CurrentTarget.Compiled then AProgramCompile.Execute;
-    DebugStep := CurrentTarget.DebugSteps.SearchBySourcePos(FormSourceCode.MemoSource.SelStart);
-    CurrentTarget.BreakPoints.SetSystem(DebugStep.TargetPosition);
+  if Core.CurrentTarget.State = rsStopped then begin
+    if not Core.CurrentTarget.Compiled then AProgramCompile.Execute;
+    DebugStep := Core.CurrentTarget.DebugSteps.SearchBySourcePos(FormSourceCode.MemoSource.SelStart);
+    Core.CurrentTarget.BreakPoints.SetSystem(DebugStep.TargetPosition);
     AProgramRun.Execute;
   end else begin
-    DebugStep := CurrentTarget.DebugSteps.SearchBySourcePos(FormSourceCode.MemoSource.SelStart);
-    CurrentTarget.RunToCursor(DebugStep.TargetPosition);
-  end;
-end;
-
-procedure TMainForm.AProgramShowExecutionPointExecute(Sender: TObject);
+    DebugStep := Core.CurrentTarget.DebugSteps.SearchBySourcePos(FormSourceCode.MemoSource.SelStart);
+    Core.CurrentTarget.RunToCursor(DebugStep.TargetPosition);
+  end;
+end;
+
+procedure TFormMain.AProgramShowExecutionPointExecute(Sender: TObject);
 var
   DebugStep: TDebugStep;
 begin
-  DebugStep := CurrentTarget.DebugSteps.SearchByTargetPos(CurrentTarget.ExecutionPosition);
+  DebugStep := Core.CurrentTarget.DebugSteps.SearchByTargetPos(Core.CurrentTarget.ExecutionPosition);
   FormSourceCode.MemoSource.SelStart := DebugStep.SourcePosition;
   FormTargetCode.MemoTarget.SelStart := DebugStep.TargetPosition;
@@ -542 +523 @@
 end;
 
-procedure TMainForm.AProgramStepIntoExecute(Sender: TObject);
-begin
-  if CurrentTarget.State = rsStopped then begin
-    if not CurrentTarget.Compiled then AProgramCompile.Execute;
-    CurrentTarget.BreakPoints.SetSystem(TDebugStep(CurrentTarget.DebugSteps.First).TargetPosition);
+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(TDebugStep(Core.CurrentTarget.DebugSteps.First).TargetPosition);
     AProgramRun.Execute;
-  end else CurrentTarget.StepInto;
-end;
-
-procedure TMainForm.AProgramStepOutExecute(Sender: TObject);
-begin
-  CurrentTarget.StepOut;
-end;
-
-procedure TMainForm.AProgramStepOverExecute(Sender: TObject);
-begin
-  if CurrentTarget.State = rsStopped then begin
-    if not CurrentTarget.Compiled then AProgramCompile.Execute;
-    CurrentTarget.BreakPoints.SetSystem(TDebugStep(CurrentTarget.DebugSteps.First).TargetPosition);
+  end else Core.CurrentTarget.StepInto;
+end;
+
+procedure TFormMain.AProgramStepOutExecute(Sender: TObject);
+begin
+  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).TargetPosition);
     AProgramRun.Execute;
-  end else CurrentTarget.StepOver;
-end;
-
-procedure TMainForm.AProgramStopExecute(Sender: TObject);
-begin
-  CurrentTarget.Stop;
-end;
-
-procedure TMainForm.AProjectCloseExecute(Sender: TObject);
+  end else Core.CurrentTarget.StepOver;
+end;
+
+procedure TFormMain.AProgramStopExecute(Sender: TObject);
+begin
+  Core.CurrentTarget.Stop;
+end;
+
+procedure TFormMain.AProjectCloseExecute(Sender: TObject);
 var
   DialogResult: TModalResult;
@@ -589 +570 @@
 end;
 
-procedure TMainForm.AProjectNewExecute(Sender: TObject);
+procedure TFormMain.AProjectNewExecute(Sender: TObject);
 begin
   AProjectClose.Execute;
@@ -596 +577 @@
   FormSourceCode.MemoSource.Clear;
   Core.Project.Openned := True;
-  CurrentTarget.Compiled := False;
+  Core.CurrentTarget.Compiled := False;
   UpdateInterface;
 end;
 
-procedure TMainForm.AProjectOpenRecentExecute(Sender: TObject);
+procedure TFormMain.AProjectOpenRecentExecute(Sender: TObject);
 begin
   AProjectClose.Execute;
@@ -607 +588 @@
 end;
 
-procedure TMainForm.AProjectOpenExecute(Sender: TObject);
+procedure TFormMain.AProjectOpenExecute(Sender: TObject);
 begin
   if Core.LastOpenedList.Items.Count > 0 then
@@ -620 +601 @@
 end;
 
-procedure TMainForm.AProjectSaveAsExecute(Sender: TObject);
+procedure TFormMain.AProjectSaveAsExecute(Sender: TObject);
 begin
   SaveDialog1.FileName := Core.Project.FileName;
@@ -632 +613 @@
 end;
 
-procedure TMainForm.AProjectSaveExecute(Sender: TObject);
+procedure TFormMain.AProjectSaveExecute(Sender: TObject);
 begin
   if Core.Project.Modified and FileExistsUTF8(Core.Project.FileName) then begin