Changeset 40 for trunk/Forms/UFormMain.pas

Timestamp:

Feb 19, 2012, 2:13:49 PM (12 years ago)

Author:

chronos

Message:

• Modified: Text message handling moved to UTarget unit as field of TTarget.
• Modified: Messages are displayed as TListVIew rather then TMemo.

File:

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

trunk/Forms/UFormMain.pas

@@ -169 +169 @@
     procedure AProjectOpenRecentExecute(Sender: TObject);
     procedure TargetStateChanged(Sender: TObject);
+    procedure MessagesChanged(Sender: TObject);
     procedure MenuItemTargetClick(Sender: TObject);
     procedure ProjectOpen(FileName: string);
@@ -191 +192 @@
   MainForm: TMainForm;
 
+
 implementation
 
@@ -204 +206 @@
   SNumberGeneration = 'Number generation';
   SProgramExited = 'Program exited';
+  SProgramStarted = 'Program started';
+  SProgramStopped = 'Program stopped';
+  SNewProject = 'New project';
 
 { TMainForm }
@@ -259 +264 @@
   if CurrentTarget.State = rsPaused then
     AProgramShowExecutionPoint.Execute;
+  if CurrentTarget.State = rsStopped then CurrentTarget.Messages.AddMessage(SProgramStopped);
+end;
+
+procedure TMainForm.MessagesChanged(Sender: TObject);
+begin
+  FormMessages.Reload;
 end;
 
@@ -275 +286 @@
 procedure TMainForm.ProjectOpen(FileName: string);
 begin
+  AProjectClose.Execute;
   MemoSource.Lines.LoadFromFile(UTF8Decode(FileName));
   LastOpenedList.AddItem(FileName);
@@ -292 +304 @@
     TTarget(Targets[I]).OnChangeState := nil;
   FCurrentTarget.OnChangeState := TargetStateChanged;
+  FCurrentTarget.Messages.OnChange := MessagesChanged;
   UpdateInterface;
 end;
@@ -317 +330 @@
   FormMemory.Align := alClient;
   FormMemory.Show;
-  FormMesssages.ManualDock(TabSheetMessages, nil, alClient);
-  FormMesssages.Align := alClient;
-  FormMesssages.Show;
+  FormMessages.ManualDock(TabSheetMessages, nil, alClient);
+  FormMessages.Align := alClient;
+  FormMessages.Show;
   PageControlRight.Width := MainForm.Width div 2;
   PageControlBottom.Height := MainForm.Height div 5;
@@ -444 +457 @@
   if not CurrentTarget.Compiled then AProgramCompile.Execute;
   CurrentTarget.Run;
+  CurrentTarget.Messages.AddMessage(SProgramStarted);
 end;
 
@@ -560 +574 @@
 begin
   with CurrentTarget do begin
-    Stop;
+    AProgramStop.Execute;
     Optimization := coNormal;
     SourceCode := MemoSource.Text;
     ProgramName := ExtractFileNameOnly(ProjectFileName);
+    CurrentTarget.Messages.AddMessage('Compiling...');
     Compile;
+    CurrentTarget.Messages.AppendMessage('done');
     MemoTarget.Text := TargetCode;
     UpdateInterface;
@@ -645 +661 @@
 procedure TMainForm.AProjectCloseExecute(Sender: TObject);
 begin
+  AProgramStop.Execute;
   Modified := False;
   ProjectFileName := '';
@@ -653 +670 @@
 procedure TMainForm.AProjectNewExecute(Sender: TObject);
 begin
-  ProjectFileName := 'Examples' + DirectorySeparator + 'Project.b';
+  AProjectClose.Execute;
+  ProjectFileName := 'Examples' + DirectorySeparator + SNewProject + '.b';
   MemoSource.Clear;
   Modified := False;