From 03c924f14757c8b49afb0eb1f94dedb3669d75d7 Mon Sep 17 00:00:00 2001
From: vincents <vincents@lazarus-ide.org>
Date: Mon, 19 Sep 2005 18:57:19 +0000
Subject: [PATCH] Cancelbutton activated by ESC (issue #1173)

git-svn-id: trunk@7741 -
---
 packager/installpkgsetdlg.lfm | 36 +++++++++++------
 packager/installpkgsetdlg.lrs | 76 ++++++++++++++++++-----------------
 2 files changed, 63 insertions(+), 49 deletions(-)

diff --git a/packager/installpkgsetdlg.lfm b/packager/installpkgsetdlg.lfm
index 415eaee360..d3f963f5c0 100644
--- a/packager/installpkgsetdlg.lfm
+++ b/packager/installpkgsetdlg.lfm
@@ -5,17 +5,18 @@ object InstallPkgSetDialog: TInstallPkgSetDialog
   OnCreate = InstallPkgSetDialogCreate
   OnDestroy = InstallPkgSetDialogDestroy
   OnResize = InstallPkgSetDialogResize
-  PixelsPerInch = 90
-  HorzScrollBar.Page = 530
-  VertScrollBar.Page = 372
+  PixelsPerInch = 96
+  HorzScrollBar.Page = 528
+  VertScrollBar.Page = 370
   Left = 319
   Height = 371
   Top = 178
   Width = 529
   object InstallPkgGroupBox: TGroupBox
     Anchors = [akTop, akLeft, akBottom]
+    BorderSpacing.OnChange = nil
     Caption = 'InstallPkgGroupBox'
-    ClientHeight = 286
+    ClientHeight = 285
     ClientWidth = 236
     ParentColor = True
     TabOrder = 0
@@ -26,49 +27,53 @@ object InstallPkgSetDialog: TInstallPkgSetDialog
     object InstallListBox: TListBox
       Align = alTop
       Anchors = [akTop, akLeft, akRight, akBottom]
+      BorderSpacing.OnChange = nil
       ClickOnSelChange = False
       MultiSelect = True
       OnSelectionChange = InstallListBoxSelectionChange
       TabOrder = 0
-      TopIndex = -1
-      Height = 185
+      Height = 184
       Width = 236
     end
     object UninstallButton: TButton
       Anchors = [akLeft, akRight, akBottom]
+      BorderSpacing.OnChange = nil
       Caption = 'UninstallButton'
       OnClick = UninstallButtonClick
       TabOrder = 1
       Left = 6
       Height = 25
-      Top = 193
+      Top = 192
       Width = 224
     end
     object ImportButton: TButton
       Anchors = [akLeft, akRight, akBottom]
+      BorderSpacing.OnChange = nil
       Caption = 'ImportButton'
       OnClick = ImportButtonClick
       TabOrder = 2
       Left = 6
       Height = 25
-      Top = 225
+      Top = 224
       Width = 224
     end
     object ExportButton: TButton
       Anchors = [akLeft, akRight, akBottom]
+      BorderSpacing.OnChange = nil
       Caption = 'ExportButton'
       OnClick = ExportButtonClick
       TabOrder = 3
       Left = 6
       Height = 25
-      Top = 257
+      Top = 256
       Width = 224
     end
   end
   object AvailablePkgGroupBox: TGroupBox
     Anchors = [akTop, akLeft, akBottom]
+    BorderSpacing.OnChange = nil
     Caption = 'AvailablePkgGroupBox'
-    ClientHeight = 286
+    ClientHeight = 285
     ClientWidth = 236
     ParentColor = True
     TabOrder = 1
@@ -79,28 +84,31 @@ object InstallPkgSetDialog: TInstallPkgSetDialog
     object AvailableListBox: TListBox
       Align = alTop
       Anchors = [akTop, akLeft, akRight, akBottom]
+      BorderSpacing.OnChange = nil
       ClickOnSelChange = False
       MultiSelect = True
       OnSelectionChange = AvailableListBoxSelectionChange
       TabOrder = 0
-      TopIndex = -1
-      Height = 250
+      Height = 249
       Width = 236
     end
     object AddToInstallButton: TButton
       Anchors = [akLeft, akRight, akBottom]
+      BorderSpacing.OnChange = nil
       Caption = 'AddToInstallButton'
       OnClick = AddToInstallButtonClick
       TabOrder = 1
       Left = 6
       Height = 25
-      Top = 257
+      Top = 256
       Width = 224
     end
   end
   object CancelButton: TButton
     Anchors = [akLeft, akBottom]
     AutoSize = True
+    BorderSpacing.OnChange = nil
+    Cancel = True
     Caption = 'CancelButton'
     ModalResult = 2
     TabOrder = 2
@@ -112,6 +120,7 @@ object InstallPkgSetDialog: TInstallPkgSetDialog
   object SaveAndRebuildButton: TButton
     Anchors = [akLeft, akBottom]
     AutoSize = True
+    BorderSpacing.OnChange = nil
     Caption = 'SaveAndRebuildButton'
     OnClick = InstallButtonClick
     TabOrder = 3
@@ -123,6 +132,7 @@ object InstallPkgSetDialog: TInstallPkgSetDialog
   object SaveAndExitButton: TButton
     Anchors = [akLeft, akBottom]
     AutoSize = True
+    BorderSpacing.OnChange = nil
     Caption = 'SaveAndExitButton'
     OnClick = SaveAndExitButtonClick
     TabOrder = 4
diff --git a/packager/installpkgsetdlg.lrs b/packager/installpkgsetdlg.lrs
index 90bdaf3a9f..6d044d61f9 100644
--- a/packager/installpkgsetdlg.lrs
+++ b/packager/installpkgsetdlg.lrs
@@ -4,43 +4,47 @@ LazarusResources.Add('TInstallPkgSetDialog','FORMDATA',[
   'TPF0'#20'TInstallPkgSetDialog'#19'InstallPkgSetDialog'#7'Caption'#6#19'Insta'
   +'llPkgSetDialog'#12'ClientHeight'#3's'#1#11'ClientWidth'#3#17#2#8'OnCreate'#7
   +#25'InstallPkgSetDialogCreate'#9'OnDestroy'#7#26'InstallPkgSetDialogDestroy'
-  +#8'OnResize'#7#25'InstallPkgSetDialogResize'#13'PixelsPerInch'#2'Z'#18'HorzS'
-  +'crollBar.Page'#3#18#2#18'VertScrollBar.Page'#3't'#1#4'Left'#3'?'#1#6'Height'
+  +#8'OnResize'#7#25'InstallPkgSetDialogResize'#13'PixelsPerInch'#2'`'#18'HorzS'
+  +'crollBar.Page'#3#16#2#18'VertScrollBar.Page'#3'r'#1#4'Left'#3'?'#1#6'Height'
   +#3's'#1#3'Top'#3#178#0#5'Width'#3#17#2#0#9'TGroupBox'#18'InstallPkgGroupBox'
-  +#7'Anchors'#11#5'akTop'#6'akLeft'#8'akBottom'#0#7'Caption'#6#18'InstallPkgGr'
-  +'oupBox'#12'ClientHeight'#3#30#1#11'ClientWidth'#3#236#0#11'ParentColor'#9#8
-  +'TabOrder'#2#0#4'Left'#2#16#6'Height'#3'/'#1#3'Top'#2#16#5'Width'#3#240#0#0#8
-  +'TListBox'#14'InstallListBox'#5'Align'#7#5'alTop'#7'Anchors'#11#5'akTop'#6'a'
-  +'kLeft'#7'akRight'#8'akBottom'#0#16'ClickOnSelChange'#8#11'MultiSelect'#9#17
-  +'OnSelectionChange'#7#29'InstallListBoxSelectionChange'#8'TabOrder'#2#0#8'To'
-  +'pIndex'#2#255#6'Height'#3#185#0#5'Width'#3#236#0#0#0#7'TButton'#15'Uninstal'
-  +'lButton'#7'Anchors'#11#6'akLeft'#7'akRight'#8'akBottom'#0#7'Caption'#6#15'U'
-  +'ninstallButton'#7'OnClick'#7#20'UninstallButtonClick'#8'TabOrder'#2#1#4'Lef'
-  +'t'#2#6#6'Height'#2#25#3'Top'#3#193#0#5'Width'#3#224#0#0#0#7'TButton'#12'Imp'
-  +'ortButton'#7'Anchors'#11#6'akLeft'#7'akRight'#8'akBottom'#0#7'Caption'#6#12
-  +'ImportButton'#7'OnClick'#7#17'ImportButtonClick'#8'TabOrder'#2#2#4'Left'#2#6
-  +#6'Height'#2#25#3'Top'#3#225#0#5'Width'#3#224#0#0#0#7'TButton'#12'ExportButt'
-  +'on'#7'Anchors'#11#6'akLeft'#7'akRight'#8'akBottom'#0#7'Caption'#6#12'Export'
-  +'Button'#7'OnClick'#7#17'ExportButtonClick'#8'TabOrder'#2#3#4'Left'#2#6#6'He'
-  +'ight'#2#25#3'Top'#3#1#1#5'Width'#3#224#0#0#0#0#9'TGroupBox'#20'AvailablePkg'
-  +'GroupBox'#7'Anchors'#11#5'akTop'#6'akLeft'#8'akBottom'#0#7'Caption'#6#20'Av'
-  +'ailablePkgGroupBox'#12'ClientHeight'#3#30#1#11'ClientWidth'#3#236#0#11'Pare'
-  +'ntColor'#9#8'TabOrder'#2#1#4'Left'#3#16#1#6'Height'#3'/'#1#3'Top'#2#16#5'Wi'
-  +'dth'#3#240#0#0#8'TListBox'#16'AvailableListBox'#5'Align'#7#5'alTop'#7'Ancho'
-  +'rs'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#16'ClickOnSelChange'#8#11
-  +'MultiSelect'#9#17'OnSelectionChange'#7#31'AvailableListBoxSelectionChange'#8
-  +'TabOrder'#2#0#8'TopIndex'#2#255#6'Height'#3#250#0#5'Width'#3#236#0#0#0#7'TB'
-  +'utton'#18'AddToInstallButton'#7'Anchors'#11#6'akLeft'#7'akRight'#8'akBottom'
-  +#0#7'Caption'#6#18'AddToInstallButton'#7'OnClick'#7#23'AddToInstallButtonCli'
-  +'ck'#8'TabOrder'#2#1#4'Left'#2#6#6'Height'#2#25#3'Top'#3#1#1#5'Width'#3#224#0
-  +#0#0#0#7'TButton'#12'CancelButton'#7'Anchors'#11#6'akLeft'#8'akBottom'#0#8'A'
-  +'utoSize'#9#7'Caption'#6#12'CancelButton'#11'ModalResult'#2#2#8'TabOrder'#2#2
-  +#4'Left'#2#16#6'Height'#2#22#3'Top'#3'P'#1#5'Width'#2'Q'#0#0#7'TButton'#20'S'
-  +'aveAndRebuildButton'#7'Anchors'#11#6'akLeft'#8'akBottom'#0#8'AutoSize'#9#7
-  +'Caption'#6#20'SaveAndRebuildButton'#7'OnClick'#7#18'InstallButtonClick'#8'T'
-  +'abOrder'#2#3#4'Left'#3#183#0#6'Height'#2#22#3'Top'#3'P'#1#5'Width'#2'I'#0#0
-  +#7'TButton'#17'SaveAndExitButton'#7'Anchors'#11#6'akLeft'#8'akBottom'#0#8'Au'
-  +'toSize'#9#7'Caption'#6#17'SaveAndExitButton'#7'OnClick'#7#22'SaveAndExitBut'
+  +#7'Anchors'#11#5'akTop'#6'akLeft'#8'akBottom'#0#22'BorderSpacing.OnChange'#13
+  +#7'Caption'#6#18'InstallPkgGroupBox'#12'ClientHeight'#3#29#1#11'ClientWidth'
+  +#3#236#0#11'ParentColor'#9#8'TabOrder'#2#0#4'Left'#2#16#6'Height'#3'/'#1#3'T'
+  +'op'#2#16#5'Width'#3#240#0#0#8'TListBox'#14'InstallListBox'#5'Align'#7#5'alT'
+  +'op'#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#22'BorderSpac'
+  +'ing.OnChange'#13#16'ClickOnSelChange'#8#11'MultiSelect'#9#17'OnSelectionCha'
+  +'nge'#7#29'InstallListBoxSelectionChange'#8'TabOrder'#2#0#6'Height'#3#184#0#5
+  +'Width'#3#236#0#0#0#7'TButton'#15'UninstallButton'#7'Anchors'#11#6'akLeft'#7
+  +'akRight'#8'akBottom'#0#22'BorderSpacing.OnChange'#13#7'Caption'#6#15'Uninst'
+  +'allButton'#7'OnClick'#7#20'UninstallButtonClick'#8'TabOrder'#2#1#4'Left'#2#6
+  +#6'Height'#2#25#3'Top'#3#192#0#5'Width'#3#224#0#0#0#7'TButton'#12'ImportButt'
+  +'on'#7'Anchors'#11#6'akLeft'#7'akRight'#8'akBottom'#0#22'BorderSpacing.OnCha'
+  +'nge'#13#7'Caption'#6#12'ImportButton'#7'OnClick'#7#17'ImportButtonClick'#8
+  +'TabOrder'#2#2#4'Left'#2#6#6'Height'#2#25#3'Top'#3#224#0#5'Width'#3#224#0#0#0
+  +#7'TButton'#12'ExportButton'#7'Anchors'#11#6'akLeft'#7'akRight'#8'akBottom'#0
+  +#22'BorderSpacing.OnChange'#13#7'Caption'#6#12'ExportButton'#7'OnClick'#7#17
+  +'ExportButtonClick'#8'TabOrder'#2#3#4'Left'#2#6#6'Height'#2#25#3'Top'#3#0#1#5
+  +'Width'#3#224#0#0#0#0#9'TGroupBox'#20'AvailablePkgGroupBox'#7'Anchors'#11#5
+  +'akTop'#6'akLeft'#8'akBottom'#0#22'BorderSpacing.OnChange'#13#7'Caption'#6#20
+  +'AvailablePkgGroupBox'#12'ClientHeight'#3#29#1#11'ClientWidth'#3#236#0#11'Pa'
+  +'rentColor'#9#8'TabOrder'#2#1#4'Left'#3#16#1#6'Height'#3'/'#1#3'Top'#2#16#5
+  +'Width'#3#240#0#0#8'TListBox'#16'AvailableListBox'#5'Align'#7#5'alTop'#7'Anc'
+  +'hors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#22'BorderSpacing.OnCha'
+  +'nge'#13#16'ClickOnSelChange'#8#11'MultiSelect'#9#17'OnSelectionChange'#7#31
+  +'AvailableListBoxSelectionChange'#8'TabOrder'#2#0#6'Height'#3#249#0#5'Width'
+  +#3#236#0#0#0#7'TButton'#18'AddToInstallButton'#7'Anchors'#11#6'akLeft'#7'akR'
+  +'ight'#8'akBottom'#0#22'BorderSpacing.OnChange'#13#7'Caption'#6#18'AddToInst'
+  +'allButton'#7'OnClick'#7#23'AddToInstallButtonClick'#8'TabOrder'#2#1#4'Left'
+  +#2#6#6'Height'#2#25#3'Top'#3#0#1#5'Width'#3#224#0#0#0#0#7'TButton'#12'Cancel'
+  +'Button'#7'Anchors'#11#6'akLeft'#8'akBottom'#0#8'AutoSize'#9#22'BorderSpacin'
+  +'g.OnChange'#13#6'Cancel'#9#7'Caption'#6#12'CancelButton'#11'ModalResult'#2#2
+  +#8'TabOrder'#2#2#4'Left'#2#16#6'Height'#2#22#3'Top'#3'P'#1#5'Width'#2'Q'#0#0
+  +#7'TButton'#20'SaveAndRebuildButton'#7'Anchors'#11#6'akLeft'#8'akBottom'#0#8
+  +'AutoSize'#9#22'BorderSpacing.OnChange'#13#7'Caption'#6#20'SaveAndRebuildBut'
+  +'ton'#7'OnClick'#7#18'InstallButtonClick'#8'TabOrder'#2#3#4'Left'#3#183#0#6
+  +'Height'#2#22#3'Top'#3'P'#1#5'Width'#2'I'#0#0#7'TButton'#17'SaveAndExitButto'
+  +'n'#7'Anchors'#11#6'akLeft'#8'akBottom'#0#8'AutoSize'#9#22'BorderSpacing.OnC'
+  +'hange'#13#7'Caption'#6#17'SaveAndExitButton'#7'OnClick'#7#22'SaveAndExitBut'
   +'tonClick'#8'TabOrder'#2#4#4'Left'#3'H'#1#6'Height'#2#22#3'Top'#3'P'#1#5'Wid'
   +'th'#2'q'#0#0#0
 ]);