Changeset 46 for trunk/Forms/UFormMain.pas

Timestamp:

Jul 12, 2012, 7:47:58 AM (12 years ago)

Author:

chronos

Message:

• Modified: Source code and target code splited to units.

File:

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

trunk/Forms/UFormMain.pas

@@ -49 +49 @@
     ImageList1: TImageList;
     MainMenu1: TMainMenu;
-    MemoSource: TMemo;
-    MemoTarget: TMemo;
     MenuItem1: TMenuItem;
     MenuItem10: TMenuItem;
@@ -62 +60 @@
     MenuItem18: TMenuItem;
     MenuItem2: TMenuItem;
-    MenuItem20: TMenuItem;
-    MenuItem21: TMenuItem;
     MenuItem22: TMenuItem;
-    MenuItem23: TMenuItem;
     MenuItem24: TMenuItem;
     MenuItem25: TMenuItem;
-    MenuItem26: TMenuItem;
     MenuItem27: TMenuItem;
     MenuItem28: TMenuItem;
-    MenuItem29: TMenuItem;
     MenuItem30: TMenuItem;
     MenuItem31: TMenuItem;
@@ -78 +71 @@
     MenuItem34: TMenuItem;
     MenuItem35: TMenuItem;
-    MenuItem36: TMenuItem;
     MenuItemOpenRecent: TMenuItem;
     MenuItemTarget: TMenuItem;
@@ -97 +89 @@
     PanelOutput: TPanel;
     PanelInput: TPanel;
-    PopupMenuTarget: TPopupMenu;
-    PopupMenuSource: TPopupMenu;
     SaveDialog1: TSaveDialog;
     Splitter1: TSplitter;
@@ -200 +190 @@
   UFormCPU, UFormOptions, UFormMessages, UTargetJava,
   UTargetDelphi, UTargetPHP, UTargetC, UFormTargets, UFormOutput, UFormInput,
-  UFormMemory;
+  UFormMemory, UFormSourceCode, UFormTargetCode;
 
 resourcestring
@@ -214 +204 @@
 procedure TMainForm.FormShow(Sender: TObject);
 begin
+  LoadFromRegistry(RegistryRoot, ApplicationInfo.RegistryKey);
   PageControlMain.TabIndex := 0;
   if OpenProjectOnStart and (LastOpenedList.Items.Count > 0) then
@@ -287 +278 @@
 begin
   AProjectClose.Execute;
-  MemoSource.Lines.LoadFromFile(UTF8Decode(FileName));
+  FormSourceCode.MemoSource.Lines.LoadFromFile(UTF8Decode(FileName));
   LastOpenedList.AddItem(FileName);
   ProjectFileName := FileName;
@@ -318 +309 @@
 procedure TMainForm.DockInit;
 begin
+  FormSourceCode.ManualDock(TabSheetSource, nil, alClient);
+  FormSourceCode.Align := alClient;
+  FormSourceCode.Show;
+  FormTargetCode.ManualDock(TabSheetTarget, nil, alClient);
+  FormTargetCode.Align := alClient;
+  FormTargetCode.Show;
   FormCPU.ManualDock(PanelCPU, nil, alClient);
   FormCPU.Align := alClient;
@@ -387 +384 @@
 begin
   AProjectSave.Enabled := Modified;
-  Title := ApplicationInfo.Name;
+  Title := ApplicationInfo.AppName;
   if ProjectFileName <> '' then Title := ProjectFileName + ' - ' + Title;
   if Modified then Title := Title + ' *';
   Caption := Title;
-  MemoSource.Enabled := ProjectFileName <> '';
+  FormSourceCode.MemoSource.Enabled := ProjectFileName <> '';
   AProjectClose.Enabled := ProjectFileName <> '';
   AProgramRun.Enabled := (tcRun in CurrentTarget.Capabilities) and
@@ -418 +415 @@
 procedure TMainForm.UpdateStatusBar;
 begin
-  StatusBarMain.Panels[0].Text := IntToStr(MemoSource.CaretPos.X) + ', ' + IntToStr(MemoSource.CaretPos.Y);
+  StatusBarMain.Panels[0].Text := IntToStr(FormSourceCode.MemoSource.CaretPos.X) +
+    ', ' + IntToStr(FormSourceCode.MemoSource.CaretPos.Y);
 end;
 
@@ -447 +445 @@
   LastOpenedList := TLastOpenedList.Create(nil);
   LastOpenedList.OnChange := LastOpenedListChange;
-  LoadFromRegistry(RegistryRoot, ApplicationInfo.RegistryKey);
 end;
 
@@ -470 +467 @@
   DebugStep: TDebugStep;
 begin
-  DebugStep := CurrentTarget.DebugSteps.SearchByTargetPos(MemoTarget.SelStart);
+  DebugStep := CurrentTarget.DebugSteps.SearchByTargetPos(FormTargetCode.MemoTarget.SelStart);
   if Assigned(DebugStep) then begin
-    MemoSource.SelStart := DebugStep.SourcePosition;
+    FormSourceCode.MemoSource.SelStart := DebugStep.SourcePosition;
     PageControlMain.TabIndex := 0;
   end;
@@ -481 +478 @@
   DebugStep: TDebugStep;
 begin
-  DebugStep := CurrentTarget.DebugSteps.SearchBySourcePos(MemoSource.SelStart);
+  DebugStep := CurrentTarget.DebugSteps.SearchBySourcePos(FormSourceCode.MemoSource.SelStart);
   if Assigned(DebugStep) then begin
-    MemoTarget.SelStart := DebugStep.TargetPosition;
+    FormTargetCode.MemoTarget.SelStart := DebugStep.TargetPosition;
     PageControlMain.TabIndex := 1;
   end;
@@ -494 +491 @@
   I: Integer;
 begin
-  Source := MemoSource.Text;
+  Source := FormSourceCode.MemoSource.Text;
   Pos := 1;
   for I := 1 to Length(Source) do begin
@@ -503 +500 @@
   end;
   SetLength(Source, Pos - 1);
-  MemoSource.Text := Source;
+  FormSourceCode.MemoSource.Text := Source;
 end;
 
@@ -535 +532 @@
   IndentText = '  ';
 begin
-  Source := MemoSource.Text;
+  Source := FormSourceCode.MemoSource.Text;
   NewSource := '';
   Indent := 0;
@@ -551 +548 @@
       NewSource := NewSource + Source[I];
   end;
-  MemoSource.Text := NewSource;
+  FormSourceCode.MemoSource.Text := NewSource;
 end;
 
@@ -565 +562 @@
     for I := 0 to Number - 1 do
       NumberText := NumberText + '+';
-    MemoSource.Text := MemoSource.Text + NumberText;
+    FormSourceCode.MemoSource.Text := FormSourceCode.MemoSource.Text + NumberText;
   end;
 end;
@@ -582 +579 @@
     AProgramStop.Execute;
     Optimization := coNormal;
-    SourceCode := MemoSource.Text;
+    SourceCode := FormSourceCode.MemoSource.Text;
     ProjectFileName := Self.ProjectFileName;
     ProgramName := ExtractFileNameOnly(Self.ProjectFileName);
@@ -588 +585 @@
     Compile;
     CurrentTarget.Messages.AppendMessage('done');
-    MemoTarget.Text := TargetCode;
+    FormTargetCode.MemoTarget.Text := TargetCode;
     UpdateInterface;
   end;
@@ -598 +595 @@
   BreakPoint: TBreakPoint;
 begin
-  DebugStep := CurrentTarget.DebugSteps.SearchBySourcePos(MemoSource.SelStart);
+  DebugStep := CurrentTarget.DebugSteps.SearchBySourcePos(FormSourceCode.MemoSource.SelStart);
   if Assigned(DebugStep) then begin
     BreakPoint := CurrentTarget.BreakPoints.SearchByTargetPos(DebugStep.TargetPosition);
@@ -618 +615 @@
   if CurrentTarget.State = rsStopped then begin
     if not CurrentTarget.Compiled then AProgramCompile.Execute;
-    DebugStep := CurrentTarget.DebugSteps.SearchBySourcePos(MemoSource.SelStart);
+    DebugStep := CurrentTarget.DebugSteps.SearchBySourcePos(FormSourceCode.MemoSource.SelStart);
     CurrentTarget.BreakPoints.SetSystem(DebugStep.TargetPosition);
     AProgramRun.Execute;
   end else begin
-    DebugStep := CurrentTarget.DebugSteps.SearchBySourcePos(MemoSource.SelStart);
+    DebugStep := CurrentTarget.DebugSteps.SearchBySourcePos(FormSourceCode.MemoSource.SelStart);
     CurrentTarget.RunToCursor(DebugStep.TargetPosition);
   end;
@@ -632 +629 @@
 begin
   DebugStep := CurrentTarget.DebugSteps.SearchByTargetPos(CurrentTarget.ExecutionPosition);
-  MemoSource.SelStart := DebugStep.SourcePosition;
-  MemoTarget.SelStart := DebugStep.TargetPosition;
-  if PageControlMain.TabIndex = 0 then MemoSource.SetFocus;
-  if PageControlMain.TabIndex = 1 then MemoTarget.SetFocus;
+  FormSourceCode.MemoSource.SelStart := DebugStep.SourcePosition;
+  FormTargetCode.MemoTarget.SelStart := DebugStep.TargetPosition;
+  if PageControlMain.TabIndex = 0 then FormSourceCode.MemoSource.SetFocus;
+  if PageControlMain.TabIndex = 1 then FormTargetCode.MemoTarget.SetFocus;
 end;
 
@@ -671 +668 @@
   Modified := False;
   ProjectFileName := '';
-  MemoSource.Clear;
+  FormSourceCode.MemoSource.Clear;
   UpdateInterface;
 end;
@@ -679 +676 @@
   AProjectClose.Execute;
   ProjectFileName := 'Examples' + DirectorySeparator + SNewProject + '.b';
-  MemoSource.Clear;
+  FormSourceCode.MemoSource.Clear;
   Modified := False;
   CurrentTarget.Compiled := False;
@@ -702 +699 @@
   SaveDialog1.FileName := ProjectFileName;
   if SaveDialog1.Execute then begin
-    MemoSource.Lines.SaveToFile(UTF8Decode(SaveDialog1.FileName));
+    FormSourceCode.MemoSource.Lines.SaveToFile(UTF8Decode(SaveDialog1.FileName));
     ProjectFileName := SaveDialog1.FileName;
     LastOpenedList.AddItem(SaveDialog1.FileName);