Changeset 38 for trunk/Forms/UFormMain.pas

Timestamp:

Feb 19, 2012, 10:29:55 AM (12 years ago)

Author:

chronos

Message:

• Modified: Used manual docked forms for better code separation.
• Modified: Used tabbed layout with PageControl and TabSheets for better usability.

File:

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

trunk/Forms/UFormMain.pas

@@ -49 +49 @@
     ImageList1: TImageList;
     MainMenu1: TMainMenu;
-    MemoMessages: TMemo;
     MemoSource: TMemo;
     MemoTarget: TMemo;
@@ -91 +90 @@
     MenuItem9: TMenuItem;
     OpenDialog1: TOpenDialog;
-    PageControl1: TPageControl;
-    PageControl2: TPageControl;
-    PageControl3: TPageControl;
-    Panel1: TPanel;
+    PageControlMain: TPageControl;
+    PageControlRight: TPageControl;
+    PageControlBottom: TPageControl;
+    PanelLeft: TPanel;
+    PanelMemory: TPanel;
+    PanelCPU: TPanel;
+    PanelOutput: TPanel;
+    PanelInput: TPanel;
     PopupMenuTarget: TPopupMenu;
     PopupMenuSource: TPopupMenu;
@@ -100 +103 @@
     Splitter1: TSplitter;
     Splitter2: TSplitter;
-    StatusBar1: TStatusBar;
-    TabSheet1: TTabSheet;
-    TabSheet2: TTabSheet;
+    Splitter3: TSplitter;
+    Splitter4: TSplitter;
+    Splitter5: TSplitter;
+    StatusBarMain: TStatusBar;
+    TabSheetMessages: TTabSheet;
+    TabSheetDebug: TTabSheet;
     TabSheetSource: TTabSheet;
     TabSheetTarget: TTabSheet;
-    ToolBar1: TToolBar;
+    TimerRefresh: TTimer;
+    ToolBarMain: TToolBar;
     ToolButton1: TToolButton;
     ToolButton10: TToolButton;
@@ -157 +164 @@
     procedure MemoSourceMouseDown(Sender: TObject; Button: TMouseButton;
       Shift: TShiftState; X, Y: Integer);
+    procedure TimerRefreshTimer(Sender: TObject);
   private
     FCurrentTarget: TTarget;
@@ -165 +173 @@
     procedure SetCurrentTarget(AValue: TTarget);
     procedure UpdateToolBarHints;
+    procedure DockInit;
   public
     Modified: Boolean;
@@ -187 +196 @@
 
 uses
-  UFormCPU, UApplicationInfo, UFormOptions,
-  UTargetDelphi, UTargetPHP, UTargetC, UFormTargets;
+  UFormCPU, UApplicationInfo, UFormOptions, UFormMessages,
+  UTargetDelphi, UTargetPHP, UTargetC, UFormTargets, UFormOutput, UFormInput,
+  UFormMemory;
 
 resourcestring
@@ -199 +209 @@
 procedure TMainForm.FormShow(Sender: TObject);
 begin
-  PageControl1.TabIndex := 0;
+  PageControlMain.TabIndex := 0;
   if OpenProjectOnStart and (LastOpenedList.Count > 0) then
     ProjectOpen(LastOpenedList[0])
@@ -206 +216 @@
   UpdateToolBarHints;
   UpdateTargetList;
+  DockInit;
 end;
 
@@ -234 +245 @@
 begin
   UpdateStatusBar;
+end;
+
+procedure TMainForm.TimerRefreshTimer(Sender: TObject);
+begin
+  FormCPU.Reload;
+  FormOutput.Reload;
+  FormMemory.Reload;
 end;
 
@@ -283 +301 @@
   I: Integer;
 begin
-  for I := 0 to ToolBar1.ControlCount - 1 do
-    ToolBar1.Controls[I].Hint := ToolBar1.Controls[I].Caption;
+  for I := 0 to ToolBarMain.ControlCount - 1 do
+    ToolBarMain.Controls[I].Hint := ToolBarMain.Controls[I].Caption;
+end;
+
+procedure TMainForm.DockInit;
+begin
+  FormCPU.ManualDock(PanelCPU, nil, alClient);
+  FormCPU.Align := alClient;
+  FormCPU.Show;
+  FormInput.ManualDock(PanelInput, nil, alClient);
+  FormInput.Align := alClient;
+  FormInput.Show;
+  FormOutput.ManualDock(PanelOutput, nil, alClient);
+  FormOutput.Align := alClient;
+  FormOutput.Show;
+  FormMemory.ManualDock(PanelMemory, nil, alClient);
+  FormMemory.Align := alClient;
+  FormMemory.Show;
+  FormMesssages.ManualDock(TabSheetMessages, nil, alClient);
+  FormMesssages.Align := alClient;
+  FormMesssages.Show;
 end;
 
@@ -362 +399 @@
 procedure TMainForm.UpdateStatusBar;
 begin
-  StatusBar1.Panels[0].Text := IntToStr(MemoSource.CaretPos.X) + ', ' + IntToStr(MemoSource.CaretPos.Y);
+  StatusBarMain.Panels[0].Text := IntToStr(MemoSource.CaretPos.X) + ', ' + IntToStr(MemoSource.CaretPos.Y);
 end;
 
@@ -403 +440 @@
 procedure TMainForm.AProgramRunExecute(Sender: TObject);
 begin
-  InterpreterForm.LastStepCounter := 0;
-  InterpreterForm.Show;
+  FormCPU.LastStepCounter := 0;
+  FormCPU.Show;
   if CurrentTarget is TTargetInterpretter then
-    TTargetInterpretter(CurrentTarget).Input := InterpreterForm.MemoInput.Lines.Text;
+    TTargetInterpretter(CurrentTarget).Input := FormInput.MemoInput.Lines.Text;
   if not CurrentTarget.Compiled then AProgramCompile.Execute;
   CurrentTarget.Run;
@@ -418 +455 @@
   if Assigned(DebugStep) then begin
     MemoSource.SelStart := DebugStep.SourcePosition;
-    PageControl1.TabIndex := 0;
+    PageControlMain.TabIndex := 0;
   end;
 end;
@@ -429 +466 @@
   if Assigned(DebugStep) then begin
     MemoTarget.SelStart := DebugStep.TargetPosition;
-    PageControl1.TabIndex := 1;
+    PageControlMain.TabIndex := 1;
   end;
 end;
@@ -458 +495 @@
 procedure TMainForm.AViewInterpretterExecute(Sender: TObject);
 begin
-  InterpreterForm.Show;
+  FormCPU.Show;
 end;
 
@@ -573 +610 @@
   MemoSource.SelStart := DebugStep.SourcePosition;
   MemoTarget.SelStart := DebugStep.TargetPosition;
-  if PageControl1.TabIndex = 0 then MemoSource.SetFocus;
-  if PageControl1.TabIndex = 1 then MemoTarget.SetFocus;
+  if PageControlMain.TabIndex = 0 then MemoSource.SetFocus;
+  if PageControlMain.TabIndex = 1 then MemoTarget.SetFocus;
 end;