Changeset 133 for trunk/Forms

Timestamp:

Mar 4, 2022, 10:57:08 PM (3 years ago)

Author:

chronos

Message:

• Added: Compile multiple action for compilation of code with mutliple compilers at once.

Location:

trunk/Forms

Files:

• UFormCompileMultiple.lfm (added)
• UFormCompileMultiple.lrj (added)
• UFormCompileMultiple.pas (added)
• UFormMain.lfm (modified) (22 diffs)
• UFormMain.lrj (modified) (2 diffs)
• UFormMain.pas (modified) (11 diffs)
• UFormMessages.pas (modified) (2 diffs)
• UFormSourceCode.lfm (modified) (1 diff)
• UFormTargets.lfm (modified) (1 diff)
• UFormTargets.pas (modified) (3 diffs)

trunk/Forms/UFormMain.lfm

@@ -1 +1 @@
 object FormMain: TFormMain
   Left = 430
-  Height = 703
+  Height = 732
   Top = 249
-  Width = 1032
+  Width = 1075
   Caption = 'LazFuck'
-  ClientHeight = 669
-  ClientWidth = 1032
-  DesignTimePPI = 144
+  ClientHeight = 697
+  ClientWidth = 1075
+  DesignTimePPI = 150
   Menu = MainMenu1
   OnClose = FormClose
@@ -18 +18 @@
   object StatusBarMain: TStatusBar
     Left = 0
-    Height = 27
-    Top = 642
-    Width = 1032
+    Height = 28
+    Top = 669
+    Width = 1075
     Panels = <    
       item
-        Width = 84
+        Width = 88
       end    
       item
-        Width = 84
+        Width = 88
       end    
       item
-        Width = 96
+        Width = 100
       end>
     ParentFont = False
@@ -36 +36 @@
   object ToolBarMain: TToolBar
     Left = 0
-    Height = 33
+    Height = 34
     Top = 0
-    Width = 1032
+    Width = 1075
     Images = Core.ImageListMain
     ParentFont = False
@@ -50 +50 @@
     end
     object ToolButton2: TToolButton
-      Left = 36
+      Left = 37
       Top = 2
       Action = AProjectOpen
@@ -57 +57 @@
     end
     object ToolButton3: TToolButton
-      Left = 89
+      Left = 92
       Top = 2
       Action = AProjectSave
     end
     object ToolButton4: TToolButton
-      Left = 124
+      Left = 128
       Top = 2
       Action = AProjectClose
     end
     object ToolButton5: TToolButton
-      Left = 194
-      Height = 33
+      Left = 200
+      Height = 34
       Top = 2
       Style = tbsSeparator
     end
     object ToolButton6: TToolButton
-      Left = 237
+      Left = 244
       Top = 2
       Action = AProgramRun
     end
     object ToolButton7: TToolButton
-      Left = 202
+      Left = 208
       Top = 2
       Action = AProgramCompile
     end
     object ToolButton8: TToolButton
-      Left = 159
+      Left = 164
       Top = 2
       Action = AOptions
     end
     object ToolButton9: TToolButton
-      Left = 342
+      Left = 352
       Top = 2
       Action = ABreakpointToggle
     end
     object ToolButton10: TToolButton
-      Left = 272
+      Left = 280
       Top = 2
       Action = AProgramPause
     end
     object ToolButton11: TToolButton
-      Left = 307
+      Left = 316
       Top = 2
       Action = AProgramStop
     end
     object ToolButton12: TToolButton
-      Left = 377
+      Left = 388
       Top = 2
       Action = AProgramStepOver
     end
     object ToolButton13: TToolButton
-      Left = 412
+      Left = 424
       Top = 2
       Action = AProgramStepInto
     end
     object ToolButton14: TToolButton
-      Left = 447
+      Left = 460
       Top = 2
       Action = AProgramStepOut
     end
     object ToolButton15: TToolButton
-      Left = 482
+      Left = 496
       Top = 2
       Action = AProgramRunToCursor
     end
     object ToolButtonTarget: TToolButton
-      Left = 517
+      Left = 532
       Hint = 'Target select'
       Top = 2
@@ -132 +132 @@
   end
   object PageControlRight: TPageControl
-    Left = 560
-    Height = 609
-    Top = 33
-    Width = 472
+    Left = 583
+    Height = 635
+    Top = 34
+    Width = 492
     ActivePage = TabSheetDebug
     Align = alRight
@@ -144 +144 @@
     object TabSheetDebug: TTabSheet
       Caption = 'Debug'
-      ClientHeight = 605
-      ClientWidth = 390
+      ClientHeight = 631
+      ClientWidth = 405
       ParentFont = False
       object PanelInput: TPanel
         Left = 0
-        Height = 77
+        Height = 80
         Top = 0
-        Width = 390
+        Width = 405
         Align = alTop
         BevelOuter = bvNone
@@ -161 +161 @@
         Left = 0
         Height = 6
-        Top = 77
-        Width = 390
+        Top = 80
+        Width = 405
         Align = alTop
         ResizeAnchor = akTop
@@ -168 +168 @@
       object PanelOutput: TPanel
         Left = 0
-        Height = 311
-        Top = 83
-        Width = 390
+        Height = 324
+        Top = 86
+        Width = 405
         Align = alTop
         BevelOuter = bvNone
@@ -180 +180 @@
         Left = 0
         Height = 6
-        Top = 394
-        Width = 390
+        Top = 410
+        Width = 405
         Align = alTop
         ResizeAnchor = akTop
@@ -187 +187 @@
       object PanelCPU: TPanel
         Left = 0
-        Height = 103
-        Top = 400
-        Width = 390
+        Height = 107
+        Top = 416
+        Width = 405
         Align = alTop
         BevelOuter = bvNone
@@ -199 +199 @@
         Left = 0
         Height = 6
-        Top = 503
-        Width = 390
+        Top = 523
+        Width = 405
         Align = alTop
         ResizeAnchor = akTop
@@ -206 +206 @@
       object PanelMemory: TPanel
         Left = 0
-        Height = 96
-        Top = 509
-        Width = 390
+        Height = 102
+        Top = 529
+        Width = 405
         Align = alClient
         BevelOuter = bvNone
@@ -217 +217 @@
   end
   object Splitter1: TSplitter
-    Left = 554
-    Height = 609
-    Top = 33
+    Left = 577
+    Height = 635
+    Top = 34
     Width = 6
     Align = alRight
@@ -226 +226 @@
   object PanelLeft: TPanel
     Left = 0
-    Height = 609
-    Top = 33
-    Width = 554
+    Height = 635
+    Top = 34
+    Width = 577
     Align = alClient
     BevelOuter = bvNone
-    ClientHeight = 609
-    ClientWidth = 554
+    ClientHeight = 635
+    ClientWidth = 577
     ParentFont = False
     TabOrder = 4
     object PageControlMain: TPageControl
       Left = 0
-      Height = 461
+      Height = 481
       Top = 0
-      Width = 554
+      Width = 577
       ActivePage = TabSheetSource
       Align = alClient
@@ -256 +256 @@
     object PageControlBottom: TPageControl
       Left = 0
-      Height = 142
-      Top = 467
-      Width = 554
+      Height = 148
+      Top = 487
+      Width = 577
       ActivePage = TabSheetMessages
       Align = alBottom
@@ -274 +274 @@
       Left = 0
       Height = 6
-      Top = 461
-      Width = 554
+      Top = 481
+      Width = 577
       Align = alBottom
       ResizeAnchor = akBottom
@@ -282 +282 @@
   object MainMenu1: TMainMenu
     Images = Core.ImageListMain
-    Left = 259
-    Top = 160
+    Left = 270
+    Top = 167
     object MenuItem1: TMenuItem
-      Caption = 'Project'
+      Caption = 'File'
       object MenuItem8: TMenuItem
         Action = AProjectNew
@@ -311 +311 @@
       end
     end
+    object MenuItem24: TMenuItem
+      Caption = 'Edit'
+      object MenuItem25: TMenuItem
+        Action = FormSourceCode.AFormatSource
+      end
+      object MenuItem27: TMenuItem
+        Action = FormSourceCode.AShrinkSource
+      end
+      object MenuItem28: TMenuItem
+        Action = FormSourceCode.AGenerateNumber
+      end
+    end
     object MenuItem9: TMenuItem
-      Caption = 'Program'
+      Caption = 'Run'
       object MenuItem11: TMenuItem
         Action = AProgramCompile
       end
+      object MenuItem20: TMenuItem
+        Action = AProgramCompileMultiple
+      end
       object MenuItemTarget: TMenuItem
         Caption = 'Target'
@@ -347 +362 @@
       end
     end
-    object MenuItem24: TMenuItem
+    object MenuItem18: TMenuItem
       Caption = 'Tools'
-      object MenuItem25: TMenuItem
-        Action = FormSourceCode.AFormatSource
-      end
-      object MenuItem27: TMenuItem
-        Action = FormSourceCode.AShrinkSource
-      end
-      object MenuItem28: TMenuItem
-        Action = FormSourceCode.AGenerateNumber
-      end
-    end
-    object MenuItem18: TMenuItem
-      Caption = 'View'
       object MenuItem22: TMenuItem
         Action = AOptions
@@ -383 +386 @@
   object ActionList1: TActionList
     Images = Core.ImageListMain
-    Left = 259
-    Top = 230
+    Left = 270
+    Top = 240
     object AProjectOpen: TAction
       Category = 'Project'
@@ -525 +528 @@
       OnExecute = AViewLogExecute
     end
+    object AProgramCompileMultiple: TAction
+      Category = 'Program'
+      Caption = 'Compile multiple...'
+      OnExecute = AProgramCompileMultipleExecute
+    end
   end
   object OpenDialog1: TOpenDialog
     DefaultExt = '.b'
     Filter = 'BrainFuck (*.b)|*.b|Any file (*.*)|*.*'
-    Left = 67
-    Top = 221
+    Left = 70
+    Top = 230
   end
   object SaveDialog1: TSaveDialog
     DefaultExt = '.b'
     Filter = 'BrainFuck (*.b)|*.b|Any file (*.*)|*.*'
-    Left = 67
-    Top = 288
+    Left = 70
+    Top = 300
   end
   object TimerRefresh: TTimer
     OnTimer = TimerRefreshTimer
-    Left = 67
-    Top = 355
+    Left = 70
+    Top = 370
   end
   object PopupMenuRecentFiles: TPopupMenu
-    Left = 67
-    Top = 77
+    Left = 70
+    Top = 80
   end
   object PopupMenuTargets: TPopupMenu
-    Left = 67
-    Top = 143
+    Images = Core.ImageListMain
+    Left = 70
+    Top = 149
   end
 end

trunk/Forms/UFormMain.lrj

@@ -7 +7 @@
 {"hash":205270389,"name":"tformmain.tabsheettarget.caption","sourcebytes":[84,97,114,103,101,116,32,99,111,100,101],"value":"Target code"},
 {"hash":212433139,"name":"tformmain.tabsheetmessages.caption","sourcebytes":[77,101,115,115,97,103,101,115],"value":"Messages"},
-{"hash":127273972,"name":"tformmain.menuitem1.caption","sourcebytes":[80,114,111,106,101,99,116],"value":"Project"},
+{"hash":315429,"name":"tformmain.menuitem1.caption","sourcebytes":[70,105,108,101],"value":"File"},
 {"hash":131987540,"name":"tformmain.menuitemopenrecent.caption","sourcebytes":[79,112,101,110,32,114,101,99,101,110,116],"value":"Open recent"},
-{"hash":127264813,"name":"tformmain.menuitem9.caption","sourcebytes":[80,114,111,103,114,97,109],"value":"Program"},
+{"hash":310020,"name":"tformmain.menuitem24.caption","sourcebytes":[69,100,105,116],"value":"Edit"},
+{"hash":22974,"name":"tformmain.menuitem9.caption","sourcebytes":[82,117,110],"value":"Run"},
 {"hash":94932420,"name":"tformmain.menuitemtarget.caption","sourcebytes":[84,97,114,103,101,116],"value":"Target"},
-{"hash":5989939,"name":"tformmain.menuitem24.caption","sourcebytes":[84,111,111,108,115],"value":"Tools"},
-{"hash":380871,"name":"tformmain.menuitem18.caption","sourcebytes":[86,105,101,119],"value":"View"},
+{"hash":5989939,"name":"tformmain.menuitem18.caption","sourcebytes":[84,111,111,108,115],"value":"Tools"},
 {"hash":322608,"name":"tformmain.menuitem10.caption","sourcebytes":[72,101,108,112],"value":"Help"},
 {"hash":353982,"name":"tformmain.aprojectopen.caption","sourcebytes":[79,112,101,110],"value":"Open"},
@@ -36 +36 @@
 {"hash":248107685,"name":"tformmain.ashowsourceposition.caption","sourcebytes":[83,104,111,119,32,112,111,115,105,116,105,111,110,32,105,110,32,115,111,117,114,99,101],"value":"Show position in source"},
 {"hash":78944612,"name":"tformmain.aprogramshowexecutionpoint.caption","sourcebytes":[83,104,111,119,32,101,120,101,99,117,116,105,111,110,32,112,111,105,110,116],"value":"Show execution point"},
-{"hash":21335,"name":"tformmain.aviewlog.caption","sourcebytes":[76,111,103],"value":"Log"}
+{"hash":21335,"name":"tformmain.aviewlog.caption","sourcebytes":[76,111,103],"value":"Log"},
+{"hash":226669790,"name":"tformmain.aprogramcompilemultiple.caption","sourcebytes":[67,111,109,112,105,108,101,32,109,117,108,116,105,112,108,101,46,46,46],"value":"Compile multiple..."}
 ]}

trunk/Forms/UFormMain.pas

@@ -15 +15 @@
 
   TFormMain = class(TForm)
+    AProgramCompileMultiple: TAction;
     AViewLog: TAction;
     AProgramShowExecutionPoint: TAction;
@@ -52 +53 @@
     MenuItem19: TMenuItem;
     MenuItem2: TMenuItem;
+    MenuItem20: TMenuItem;
     MenuItem22: TMenuItem;
     MenuItem24: TMenuItem;
@@ -117 +119 @@
     procedure AOptionsExecute(Sender: TObject);
     procedure AProgramCompileExecute(Sender: TObject);
+    procedure AProgramCompileMultipleExecute(Sender: TObject);
     procedure AProgramPauseExecute(Sender: TObject);
     procedure AProgramRunToCursorExecute(Sender: TObject);
@@ -171 +174 @@
   UCore, UFormCPU, UFormOptions, UFormMessages, UFormTargets, UFormOutput, UFormInput,
   UFormMemory, UFormSourceCode, UFormTargetCode, UTargetInterpretter, UFormLog,
-  UBFTarget, UCommon;
+  UBFTarget, UCommon, UFormCompileMultiple;
 
 resourcestring
@@ -206 +209 @@
     FormSourceCode.UpdateTheme;
   end;
+  Core.Messages.OnChange := FormMain.MessagesChanged;
 end;
 
@@ -227 +231 @@
     AProgramShowExecutionPoint.Execute;
   if Core.CurrentTarget.State = rsStopped then
-    Core.CurrentTarget.Messages.AddMessage(SProgramStopped);
+    Core.Messages.AddMessage(SProgramStopped);
 end;
 
@@ -405 +409 @@
   if not Core.CurrentTarget.Compiled then AProgramCompile.Execute;
   Core.CurrentTarget.Run;
-  Core.CurrentTarget.Messages.AddMessage(SProgramStarted);
+  Core.Messages.AddMessage(SProgramStarted);
 end;
 
@@ -432 +436 @@
 procedure TFormMain.AViewCompilersExecute(Sender: TObject);
 begin
-  if not Assigned(FormTargets) then FormTargets := TFormTargets.Create(Self);
-  FormTargets.Show;
+  with TFormTargets.Create(nil) do
+  try
+    ShowModal;
+  finally
+    Free;
+  end;
 end;
 
@@ -493 +501 @@
   with Core.CurrentTarget do
   try
+    Core.Messages.Clear;
     AProgramStop.Execute;
     SourceCode := FormSourceCode.SynEditSource.Text;
@@ -499 +508 @@
     if Core.CurrentTarget is TBFTarget then
       TBFTarget(Core.CurrentTarget).Optimizations := Core.Optimizations;
-    Core.CurrentTarget.Messages.AddMessage(SCompileStart);
+    DebugEnabled := Core.DebugEnabled;
+    Core.Messages.AddMessage(SCompileStart);
     Application.ProcessMessages;
     Compile;
-    Core.CurrentTarget.Messages.AppendMessage(SDone);
+    Core.Messages.AppendMessage(SDone);
     FormTargetCode.SynEditTarget.Text := TargetCode;
     FormTargetCode.SetHighlighter(Core.CurrentTarget.SourceExtension);
@@ -509 +519 @@
     on E: Exception do
       MessageDlg(SError, E.Message, mtError, [mbOk], 0);
+  end;
+end;
+
+procedure TFormMain.AProgramCompileMultipleExecute(Sender: TObject);
+var
+  I: Integer;
+begin
+  AProgramStop.Execute;
+  with TFormCompileMultiple.Create(nil) do
+  try
+    Targets := Core.Targets;
+    if ShowModal = mrOk then begin
+      Core.Messages.Clear;
+      for I := 0 to Targets.Count - 1 do
+      with Targets[I] do
+      if Selected then
+      try
+        AProgramStop.Execute;
+        SourceCode := FormSourceCode.SynEditSource.Text;
+        ProjectFileName := Core.Project.FileName;
+        ProgramName := ExtractFileNameOnly(Core.Project.FileName);
+        if Targets[I] is TBFTarget then
+          TBFTarget(Targets[I]).Optimizations := Core.Optimizations;
+        DebugEnabled := Core.DebugEnabled;
+        Core.Messages.AddMessage(Name + ' ' + SCompileStart);
+        Application.ProcessMessages;
+        Compile;
+        Core.Messages.AppendMessage(SDone);
+        FormTargetCode.SynEditTarget.Text := TargetCode;
+        FormTargetCode.SetHighlighter(Core.CurrentTarget.SourceExtension);
+        UpdateInterface;
+      except
+        on E: Exception do
+          MessageDlg(SError, E.Message, mtError, [mbOk], 0);
+      end;
+    end;
+  finally
+    Free;
   end;
 end;

trunk/Forms/UFormMessages.pas

@@ -37 +37 @@
 procedure TFormMessages.ListView1Data(Sender: TObject; Item: TListItem);
 begin
-  with Core.CurrentTarget do
+  with Core do
   if (Item.Index >= 0) and (Item.Index < Messages.Count) then
-  with TMessage(Messages[Item.Index]) do begin
+  with Messages[Item.Index] do begin
     Item.Caption := Text;
     Item.Data := Messages[Item.Index];
@@ -51 +51 @@
 procedure TFormMessages.Reload;
 begin
-  ListView1.Items.Count := Core.CurrentTarget.Messages.Count;
+  ListView1.Items.Count := Core.Messages.Count;
   ListView1.Refresh;
 end;

trunk/Forms/UFormSourceCode.lfm

@@ -591 +591 @@
   object ActionList1: TActionList
     Images = Core.ImageListMain
-    Left = 154
+    Left = 152
     Top = 67
     object AGenerateNumber: TAction

trunk/Forms/UFormTargets.lfm

@@ -1 +1 @@
 object FormTargets: TFormTargets
-  Left = 292
-  Height = 413
-  Top = 138
-  Width = 689
+  Left = 294
+  Height = 430
+  Top = 172
+  Width = 718
   Caption = 'Compilers'
-  ClientHeight = 413
-  ClientWidth = 689
-  DesignTimePPI = 144
+  ClientHeight = 430
+  ClientWidth = 718
+  DesignTimePPI = 150
+  OnClose = FormClose
   OnCreate = FormCreate
   OnShow = FormShow
-  LCLVersion = '2.0.0.4'
+  LCLVersion = '2.2.0.4'
   object ListView1: TListView
     Left = 10
-    Height = 393
+    Height = 410
     Top = 10
-    Width = 672
+    Width = 701
     Anchors = [akTop, akLeft, akRight, akBottom]
     Columns = <    
       item
         Caption = 'Name'
-        Width = 96
+        Width = 100
       end    
       item
         Caption = 'Execution path'
-        Width = 240
+        Width = 250
       end    
       item
         Caption = 'Compiler path'
-        Width = 313
+        Width = 336
       end>
     OwnerData = True

trunk/Forms/UFormTargets.pas

@@ -14 +14 @@
   TFormTargets = class(TForm)
     ListView1: TListView;
+    procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
     procedure FormCreate(Sender: TObject);
     procedure FormShow(Sender: TObject);
@@ -39 +40 @@
 procedure TFormTargets.FormShow(Sender: TObject);
 begin
+  Core.PersistentForm1.Load(Self);
   ReloadList;
 end;
@@ -46 +48 @@
   Core.Translator.TranslateComponentRecursive(Self);
   Core.ThemeManager.UseTheme(Self);
+end;
+
+procedure TFormTargets.FormClose(Sender: TObject; var CloseAction: TCloseAction
+  );
+begin
+  Core.PersistentForm1.Save(Self);
 end;