LazReport, editor sample layout improvement and change to fpc resources, missing localized items, from Aleksey Lagunov

git-svn-id: trunk@23746 -
2025-06-03 04:38:13 +02:00 · 2010-02-19 21:28:56 +00:00 · 2010-02-19 21:28:56 +00:00 · ab29a9ca68
commit ab29a9ca68
parent ec6f9fbae0
14 changed files with 286 additions and 174 deletions
--- a/.gitattributes
+++ b/.gitattributes
@ -1264,6 +1264,7 @@ components/lazreport/samples/barcode/reports/codigobarras.lrf svneol=native#text
 components/lazreport/samples/editor/albumsbycountry.lrf svneol=LF#text/xml eol=lf
 components/lazreport/samples/editor/calleditorwithpkg.lpi svneol=native#text/plain
 components/lazreport/samples/editor/calleditorwithpkg.lpr svneol=native#text/pascal
+components/lazreport/samples/editor/calleditorwithpkg.res -text
 components/lazreport/samples/editor/csvtest.lrf svneol=LF#text/xml eol=lf
 components/lazreport/samples/editor/db/disco.dbf -text
 components/lazreport/samples/editor/db/disco.mdx -text
@ -1275,7 +1276,6 @@ components/lazreport/samples/editor/languages/calleditorwithpkg.pb.po svneol=nat
 components/lazreport/samples/editor/languages/calleditorwithpkg.po svneol=native#text/plain
 components/lazreport/samples/editor/languages/calleditorwithpkg.ru.po svneol=native#text/plain
 components/lazreport/samples/editor/maincalleditor.lfm svneol=native#text/plain
-components/lazreport/samples/editor/maincalleditor.lrs svneol=native#text/pascal
 components/lazreport/samples/editor/maincalleditor.pas svneol=native#text/pascal
 components/lazreport/samples/editor/readme.txt svneol=native#text/plain
 components/lazreport/samples/editor/rpta.lrf svneol=LF#text/xml eol=lf
--- a/components/lazreport/samples/editor/calleditorwithpkg.lpi
+++ b/components/lazreport/samples/editor/calleditorwithpkg.lpi
@ -12,11 +12,16 @@
      <MainUnit Value="0"/>
      <TargetFileExt Value=""/>
      <Title Value="LazReport Designer"/>
+      <ResourceType Value="res"/>
+      <UseXPManifest Value="True"/>
    </General>
    <i18n>
      <EnableI18N Value="True"/>
      <OutDir Value="languages"/>
    </i18n>
+    <VersionInfo>
+      <StringTable Comments="" CompanyName="" FileDescription="" FileVersion="0.0.0.0" InternalName="" LegalCopyright="" LegalTrademarks="" OriginalFilename="" ProductName="" ProductVersion="0.0.0.0"/>
+    </VersionInfo>
    <PublishOptions>
      <Version Value="2"/>
      <IgnoreBinaries Value="False"/>
@ -70,7 +75,11 @@
  </ProjectOptions>
  <CompilerOptions>
    <Version Value="8"/>
+    <Target>
+      <Filename Value="calleditorwithpkg"/>
+    </Target>
    <SearchPaths>
+      <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)"/>
      <SrcPath Value="$(LazarusDir)/lcl/;$(LazarusDir)/lcl/interfaces/$(LCLWidgetType)/"/>
    </SearchPaths>
    <Other>
--- a/components/lazreport/samples/editor/calleditorwithpkg.lpr
+++ b/components/lazreport/samples/editor/calleditorwithpkg.lpr
@ -4,8 +4,12 @@ program calleditorwithpkg;

 uses
  Interfaces, // this includes the LCL widgetset
-  Forms
-  { add your units here }, maincalleditor, lazreportpdfexport, lazreport;
+  Forms,
+  maincalleditor,
+  lazreportpdfexport,
+  lazreport;
+
+{$R calleditorwithpkg.res}

 begin
  Application.Title:='LazReport Designer';
--- a/components/lazreport/samples/editor/calleditorwithpkg.res
+++ b/components/lazreport/samples/editor/calleditorwithpkg.res
--- a/components/lazreport/samples/editor/languages/calleditorwithpkg.de.po
+++ b/components/lazreport/samples/editor/languages/calleditorwithpkg.de.po
@ -21,6 +21,11 @@ msgctxt "maincalleditor.cerappcaption"
 msgid "LazReport Test Suite"
 msgstr "Testen des LazReport-Editors"

+#: maincalleditor.cercomposite
+msgctxt "maincalleditor.cercomposite"
+msgid "Composite"
+msgstr ""
+
 #: maincalleditor.cereditreport
 msgctxt "maincalleditor.cereditreport"
 msgid "Edit Report"
@ -30,6 +35,10 @@ msgstr "Report bearbeiten"
 msgid "Close application"
 msgstr ""

+#: maincalleditor.cerhintcomposite
+msgid "This Action will Load and Preview a composite Report"
+msgstr ""
+
 #: maincalleditor.cerhinteditreport
 msgid "Edit active report"
 msgstr ""
@ -59,6 +68,7 @@ msgid "This Action will Load and Preview a thumbnails Report"
 msgstr ""

 #: maincalleditor.cerindex
+msgctxt "maincalleditor.cerindex"
 msgid "Index"
 msgstr ""

@ -112,6 +122,7 @@ msgid "Close"
 msgstr "Schließen"

 #: TFRMMAIN.ACCCOMPOSITE.CAPTION
+msgctxt "TFRMMAIN.ACCCOMPOSITE.CAPTION"
 msgid "Composite"
 msgstr ""

@ -166,6 +177,15 @@ msgctxt "TFRMMAIN.CAPTION"
 msgid "LazReport Test Suite"
 msgstr "Testen des LazReport-Editors"

+#: TFRMMAIN.LBLEXPR.CAPTION
+msgid "Expression"
+msgstr ""
+
+#: TFRMMAIN.LBLINDEX.CAPTION
+msgctxt "TFRMMAIN.LBLINDEX.CAPTION"
+msgid "Index"
+msgstr ""
+
 #: TFRMMAIN.MENUITEM1.CAPTION
 msgid "Files"
 msgstr "Dateien"
--- a/components/lazreport/samples/editor/languages/calleditorwithpkg.es.po
+++ b/components/lazreport/samples/editor/languages/calleditorwithpkg.es.po
@ -18,6 +18,11 @@ msgctxt "maincalleditor.cerappcaption"
 msgid "LazReport Test Suite"
 msgstr "Banco de pruebas de LazReport"

+#: maincalleditor.cercomposite
+msgctxt "maincalleditor.cercomposite"
+msgid "Composite"
+msgstr "Compuesto"
+
 #: maincalleditor.cereditreport
 msgctxt "maincalleditor.cereditreport"
 msgid "Edit Report"
@ -27,6 +32,10 @@ msgstr "Editar Reporte"
 msgid "Close application"
 msgstr "Cerrar aplicación"

+#: maincalleditor.cerhintcomposite
+msgid "This Action will Load and Preview a composite Report"
+msgstr ""
+
 #: maincalleditor.cerhinteditreport
 msgid "Edit active report"
 msgstr "Editar reporte activo"
@ -56,6 +65,7 @@ msgid "This Action will Load and Preview a thumbnails Report"
 msgstr "Esta acción cargará y mostrará una vista previa del reporte de imágenes"

 #: maincalleditor.cerindex
+msgctxt "maincalleditor.cerindex"
 msgid "Index"
 msgstr "Indice"

@ -109,6 +119,7 @@ msgid "Close"
 msgstr "Cerrar"

 #: TFRMMAIN.ACCCOMPOSITE.CAPTION
+msgctxt "TFRMMAIN.ACCCOMPOSITE.CAPTION"
 msgid "Composite"
 msgstr "Compuesto"

@ -163,6 +174,15 @@ msgctxt "TFRMMAIN.CAPTION"
 msgid "LazReport Test Suite"
 msgstr "Banco de pruebas de LazReport"

+#: TFRMMAIN.LBLEXPR.CAPTION
+msgid "Expression"
+msgstr ""
+
+#: TFRMMAIN.LBLINDEX.CAPTION
+msgctxt "TFRMMAIN.LBLINDEX.CAPTION"
+msgid "Index"
+msgstr "Indice"
+
 #: TFRMMAIN.MENUITEM1.CAPTION
 msgid "Files"
 msgstr "Archivos"
--- a/components/lazreport/samples/editor/languages/calleditorwithpkg.fr.po
+++ b/components/lazreport/samples/editor/languages/calleditorwithpkg.fr.po
@ -18,6 +18,11 @@ msgctxt "maincalleditor.cerappcaption"
 msgid "LazReport Test Suite"
 msgstr "Suite de tests LazReport "

+#: maincalleditor.cercomposite
+msgctxt "maincalleditor.cercomposite"
+msgid "Composite"
+msgstr ""
+
 #: maincalleditor.cereditreport
 msgctxt "maincalleditor.cereditreport"
 msgid "Edit Report"
@ -27,6 +32,10 @@ msgstr "Edite Rapport"
 msgid "Close application"
 msgstr "Fermer l'application"

+#: maincalleditor.cerhintcomposite
+msgid "This Action will Load and Preview a composite Report"
+msgstr ""
+
 #: maincalleditor.cerhinteditreport
 msgid "Edit active report"
 msgstr "Edite Rapport Actif"
@ -56,6 +65,7 @@ msgid "This Action will Load and Preview a thumbnails Report"
 msgstr "Cette action va charger et donner l'aperçu d'un rapport sous forme de vignettes"

 #: maincalleditor.cerindex
+msgctxt "maincalleditor.cerindex"
 msgid "Index"
 msgstr "Index"

@ -110,6 +120,7 @@ msgid "Close"
 msgstr "Quitter"

 #: TFRMMAIN.ACCCOMPOSITE.CAPTION
+msgctxt "TFRMMAIN.ACCCOMPOSITE.CAPTION"
 msgid "Composite"
 msgstr ""

@ -167,6 +178,15 @@ msgctxt "TFRMMAIN.CAPTION"
 msgid "LazReport Test Suite"
 msgstr "Suite de tests LazReport "

+#: TFRMMAIN.LBLEXPR.CAPTION
+msgid "Expression"
+msgstr ""
+
+#: TFRMMAIN.LBLINDEX.CAPTION
+msgctxt "TFRMMAIN.LBLINDEX.CAPTION"
+msgid "Index"
+msgstr "Index"
+
 #: TFRMMAIN.MENUITEM1.CAPTION
 msgctxt "TFRMMAIN.MENUITEM1.CAPTION"
 msgid "Files"
--- a/components/lazreport/samples/editor/languages/calleditorwithpkg.lt.po
+++ b/components/lazreport/samples/editor/languages/calleditorwithpkg.lt.po
@ -21,6 +21,11 @@ msgctxt "maincalleditor.cerappcaption"
 msgid "LazReport Test Suite"
 msgstr "LazReport testavimo paketas"

+#: maincalleditor.cercomposite
+msgctxt "maincalleditor.cercomposite"
+msgid "Composite"
+msgstr ""
+
 #: maincalleditor.cereditreport
 msgctxt "maincalleditor.cereditreport"
 msgid "Edit Report"
@ -30,6 +35,10 @@ msgstr "Keisti pranešimą"
 msgid "Close application"
 msgstr ""

+#: maincalleditor.cerhintcomposite
+msgid "This Action will Load and Preview a composite Report"
+msgstr ""
+
 #: maincalleditor.cerhinteditreport
 msgid "Edit active report"
 msgstr ""
@ -59,6 +68,7 @@ msgid "This Action will Load and Preview a thumbnails Report"
 msgstr ""

 #: maincalleditor.cerindex
+msgctxt "maincalleditor.cerindex"
 msgid "Index"
 msgstr ""

@ -112,6 +122,7 @@ msgid "Close"
 msgstr "Užverti"

 #: TFRMMAIN.ACCCOMPOSITE.CAPTION
+msgctxt "TFRMMAIN.ACCCOMPOSITE.CAPTION"
 msgid "Composite"
 msgstr ""

@ -166,6 +177,15 @@ msgctxt "TFRMMAIN.CAPTION"
 msgid "LazReport Test Suite"
 msgstr "LazReport testavimo paketas"

+#: TFRMMAIN.LBLEXPR.CAPTION
+msgid "Expression"
+msgstr ""
+
+#: TFRMMAIN.LBLINDEX.CAPTION
+msgctxt "TFRMMAIN.LBLINDEX.CAPTION"
+msgid "Index"
+msgstr ""
+
 #: TFRMMAIN.MENUITEM1.CAPTION
 msgid "Files"
 msgstr "Failai"
--- a/components/lazreport/samples/editor/languages/calleditorwithpkg.pb.po
+++ b/components/lazreport/samples/editor/languages/calleditorwithpkg.pb.po
@ -18,6 +18,11 @@ msgctxt "maincalleditor.cerappcaption"
 msgid "LazReport Test Suite"
 msgstr "Acompanhamento Teste LazReport"

+#: maincalleditor.cercomposite
+msgctxt "maincalleditor.cercomposite"
+msgid "Composite"
+msgstr ""
+
 #: maincalleditor.cereditreport
 msgctxt "maincalleditor.cereditreport"
 msgid "Edit Report"
@ -27,6 +32,10 @@ msgstr "Editar Relatório"
 msgid "Close application"
 msgstr ""

+#: maincalleditor.cerhintcomposite
+msgid "This Action will Load and Preview a composite Report"
+msgstr ""
+
 #: maincalleditor.cerhinteditreport
 msgid "Edit active report"
 msgstr ""
@ -56,6 +65,7 @@ msgid "This Action will Load and Preview a thumbnails Report"
 msgstr ""

 #: maincalleditor.cerindex
+msgctxt "maincalleditor.cerindex"
 msgid "Index"
 msgstr ""

@ -109,6 +119,7 @@ msgid "Close"
 msgstr "Fechar"

 #: TFRMMAIN.ACCCOMPOSITE.CAPTION
+msgctxt "TFRMMAIN.ACCCOMPOSITE.CAPTION"
 msgid "Composite"
 msgstr ""

@ -163,6 +174,15 @@ msgctxt "TFRMMAIN.CAPTION"
 msgid "LazReport Test Suite"
 msgstr "Acompanhamento Teste LazReport"

+#: TFRMMAIN.LBLEXPR.CAPTION
+msgid "Expression"
+msgstr ""
+
+#: TFRMMAIN.LBLINDEX.CAPTION
+msgctxt "TFRMMAIN.LBLINDEX.CAPTION"
+msgid "Index"
+msgstr ""
+
 #: TFRMMAIN.MENUITEM1.CAPTION
 msgid "Files"
 msgstr "Arquivos"
--- a/components/lazreport/samples/editor/languages/calleditorwithpkg.po
+++ b/components/lazreport/samples/editor/languages/calleditorwithpkg.po
@ -13,6 +13,11 @@ msgctxt "maincalleditor.cerappcaption"
 msgid "LazReport Test Suite"
 msgstr ""

+#: maincalleditor.cercomposite
+msgctxt "maincalleditor.cercomposite"
+msgid "Composite"
+msgstr ""
+
 #: maincalleditor.cereditreport
 msgctxt "maincalleditor.cereditreport"
 msgid "Edit Report"
@ -22,6 +27,10 @@ msgstr ""
 msgid "Close application"
 msgstr ""

+#: maincalleditor.cerhintcomposite
+msgid "This Action will Load and Preview a composite Report"
+msgstr ""
+
 #: maincalleditor.cerhinteditreport
 msgid "Edit active report"
 msgstr ""
@ -51,6 +60,7 @@ msgid "This Action will Load and Preview a thumbnails Report"
 msgstr ""

 #: maincalleditor.cerindex
+msgctxt "maincalleditor.cerindex"
 msgid "Index"
 msgstr ""

@ -104,6 +114,7 @@ msgid "Close"
 msgstr ""

 #: TFRMMAIN.ACCCOMPOSITE.CAPTION
+msgctxt "TFRMMAIN.ACCCOMPOSITE.CAPTION"
 msgid "Composite"
 msgstr ""

@ -158,6 +169,15 @@ msgctxt "TFRMMAIN.CAPTION"
 msgid "LazReport Test Suite"
 msgstr ""

+#: TFRMMAIN.LBLEXPR.CAPTION
+msgid "Expression"
+msgstr ""
+
+#: TFRMMAIN.LBLINDEX.CAPTION
+msgctxt "TFRMMAIN.LBLINDEX.CAPTION"
+msgid "Index"
+msgstr ""
+
 #: TFRMMAIN.MENUITEM1.CAPTION
 msgid "Files"
 msgstr ""
--- a/components/lazreport/samples/editor/languages/calleditorwithpkg.ru.po
+++ b/components/lazreport/samples/editor/languages/calleditorwithpkg.ru.po
@ -18,6 +18,11 @@ msgctxt "maincalleditor.cerappcaption"
 msgid "LazReport Test Suite"
 msgstr "Тестовая программа для LazReport"

+#: maincalleditor.cercomposite
+msgctxt "maincalleditor.cercomposite"
+msgid "Composite"
+msgstr "Составной"
+
 #: maincalleditor.cereditreport
 msgctxt "maincalleditor.cereditreport"
 msgid "Edit Report"
@ -27,6 +32,10 @@ msgstr "Редактировать отчёт"
 msgid "Close application"
 msgstr "Закрыть приложение"

+#: maincalleditor.cerhintcomposite
+msgid "This Action will Load and Preview a composite Report"
+msgstr "Загрузка и просмотр составного отчёта"
+
 #: maincalleditor.cerhinteditreport
 msgid "Edit active report"
 msgstr "Редактировать активный отчёт"
@ -56,6 +65,7 @@ msgid "This Action will Load and Preview a thumbnails Report"
 msgstr "Загрузка и просмотр отчёта с эскизами"

 #: maincalleditor.cerindex
+msgctxt "maincalleditor.cerindex"
 msgid "Index"
 msgstr "Индекс"

@ -109,6 +119,7 @@ msgid "Close"
 msgstr "Закрыть"

 #: TFRMMAIN.ACCCOMPOSITE.CAPTION
+msgctxt "TFRMMAIN.ACCCOMPOSITE.CAPTION"
 msgid "Composite"
 msgstr "Составной"

@ -163,6 +174,15 @@ msgctxt "TFRMMAIN.CAPTION"
 msgid "LazReport Test Suite"
 msgstr "Тестовая программа для LazReport"

+#: TFRMMAIN.LBLEXPR.CAPTION
+msgid "Expression"
+msgstr ""
+
+#: TFRMMAIN.LBLINDEX.CAPTION
+msgctxt "TFRMMAIN.LBLINDEX.CAPTION"
+msgid "Index"
+msgstr "Индекс"
+
 #: TFRMMAIN.MENUITEM1.CAPTION
 msgid "Files"
 msgstr "Файлы"
--- a/components/lazreport/samples/editor/maincalleditor.lfm
+++ b/components/lazreport/samples/editor/maincalleditor.lfm
@ -1,75 +1,104 @@
 object frmMain: TfrmMain
-  Left = 277
-  Height = 433
-  Top = 127
-  Width = 569
+  Left = 20
+  Height = 545
+  Top = 111
+  Width = 800
  ActiveControl = btnCallEditor
  Caption = 'LazReport Test Suite'
-  ClientHeight = 413
-  ClientWidth = 569
+  ClientHeight = 524
+  ClientWidth = 800
  Menu = MainMenu1
  OnCreate = frmMainCreate
  ShowHint = True
  LCLVersion = '0.9.29'
  object lblIndex: TLabel
-    Left = 12
-    Height = 14
-    Top = 44
-    Width = 1
+    AnchorSideLeft.Control = Owner
+    AnchorSideBottom.Control = dbGrid1
+    Left = 6
+    Height = 16
+    Top = 54
+    Width = 32
+    Anchors = [akLeft, akBottom]
+    BorderSpacing.Around = 6
+    Caption = 'Index'
    ParentColor = False
  end
  object lblExpr: TLabel
-    Left = 235
-    Height = 14
-    Top = 44
-    Width = 1
+    AnchorSideRight.Control = Button5
+    AnchorSideBottom.Control = dbGrid1
+    Left = 560
+    Height = 16
+    Top = 54
+    Width = 66
+    Anchors = [akRight, akBottom]
+    BorderSpacing.Around = 6
+    Caption = 'Expression'
    ParentColor = False
  end
  object btnCallEditor: TButton
-    Left = 24
-    Height = 25
-    Top = 8
-    Width = 80
+    AnchorSideTop.Control = Owner
+    AnchorSideRight.Control = btnOpenReport
+    Left = 265
+    Height = 29
+    Top = 6
+    Width = 81
    Action = accNewReport
-    BorderSpacing.InnerBorder = 4
+    Anchors = [akTop, akRight]
+    AutoSize = True
+    BorderSpacing.Around = 6
    TabOrder = 0
  end
  object dbGrid1: TDBGrid
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = Button5
+    AnchorSideTop.Side = asrBottom
+    AnchorSideRight.Control = Owner
+    AnchorSideBottom.Control = sbar
    Left = 0
-    Height = 322
-    Top = 68
-    Width = 569
+    Height = 429
+    Top = 76
+    Width = 800
    Align = alBottom
    Anchors = [akTop, akLeft, akRight, akBottom]
    Color = clWhite
+    Columns = <>
    DataSource = Datasource1
    Options = [dgEditing, dgTitles, dgIndicator, dgColumnResize, dgColLines, dgRowLines, dgTabs, dgAlwaysShowSelection, dgConfirmDelete, dgCancelOnExit]
    TabOrder = 5
    OnTitleClick = dbGrid1TitleClick
  end
  object Button1: TButton
-    Left = 479
-    Height = 25
-    Top = 8
-    Width = 75
+    AnchorSideTop.Control = Owner
+    AnchorSideRight.Control = Owner
+    AnchorSideRight.Side = asrBottom
+    Left = 725
+    Height = 29
+    Top = 6
+    Width = 69
    Action = accPrintGrid
-    BorderSpacing.InnerBorder = 4
+    Anchors = [akTop, akRight]
+    AutoSize = True
+    BorderSpacing.Around = 6
    TabOrder = 1
  end
  object Button2: TButton
-    Left = 290
-    Height = 25
-    Top = 8
-    Width = 96
+    AnchorSideTop.Control = Owner
+    AnchorSideRight.Control = Button4
+    Left = 530
+    Height = 29
+    Top = 6
+    Width = 100
    Action = accPreviewReport
-    BorderSpacing.InnerBorder = 4
+    Anchors = [akTop, akRight]
+    AutoSize = True
+    BorderSpacing.Around = 6
    TabOrder = 2
  end
  object sbar: TStatusBar
    Left = 0
-    Height = 23
-    Top = 390
-    Width = 569
+    Height = 19
+    Top = 505
+    Width = 800
    Panels = <    
      item
        Width = 250
@ -77,56 +106,87 @@ object frmMain: TfrmMain
    SimplePanel = False
  end
  object Button3: TButton
-    Left = 210
-    Height = 25
-    Top = 8
-    Width = 75
+    AnchorSideTop.Control = Owner
+    AnchorSideRight.Control = Button2
+    Left = 445
+    Height = 29
+    Top = 6
+    Width = 79
    Action = accEditReport
-    BorderSpacing.InnerBorder = 4
+    Anchors = [akTop, akRight]
+    AutoSize = True
+    BorderSpacing.Around = 6
    TabOrder = 3
  end
  object Button4: TButton
-    Left = 391
-    Height = 25
-    Top = 8
+    AnchorSideTop.Control = Owner
+    AnchorSideRight.Control = Button1
+    Left = 636
+    Height = 29
+    Top = 6
    Width = 83
    Action = accPrintReport
-    BorderSpacing.InnerBorder = 4
+    Anchors = [akTop, akRight]
+    AutoSize = True
+    BorderSpacing.Around = 6
    TabOrder = 4
  end
  object btnOpenReport: TButton
-    Left = 109
-    Height = 25
-    Top = 8
-    Width = 96
+    AnchorSideTop.Control = Owner
+    AnchorSideRight.Control = Button3
+    Left = 352
+    Height = 29
+    Top = 6
+    Width = 87
    Action = accOpenReport
-    BorderSpacing.InnerBorder = 4
+    Anchors = [akTop, akRight]
+    AutoSize = True
+    BorderSpacing.Around = 6
    TabOrder = 6
  end
  object comboIndex: TComboBox
-    Left = 72
-    Height = 21
-    Top = 37
-    Width = 148
-    ItemHeight = 13
+    AnchorSideLeft.Control = lblIndex
+    AnchorSideLeft.Side = asrBottom
+    AnchorSideRight.Control = lblExpr
+    AnchorSideBottom.Control = dbGrid1
+    Left = 44
+    Height = 29
+    Top = 41
+    Width = 510
+    Anchors = [akLeft, akRight, akBottom]
+    BorderSpacing.Around = 6
+    ItemHeight = 0
    OnSelect = comboIndexSelect
    TabOrder = 8
  end
  object btnImageList: TButton
-    Left = 480
-    Height = 25
-    Top = 36
-    Width = 75
+    AnchorSideTop.Control = Button1
+    AnchorSideTop.Side = asrBottom
+    AnchorSideRight.Control = Owner
+    AnchorSideRight.Side = asrBottom
+    Left = 714
+    Height = 29
+    Top = 41
+    Width = 80
    Action = accThumbnails
+    Anchors = [akTop, akRight]
+    AutoSize = True
+    BorderSpacing.Around = 6
    DragMode = dmAutomatic
    TabOrder = 9
  end
  object Button5: TButton
-    Left = 391
-    Height = 25
-    Top = 36
-    Width = 83
+    AnchorSideTop.Control = Button4
+    AnchorSideTop.Side = asrBottom
+    AnchorSideRight.Control = btnImageList
+    Left = 632
+    Height = 29
+    Top = 41
+    Width = 76
    Action = accComposite
+    Anchors = [akTop, akRight]
+    AutoSize = True
+    BorderSpacing.Around = 6
    TabOrder = 10
  end
  object TheReport: TfrReport
--- a/components/lazreport/samples/editor/maincalleditor.lrs
+++ b/components/lazreport/samples/editor/maincalleditor.lrs
@ -1,105 +0,0 @@
-{ This is an automatically generated lazarus resource file }
-
-LazarusResources.Add('TfrmMain','FORMDATA',[
-  'TPF0'#8'TfrmMain'#7'frmMain'#4'Left'#3#21#1#6'Height'#3#177#1#3'Top'#2#127#5
-  +'Width'#3'9'#2#13'ActiveControl'#7#13'btnCallEditor'#7'Caption'#6#20'LazRepo'
-  +'rt Test Suite'#12'ClientHeight'#3#157#1#11'ClientWidth'#3'9'#2#4'Menu'#7#9
-  +'MainMenu1'#8'OnCreate'#7#13'frmMainCreate'#8'ShowHint'#9#10'LCLVersion'#6#6
-  +'0.9.29'#0#6'TLabel'#8'lblIndex'#4'Left'#2#12#6'Height'#2#14#3'Top'#2','#5'W'
-  +'idth'#2#1#11'ParentColor'#8#0#0#6'TLabel'#7'lblExpr'#4'Left'#3#235#0#6'Heig'
-  +'ht'#2#14#3'Top'#2','#5'Width'#2#1#11'ParentColor'#8#0#0#7'TButton'#13'btnCa'
-  +'llEditor'#4'Left'#2#24#6'Height'#2#25#3'Top'#2#8#5'Width'#2'P'#6'Action'#7
-  +#12'accNewReport'#25'BorderSpacing.InnerBorder'#2#4#8'TabOrder'#2#0#0#0#7'TD'
-  +'BGrid'#7'dbGrid1'#4'Left'#2#0#6'Height'#3'B'#1#3'Top'#2'D'#5'Width'#3'9'#2#5
-  +'Align'#7#8'alBottom'#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'
-  +#0#5'Color'#7#7'clWhite'#10'DataSource'#7#11'Datasource1'#7'Options'#11#9'dg'
-  +'Editing'#8'dgTitles'#11'dgIndicator'#14'dgColumnResize'#10'dgColLines'#10'd'
-  +'gRowLines'#6'dgTabs'#21'dgAlwaysShowSelection'#15'dgConfirmDelete'#14'dgCan'
-  +'celOnExit'#0#8'TabOrder'#2#5#12'OnTitleClick'#7#17'dbGrid1TitleClick'#0#0#7
-  +'TButton'#7'Button1'#4'Left'#3#223#1#6'Height'#2#25#3'Top'#2#8#5'Width'#2'K'
-  +#6'Action'#7#12'accPrintGrid'#25'BorderSpacing.InnerBorder'#2#4#8'TabOrder'#2
-  +#1#0#0#7'TButton'#7'Button2'#4'Left'#3'"'#1#6'Height'#2#25#3'Top'#2#8#5'Widt'
-  +'h'#2'`'#6'Action'#7#16'accPreviewReport'#25'BorderSpacing.InnerBorder'#2#4#8
-  +'TabOrder'#2#2#0#0#10'TStatusBar'#4'sbar'#4'Left'#2#0#6'Height'#2#23#3'Top'#3
-  +#134#1#5'Width'#3'9'#2#6'Panels'#14#1#5'Width'#3#250#0#0#0#11'SimplePanel'#8
-  +#0#0#7'TButton'#7'Button3'#4'Left'#3#210#0#6'Height'#2#25#3'Top'#2#8#5'Width'
-  +#2'K'#6'Action'#7#13'accEditReport'#25'BorderSpacing.InnerBorder'#2#4#8'TabO'
-  +'rder'#2#3#0#0#7'TButton'#7'Button4'#4'Left'#3#135#1#6'Height'#2#25#3'Top'#2
-  +#8#5'Width'#2'S'#6'Action'#7#14'accPrintReport'#25'BorderSpacing.InnerBorder'
-  +#2#4#8'TabOrder'#2#4#0#0#7'TButton'#13'btnOpenReport'#4'Left'#2'm'#6'Height'
-  +#2#25#3'Top'#2#8#5'Width'#2'`'#6'Action'#7#13'accOpenReport'#25'BorderSpacin'
-  +'g.InnerBorder'#2#4#8'TabOrder'#2#6#0#0#9'TComboBox'#10'comboIndex'#4'Left'#2
-  +'H'#6'Height'#2#21#3'Top'#2'%'#5'Width'#3#148#0#10'ItemHeight'#2#13#8'OnSele'
-  +'ct'#7#16'comboIndexSelect'#8'TabOrder'#2#8#0#0#7'TButton'#12'btnImageList'#4
-  +'Left'#3#224#1#6'Height'#2#25#3'Top'#2'$'#5'Width'#2'K'#6'Action'#7#13'accTh'
-  +'umbnails'#8'DragMode'#7#11'dmAutomatic'#8'TabOrder'#2#9#0#0#7'TButton'#7'Bu'
-  +'tton5'#4'Left'#3#135#1#6'Height'#2#25#3'Top'#2'$'#5'Width'#2'S'#6'Action'#7
-  +#12'accComposite'#8'TabOrder'#2#10#0#0#9'TfrReport'#9'TheReport'#7'Dataset'#7
-  +#12'frDBDataSet1'#11'InitialZoom'#7#9'pzDefault'#14'PreviewButtons'#11#6'pbZ'
-  +'oom'#6'pbLoad'#6'pbSave'#7'pbPrint'#6'pbFind'#6'pbHelp'#6'pbExit'#0#8'DataT'
-  +'ype'#7#9'dtDataSet'#10'OnBeginDoc'#7#17'TheReportBeginDoc'#10'OnGetValue'#7
-  +#17'TheReportGetValue'#11'OnEnterRect'#7#18'TheReportEnterRect'#19'OnExportF'
-  +'ilterSetup'#7#26'TheReportExportFilterSetup'#4'left'#2'`'#3'top'#2'p'#10'Re'
-  +'portForm'#10#4#0#0#0#25#0#0#0#0#0#4'TDbf'#4'Dbf1'#9'IndexDefs'#14#0#10'Tabl'
-  +'eLevel'#2#3#13'FilterOptions'#11#0#4'left'#3#128#0#3'top'#2'H'#0#0#11'TData'
-  +'source'#11'Datasource1'#7'DataSet'#7#4'Dbf1'#4'left'#2'`'#3'top'#2'H'#0#0#12
-  +'TfrDBDataSet'#12'frDBDataSet1'#7'DataSet'#7#4'Dbf1'#4'left'#2'`'#3'top'#3
-  +#144#0#0#0#12'TFrPrintGrid'#2'PG'#6'DBGrid'#7#7'dbGrid1'#11'Orientation'#7#11
-  +'poLandscape'#7'Caption'#6#4'Grid'#11'ShowCaption'#9#4'left'#2'`'#3'top'#3
-  +#176#0#0#0#9'TMainMenu'#9'MainMenu1'#4'left'#2#8#3'top'#2'`'#0#9'TMenuItem'#9
-  +'MenuItem1'#7'Caption'#6#5'Files'#0#9'TMenuItem'#9'MenuItem2'#6'Action'#7#8
-  +'accClose'#7'OnClick'#7#15'accCloseExecute'#0#0#0#9'TMenuItem'#9'MenuItem3'#7
-  +'Caption'#6#5'Tests'#0#9'TMenuItem'#9'MenuItem4'#6'Action'#7#12'accNewReport'
-  +#7'OnClick'#7#19'accNewReportExecute'#0#0#9'TMenuItem'#9'MenuItem5'#6'Action'
-  +#7#13'accEditReport'#7'OnClick'#7#20'accEditReportExecute'#0#0#9'TMenuItem'#9
-  +'MenuItem6'#6'Action'#7#16'accPreviewReport'#7'OnClick'#7#23'accPreviewRepor'
-  +'tExecute'#0#0#9'TMenuItem'#9'MenuItem7'#6'Action'#7#14'accPrintReport'#7'On'
-  +'Click'#7#21'accPrintReportExecute'#0#0#9'TMenuItem'#9'MenuItem8'#6'Action'#7
-  +#12'accPrintGrid'#7'OnClick'#7#19'accPrintGridExecute'#0#0#9'TMenuItem'#10'M'
-  +'enuItem14'#6'Action'#7#13'accThumbnails'#7'OnClick'#7#20'accThumbnailsExecu'
-  +'te'#0#0#9'TMenuItem'#10'MenuItem15'#6'Action'#7#12'accComposite'#7'OnClick'
-  +#7#19'accCompositeExecute'#0#0#0#9'TMenuItem'#9'MenuItem9'#7'Caption'#6#6'Ex'
-  +'port'#0#9'TMenuItem'#10'MenuItem10'#6'Action'#7#15'accExportToText'#7'OnCli'
-  +'ck'#7#22'accExportToTextExecute'#0#0#9'TMenuItem'#10'MenuItem11'#6'Action'#7
-  +#15'accExportToHtml'#7'OnClick'#7#22'accExportToHtmlExecute'#0#0#9'TMenuItem'
-  +#10'MenuItem12'#6'Action'#7#14'accExportToCSV'#7'OnClick'#7#21'accExportToCS'
-  +'VExecute'#0#0#9'TMenuItem'#10'MenuItem13'#6'Action'#7#14'accExportToDbg'#7
-  +'OnClick'#7#21'accExportToDbgExecute'#0#0#0#0#22'TApplicationProperties'#22
-  ,'ApplicationProperties1'#9'HintPause'#2#10#10'OnShowHint'#7#30'ApplicationPr'
-  +'operties1ShowHint'#4'left'#2'`'#3'top'#3#240#0#0#0#11'TActionList'#11'Actio'
-  +'nList1'#4'left'#2'0'#3'top'#2'`'#0#7'TAction'#12'accNewReport'#8'Category'#6
-  +#5'Tests'#7'Caption'#6#10'New Report'#9'OnExecute'#7#19'accNewReportExecute'
-  +#0#0#7'TAction'#13'accEditReport'#8'Category'#6#5'Tests'#7'Caption'#6#11'Edi'
-  +'t Report'#9'OnExecute'#7#20'accEditReportExecute'#0#0#7'TAction'#16'accPrev'
-  +'iewReport'#8'Category'#6#5'Tests'#7'Caption'#6#14'Preview Report'#9'OnExecu'
-  +'te'#7#23'accPreviewReportExecute'#0#0#7'TAction'#12'accPrintGrid'#8'Categor'
-  +'y'#6#5'Tests'#7'Caption'#6#10'Print Grid'#9'OnExecute'#7#19'accPrintGridExe'
-  +'cute'#0#0#7'TAction'#14'accPrintReport'#8'Category'#6#5'Tests'#7'Caption'#6
-  +#12'Print Report'#9'OnExecute'#7#21'accPrintReportExecute'#0#0#7'TAction'#8
-  +'accClose'#8'Category'#6#5'Files'#7'Caption'#6#5'Close'#9'OnExecute'#7#15'ac'
-  +'cCloseExecute'#0#0#7'TAction'#15'accExportToText'#8'Category'#6#6'Export'#7
-  +'Caption'#6#14'Export to text'#9'OnExecute'#7#22'accExportToTextExecute'#0#0
-  +#7'TAction'#15'accExportToHtml'#8'Category'#6#6'Export'#7'Caption'#6#14'Expo'
-  +'rt to html'#9'OnExecute'#7#22'accExportToHtmlExecute'#0#0#7'TAction'#13'acc'
-  +'OpenReport'#8'Category'#6#5'Files'#7'Caption'#6#11'Open Report'#9'OnExecute'
-  +#7#20'accOpenReportExecute'#0#0#7'TAction'#14'accExportToCSV'#8'Category'#6#6
-  +'Export'#7'Caption'#6#13'Export to CSV'#9'OnExecute'#7#21'accExportToCSVExec'
-  +'ute'#0#0#7'TAction'#13'accThumbnails'#8'Category'#6#14'Sample Reports'#7'Ca'
-  +'ption'#6#10'Thumbnails'#9'OnExecute'#7#20'accThumbnailsExecute'#0#0#7'TActi'
-  +'on'#14'accExportToDbg'#8'Category'#6#6'Export'#7'Caption'#6#12'Export Debug'
-  +#9'OnExecute'#7#21'accExportToDbgExecute'#0#0#7'TAction'#12'accComposite'#8
-  +'Category'#6#14'Sample Reports'#7'Caption'#6#9'Composite'#9'OnExecute'#7#19
-  +'accCompositeExecute'#0#0#0#11'TOpenDialog'#11'OpenDialog1'#6'Filter'#6':Laz'
-  +'Report Files|*.lrf|FreeReport Files|*.frf|All Files|*.*'#11'FilterIndex'#2#0
-  +#4'left'#2'd'#3'top'#3#16#1#0#0#12'TfrCSVExport'#12'frCSVExport1'#4'left'#3
-  +#188#0#3'top'#2'H'#0#0#14'TfrUserDataset'#14'frUserDataset1'#8'RangeEnd'#7#7
-  +'reCount'#4'left'#3#132#0#3'top'#3#144#0#0#0#16'TfrBarCodeObject'#16'frBarCo'
-  +'deObject1'#4'left'#3#16#1#3'top'#3#170#0#0#0#18'TfrRoundRectObject'#18'frRo'
-  +'undRectObject1'#4'left'#3#16#1#3'top'#3#216#0#0#0#14'TfrShapeObject'#14'frS'
-  +'hapeObject1'#4'left'#3#16#1#3'top'#3#8#1#0#0#17'TfrCheckBoxObject'#17'frChe'
-  +'ckBoxObject1'#4'left'#3#16#1#3'top'#3'8'#1#0#0#18'TfrCompositeReport'#9'Com'
-  +'posite'#11'InitialZoom'#7#9'pzDefault'#14'PreviewButtons'#11#6'pbZoom'#6'pb'
-  +'Load'#6'pbSave'#7'pbPrint'#6'pbFind'#6'pbHelp'#6'pbExit'#0#8'DataType'#7#9
-  +'dtDataSet'#4'left'#3#144#1#3'top'#2'T'#10'ReportForm'#10#4#0#0#0#25#0#0#0#0
-  +#0#0
-]);
--- a/components/lazreport/samples/editor/maincalleditor.pas
+++ b/components/lazreport/samples/editor/maincalleditor.pas
@ -136,6 +136,8 @@ implementation

 uses gettext,translations;

+{$R *.lfm}
+
 resourcestring
  cerOpenReport     = 'Open report';
  cerNewReport      = 'New report';
@ -160,7 +162,9 @@ resourcestring
  cerAppCaption     = 'LazReport Test Suite';
  cerHintThumbnails = 'This Action will Load and Preview a thumbnails Report';
  cerThumbnails     = 'Thumbnails';
-  
+  cerHintComposite  = 'This Action will Load and Preview a composite Report';
+  cerComposite      = 'Composite';
+

 { TfrmMain }

@ -186,6 +190,9 @@ begin

  accThumbnails.Hint := cerHintThumbnails;
  accThumbnails.Caption := cerThumbnails;
+
+  accComposite.Hint := cerHintComposite;
+  accComposite.Caption := cerComposite;
 end;

 procedure TfrmMain.ApplicationProperties1ShowHint(var HintStr: string;
@ -438,9 +445,6 @@ begin
 end;

 initialization
-  {$I maincalleditor.lrs}
  TranslateResStrings;
-  
-
 end.