From c5529f5cb1aebe7ac6bc5235a7df17b8a45612ad Mon Sep 17 00:00:00 2001
From: juha <juha@lazarus-ide.org>
Date: Sun, 24 May 2015 22:05:21 +0000
Subject: [PATCH] Packager: In PkgGraph dialog, add Close button and fix tab
 order. Issue #28170, patch from Alexey Torgashin.

git-svn-id: trunk@49160 -
---
 packager/pkggraphexplorer.lfm | 74 ++++++++++++++++++++++-------------
 packager/pkggraphexplorer.pas | 15 ++++++-
 2 files changed, 61 insertions(+), 28 deletions(-)

diff --git a/packager/pkggraphexplorer.lfm b/packager/pkggraphexplorer.lfm
index 5b06adf8a0..7d48adf691 100644
--- a/packager/pkggraphexplorer.lfm
+++ b/packager/pkggraphexplorer.lfm
@@ -1,52 +1,54 @@
 object PkgGraphExplorerDlg: TPkgGraphExplorerDlg
   Left = 369
-  Height = 441
+  Height = 514
   Top = 239
-  Width = 567
+  Width = 675
   Caption = 'PkgGraphExplorerDlg'
-  ClientHeight = 441
-  ClientWidth = 567
+  ClientHeight = 514
+  ClientWidth = 675
   KeyPreview = True
+  OnCreate = FormCreate
   OnShow = PkgGraphExplorerShow
   Position = poScreenCenter
-  LCLVersion = '1.3'
+  LCLVersion = '1.5'
   object InfoMemo: TMemo
     Left = 0
     Height = 144
-    Top = 297
-    Width = 567
+    Top = 332
+    Width = 675
     Align = alBottom
     Lines.Strings = (
       'InfoMemo'
     )
     OnKeyDown = InfoMemoKeyDown
     ReadOnly = True
-    TabOrder = 0
+    TabOrder = 1
   end
   object VerticalSplitter: TSplitter
     Cursor = crVSplit
     Left = 0
     Height = 5
-    Top = 292
-    Width = 567
+    Top = 327
+    Width = 675
     Align = alBottom
     ResizeAnchor = akBottom
   end
   object Panel1: TPanel
     Left = 0
-    Height = 292
+    Height = 327
     Top = 0
-    Width = 567
+    Width = 675
     Align = alClient
+    BevelOuter = bvNone
     Caption = 'Panel1'
-    ClientHeight = 292
-    ClientWidth = 567
-    TabOrder = 2
+    ClientHeight = 327
+    ClientWidth = 675
+    TabOrder = 0
     object LvlGraphControl1: TLvlGraphControl
-      Left = 200
-      Height = 290
-      Top = 1
-      Width = 366
+      Left = 199
+      Height = 327
+      Top = 0
+      Width = 476
       Align = alClient
       NodeStyle.Shape = lgnsNone
       NodeStyle.GapTop = 2
@@ -58,31 +60,49 @@ object PkgGraphExplorerDlg: TPkgGraphExplorerDlg
       ParentColor = True
       ParentShowHint = False
       PopupMenu = PkgPopupMenu
-      TabOrder = 0
+      TabOrder = 2
       TabStop = False
     end
     object PkgTreeView: TTreeView
-      Left = 1
-      Height = 290
-      Top = 1
+      Left = 0
+      Height = 327
+      Top = 0
       Width = 194
       Align = alLeft
       DefaultItemHeight = 18
       PopupMenu = PkgPopupMenu
       ReadOnly = True
-      TabOrder = 1
+      TabOrder = 0
       OnDblClick = PkgTreeViewDblClick
       OnExpanding = PkgTreeViewExpanding
       OnSelectionChanged = PkgTreeViewSelectionChanged
       Options = [tvoAutoItemHeight, tvoHideSelection, tvoKeepCollapsedNodes, tvoReadOnly, tvoShowButtons, tvoShowLines, tvoShowRoot, tvoToolTips, tvoThemedDraw]
     end
     object Splitter1: TSplitter
-      Left = 195
-      Height = 290
-      Top = 1
+      Left = 194
+      Height = 327
+      Top = 0
       Width = 5
     end
   end
+  object ButtonPanel1: TButtonPanel
+    Left = 6
+    Height = 26
+    Top = 482
+    Width = 663
+    OKButton.Name = 'OKButton'
+    OKButton.DefaultCaption = True
+    OKButton.OnClick = OKButtonClick
+    HelpButton.Name = 'HelpButton'
+    HelpButton.DefaultCaption = True
+    CloseButton.Name = 'CloseButton'
+    CloseButton.DefaultCaption = True
+    CancelButton.Name = 'CancelButton'
+    CancelButton.DefaultCaption = True
+    TabOrder = 3
+    ShowButtons = [pbOK]
+    ShowBevel = False
+  end
   object PkgPopupMenu: TPopupMenu
     OnPopup = PkgPopupMenuPopup
     left = 32
diff --git a/packager/pkggraphexplorer.pas b/packager/pkggraphexplorer.pas
index f8dd15ae7a..26bdc995df 100644
--- a/packager/pkggraphexplorer.pas
+++ b/packager/pkggraphexplorer.pas
@@ -38,7 +38,7 @@ interface
 
 uses
   Classes, SysUtils, LCLProc, Forms, Controls, Buttons, ComCtrls,
-  StdCtrls, Menus, Dialogs, Graphics, LCLType, ExtCtrls,
+  StdCtrls, Menus, Dialogs, Graphics, LCLType, ExtCtrls, ButtonPanel,
   AVL_Tree, contnrs,
   IDECommands, PackageIntf, IDEImagesIntf, LazIDEIntf,
   LvlGraphCtrl,
@@ -55,6 +55,7 @@ type
   { TPkgGraphExplorerDlg }
 
   TPkgGraphExplorerDlg = class(TForm)
+    ButtonPanel1: TButtonPanel;
     CleanPkgDepsMenuItem: TMenuItem;
     PkgTreeView: TTreeView;
     InfoMemo: TMemo;
@@ -65,8 +66,10 @@ type
     VerticalSplitter: TSplitter;
     UninstallMenuItem: TMenuItem;
     procedure CleanPkgDepsMenuItemClick(Sender: TObject);
+    procedure FormCreate(Sender: TObject);
     procedure LvlGraphControl1DblClick(Sender: TObject);
     procedure LvlGraphControl1SelectionChanged(Sender: TObject);
+    procedure OKButtonClick(Sender: TObject);
     procedure PkgGraphExplorerShow(Sender: TObject);
     procedure PkgPopupMenuPopup(Sender: TObject);
     procedure InfoMemoKeyDown(Sender: TObject; var Key: Word;
@@ -201,6 +204,11 @@ begin
   end;
 end;
 
+procedure TPkgGraphExplorerDlg.FormCreate(Sender: TObject);
+begin
+  ButtonPanel1.OKButton.Caption:= lisClose;
+end;
+
 procedure TPkgGraphExplorerDlg.LvlGraphControl1SelectionChanged(Sender: TObject
   );
 var
@@ -219,6 +227,11 @@ begin
   UpdateInfo;
 end;
 
+procedure TPkgGraphExplorerDlg.OKButtonClick(Sender: TObject);
+begin
+  Close;
+end;
+
 procedure TPkgGraphExplorerDlg.PkgPopupMenuPopup(Sender: TObject);
 var
   Pkg: TLazPackage;