Changeset 40 for trunk/Forms

Timestamp:

Feb 19, 2012, 2:13:49 PM (13 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.

Location:

trunk/Forms

Files:

• UFormMain.pas (modified) (11 diffs)
• UFormMessages.lfm (modified) (1 diff)
• UFormMessages.lrt (modified) (1 diff)
• UFormMessages.pas (modified) (2 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;

trunk/Forms/UFormMessages.lfm

@@ -1 @@
-object FormMesssages: TFormMesssages
+object FormMessages: TFormMessages
   Left = 256
-  Height = 240
-  Top = 32
-  Width = 320
+  Height = 225
+  Top = 47
+  Width = 492
   Caption = 'Messages'
-  ClientHeight = 240
-  ClientWidth = 320
+  ClientHeight = 225
+  ClientWidth = 492
+  OnCreate = FormCreate
   LCLVersion = '0.9.31'
-  object MemoMessages: TMemo
+  object ListView1: TListView
     Left = 0
-    Height = 240
+    Height = 225
     Top = 0
-    Width = 320
+    Width = 492
     Align = alClient
+    Columns = <    
+      item
+        Width = 473
+      end>
+    OwnerData = True
+    ReadOnly = True
+    RowSelect = True
+    ShowColumnHeaders = False
     TabOrder = 0
+    ViewStyle = vsReport
+    OnData = ListView1Data
   end
 end

trunk/Forms/UFormMessages.lrt

@@ -1 @@
-TFORMMESSSAGES.CAPTION=Messages
+TFORMMESSAGES.CAPTION=Messages

trunk/Forms/UFormMessages.pas

@@ -6 +6 @@
 
 uses
-  Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, StdCtrls;
+  Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, StdCtrls,
+  ComCtrls;
 
 type
 
-  { TFormMesssages }
+  { TFormMessages }
 
-  TFormMesssages = class(TForm)
-    MemoMessages: TMemo;
+  TFormMessages = class(TForm)
+    ListView1: TListView;
+    procedure FormCreate(Sender: TObject);
+    procedure ListView1Data(Sender: TObject; Item: TListItem);
   private
     { private declarations }
   public
-    { public declarations }
+    procedure Reload;
   end;
 
 var
-  FormMesssages: TFormMesssages;
+  FormMessages: TFormMessages;
 
 implementation
@@ -27 +30 @@
 {$R *.lfm}
 
+uses
+  UFormMain, UTarget;
+
+{ TFormMessages }
+
+procedure TFormMessages.ListView1Data(Sender: TObject; Item: TListItem);
+begin
+  with MainForm.CurrentTarget do
+  if (Item.Index >= 0) and (Item.Index < Messages.Count) then
+  with TMessage(Messages[Item.Index]) do begin
+    Item.Caption := Text;
+    Item.Data := Messages[Item.Index];
+  end;
+end;
+
+procedure TFormMessages.FormCreate(Sender: TObject);
+begin
+
+end;
+
+procedure TFormMessages.Reload;
+begin
+  ListView1.Items.Count := MainForm.CurrentTarget.Messages.Count;
+  ListView1.Refresh;
+end;
+
 end.