From a76c33a899121c148109d79d001a2c7743d6b614 Mon Sep 17 00:00:00 2001
From: laurent <laurent@lazarus-ide.org>
Date: Wed, 17 Sep 2008 07:58:38 +0000
Subject: [PATCH] add standard glyph in buttons and change the order.

git-svn-id: trunk@16616 -
---
 packager/installpkgsetdlg.lfm | 199 ++++++++++++++++++++++------
 packager/installpkgsetdlg.lrs | 237 +++++++++++++++++++++++++++-------
 packager/installpkgsetdlg.pas |   6 +-
 3 files changed, 351 insertions(+), 91 deletions(-)

diff --git a/packager/installpkgsetdlg.lfm b/packager/installpkgsetdlg.lfm
index af2b26a4b0..093171e027 100644
--- a/packager/installpkgsetdlg.lfm
+++ b/packager/installpkgsetdlg.lfm
@@ -3,8 +3,6 @@ object InstallPkgSetDialog: TInstallPkgSetDialog
   Height = 441
   Top = 167
   Width = 529
-  HorzScrollBar.Page = 528
-  VertScrollBar.Page = 440
   ActiveControl = InstallListBox
   BorderStyle = bsSizeToolWin
   Caption = 'InstallPkgSetDialog'
@@ -13,6 +11,7 @@ object InstallPkgSetDialog: TInstallPkgSetDialog
   OnCreate = InstallPkgSetDialogCreate
   OnDestroy = InstallPkgSetDialogDestroy
   OnResize = InstallPkgSetDialogResize
+  ParentFont = False
   LCLVersion = '0.9.25'
   object InstallPkgGroupBox: TGroupBox
     Left = 6
@@ -108,42 +107,6 @@ object InstallPkgSetDialog: TInstallPkgSetDialog
       TabOrder = 1
     end
   end
-  object CancelButton: TButton
-    Left = 6
-    Height = 23
-    Top = 408
-    Width = 90
-    Anchors = [akLeft, akBottom]
-    AutoSize = True
-    Cancel = True
-    Caption = 'CancelButton'
-    ModalResult = 2
-    TabOrder = 2
-  end
-  object SaveAndRebuildButton: TButton
-    AnchorSideRight.Control = SaveAndExitButton
-    Left = 261
-    Height = 23
-    Top = 408
-    Width = 137
-    Anchors = [akRight, akBottom]
-    AutoSize = True
-    BorderSpacing.Around = 6
-    Caption = 'SaveAndRebuildButton'
-    OnClick = InstallButtonClick
-    TabOrder = 3
-  end
-  object SaveAndExitButton: TButton
-    Left = 404
-    Height = 23
-    Top = 408
-    Width = 118
-    Anchors = [akRight, akBottom]
-    AutoSize = True
-    Caption = 'SaveAndExitButton'
-    OnClick = SaveAndExitButtonClick
-    TabOrder = 4
-  end
   object PkgInfoGroupBox: TGroupBox
     Left = 7
     Height = 85
@@ -153,7 +116,7 @@ object InstallPkgSetDialog: TInstallPkgSetDialog
     Caption = 'PkgInfoGroupBox'
     ClientHeight = 67
     ClientWidth = 511
-    TabOrder = 5
+    TabOrder = 2
     object PkgInfoMemo: TMemo
       Height = 67
       Width = 511
@@ -163,4 +126,162 @@ object InstallPkgSetDialog: TInstallPkgSetDialog
       TabOrder = 0
     end
   end
+  object CancelButton: TBitBtn
+    AnchorSideRight.Control = Owner
+    AnchorSideRight.Side = asrBottom
+    AnchorSideBottom.Control = Owner
+    AnchorSideBottom.Side = asrBottom
+    Left = 414
+    Height = 26
+    Top = 409
+    Width = 109
+    Anchors = [akRight, akBottom]
+    AutoSize = True
+    BorderSpacing.Around = 6
+    Cancel = True
+    Caption = 'CancelButton'
+    Glyph.Data = {
+      36040000424D3604000000000000360000002800000010000000100000000100
+      2000000000000004000064000000640000000000000000000000FFFFFF00FFFF
+      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+      FF00FFFFFF003F3DED413B38EB08FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+      FF00FFFFFF00211FE3081E1CE241FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+      FF004A47F0414F4CF2FF403EEDFD3C39EB08FFFFFF00FFFFFF00FFFFFF00FFFF
+      FF002725E5082422E4FC312FEAFF1F1DE241FFFFFF00FFFFFF00FFFFFF005451
+      F3415856F5FF6361FAFF5855F6FF413FEDFC3D3AEC08FFFFFF00FFFFFF00302D
+      E7082C2AE6FC413FF1FF4C4AF6FF312FEAFF1F1DE241FFFFFF00FFFFFF005956
+      F52B5B58F6FF6562FAFF7170FFFF5956F6FF4240EEFC3E3BEC083937EB083532
+      E9FC4745F2FF6362FFFF4A48F4FF2F2DE9FF2220E32BFFFFFF00FFFFFF00FFFF
+      FF005A57F52B5B59F6FF6663FAFF7471FFFF5A58F6FF4341EEFC3E3CECFD504D
+      F4FF6867FFFF504EF5FF3634EBFF2A27E52BFFFFFF00FFFFFF00FFFFFF00FFFF
+      FF00FFFFFF005B58F62B5C5AF6FF6764FAFF7472FFFF7370FFFF706EFFFF6E6C
+      FFFF5755F7FF3F3DEEFF3230E82BFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+      FF00FFFFFF00FFFFFF005C59F62B5D5BF7FF7976FFFF5956FFFF5754FFFF7270
+      FFFF4846F0FF3C39EB2BFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+      FF00FFFFFF00FFFFFF00615EF8085D5AF6FD7D79FFFF5E5BFFFF5B58FFFF7674
+      FFFF4643EFFD413FED08FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+      FF00FFFFFF006967FB086663F9FC706DFBFF807EFFFF7E7BFFFF7C79FFFF7977
+      FFFF5E5CF7FF4744EFFC4240EE08FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+      FF00716EFD086E6BFCFC7774FDFF8682FFFF7673FCFF6462F8FF605DF7FF6D6A
+      FAFF7B79FFFF605DF7FF4845EFFC4341EE08FFFFFF00FFFFFF00FFFFFF007673
+      FF087471FEFD7D7AFEFF8A87FFFF7C79FDFF6C69FBFF6361F92B5F5CF72B615E
+      F8FF6E6CFAFF7D7AFFFF615FF7FF4946F0FC4441EE05FFFFFF00FFFFFF007774
+      FF1F7A77FFFF817EFFFF817EFEFF7471FDFF6C69FB2BFFFFFF00FFFFFF00605D
+      F72B625FF8FF6F6DFBFF7E7CFFFF625FF8FF4A47F06F4542EE02FFFFFF00FFFF
+      FF007774FF1F7A77FFFF7976FEFF726FFD2BFFFFFF00FFFFFF00FFFFFF00FFFF
+      FF00615EF82B6461F8FF6A68F9FF5451F3A84F4DF229FFFFFF00FFFFFF00FFFF
+      FF00FFFFFF007774FF1F7774FF2BFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+      FF00FFFFFF00625FF82B5D5BF76F5956F53EFFFFFF00FFFFFF00FFFFFF00FFFF
+      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+      FF00FFFFFF00FFFFFF006360F80AFFFFFF00FFFFFF00FFFFFF00
+    }
+    ModalResult = 2
+    NumGlyphs = 0
+    TabOrder = 3
+  end
+  object SaveAndExitButton: TBitBtn
+    AnchorSideRight.Control = CancelButton
+    AnchorSideBottom.Control = Owner
+    AnchorSideBottom.Side = asrBottom
+    Left = 270
+    Height = 26
+    Top = 409
+    Width = 138
+    Anchors = [akRight, akBottom]
+    AutoSize = True
+    BorderSpacing.Around = 6
+    Caption = 'SaveAndExitButton'
+    Glyph.Data = {
+      36040000424D3604000000000000360000002800000010000000100000000100
+      2000000000000004000064000000640000000000000000000000FFFFFF00FFFF
+      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF001D63
+      9B1619609839145D9562105A92880D5890A4135C92FC0C578FED999999FF7171
+      71FF545454FF515151FF4F4F4FFF4C4C4CFF4A4A4AFF474747FF454545FF2567
+      9DFF3274A8FF3D7CAFFF4784B5FF4E8ABAFF3E7EADFF0C578FEAFFFFFF00FFFF
+      FF00585858FFA2A2A2FFA2A2A2FFA3A3A3FFA4A4A4FFA4A4A4FFA5A5A5FF2F6F
+      A5FF78ABD2FF78ABD3FF73A7D1FF69A0CDFF407FAEFF0F5991EAFFFFFF00FFFF
+      FF005C5C5CFFA1A1A1FF3C7340FFA0A1A1FFA3A3A3FFA3A3A3FFA4A4A4FF3674
+      AAFF7DAFD4FF5B9AC9FF5495C7FF5896C8FF4180AEFF135C94EAFFFFFF00FFFF
+      FF00606060FFA0A0A0FF3D7641FF367139FFA2A2A2FFA2A2A2FFA3A3A3FF3D79
+      B0FF82B3D7FF629FCCFF5A9AC9FF5E9BCAFF4381AFFF196098EA37823EFF347E
+      3BFF317937FF2E7534FF499150FF468F4CFF39733DFFA1A1A1FFA2A2A2FF457E
+      B4FF88B7D9FF67A3CFFF619ECCFF639FCCFF4583B1FF1F649CEA3B8742FF89CB
+      92FF84C88DFF80C688FF7BC383FF77C17FFF478F4DFF3B743FFFA1A1A1FF4C84
+      BAFF8DBBDBFF6EA8D1FF66A6D1FF5FB4DFFF4785B1FF2569A1EA3E8B46FF8FCE
+      99FF7DC687FF78C381FF73C07CFF74C07CFF79C281FF49904FFF547F57FF5489
+      BFFF94BFDDFF75ADD4FF63B8E1FF4BD4FFFF428BB8FF2C6EA6EA41904AFF94D2
+      9FFF91D09AFF8DCD96FF89CB92FF84C88DFF519858FF417C46FF9F9F9FFF5A8E
+      C4FF98C3E0FF7CB3D7FF74AFD6FF5EC4EDFF4B88B3FF3473ABEA44944DFF4291
+      4BFF3F8D48FF3D8945FF5DA465FF5AA061FF45834BFF9E9E9EFF9E9E9EFF6092
+      C9FF9EC7E2FF83B8DAFF7DB4D7FF7EB3D7FF4F89B4FF3B79B1EAFFFFFF00FFFF
+      FF00777777FF9A9A9AFF3D8A45FF498A4FFF9C9C9CFF9D9D9DFF9D9D9DFF6696
+      CCFFA2CBE3FF89BDDCFF83B9DAFF84B9DAFF518BB5FF437EB6EAFFFFFF00FFFF
+      FF007A7A7AFF999999FF529159FF999A99FF9B9B9BFF9C9C9CFF9C9C9CFF6C9A
+      D0FFA7CEE5FF8FC1DFFF89BDDCFF8BBDDCFF538DB6FF4B84BCEAFFFFFF00FFFF
+      FF007D7D7DFF999999FF999999FF9A9A9AFF9A9A9AFF9B9B9BFF9B9B9BFF6F9D
+      D3FFAAD1E7FFABD1E7FF98C7E1FF91C2DEFF568FB7FF5289C1EAFFFFFF00FFFF
+      FF00808080FF7E7E7EFF7C7C7CFF7A7A7AFF777777FF757575FF727272FF719E
+      D4FF6F9ED6FF87B2DCFFABD3E8FFA9D0E6FF5890B8FF598EC6EAFFFFFF00FFFF
+      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+      FF00FFFFFF00709ED6DB6D9CD4FF85B1DAFF5A91B9FF6093CBEAFFFFFF00FFFF
+      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+      FF00FFFFFF00FFFFFF00FFFFFF006D9CD4896A9AD2FB6697CFEE
+    }
+    NumGlyphs = 0
+    OnClick = SaveAndExitButtonClick
+    TabOrder = 4
+  end
+  object SaveAndRebuildButton: TBitBtn
+    AnchorSideRight.Control = SaveAndExitButton
+    AnchorSideBottom.Control = Owner
+    AnchorSideBottom.Side = asrBottom
+    Left = 109
+    Height = 26
+    Top = 409
+    Width = 155
+    Anchors = [akRight, akBottom]
+    AutoSize = True
+    BorderSpacing.Around = 6
+    Caption = 'SaveAndRebuildButton'
+    Glyph.Data = {
+      36040000424D3604000000000000360000002800000010000000100000000100
+      2000000000000004000064000000640000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      000000000000000000000000000000000000BE7A45FFBE7A45FFBE7A45FF0000
+      0000000000000000000000000000000000000000000000000000000000000000
+      000000000000BE7A45FFBE7A45FF78553958BE7A45FFE3CDBCFFBE7A45FF7855
+      3958BE7A45FFBE7A45FF00000000000000000000000000000000000000000000
+      0000BE7A45FFE3CDBCFFD2A786FFBE7A45FFC79064FFDAB89DFFC79064FFBE7A
+      45FFD2A786FFE3CDBCFFBE7A45FF000000000000000000000000000000000000
+      0000BE7A45FFD2A786FFDAB89DFFDAB89DFFDAB89DFFDAB89DFFDAB89DFFDAB8
+      9DFFDAB89DFFD2A786FFBE7A45FF000000000000000000000000000000000000
+      000078553958BE7A45FFE3CDBCFFCFA17CFFBD7F4CF8C38656FFBA7A46F4D5AE
+      8FFFDAB89DFFBE7A45FF7855395800000000000000000000000000000000BE7A
+      45FFBE7A45FFC79064FFDAB89DFFBD7F4CF8B78256CD78553959A56F43C0BA7A
+      46F4DAB89DFFC79064FFBE7A45FFBE7A45FF000000000000000000000000BE7A
+      45FFE3CDBCFFDAB89DFFDAB89DFFC38656FF785539590000000078553959C386
+      56FFDAB89DFFDAB89DFFE3CDBCFFBE7A45FF000000000000000000000000BE7A
+      45FFBE7A45FFC79064FFDAB89DFFBA7A46F49C6B42AE785539598F633F97BA7C
+      49EEDAB89DFFC79064FFBE7A45FFBE7A45FF0000000000000000000000000000
+      000078553958BE7A45FFDAB89DFFCFA17CFFBA7A46F4C38656FFBA7A46F4D1A5
+      82FFDAB89DFFBE7A45FF78553958000000000000000000000000000000000000
+      0000BE7A45FFD2A786FFDAB89DFFDAB89DFFDAB89DFFDAB89DFFDAB89DFFDAB8
+      9DFFDAB89DFFD2A786FFBE7A45FF000000000000000000000000000000000000
+      0000BE7A45FFE3CDBCFFD2A786FFBE7A45FFC79064FFDAB89DFFC79064FFBE7A
+      45FFD2A786FFE3CDBCFFBE7A45FF000000000000000000000000000000000000
+      000078553958BE7A45FFBE7A45FF78553958BE7A45FFE3CDBCFFBE7A45FF7855
+      3958BE7A45FFBE7A45FF00000000000000000000000000000000000000000000
+      000000000000000000000000000000000000BE7A45FFBE7A45FFBE7A45FF0000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000
+    }
+    NumGlyphs = 0
+    OnClick = InstallButtonClick
+    TabOrder = 5
+  end
 end
diff --git a/packager/installpkgsetdlg.lrs b/packager/installpkgsetdlg.lrs
index a184d39b48..d047642c8c 100644
--- a/packager/installpkgsetdlg.lrs
+++ b/packager/installpkgsetdlg.lrs
@@ -2,53 +2,192 @@
 
 LazarusResources.Add('TInstallPkgSetDialog','FORMDATA',[
   'TPF0'#20'TInstallPkgSetDialog'#19'InstallPkgSetDialog'#4'Left'#3','#1#6'Heig'
-  +'ht'#3#185#1#3'Top'#3#167#0#5'Width'#3#17#2#18'HorzScrollBar.Page'#3#16#2#18
-  +'VertScrollBar.Page'#3#184#1#13'ActiveControl'#7#14'InstallListBox'#11'Borde'
-  +'rStyle'#7#13'bsSizeToolWin'#7'Caption'#6#19'InstallPkgSetDialog'#12'ClientH'
-  +'eight'#3#185#1#11'ClientWidth'#3#17#2#8'OnCreate'#7#25'InstallPkgSetDialogC'
-  +'reate'#9'OnDestroy'#7#26'InstallPkgSetDialogDestroy'#8'OnResize'#7#25'Insta'
-  +'llPkgSetDialogResize'#10'LCLVersion'#6#6'0.9.25'#0#9'TGroupBox'#18'InstallP'
-  +'kgGroupBox'#4'Left'#2#6#6'Height'#3'#'#1#3'Top'#2#6#5'Width'#3#255#0#7'Anch'
-  +'ors'#11#5'akTop'#6'akLeft'#8'akBottom'#0#20'BorderSpacing.Around'#2#6#7'Cap'
-  +'tion'#6#18'InstallPkgGroupBox'#12'ClientHeight'#3#17#1#11'ClientWidth'#3#251
-  +#0#8'TabOrder'#2#0#0#8'TListBox'#14'InstallListBox'#4'Left'#2#6#6'Height'#3
-  +#168#0#3'Top'#2#6#5'Width'#3#239#0#5'Align'#7#8'alClient'#20'BorderSpacing.A'
-  +'round'#2#6#16'ClickOnSelChange'#8#11'MultiSelect'#9#10'OnDblClick'#7#22'Ins'
-  +'tallListBoxDblClick'#17'OnSelectionChange'#7#29'InstallListBoxSelectionChan'
-  +'ge'#8'TabOrder'#2#0#0#0#7'TButton'#15'UninstallButton'#4'Left'#2#6#6'Height'
-  +#2#25#3'Top'#3#180#0#5'Width'#3#239#0#5'Align'#7#8'alBottom'#20'BorderSpacin'
-  +'g.Around'#2#6#7'Caption'#6#15'UninstallButton'#7'OnClick'#7#20'UninstallBut'
-  +'tonClick'#8'TabOrder'#2#1#0#0#7'TButton'#12'ImportButton'#4'Left'#2#6#6'Hei'
-  +'ght'#2#25#3'Top'#3#211#0#5'Width'#3#239#0#5'Align'#7#8'alBottom'#20'BorderS'
-  +'pacing.Around'#2#6#7'Caption'#6#12'ImportButton'#7'OnClick'#7#17'ImportButt'
-  +'onClick'#8'TabOrder'#2#2#0#0#7'TButton'#12'ExportButton'#4'Left'#2#6#6'Heig'
-  +'ht'#2#25#3'Top'#3#242#0#5'Width'#3#239#0#5'Align'#7#8'alBottom'#20'BorderSp'
-  +'acing.Around'#2#6#7'Caption'#6#12'ExportButton'#7'OnClick'#7#17'ExportButto'
-  +'nClick'#8'TabOrder'#2#3#0#0#0#9'TGroupBox'#20'AvailablePkgGroupBox'#4'Left'
-  +#3#11#1#6'Height'#3'#'#1#3'Top'#2#6#5'Width'#3#255#0#7'Anchors'#11#5'akTop'#6
-  +'akLeft'#8'akBottom'#0#20'BorderSpacing.Around'#2#6#7'Caption'#6#20'Availabl'
-  +'ePkgGroupBox'#12'ClientHeight'#3#17#1#11'ClientWidth'#3#251#0#8'TabOrder'#2
-  +#1#0#8'TListBox'#16'AvailableListBox'#4'Left'#2#6#6'Height'#3#230#0#3'Top'#2
-  +#6#5'Width'#3#239#0#5'Align'#7#8'alClient'#20'BorderSpacing.Around'#2#6#16'C'
-  +'lickOnSelChange'#8#11'MultiSelect'#9#10'OnDblClick'#7#24'AvailableListBoxDb'
-  +'lClick'#17'OnSelectionChange'#7#31'AvailableListBoxSelectionChange'#8'TabOr'
-  +'der'#2#0#0#0#7'TButton'#18'AddToInstallButton'#4'Left'#2#6#6'Height'#2#25#3
-  +'Top'#3#242#0#5'Width'#3#239#0#5'Align'#7#8'alBottom'#20'BorderSpacing.Aroun'
-  +'d'#2#6#7'Caption'#6#18'AddToInstallButton'#7'OnClick'#7#23'AddToInstallButt'
-  +'onClick'#8'TabOrder'#2#1#0#0#0#7'TButton'#12'CancelButton'#4'Left'#2#6#6'He'
-  +'ight'#2#23#3'Top'#3#152#1#5'Width'#2'Z'#7'Anchors'#11#6'akLeft'#8'akBottom'
-  +#0#8'AutoSize'#9#6'Cancel'#9#7'Caption'#6#12'CancelButton'#11'ModalResult'#2
-  +#2#8'TabOrder'#2#2#0#0#7'TButton'#20'SaveAndRebuildButton'#23'AnchorSideRigh'
-  +'t.Control'#7#17'SaveAndExitButton'#4'Left'#3#5#1#6'Height'#2#23#3'Top'#3#152
-  +#1#5'Width'#3#137#0#7'Anchors'#11#7'akRight'#8'akBottom'#0#8'AutoSize'#9#20
-  +'BorderSpacing.Around'#2#6#7'Caption'#6#20'SaveAndRebuildButton'#7'OnClick'#7
-  +#18'InstallButtonClick'#8'TabOrder'#2#3#0#0#7'TButton'#17'SaveAndExitButton'
-  +#4'Left'#3#148#1#6'Height'#2#23#3'Top'#3#152#1#5'Width'#2'v'#7'Anchors'#11#7
-  +'akRight'#8'akBottom'#0#8'AutoSize'#9#7'Caption'#6#17'SaveAndExitButton'#7'O'
-  +'nClick'#7#22'SaveAndExitButtonClick'#8'TabOrder'#2#4#0#0#9'TGroupBox'#15'Pk'
-  +'gInfoGroupBox'#4'Left'#2#7#6'Height'#2'U'#3'Top'#3'2'#1#5'Width'#3#3#2#7'An'
-  +'chors'#11#6'akLeft'#7'akRight'#8'akBottom'#0#7'Caption'#6#15'PkgInfoGroupBo'
-  +'x'#12'ClientHeight'#2'C'#11'ClientWidth'#3#255#1#8'TabOrder'#2#5#0#5'TMemo'
-  +#11'PkgInfoMemo'#6'Height'#2'C'#5'Width'#3#255#1#5'Align'#7#8'alClient'#8'Re'
-  +'adOnly'#9#10'ScrollBars'#7#14'ssAutoVertical'#8'TabOrder'#2#0#0#0#0#0
+  +'ht'#3#185#1#3'Top'#3#167#0#5'Width'#3#17#2#13'ActiveControl'#7#14'InstallLi'
+  +'stBox'#11'BorderStyle'#7#13'bsSizeToolWin'#7'Caption'#6#19'InstallPkgSetDia'
+  +'log'#12'ClientHeight'#3#185#1#11'ClientWidth'#3#17#2#8'OnCreate'#7#25'Insta'
+  +'llPkgSetDialogCreate'#9'OnDestroy'#7#26'InstallPkgSetDialogDestroy'#8'OnRes'
+  +'ize'#7#25'InstallPkgSetDialogResize'#10'ParentFont'#8#10'LCLVersion'#6#6'0.'
+  +'9.25'#0#9'TGroupBox'#18'InstallPkgGroupBox'#4'Left'#2#6#6'Height'#3'#'#1#3
+  +'Top'#2#6#5'Width'#3#255#0#7'Anchors'#11#5'akTop'#6'akLeft'#8'akBottom'#0#20
+  +'BorderSpacing.Around'#2#6#7'Caption'#6#18'InstallPkgGroupBox'#12'ClientHeig'
+  +'ht'#3#17#1#11'ClientWidth'#3#251#0#8'TabOrder'#2#0#0#8'TListBox'#14'Install'
+  +'ListBox'#4'Left'#2#6#6'Height'#3#168#0#3'Top'#2#6#5'Width'#3#239#0#5'Align'
+  +#7#8'alClient'#20'BorderSpacing.Around'#2#6#16'ClickOnSelChange'#8#11'MultiS'
+  +'elect'#9#10'OnDblClick'#7#22'InstallListBoxDblClick'#17'OnSelectionChange'#7
+  +#29'InstallListBoxSelectionChange'#8'TabOrder'#2#0#0#0#7'TButton'#15'Uninsta'
+  +'llButton'#4'Left'#2#6#6'Height'#2#25#3'Top'#3#180#0#5'Width'#3#239#0#5'Alig'
+  +'n'#7#8'alBottom'#20'BorderSpacing.Around'#2#6#7'Caption'#6#15'UninstallButt'
+  +'on'#7'OnClick'#7#20'UninstallButtonClick'#8'TabOrder'#2#1#0#0#7'TButton'#12
+  +'ImportButton'#4'Left'#2#6#6'Height'#2#25#3'Top'#3#211#0#5'Width'#3#239#0#5
+  +'Align'#7#8'alBottom'#20'BorderSpacing.Around'#2#6#7'Caption'#6#12'ImportBut'
+  +'ton'#7'OnClick'#7#17'ImportButtonClick'#8'TabOrder'#2#2#0#0#7'TButton'#12'E'
+  +'xportButton'#4'Left'#2#6#6'Height'#2#25#3'Top'#3#242#0#5'Width'#3#239#0#5'A'
+  +'lign'#7#8'alBottom'#20'BorderSpacing.Around'#2#6#7'Caption'#6#12'ExportButt'
+  +'on'#7'OnClick'#7#17'ExportButtonClick'#8'TabOrder'#2#3#0#0#0#9'TGroupBox'#20
+  +'AvailablePkgGroupBox'#4'Left'#3#11#1#6'Height'#3'#'#1#3'Top'#2#6#5'Width'#3
+  +#255#0#7'Anchors'#11#5'akTop'#6'akLeft'#8'akBottom'#0#20'BorderSpacing.Aroun'
+  +'d'#2#6#7'Caption'#6#20'AvailablePkgGroupBox'#12'ClientHeight'#3#17#1#11'Cli'
+  +'entWidth'#3#251#0#8'TabOrder'#2#1#0#8'TListBox'#16'AvailableListBox'#4'Left'
+  +#2#6#6'Height'#3#230#0#3'Top'#2#6#5'Width'#3#239#0#5'Align'#7#8'alClient'#20
+  +'BorderSpacing.Around'#2#6#16'ClickOnSelChange'#8#11'MultiSelect'#9#10'OnDbl'
+  +'Click'#7#24'AvailableListBoxDblClick'#17'OnSelectionChange'#7#31'AvailableL'
+  +'istBoxSelectionChange'#8'TabOrder'#2#0#0#0#7'TButton'#18'AddToInstallButton'
+  +#4'Left'#2#6#6'Height'#2#25#3'Top'#3#242#0#5'Width'#3#239#0#5'Align'#7#8'alB'
+  +'ottom'#20'BorderSpacing.Around'#2#6#7'Caption'#6#18'AddToInstallButton'#7'O'
+  +'nClick'#7#23'AddToInstallButtonClick'#8'TabOrder'#2#1#0#0#0#9'TGroupBox'#15
+  +'PkgInfoGroupBox'#4'Left'#2#7#6'Height'#2'U'#3'Top'#3'2'#1#5'Width'#3#3#2#7
+  +'Anchors'#11#6'akLeft'#7'akRight'#8'akBottom'#0#7'Caption'#6#15'PkgInfoGroup'
+  +'Box'#12'ClientHeight'#2'C'#11'ClientWidth'#3#255#1#8'TabOrder'#2#2#0#5'TMem'
+  +'o'#11'PkgInfoMemo'#6'Height'#2'C'#5'Width'#3#255#1#5'Align'#7#8'alClient'#8
+  +'ReadOnly'#9#10'ScrollBars'#7#14'ssAutoVertical'#8'TabOrder'#2#0#0#0#0#7'TBi'
+  +'tBtn'#12'CancelButton'#23'AnchorSideRight.Control'#7#5'Owner'#20'AnchorSide'
+  +'Right.Side'#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#5'Owner'#21'Ancho'
+  +'rSideBottom.Side'#7#9'asrBottom'#4'Left'#3#158#1#6'Height'#2#26#3'Top'#3#153
+  +#1#5'Width'#2'm'#7'Anchors'#11#7'akRight'#8'akBottom'#0#8'AutoSize'#9#20'Bor'
+  +'derSpacing.Around'#2#6#6'Cancel'#9#7'Caption'#6#12'CancelButton'#10'Glyph.D'
+  +'ata'#10':'#4#0#0'6'#4#0#0'BM6'#4#0#0#0#0#0#0'6'#0#0#0'('#0#0#0#16#0#0#0#16#0
+  +#0#0#1#0' '#0#0#0#0#0#0#4#0#0'd'#0#0#0'd'#0#0#0#0#0#0#0#0#0#0#0#255#255#255#0
+  +#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255
+  +#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255
+  +#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0
+  +#255#255#255#0#255#255#255#0'?='#237'A;8'#235#8#255#255#255#0#255#255#255#0
+  +#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0'!'#31#227#8#30#28
+  +#226'A'#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0
+  +'JG'#240'AOL'#242#255'@>'#237#253'<9'#235#8#255#255#255#0#255#255#255#0#255
+  +#255#255#0#255#255#255#0'''%'#229#8'$"'#228#252'1/'#234#255#31#29#226'A'#255
+  +#255#255#0#255#255#255#0#255#255#255#0'TQ'#243'AXV'#245#255'ca'#250#255'XU'
+  +#246#255'A?'#237#252'=:'#236#8#255#255#255#0#255#255#255#0'0-'#231#8',*'#230
+  +#252'A?'#241#255'LJ'#246#255'1/'#234#255#31#29#226'A'#255#255#255#0#255#255
+  +#255#0'YV'#245'+[X'#246#255'eb'#250#255'qp'#255#255'YV'#246#255'B@'#238#252
+  +'>;'#236#8'97'#235#8'52'#233#252'GE'#242#255'cb'#255#255'JH'#244#255'/-'#233
+  +#255'" '#227'+'#255#255#255#0#255#255#255#0#255#255#255#0'ZW'#245'+[Y'#246
+  +#255'fc'#250#255'tq'#255#255'ZX'#246#255'CA'#238#252'><'#236#253'PM'#244#255
+  +'hg'#255#255'PN'#245#255'64'#235#255'*'''#229'+'#255#255#255#0#255#255#255#0
+  +#255#255#255#0#255#255#255#0#255#255#255#0'[X'#246'+\Z'#246#255'gd'#250#255
+  +'tr'#255#255'sp'#255#255'pn'#255#255'nl'#255#255'WU'#247#255'?='#238#255'20'
+  ,#232'+'#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0
+  +#255#255#255#0#255#255#255#0'\Y'#246'+]['#247#255'yv'#255#255'YV'#255#255'WT'
+  +#255#255'rp'#255#255'HF'#240#255'<9'#235'+'#255#255#255#0#255#255#255#0#255
+  +#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255
+  +#255#0'a^'#248#8']Z'#246#253'}y'#255#255'^['#255#255'[X'#255#255'vt'#255#255
+  +'FC'#239#253'A?'#237#8#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255
+  +#0#255#255#255#0#255#255#255#0#255#255#255#0'ig'#251#8'fc'#249#252'pm'#251
+  +#255#128'~'#255#255'~{'#255#255'|y'#255#255'yw'#255#255'^\'#247#255'GD'#239
+  +#252'B@'#238#8#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255
+  +#255#255#0'qn'#253#8'nk'#252#252'wt'#253#255#134#130#255#255'vs'#252#255'db'
+  +#248#255'`]'#247#255'mj'#250#255'{y'#255#255'`]'#247#255'HE'#239#252'CA'#238
+  +#8#255#255#255#0#255#255#255#0#255#255#255#0'vs'#255#8'tq'#254#253'}z'#254
+  +#255#138#135#255#255'|y'#253#255'li'#251#255'ca'#249'+_\'#247'+a^'#248#255'n'
+  +'l'#250#255'}z'#255#255'a_'#247#255'IF'#240#252'DA'#238#5#255#255#255#0#255
+  +#255#255#0'wt'#255#31'zw'#255#255#129'~'#255#255#129'~'#254#255'tq'#253#255
+  +'li'#251'+'#255#255#255#0#255#255#255#0'`]'#247'+b_'#248#255'om'#251#255'~|'
+  +#255#255'b_'#248#255'JG'#240'oEB'#238#2#255#255#255#0#255#255#255#0'wt'#255
+  +#31'zw'#255#255'yv'#254#255'ro'#253'+'#255#255#255#0#255#255#255#0#255#255
+  +#255#0#255#255#255#0'a^'#248'+da'#248#255'jh'#249#255'TQ'#243#168'OM'#242')'
+  +#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0'wt'#255#31'wt'#255
+  +'+'#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255
+  +#255#255#0'b_'#248'+]['#247'oYV'#245'>'#255#255#255#0#255#255#255#0#255#255
+  +#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0
+  +#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255
+  +#255#255#0'c`'#248#10#255#255#255#0#255#255#255#0#255#255#255#0#11'ModalResu'
+  +'lt'#2#2#9'NumGlyphs'#2#0#8'TabOrder'#2#3#0#0#7'TBitBtn'#17'SaveAndExitButto'
+  +'n'#23'AnchorSideRight.Control'#7#12'CancelButton'#24'AnchorSideBottom.Contr'
+  +'ol'#7#5'Owner'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#3#14#1#6'He'
+  +'ight'#2#26#3'Top'#3#153#1#5'Width'#3#138#0#7'Anchors'#11#7'akRight'#8'akBot'
+  +'tom'#0#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#17'SaveAndEx'
+  +'itButton'#10'Glyph.Data'#10':'#4#0#0'6'#4#0#0'BM6'#4#0#0#0#0#0#0'6'#0#0#0'('
+  +#0#0#0#16#0#0#0#16#0#0#0#1#0' '#0#0#0#0#0#0#4#0#0'd'#0#0#0'd'#0#0#0#0#0#0#0#0
+  +#0#0#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0
+  +#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#29'c'#155#22#25'`'
+  +#152'9'#20']'#149'b'#16'Z'#146#136#13'X'#144#164#19'\'#146#252#12'W'#143#237
+  +#153#153#153#255'qqq'#255'TTT'#255'QQQ'#255'OOO'#255'LLL'#255'JJJ'#255'GGG'
+  +#255'EEE'#255'%g'#157#255'2t'#168#255'=|'#175#255'G'#132#181#255'N'#138#186
+  +#255'>~'#173#255#12'W'#143#234#255#255#255#0#255#255#255#0'XXX'#255#162#162
+  +#162#255#162#162#162#255#163#163#163#255#164#164#164#255#164#164#164#255#165
+  +#165#165#255'/o'#165#255'x'#171#210#255'x'#171#211#255's'#167#209#255'i'#160
+  +#205#255'@'#174#255#15'Y'#145#234#255#255#255#0#255#255#255#0'\\\'#255#161
+  +#161#161#255'<s@'#255#160#161#161#255#163#163#163#255#163#163#163#255#164#164
+  +#164#255'6t'#170#255'}'#175#212#255'['#154#201#255'T'#149#199#255'X'#150#200
+  +#255'A'#128#174#255#19'\'#148#234#255#255#255#0#255#255#255#0'```'#255#160
+  +#160#160#255'=vA'#255'6q9'#255#162#162#162#255#162#162#162#255#163#163#163
+  +#255'=y'#176#255#130#179#215#255'b'#159#204#255'Z'#154#201#255'^'#155#202#255
+  +'C'#129#175#255#25'`'#152#234'7'#130'>'#255'4~;'#255'1y7'#255'.u4'#255'I'#145
+  +'P'#255'F'#143'L'#255'9s='#255#161#161#161#255#162#162#162#255'E~'#180#255
+  +#136#183#217#255'g'#163#207#255'a'#158#204#255'c'#159#204#255'E'#131#177#255
+  +#31'd'#156#234';'#135'B'#255#137#203#146#255#132#200#141#255#128#198#136#255
+  +'{'#195#131#255'w'#193''#255'G'#143'M'#255';t?'#255#161#161#161#255'L'#132
+  +#186#255#141#187#219#255'n'#168#209#255'f'#166#209#255'_'#180#223#255'G'#133
+  +#177#255'%i'#161#234'>'#139'F'#255#143#206#153#255'}'#198#135#255'x'#195#129
+  +#255's'#192'|'#255't'#192'|'#255'y'#194#129#255'I'#144'O'#255'TW'#255'T'#137
+  +#191#255#148#191#221#255'u'#173#212#255'c'#184#225#255'K'#212#255#255'B'#139
+  +#184#255',n'#166#234'A'#144'J'#255#148#210#159#255#145#208#154#255#141#205
+  +#150#255#137#203#146#255#132#200#141#255'Q'#152'X'#255'A|F'#255#159#159#159
+  +#255'Z'#142#196#255#152#195#224#255'|'#179#215#255't'#175#214#255'^'#196#237
+  +#255'K'#136#179#255'4s'#171#234'D'#148'M'#255'B'#145'K'#255'?'#141'H'#255'='
+  +#137'E'#255']'#164'e'#255'Z'#160'a'#255'E'#131'K'#255#158#158#158#255#158#158
+  +#158#255'`'#146#201#255#158#199#226#255#131#184#218#255'}'#180#215#255'~'#179
+  +#215#255'O'#137#180#255';y'#177#234#255#255#255#0#255#255#255#0'www'#255#154
+  +#154#154#255'='#138'E'#255'I'#138'O'#255#156#156#156#255#157#157#157#255#157
+  +#157#157#255'f'#150#204#255#162#203#227#255#137#189#220#255#131#185#218#255
+  ,#132#185#218#255'Q'#139#181#255'C~'#182#234#255#255#255#0#255#255#255#0'zzz'
+  +#255#153#153#153#255'R'#145'Y'#255#153#154#153#255#155#155#155#255#156#156
+  +#156#255#156#156#156#255'l'#154#208#255#167#206#229#255#143#193#223#255#137
+  +#189#220#255#139#189#220#255'S'#141#182#255'K'#132#188#234#255#255#255#0#255
+  +#255#255#0'}}}'#255#153#153#153#255#153#153#153#255#154#154#154#255#154#154
+  +#154#255#155#155#155#255#155#155#155#255'o'#157#211#255#170#209#231#255#171
+  +#209#231#255#152#199#225#255#145#194#222#255'V'#143#183#255'R'#137#193#234
+  +#255#255#255#0#255#255#255#0#128#128#128#255'~~~'#255'|||'#255'zzz'#255'www'
+  +#255'uuu'#255'rrr'#255'q'#158#212#255'o'#158#214#255#135#178#220#255#171#211
+  +#232#255#169#208#230#255'X'#144#184#255'Y'#142#198#234#255#255#255#0#255#255
+  +#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0
+  +#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0'p'#158#214#219'm'
+  +#156#212#255#133#177#218#255'Z'#145#185#255'`'#147#203#234#255#255#255#0#255
+  +#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255
+  +#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0
+  +#255#255#255#0'm'#156#212#137'j'#154#210#251'f'#151#207#238#9'NumGlyphs'#2#0
+  +#7'OnClick'#7#22'SaveAndExitButtonClick'#8'TabOrder'#2#4#0#0#7'TBitBtn'#20'S'
+  +'aveAndRebuildButton'#23'AnchorSideRight.Control'#7#17'SaveAndExitButton'#24
+  +'AnchorSideBottom.Control'#7#5'Owner'#21'AnchorSideBottom.Side'#7#9'asrBotto'
+  +'m'#4'Left'#2'm'#6'Height'#2#26#3'Top'#3#153#1#5'Width'#3#155#0#7'Anchors'#11
+  +#7'akRight'#8'akBottom'#0#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Capti'
+  +'on'#6#20'SaveAndRebuildButton'#10'Glyph.Data'#10':'#4#0#0'6'#4#0#0'BM6'#4#0
+  +#0#0#0#0#0'6'#0#0#0'('#0#0#0#16#0#0#0#16#0#0#0#1#0' '#0#0#0#0#0#0#4#0#0'd'#0
+  +#0#0'd'#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
+  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
+  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
+  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
+  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#190'zE'#255#190'zE'#255#190'zE'#255#0#0#0#0#0#0
+  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#190'zE'
+  +#255#190'zE'#255'xU9X'#190'zE'#255#227#205#188#255#190'zE'#255'xU9X'#190'zE'
+  +#255#190'zE'#255#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#190'zE'#255
+  +#227#205#188#255#210#167#134#255#190'zE'#255#199#144'd'#255#218#184#157#255
+  +#199#144'd'#255#190'zE'#255#210#167#134#255#227#205#188#255#190'zE'#255#0#0#0
+  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#190'zE'#255#210#167#134#255#218#184#157
+  +#255#218#184#157#255#218#184#157#255#218#184#157#255#218#184#157#255#218#184
+  +#157#255#218#184#157#255#210#167#134#255#190'zE'#255#0#0#0#0#0#0#0#0#0#0#0#0
+  +#0#0#0#0#0#0#0#0'xU9X'#190'zE'#255#227#205#188#255#207#161'|'#255#189'L'#248
+  +#195#134'V'#255#186'zF'#244#213#174#143#255#218#184#157#255#190'zE'#255'xU9X'
+  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#190'zE'#255#190'zE'#255#199#144'd'#255#218
+  +#184#157#255#189'L'#248#183#130'V'#205'xU9Y'#165'oC'#192#186'zF'#244#218#184
+  +#157#255#199#144'd'#255#190'zE'#255#190'zE'#255#0#0#0#0#0#0#0#0#0#0#0#0#190
+  +'zE'#255#227#205#188#255#218#184#157#255#218#184#157#255#195#134'V'#255'xU9Y'
+  +#0#0#0#0'xU9Y'#195#134'V'#255#218#184#157#255#218#184#157#255#227#205#188#255
+  +#190'zE'#255#0#0#0#0#0#0#0#0#0#0#0#0#190'zE'#255#190'zE'#255#199#144'd'#255
+  +#218#184#157#255#186'zF'#244#156'kB'#174'xU9Y'#143'c?'#151#186'|I'#238#218
+  +#184#157#255#199#144'd'#255#190'zE'#255#190'zE'#255#0#0#0#0#0#0#0#0#0#0#0#0#0
+  +#0#0#0'xU9X'#190'zE'#255#218#184#157#255#207#161'|'#255#186'zF'#244#195#134
+  +'V'#255#186'zF'#244#209#165#130#255#218#184#157#255#190'zE'#255'xU9X'#0#0#0#0
+  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#190'zE'#255#210#167#134#255#218#184#157#255
+  +#218#184#157#255#218#184#157#255#218#184#157#255#218#184#157#255#218#184#157
+  +#255#218#184#157#255#210#167#134#255#190'zE'#255#0#0#0#0#0#0#0#0#0#0#0#0#0#0
+  +#0#0#0#0#0#0#190'zE'#255#227#205#188#255#210#167#134#255#190'zE'#255#199#144
+  +'d'#255#218#184#157#255#199#144'd'#255#190'zE'#255#210#167#134#255#227#205
+  +#188#255#190'zE'#255#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0'xU9X'#190'zE'
+  +#255#190'zE'#255'xU9X'#190'zE'#255#227#205#188#255#190'zE'#255'xU9X'#190'zE'
+  +#255#190'zE'#255#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
+  +#0#0#0#0#0#0#0#0#0#0#190'zE'#255#190'zE'#255#190'zE'#255#0#0#0#0#0#0#0#0#0#0
+  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
+  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
+  +#0#0#0#0#0#0#9'NumGlyphs'#2#0#7'OnClick'#7#18'InstallButtonClick'#8'TabOrder'
+  +#2#5#0#0#0
 ]);
diff --git a/packager/installpkgsetdlg.pas b/packager/installpkgsetdlg.pas
index 9cc7b7f4b6..6b987fcf8b 100644
--- a/packager/installpkgsetdlg.pas
+++ b/packager/installpkgsetdlg.pas
@@ -54,15 +54,15 @@ type
     AddToInstallButton: TButton;
     AvailableListBox: TListBox;
     AvailablePkgGroupBox: TGroupBox;
-    CancelButton: TButton;
+    CancelButton: TBitBtn;
     ExportButton: TButton;
     PkgInfoMemo: TMemo;
     PkgInfoGroupBox: TGroupBox;
     ImportButton: TButton;
-    SaveAndRebuildButton: TButton;
+    SaveAndExitButton: TBitBtn;
     InstallListBox: TListBox;
     InstallPkgGroupBox: TGroupBox;
-    SaveAndExitButton: TButton;
+    SaveAndRebuildButton: TBitBtn;
     UninstallButton: TButton;
     procedure AddToInstallButtonClick(Sender: TObject);
     procedure AvailableListBoxDblClick(Sender: TObject);