diff options
| author | Graeme Geldenhuys <graemeg@gmail.com> | 2015-02-06 14:57:48 +0000 |
|---|---|---|
| committer | Graeme Geldenhuys <graemeg@gmail.com> | 2015-02-06 14:57:48 +0000 |
| commit | ba352f05a5487fd11f577e29a93bfc9faa2e5d53 (patch) | |
| tree | 7d9016fbe2b94442d751883d1a8d169becb8bdfb | |
| parent | 41b61baf6e6aa3d91ee2eddf74e3438dbd8d3833 (diff) | |
| parent | e58067a5dc7e49538b53860aa11c33ffdecc72d9 (diff) | |
| download | fpGUI-ba352f05a5487fd11f577e29a93bfc9faa2e5d53.tar.xz | |
Merge remote-tracking branch 'jmarcl/reporting' into develop
Removes unnecessary colors from the demo.
| -rw-r--r-- | examples/gui/reporting/u_demo.pas | 3 | ||||
| -rw-r--r-- | src/reportengine/u_command.pas | 2 | ||||
| -rw-r--r-- | src/reportengine/u_pdf.pas | 2 | ||||
| -rw-r--r-- | src/reportengine/u_report.pas | 2 |
4 files changed, 3 insertions, 6 deletions
diff --git a/examples/gui/reporting/u_demo.pas b/examples/gui/reporting/u_demo.pas index 349b0ad1..adad8515 100644 --- a/examples/gui/reporting/u_demo.pas +++ b/examples/gui/reporting/u_demo.pas @@ -1279,12 +1279,10 @@ begin Ckb_Preferences := CreateCheckBox(Self, 650, 30, 'FitWindow preference'); Ckb_Preferences.OnChange := @Ckb_PreferencesChange; P_Zoom := CreatePanel(Self, 650, 60, 200, 60, 'Zoom', bsRaised, taCenter, tlTop, 5); - P_Zoom.BackgroundColor := clPaleGreen; SE_Zoom := CreateSpinEdit(P_Zoom, 10, 25, 55, 20, 20, 200, 1, 5, 100); SE_Zoom.OnChange := @SE_ZoomChange; L_Zoom := CreateLabel(P_Zoom, 70, 25, '%'); P_Layout := CreatePanel(Self, 650, 130, 200, 110, 'Layout', bsRaised, taCenter, tlTop, 5); - P_Layout.BackgroundColor := clPaleGreen; RB_Single := CreateRadiobutton(P_Layout, 10, 25, 'Single'); RB_Single.OnChange := @P_LayoutRBChange; RB_Two := CreateRadiobutton(P_Layout, 10, 50, 'Two pages'); @@ -1295,7 +1293,6 @@ begin Ckb_Preferences.Checked := True; RB_Single.Checked := True; Bt_Exit := CreateButton(Self, 375, 550, 150, 'Exit', @Bt_ExitClick, 'stdimg.exit'); - Bt_Exit.BackgroundColor := clTomato; ZoomValue := '100'; Randomize; for Cpt := 0 to 18 do diff --git a/src/reportengine/u_command.pas b/src/reportengine/u_command.pas index 8ef6e406..c6746d0d 100644 --- a/src/reportengine/u_command.pas +++ b/src/reportengine/u_command.pas @@ -16,7 +16,7 @@ the objects in memory to produce either the preview or pdf files. The PDF Reporting Engine was originally written by - Jean-Marc Levecque <jean-marc.levecque@jmlesite.fr> + Jean-Marc Levecque <jmarc.levecque@jmlesite.web4me.fr> } unit U_Command; diff --git a/src/reportengine/u_pdf.pas b/src/reportengine/u_pdf.pas index 9f31bada..f6222cf2 100644 --- a/src/reportengine/u_pdf.pas +++ b/src/reportengine/u_pdf.pas @@ -16,7 +16,7 @@ produces the PDF file. The PDF Reporting Engine was originally written by - Jean-Marc Levecque <jean-marc.levecque@jmlesite.fr> + Jean-Marc Levecque <jmarc.levecque@jmlesite.web4me.fr> } unit U_Pdf; diff --git a/src/reportengine/u_report.pas b/src/reportengine/u_report.pas index 6fd2ac0b..23004231 100644 --- a/src/reportengine/u_report.pas +++ b/src/reportengine/u_report.pas @@ -16,7 +16,7 @@ the user program. The PDF Reporting Engine was originally written by - Jean-Marc Levecque <jean-marc.levecque@jmlesite.fr> + Jean-Marc Levecque <jmarc.levecque@jmlesite.web4me.fr> } unit U_Report; |