Changeset 51 for trunk/Forms/UFormMain.pas

Timestamp:

Jul 26, 2012, 2:07:15 PM (12 years ago)

Author:

chronos

Message:

• Modified: Non visual related code moved to data module Core in UCore unit.

File:

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

trunk/Forms/UFormMain.pas

@@ -7 +7 @@
 uses
   Classes, SysUtils, FileUtil, SynEdit, Forms, Controls, Graphics, Dialogs,
-  Menus, ActnList, StdCtrls, ComCtrls, ExtCtrls, UTargetInterpretter,
-  UCoolTranslator, StrUtils, SpecializedList, UTarget, UApplicationInfo,
-  Registry, URegistry, ULastOpenedList, Process;
-
-const
-  RegistryRoot = HKEY_CURRENT_USER;
+  Menus, ActnList, StdCtrls, ComCtrls, ExtCtrls,
+  StrUtils, SpecializedList, UTarget,
+  Registry, URegistry, Process;
 
 type
@@ -19 +16 @@
 
   TMainForm = class(TForm)
-    ApplicationInfo: TApplicationInfo;
     AProgramShowExecutionPoint: TAction;
     AShowSourcePosition: TAction;
@@ -43 +39 @@
     AProjectOpen: TAction;
     ActionList1: TActionList;
-    CoolTranslator1: TCoolTranslator;
     ImageListMain: TImageList;
     MainMenu1: TMainMenu;
@@ -145 +140 @@
   private
     FCurrentTarget: TTarget;
+    procedure SetCurrentTarget(AValue: TTarget);
     procedure AProjectOpenRecentExecute(Sender: TObject);
     procedure TargetStateChanged(Sender: TObject);
@@ -150 +146 @@
     procedure MenuItemTargetClick(Sender: TObject);
     procedure ProjectOpen(FileName: string);
-    procedure SetCurrentTarget(AValue: TTarget);
     procedure UpdateToolBarHints;
     procedure DockInit;
     procedure LastOpenedListChange(Sender: TObject);
   public
-    Modified: Boolean;
-    ProjectFileName: string;
-    Targets: TTargetList;
-    LastOpenedList: TLastOpenedList;
-    OpenProjectOnStart: Boolean;
     procedure LoadFromRegistry(Root: HKEY; Key: string);
     procedure SaveToRegistry(Root: HKEY; Key: string);
@@ -177 +167 @@
 
 uses
-  UFormCPU, UFormOptions, UFormMessages, UTargetJava,
-  UTargetDelphi, UTargetPHP, UTargetC, UFormTargets, UFormOutput, UFormInput,
-  UFormMemory, UFormSourceCode, UFormTargetCode;
+  UCore, UFormCPU, UFormOptions, UFormMessages, UFormTargets, UFormOutput, UFormInput,
+  UFormMemory, UFormSourceCode, UFormTargetCode, UTargetInterpretter;
 
 resourcestring
@@ -189 +178 @@
 { 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;
+  FCurrentTarget.OnChangeState := TargetStateChanged;
+  FCurrentTarget.Messages.OnChange := MessagesChanged;
+  UpdateTargetList;
+  UpdateInterface;
+end;
+
 procedure TMainForm.FormShow(Sender: TObject);
 begin
-  LoadFromRegistry(RegistryRoot, ApplicationInfo.RegistryKey);
+  LoadFromRegistry(HKEY(Core.ApplicationInfo.RegistryRoot), Core.ApplicationInfo.RegistryKey);
   PageControlMain.TabIndex := 0;
-  if OpenProjectOnStart and (LastOpenedList.Items.Count > 0) then
-    ProjectOpen(LastOpenedList.Items[0])
+  if Core.OpenProjectOnStart and (Core.LastOpenedList.Items.Count > 0) then
+    ProjectOpen(Core.LastOpenedList.Items[0])
     else AProjectNew.Execute;
   UpdateInterface;
@@ -228 +231 @@
   if Sender is TMenuItem then
   with TMenuItem(Sender) do begin
-    CurrentTarget := TTarget(Targets[MenuIndex]);
+    CurrentTarget := TTarget(Core.Targets[MenuIndex]);
     Checked := True;
     for I := 0 to Parent.Count - 1 do
@@ -239 +242 @@
   AProjectClose.Execute;
   FormSourceCode.MemoSource.Lines.LoadFromFile(UTF8Decode(FileName));
-  LastOpenedList.AddItem(FileName);
-  ProjectFileName := FileName;
-  Modified := False;
+  Core.LastOpenedList.AddItem(FileName);
+  Core.ProjectFileName := FileName;
+  Core.Modified := False;
   CurrentTarget.Compiled := False;
-  UpdateInterface;
-end;
-
-procedure TMainForm.SetCurrentTarget(AValue: TTarget);
-var
-  I: Integer;
-begin
-  if FCurrentTarget = AValue then Exit;
-  FCurrentTarget := AValue;
-  for I := 0 to Targets.Count - 1 do
-    TTarget(Targets[I]).OnChangeState := nil;
-  FCurrentTarget.OnChangeState := TargetStateChanged;
-  FCurrentTarget.Messages.OnChange := MessagesChanged;
-  UpdateTargetList;
   UpdateInterface;
 end;
@@ -297 +286 @@
 procedure TMainForm.LastOpenedListChange(Sender: TObject);
 begin
-  LastOpenedList.LoadToMenuItem(MenuItemOpenRecent, AProjectOpenRecentExecute);
-  LastOpenedList.LoadToMenuItem(PopupMenuRecentFiles.Items, AProjectOpenRecentExecute);
+  Core.LastOpenedList.LoadToMenuItem(MenuItemOpenRecent, AProjectOpenRecentExecute);
+  Core.LastOpenedList.LoadToMenuItem(PopupMenuRecentFiles.Items, AProjectOpenRecentExecute);
 end;
 
@@ -309 +298 @@
     RootKey := Root;
     OpenKey(Key, True);
-    OpenProjectOnStart := ReadBoolWithDefault('OpenProjectOnStart', True);
+    Core.OpenProjectOnStart := ReadBoolWithDefault('OpenProjectOnStart', True);
     if ValueExists('LanguageCode') then
-      CoolTranslator1.Language := CoolTranslator1.Languages.SearchByCode(ReadStringWithDefault('LanguageCode', ''))
-      else CoolTranslator1.Language := CoolTranslator1.Languages.SearchByCode('');
+      Core.CoolTranslator1.Language := Core.CoolTranslator1.Languages.SearchByCode(ReadStringWithDefault('LanguageCode', ''))
+      else Core.CoolTranslator1.Language := Core.CoolTranslator1.Languages.SearchByCode('');
     TargetName := ReadStringWithDefault('TargetName', 'Interpretter');
-    CurrentTarget := Targets.FindByName(TargetName);
-    if not Assigned(CurrentTarget) then CurrentTarget := TTarget(Targets[0]);
+    CurrentTarget := Core.Targets.FindByName(TargetName);
+    if not Assigned(CurrentTarget) then CurrentTarget := TTarget(Core.Targets[0]);
   finally
     Free;
   end;
-  LastOpenedList.LoadFromRegistry(Root, Key);
-  Targets.LoadFromRegistry(Root, Key);
+  Core.LastOpenedList.LoadFromRegistry(Root, Key);
+  Core.Targets.LoadFromRegistry(Root, Key);
 end;
 
 procedure TMainForm.SaveToRegistry(Root: HKEY; Key: string);
 begin
-  Targets.SaveToRegistry(Root, Key);
-  LastOpenedList.SaveToRegistry(Root, Key);
+  Core.Targets.SaveToRegistry(Root, Key);
+  Core.LastOpenedList.SaveToRegistry(Root, Key);
   with TRegistryEx.Create do
   try
     RootKey := Root;
     OpenKey(Key, True);
-    WriteBool('OpenProjectOnStart', OpenProjectOnStart);
-    if Assigned(CoolTranslator1.Language) and (CoolTranslator1.Language.Code <> '') then
-      WriteString('LanguageCode', CoolTranslator1.Language.Code)
+    WriteBool('OpenProjectOnStart', Core.OpenProjectOnStart);
+    if Assigned(Core.CoolTranslator1.Language) and (Core.CoolTranslator1.Language.Code <> '') then
+      WriteString('LanguageCode', Core.CoolTranslator1.Language.Code)
       else DeleteValue('LanguageCode');
     WriteString('TargetName', CurrentTarget.Name);
@@ -345 +334 @@
   Title: string;
 begin
-  AProjectSave.Enabled := Modified;
-  Title := ApplicationInfo.AppName;
-  if ProjectFileName <> '' then Title := ProjectFileName + ' - ' + Title;
-  if Modified then Title := Title + ' *';
+  AProjectSave.Enabled := Core.Modified;
+  Title := Core.ApplicationInfo.AppName;
+  if Core.ProjectFileName <> '' then Title := Core.ProjectFileName + ' - ' + Title;
+  if Core.Modified then Title := Title + ' *';
   Caption := Title;
-  FormSourceCode.MemoSource.Enabled := ProjectFileName <> '';
-  AProjectClose.Enabled := ProjectFileName <> '';
+  FormSourceCode.MemoSource.Enabled := Core.ProjectFileName <> '';
+  AProjectClose.Enabled := Core.ProjectFileName <> '';
   AProgramRun.Enabled := (tcRun in CurrentTarget.Capabilities) and
-    (ProjectFileName <> '') and (CurrentTarget.State = rsStopped) or (CurrentTarget.State = rsPaused);
+    (Core.ProjectFileName <> '') and (CurrentTarget.State = rsStopped) or (CurrentTarget.State = rsPaused);
   AProgramPause.Enabled := (tcPause in CurrentTarget.Capabilities) and
-    (ProjectFileName <> '') and (CurrentTarget.State = rsRunning);
+    (Core.ProjectFileName <> '') and (CurrentTarget.State = rsRunning);
   AProgramStop.Enabled := (tcStop in CurrentTarget.Capabilities) and
-    (ProjectFileName <> '') and (CurrentTarget.State <> rsStopped);
+    (Core.ProjectFileName <> '') and (CurrentTarget.State <> rsStopped);
   AProgramCompile.Enabled := (tcCompile in CurrentTarget.Capabilities) and
-    (ProjectFileName <> '');
+    (Core.ProjectFileName <> '');
   AProgramStepInto.Enabled := (tcStepInto in CurrentTarget.Capabilities) and
-    (ProjectFileName <> '') and ((CurrentTarget.State = rsPaused) or (CurrentTarget.State = rsStopped));
+    (Core.ProjectFileName <> '') and ((CurrentTarget.State = rsPaused) or (CurrentTarget.State = rsStopped));
   AProgramStepOut.Enabled := (tcStepOut in CurrentTarget.Capabilities) and
-    (ProjectFileName <> '') and (CurrentTarget.State = rsPaused);
+    (Core.ProjectFileName <> '') and (CurrentTarget.State = rsPaused);
   AProgramRunToCursor.Enabled := (tcRunToCursor in CurrentTarget.Capabilities) and
-    (ProjectFileName <> '') and ((CurrentTarget.State = rsPaused) or (CurrentTarget.State = rsStopped));
+    (Core.ProjectFileName <> '') and ((CurrentTarget.State = rsPaused) or (CurrentTarget.State = rsStopped));
   AProgramStepOver.Enabled := (tcStepOver in CurrentTarget.Capabilities) and
-    (ProjectFileName <> '') and ((CurrentTarget.State = rsPaused) or (CurrentTarget.State = rsStopped));
+    (Core.ProjectFileName <> '') and ((CurrentTarget.State = rsPaused) or (CurrentTarget.State = rsStopped));
   AProgramShowExecutionPoint.Enabled := (tcPause in CurrentTarget.Capabilities) and
-    (ProjectFileName <> '') and (CurrentTarget.State = rsPaused);
+    (Core.ProjectFileName <> '') and (CurrentTarget.State = rsPaused);
   AShowSourcePosition.Enabled := CurrentTarget.Compiled;
   AShowTargetPosition.Enabled := CurrentTarget.Compiled;
@@ -385 +374 @@
   I: Integer;
 begin
-  Targets.LoadToMenuItem(MenuItemTarget, MenuItemTargetClick, CurrentTarget);
-  Targets.LoadToMenuItem(PopupMenuTargets.Items, MenuItemTargetClick, CurrentTarget);
+  Core.Targets.LoadToMenuItem(MenuItemTarget, MenuItemTargetClick, CurrentTarget);
+  Core.Targets.LoadToMenuItem(PopupMenuTargets.Items, MenuItemTargetClick, CurrentTarget);
 
   // Update toolbutton
-  I := Targets.IndexOf(CurrentTarget);
+  I := Core.Targets.IndexOf(CurrentTarget);
   if I <> -1 then
-  with TTarget(Targets[I]) do begin
+  with TTarget(Core.Targets[I]) do begin
     ToolButtonTarget.ImageIndex := ImageIndex;
     ToolButtonTarget.Caption := Name;
@@ -400 +389 @@
 procedure TMainForm.FormCreate(Sender: TObject);
 begin
-  Targets := TTargetList.Create;
-  Targets.Add(TTargetInterpretter.Create);
-  Targets.Add(TTargetDelphi.Create);
-  Targets.Add(TTargetPHP.Create);
-  Targets.Add(TTargetC.Create);
-  Targets.Add(TTargetJava.Create);
   UpdateTargetList;
-  LastOpenedList := TLastOpenedList.Create(nil);
-  LastOpenedList.OnChange := LastOpenedListChange;
+  Core.LastOpenedList.OnChange := LastOpenedListChange;
 end;
 
 procedure TMainForm.FormDestroy(Sender: TObject);
 begin
-  SaveToRegistry(RegistryRoot, ApplicationInfo.RegistryKey);
-  LastOpenedList.Free;
-  Targets.Free;
+  SaveToRegistry(HKEY(Core.ApplicationInfo.RegistryRoot), Core.ApplicationInfo.RegistryKey);
 end;
 
@@ -461 +441 @@
 procedure TMainForm.FormCloseQuery(Sender: TObject; var CanClose: boolean);
 begin
-  if Modified then AProjectSaveAs.Execute;
+  if Core.Modified then AProjectSaveAs.Execute;
 end;
 
@@ -483 +463 @@
     Optimization := coNormal;
     SourceCode := FormSourceCode.MemoSource.Text;
-    ProjectFileName := Self.ProjectFileName;
-    ProgramName := ExtractFileNameOnly(Self.ProjectFileName);
+    ProjectFileName := Core.ProjectFileName;
+    ProgramName := ExtractFileNameOnly(Core.ProjectFileName);
     CurrentTarget.Messages.AddMessage('Compiling...');
     Compile;
@@ -568 +548 @@
 procedure TMainForm.AProjectCloseExecute(Sender: TObject);
 begin
-  if Modified then AProjectSaveAs.Execute;
+  if Core.Modified then AProjectSaveAs.Execute;
   AProgramStop.Execute;
-  ProjectFileName := '';
+  Core.ProjectFileName := '';
   FormSourceCode.MemoSource.Clear;
-  Modified := False;
+  Core.Modified := False;
   UpdateInterface;
 end;
@@ -579 +559 @@
 begin
   AProjectClose.Execute;
-  ProjectFileName := 'Examples' + DirectorySeparator + SNewProject + '.b';
+  Core.ProjectFileName := 'Examples' + DirectorySeparator + SNewProject + '.b';
   FormSourceCode.MemoSource.Clear;
-  Modified := False;
+  Core.Modified := False;
   CurrentTarget.Compiled := False;
   UpdateInterface;
@@ -588 +568 @@
 procedure TMainForm.AProjectOpenRecentExecute(Sender: TObject);
 begin
-  ProjectOpen(LastOpenedList.Items[TMenuItem(Sender).MenuIndex]);
+  ProjectOpen(Core.LastOpenedList.Items[TMenuItem(Sender).MenuIndex]);
 end;
 
@@ -594 +574 @@
 begin
   AProjectClose.Execute;
-  OpenDialog1.FileName := ProjectFileName;
+  OpenDialog1.FileName := Core.ProjectFileName;
   if OpenDialog1.Execute then begin
     ProjectOpen(OpenDialog1.FileName);
@@ -602 +582 @@
 procedure TMainForm.AProjectSaveAsExecute(Sender: TObject);
 begin
-  SaveDialog1.FileName := ProjectFileName;
+  SaveDialog1.FileName := Core.ProjectFileName;
   if SaveDialog1.Execute then begin
     FormSourceCode.MemoSource.Lines.SaveToFile(UTF8Decode(SaveDialog1.FileName));
-    ProjectFileName := SaveDialog1.FileName;
-    LastOpenedList.AddItem(SaveDialog1.FileName);
-    Modified := False;
+    Core.ProjectFileName := SaveDialog1.FileName;
+    Core.LastOpenedList.AddItem(SaveDialog1.FileName);
+    Core.Modified := False;
     UpdateInterface;
   end;
@@ -614 +594 @@
 procedure TMainForm.AProjectSaveExecute(Sender: TObject);
 begin
-  if Modified then AProjectSaveAs.Execute;
+  if Core.Modified then AProjectSaveAs.Execute;
 end;