LazReport, fix editor sample new report name and added testpage report

git-svn-id: trunk@15816 -
This commit is contained in:
jesus 2008-07-18 21:21:51 +00:00
parent 34f9100000
commit 5ace44bd40
5 changed files with 426 additions and 36 deletions

1
.gitattributes vendored
View File

@ -459,6 +459,7 @@ components/lazreport/samples/editor/maincalleditor.lrs svneol=native#text/plain
components/lazreport/samples/editor/maincalleditor.pas svneol=native#text/pascal
components/lazreport/samples/editor/readme.txt svneol=native#text/plain
components/lazreport/samples/editor/salida.lrf svneol=native#text/xml
components/lazreport/samples/editor/testpage.lrf svneol=LF#text/xml eol=lf
components/lazreport/samples/index.txt svneol=native#text/plain
components/lazreport/samples/stringgrid/project1.lpi svneol=native#text/plain
components/lazreport/samples/stringgrid/project1.lpr svneol=native#text/pascal

View File

@ -1,18 +1,17 @@
<?xml version="1.0"?>
<CONFIG>
<ProjectOptions>
<PathDelim Value="\"/>
<PathDelim Value="/"/>
<Version Value="6"/>
<General>
<Flags>
<SaveClosedFiles Value="False"/>
<SaveOnlyProjectUnits Value="True"/>
</Flags>
<MainUnit Value="0"/>
<IconPath Value=".\"/>
<IconPath Value="./"/>
<TargetFileExt Value=""/>
<Title Value="LazReport Designer"/>
<ActiveEditorIndexAtStart Value="0"/>
<ActiveEditorIndexAtStart Value="2"/>
</General>
<i18n>
<EnableI18N Value="True"/>
@ -20,7 +19,6 @@
</i18n>
<PublishOptions>
<Version Value="2"/>
<DestinationDirectory Value="$(TestDir)\publishedproject\"/>
<IgnoreBinaries Value="False"/>
<IncludeFileFilter Value="*.(pas|pp|inc|lfm|lpr|lrs|lpi|lpk|sh|xml)"/>
<ExcludeFileFilter Value="*.(bak|ppu|ppw|o|so);*~;backup"/>
@ -28,7 +26,7 @@
<RunParams>
<local>
<FormatVersion Value="1"/>
<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>
</RunParams>
<RequiredPackages Count="5">
@ -50,7 +48,7 @@
<MinVersion Minor="1" Release="1" Valid="True"/>
</Item5>
</RequiredPackages>
<Units Count="2">
<Units Count="4">
<Unit0>
<Filename Value="calleditorwithpkg.lpr"/>
<IsPartOfProject Value="True"/>
@ -66,31 +64,53 @@
<ResourceBaseClass Value="Form"/>
<ResourceFilename Value="maincalleditor.lrs"/>
<UnitName Value="maincalleditor"/>
<CursorPos X="3" Y="116"/>
<TopLine Value="110"/>
<CursorPos X="59" Y="262"/>
<TopLine Value="232"/>
<EditorIndex Value="0"/>
<UsageCount Value="200"/>
<Bookmarks Count="1">
<Item0 X="5" Y="220" ID="0"/>
</Bookmarks>
<Loaded Value="True"/>
</Unit1>
<Unit2>
<Filename Value="../../../printers/unix/cupsprinters.inc"/>
<CursorPos X="31" Y="501"/>
<TopLine Value="483"/>
<EditorIndex Value="1"/>
<UsageCount Value="14"/>
<Loaded Value="True"/>
</Unit2>
<Unit3>
<Filename Value="../../../../lcl/postscriptcanvas.pas"/>
<UnitName Value="PostScriptCanvas"/>
<CursorPos X="1" Y="554"/>
<TopLine Value="554"/>
<EditorIndex Value="2"/>
<UsageCount Value="14"/>
<Loaded Value="True"/>
</Unit3>
</Units>
<JumpHistory Count="3" HistoryIndex="2">
<Position1>
<Filename Value="../../../printers/unix/cupsprinters.inc"/>
<Caret Line="10" Column="28" TopLine="1"/>
</Position1>
<Position2>
<Filename Value="../../../printers/unix/cupsprinters.inc"/>
<Caret Line="13" Column="39" TopLine="1"/>
</Position2>
<Position3>
<Filename Value="../../../printers/unix/cupsprinters.inc"/>
<Caret Line="501" Column="31" TopLine="483"/>
</Position3>
</JumpHistory>
</ProjectOptions>
<CompilerOptions>
<Version Value="5"/>
<PathDelim Value="\"/>
<SearchPaths>
<SrcPath Value="$(LazarusDir)\lcl\;$(LazarusDir)\lcl\interfaces\$(LCLWidgetType)\"/>
<SrcPath Value="$(LazarusDir)/lcl/;$(LazarusDir)/lcl/interfaces/$(LCLWidgetType)/"/>
</SearchPaths>
<CodeGeneration>
<Generate Value="Faster"/>
</CodeGeneration>
<Linking>
<Debugging>
<UseHeaptrc Value="True"/>
</Debugging>
</Linking>
<Other>
<CompilerPath Value="$(CompPath)"/>
</Other>

View File

@ -27,8 +27,8 @@ interface
uses
Classes, SysUtils, LResources, Forms, Controls, Graphics, Dialogs, Buttons,
StdCtrls, LR_Class, LR_Desgn, Dbf, DB, DBGrids, LR_DBSet, LR_PGrid, Menus,
ComCtrls, ActnList, Lr_e_txt, Lr_e_htm, LR_E_CSV;
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;
type
@ -209,6 +209,7 @@ end;
procedure TfrmMain.accNewReportExecute(Sender: TObject);
begin
TheReport.Pages.Clear;
TheReport.FileName:=SUntitled;
TheReport.DesignReport;
UpdateActiveReport;
end;

View File

@ -1,22 +1,27 @@
<?xml version="1.0"?>
<CONFIG>
<LazReport>
<Version Value="23"/>
<Version Value="24"/>
<Title Value=""/>
<Subject Value=""/>
<KeyWords Value=""/>
<Comments Value=""/>
<ReportVersionBuild Value=""/>
<ReportVersionMajor Value=""/>
<ReportVersionMinor Value=""/>
<ReportVersionRelease Value=""/>
<ReportAutor Value=""/>
<Pages>
<PrintToDefault Value="False"/>
<DoublePass Value="True"/>
<SelectedPrinter Value="hp1200_conta"/>
<SelectedPrinter Value="HP1100"/>
<PageCount Value="1"/>
<Page1>
<Name Value="Page1"/>
<ClassName Value="TfrPageReport"/>
<Visible Value="1"/>
<Width Value="595"/>
<Height Value="842"/>
<Width Value="547"/>
<Height Value="770" PageType="0"/>
<PgSize Value="9"/>
<Margins>
<left Value="0"/>
@ -29,6 +34,7 @@
<PrintToPrevPage Value="False"/>
<ColCount Value="1"/>
<ColGap Value="0"/>
<LayoutOrder Value="loColumns"/>
<ObjectCount Value="6"/>
<Object1>
<Name Value="ReportTitle1"/>
@ -43,7 +49,9 @@
<Height Value="40"/>
</Size>
<Flags Value="48"/>
<Data><Script Value=""/></Data>
<Data>
<Script Value=""/>
</Data>
<BandType Value="btReportTitle"/>
<Condition Value=""/>
<DatasetStr Value=""/>
@ -61,7 +69,9 @@
<Height Value="24"/>
</Size>
<Flags Value="48"/>
<Data><Script Value=""/></Data>
<Data>
<Script Value=""/>
</Data>
<BandType Value="btMasterData"/>
<Condition Value=""/>
<DatasetStr Value="frDBDataSet1"/>
@ -89,8 +99,7 @@
<Data>
<Format Value="556"/>
<FormatStr Value=""/>
<Memo Value="TITLE OF REPORT
"/>
<Memo Value="TITLE OF REPORT &#xA;"/>
<Script Value=""/>
</Data>
<Font>
@ -133,8 +142,7 @@
<Data>
<Format Value="556"/>
<FormatStr Value=""/>
<Memo Value="[Dbf1.&quot;TITLE&quot;]
"/>
<Memo Value="[Dbf1.&quot;TITLE&quot;] &#xA;"/>
<Script Value=""/>
</Data>
<Font>
@ -177,8 +185,7 @@
<Data>
<Format Value="556"/>
<FormatStr Value=""/>
<Memo Value="[Dbf1.&quot;AUTHOR&quot;]
"/>
<Memo Value="[Dbf1.&quot;AUTHOR&quot;] &#xA;"/>
<Script Value=""/>
</Data>
<Font>
@ -221,8 +228,7 @@
<Data>
<Format Value="556"/>
<FormatStr Value=""/>
<Memo Value="Page [PAGE#]/[TOTALPAGES]
"/>
<Memo Value="Page [PAGE#]/[TOTALPAGES] &#xA;"/>
<Script Value=""/>
</Data>
<Font>
@ -243,7 +249,9 @@
<Angle Value="0"/>
</Object6>
</Page1>
<FVal><Count Value="0"/></FVal>
<FVal>
<Count Value="0"/>
</FVal>
<ParentVars Value=""/>
</Pages>
</LazReport>

View File

@ -0,0 +1,360 @@
<?xml version="1.0"?>
<CONFIG>
<LazReport>
<Version Value="24"/>
<Title Value=""/>
<Subject Value=""/>
<KeyWords Value=""/>
<Comments Value=""/>
<ReportVersionBuild Value=""/>
<ReportVersionMajor Value=""/>
<ReportVersionMinor Value=""/>
<ReportVersionRelease Value=""/>
<ReportAutor Value=""/>
<Pages>
<PrintToDefault Value="False"/>
<DoublePass Value="False"/>
<SelectedPrinter Value="HP1100"/>
<PageCount Value="1"/>
<Page1>
<Name Value="Page1"/>
<ClassName Value="TfrPageReport"/>
<Visible Value="1"/>
<Width Value="564"/>
<Height Value="720" PageType="0"/>
<PgSize Value="1"/>
<Margins>
<left Value="0"/>
<Top Value="0"/>
<Right Value="0"/>
<Bottom Value="0"/>
</Margins>
<Orientation Value="poPortrait"/>
<UseMargins Value="True"/>
<PrintToPrevPage Value="False"/>
<ColCount Value="0"/>
<ColGap Value="0"/>
<LayoutOrder Value="loColumns"/>
<ObjectCount Value="10"/>
<Object1>
<Name Value="Memo5"/>
<ClassName Value="TfrMemoView"/>
<Visible Value="1"/>
<Typ Value="gtMemo"/>
<StreamMode Value="0"/>
<Size>
<Left Value="32"/>
<Top Value="32"/>
<Width Value="708"/>
<Height Value="914"/>
</Size>
<Flags Value="3"/>
<FillColor Value="clNone"/>
<Frames>
<FrameWidth Value="1"/>
<FrameColor Value="clBlack"/>
<FrameBorders Value="frbLeft,frbTop,frbRight,frbBottom"/>
<FrameStyle Value="frsSolid"/>
</Frames>
<Data>
<Format Value="558"/>
<FormatStr Value=""/>
<Memo Value=""/>
<Script Value=""/>
</Data>
<Font>
<Name Value="helvetica [urw]"/>
<Size Value="10"/>
<Color Value="clBlack"/>
<Charset Value="0"/>
<Style Value=""/>
</Font>
<Highlight>
<FontStyle Value="2"/>
<FontColor Value="clBlack"/>
<FillColor Value="clWhite"/>
<HighlightStr Value=""/>
</Highlight>
<Alignment Value="taLeftJustify"/>
<Layout Value="tlTop"/>
<Angle Value="0"/>
</Object1>
<Object2>
<Name Value="Memo1"/>
<ClassName Value="TfrMemoView"/>
<Visible Value="1"/>
<Typ Value="gtMemo"/>
<StreamMode Value="0"/>
<Size>
<Left Value="32"/>
<Top Value="32"/>
<Width Value="60"/>
<Height Value="48"/>
</Size>
<Flags Value="3"/>
<FillColor Value="clNone"/>
<Frames>
<FrameWidth Value="1"/>
<FrameColor Value="clBlack"/>
<FrameBorders Value="frbLeft,frbTop,frbRight,frbBottom"/>
<FrameStyle Value="frsSolid"/>
</Frames>
<Data>
<Format Value="558"/>
<FormatStr Value=""/>
<Memo Value=""/>
<Script Value=""/>
</Data>
<Font>
<Name Value="helvetica [urw]"/>
<Size Value="10"/>
<Color Value="clBlack"/>
<Charset Value="0"/>
<Style Value=""/>
</Font>
<Highlight>
<FontStyle Value="2"/>
<FontColor Value="clBlack"/>
<FillColor Value="clWhite"/>
<HighlightStr Value=""/>
</Highlight>
<Alignment Value="taLeftJustify"/>
<Layout Value="tlTop"/>
<Angle Value="0"/>
</Object2>
<Object3>
<Name Value="Memo2"/>
<ClassName Value="TfrMemoView"/>
<Visible Value="1"/>
<Typ Value="gtMemo"/>
<StreamMode Value="0"/>
<Size>
<Left Value="680"/>
<Top Value="32"/>
<Width Value="60"/>
<Height Value="48"/>
</Size>
<Flags Value="3"/>
<FillColor Value="clNone"/>
<Frames>
<FrameWidth Value="1"/>
<FrameColor Value="clBlack"/>
<FrameBorders Value="frbLeft,frbTop,frbRight,frbBottom"/>
<FrameStyle Value="frsSolid"/>
</Frames>
<Data>
<Format Value="558"/>
<FormatStr Value=""/>
<Memo Value=""/>
<Script Value=""/>
</Data>
<Font>
<Name Value="helvetica [urw]"/>
<Size Value="10"/>
<Color Value="clBlack"/>
<Charset Value="0"/>
<Style Value=""/>
</Font>
<Highlight>
<FontStyle Value="2"/>
<FontColor Value="clBlack"/>
<FillColor Value="clWhite"/>
<HighlightStr Value=""/>
</Highlight>
<Alignment Value="taLeftJustify"/>
<Layout Value="tlTop"/>
<Angle Value="0"/>
</Object3>
<Object4>
<Name Value="Memo3"/>
<ClassName Value="TfrMemoView"/>
<Visible Value="1"/>
<Typ Value="gtMemo"/>
<StreamMode Value="0"/>
<Size>
<Left Value="32"/>
<Top Value="896"/>
<Width Value="60"/>
<Height Value="48"/>
</Size>
<Flags Value="3"/>
<FillColor Value="clNone"/>
<Frames>
<FrameWidth Value="1"/>
<FrameColor Value="clBlack"/>
<FrameBorders Value="frbLeft,frbTop,frbRight,frbBottom"/>
<FrameStyle Value="frsSolid"/>
</Frames>
<Data>
<Format Value="558"/>
<FormatStr Value=""/>
<Memo Value=""/>
<Script Value=""/>
</Data>
<Font>
<Name Value="helvetica [urw]"/>
<Size Value="10"/>
<Color Value="clBlack"/>
<Charset Value="0"/>
<Style Value=""/>
</Font>
<Highlight>
<FontStyle Value="2"/>
<FontColor Value="clBlack"/>
<FillColor Value="clWhite"/>
<HighlightStr Value=""/>
</Highlight>
<Alignment Value="taLeftJustify"/>
<Layout Value="tlTop"/>
<Angle Value="0"/>
</Object4>
<Object5>
<Name Value="Memo4"/>
<ClassName Value="TfrMemoView"/>
<Visible Value="1"/>
<Typ Value="gtMemo"/>
<StreamMode Value="0"/>
<Size>
<Left Value="680"/>
<Top Value="896"/>
<Width Value="60"/>
<Height Value="48"/>
</Size>
<Flags Value="3"/>
<FillColor Value="clNone"/>
<Frames>
<FrameWidth Value="1"/>
<FrameColor Value="clBlack"/>
<FrameBorders Value="frbLeft,frbTop,frbRight,frbBottom"/>
<FrameStyle Value="frsSolid"/>
</Frames>
<Data>
<Format Value="558"/>
<FormatStr Value=""/>
<Memo Value=""/>
<Script Value=""/>
</Data>
<Font>
<Name Value="helvetica [urw]"/>
<Size Value="10"/>
<Color Value="clBlack"/>
<Charset Value="0"/>
<Style Value=""/>
</Font>
<Highlight>
<FontStyle Value="2"/>
<FontColor Value="clBlack"/>
<FillColor Value="clWhite"/>
<HighlightStr Value=""/>
</Highlight>
<Alignment Value="taLeftJustify"/>
<Layout Value="tlTop"/>
<Angle Value="0"/>
</Object5>
<Object6>
<Name Value="Line1"/>
<ClassName Value="TfrLineView"/>
<Visible Value="1"/>
<Typ Value="gtLine"/>
<StreamMode Value="0"/>
<Size>
<Left Value="92"/>
<Top Value="80"/>
<Width Value="492"/>
<Height Value="0"/>
</Size>
<Flags Value="1"/>
</Object6>
<Object7>
<Name Value="Line2"/>
<ClassName Value="TfrLineView"/>
<Visible Value="1"/>
<Typ Value="gtLine"/>
<StreamMode Value="0"/>
<Size>
<Left Value="680"/>
<Top Value="80"/>
<Width Value="0"/>
<Height Value="476"/>
</Size>
<Flags Value="1"/>
</Object7>
<Object8>
<Name Value="Line3"/>
<ClassName Value="TfrLineView"/>
<Visible Value="1"/>
<Typ Value="gtLine"/>
<StreamMode Value="0"/>
<Size>
<Left Value="132"/>
<Top Value="896"/>
<Width Value="548"/>
<Height Value="0"/>
</Size>
<Flags Value="1"/>
</Object8>
<Object9>
<Name Value="Line4"/>
<ClassName Value="TfrLineView"/>
<Visible Value="1"/>
<Typ Value="gtLine"/>
<StreamMode Value="0"/>
<Size>
<Left Value="92"/>
<Top Value="500"/>
<Width Value="0"/>
<Height Value="396"/>
</Size>
<Flags Value="1"/>
</Object9>
<Object10>
<Name Value="Memo6"/>
<ClassName Value="TfrMemoView"/>
<Visible Value="1"/>
<Typ Value="gtMemo"/>
<StreamMode Value="0"/>
<Size>
<Left Value="180"/>
<Top Value="180"/>
<Width Value="252"/>
<Height Value="108"/>
</Size>
<Flags Value="3"/>
<FillColor Value="clNone"/>
<Frames>
<FrameWidth Value="1"/>
<FrameColor Value="clBlack"/>
<FrameBorders Value="frbLeft,frbTop,frbRight,frbBottom"/>
<FrameStyle Value="frsSolid"/>
</Frames>
<Data>
<Format Value="558"/>
<FormatStr Value=""/>
<Memo Value="THIS MEMO IS AT 50 MILIMETERS FROM LEFT BORDER OF SHEET AND 50 MM FROM TOP BORDER OF SHEET, IT'S HAS WIDTH OF 70 MM AND 30 MM OF HEIGHT&#xA;"/>
<Script Value=""/>
</Data>
<Font>
<Name Value="helvetica [urw]"/>
<Size Value="10"/>
<Color Value="clBlack"/>
<Charset Value="0"/>
<Style Value=""/>
</Font>
<Highlight>
<FontStyle Value="2"/>
<FontColor Value="clBlack"/>
<FillColor Value="clWhite"/>
<HighlightStr Value=""/>
</Highlight>
<Alignment Value="taLeftJustify"/>
<Layout Value="tlTop"/>
<Angle Value="0"/>
</Object10>
</Page1>
<FVal>
<Count Value="0"/>
</FVal>
<ParentVars Value=""/>
</Pages>
</LazReport>
</CONFIG>