From c6b1894e691ebe5e8927e5d56d865ef6dcebb932 Mon Sep 17 00:00:00 2001 From: michael Date: Tue, 27 Feb 2018 12:43:16 +0000 Subject: [PATCH] * Cannot add page if there is no report (bug ID #33234) git-svn-id: trunk@57387 - --- components/fpreport/design/frmfpreportdesignermain.lfm | 5 +++-- components/fpreport/design/frmfpreportdesignermain.pp | 6 ++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/components/fpreport/design/frmfpreportdesignermain.lfm b/components/fpreport/design/frmfpreportdesignermain.lfm index 4a12342d61..3969a7eef5 100644 --- a/components/fpreport/design/frmfpreportdesignermain.lfm +++ b/components/fpreport/design/frmfpreportdesignermain.lfm @@ -634,6 +634,7 @@ object FPReportDesignerForm: TFPReportDesignerForm Caption = 'Add Page' ImageIndex = 13 OnExecute = AAddPageExecute + OnUpdate = AAddPageUpdate end object AAlignleft: TAction Tag = 1 @@ -2076,7 +2077,7 @@ object FPReportDesignerForm: TFPReportDesignerForm top = 348 end object PMRecent: TPopupMenu - Left = 467 - Top = 209 + left = 467 + top = 209 end end diff --git a/components/fpreport/design/frmfpreportdesignermain.pp b/components/fpreport/design/frmfpreportdesignermain.pp index 6cd3a51f77..42d2907f7a 100644 --- a/components/fpreport/design/frmfpreportdesignermain.pp +++ b/components/fpreport/design/frmfpreportdesignermain.pp @@ -217,6 +217,7 @@ type procedure AAddPageExecute(Sender: TObject); procedure AAddBandExecute(Sender: TObject); procedure AAddBandUpdate(Sender: TObject); + procedure AAddPageUpdate(Sender: TObject); procedure AAddShapeExecute(Sender: TObject); procedure AAlignExecute(Sender: TObject); procedure AAlignUpdate(Sender: TObject); @@ -738,6 +739,11 @@ begin (Sender as TAction).Enabled:=(rdoAllowBands in DesignOptions) and TOK; end; +procedure TFPReportDesignerForm.AAddPageUpdate(Sender: TObject); +begin + (Sender as Taction).Enabled:=Assigned(FReport); +end; + procedure TFPReportDesignerForm.AAddCheckBoxExecute(Sender: TObject); begin CurrentDesigner.AddElement(TFPReportCheckbox);