Merge pull request #89 from FastReports/sync_branch_636935032287457690

* sync 5/15/2019
FastReports · May 15, 2019 · 723ad23 · 723ad23
2 parents 15a3905 + d200413
commit 723ad23
Show file tree

Hide file tree

Showing 40 changed files with 1,185 additions and 173 deletions.
diff --git a/Demos/Reports/Badges.frx b/Demos/Reports/Badges.frx
diff --git a/Demos/Reports/Complex (Master-detail + Group).frx b/Demos/Reports/Complex (Master-detail + Group).frx
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Report ScriptLanguage="CSharp" TextQuality="Regular" ReportInfo.Description="Demonstrates the master-detail report with groups. To create a report like this one:&#13;&#10;- go &quot;Report|Configure Bands...&quot; menu and create the report structure.&#13;&#10;The page can contain service bands such as page header, report title, and one or several data bands or groups.&#13;&#10;Each data band can contain one or several data bands or groups.&#13;&#10;Each group can contain either nested group or a data band." ReportInfo.Created="01/18/2008 00:04:46" ReportInfo.Modified="01/18/2019 12:55:21" ReportInfo.CreatorVersion="2019.1.9.0">
+<Report ScriptLanguage="CSharp" TextQuality="Regular" ReportInfo.Description="Demonstrates the master-detail report with groups. To create a report like this one:&#13;&#10;- go &quot;Report|Configure Bands...&quot; menu and create the report structure.&#13;&#10;The page can contain service bands such as page header, report title, and one or several data bands or groups.&#13;&#10;Each data band can contain one or several data bands or groups.&#13;&#10;Each group can contain either nested group or a data band." ReportInfo.Created="01/18/2008 00:04:46" ReportInfo.Modified="05/14/2019 13:02:04" ReportInfo.CreatorVersion="1.0.0.0">
   <Styles>
-    <Style Name="EvenRows" Fill.Color="Linen"/>
+    <Style Name="EvenRows" Fill.Color="Linen" Font="Arial, 10pt"/>
   </Styles>
   <Dictionary>
     <TableDataSource Name="Customers" ReferenceName="NorthWind.Customers" DataType="System.Int32" Enabled="true">
@@ -60,15 +60,16 @@
     <Relation Name="ProductsOrderDetails" ReferenceName="NorthWind.ProductsOrderDetails" ParentDataSource="Products" ChildDataSource="Order Details" ParentColumns="ProductID" ChildColumns="ProductID" Enabled="true"/>
     <Total Name="SumOfOrder" Expression="[Order Details.UnitPrice] * [Order Details.Quantity]" Evaluator="Data1" PrintOn="DataFooter1"/>
   </Dictionary>
-  <ReportPage Name="Page1">
-    <ReportTitleBand Name="ReportTitle1" Width="718.2" Height="66.15" CanGrow="true">
-      <TextObject Name="Text6" Top="37.8" Width="718.2" Height="28.35" Text="CUSTOMERS ORDERS" HorzAlign="Center" VertAlign="Center" Font="Tahoma, 14pt, style=Bold"/>
-      <TextObject Name="Text25" Width="718.2" Height="28.35" Anchor="Top, Left, Right" Fill.Color="WhiteSmoke" CanGrow="true" CanShrink="true" CanBreak="false" Text="[Report.ReportInfo.Description]&#13;&#10;" Padding="4, 4, 4, 4" Font="Tahoma, 8pt"/>
-      <ChildBand Name="Child1" Top="70.15" Width="718.2" Height="9.45"/>
+  <ReportPage Name="Page1" Watermark.Font="Arial, 60pt">
+    <ReportTitleBand Name="ReportTitle1" Width="718.2" Height="94.5" CanGrow="true">
+      <TextObject Name="Text6" Top="66.15" Width="718.2" Height="28.35" Text="CUSTOMERS ORDERS" HorzAlign="Center" VertAlign="Center" Font="Tahoma, 14pt, style=Bold"/>
+      <TextObject Name="Text25" Top="28.35" Width="718.2" Height="28.35" Anchor="Top, Left, Right" Fill.Color="WhiteSmoke" CanGrow="true" CanShrink="true" CanBreak="false" Text="[Report.ReportInfo.Description]&#13;&#10;" Padding="4, 4, 4, 4" Font="Tahoma, 8pt"/>
+      <TextObject Name="Text28" Width="718.2" Height="28.35" Anchor="Top, Left, Right" Fill.Color="WhiteSmoke" Cursor="Hand" Hyperlink.Value="http://fast.report/1548a" Hyperlink.OpenLinkInNewTab="true" Text="Learn more about how to create reports on the Fast Reports Academy channel" VertAlign="Center" Font="Tahoma, 10pt, style=Bold, Underline" TextFill.Color="Blue"/>
+      <ChildBand Name="Child1" Top="98.22" Width="718.2" Height="9.45"/>
     </ReportTitleBand>
-    <GroupHeaderBand Name="GroupHeader1" Top="83.6" Width="718.2" Height="37.8" Fill="Glass" Fill.Color="YellowGreen" Fill.Blend="0.2" Fill.Hatch="true" Condition="[Orders.CustomerID]">
+    <GroupHeaderBand Name="GroupHeader1" Top="111.39" Width="718.2" Height="37.8" Fill="Glass" Fill.Color="YellowGreen" Fill.Blend="0.2" Fill.Hatch="true" Condition="[Orders.CustomerID]">
       <TextObject Name="Text1" Left="9.45" Width="699.3" Height="37.8" Text="[Orders.Customers.CompanyName]" VertAlign="Center" Font="Tahoma, 14pt, style=Bold"/>
-      <DataBand Name="Data2" Top="125.4" Width="718.2" Height="47.25" Fill.Color="230, 255, 204" DataSource="Orders" PrintIfDetailEmpty="true">
+      <DataBand Name="Data2" Top="152.91" Width="718.2" Height="47.25" Fill.Color="230, 255, 204" DataSource="Orders" PrintIfDetailEmpty="true">
         <TextObject Name="Text4" Left="113.4" Width="94.5" Height="28.35" Text="[Orders.OrderID]" VertAlign="Center" Font="Tahoma, 8pt"/>
         <TextObject Name="Text2" Left="330.75" Width="94.5" Height="28.35" Text="[Orders.OrderDate]" Format="Date" Format.Format="d" VertAlign="Center" Font="Tahoma, 8pt"/>
         <TextObject Name="Text7" Left="519.75" Width="141.75" Height="28.35" Text="[Orders.ShippedDate]" Format="Date" Format.Format="d" VertAlign="Center" Font="Tahoma, 8pt"/>
@@ -78,11 +79,11 @@
         <TextObject Name="Text14" Left="47.25" Top="28.35" Width="425.25" Height="18.9" Border.Lines="All" Border.Color="White" Fill.Color="YellowGreen" Text="Product name" VertAlign="Center" Font="Tahoma, 8pt, style=Bold"/>
         <TextObject Name="Text15" Left="472.5" Top="28.35" Width="94.5" Height="18.9" Border.Lines="All" Border.Color="White" Fill.Color="YellowGreen" Text="Unit Price" HorzAlign="Center" VertAlign="Center" Font="Tahoma, 8pt, style=Bold"/>
         <TextObject Name="Text16" Left="567" Top="28.35" Width="94.5" Height="18.9" Border.Lines="All" Border.Color="White" Fill.Color="YellowGreen" Text="Quantity" HorzAlign="Center" VertAlign="Center" Font="Tahoma, 8pt, style=Bold"/>
-        <DataBand Name="Data1" Top="176.65" Width="718.2" Height="18.9" Fill.Color="230, 255, 204" DataSource="Order Details">
+        <DataBand Name="Data1" Top="203.88" Width="718.2" Height="18.9" Fill.Color="230, 255, 204" DataSource="Order Details">
           <TextObject Name="Text11" Left="47.25" Width="425.25" Height="18.9" Border.Lines="All" Border.Color="White" Fill.Color="YellowGreen" Text="[Order Details.Products.ProductName]" VertAlign="Center" Font="Tahoma, 8pt"/>
           <TextObject Name="Text12" Left="472.5" Width="94.5" Height="18.9" Border.Lines="All" Border.Color="White" Fill.Color="YellowGreen" Text="[Order Details.UnitPrice]" Format="Currency" Format.UseLocale="true" HorzAlign="Right" VertAlign="Center" Font="Tahoma, 8pt"/>
           <TextObject Name="Text13" Left="567" Width="94.5" Height="18.9" Border.Lines="All" Border.Color="White" Fill.Color="YellowGreen" Text="[Order Details.Quantity]" HorzAlign="Center" VertAlign="Center" Font="Tahoma, 8pt"/>
-          <DataFooterBand Name="DataFooter1" Top="199.55" Width="718.2" Height="28.35" Fill.Color="230, 255, 204" KeepWithData="true">
+          <DataFooterBand Name="DataFooter1" Top="226.5" Width="718.2" Height="28.35" Fill.Color="230, 255, 204" KeepWithData="true">
             <TextObject Name="Text9" Left="47.25" Width="614.25" Height="18.9" Border.Lines="All" Border.Color="White" Fill.Color="YellowGreen" Text="Total this order: [SumOfOrder]" Format="Currency" Format.UseLocale="true" HorzAlign="Right" VertAlign="Center" Font="Tahoma, 8pt, style=Bold"/>
           </DataFooterBand>
         </DataBand>
@@ -91,7 +92,7 @@
         </Sort>
       </DataBand>
     </GroupHeaderBand>
-    <PageFooterBand Name="PageFooter1" Top="231.9" Width="718.2" Height="28.35" Fill.Color="WhiteSmoke">
+    <PageFooterBand Name="PageFooter1" Top="258.57" Width="718.2" Height="28.35" Fill.Color="WhiteSmoke">
       <TextObject Name="Text10" Left="614.25" Width="94.5" Height="28.35" Text="[PageN]" HorzAlign="Right" VertAlign="Center" Font="Tahoma, 8pt"/>
       <TextObject Name="Text26" Left="9.45" Width="217.35" Height="28.35" Cursor="Hand" Hyperlink.Value="https://www.fast-report.com/en/product/fast-report-net/" Text="Generated by FastReport .NET" VertAlign="Center" Font="Tahoma, 8pt, style=Underline" TextFill.Color="Blue"/>
     </PageFooterBand>

diff --git a/Demos/Reports/Groups.frx b/Demos/Reports/Groups.frx
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Report ScriptLanguage="CSharp" TextQuality="Regular" ReportInfo.Description="Demonstrates a group report. To create it:&#13;&#10;- go to &quot;Report|Configure Bands...&quot; menu;&#13;&#10;- press &quot;Add&quot; button and add a group header (this will add a data band and a group footer as well);&#13;&#10;- return to the report page, doubleclick the group header to show its editor." ReportInfo.Created="01/17/2008 04:31:41" ReportInfo.Modified="01/18/2019 12:19:41" ReportInfo.CreatorVersion="2019.1.9.0">
+<Report ScriptLanguage="CSharp" TextQuality="Regular" ReportInfo.Description="Demonstrates a group report. To create it:&#13;&#10;- go to &quot;Report|Configure Bands...&quot; menu;&#13;&#10;- press &quot;Add&quot; button and add a group header (this will add a data band and a group footer as well);&#13;&#10;- return to the report page, doubleclick the group header to show its editor." ReportInfo.Created="01/17/2008 04:31:41" ReportInfo.Modified="05/14/2019 13:26:19" ReportInfo.CreatorVersion="2019.1.15.0">
   <Styles>
-    <Style Name="EvenRows" Fill.Color="OldLace"/>
+    <Style Name="EvenRows" Fill.Color="OldLace" Font="Arial, 10pt"/>
   </Styles>
   <Dictionary>
     <TableDataSource Name="Products" ReferenceName="NorthWind.Products" DataType="System.Int32" Enabled="true">
@@ -19,33 +19,34 @@
     </TableDataSource>
     <Total Name="TotalProducts" TotalType="Count" Evaluator="Data1" PrintOn="GroupFooter1"/>
   </Dictionary>
-  <ReportPage Name="Page1">
-    <ReportTitleBand Name="ReportTitle1" Width="718.2" Height="75.6" CanGrow="true">
-      <TextObject Name="Text1" Top="28.35" Width="718.2" Height="47.25" Text="ALPHABETICAL PRODUCT LIST" HorzAlign="Center" VertAlign="Center" Font="Tahoma, 14pt, style=Bold"/>
-      <TextObject Name="Text11" Width="718.2" Height="28.35" Anchor="Top, Left, Right" Fill.Color="WhiteSmoke" CanGrow="true" CanShrink="true" Text="[Report.ReportInfo.Description]&#13;&#10;" Padding="4, 4, 4, 4" Font="Tahoma, 8pt"/>
+  <ReportPage Name="Page1" Watermark.Font="Arial, 60pt">
+    <ReportTitleBand Name="ReportTitle1" Width="718.2" Height="103.95" CanGrow="true">
+      <TextObject Name="Text1" Top="56.7" Width="718.2" Height="47.25" Text="ALPHABETICAL PRODUCT LIST" HorzAlign="Center" VertAlign="Center" Font="Tahoma, 14pt, style=Bold"/>
+      <TextObject Name="Text11" Top="28.35" Width="718.2" Height="28.35" Anchor="Top, Left, Right" Fill.Color="WhiteSmoke" CanGrow="true" CanShrink="true" Text="[Report.ReportInfo.Description]&#13;&#10;" Padding="4, 4, 4, 4" Font="Tahoma, 8pt"/>
+      <TextObject Name="Text18" Width="718.2" Height="28.35" Anchor="Top, Left, Right" Fill.Color="WhiteSmoke" Cursor="Hand" Hyperlink.Value="http://fast.report/cda2a" Hyperlink.OpenLinkInNewTab="true" Text="Learn how to build this report on the Fast Reports Academy channel" VertAlign="Center" Font="Tahoma, 10pt, style=Bold, Underline" TextFill.Color="Blue"/>
     </ReportTitleBand>
-    <GroupHeaderBand Name="GroupHeader1" Top="79.6" Width="718.2" Height="37.8" KeepWithData="true" Condition="[Products.ProductName].Substring(0,1)" SortOrder="None">
+    <GroupHeaderBand Name="GroupHeader1" Top="107.67" Width="718.2" Height="37.8" KeepWithData="true" Condition="[Products.ProductName].Substring(0,1)" SortOrder="None">
       <TextObject Name="Text7" Left="9.45" Width="699.3" Height="37.8" Border.Lines="All" Border.Color="LightSkyBlue" Fill="LinearGradient" Fill.StartColor="LightSkyBlue" Fill.EndColor="AliceBlue" Fill.Angle="90" Fill.Focus="0.42" Fill.Contrast="1" Text="[[Products.ProductName].Substring(0,1)]" Padding="5, 0, 0, 0" VertAlign="Center" Font="Tahoma, 12pt, style=Bold"/>
-      <DataBand Name="Data1" Top="121.4" Width="718.2" Height="18.9" DataSource="Products" KeepTogether="true">
+      <DataBand Name="Data1" Top="149.19" Width="718.2" Height="18.9" DataSource="Products" KeepTogether="true">
         <TextObject Name="Text2" Left="9.45" Width="604.8" Height="18.9" Border.Lines="Left" Border.Color="LightSkyBlue" Text="[Products.ProductName]" VertAlign="Center" Font="Tahoma, 8pt">
           <Highlight>
-            <Condition Expression="[Row#] % 2 == 0" Fill.Color="AliceBlue" TextFill.Color="Black" ApplyFill="true" ApplyTextFill="false"/>
+            <Condition Expression="[Row#] % 2 == 0" Fill.Color="AliceBlue" TextFill.Color="Black" Font="Arial, 10pt" ApplyFill="true" ApplyTextFill="false"/>
           </Highlight>
         </TextObject>
         <TextObject Name="Text4" Left="614.25" Width="94.5" Height="18.9" Border.Lines="Right" Border.Color="LightSkyBlue" Text="[Products.UnitPrice]" Format="Currency" Format.UseLocale="true" HorzAlign="Right" VertAlign="Center" Font="Tahoma, 8pt">
           <Highlight>
-            <Condition Expression="[Row#] % 2 == 0" Fill.Color="AliceBlue" TextFill.Color="Black" ApplyFill="true" ApplyTextFill="false"/>
+            <Condition Expression="[Row#] % 2 == 0" Fill.Color="AliceBlue" TextFill.Color="Black" Font="Arial, 10pt" ApplyFill="true" ApplyTextFill="false"/>
           </Highlight>
         </TextObject>
         <Sort>
           <Sort Expression="[Products.ProductName]"/>
         </Sort>
       </DataBand>
-      <GroupFooterBand Name="GroupFooter1" Top="144.3" Width="718.2" Height="47.25" KeepWithData="true">
+      <GroupFooterBand Name="GroupFooter1" Top="171.81" Width="718.2" Height="47.25" KeepWithData="true">
         <TextObject Name="Text8" Left="9.45" Width="699.3" Height="18.9" Border.Lines="Left, Right, Bottom" Border.Color="LightSkyBlue" Text="Total products: [TotalProducts]" HorzAlign="Right" VertAlign="Center" Font="Tahoma, 8pt, style=Bold"/>
       </GroupFooterBand>
     </GroupHeaderBand>
-    <PageFooterBand Name="PageFooter1" Top="195.55" Width="718.2" Height="28.35" Fill.Color="WhiteSmoke">
+    <PageFooterBand Name="PageFooter1" Top="222.78" Width="718.2" Height="28.35" Fill.Color="WhiteSmoke">
       <TextObject Name="Text9" Left="614.25" Width="94.5" Height="28.35" Text="[PageN]" HorzAlign="Right" VertAlign="Center" Font="Tahoma, 8pt"/>
       <TextObject Name="Text12" Left="9.45" Width="217.35" Height="28.35" Cursor="Hand" Hyperlink.Value="https://www.fast-report.com/en/product/fast-report-net/" Text="Generated by FastReport .NET" VertAlign="Center" Font="Tahoma, 8pt, style=Underline" TextFill.Color="Blue"/>
     </PageFooterBand>

diff --git a/Demos/Reports/Hierarchic List.frx b/Demos/Reports/Hierarchic List.frx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Report ScriptLanguage="CSharp" TextQuality="Regular" ReportInfo.Description="Demonstrates how to print a hierarchic list. &#13;&#10;To create hierarchy, the FastReport engine needs two values: the row ID and its parent row ID. In this report, the row ID is represented by the Employee.EmployeeID column; its parent row is Employees.ReportsTo column. To create the report:&#13;&#10;- select the databand and go to the Properties window;&#13;&#10;- set the &quot;IdColumn&quot; property to &quot;Employee.EmployeeID&quot;;&#13;&#10;- set the &quot;ParentIdColumn&quot; property to &quot;Employee.ReportsTo&quot;;&#13;&#10;- the &quot;Indent&quot; property will be used to shift the databand rows according to hierarchy level. Set it to a desired value." ReportInfo.Created="01/17/2008 03:05:57" ReportInfo.Modified="01/18/2019 15:30:20" ReportInfo.CreatorVersion="2019.1.9.0">
+<Report ScriptLanguage="CSharp" TextQuality="Regular" ReportInfo.Description="Demonstrates how to print a hierarchic list. &#13;&#10;To create hierarchy, the FastReport engine needs two values: the row ID and its parent row ID. In this report, the row ID is represented by the Employee.EmployeeID column; its parent row is Employees.ReportsTo column. To create the report:&#13;&#10;- select the databand and go to the Properties window;&#13;&#10;- set the &quot;IdColumn&quot; property to &quot;Employee.EmployeeID&quot;;&#13;&#10;- set the &quot;ParentIdColumn&quot; property to &quot;Employee.ReportsTo&quot;;&#13;&#10;- the &quot;Indent&quot; property will be used to shift the databand rows according to hierarchy level. Set it to a desired value." ReportInfo.Created="01/17/2008 03:05:57" ReportInfo.Modified="05/14/2019 13:01:32" ReportInfo.CreatorVersion="1.0.0.0">
   <Dictionary>
     <TableDataSource Name="Employees" ReferenceName="NorthWind.Employees" DataType="System.Int32" Enabled="true">
       <Column Name="EmployeeID" DataType="System.Int32"/>
@@ -21,17 +21,18 @@
       <Column Name="ReportsTo" DataType="System.Int32"/>
     </TableDataSource>
   </Dictionary>
-  <ReportPage Name="Page1">
-    <ReportTitleBand Name="ReportTitle1" Width="718.2" Height="75.6" CanGrow="true">
-      <TextObject Name="Text1" Top="37.8" Width="718.2" Height="37.8" Text="EMPLOYEE HIERARCHY" HorzAlign="Center" VertAlign="Center" Font="Tahoma, 14pt, style=Bold"/>
-      <TextObject Name="Text25" Width="718.2" Height="28.35" Anchor="Top, Left, Right" Fill.Color="WhiteSmoke" CanGrow="true" CanShrink="true" CanBreak="false" Text="[Report.ReportInfo.Description]&#13;&#10;" Padding="4, 4, 4, 4" Font="Tahoma, 8pt"/>
+  <ReportPage Name="Page1" Watermark.Font="Arial, 60pt">
+    <ReportTitleBand Name="ReportTitle1" Width="718.2" Height="103.95" CanGrow="true">
+      <TextObject Name="Text1" Top="66.15" Width="718.2" Height="37.8" Text="EMPLOYEE HIERARCHY" HorzAlign="Center" VertAlign="Center" Font="Tahoma, 14pt, style=Bold"/>
+      <TextObject Name="Text25" Top="28.35" Width="718.2" Height="28.35" Anchor="Top, Left, Right" Fill.Color="WhiteSmoke" CanGrow="true" CanShrink="true" CanBreak="false" Text="[Report.ReportInfo.Description]&#13;&#10;" Padding="4, 4, 4, 4" Font="Tahoma, 8pt"/>
+      <TextObject Name="Text5" Width="718.2" Height="28.35" Anchor="Top, Left, Right" Fill.Color="WhiteSmoke" Cursor="Hand" Hyperlink.Value="http://fast.report/505f3" Hyperlink.OpenLinkInNewTab="true" Text="Learn how to build this report on the Fast Reports Academy channel" VertAlign="Center" Font="Tahoma, 10pt, style=Bold, Underline" TextFill.Color="Blue"/>
     </ReportTitleBand>
-    <DataBand Name="Data1" Top="79.6" Width="718.2" Height="94.5" DataSource="Employees" IdColumn="Employees.EmployeeID" ParentIdColumn="Employees.ReportsTo" Indent="85.05">
+    <DataBand Name="Data1" Top="107.67" Width="718.2" Height="94.5" DataSource="Employees" IdColumn="Employees.EmployeeID" ParentIdColumn="Employees.ReportsTo" Indent="85.05">
       <TextObject Name="Text2" Left="94.5" Top="18.9" Width="245.7" Height="18.9" Text="[Employees.FirstName] [Employees.LastName]" VertAlign="Center" Font="Tahoma, 10pt, style=Bold"/>
       <PictureObject Name="Picture1" Width="85.05" Height="85.05" CanGrow="true" CanShrink="true" DataColumn="Employees.Photo"/>
       <TextObject Name="Text3" Left="94.5" Top="37.8" Width="245.7" Height="18.9" Text="[Employees.Title]" Font="Tahoma, 8pt"/>
     </DataBand>
-    <PageFooterBand Name="PageFooter1" Top="178.1" Width="718.2" Height="28.35" Fill.Color="WhiteSmoke">
+    <PageFooterBand Name="PageFooter1" Top="205.89" Width="718.2" Height="28.35" Fill.Color="WhiteSmoke">
       <TextObject Name="Text26" Left="9.45" Width="217.35" Height="28.35" Cursor="Hand" Hyperlink.Value="https://www.fast-report.com/en/product/fast-report-net/" Text="Generated by FastReport .NET" VertAlign="Center" Font="Tahoma, 8pt, style=Underline" TextFill.Color="Blue"/>
     </PageFooterBand>
   </ReportPage>