Skip to content

Commit

Permalink
Merge pull request #514 from FastReports/sync_branch_2023.1.0
Browse files Browse the repository at this point in the history 
FastReport.OpenSource 2023.1.0
  • Loading branch information
@0legK
0legK authored Nov 28, 2022
2 parents 3d38195 + c5bb71f commit 43667df
Show file tree
Hide file tree
Showing 191 changed files with 3,786 additions and 3,358 deletions.
2 changes: 1 addition & 1 deletion Demos/OpenSource/WPFOpenSourceViewer/OpenSourceCustomViewer/OpenSourceCustomViewer.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<OutputType>WinExe</OutputType>
<RootNamespace>OpenSourceCustomViewer</RootNamespace>
<AssemblyName>OpenSourceCustomViewer</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<WarningLevel>4</WarningLevel>
Expand Down
2 changes: 1 addition & 1 deletion Demos/OpenSource/WinFormsOpenSourceViewer/WinFormsOpenSource/WinFormsOpenSource.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<OutputType>WinExe</OutputType>
<RootNamespace>WinFormsOpenSource</RootNamespace>
<AssemblyName>WinFormsOpenSource</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<Deterministic>true</Deterministic>
Expand Down
34 changes: 17 additions & 17 deletions Demos/Reports/About Microsoft Chart.frx
View file

Large diffs are not rendered by default.

40 changes: 20 additions & 20 deletions Demos/Reports/AdvMatrix - Collapse + Sort.frx
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Report ScriptLanguage="CSharp" TextQuality="Regular" ReportInfo.Description="Demonstrates the following AdvMatrixObject features:&#13;&#10;- collapse/expand header elements;&#13;&#10;- interactive sort" ReportInfo.Created="05/16/2008 01:44:40" ReportInfo.Modified="10/31/2021 22:37:27" ReportInfo.CreatorVersion="1.0.0.0">
<Report ScriptLanguage="CSharp" TextQuality="Regular" ReportInfo.Description="Demonstrates the following AdvMatrixObject features:&#13;&#10;- collapse/expand header elements;&#13;&#10;- interactive sort" ReportInfo.Created="05/16/2008 01:44:40" ReportInfo.Modified="11/21/2022 14:24:02" ReportInfo.CreatorVersion="1.0.0.0">
<Dictionary>
<TableDataSource Name="MatrixDemo" ReferenceName="NorthWind.MatrixDemo" DataType="System.Int32" Enabled="true">
<Column Name="Name" DataType="System.String"/>
Expand All @@ -11,10 +11,10 @@
</Dictionary>
<ReportPage Name="Page1" Watermark.Font="Arial, 60pt">
<ReportTitleBand Name="ReportTitle1" Width="718.2" Height="66.15" CanGrow="true">
<TextObject Name="Text1" Top="37.8" Width="718.2" Height="28.35" Text="REVENUE BY EMPLOYEE" 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"/>
<TextObject Name="Text1" Top="37.8" Width="718.2" Height="28.35" Text="REVENUE BY EMPLOYEE" HorzAlign="Center" VertAlign="Center" Font="Microsoft JhengHei, 14pt, style=Bold"/>
<TextObject Name="Text11" Width="718.2" Height="28.35" Anchor="Top, Left, Right" CanGrow="true" CanShrink="true" Text="[Report.ReportInfo.Description]&#13;&#10;" Padding="4, 4, 4, 4" Font="Microsoft JhengHei, 8pt"/>
</ReportTitleBand>
<DataBand Name="Data1" Top="68.15" Width="718.2" Height="96.97">
<DataBand Name="Data1" Top="70.19" Width="718.2" Height="96.97">
<AdvMatrixObject Name="Matrix1" Left="11.34" Top="11.92" Width="349.65" Height="85.05" Layout="Wrapped" WrappedGap="37.8" DataSource="MatrixDemo">
<Columns>
<Descriptor Expression="[MatrixDemo.Name]" VisibleToggledBy="CollapseButton1"/>
Expand All @@ -32,47 +32,47 @@
<TableColumn Name="Column3" Width="113.4"/>
<TableColumn Name="Column4" Width="75.6"/>
<TableRow Name="Row1" Height="28.35">
<TableCell Name="Cell1" Border.Lines="All" Border.Color="White" Fill="Glass" Fill.Color="Gold" Fill.Blend="0.35" Fill.Hatch="true" Text="Year" HorzAlign="Center" VertAlign="Center" Font="Tahoma, 8pt"/>
<TableCell Name="Cell2" Border.Lines="All" Border.Color="White" Fill="Glass" Fill.Color="Gold" Fill.Blend="0.35" Fill.Hatch="true" Text="Month" HorzAlign="Center" VertAlign="Center" Font="Tahoma, 8pt"/>
<TableCell Name="Cell21" Border.Lines="All" Border.Color="White" Fill="Glass" Fill.Color="Gold" Fill.Blend="0.35" Fill.Hatch="true" Text="[Name]" AllowExpressions="false" HorzAlign="Center" VertAlign="Center" Font="Tahoma, 8pt">
<TableCell Name="Cell1" Border.Lines="All" Border.Color="White" Fill="Glass" Fill.Color="Gold" Fill.Blend="0.35" Fill.Hatch="true" Text="Year" HorzAlign="Center" VertAlign="Center" Font="Microsoft JhengHei, 8pt"/>
<TableCell Name="Cell2" Border.Lines="All" Border.Color="White" Fill="Glass" Fill.Color="Gold" Fill.Blend="0.35" Fill.Hatch="true" Text="Month" HorzAlign="Center" VertAlign="Center" Font="Microsoft JhengHei, 8pt"/>
<TableCell Name="Cell21" Border.Lines="All" Border.Color="White" Fill="Glass" Fill.Color="Gold" Fill.Blend="0.35" Fill.Hatch="true" Text="[Name]" AllowExpressions="false" HorzAlign="Center" VertAlign="Center" Font="Microsoft JhengHei, 8pt">
<MatrixSortButton Name="SortButton1" Left="100.17" Width="13.23" Height="28.35" Dock="Right"/>
</TableCell>
<TableCell Name="Cell7" Border.Lines="All" Border.Color="White" Fill="Glass" Fill.Color="Gold" Fill.Blend="0.35" Fill.Hatch="true" Text="Total" HorzAlign="Center" VertAlign="Center" Font="Tahoma, 8pt, style=Bold">
<TableCell Name="Cell7" Border.Lines="All" Border.Color="White" Fill="Glass" Fill.Color="Gold" Fill.Blend="0.35" Fill.Hatch="true" Text="Total" HorzAlign="Center" VertAlign="Center" Font="Microsoft JhengHei, 8pt, style=Bold">
<MatrixSortButton Name="MatrixSortButton1" Left="62.37" Width="13.23" Height="28.35" Dock="Right"/>
<MatrixCollapseButton Name="CollapseButton1" Width="16" Height="28.35" Dock="Left" SymbolSize="5"/>
</TableCell>
</TableRow>
<TableRow Name="Row2">
<TableCell Name="Cell1_" Border.Lines="All" Border.Color="White" Fill="Glass" Fill.Color="Gold" Fill.Blend="0.35" Fill.Hatch="true" Text="[Year]" AllowExpressions="false" HorzAlign="Center" VertAlign="Center" Font="Tahoma, 8pt" RowSpan="2">
<TableCell Name="Cell1_" Border.Lines="All" Border.Color="White" Fill="Glass" Fill.Color="Gold" Fill.Blend="0.35" Fill.Hatch="true" Text="[Year]" AllowExpressions="false" HorzAlign="Center" VertAlign="Center" Font="Microsoft JhengHei, 8pt" RowSpan="2">
<MatrixCollapseButton Name="CollapseButton2" Width="16" Height="37.8" Dock="Left" SymbolSize="5"/>
</TableCell>
<TableCell Name="Cell2_" Border.Lines="All" Border.Color="White" Fill="Glass" Fill.Color="Gold" Fill.Blend="0.35" Fill.Hatch="true" Text="[Month]" AllowExpressions="false" HorzAlign="Center" VertAlign="Center" Font="Tahoma, 8pt">
<TableCell Name="Cell2_" Border.Lines="All" Border.Color="White" Fill="Glass" Fill.Color="Gold" Fill.Blend="0.35" Fill.Hatch="true" Text="[Month]" AllowExpressions="false" HorzAlign="Center" VertAlign="Center" Font="Microsoft JhengHei, 8pt">
<MatrixSortButton Name="MatrixSortButton3" Left="81.27" Width="13.23" Height="18.9" Dock="Right"/>
</TableCell>
<TableCell Name="Cell21_" Border.Lines="All" Border.Color="White" Fill.Color="255, 235, 155" Text="[Sum([MatrixDemo.Revenue])]" AllowExpressions="false" Format="Currency" Format.UseLocale="true" Format.DecimalDigits="2" HorzAlign="Right" VertAlign="Center" Font="Tahoma, 8pt"/>
<TableCell Name="Cell7_" Border.Lines="All" Border.Color="White" Fill.Color="255, 235, 155" Text="[Sum([MatrixDemo.Revenue])]" AllowExpressions="false" Format="Currency" Format.UseLocale="true" Format.DecimalDigits="2" HorzAlign="Right" VertAlign="Center" Font="Tahoma, 8pt"/>
<TableCell Name="Cell21_" Border.Lines="All" Border.Color="White" Fill.Color="255, 235, 155" Text="[Sum([MatrixDemo.Revenue])]" AllowExpressions="false" Format="Currency" Format.UseLocale="true" Format.DecimalDigits="2" HorzAlign="Right" VertAlign="Center" Font="Microsoft JhengHei, 8pt"/>
<TableCell Name="Cell7_" Border.Lines="All" Border.Color="White" Fill.Color="255, 235, 155" Text="[Sum([MatrixDemo.Revenue])]" AllowExpressions="false" Format="Currency" Format.UseLocale="true" Format.DecimalDigits="2" HorzAlign="Right" VertAlign="Center" Font="Microsoft JhengHei, 8pt"/>
</TableRow>
<TableRow Name="Row3">
<TableCell Name="Cell3" Border.Lines="All" Border.Color="White" Fill.Color="255, 218, 70" AllowExpressions="false" VertAlign="Center" Font="Tahoma, 8pt"/>
<TableCell Name="Cell4" Border.Lines="All" Border.Color="White" Fill="Glass" Fill.Color="Gold" Fill.Blend="0.35" Fill.Hatch="true" Text="Total" AllowExpressions="false" HorzAlign="Center" VertAlign="Center" Font="Tahoma, 8pt">
<TableCell Name="Cell4" Border.Lines="All" Border.Color="White" Fill="Glass" Fill.Color="Gold" Fill.Blend="0.35" Fill.Hatch="true" Text="Total" AllowExpressions="false" HorzAlign="Center" VertAlign="Center" Font="Microsoft JhengHei, 8pt">
<MatrixSortButton Name="MatrixSortButton4" Left="81.27" Width="13.23" Height="18.9" Dock="Right"/>
</TableCell>
<TableCell Name="Cell41" Border.Lines="All" Border.Color="White" Fill.Color="Wheat" Text="[Sum([MatrixDemo.Revenue])]" AllowExpressions="false" Format="Currency" Format.UseLocale="true" Format.DecimalDigits="2" HorzAlign="Right" VertAlign="Center" Font="Tahoma, 8pt"/>
<TableCell Name="Cell8" Border.Lines="All" Border.Color="White" Fill.Color="Wheat" Text="[Sum([MatrixDemo.Revenue])]" AllowExpressions="false" Format="Currency" Format.UseLocale="true" Format.DecimalDigits="2" HorzAlign="Right" VertAlign="Center" Font="Tahoma, 8pt"/>
<TableCell Name="Cell41" Border.Lines="All" Border.Color="White" Fill.Color="Wheat" Text="[Sum([MatrixDemo.Revenue])]" AllowExpressions="false" Format="Currency" Format.UseLocale="true" Format.DecimalDigits="2" HorzAlign="Right" VertAlign="Center" Font="Microsoft JhengHei, 8pt"/>
<TableCell Name="Cell8" Border.Lines="All" Border.Color="White" Fill.Color="Wheat" Text="[Sum([MatrixDemo.Revenue])]" AllowExpressions="false" Format="Currency" Format.UseLocale="true" Format.DecimalDigits="2" HorzAlign="Right" VertAlign="Center" Font="Microsoft JhengHei, 8pt"/>
</TableRow>
<TableRow Name="Row4">
<TableCell Name="Cell5" Border.Lines="All" Border.Color="White" Fill.Color="255, 218, 70" Text="Total" HorzAlign="Center" VertAlign="Center" Font="Tahoma, 8pt, style=Bold" ColSpan="2">
<TableCell Name="Cell5" Border.Lines="All" Border.Color="White" Fill.Color="255, 218, 70" Text="Total" HorzAlign="Center" VertAlign="Center" Font="Microsoft JhengHei, 8pt, style=Bold" ColSpan="2">
<MatrixCollapseButton Name="CollapseButton3" Width="16" Height="18.9" Dock="Left" SymbolSize="5"/>
<MatrixSortButton Name="MatrixSortButton2" Left="147.42" Width="13.23" Height="18.9" Dock="Right"/>
</TableCell>
<TableCell Name="Cell6" Border.Lines="All" Border.Color="White" Fill.Color="255, 235, 155" Format="Currency" Format.UseLocale="true" Format.DecimalDigits="2" HorzAlign="Right" VertAlign="Center" Font="Tahoma, 8pt"/>
<TableCell Name="Cell61" Border.Lines="All" Border.Color="White" Fill.Color="255, 235, 155" Text="[Sum([MatrixDemo.Revenue])]" AllowExpressions="false" Format="Currency" Format.UseLocale="true" Format.DecimalDigits="2" HorzAlign="Right" VertAlign="Center" Font="Tahoma, 8pt"/>
<TableCell Name="Cell9" Border.Lines="All" Border.Color="White" Fill.Color="255, 235, 155" Text="[Sum([MatrixDemo.Revenue])]" AllowExpressions="false" Format="Currency" Format.UseLocale="true" Format.DecimalDigits="2" HorzAlign="Right" VertAlign="Center" Font="Tahoma, 8pt, style=Bold"/>
<TableCell Name="Cell61" Border.Lines="All" Border.Color="White" Fill.Color="255, 235, 155" Text="[Sum([MatrixDemo.Revenue])]" AllowExpressions="false" Format="Currency" Format.UseLocale="true" Format.DecimalDigits="2" HorzAlign="Right" VertAlign="Center" Font="Microsoft JhengHei, 8pt"/>
<TableCell Name="Cell9" Border.Lines="All" Border.Color="White" Fill.Color="255, 235, 155" Text="[Sum([MatrixDemo.Revenue])]" AllowExpressions="false" Format="Currency" Format.UseLocale="true" Format.DecimalDigits="2" HorzAlign="Right" VertAlign="Center" Font="Microsoft JhengHei, 8pt, style=Bold"/>
</TableRow>
</AdvMatrixObject>
</DataBand>
<PageFooterBand Name="PageFooter1" Top="167.12" Width="718.2" Height="28.35" Fill.Color="WhiteSmoke">
<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 Name="PageFooter1" Top="171.2" Width="718.2" Height="28.35">
<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="Microsoft JhengHei, 8pt, style=Underline"/>
</PageFooterBand>
</ReportPage>
</Report>
Loading

0 comments on commit 43667df

Please sign in to comment.