From 55aac0f6fe30c0348817bf5fca42ad5a899daefb Mon Sep 17 00:00:00 2001 From: juha Date: Sat, 1 Oct 2011 19:26:44 +0000 Subject: [PATCH] Packager: connect event handlers to buttons in AddToPackageDlg. Update FilesAddButton.Enabled. git-svn-id: trunk@32593 - --- packager/addtopackagedlg.lfm | 17 +++++++---------- packager/addtopackagedlg.pas | 12 ++++++------ 2 files changed, 13 insertions(+), 16 deletions(-) diff --git a/packager/addtopackagedlg.lfm b/packager/addtopackagedlg.lfm index e8d247bc06..6f9c532751 100644 --- a/packager/addtopackagedlg.lfm +++ b/packager/addtopackagedlg.lfm @@ -13,13 +13,15 @@ object AddToPackageDlg: TAddToPackageDlg OnDestroy = FormDestroy OnKeyDown = AddToPackageDlgKeyDown Position = poScreenCenter - LCLVersion = '0.9.29' + LCLVersion = '0.9.31' object NoteBook: TPageControl Left = 0 Height = 322 Top = 0 Width = 658 + ActivePage = AddFilesPage Align = alClient + TabIndex = 3 TabOrder = 0 object NewFilePage: TTabSheet Caption = 'New File' @@ -44,8 +46,6 @@ object AddToPackageDlg: TAddToPackageDlg end object NewFileDescriptionGroupBox: TGroupBox AnchorSideLeft.Control = NewFileTreeView - AnchorSideLeft.Side = asrBottom - AnchorSideRight.Side = asrBottom Left = 249 Height = 249 Top = 0 @@ -79,7 +79,6 @@ object AddToPackageDlg: TAddToPackageDlg ClientWidth = 656 TabOrder = 2 object NewFileOkButton: TBitBtn - AnchorSideBottom.Side = asrBottom Left = 342 Height = 29 Top = 6 @@ -375,7 +374,6 @@ object AddToPackageDlg: TAddToPackageDlg ClientWidth = 654 TabOrder = 8 object NewComponentButton: TBitBtn - AnchorSideTop.Side = asrBottom Left = 228 Height = 27 Top = 6 @@ -497,7 +495,6 @@ object AddToPackageDlg: TAddToPackageDlg Top = 171 Width = 28 BorderSpacing.Top = 6 - Color = clBtnFace NumGlyphs = 0 OnClick = ComponentIconSpeedButtonClick ShowHint = True @@ -572,7 +569,6 @@ object AddToPackageDlg: TAddToPackageDlg TabOrder = 0 end object NewDependButton: TBitBtn - AnchorSideTop.Side = asrBottom Left = 326 Height = 29 Top = 6 @@ -723,7 +719,6 @@ object AddToPackageDlg: TAddToPackageDlg Caption = 'Type' Width = 436 end> - ItemIndex = -1 MultiSelect = True TabOrder = 0 ViewStyle = vsReport @@ -740,9 +735,8 @@ object AddToPackageDlg: TAddToPackageDlg ClientWidth = 654 TabOrder = 1 object FilesBrowseButton: TButton - AnchorSideBottom.Side = asrBottom - Left = -16 Height = 27 + Left = 48 Top = 6 Width = 139 Align = alRight @@ -762,6 +756,7 @@ object AddToPackageDlg: TAddToPackageDlg AutoSize = True BorderSpacing.Around = 6 Caption = 'FilesAddButton' + Enabled = False OnClick = FilesAddButtonClick TabOrder = 1 end @@ -776,6 +771,7 @@ object AddToPackageDlg: TAddToPackageDlg BorderSpacing.Around = 6 Caption = 'FilesShortenButton' NumGlyphs = 0 + OnClick = FilesShortenButtonClick TabOrder = 2 end object FilesDeleteButton: TBitBtn @@ -789,6 +785,7 @@ object AddToPackageDlg: TAddToPackageDlg BorderSpacing.Around = 6 Caption = 'FilesDeleteButton' NumGlyphs = 0 + OnClick = FilesDeleteButtonClick TabOrder = 3 end object FilesDirButton: TButton diff --git a/packager/addtopackagedlg.pas b/packager/addtopackagedlg.pas index 54c2a7232d..e43abbd905 100644 --- a/packager/addtopackagedlg.pas +++ b/packager/addtopackagedlg.pas @@ -545,9 +545,8 @@ var Filename: String; NewFileType: TPkgFileType; HasRegisterProc: boolean; - LastParams: TAddToPkgResult; + CurParams, LastParams: TAddToPkgResult; ok: Boolean; - CurParams: TAddToPkgResult; begin ok:=false; try @@ -630,6 +629,7 @@ begin LastParams:=CurParams; inc(i); end; + FilesAddButton.Enabled:=FilesListView.Items.Count>0; ok:=LastParams<>nil; finally if not ok then Params.Clear; @@ -677,6 +677,7 @@ begin end; end; InputHistories.StoreFileDialogSettings(OpenDialog); + FilesAddButton.Enabled:=FilesListView.Items.Count>0; finally OpenDialog.Free; end; @@ -689,6 +690,7 @@ begin for i:=FilesListView.Items.Count-1 downto 0 do if FilesListView.Items[i].Selected then FilesListView.Items.Delete(i); + FilesAddButton.Enabled:=FilesListView.Items.Count>0; end; procedure TAddToPackageDlg.FilesDirButtonClick(Sender: TObject); @@ -712,6 +714,7 @@ begin NewListItem.SubItems.Add(GetPkgFileTypeLocalizedName(NewPgkFileType)); end; end; + FilesAddButton.Enabled:=FilesListView.Items.Count>0; finally Files.Free; end; @@ -1163,10 +1166,7 @@ begin ShowHint:=true; Hint:=lisDeleteSelectedFiles; end; - - with FilesAddButton do begin - Caption:=lisA2PAddFilesToPackage; - end; + FilesAddButton.Caption:=lisA2PAddFilesToPackage; end; procedure TAddToPackageDlg.OnIterateComponentClasses(PkgComponent: TPkgComponent);