Changeset 58 for branches/ByteArray/Forms/FormScreen.pas

Timestamp:

Nov 23, 2023, 11:18:42 PM (13 months ago)

Author:

chronos

Message:

• Modified: Source editor with main menu can't be docked into another form with main menu. Source enditor and Screen have own main menu.

File:

• branches/ByteArray/Forms/FormScreen.pas (modified) (4 diffs)

branches/ByteArray/Forms/FormScreen.pas

@@ -4 +4 @@
 
 uses
-  Classes, SysUtils, Forms, Controls, Graphics, Dialogs, ExtCtrls, FrameBuffer,
-  Channel, Device;
+  Classes, SysUtils, Forms, Controls, Graphics, Dialogs, ExtCtrls, Menus,
+  FrameBuffer, Device;
 
 type
@@ -13 +13 @@
   TFormScreen = class(TFormDevice)
     Image1: TImage;
+    MainMenu1: TMainMenu;
+    MenuItem1: TMenuItem;
+    MenuItem10: TMenuItem;
+    MenuItem11: TMenuItem;
+    MenuItem12: TMenuItem;
+    MenuItem2: TMenuItem;
+    MenuItem3: TMenuItem;
+    MenuItem4: TMenuItem;
+    MenuItem5: TMenuItem;
+    MenuItem6: TMenuItem;
+    MenuItem7: TMenuItem;
+    MenuItem8: TMenuItem;
+    MenuItem9: TMenuItem;
+    MenuItemViewConsole: TMenuItem;
+    MenuItemViewStorage: TMenuItem;
+    Separator1: TMenuItem;
+    Separator2: TMenuItem;
     TimerDraw: TTimer;
+    procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
     procedure FormShow(Sender: TObject);
     procedure TimerDrawTimer(Sender: TObject);
@@ -27 +45 @@
 
 {$R *.lfm}
+
+uses
+  Core;
 
 { TFormScreen }
@@ -55 +76 @@
 end;
 
+procedure TFormScreen.FormClose(Sender: TObject; var CloseAction: TCloseAction);
+begin
+  if Core.Core.MainForm = Self then Application.Terminate;
+end;
+
 procedure TFormScreen.ScreenChange(Sender: TObject);
 begin