From 315062347c9c8025004b2c58650dbe51db58c0c7 Mon Sep 17 00:00:00 2001
From: martin <laz.git@mfriebe.de>
Date: Sat, 28 Sep 2019 20:08:48 +0000
Subject: [PATCH] IDE, Package Install Dlg: Re-arranged buttons.

git-svn-id: trunk@61944 -
---
 packager/installpkgsetdlg.lfm | 84 +++++++++++++++++++++--------------
 packager/installpkgsetdlg.pas |  4 +-
 2 files changed, 53 insertions(+), 35 deletions(-)

diff --git a/packager/installpkgsetdlg.lfm b/packager/installpkgsetdlg.lfm
index 83e80259b0..14f3b8c7d8 100644
--- a/packager/installpkgsetdlg.lfm
+++ b/packager/installpkgsetdlg.lfm
@@ -272,38 +272,8 @@ object InstallPkgSetDialog: TInstallPkgSetDialog
       Caption = 'InstallPkgGroupBox'
       ClientHeight = 349
       ClientWidth = 290
+      Constraints.MinWidth = 200
       TabOrder = 0
-      object ImportButton: TButton
-        AnchorSideLeft.Control = InstallTreeView
-        AnchorSideLeft.Side = asrCenter
-        AnchorSideBottom.Control = ExportButton
-        Left = 96
-        Height = 25
-        Top = 287
-        Width = 98
-        Anchors = [akLeft, akBottom]
-        AutoSize = True
-        BorderSpacing.Bottom = 6
-        Caption = 'ImportButton'
-        OnClick = ImportButtonClick
-        TabOrder = 3
-      end
-      object ExportButton: TButton
-        AnchorSideLeft.Control = InstallTreeView
-        AnchorSideLeft.Side = asrCenter
-        AnchorSideBottom.Control = InstallPkgGroupBox
-        AnchorSideBottom.Side = asrBottom
-        Left = 97
-        Height = 25
-        Top = 318
-        Width = 96
-        Anchors = [akLeft, akBottom]
-        AutoSize = True
-        BorderSpacing.Bottom = 6
-        Caption = 'ExportButton'
-        OnClick = ExportButtonClick
-        TabOrder = 4
-      end
       object InstallTreeView: TTreeView
         AnchorSideLeft.Control = InstalledFilterEdit
         AnchorSideTop.Control = InstalledFilterEdit
@@ -312,7 +282,7 @@ object InstallPkgSetDialog: TInstallPkgSetDialog
         AnchorSideRight.Side = asrBottom
         AnchorSideBottom.Control = UninstallButton
         Left = 6
-        Height = 219
+        Height = 250
         Top = 31
         Width = 278
         Anchors = [akTop, akLeft, akRight, akBottom]
@@ -331,10 +301,10 @@ object InstallPkgSetDialog: TInstallPkgSetDialog
       object UninstallButton: TBitBtn
         AnchorSideLeft.Control = InstallTreeView
         AnchorSideLeft.Side = asrCenter
-        AnchorSideBottom.Control = ImportButton
+        AnchorSideBottom.Control = Panel2
         Left = 91
         Height = 25
-        Top = 256
+        Top = 287
         Width = 108
         Anchors = [akLeft, akBottom]
         AutoSize = True
@@ -368,6 +338,52 @@ object InstallPkgSetDialog: TInstallPkgSetDialog
         FilteredTreeview = InstallTreeView
         OnGetImageIndex = FilterEditGetImageIndex
       end
+      object Panel2: TPanel
+        AnchorSideLeft.Control = InstallPkgGroupBox
+        AnchorSideRight.Control = InstallPkgGroupBox
+        AnchorSideRight.Side = asrBottom
+        AnchorSideBottom.Control = InstallPkgGroupBox
+        AnchorSideBottom.Side = asrBottom
+        Left = 0
+        Height = 25
+        Top = 318
+        Width = 290
+        Anchors = [akLeft, akRight, akBottom]
+        AutoSize = True
+        BorderSpacing.Bottom = 6
+        BorderSpacing.CellAlignHorizontal = ccaCenter
+        BevelOuter = bvNone
+        ChildSizing.LeftRightSpacing = 3
+        ChildSizing.HorizontalSpacing = 3
+        ChildSizing.EnlargeHorizontal = crsHomogenousSpaceResize
+        ChildSizing.ShrinkHorizontal = crsHomogenousChildResize
+        ChildSizing.Layout = cclLeftToRightThenTopToBottom
+        ChildSizing.ControlsPerLine = 2
+        ClientHeight = 25
+        ClientWidth = 290
+        TabOrder = 3
+        object ImportButton: TButton
+          AnchorSideLeft.Side = asrCenter
+          Left = 32
+          Height = 25
+          Top = 0
+          Width = 98
+          Caption = 'ImportButton'
+          OnClick = ImportButtonClick
+          TabOrder = 0
+        end
+        object ExportButton: TButton
+          AnchorSideLeft.Side = asrCenter
+          AnchorSideBottom.Side = asrBottom
+          Left = 162
+          Height = 25
+          Top = 0
+          Width = 96
+          Caption = 'ExportButton'
+          OnClick = ExportButtonClick
+          TabOrder = 1
+        end
+      end
     end
     object AvailablePkgGroupBox: TGroupBox
       AnchorSideLeft.Control = MiddleBevel
diff --git a/packager/installpkgsetdlg.pas b/packager/installpkgsetdlg.pas
index a6dd545d72..b1b1b04e96 100644
--- a/packager/installpkgsetdlg.pas
+++ b/packager/installpkgsetdlg.pas
@@ -72,6 +72,7 @@ type
     LPKParsingTimer: TTimer;
     NoteLabel: TLabel;
     Panel1: TPanel;
+    Panel2: TPanel;
     PkgInfoMemo: TMemo;
     PkgInfoGroupBox: TGroupBox;
     ImportButton: TButton;
@@ -270,7 +271,8 @@ procedure TInstallPkgSetDialog.InstallPkgSetDialogShow(Sender: TObject);
 begin
   InstalledFilterEdit.Filter:='';    // (filter) - text is shown after this.
   AvailableFilterEdit.Filter:='';
-  SetControlsWidthOnMax([UninstallButton, ImportButton, ExportButton, AddToInstallButton]);
+  SetControlsWidthOnMax([UninstallButton, AddToInstallButton]);
+  SetControlsWidthOnMax([ImportButton, ExportButton]);
 end;
 
 procedure TInstallPkgSetDialog.SaveAndRebuildButtonClick(Sender: TObject);