Changeset 27 for branches/topdown/UFormMenu.pas

Timestamp:

Aug 22, 2019, 11:32:31 AM (5 years ago)

Author:

chronos

Message:

• Modified: Menu shutdown button with drop down menu and reboot action.
• Fixed: Correct left positioning of main menu.

File:

• branches/topdown/UFormMenu.pas (modified) (4 diffs)

branches/topdown/UFormMenu.pas

@@ -6 +6 @@
 
 uses
-  Classes, SysUtils, Forms, Controls, Graphics, Dialogs, StdCtrls;
+  Classes, SysUtils, Forms, Controls, Graphics, Dialogs, StdCtrls, Menus,
+  Buttons, ComCtrls;
 
 type
@@ -13 +14 @@
 
   TFormMenu = class(TForm)
-    ButtonShutDown: TButton;
-    ButtonReboot: TButton;
     ListBoxApps: TListBox;
-    procedure ButtonRebootClick(Sender: TObject);
-    procedure ButtonShutDownClick(Sender: TObject);
+    MenuItemReboot: TMenuItem;
+    PopupMenu1: TPopupMenu;
+    ToolBar1: TToolBar;
+    ToolButton1: TToolButton;
     procedure FormDeactivate(Sender: TObject);
     procedure FormShow(Sender: TObject);
     procedure ListBoxAppsClick(Sender: TObject);
+    procedure MenuItemRebootClick(Sender: TObject);
+    procedure ToolButton1Click(Sender: TObject);
   private
 
@@ -54 +57 @@
   FormClass: TFormTaskClass;
 begin
-  FormClass := TFormTaskClass(ListBoxApps.Items.Objects[ListBoxApps.ItemIndex]);
-  BaseSystem.Tasks.StartTask(FormClass);
+  if ListBoxApps.ItemIndex <> -1 then begin
+    FormClass := TFormTaskClass(ListBoxApps.Items.Objects[ListBoxApps.ItemIndex]);
+    BaseSystem.Tasks.StartTask(FormClass);
+  end;
+end;
+
+procedure TFormMenu.MenuItemRebootClick(Sender: TObject);
+begin
+  Hide;
+  BaseSystem.Reboot;
+end;
+
+procedure TFormMenu.ToolButton1Click(Sender: TObject);
+begin
+  Hide;
+  BaseSystem.ShutDown;
 end;
 
@@ -71 +88 @@
 end;
 
-procedure TFormMenu.ButtonShutDownClick(Sender: TObject);
-begin
-  Hide;
-  BaseSystem.ShutDown;
-end;
-
-procedure TFormMenu.ButtonRebootClick(Sender: TObject);
-begin
-  Hide;
-  BaseSystem.Reboot;
-end;
-
 end.