Changeset 27

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.

Location:

branches/topdown

Files:

• UFormMain.lfm (modified) (1 diff)
• UFormMain.pas (modified) (1 diff)
• UFormMenu.lfm (modified) (2 diffs)
• UFormMenu.pas (modified) (4 diffs)

branches/topdown/UFormMain.lfm

@@ -1 +1 @@
 object FormMain: TFormMain
-  Left = 441
+  Left = 689
   Height = 300
-  Top = 290
+  Top = 331
   Width = 400
   BorderStyle = bsNone

branches/topdown/UFormMain.pas

@@ -82 +82 @@
   P: TPoint;
 begin
-  P := ClientToScreen(Point(0, PanelTaskBar.Top - PanelTaskBar.Height));
-  FormMenu.BoundsRect := Bounds(0, P.Y - FormMenu.Height,
+  P := PanelTaskBar.ClientToScreen(Point(ButtonMenu.Left, ButtonMenu.Top - PanelTaskBar.Height));
+  FormMenu.BoundsRect := Bounds(P.X, P.Y - FormMenu.Height,
     FormMenu.Width, FormMenu.Height);
   FormMenu.Show;

branches/topdown/UFormMenu.lfm

@@ -12 +12 @@
   OnShow = FormShow
   LCLVersion = '2.0.2.0'
-  object ButtonShutDown: TButton
-    Left = 7
-    Height = 31
-    Top = 362
-    Width = 94
-    Anchors = [akLeft, akBottom]
-    Caption = 'Shut down'
-    OnClick = ButtonShutDownClick
-    TabOrder = 0
-  end
   object ListBoxApps: TListBox
     Left = 10
@@ -34 +24 @@
     ItemHeight = 20
     OnClick = ListBoxAppsClick
+    TabOrder = 0
+  end
+  object ToolBar1: TToolBar
+    Left = 164
+    Height = 30
+    Top = 362
+    Width = 90
+    Align = alCustom
+    Anchors = [akTop, akRight]
+    AutoSize = True
+    Caption = 'ToolBar1'
+    EdgeBorders = []
+    Flat = False
+    ShowCaptions = True
     TabOrder = 1
+    object ToolButton1: TToolButton
+      Left = 1
+      Top = 2
+      Caption = 'Shutdown'
+      DropdownMenu = PopupMenu1
+      OnClick = ToolButton1Click
+      Style = tbsDropDown
+    end
   end
-  object ButtonReboot: TButton
-    Left = 112
-    Height = 31
-    Top = 362
-    Width = 94
-    Anchors = [akLeft, akBottom]
-    Caption = 'Reboot'
-    OnClick = ButtonRebootClick
-    TabOrder = 2
+  object PopupMenu1: TPopupMenu
+    left = 111
+    top = 278
+    object MenuItemReboot: TMenuItem
+      Caption = 'Reboot'
+      OnClick = MenuItemRebootClick
+    end
   end
 end

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.