report tool: move some images into standard images list

3 files changed, 61 insertions, 235 deletions

diff --git a/extras/contributed/report_tool/demo/u_demo.pas b/extras/contributed/report_tool/demo/u_demo.pas
index 5f8d6cf4..7853e4b1 100644
--- a/extras/contributed/report_tool/demo/u_demo.pas
+++ b/extras/contributed/report_tool/demo/u_demo.pas
@@ -108,7 +108,7 @@ var
 implementation
 
 uses
-  U_Commande, U_Pdf, U_ReportImages;
+  U_Commande, U_Pdf, U_ReportImages{, U_DemoImages};
 
 var
   ChartValues: array[0..18] of Integer;
@@ -1448,7 +1448,6 @@ WindowTitle:= 'PDF demo';
 SetPosition(0, 0, 650, 550);
 WindowPosition:= wpScreenCenter;
 Sizeable:= False;
-CreateReportImages;
 fpgSetNamedColor(clWindowBackground,clPaleGreen);
 fpgSetNamedColor(clButtonFace,clCyan);
 fpgSetNamedColor(clText1,clBlue);
@@ -1457,53 +1456,53 @@ fpgSetNamedColor(clSelectionText,clDarkBlue);
 fpgSetNamedFont('Label1','bitstream vera sans-10');
 fpgSetNamedFont('Edit1','bitstream vera sans-10');
 L_Visu:= CreateLabel(Self,50,5,'Print to PDF',150,20,taCenter);
-Bt_PdfEmptyPage:= CreateButton(Self,50,30,150,'Empty page',@Bt_PdfEmptyPageClick,'repimg.Adobe_pdf');
-Bt_PdfSimpleText:= CreateButton(Self,50,70,150,'Simple text',@Bt_PdfSimpleTextClick,'repimg.Adobe_pdf');
-Bt_PdfMultiPages:= CreateButton(Self,50,110,150,'Multiple pages',@Bt_PdfMultiPagesClick,'repimg.Adobe_pdf');
-Bt_PdfMultiSections:= CreateButton(Self,50,150,150,'Multiple sections',@Bt_PdfMultiSectionsClick,'repimg.Adobe_pdf');
-Bt_PdfOutlines:= CreateButton(Self,50,190,150,'Outlines',@Bt_PdfOutlinesClick,'repimg.Adobe_pdf');
-Bt_PdfCadres:= CreateButton(Self,50,230,150,'Draw frames',@Bt_PdfCadresClick,'repimg.Adobe_pdf');
-Bt_PdfColor:= CreateButton(Self,50,270,150,'Show colors',@Bt_PdfColorClick,'repimg.Adobe_pdf');
-Bt_PdfLines:= CreateButton(Self,50,310,150,'Draw lines',@Bt_PdfLinesClick,'repimg.Adobe_pdf');
-Bt_PdfGrid:= CreateButton(Self,50,350,150,'Show grid',@Bt_PdfGridClick,'repimg.Adobe_pdf');
-Bt_PdfGraph:= CreateButton(Self,50,390,150,'Show graph',@Bt_PdfGraphClick,'repimg.Adobe_pdf');
-Bt_PdfSurf:= CreateButton(Self,50,430,150,'Show surface',@Bt_PdfSurfClick,'repimg.Adobe_pdf');
+Bt_PdfEmptyPage:= CreateButton(Self,50,30,150,'Empty page',@Bt_PdfEmptyPageClick,'stdimg.Adobe_pdf');
+Bt_PdfSimpleText:= CreateButton(Self,50,70,150,'Simple text',@Bt_PdfSimpleTextClick,'stdimg.Adobe_pdf');
+Bt_PdfMultiPages:= CreateButton(Self,50,110,150,'Multiple pages',@Bt_PdfMultiPagesClick,'stdimg.Adobe_pdf');
+Bt_PdfMultiSections:= CreateButton(Self,50,150,150,'Multiple sections',@Bt_PdfMultiSectionsClick,'stdimg.Adobe_pdf');
+Bt_PdfOutlines:= CreateButton(Self,50,190,150,'Outlines',@Bt_PdfOutlinesClick,'stdimg.Adobe_pdf');
+Bt_PdfCadres:= CreateButton(Self,50,230,150,'Draw frames',@Bt_PdfCadresClick,'stdimg.Adobe_pdf');
+Bt_PdfColor:= CreateButton(Self,50,270,150,'Show colors',@Bt_PdfColorClick,'stdimg.Adobe_pdf');
+Bt_PdfLines:= CreateButton(Self,50,310,150,'Draw lines',@Bt_PdfLinesClick,'stdimg.Adobe_pdf');
+Bt_PdfGrid:= CreateButton(Self,50,350,150,'Show grid',@Bt_PdfGridClick,'stdimg.Adobe_pdf');
+Bt_PdfGraph:= CreateButton(Self,50,390,150,'Show graph',@Bt_PdfGraphClick,'stdimg.Adobe_pdf');
+Bt_PdfSurf:= CreateButton(Self,50,430,150,'Show surface',@Bt_PdfSurfClick,'stdimg.Adobe_pdf');
 L_Pdf:= CreateLabel(Self,250,5,'Preview',150,20,taCenter);
-Bt_VisuEmptyPage:= CreateButton(Self,250,30,150,'Empty page',@Bt_VisuEmptyPageClick,'repimg.Preview');
-Bt_VisuSimpleText:= CreateButton(Self,250,70,150,'Simple text',@Bt_VisuSimpleTextClick,'repimg.Preview');
-Bt_VisuMultiPages:= CreateButton(Self,250,110,150,'Multiple pages',@Bt_VisuMultiPagesClick,'repimg.Preview');
-Bt_VisuMultiSections:= CreateButton(Self,250,150,150,'Multiple sections',@Bt_VisuMultiSectionsClick,'repimg.Preview');
-Bt_VisuOutlines:= CreateButton(Self,250,190,150,'Outlines',@Bt_VisuOutlinesClick,'repimg.Preview');
-Bt_VisuCadres:= CreateButton(Self,250,230,150,'Draw frames',@Bt_VisuCadresClick,'repimg.Preview');
-Bt_VisuColor:= CreateButton(Self,250,270,150,'Show colors',@Bt_VisuColorClick,'repimg.Preview');
-Bt_VisuLines:= CreateButton(Self,250,310,150,'Draw lines',@Bt_VisuLinesClick,'repimg.Preview');
-Bt_VisuGrid:= CreateButton(Self,250,350,150,'Show grid',@Bt_VisuGridClick,'repimg.Preview');
-Bt_VisuGraph:= CreateButton(Self,250,390,150,'Show graph',@Bt_VisuGraphClick,'repimg.Preview');
-Bt_VisuSurf:= CreateButton(Self,250,430,150,'Show surface',@Bt_VisuSurfClick,'repimg.Preview');
+Bt_VisuEmptyPage:= CreateButton(Self,250,30,150,'Empty page',@Bt_VisuEmptyPageClick,'stdimg.preview');
+Bt_VisuSimpleText:= CreateButton(Self,250,70,150,'Simple text',@Bt_VisuSimpleTextClick,'stdimg.preview');
+Bt_VisuMultiPages:= CreateButton(Self,250,110,150,'Multiple pages',@Bt_VisuMultiPagesClick,'stdimg.preview');
+Bt_VisuMultiSections:= CreateButton(Self,250,150,150,'Multiple sections',@Bt_VisuMultiSectionsClick,'stdimg.preview');
+Bt_VisuOutlines:= CreateButton(Self,250,190,150,'Outlines',@Bt_VisuOutlinesClick,'stdimg.preview');
+Bt_VisuCadres:= CreateButton(Self,250,230,150,'Draw frames',@Bt_VisuCadresClick,'stdimg.preview');
+Bt_VisuColor:= CreateButton(Self,250,270,150,'Show colors',@Bt_VisuColorClick,'stdimg.preview');
+Bt_VisuLines:= CreateButton(Self,250,310,150,'Draw lines',@Bt_VisuLinesClick,'stdimg.preview');
+Bt_VisuGrid:= CreateButton(Self,250,350,150,'Show grid',@Bt_VisuGridClick,'stdimg.preview');
+Bt_VisuGraph:= CreateButton(Self,250,390,150,'Show graph',@Bt_VisuGraphClick,'stdimg.preview');
+Bt_VisuSurf:= CreateButton(Self,250,430,150,'Show surface',@Bt_VisuSurfClick,'stdimg.preview');
 L_Print:= CreateLabel(Self,450,5,'Print to printer',150,20,taCenter);
-Bt_PrintEmptyPage:= CreateButton(Self,450,30,150,'Empty page',@Bt_PrintEmptyPageClick,'repimg.Imprimer');
+Bt_PrintEmptyPage:= CreateButton(Self,450,30,150,'Empty page',@Bt_PrintEmptyPageClick,'stdimg.print');
 Bt_PrintEmptyPage.Enabled:= False;
-Bt_PrintSimpleText:= CreateButton(Self,450,70,150,'Simple text',@Bt_PrintSimpleTextClick,'repimg.Imprimer');
+Bt_PrintSimpleText:= CreateButton(Self,450,70,150,'Simple text',@Bt_PrintSimpleTextClick,'stdimg.print');
 Bt_PrintSimpleText.Enabled:= False;
-Bt_PrintMultiPages:= CreateButton(Self,450,110,150,'Multiple pages',@Bt_PrintMultiPagesClick,'repimg.Imprimer');
+Bt_PrintMultiPages:= CreateButton(Self,450,110,150,'Multiple pages',@Bt_PrintMultiPagesClick,'stdimg.print');
 Bt_PrintMultiPages.Enabled:= False;
-Bt_PrintMultiSections:= CreateButton(Self,450,150,150,'Multiple sections',@Bt_PrintMultiSectionsClick,'repimg.Imprimer');
+Bt_PrintMultiSections:= CreateButton(Self,450,150,150,'Multiple sections',@Bt_PrintMultiSectionsClick,'stdimg.print');
 Bt_PrintMultiSections.Enabled:= False;
-Bt_PrintOutlines:= CreateButton(Self,450,190,150,'Outlines',@Bt_PrintOutlinesClick,'repimg.Imprimer');
+Bt_PrintOutlines:= CreateButton(Self,450,190,150,'Outlines',@Bt_PrintOutlinesClick,'stdimg.print');
 Bt_PrintOutlines.Enabled:= False;
-Bt_PrintCadres:= CreateButton(Self,450,230,150,'Draw frames',@Bt_PrintCadresClick,'repimg.Imprimer');
+Bt_PrintCadres:= CreateButton(Self,450,230,150,'Draw frames',@Bt_PrintCadresClick,'stdimg.print');
 Bt_PrintCadres.Enabled:= False;
-Bt_PrintColor:= CreateButton(Self,450,270,150,'Show colors',@Bt_PrintColorClick,'repimg.Imprimer');
+Bt_PrintColor:= CreateButton(Self,450,270,150,'Show colors',@Bt_PrintColorClick,'stdimg.print');
 Bt_PrintColor.Enabled:= False;
-Bt_PrintLines:= CreateButton(Self,450,310,150,'Draw lines',@Bt_PrintLinesClick,'repimg.Imprimer');
+Bt_PrintLines:= CreateButton(Self,450,310,150,'Draw lines',@Bt_PrintLinesClick,'stdimg.print');
 Bt_PrintLines.Enabled:= False;
-Bt_PrintGrid:= CreateButton(Self,450,350,150,'Show grid',@Bt_PrintGridClick,'repimg.Imprimer');
+Bt_PrintGrid:= CreateButton(Self,450,350,150,'Show grid',@Bt_PrintGridClick,'stdimg.print');
 Bt_PrintGrid.Enabled:= False;
-Bt_PrintGraph:= CreateButton(Self,450,390,150,'Show graph',@Bt_PrintGraphClick,'repimg.Imprimer');
+Bt_PrintGraph:= CreateButton(Self,450,390,150,'Show graph',@Bt_PrintGraphClick,'stdimg.print');
 Bt_PrintGraph.Enabled:= False;
-Bt_PrintSurf:= CreateButton(Self,450,430,150,'Show surface',@Bt_PrintSurfClick,'repimg.Imprimer');
+Bt_PrintSurf:= CreateButton(Self,450,430,150,'Show surface',@Bt_PrintSurfClick,'stdimg.print');
 Bt_PrintSurf.Enabled:= False;
-Bt_Fermer:= CreateButton(Self,450,500,150,'Fermer',@Bt_FermerClick,'repimg.Fermer');
+Bt_Fermer:= CreateButton(Self,450,500,150,'Fermer',@Bt_FermerClick,'stdimg.exit');
 Bt_Fermer.BackgroundColor:= clTomato;
 Randomize;
 for Cpt:= 0 to 18 do
diff --git a/extras/contributed/report_tool/reportengine/u_reportimages.pas b/extras/contributed/report_tool/reportengine/u_reportimages.pas
index af0433f4..5f25090e 100644
--- a/extras/contributed/report_tool/reportengine/u_reportimages.pas
+++ b/extras/contributed/report_tool/reportengine/u_reportimages.pas
@@ -24,28 +24,11 @@ uses
   fpg_main;
 
 procedure CreateReportImages;
+function DeleteReportImages: Boolean;
 
 implementation
 
 const
-  repimg_Fermer : Array[0..245] of byte = (
-      66, 77,246,  0,  0,  0,  0,  0,  0,  0,118,  0,  0,  0, 40,  0,  0,
-       0, 16,  0,  0,  0, 16,  0,  0,  0,  1,  0,  4,  0,  0,  0,  0,  0,
-     128,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-       0,  0,  0,  0,  0,  0,  0,  0,  0,128,  0,  0,128,  0,  0,  0,128,
-     128,  0,128,  0,  0,  0,128,  0,128,  0,128,128,  0,  0,192,192,192,
-       0,128,128,128,  0,  0,  0,255,  0,  0,255,  0,  0,  0,255,255,  0,
-     255,  0,  0,  0,255,  0,255,  0,255,255,  0,  0,255,255,255,  0, 51,
-       0,  0,  0,  0,  0,  3, 51, 51,  1,187,187,187,187,  3, 51, 51,  1,
-      27,187,187,187,  3, 51, 51,  1, 17,187,187,187,  3, 51, 51,  1, 17,
-      11,187,187,  3, 51, 51,  1, 17, 11,187,187,  3, 51, 51,  1, 17, 11,
-     187,187,  3, 51, 51,  1, 17, 11,187,187,  3, 51, 51,  1, 17, 11,187,
-     187,  3, 51, 51,  1, 17, 11,187,187,  3, 51, 51,  1, 17,176,187,187,
-       3, 51, 51,  1, 17, 11,187,187,  3, 51, 51,  1, 17, 11,187,187,  3,
-      51, 51,  1,225, 11,187,187,  3, 51, 51,  1,238, 11,187,187,  3, 51,
-      51,  0,  0,  0,  0,  0,  3, 51);
-
-const
   repimg_Fin : Array[0..245] of byte = (
       66, 77,246,  0,  0,  0,  0,  0,  0,  0,118,  0,  0,  0, 40,  0,  0,
        0, 16,  0,  0,  0, 16,  0,  0,  0,  1,  0,  4,  0,  0,  0,  0,  0,
@@ -89,24 +72,6 @@ const
        0);
 
 const
-  repimg_Imprimer : Array[0..245] of byte = (
-      66, 77,246,  0,  0,  0,  0,  0,  0,  0,118,  0,  0,  0, 40,  0,  0,
-       0, 16,  0,  0,  0, 16,  0,  0,  0,  1,  0,  4,  0,  0,  0,  0,  0,
-     128,  0,  0,  0, 18, 11,  0,  0, 18, 11,  0,  0, 16,  0,  0,  0, 16,
-       0,  0,  0,  0,  0,  0,  0,  0,  0,128,  0,  0,128,  0,  0,  0,128,
-     128,  0,128,  0,  0,  0,128,  0,128,  0,128,128,  0,  0,128,128,128,
-       0,192,192,192,  0,  0,  0,255,  0,192,192,192,  0,  0,255,255,  0,
-     255,  0,  0,  0,192,192,192,  0,255,255,  0,  0,255,255,255,  0,218,
-     218,218,218,218,218,218,218,173,  0,  0,  0,  0,  0, 13,173,208,136,
-     136,136,136,128,128,218,  0,  0,  0,  0,  0,  0,  8, 13,  8,136,136,
-     139,187,136,  0, 10,  8,136,136,135,119,136,  8, 13,  0,  0,  0,  0,
-       0,  0,  8,128,  8,136,136,136,136,128,128,128,208,  0,  0,  0,  0,
-       8,  8,  0,173, 15,255,255,255,240,128,128,218,208,240,  0,  0,240,
-       0, 10,173,160,255,255,255,255, 13,173,218,218, 15,  0,  0, 15, 10,
-     218,173,173, 15,255,255,255,240,173,218,218,208,  0,  0,  0,  0,218,
-     173,173,173,173,173,173,173,173);
-
-const
   repimg_Precedent : Array[0..245] of byte = (
       66, 77,246,  0,  0,  0,  0,  0,  0,  0,118,  0,  0,  0, 40,  0,  0,
        0, 16,  0,  0,  0, 16,  0,  0,  0,  1,  0,  4,  0,  0,  0,  0,  0,
@@ -178,171 +143,13 @@ const
      119,119,119,119,119,119,119,119,119,119,119,119,119,119,119,119,119,
      119,119,119,119,119,119,119,119);
 
-const
-  repimg_Adobe_pdf : Array[0..1253] of byte = (
-      66, 77,230,  4,  0,  0,  0,  0,  0,  0, 54,  0,  0,  0, 40,  0,  0,
-       0, 20,  0,  0,  0, 20,  0,  0,  0,  1,  0, 24,  0,  0,  0,  0,  0,
-     176,  4,  0,  0, 19, 11,  0,  0, 19, 11,  0,  0,  0,  0,  0,  0,  0,
-       0,  0,  0,255,255,255,255,255,255,255,255,255,255,255,255,226,226,
-     226,148,148,148,152,152,152,152,152,152,152,152,152,152,152,152,152,
-     152,152,152,152,152,152,152,152,152,152,152,152,152,152,152,152,152,
-     152,152,152,146,146,146,208,208,208,253,253,253,255,255,255,255,255,
-     255,255,255,255,255,255,255,204,204,204,245,245,245,247,247,244,246,
-     246,244,244,244,244,245,245,245,210,210,209,212,212,212,200,201,200,
-     208,208,208,210,210,209,202,202,202,209,210,209,221,222,221,210,210,
-     210,253,253,253,255,255,255,255,255,255,255,255,255,255,255,255,212,
-     212,212,254,254,255,205,205,255,226,226,255,255,255,255,255,255,255,
-     141,142,139,136,138,135,127,128,125,136,138,135,137,139,136,130,131,
-     128,130,131,129,145,146,143,194,194,194,253,253,253,255,255,255,255,
-     255,255,255,255,255,255,255,255,211,211,211,247,247,255,135,135,254,
-     144,144,254,229,229,254,255,255,255,173,174,172,151,153,151,157,159,
-     157,175,176,174,193,194,193,131,133,130,190,190,189,188,188,187,200,
-     201,200,253,253,253,255,255,255,255,255,255,255,255,255,255,255,255,
-     211,211,211,253,253,254,221,221,253,138,138,253,155,155,253,249,249,
-     253,238,238,238,225,225,224,226,227,226,237,237,237,252,252,252,207,
-     207,206,255,255,253,253,253,252,222,222,221,253,253,253,255,255,255,
-     255,255,255,255,255,255,255,255,255,210,210,210,253,253,253,254,254,
-     252,254,254,251,133,133,252,197,197,252,249,249,253,247,247,253,249,
-     249,253,250,250,253,244,244,252,231,231,254,197,196,251,217,214,249,
-     213,212,220,253,253,253,255,255,255,255,255,255,255,255,255,255,255,
-     255,209,209,209,251,251,251,250,250,250,252,252,250,248,248,250, 96,
-      96,252,188,188,251,175,175,251,166,166,251,164,164,252, 99, 99,252,
-     122,122,252,180,180,251,228,228,252,224,224,220,253,253,253,255,255,
-     255,255,255,255,255,255,255,255,255,255,209,209,209,250,250,250,249,
-     249,249,249,249,249,255,255,249,172,172,250,181,181,250,243,243,249,
-     131,131,251,162,162,250,192,192,250,195,195,250,201,201,250,243,243,
-     250,221,221,220,253,253,253,255,255,255,255,255,255,255,255,255,255,
-     255,255,208,208,208,248,248,248,247,247,247,247,247,247,247,247,247,
-     249,249,247,102,102,251,161,161,249,185,185,248,252,252,247,251,251,
-     247,251,251,247,250,250,247,249,249,249,219,219,219,253,253,253,255,
-     255,255,255,255,255,255,255,255,255,255,255,207,207,207,246,246,246,
-     245,245,245,245,245,245,245,245,245,247,247,245,184,184,247, 87, 87,
-     251,254,254,244,245,245,245,245,245,245,245,245,245,245,245,245,244,
-     244,244,214,214,214,253,253,253,255,255,255,255,255,255,255,255,255,
-     255,255,255,206,206,206,245,245,245,244,244,244,244,244,244,244,244,
-     244,247,247,244,176,176,246,125,125,248,253,253,244,244,244,244,244,
-     244,244,243,243,243,240,240,240,238,238,238,209,209,209,252,252,252,
-     255,255,255,255,255,255,255,255,255,255,255,255,205,205,205,243,243,
-     243,242,242,242,242,242,242,242,242,242,247,247,242,118,118,248,191,
-     191,244,246,246,242,242,242,242,240,240,240,237,237,237,233,233,233,
-     231,231,231,204,204,204,252,252,252,255,255,255,255,255,255,255,255,
-     255,255,255,255,216,216,210,249,249,245,248,248,245,248,248,245,248,
-     248,245,254,254,245, 96, 96,254,238,238,245,250,250,244,242,242,241,
-     234,234,234,230,230,230,227,227,227,223,223,223,196,196,196,252,252,
-     252,202,202,222,114,114,167,122,122,170,122,122,170, 78, 78,130,145,
-     145,177,138,138,173,139,139,172,140,140,171,146,146,172, 68, 68,176,
-     111,111,174,142,142,169,183,183,199,226,226,227,223,223,223,216,216,
-     216,206,206,206,190,190,190,252,252,252,127,127,195,  0,  0,156,  0,
-       0,164, 11, 11,168, 44, 44,178,  6,  6,167, 69, 69,184, 53, 53,177,
-      50, 50,174, 13, 13,158,  3,  3,151,  3,  3,146,  0,  0,132,109,109,
-     162,204,204,205,181,181,181,166,166,166,162,162,162,224,224,224,254,
-     254,254,127,127,209,  0,  0,199,  4,  4,206, 36, 36,212,152,152,234,
-      28, 28,209,134,134,230,129,129,229,184,184,238, 41, 41,198,  0,  0,
-     183,  0,  0,175,  0,  0,159,100,100,165,180,180,181,185,185,185,189,
-     189,189,219,219,219,254,254,254,255,255,255,138,138,225, 28, 28,227,
-      37, 37,232, 60, 60,234,187,187,247,196,196,248,129,129,238,129,129,
-     236,175,175,242,168,168,241,  5,  5,204,  0,  0,195,  0,  0,177, 92,
-      92,166,185,185,187,244,244,244,224,224,224,252,252,252,255,255,255,
-     254,254,254,143,143,237, 42, 42,240, 52, 52,244, 59, 59,242,118,118,
-     244,101,101,240, 91, 91,235, 86, 86,230, 81, 81,226, 80, 80,221,  2,
-       2,202,  0,  0,192,  0,  0,177, 80, 80,162,187,187,190,229,229,229,
-     251,251,251,255,255,255,254,254,254,255,255,255,221,221,249,184,184,
-     248,187,187,250,188,188,250,121,121,213,158,158,224,155,155,220,153,
-     153,218,147,147,213,142,142,207,141,141,201,135,135,195,126,126,184,
-     148,148,176,227,227,228,253,253,253,255,255,255,254,254,254,255,255,
-     255,255,255,255,254,254,254,254,254,254,254,254,254,254,254,255,248,
-     248,249,243,243,244,243,243,244,243,243,243,242,242,243,241,241,242,
-     239,239,239,237,237,238,235,235,236,245,245,245,254,254,254,255,255,
-     255,254,254,254,255,255,255,255,255,255,255,255,255);
-
-const
-  repimg_Preview : Array[0..1253] of byte = (
-      66, 77,230,  4,  0,  0,  0,  0,  0,  0, 54,  0,  0,  0, 40,  0,  0,
-       0, 20,  0,  0,  0, 20,  0,  0,  0,  1,  0, 24,  0,  0,  0,  0,  0,
-     176,  4,  0,  0, 19, 11,  0,  0, 19, 11,  0,  0,  0,  0,  0,  0,  0,
-       0,  0,  0,255,255,255,255,255,255,255,255,255,160,160,160,160,160,
-     160,160,160,160,160,160,160,160,160,160,160,160,160,160,160,160,160,
-     160,160,160,160,160,160,160,160,160,160,160,160,160,160,160,160,160,
-     160,160,160,160,160,160,160,160,160,255,255,255,255,255,255,255,255,
-     255,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-       0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-       0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,100,100,100,160,160,
-     160,255,255,255,255,255,255,  0,  0,  0,  0,  0,  0,100,100,100,100,
-     100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,
-     100,100,100,  0,  0,  0,150,150,150,200,200,200,200,200,200,200,200,
-     200,200,200,200,100,100,100,160,160,160,255,255,255,255,255,255,  0,
-       0,  0,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-     255,255,255,255,255,255,255,255,255,255,255,255,200,200,200,100,100,
-     100,150,150,150,200,200,200,200,200,200,200,200,200,100,100,100,160,
-     160,160,255,255,255,255,255,255,  0,  0,  0,255,255,255,255,255,255,
-     255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-     255,255,255,255,200,200,200,255,255,255,100,100,100,150,150,150,200,
-     200,200,200,200,200,100,100,100,160,160,160,255,255,255,255,255,255,
-       0,  0,  0,255,255,255,255,255,255,220,220,220,220,220,220,220,220,
-     220,220,220,220,220,220,220,220,220,220,220,220,220,200,200,200,255,
-     255,255,255,255,255,100,100,100,150,150,150,200,200,200,100,100,100,
-     160,160,160,255,255,255,255,255,255,  0,  0,  0,255,255,255,255,255,
-     255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-     255,255,255,255,255,200,200,200,255,255,255,255,255,255,255,255,255,
-     100,100,100,150,150,150,100,100,100,160,160,160,255,255,255,255,255,
-     255,  0,  0,  0,255,255,255,255,255,255,200,200,200,200,200,200,200,
-     200,200,200,200,200,200,200,200,200,200,200,200,200,200,100,100,100,
-     100,100,100,100,100,100,100,100,100,100,100,100,  0,  0,  0,100,100,
-     100,160,160,160,255,255,255,255,255,255,  0,  0,  0,255,255,255,255,
-     255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-     255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-     255,255,255,255,200,200,200,100,100,100,160,160,160,255,255,255,255,
-     255,255,  0,  0,  0,255,255,255,255,255,255,160,160,160,160,160,160,
-     160,160,160,160,160,160,160,160,160,160,160,160,160,160,160,160,160,
-     160,160,160,160,160,160,160,160,160,160,255,255,255,200,200,200,100,
-     100,100,160,160,160,255,255,255,255,255,255,  0,  0,  0,255,255,255,
-     255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-     255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-     255,255,255,255,255,200,200,200,100,100,100,160,160,160,255,255,255,
-     255,255,255,  0,  0,  0,255,255,255,255,255,255,160,160,160,160,160,
-     160,160,160,160,160,160,160,160,160,160,160,160,160,160,160,160,160,
-     160,160,160,160,160,160,160,160,160,160,160,255,255,255,200,200,200,
-     100,100,100,160,160,160,255,255,255,255,255,255,  0,  0,  0,255,255,
-     255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-     255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-     255,255,255,255,255,255,200,200,200,100,100,100,160,160,160,255,255,
-     255,255,255,255,  0,  0,  0,255,255,255,255,255,255,160,160,160,160,
-     160,160,160,160,160,160,160,160,160,160,160,160,160,160,160,160,160,
-     160,160,160,160,160,160,160,160,160,160,160,160,255,255,255,200,200,
-     200,100,100,100,160,160,160,255,255,255,255,255,255,  0,  0,  0,255,
-     255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-     255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-     255,255,255,255,255,255,255,200,200,200,100,100,100,160,160,160,255,
-     255,255,255,255,255,  0,  0,  0,255,255,255,255,255,255,160,160,160,
-     160,160,160,160,160,160,160,160,160,160,160,160,160,160,160,160,160,
-     160,160,160,160,160,160,160,160,160,160,160,160,160,255,255,255,200,
-     200,200,100,100,100,160,160,160,255,255,255,255,255,255,  0,  0,  0,
-     255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-     255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-     255,255,255,255,255,255,255,255,200,200,200,100,100,100,160,160,160,
-     255,255,255,255,255,255,  0,  0,  0,255,255,255,255,255,255,160,160,
-     160,160,160,160,160,160,160,160,160,160,160,160,160,160,160,160,160,
-     160,160,160,160,160,160,160,160,160,160,160,160,160,160,255,255,255,
-     200,200,200,100,100,100,160,160,160,255,255,255,255,255,255,  0,  0,
-       0,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-     255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-     255,255,255,255,255,255,255,255,255,200,200,200,100,100,100,255,255,
-     255,255,255,255,255,255,255,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-       0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-       0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-       0,  0,  0,  0,255,255,255,255,255,255,255,255,255);
-
 procedure CreateReportImages;
 begin
 
-  fpgImages.AddMaskedBMP('repimg.Fermer',@repimg_Fermer,sizeof(repimg_Fermer),0,0);
-
   fpgImages.AddMaskedBMP('repimg.Fin',@repimg_Fin,sizeof(repimg_Fin),0,0);
 
   fpgImages.AddMaskedBMP('repimg.Imprimante',@repimg_Imprimante,sizeof(repimg_Imprimante),0,0);
 
-  fpgImages.AddMaskedBMP('repimg.Imprimer',@repimg_Imprimer,sizeof(repimg_Imprimer),0,0);
-
   fpgImages.AddMaskedBMP('repimg.Precedent',@repimg_Precedent,sizeof(repimg_Precedent),0,0);
 
   fpgImages.AddMaskedBMP('repimg.Stop',@repimg_Stop,sizeof(repimg_Stop),0,0);
@@ -351,9 +158,22 @@ begin
 
   fpgImages.AddMaskedBMP('repimg.Debut',@repimg_Debut,sizeof(repimg_Debut),0,0);
 
-  fpgImages.AddMaskedBMP('repimg.Adobe_pdf',@repimg_Adobe_pdf,sizeof(repimg_Adobe_pdf),0,0);
+end;
+
+function DeleteReportImages: Boolean;
+begin
+
+  fpgImages.DeleteImage('repimg.Fin',True);
+
+  fpgImages.DeleteImage('repimg.Imprimante',True);
+
+  fpgImages.DeleteImage('repimg.Precedent',True);
+
+  fpgImages.DeleteImage('repimg.Stop',True);
+
+  fpgImages.DeleteImage('repimg.Suivant',True);
 
-  fpgImages.AddMaskedBMP('repimg.Preview',@repimg_Preview,sizeof(repimg_Preview),0,0);
+  fpgImages.DeleteImage('repimg.Debut',True);
 
 end;
 
diff --git a/extras/contributed/report_tool/reportengine/u_visu.pas b/extras/contributed/report_tool/reportengine/u_visu.pas
index 430d8397..7d155547 100644
--- a/extras/contributed/report_tool/reportengine/u_visu.pas
+++ b/extras/contributed/report_tool/reportengine/u_visu.pas
@@ -78,6 +78,7 @@ type
       procedure ChangeBoutons;
     public
       constructor Create(AOwner: TComponent; AImprime: T_Imprime); reintroduce;
+      destructor Destroy; override;
     end;
 
 var
@@ -487,9 +488,9 @@ BackgroundColor:= clMediumAquamarine;
 CreateReportImages;
 Bv_Commande:= CreateBevel(Self,0,0,Width,50,bsBox,bsRaised);
 Bv_Commande.BackgroundColor:= clBisque;
-Bt_Fermer:= CreateButton(Bv_Commande,10,10,26,'',@Bt_FermerClick,'repimg.Fermer');
+Bt_Fermer:= CreateButton(Bv_Commande,10,10,26,'',@Bt_FermerClick,'stdimg.exit');
 Bt_Fermer.BackgroundColor:= clOrangeRed;
-Bt_Imprimer:= CreateButton(Bv_Commande,50,10,26,'',@Bt_ImprimerClick,'repimg.Imprimer');
+Bt_Imprimer:= CreateButton(Bv_Commande,50,10,26,'',@Bt_ImprimerClick,'stdimg.print');
 Bt_Imprimer.BackgroundColor:= clGreen;
 Bt_Imprimer.Enabled:= False;
 Bt_Imprimante:= CreateButton(Bv_Commande,90,10,26,'',@Bt_ImprimanteClick,'repimg.Imprimante');
@@ -497,7 +498,7 @@ Bt_Imprimante.BackgroundColor:= clSilver;
 Bt_Imprimante.Enabled:= False;
 Bt_Arreter:= CreateButton(Bv_Commande,130,10,26,'',@Bt_ArreterClick,'repimg.Stop');
 Bt_Arreter.BackgroundColor:= clRed;
-Bt_Pdf:= CreateButton(Bv_Commande,170,10,26,'',@Bt_PdfClick,'repimg.Adobe_pdf');
+Bt_Pdf:= CreateButton(Bv_Commande,170,10,26,'',@Bt_PdfClick,'stdimg.Adobe_pdf');
 Bt_Pdf.BackgroundColor:= clWhite;
 Bt_Pdf.ImageMargin:= 0;
 Bv_Pages:= CreateBevel(Bv_Commande,220,5,300,40,bsBox,bsLowered);
@@ -527,5 +528,11 @@ L_NbrPageSect:= CreateLabel(Bv_Sections,440,E_NumSect.Top,'-',0,E_NumSect.Height
 OnShow:= @FormShow;
 end;
 
+destructor TF_Visu.Destroy;
+begin
+DeleteReportImages;
+inherited Destroy;
+end;
+
 end.