paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-15 20:59:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

lazreport: fix compilation, update project file and minor usability improvements to userds sample

Browse Source 
git-svn-id: trunk@35126 -
This commit is contained in:
blikblum 2012-02-04 16:47:31 +00:00
parent e96f8fdf7b
commit 60a48a0d04
6 changed files with 66 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

110
components/lazreport/samples/userds/project1.lpi
View File

@ -1,17 +1,20 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<CONFIG> <CONFIG>
<ProjectOptions> <ProjectOptions>
<PathDelim Value="/"/> <Version Value="9"/>
<Version Value="5"/>
<General> <General>
<Flags>
<LRSInOutputDirectory Value="False"/>
</Flags>
<SessionStorage Value="InProjectDir"/>
<MainUnit Value="0"/> <MainUnit Value="0"/>
<IconPath Value="./"/>
<TargetFileExt Value=""/>
<ActiveEditorIndexAtStart Value="0"/>
</General> </General>
<VersionInfo> <VersionInfo>
<ProjectVersion Value=""/> <StringTable ProductVersion=""/>
</VersionInfo> </VersionInfo>
<BuildModes Count="1">
<Item1 Name="default" Default="True"/>
</BuildModes>
<PublishOptions> <PublishOptions>
<Version Value="2"/> <Version Value="2"/>
<IgnoreBinaries Value="False"/> <IgnoreBinaries Value="False"/>
@ -30,81 +33,38 @@
</Item1> </Item1>
<Item2> <Item2>
<PackageName Value="lazreport"/> <PackageName Value="lazreport"/>
<MinVersion Minor="9" Release="3" Valid="True"/> <MinVersion Minor="9" Valid="True" Release="3"/>
</Item2> </Item2>
</RequiredPackages> </RequiredPackages>
<Units Count="8"> <Units Count="3">
<Unit0> <Unit0>
<Filename Value="project1.lpr"/> <Filename Value="project1.lpr"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
<UnitName Value="project1"/> <UnitName Value="project1"/>
<UsageCount Value="30"/>
</Unit0> </Unit0>
<Unit1> <Unit1>
<Filename Value="unit1.pas"/> <Filename Value="unit1.pas"/>
<ComponentName Value="Form1"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
<ResourceFilename Value="unit1.lrs"/> <ComponentName Value="Form1"/>
<ResourceBaseClass Value="Form"/>
<UnitName Value="Unit1"/> <UnitName Value="Unit1"/>
<CursorPos X="24" Y="104"/>
<TopLine Value="95"/>
<EditorIndex Value="0"/>
<UsageCount Value="30"/>
<Loaded Value="True"/>
</Unit1> </Unit1>
<Unit2> <Unit2>
<Filename Value="unit1.lfm"/>
<CursorPos X="27" Y="41"/>
<TopLine Value="33"/>
<UsageCount Value="10"/>
<SyntaxHighlighter Value="LFM"/>
</Unit2>
<Unit3>
<Filename Value="../../source/lr_class.pas"/>
<UnitName Value="LR_Class"/>
<CursorPos X="5" Y="47"/>
<TopLine Value="33"/>
<UsageCount Value="11"/>
</Unit3>
<Unit4>
<Filename Value="../../source/lr_pars.pas"/>
<UnitName Value="LR_Pars"/>
<CursorPos X="3" Y="80"/>
<TopLine Value="72"/>
<UsageCount Value="11"/>
</Unit4>
<Unit5>
<Filename Value="../../../../lazarus/lcl/lclproc.pas"/>
<UnitName Value="LCLProc"/>
<CursorPos X="10" Y="232"/>
<TopLine Value="213"/>
<UsageCount Value="11"/>
</Unit5>
<Unit6>
<Filename Value="unit2.pas"/> <Filename Value="unit2.pas"/>
<ComponentName Value="Form2"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
<ResourceFilename Value="unit2.lrs"/> <ComponentName Value="Form2"/>
<ResourceBaseClass Value="Form"/>
<UnitName Value="Unit2"/> <UnitName Value="Unit2"/>
<CursorPos X="22" Y="8"/> </Unit2>
<TopLine Value="1"/>
<UsageCount Value="22"/>
</Unit6>
<Unit7>
<Filename Value="../../../../lazarus/components/sqldb/registersqldb.pas"/>
<UnitName Value="registersqldb"/>
<CursorPos X="1" Y="1"/>
<TopLine Value="1"/>
<UsageCount Value="10"/>
</Unit7>
</Units> </Units>
<JumpHistory Count="0" HistoryIndex="-1"/>
</ProjectOptions> </ProjectOptions>
<CompilerOptions> <CompilerOptions>
<Version Value="5"/> <Version Value="11"/>
<CodeGeneration> <Parsing>
<Generate Value="Faster"/> <SyntaxOptions>
</CodeGeneration> <UseAnsiStrings Value="False"/>
</SyntaxOptions>
</Parsing>
<Linking> <Linking>
<Options> <Options>
<Win32> <Win32>
@ -113,30 +73,10 @@
</Options> </Options>
</Linking> </Linking>
<Other> <Other>
<CompilerMessages>
<UseMsgFile Value="True"/>
</CompilerMessages>
<CompilerPath Value="$(CompPath)"/> <CompilerPath Value="$(CompPath)"/>
</Other> </Other>
</CompilerOptions> </CompilerOptions>
<Debugging>
<Watches Count="5">
<Item1>
<Expression Value="FieldDef.FDataType"/>
<Enabled Value="False"/>
</Item1>
<Item2>
<Expression Value="FieldDef.FSize"/>
<Enabled Value="False"/>
</Item2>
<Item3>
<Expression Value="IsSeq"/>
<Enabled Value="False"/>
</Item3>
<Item4>
<Expression Value="TIBCURSOR(CURSOR).SQLDA^"/>
<Enabled Value="False"/>
</Item4>
<Item5>
<Expression Value="x"/>
</Item5>
</Watches>
</Debugging>
</CONFIG> </CONFIG>

9
components/lazreport/samples/userds/unit1.lfm
View File

@ -6,10 +6,12 @@ object Form1: TForm1
HorzScrollBar.Page = 399 HorzScrollBar.Page = 399
VertScrollBar.Page = 87 VertScrollBar.Page = 87
ActiveControl = btnShowReport ActiveControl = btnShowReport
Caption = 'Form1' Caption = 'LazReport UserDataser Demo'
ClientHeight = 88 ClientHeight = 88
ClientWidth = 400 ClientWidth = 400
OnCreate = FormCreate OnCreate = FormCreate
Position = poDesktopCenter
LCLVersion = '0.9.31'
object btnShowReport: TButton object btnShowReport: TButton
Left = 64 Left = 64
Height = 25 Height = 25
@ -48,7 +50,10 @@ object Form1: TForm1
top = 56 top = 56
end end
object frReport1: TfrReport object frReport1: TfrReport
InitialZoom = pzDefault
Options = []
PreviewButtons = [pbZoom, pbLoad, pbSave, pbPrint, pbFind, pbHelp, pbExit] PreviewButtons = [pbZoom, pbLoad, pbSave, pbPrint, pbFind, pbHelp, pbExit]
DataType = dtDataSet
OnBeginDoc = frReport1BeginDoc OnBeginDoc = frReport1BeginDoc
OnEndDoc = frReport1EndDoc OnEndDoc = frReport1EndDoc
OnBeginPage = frReport1BeginPage OnBeginPage = frReport1BeginPage
@ -64,7 +69,7 @@ object Form1: TForm1
left = 80 left = 80
top = 56 top = 56
ReportForm = { ReportForm = {
18000000 19000000
} }
end end
object ColumnsDS: TfrUserDataset object ColumnsDS: TfrUserDataset

48
components/lazreport/samples/userds/unit1.lrs
View File

@ -3,27 +3,29 @@
LazarusResources.Add('TForm1','FORMDATA',[ LazarusResources.Add('TForm1','FORMDATA',[
'TPF0'#6'TForm1'#5'Form1'#4'Left'#3#238#0#6'Height'#2'X'#3'Top'#2't'#5'Width' 'TPF0'#6'TForm1'#5'Form1'#4'Left'#3#238#0#6'Height'#2'X'#3'Top'#2't'#5'Width'
+#3#144#1#18'HorzScrollBar.Page'#3#143#1#18'VertScrollBar.Page'#2'W'#13'Activ' +#3#144#1#18'HorzScrollBar.Page'#3#143#1#18'VertScrollBar.Page'#2'W'#13'Activ'
+'eControl'#7#13'btnShowReport'#7'Caption'#6#5'Form1'#12'ClientHeight'#2'X'#11 +'eControl'#7#13'btnShowReport'#7'Caption'#6#26'LazReport UserDataser Demo'#12
+'ClientWidth'#3#144#1#8'OnCreate'#7#10'FormCreate'#0#7'TButton'#13'btnShowRe' +'ClientHeight'#2'X'#11'ClientWidth'#3#144#1#8'OnCreate'#7#10'FormCreate'#8'P'
+'port'#4'Left'#2'@'#6'Height'#2#25#3'Top'#2#20#5'Width'#2'~'#25'BorderSpacin' +'osition'#7#15'poDesktopCenter'#10'LCLVersion'#6#6'0.9.31'#0#7'TButton'#13'b'
+'g.InnerBorder'#2#4#7'Caption'#6#11'Show Report'#7'OnClick'#7#18'btnShowRepo' +'tnShowReport'#4'Left'#2'@'#6'Height'#2#25#3'Top'#2#20#5'Width'#2'~'#25'Bord'
+'rtClick'#8'TabOrder'#2#0#0#0#7'TButton'#7'Button1'#4'Left'#3#200#0#6'Height' +'erSpacing.InnerBorder'#2#4#7'Caption'#6#11'Show Report'#7'OnClick'#7#18'btn'
+#2#25#3'Top'#2#20#5'Width'#3#136#0#25'BorderSpacing.InnerBorder'#2#4#7'Capti' +'ShowReportClick'#8'TabOrder'#2#0#0#0#7'TButton'#7'Button1'#4'Left'#3#200#0#6
+'on'#6#13'Design Report'#7'OnClick'#7#12'Button1Click'#8'TabOrder'#2#1#0#0#7 +'Height'#2#25#3'Top'#2#20#5'Width'#3#136#0#25'BorderSpacing.InnerBorder'#2#4
+'TButton'#7'Button2'#4'Left'#2'l'#6'Height'#2#25#3'Top'#2'8'#5'Width'#3#184#0 +#7'Caption'#6#13'Design Report'#7'OnClick'#7#12'Button1Click'#8'TabOrder'#2#1
+#25'BorderSpacing.InnerBorder'#2#4#7'Caption'#6#25'Show Notes of this Sample' +#0#0#7'TButton'#7'Button2'#4'Left'#2'l'#6'Height'#2#25#3'Top'#2'8'#5'Width'#3
+#7'OnClick'#7#12'Button2Click'#8'TabOrder'#2#2#0#0#14'TfrUserDataset'#8'Mast' +#184#0#25'BorderSpacing.InnerBorder'#2#4#7'Caption'#6#25'Show Notes of this '
+'erDS'#10'OnCheckEOF'#7#16'MasterDSCheckEOF'#7'OnFirst'#7#13'MasterDSFirst'#6 +'Sample'#7'OnClick'#7#12'Button2Click'#8'TabOrder'#2#2#0#0#14'TfrUserDataset'
+'OnNext'#7#12'MasterDSNext'#4'left'#2#8#3'top'#2'8'#0#0#9'TfrReport'#9'frRep' +#8'MasterDS'#10'OnCheckEOF'#7#16'MasterDSCheckEOF'#7'OnFirst'#7#13'MasterDSF'
+'ort1'#14'PreviewButtons'#11#6'pbZoom'#6'pbLoad'#6'pbSave'#7'pbPrint'#6'pbFi' +'irst'#6'OnNext'#7#12'MasterDSNext'#4'left'#2#8#3'top'#2'8'#0#0#9'TfrReport'
+'nd'#6'pbHelp'#6'pbExit'#0#10'OnBeginDoc'#7#17'frReport1BeginDoc'#8'OnEndDoc' +#9'frReport1'#11'InitialZoom'#7#9'pzDefault'#7'Options'#11#0#14'PreviewButto'
+#7#15'frReport1EndDoc'#11'OnBeginPage'#7#18'frReport1BeginPage'#9'OnEndPage' +'ns'#11#6'pbZoom'#6'pbLoad'#6'pbSave'#7'pbPrint'#6'pbFind'#6'pbHelp'#6'pbExi'
+#7#16'frReport1EndPage'#11'OnBeginBand'#7#18'frReport1BeginBand'#9'OnEndBand' +'t'#0#8'DataType'#7#9'dtDataSet'#10'OnBeginDoc'#7#17'frReport1BeginDoc'#8'On'
+#7#16'frReport1EndBand'#10'OnGetValue'#7#17'frReport1GetValue'#11'OnEnterRec' +'EndDoc'#7#15'frReport1EndDoc'#11'OnBeginPage'#7#18'frReport1BeginPage'#9'On'
+'t'#7#18'frReport1EnterRect'#14'OnUserFunction'#7#21'frReport1UserFunction' +'EndPage'#7#16'frReport1EndPage'#11'OnBeginBand'#7#18'frReport1BeginBand'#9
+#10'OnProgress'#7#17'frReport1Progress'#13'OnBeginColumn'#7#20'frReport1Begi' +'OnEndBand'#7#16'frReport1EndBand'#10'OnGetValue'#7#17'frReport1GetValue'#11
+'nColumn'#13'OnPrintColumn'#7#20'frReport1PrintColumn'#4'left'#2'P'#3'top'#2 +'OnEnterRect'#7#18'frReport1EnterRect'#14'OnUserFunction'#7#21'frReport1User'
+'8'#10'ReportForm'#10#4#0#0#0#24#0#0#0#0#0#14'TfrUserDataset'#9'ColumnsDS'#10 +'Function'#10'OnProgress'#7#17'frReport1Progress'#13'OnBeginColumn'#7#20'frR'
+'OnCheckEOF'#7#17'ColumnsDSCheckEOF'#7'OnFirst'#7#14'ColumnsDSFirst'#6'OnNex' +'eport1BeginColumn'#13'OnPrintColumn'#7#20'frReport1PrintColumn'#4'left'#2'P'
+'t'#7#13'ColumnsDSNext'#4'left'#2'('#3'top'#2'8'#0#0#0 +#3'top'#2'8'#10'ReportForm'#10#4#0#0#0#25#0#0#0#0#0#14'TfrUserDataset'#9'Col'
+'umnsDS'#10'OnCheckEOF'#7#17'ColumnsDSCheckEOF'#7'OnFirst'#7#14'ColumnsDSFir'
+'st'#6'OnNext'#7#13'ColumnsDSNext'#4'left'#2'('#3'top'#2'8'#0#0#0
]); ]);

2
components/lazreport/samples/userds/unit1.pas
View File

@ -6,7 +6,7 @@ interface
uses uses
Classes, SysUtils, LResources, Forms, Controls, Graphics, Dialogs, LR_DSet, Classes, SysUtils, LResources, Forms, Controls, Graphics, Dialogs, LR_DSet,
LR_Class, LR_Pars, Buttons; LR_Class, Buttons, StdCtrls;
{.$DEFINE DEBUG} {.$DEFINE DEBUG}

4
components/lazreport/samples/userds/unit2.lfm
View File

@ -9,13 +9,17 @@ object Form2: TForm2
ClientHeight = 300 ClientHeight = 300
ClientWidth = 400 ClientWidth = 400
OnShow = FormShow OnShow = FormShow
LCLVersion = '0.9.31'
object Memo1: TMemo object Memo1: TMemo
Left = 0
Height = 300 Height = 300
Top = 0
Width = 400 Width = 400
Align = alClient Align = alClient
Lines.Strings = ( Lines.Strings = (
'Memo1' 'Memo1'
) )
ScrollBars = ssAutoBoth
TabOrder = 0 TabOrder = 0
end end
end end

7
components/lazreport/samples/userds/unit2.lrs
View File

@ -4,7 +4,8 @@ LazarusResources.Add('TForm2','FORMDATA',[
'TPF0'#6'TForm2'#5'Form2'#4'Left'#3'"'#1#6'Height'#3','#1#3'Top'#3#161#0#5'Wi' 'TPF0'#6'TForm2'#5'Form2'#4'Left'#3'"'#1#6'Height'#3','#1#3'Top'#3#161#0#5'Wi'
+'dth'#3#144#1#18'HorzScrollBar.Page'#3#143#1#18'VertScrollBar.Page'#3'+'#1#7 +'dth'#3#144#1#18'HorzScrollBar.Page'#3#143#1#18'VertScrollBar.Page'#3'+'#1#7
+'Caption'#6#12'Notes viewer'#12'ClientHeight'#3','#1#11'ClientWidth'#3#144#1 +'Caption'#6#12'Notes viewer'#12'ClientHeight'#3','#1#11'ClientWidth'#3#144#1
+#6'OnShow'#7#8'FormShow'#0#5'TMemo'#5'Memo1'#6'Height'#3','#1#5'Width'#3#144 +#6'OnShow'#7#8'FormShow'#10'LCLVersion'#6#6'0.9.31'#0#5'TMemo'#5'Memo1'#4'Le'
+#1#5'Align'#7#8'alClient'#13'Lines.Strings'#1#6#5'Memo1'#0#8'TabOrder'#2#0#0 +'ft'#2#0#6'Height'#3','#1#3'Top'#2#0#5'Width'#3#144#1#5'Align'#7#8'alClient'
+#0#0 +#13'Lines.Strings'#1#6#5'Memo1'#0#10'ScrollBars'#7#10'ssAutoBoth'#8'TabOrder'
+#2#0#0#0#0
]); ]);