Components, LazReport: made barcode sample work again, removed absolute path

git-svn-id: trunk@31896 -
2025-04-24 01:59:43 +02:00 · 2011-08-06 16:37:35 +00:00 · 2011-08-06 16:37:35 +00:00 · 31e3441f8b
commit 31e3441f8b
parent 8236371d00
7 changed files with 95 additions and 95 deletions
--- a/.gitattributes
+++ b/.gitattributes
@ -1468,7 +1468,6 @@ components/lazreport/license.txt svneol=native#text/plain
 components/lazreport/samples/barcode/cb.lpi svneol=native#text/plain
 components/lazreport/samples/barcode/cb.lpr svneol=native#text/pascal
 components/lazreport/samples/barcode/cbunit.lfm svneol=native#text/plain
-components/lazreport/samples/barcode/cbunit.lrs svneol=native#text/pascal
 components/lazreport/samples/barcode/cbunit.pas svneol=native#text/pascal
 components/lazreport/samples/barcode/reports/codigobarras.lrf svneol=native#text/xml
 components/lazreport/samples/editor/albumsbycountry.lrf svneol=LF#text/xml eol=lf
--- a/components/lazreport/samples/barcode/cb.lpi
+++ b/components/lazreport/samples/barcode/cb.lpi
@ -1,21 +1,25 @@
 <?xml version="1.0"?>
 <CONFIG>
  <ProjectOptions>
+    <Version Value="9"/>
    <PathDelim Value="\"/>
-    <Version Value="5"/>
    <General>
      <Flags>
        <SaveClosedFiles Value="False"/>
        <SaveOnlyProjectUnits Value="True"/>
+        <LRSInOutputDirectory Value="False"/>
      </Flags>
      <MainUnit Value="0"/>
-      <IconPath Value=".\"/>
-      <TargetFileExt Value=".exe"/>
-      <ActiveEditorIndexAtStart Value="0"/>
+      <ResourceType Value="res"/>
+      <UseXPManifest Value="True"/>
+      <ActiveWindowIndexAtStart Value="0"/>
    </General>
    <VersionInfo>
-      <ProjectVersion Value=""/>
+      <StringTable ProductVersion=""/>
    </VersionInfo>
+    <BuildModes Count="1">
+      <Item1 Name="default" Default="True"/>
+    </BuildModes>
    <PublishOptions>
      <Version Value="2"/>
      <DestinationDirectory Value="$(TestDir)\publishedproject\"/>
@ -29,53 +33,66 @@
        <LaunchingApplication PathPlusParams="\usr\X11R6\bin\xterm -T 'Lazarus Run Output' -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/>
      </local>
    </RunParams>
-    <RequiredPackages Count="4">
+    <RequiredPackages Count="3">
      <Item1>
        <PackageName Value="LCL"/>
      </Item1>
      <Item2>
        <PackageName Value="lazreport"/>
-        <MinVersion Minor="9" Release="4" Valid="True"/>
+        <MinVersion Minor="9" Valid="True" Release="4"/>
      </Item2>
      <Item3>
-        <PackageName Value="FCL"/>
-        <MinVersion Major="1" Valid="True"/>
-      </Item3>
-      <Item4>
        <PackageName Value="DBFLaz"/>
-        <MinVersion Minor="1" Release="1" Valid="True"/>
-      </Item4>
+        <MinVersion Minor="1" Valid="True" Release="1"/>
+      </Item3>
    </RequiredPackages>
    <Units Count="2">
      <Unit0>
        <Filename Value="cb.lpr"/>
        <IsPartOfProject Value="True"/>
        <UnitName Value="cb"/>
-        <CursorPos X="27" Y="11"/>
+        <EditorIndex Value="1"/>
+        <WindowIndex Value="0"/>
        <TopLine Value="1"/>
+        <CursorPos X="51" Y="20"/>
        <UsageCount Value="26"/>
+        <Loaded Value="True"/>
      </Unit0>
      <Unit1>
        <Filename Value="cbunit.pas"/>
-        <ComponentName Value="Form1"/>
        <IsPartOfProject Value="True"/>
-        <ResourceFilename Value="cbunit.lrs"/>
+        <ComponentName Value="Form1"/>
+        <ResourceBaseClass Value="Form"/>
        <UnitName Value="cbunit"/>
-        <CursorPos X="54" Y="63"/>
-        <TopLine Value="33"/>
+        <IsVisibleTab Value="True"/>
        <EditorIndex Value="0"/>
+        <WindowIndex Value="0"/>
+        <TopLine Value="22"/>
+        <CursorPos X="47" Y="49"/>
        <UsageCount Value="26"/>
        <Loaded Value="True"/>
+        <LoadedDesigner Value="True"/>
      </Unit1>
    </Units>
  </ProjectOptions>
  <CompilerOptions>
-    <Version Value="5"/>
+    <Version Value="10"/>
    <PathDelim Value="\"/>
-    <CodeGeneration>
-      <Generate Value="Faster"/>
-    </CodeGeneration>
+    <Target>
+      <Filename Value="cb"/>
+    </Target>
+    <SearchPaths>
+      <UnitOutputDirectory Value="units/$(TargetCPU)-$(TargetOS)"/>
+    </SearchPaths>
+    <Parsing>
+      <SyntaxOptions>
+        <UseAnsiStrings Value="False"/>
+      </SyntaxOptions>
+    </Parsing>
    <Other>
+      <CompilerMessages>
+        <UseMsgFile Value="True"/>
+      </CompilerMessages>
      <CompilerPath Value="$(CompPath)"/>
    </Other>
  </CompilerOptions>
--- a/components/lazreport/samples/barcode/cb.lpr
+++ b/components/lazreport/samples/barcode/cb.lpr
@ -10,6 +10,8 @@ uses
  Forms
  { add your units here }, cbunit, DBFLaz, lazreport;

+{$R *.res}
+
 begin
  Application.Initialize;
  Application.CreateForm(TForm1, Form1);
--- a/components/lazreport/samples/barcode/cbunit.lfm
+++ b/components/lazreport/samples/barcode/cbunit.lfm
@ -1,7 +1,7 @@
 object Form1: TForm1
-  Left = 302
+  Left = 301
  Height = 151
-  Top = 154
+  Top = 162
  Width = 685
  HorzScrollBar.Page = 684
  VertScrollBar.Page = 150
@ -10,19 +10,16 @@ object Form1: TForm1
  ClientHeight = 151
  ClientWidth = 685
  OnCreate = FormCreate
+  LCLVersion = '0.9.31'
  object DBGrid1: TDBGrid
    Left = 8
    Height = 100
    Top = 40
    Width = 632
+    Color = clWindow
+    Columns = <>
    DataSource = Datasource1
-    FixedColor = clBtnFace
-    FixedHotColor = cl3DLight
-    Options = [dgEditing, dgTitles, dgIndicator, dgColumnResize, dgColumnMove, dgColLines, dgRowLines, dgTabs, dgAlwaysShowSelection, dgConfirmDelete, dgCancelOnExit]
-    OptionsExtra = [dgeAutoColumns, dgeCheckboxColumn]
-    ParentColor = False
    TabOrder = 0
-    TabStop = True
  end
  object Button1: TButton
    Left = 456
@ -45,10 +42,10 @@ object Form1: TForm1
    TabOrder = 2
  end
  object Dbf1: TDbf
-    FilePath = 'C:\Documents and Settings\javiVF\Escritorio\lazarus\Proyectos\cb\db\/\'
    IndexDefs = <>
    TableName = 'disco.dbf'
    TableLevel = 3
+    FilterOptions = []
  end
  object Datasource1: TDatasource
    DataSet = Dbf1
@ -60,10 +57,13 @@ object Form1: TForm1
  end
  object frReport1: TfrReport
    Dataset = frDBDataSet1
+    InitialZoom = pzDefault
+    Options = []
    PreviewButtons = [pbZoom, pbLoad, pbSave, pbPrint, pbFind, pbHelp, pbExit]
+    DataType = dtDataSet
    top = 124
    ReportForm = {
-      18000000
+      19000000
    }
  end
  object frBarCodeObject1: TfrBarCodeObject
--- a/components/lazreport/samples/barcode/cbunit.lrs
+++ b/components/lazreport/samples/barcode/cbunit.lrs
@ -1,29 +0,0 @@
-{ Este es un archivo de recurso de Lazarus generado automaticamente }
-
-LazarusResources.Add('TForm1','FORMDATA',[
-  'TPF0'#6'TForm1'#5'Form1'#4'Left'#3'.'#1#6'Height'#3#151#0#3'Top'#3#154#0#5'W'
-  +'idth'#3#173#2#18'HorzScrollBar.Page'#3#172#2#18'VertScrollBar.Page'#3#150#0
-  +#13'ActiveControl'#7#7'DBGrid1'#7'Caption'#6#5'Form1'#12'ClientHeight'#3#151
-  +#0#11'ClientWidth'#3#173#2#8'OnCreate'#7#10'FormCreate'#0#7'TDBGrid'#7'DBGri'
-  +'d1'#4'Left'#2#8#6'Height'#2'd'#3'Top'#2'('#5'Width'#3'x'#2#10'DataSource'#7
-  +#11'Datasource1'#10'FixedColor'#7#9'clBtnFace'#13'FixedHotColor'#7#9'cl3DLig'
-  +'ht'#7'Options'#11#9'dgEditing'#8'dgTitles'#11'dgIndicator'#14'dgColumnResiz'
-  +'e'#12'dgColumnMove'#10'dgColLines'#10'dgRowLines'#6'dgTabs'#21'dgAlwaysShow'
-  +'Selection'#15'dgConfirmDelete'#14'dgCancelOnExit'#0#12'OptionsExtra'#11#14
-  +'dgeAutoColumns'#17'dgeCheckboxColumn'#0#11'ParentColor'#8#8'TabOrder'#2#0#7
-  +'TabStop'#9#0#0#7'TButton'#7'Button1'#4'Left'#3#200#1#6'Height'#2#25#3'Top'#2
-  +#8#5'Width'#2'K'#25'BorderSpacing.InnerBorder'#2#4#7'Caption'#6#12'DesignRep'
-  +'ort'#7'OnClick'#7#12'Button1Click'#8'TabOrder'#2#1#0#0#7'TButton'#7'Button2'
-  +#4'Left'#3' '#2#6'Height'#2#25#3'Top'#2#8#5'Width'#2'K'#25'BorderSpacing.Inn'
-  +'erBorder'#2#4#7'Caption'#6#10'ShowReport'#7'OnClick'#7#12'Button2Click'#8'T'
-  +'abOrder'#2#2#0#0#4'TDbf'#4'Dbf1'#8'FilePath'#6'FC:\Documents and Settings\j'
-  +'aviVF\Escritorio\lazarus\Proyectos\cb\db\/\'#9'IndexDefs'#14#0#9'TableName'
-  +#6#9'disco.dbf'#10'TableLevel'#2#3#0#0#11'TDatasource'#11'Datasource1'#7'Dat'
-  +'aSet'#7#4'Dbf1'#3'top'#2' '#0#0#12'TfrDBDataSet'#12'frDBDataSet1'#7'DataSet'
-  +#7#4'Dbf1'#3'top'#2'`'#0#0#9'TfrReport'#9'frReport1'#7'Dataset'#7#12'frDBDat'
-  +'aSet1'#14'PreviewButtons'#11#6'pbZoom'#6'pbLoad'#6'pbSave'#7'pbPrint'#6'pbF'
-  +'ind'#6'pbHelp'#6'pbExit'#0#3'top'#2'|'#10'ReportForm'#10#4#0#0#0#24#0#0#0#0
-  +#0#16'TfrBarCodeObject'#16'frBarCodeObject1'#3'top'#2'|'#0#0#11'TOpenDialog'
-  +#11'OpenDialog1'#5'Title'#6#26'Abrir un archivo existente'#11'FilterIndex'#2
-  +#0#3'top'#2'@'#0#0#0
-]);
--- a/components/lazreport/samples/barcode/cbunit.pas
+++ b/components/lazreport/samples/barcode/cbunit.pas
@ -6,7 +6,7 @@ interface

 uses
  Classes, SysUtils, LResources, Forms, Controls, Graphics, Dialogs, dbf, db,
-  DBGrids, LR_DBSet, LR_Class, LR_BarC, Buttons;
+  DBGrids, LR_DBSet, LR_Class, LR_BarC, Buttons, StdCtrls;

 type

@ -36,6 +36,8 @@ var

 implementation

+{$R *.lfm}
+
 { TForm1 }

 procedure TForm1.Button1Click(Sender: TObject);
@ -61,8 +63,5 @@ begin
  Dbf1.Open;
 end;

-initialization
-  {$I cbunit.lrs}
-
 end.

--- a/components/lazreport/samples/barcode/reports/codigobarras.lrf
+++ b/components/lazreport/samples/barcode/reports/codigobarras.lrf
@ -1,22 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <CONFIG>
  <LazReport>
-    <Version Value="24"/>
+    <Version Value="25"/>
    <Title Value=""/>
    <Subject Value=""/>
    <KeyWords Value=""/>
    <Comments Value=""/>
+    <ReportVersionBuild Value=""/>
+    <ReportVersionMajor Value=""/>
+    <ReportVersionMinor Value=""/>
+    <ReportVersionRelease Value=""/>
+    <ReportAutor Value=""/>
    <Pages>
      <PrintToDefault Value="True"/>
      <DoublePass Value="False"/>
-      <SelectedPrinter Value="hp psc 1310 series"/>
+      <SelectedPrinter Value="Epson Stylus COLOR 440 ESC/P 2"/>
      <PageCount Value="1"/>
      <Page1>
        <Name Value="Page1"/>
        <ClassName Value="TfrPageReport"/>
        <Visible Value="1"/>
-        <Width Value="4799"/>
-        <Height Value="6674" PageType="0"/>
+        <Width Value="1"/>
+        <Height Value="1" PageType="0"/>
        <PgSize Value="9"/>
        <Margins>
          <left Value="0"/>
@ -29,6 +34,7 @@
        <PrintToPrevPage Value="False"/>
        <ColCount Value="2"/>
        <ColGap Value="0"/>
+        <LayoutOrder Value="loColumns"/>
        <ObjectCount Value="11"/>
        <Object1>
          <Name Value="MasterData1"/>
@ -43,7 +49,9 @@
            <Height Value="228"/>
          </Size>
          <Flags Value="48"/>
-          <Data><Script Value=""/></Data>
+          <Data>
+            <Script Value=""/>
+          </Data>
          <BandType Value="btMasterData"/>
          <Condition Value=""/>
          <DatasetStr Value="frDBDataSet1"/>
@ -62,12 +70,14 @@
          </Size>
          <Flags Value="1"/>
          <Frames>
-            <FrameWidth Value="6"/>
            <FrameColor Value="clGreen"/>
-            <FrameBorders Value=""/>
            <FrameStyle Value="frsSolid"/>
+            <FrameWidth Value="6"/>
+            <FrameBorders Value=""/>
          </Frames>
-          <Data><Memo Value="[Dbf1.&quot;AUTHOR&quot;]&#xD;&#xA;"/></Data>
+          <Data>
+            <Memo Value="[Dbf1.&quot;AUTHOR&quot;]&#xD;&#xA;"/>
+          </Data>
          <BarCode Zoom="1" BarType="bcCode128A" CheckSum="1" ShowText="1"/>
        </Object2>
        <Object3>
@ -85,10 +95,10 @@
          <Flags Value="3"/>
          <FillColor Value="clNone"/>
          <Frames>
-            <FrameWidth Value="1"/>
            <FrameColor Value="clBlack"/>
-            <FrameBorders Value=""/>
            <FrameStyle Value="frsSolid"/>
+            <FrameWidth Value="1"/>
+            <FrameBorders Value=""/>
          </Frames>
          <Data>
            <Format Value="556"/>
@ -128,10 +138,10 @@
          <Flags Value="3"/>
          <FillColor Value="clNone"/>
          <Frames>
-            <FrameWidth Value="1"/>
            <FrameColor Value="clBlack"/>
-            <FrameBorders Value=""/>
            <FrameStyle Value="frsSolid"/>
+            <FrameWidth Value="1"/>
+            <FrameBorders Value=""/>
          </Frames>
          <Data>
            <Format Value="556"/>
@ -171,15 +181,15 @@
          <Flags Value="3"/>
          <FillColor Value="clNone"/>
          <Frames>
-            <FrameWidth Value="1"/>
            <FrameColor Value="clBlack"/>
-            <FrameBorders Value=""/>
            <FrameStyle Value="frsSolid"/>
+            <FrameWidth Value="1"/>
+            <FrameBorders Value=""/>
          </Frames>
          <Data>
            <Format Value="556"/>
            <FormatStr Value=""/>
-            <Memo Value="[Dbf1.&quot;COUNTRY&quot;] &#xD;&#xA;"/>
+            <Memo Value="[Dbf1.&quot;COUNTRYID&quot;] &#xD;&#xA;"/>
            <Script Value=""/>
          </Data>
          <Font>
@ -214,10 +224,10 @@
          <Flags Value="3"/>
          <FillColor Value="clNone"/>
          <Frames>
-            <FrameWidth Value="1"/>
            <FrameColor Value="clBlack"/>
-            <FrameBorders Value=""/>
            <FrameStyle Value="frsSolid"/>
+            <FrameWidth Value="1"/>
+            <FrameBorders Value=""/>
          </Frames>
          <Data>
            <Format Value="556"/>
@ -257,10 +267,10 @@
          <Flags Value="3"/>
          <FillColor Value="clNone"/>
          <Frames>
-            <FrameWidth Value="1"/>
            <FrameColor Value="clBlack"/>
-            <FrameBorders Value=""/>
            <FrameStyle Value="frsSolid"/>
+            <FrameWidth Value="1"/>
+            <FrameBorders Value=""/>
          </Frames>
          <Data>
            <Format Value="556"/>
@ -300,10 +310,10 @@
          <Flags Value="3"/>
          <FillColor Value="clNone"/>
          <Frames>
-            <FrameWidth Value="1"/>
            <FrameColor Value="clBlack"/>
-            <FrameBorders Value=""/>
            <FrameStyle Value="frsSolid"/>
+            <FrameWidth Value="1"/>
+            <FrameBorders Value=""/>
          </Frames>
          <Data>
            <Format Value="556"/>
@ -343,10 +353,10 @@
          <Flags Value="3"/>
          <FillColor Value="clNone"/>
          <Frames>
-            <FrameWidth Value="1"/>
            <FrameColor Value="clBlack"/>
-            <FrameBorders Value=""/>
            <FrameStyle Value="frsSolid"/>
+            <FrameWidth Value="1"/>
+            <FrameBorders Value=""/>
          </Frames>
          <Data>
            <Format Value="556"/>
@ -386,10 +396,10 @@
          <Flags Value="3"/>
          <FillColor Value="clNone"/>
          <Frames>
-            <FrameWidth Value="1"/>
            <FrameColor Value="clBlack"/>
-            <FrameBorders Value=""/>
            <FrameStyle Value="frsSolid"/>
+            <FrameWidth Value="1"/>
+            <FrameBorders Value=""/>
          </Frames>
          <Data>
            <Format Value="556"/>
@ -429,10 +439,10 @@
          <Flags Value="3"/>
          <FillColor Value="clNone"/>
          <Frames>
-            <FrameWidth Value="1"/>
            <FrameColor Value="clBlack"/>
-            <FrameBorders Value=""/>
            <FrameStyle Value="frsSolid"/>
+            <FrameWidth Value="1"/>
+            <FrameBorders Value=""/>
          </Frames>
          <Data>
            <Format Value="556"/>
@ -458,7 +468,9 @@
          <Angle Value="0"/>
        </Object11>
      </Page1>
-      <FVal><Count Value="0"/></FVal>
+      <FVal>
+        <Count Value="0"/>
+      </FVal>
      <ParentVars Value=""/>
    </Pages>
  </LazReport>