paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-11-03 23:59:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

* First patches from Pascal RiekenBerg (Bug ID #32320)

Browse Source 
git-svn-id: trunk@55736 -
This commit is contained in:
michael 2017-08-23 07:22:00 +00:00
parent 99922e83ea
commit 0d932901b9
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
components/fpreport/design/frmreportdesignermain.lfm
View File

@ -804,6 +804,7 @@ object FPReportDesignerForm: TFPReportDesignerForm
Caption = 'Report Data' Caption = 'Report Data'
ImageIndex = 35 ImageIndex = 35
OnExecute = AReportDataExecute OnExecute = AReportDataExecute
OnUpdate = AReportDataUpdate
end end
end end
object SDReport: TSaveDialog object SDReport: TSaveDialog

8
components/fpreport/design/frmreportdesignermain.pp
View File

@ -225,6 +225,7 @@ type
procedure APreviewExecute(Sender: TObject); procedure APreviewExecute(Sender: TObject);
procedure APreviewUpdate(Sender: TObject); procedure APreviewUpdate(Sender: TObject);
procedure AReportDataExecute(Sender: TObject); procedure AReportDataExecute(Sender: TObject);
procedure AReportDataUpdate(Sender: TObject);
procedure AReportPropertiesExecute(Sender: TObject); procedure AReportPropertiesExecute(Sender: TObject);
procedure AReportVariablesExecute(Sender: TObject); procedure AReportVariablesExecute(Sender: TObject);
procedure AResizeExecute(Sender: TObject); procedure AResizeExecute(Sender: TObject);
@ -748,6 +749,7 @@ begin
ODR:=CurrentDesigner.Objects.DeleteSelection; ODR:=CurrentDesigner.Objects.DeleteSelection;
if (ODR=odrPage) then if (ODR=odrPage) then
PCReport.ActivePage.Free; PCReport.ActivePage.Free;
FOI.RefreshReportTree;
end; end;
procedure TFPReportDesignerForm.ADeleteUpdate(Sender: TObject); procedure TFPReportDesignerForm.ADeleteUpdate(Sender: TObject);
@ -852,6 +854,7 @@ begin
p.Margins.Right := 20; p.Margins.Right := 20;
p.Margins.Bottom := 20; p.Margins.Bottom := 20;
FReport.AddPage(P); FReport.AddPage(P);
FOI.RefreshReportTree;
Result:=True Result:=True
end; end;
end; end;
@ -900,6 +903,11 @@ begin
end; end;
end; end;
procedure TFPReportDesignerForm.AReportDataUpdate(Sender: TObject);
begin
(Sender as TAction).Enabled:=Assigned(FReport);
end;
procedure TFPReportDesignerForm.CreateReportDataSets; procedure TFPReportDesignerForm.CreateReportDataSets;
Var Var