LazReport, removed PowerPDF and Cairo export requirements from editor sample

git-svn-id: trunk@43820 -
This commit is contained in:
jesus 2014-01-27 07:45:54 +00:00
parent fa2f16e5f4
commit 5c1cc280d4
4 changed files with 71 additions and 89 deletions

View File

@ -1,4 +1,4 @@
<?xml version="1.0"?> <?xml version="1.0" encoding="UTF-8"?>
<CONFIG> <CONFIG>
<ProjectOptions> <ProjectOptions>
<Version Value="9"/> <Version Value="9"/>
@ -54,35 +54,28 @@
<LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/> <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
</local> </local>
</RunParams> </RunParams>
<RequiredPackages Count="8"> <RequiredPackages Count="6">
<Item1> <Item1>
<PackageName Value="lrcairoexport"/> <PackageName Value="lr_extexp"/>
</Item1> </Item1>
<Item2> <Item2>
<PackageName Value="lr_extexp"/>
</Item2>
<Item3>
<PackageName Value="lazreport"/> <PackageName Value="lazreport"/>
<MinVersion Minor="9" Release="6" Valid="True"/> <MinVersion Minor="9" Release="6" Valid="True"/>
</Item2>
<Item3>
<PackageName Value="Printer4Lazarus"/>
</Item3> </Item3>
<Item4> <Item4>
<PackageName Value="lazreportpdfexport"/> <PackageName Value="LCL"/>
<MinVersion Minor="5" Valid="True"/>
</Item4> </Item4>
<Item5> <Item5>
<PackageName Value="Printer4Lazarus"/>
</Item5>
<Item6>
<PackageName Value="LCL"/>
</Item6>
<Item7>
<PackageName Value="FCL"/> <PackageName Value="FCL"/>
<MinVersion Major="1" Valid="True"/> <MinVersion Major="1" Valid="True"/>
</Item7> </Item5>
<Item8> <Item6>
<PackageName Value="DBFLaz"/> <PackageName Value="DBFLaz"/>
<MinVersion Minor="1" Release="1" Valid="True"/> <MinVersion Minor="1" Release="1" Valid="True"/>
</Item8> </Item6>
</RequiredPackages> </RequiredPackages>
<Units Count="3"> <Units Count="3">
<Unit0> <Unit0>

View File

@ -6,8 +6,7 @@ uses
Interfaces, // this includes the LCL widgetset Interfaces, // this includes the LCL widgetset
Forms, Forms,
maincalleditor, maincalleditor,
lazreportpdfexport, lazreport;
lazreport, lrcairoexport;
{$R calleditorwithpkg.res} {$R calleditorwithpkg.res}

View File

@ -5,21 +5,21 @@ object frmMain: TfrmMain
Width = 828 Width = 828
ActiveControl = Panel1 ActiveControl = Panel1
Caption = 'LazReport Test Suite' Caption = 'LazReport Test Suite'
ClientHeight = 525 ClientHeight = 545
ClientWidth = 828 ClientWidth = 828
Font.Name = 'Sans' Font.Name = 'Sans'
Menu = MainMenu1 Menu = MainMenu1
OnCloseQuery = FormCloseQuery OnCloseQuery = FormCloseQuery
OnCreate = frmMainCreate OnCreate = frmMainCreate
ShowHint = True ShowHint = True
LCLVersion = '1.1' LCLVersion = '1.3'
object lblIndex: TLabel object lblIndex: TLabel
AnchorSideLeft.Control = Owner AnchorSideLeft.Control = Owner
AnchorSideBottom.Control = grid AnchorSideBottom.Control = grid
Left = 6 Left = 6
Height = 18 Height = 17
Top = 98 Top = 94
Width = 36 Width = 33
Anchors = [akLeft, akBottom] Anchors = [akLeft, akBottom]
BorderSpacing.Around = 6 BorderSpacing.Around = 6
Caption = 'Index' Caption = 'Index'
@ -29,10 +29,10 @@ object frmMain: TfrmMain
AnchorSideRight.Control = Owner AnchorSideRight.Control = Owner
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
AnchorSideBottom.Control = grid AnchorSideBottom.Control = grid
Left = 744 Left = 756
Height = 18 Height = 17
Top = 98 Top = 94
Width = 78 Width = 66
Anchors = [akRight, akBottom] Anchors = [akRight, akBottom]
BorderSpacing.Around = 6 BorderSpacing.Around = 6
Caption = 'Expression' Caption = 'Expression'
@ -40,8 +40,8 @@ object frmMain: TfrmMain
end end
object sbar: TStatusBar object sbar: TStatusBar
Left = 0 Left = 0
Height = 23 Height = 15
Top = 502 Top = 530
Width = 828 Width = 828
Panels = < Panels = <
item item
@ -56,13 +56,13 @@ object frmMain: TfrmMain
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
AnchorSideRight.Control = lblExpr AnchorSideRight.Control = lblExpr
AnchorSideBottom.Control = grid AnchorSideBottom.Control = grid
Left = 48 Left = 45
Height = 26 Height = 21
Top = 90 Top = 90
Width = 690 Width = 705
Anchors = [akTop, akLeft, akRight] Anchors = [akTop, akLeft, akRight]
BorderSpacing.Around = 6 BorderSpacing.Around = 6
ItemHeight = 18 ItemHeight = 0
OnSelect = comboIndexSelect OnSelect = comboIndexSelect
TabOrder = 2 TabOrder = 2
end end
@ -73,8 +73,8 @@ object frmMain: TfrmMain
AnchorSideRight.Control = grid AnchorSideRight.Control = grid
AnchorSideBottom.Control = sbar AnchorSideBottom.Control = sbar
Left = 0 Left = 0
Height = 380 Height = 413
Top = 122 Top = 117
Width = 204 Width = 204
Anchors = [akTop, akLeft, akBottom] Anchors = [akTop, akLeft, akBottom]
Color = clMoneyGreen Color = clMoneyGreen
@ -92,8 +92,8 @@ object frmMain: TfrmMain
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
AnchorSideBottom.Control = sbar AnchorSideBottom.Control = sbar
Left = 0 Left = 0
Height = 380 Height = 413
Top = 122 Top = 117
Width = 828 Width = 828
Anchors = [akTop, akLeft, akRight, akBottom] Anchors = [akTop, akLeft, akRight, akBottom]
Color = clWhite Color = clWhite
@ -122,59 +122,59 @@ object frmMain: TfrmMain
TabOrder = 4 TabOrder = 4
object btnNewReport: TButton object btnNewReport: TButton
Left = 6 Left = 6
Height = 33 Height = 31
Top = 6 Top = 6
Width = 116 Width = 117
Action = accNewReport Action = accNewReport
AutoSize = True AutoSize = True
BorderSpacing.Around = 6 BorderSpacing.Around = 6
TabOrder = 0 TabOrder = 0
end end
object btnOpenReport: TButton object btnOpenReport: TButton
Left = 128 Left = 129
Height = 33 Height = 31
Top = 6 Top = 6
Width = 123 Width = 124
Action = accOpenReport Action = accOpenReport
AutoSize = True AutoSize = True
BorderSpacing.Around = 6 BorderSpacing.Around = 6
TabOrder = 2 TabOrder = 2
end end
object btnEditReport: TButton object btnEditReport: TButton
Left = 257 Left = 259
Height = 33 Height = 31
Top = 6 Top = 6
Width = 113 Width = 119
Action = accEditReport Action = accEditReport
AutoSize = True AutoSize = True
BorderSpacing.Around = 6 BorderSpacing.Around = 6
TabOrder = 3 TabOrder = 3
end end
object btnPreviewReport: TButton object btnPreviewReport: TButton
Left = 376 Left = 384
Height = 33 Height = 31
Top = 6 Top = 6
Width = 154 Width = 149
Action = accPreviewReport Action = accPreviewReport
AutoSize = True AutoSize = True
BorderSpacing.Around = 6 BorderSpacing.Around = 6
TabOrder = 4 TabOrder = 4
end end
object btnPrintReport: TButton object btnPrintReport: TButton
Left = 536 Left = 539
Height = 33 Height = 31
Top = 6 Top = 6
Width = 134 Width = 133
Action = accPrintReport Action = accPrintReport
AutoSize = True AutoSize = True
BorderSpacing.Around = 6 BorderSpacing.Around = 6
TabOrder = 5 TabOrder = 5
end end
object btnCustomPreview: TButton object btnCustomPreview: TButton
Left = 676 Left = 678
Height = 33 Height = 31
Top = 6 Top = 6
Width = 146 Width = 144
Action = accCustomPreview Action = accCustomPreview
AutoSize = True AutoSize = True
BorderSpacing.Around = 6 BorderSpacing.Around = 6
@ -183,9 +183,9 @@ object frmMain: TfrmMain
object btnPrintGrid: TButton object btnPrintGrid: TButton
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
Left = 6 Left = 6
Height = 33 Height = 35
Top = 45 Top = 43
Width = 116 Width = 117
Action = accPrintGrid Action = accPrintGrid
AutoSize = True AutoSize = True
BorderSpacing.Around = 6 BorderSpacing.Around = 6
@ -193,10 +193,10 @@ object frmMain: TfrmMain
end end
object btnComposite: TButton object btnComposite: TButton
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
Left = 128 Left = 129
Height = 33 Height = 35
Top = 45 Top = 43
Width = 123 Width = 124
Action = accComposite Action = accComposite
AutoSize = True AutoSize = True
BorderSpacing.Around = 6 BorderSpacing.Around = 6
@ -205,20 +205,20 @@ object frmMain: TfrmMain
object btnImageList: TButton object btnImageList: TButton
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
Left = 257 Left = 259
Height = 33 Height = 35
Top = 45 Top = 43
Width = 113 Width = 119
Action = accThumbnails Action = accThumbnails
AutoSize = True AutoSize = True
BorderSpacing.Around = 6 BorderSpacing.Around = 6
TabOrder = 7 TabOrder = 7
end end
object btnMasterDetail: TToggleBox object btnMasterDetail: TToggleBox
Left = 376 Left = 384
Height = 33 Height = 35
Top = 45 Top = 43
Width = 154 Width = 149
AutoSize = True AutoSize = True
BorderSpacing.Around = 6 BorderSpacing.Around = 6
Caption = 'Master-Detail Test' Caption = 'Master-Detail Test'
@ -226,10 +226,10 @@ object frmMain: TfrmMain
TabOrder = 9 TabOrder = 9
end end
object btnExportLast: TButton object btnExportLast: TButton
Left = 536 Left = 539
Height = 33 Height = 35
Top = 45 Top = 43
Width = 134 Width = 133
Caption = 'Repeat Export' Caption = 'Repeat Export'
OnClick = btnExportLastClick OnClick = btnExportLastClick
TabOrder = 10 TabOrder = 10
@ -398,7 +398,7 @@ object frmMain: TfrmMain
Visible = False Visible = False
end end
end end
object srcDetail: TDatasource object srcDetail: TDataSource
DataSet = Detail DataSet = Detail
left = 184 left = 184
top = 248 top = 248
@ -622,7 +622,7 @@ object frmMain: TfrmMain
left = 184 left = 184
top = 312 top = 312
end end
object srcMaster: TDatasource object srcMaster: TDataSource
DataSet = master DataSet = master
left = 184 left = 184
top = 368 top = 368
@ -636,12 +636,4 @@ object frmMain: TfrmMain
left = 500 left = 500
top = 228 top = 228
end end
object frTNPDFExport1: TfrTNPDFExport
left = 420
top = 312
end
object lrCairoExport1: TlrCairoExport
left = 352
top = 128
end
end end

View File

@ -29,8 +29,8 @@ uses
Classes, SysUtils, Variants, FileUtil, LResources, Forms, Controls, Graphics, Dialogs, Classes, SysUtils, Variants, FileUtil, LResources, Forms, Controls, Graphics, Dialogs,
Buttons, StdCtrls, LR_Const, LR_Class, LR_Desgn, Dbf, DB, DBGrids, LR_DBSet, IniFiles, Buttons, StdCtrls, LR_Const, LR_Class, LR_Desgn, Dbf, DB, DBGrids, LR_DBSet, IniFiles,
LR_PGrid, Menus, ComCtrls, ActnList, Lr_e_txt, Lr_e_htm, LR_E_CSV, LR_DSet, 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_BarC, LR_RRect, LR_Shape, LR_ChBox, lconvencoding, lr_e_gen,
lr_utils, LCLProc, ExtCtrls, custompreview, LR_Pars, LR_e_htmldiv, lr_e_cairo, lr_utils, LCLProc, ExtCtrls, custompreview, LR_Pars, LR_e_htmldiv,
LazLogger; LazLogger;
type type
@ -68,8 +68,6 @@ type
comboIndex: TComboBox; comboIndex: TComboBox;
frDbMaster: TfrDBDataSet; frDbMaster: TfrDBDataSet;
frHtmlDivExport1: TfrHtmlDivExport; frHtmlDivExport1: TfrHtmlDivExport;
frTNPDFExport1: TfrTNPDFExport;
lrCairoExport1: TlrCairoExport;
mastergrid: TDBGrid; mastergrid: TDBGrid;
Panel1: TPanel; Panel1: TPanel;
srcMaster: TDatasource; srcMaster: TDatasource;
@ -557,7 +555,7 @@ function TfrmMain.GetDataPath: string;
begin begin
result := ExtractFilePath(ParamStr(0)); result := ExtractFilePath(ParamStr(0));
{$ifdef Darwin} {$ifdef Darwin}
result := IncludeTrailingPathDelimiter(ExpandFileName(dataPath + '../../..')); result := IncludeTrailingPathDelimiter(ExpandFileName(result + '../../..'));
{$endif} {$endif}
end; end;