LazReport, editor sample, added extra exporters image and pdf by default

git-svn-id: trunk@40651 -

components/lazreport/samples/editor/calleditorwithpkg.lpi

@@ -4,8 +4,6 @@
     <Version Value="9"/>
     <General>
       <Flags>
-        <SaveClosedFiles Value="False"/>
-        <SaveOnlyProjectUnits Value="True"/>
         <LRSInOutputDirectory Value="False"/>
       </Flags>
       <SessionStorage Value="InProjectDir"/>
@@ -18,6 +16,32 @@
       <EnableI18N Value="True"/>
       <OutDir Value="languages"/>
     </i18n>
+    <BuildModes Count="2">
+      <Item1 Name="default" Default="True"/>
+      <Item2 Name="For Qt">
+        <MacroValues Count="1">
+          <Macro1 Name="LCLWidgetType" Value="qt"/>
+        </MacroValues>
+        <CompilerOptions>
+          <Version Value="11"/>
+          <Target>
+            <Filename Value="calleditorwithpkg"/>
+          </Target>
+          <SearchPaths>
+            <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)"/>
+            <SrcPath Value="$(LazarusDir)/lcl;$(LazarusDir)/lcl/interfaces/$(LCLWidgetType)"/>
+          </SearchPaths>
+          <Other>
+            <CompilerMessages>
+              <UseMsgFile Value="True"/>
+            </CompilerMessages>
+            <CompilerPath Value="$(CompPath)"/>
+          </Other>
+          <CompileReasons Run="False"/>
+          <LCLWidgetType Value="qt"/>
+        </CompilerOptions>
+      </Item2>
+    </BuildModes>
     <PublishOptions>
       <Version Value="2"/>
       <IgnoreBinaries Value="False"/>
@@ -30,29 +54,32 @@
         <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
       </local>
     </RunParams>
-    <RequiredPackages Count="6">
+    <RequiredPackages Count="7">
       <Item1>
-        <PackageName Value="lazreport"/>
-        <MinVersion Minor="9" Release="6" Valid="True"/>
+        <PackageName Value="lr_extexp"/>
       </Item1>
       <Item2>
-        <PackageName Value="lazreportpdfexport"/>
-        <MinVersion Minor="5" Valid="True"/>
+        <PackageName Value="lazreport"/>
+        <MinVersion Minor="9" Release="6" Valid="True"/>
       </Item2>
       <Item3>
-        <PackageName Value="Printer4Lazarus"/>
+        <PackageName Value="lazreportpdfexport"/>
+        <MinVersion Minor="5" Valid="True"/>
       </Item3>
       <Item4>
-        <PackageName Value="LCL"/>
+        <PackageName Value="Printer4Lazarus"/>
       </Item4>
       <Item5>
-        <PackageName Value="FCL"/>
-        <MinVersion Major="1" Valid="True"/>
+        <PackageName Value="LCL"/>
       </Item5>
       <Item6>
+        <PackageName Value="FCL"/>
+        <MinVersion Major="1" Valid="True"/>
+      </Item6>
+      <Item7>
         <PackageName Value="DBFLaz"/>
         <MinVersion Minor="1" Release="1" Valid="True"/>
-      </Item6>
+      </Item7>
     </RequiredPackages>
     <Units Count="3">
       <Unit0>
@@ -64,6 +91,7 @@
         <Filename Value="maincalleditor.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="frmMain"/>
+        <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="maincalleditor"/>
       </Unit1>
@@ -77,13 +105,13 @@
     </Units>
   </ProjectOptions>
   <CompilerOptions>
-    <Version Value="9"/>
+    <Version Value="11"/>
     <Target>
       <Filename Value="calleditorwithpkg"/>
     </Target>
     <SearchPaths>
       <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)"/>
-      <SrcPath Value="$(LazarusDir)/lcl/;$(LazarusDir)/lcl/interfaces/$(LCLWidgetType)/"/>
+      <SrcPath Value="$(LazarusDir)/lcl;$(LazarusDir)/lcl/interfaces/$(LCLWidgetType)"/>
     </SearchPaths>
     <Other>
       <CompilerMessages>

components/lazreport/samples/editor/maincalleditor.lfm

@@ -5,7 +5,7 @@ object frmMain: TfrmMain
   Width = 828
   ActiveControl = Panel1
   Caption = 'LazReport Test Suite'
-  ClientHeight = 518
+  ClientHeight = 520
   ClientWidth = 828
   Font.Name = 'Sans'
   Menu = MainMenu1
@@ -39,8 +39,8 @@ object frmMain: TfrmMain
   end
   object sbar: TStatusBar
     Left = 0
-    Height = 21
-    Top = 497
+    Height = 19
+    Top = 501
     Width = 828
     Panels = <    
       item
@@ -72,7 +72,7 @@ object frmMain: TfrmMain
     AnchorSideRight.Control = grid
     AnchorSideBottom.Control = sbar
     Left = 0
-    Height = 374
+    Height = 378
     Top = 123
     Width = 204
     Anchors = [akTop, akLeft, akBottom]
@@ -91,7 +91,7 @@ object frmMain: TfrmMain
     AnchorSideRight.Side = asrBottom
     AnchorSideBottom.Control = sbar
     Left = 0
-    Height = 374
+    Height = 378
     Top = 123
     Width = 828
     Anchors = [akTop, akLeft, akRight, akBottom]
@@ -123,47 +123,47 @@ object frmMain: TfrmMain
       Left = 6
       Height = 33
       Top = 6
-      Width = 170
+      Width = 173
       Action = accNewReport
       AutoSize = True
       BorderSpacing.Around = 6
       TabOrder = 0
     end
     object btnOpenReport: TButton
-      Left = 182
+      Left = 185
       Height = 33
       Top = 6
-      Width = 144
+      Width = 147
       Action = accOpenReport
       AutoSize = True
       BorderSpacing.Around = 6
       TabOrder = 2
     end
     object btnEditReport: TButton
-      Left = 332
+      Left = 338
       Height = 33
       Top = 6
-      Width = 135
+      Width = 138
       Action = accEditReport
       AutoSize = True
       BorderSpacing.Around = 6
       TabOrder = 3
     end
     object btnPreviewReport: TButton
-      Left = 473
+      Left = 482
       Height = 33
       Top = 6
-      Width = 162
+      Width = 165
       Action = accPreviewReport
       AutoSize = True
       BorderSpacing.Around = 6
       TabOrder = 4
     end
     object btnPrintReport: TButton
-      Left = 641
+      Left = 653
       Height = 33
       Top = 6
-      Width = 181
+      Width = 169
       Action = accPrintReport
       AutoSize = True
       BorderSpacing.Around = 6
@@ -173,7 +173,7 @@ object frmMain: TfrmMain
       Left = 6
       Height = 33
       Top = 45
-      Width = 170
+      Width = 173
       Action = accCustomPreview
       AutoSize = True
       BorderSpacing.Around = 6
@@ -181,10 +181,10 @@ object frmMain: TfrmMain
     end
     object btnPrintGrid: TButton
       AnchorSideRight.Side = asrBottom
-      Left = 182
+      Left = 185
       Height = 33
       Top = 45
-      Width = 144
+      Width = 147
       Action = accPrintGrid
       AutoSize = True
       BorderSpacing.Around = 6
@@ -192,10 +192,10 @@ object frmMain: TfrmMain
     end
     object btnComposite: TButton
       AnchorSideTop.Side = asrBottom
-      Left = 332
+      Left = 338
       Height = 33
       Top = 45
-      Width = 135
+      Width = 138
       Action = accComposite
       AutoSize = True
       BorderSpacing.Around = 6
@@ -204,20 +204,20 @@ object frmMain: TfrmMain
     object btnImageList: TButton
       AnchorSideTop.Side = asrBottom
       AnchorSideRight.Side = asrBottom
-      Left = 473
+      Left = 482
       Height = 33
       Top = 45
-      Width = 162
+      Width = 165
       Action = accThumbnails
       AutoSize = True
       BorderSpacing.Around = 6
       TabOrder = 7
     end
     object btnMasterDetail: TToggleBox
-      Left = 641
+      Left = 653
       Height = 33
       Top = 45
-      Width = 181
+      Width = 169
       AutoSize = True
       BorderSpacing.Around = 6
       Caption = 'Master-Detail Test'
@@ -626,4 +626,12 @@ object frmMain: TfrmMain
     left = 112
     top = 312
   end
+  object frHtmlDivExport1: TfrHtmlDivExport
+    left = 500
+    top = 228
+  end
+  object frTNPDFExport1: TfrTNPDFExport
+    left = 420
+    top = 312
+  end
 end

components/lazreport/samples/editor/maincalleditor.pas

@@ -30,7 +30,7 @@ uses
   Buttons, StdCtrls, LR_Const, LR_Class, LR_Desgn, Dbf, DB, DBGrids, LR_DBSet,
   LR_PGrid, Menus, ComCtrls, ActnList, Lr_e_txt, Lr_e_htm, LR_E_CSV, LR_DSet,
   LR_BarC, LR_RRect, LR_Shape, LR_ChBox, lr_e_pdf, lconvencoding, lr_e_gen,
-  lr_utils, LCLProc, ExtCtrls, custompreview, LR_Pars;
+  lr_utils, LCLProc, ExtCtrls, custompreview, LR_Pars, LR_e_htmldiv;
 
 type
 
@@ -65,6 +65,8 @@ type
     btnComposite: TButton;
     comboIndex: TComboBox;
     frDbMaster: TfrDBDataSet;
+    frHtmlDivExport1: TfrHtmlDivExport;
+    frTNPDFExport1: TfrTNPDFExport;
     mastergrid: TDBGrid;
     Panel1: TPanel;
     srcMaster: TDatasource;