From b2f5fb591e24a5f219847b49286188d17256d703 Mon Sep 17 00:00:00 2001 From: juha Date: Sat, 12 Jul 2014 11:30:15 +0000 Subject: [PATCH] Packager: Add OnShow handler in Install/uninstall packages dlg to update (filter)-text. Issue #26433 git-svn-id: trunk@45840 - --- packager/installpkgsetdlg.lfm | 2 +- packager/installpkgsetdlg.pas | 25 ++++++++++++++++--------- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/packager/installpkgsetdlg.lfm b/packager/installpkgsetdlg.lfm index 0b48b1cc68..6381419b19 100644 --- a/packager/installpkgsetdlg.lfm +++ b/packager/installpkgsetdlg.lfm @@ -13,6 +13,7 @@ object InstallPkgSetDialog: TInstallPkgSetDialog OnCreate = InstallPkgSetDialogCreate OnDestroy = InstallPkgSetDialogDestroy OnResize = InstallPkgSetDialogResize + OnShow = InstallPkgSetDialogShow Position = poScreenCenter LCLVersion = '1.3' object InstallPkgGroupBox: TGroupBox @@ -167,7 +168,6 @@ object InstallPkgSetDialog: TInstallPkgSetDialog Height = 25 Top = 3 Width = 255 - UseFormActivate = True ButtonWidth = 23 NumGlyphs = 1 Anchors = [akTop, akLeft, akRight] diff --git a/packager/installpkgsetdlg.pas b/packager/installpkgsetdlg.pas index a90013db9f..7e3a2f08f6 100644 --- a/packager/installpkgsetdlg.pas +++ b/packager/installpkgsetdlg.pas @@ -92,6 +92,7 @@ type procedure InstallTreeViewDblClick(Sender: TObject); procedure InstallPkgSetDialogCreate(Sender: TObject); procedure InstallPkgSetDialogDestroy(Sender: TObject); + procedure InstallPkgSetDialogShow(Sender: TObject); procedure InstallPkgSetDialogResize(Sender: TObject); procedure InstallTreeViewSelectionChanged(Sender: TObject); procedure SaveAndExitButtonClick(Sender: TObject); @@ -225,6 +226,21 @@ begin UpdateButtonStates; end; +procedure TInstallPkgSetDialog.InstallPkgSetDialogDestroy(Sender: TObject); +begin + LPKInfoCache.EndLPKReader; + LPKInfoCache.RemoveOnQueueEmpty(@OnAllLPKParsed); + ClearNewInstalledPackages; + FreeAndNil(FNewInstalledPackages); + IdleConnected:=false; +end; + +procedure TInstallPkgSetDialog.InstallPkgSetDialogShow(Sender: TObject); +begin + InstalledFilterEdit.Filter:=''; // (filter) - text is shown after this. + AvailableFilterEdit.Filter:=''; +end; + procedure TInstallPkgSetDialog.SaveAndRebuildButtonClick(Sender: TObject); begin if not CheckSelection then exit; @@ -398,15 +414,6 @@ begin AddToInstall; end; -procedure TInstallPkgSetDialog.InstallPkgSetDialogDestroy(Sender: TObject); -begin - LPKInfoCache.EndLPKReader; - LPKInfoCache.RemoveOnQueueEmpty(@OnAllLPKParsed); - ClearNewInstalledPackages; - FreeAndNil(FNewInstalledPackages); - IdleConnected:=false; -end; - procedure TInstallPkgSetDialog.InstallPkgSetDialogResize(Sender: TObject); var w: Integer;