Skip to content

Commit 7321560

Browse files
author
Fast Reports
committed
* sync 9/7/2020
1 parent fa3a983 commit 7321560

File tree

12 files changed

+628
-212
lines changed

12 files changed

+628
-212
lines changed

Demos/Reports/Barcode.frx

Lines changed: 47 additions & 44 deletions
Large diffs are not rendered by default.

Demos/Reports/reports.xml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Reports>
3-
<Folder Name="General">
3+
<Folder Name="General" Description="Reports containing simple objects and demonstrating primitive work with data connection and display.">
44
<Report File="Simple List.frx"/>
55
<Report File="Groups.frx"/>
66
<Report File="Master-Detail.frx"/>
@@ -15,7 +15,7 @@
1515
<Report File="Inherited Report.frx" WebDemo="false"/>
1616
<Report File="Badges.frx" WebDemo="false"/>
1717
</Folder>
18-
<Folder Name="Report Objects">
18+
<Folder Name="Report Objects" Description="Reports that superficially show complex objects.">
1919
<Report File="Text.frx"/>
2020
<Report File="Image.frx"/>
2121
<Report File="Lines and Shapes.frx" WebDemo="false"/>
@@ -35,7 +35,7 @@
3535
<Report File="Gauge.frx" Basic="false"/>
3636
<Report File="SVG.frx" Basic="false"/>
3737
</Folder>
38-
<Folder Name="Interactive Reports">
38+
<Folder Name="Interactive Reports" Description="Reports showing interactivity capabilities.">
3939
<Report File="Interactive Report.frx"/>
4040
<Report File="Interactive Report, 2-in-1.frx"/>
4141
<Report File="Interactive Matrix.frx" Basic="false"/>
@@ -47,7 +47,7 @@
4747
<Report File="Handle Preview Clicks.frx" Basic="false" WebDemo="false"/>
4848
<Report File="Interactive Forms.frx"/>
4949
</Folder>
50-
<Folder Name="Table" Basic="false">
50+
<Folder Name="Table" Basic="false" Description="Reports that demonstrate various scenarios for working with a table object.">
5151
<Report File="Labels.frx" WebDemo="false"/>
5252
<Report File="Row Datasource.frx"/>
5353
<Report File="Column Datasource.frx" WebDemo="false"/>
@@ -60,7 +60,7 @@
6060
<Report File="Row Datasource, Master-Detail.frx" WebDemo="false"/>
6161
<Report File="Fit Dynamic Table To Page.frx" WebDemo="false"/>
6262
</Folder>
63-
<Folder Name="Matrix" Basic="false">
63+
<Folder Name="Matrix" Basic="false" Description="Reports showing the various capabilities of the matrix.">
6464
<Report File="Simple Matrix.frx" WebDemo="false"/>
6565
<Report File="Matrix With Rows Only.frx" WebDemo="false"/>
6666
<Report File="Matrix With Columns Only.frx" WebDemo="false"/>
@@ -77,7 +77,7 @@
7777
<Report File="Pictures Inside The Matrix.frx"/>
7878
<Report File="Two Matrices.frx" WebDemo="false"/>
7979
</Folder>
80-
<Folder Name="Dialogs" Core="false" Basic="false">
80+
<Folder Name="Dialogs" Core="false" Basic="false" Description="Reports that demonstrate how dialog boxes work.">
8181
<Report File="Hello, FastReport!.frx"/>
8282
<Report File="Print Entered Value.frx"/>
8383
<Report File="Filtering with CheckedListBox.frx" WebDemo="false"/>
@@ -87,20 +87,20 @@
8787
<Report File="Cascaded Data Filtering.frx"/>
8888
<Report File="Labels With Dialog.frx" WebDemo="false"/>
8989
</Folder>
90-
<Folder Name="Script" WebDemo="false" Basic="false">
90+
<Folder Name="Script" WebDemo="false" Basic="false" Description="Reports showing how scripts work.">
9191
<Report File="Print Total in The Group Header.frx"/>
9292
<Report File="Sort Group By Total.frx"/>
9393
<Report File="Shift Object Position.frx"/>
9494
<Report File="Dialog Events.frx"/>
9595
<Report File="Handle Dialog Forms.frx"/>
9696
</Folder>
97-
<Folder Name="Charts" Core="false" Basic="false">
97+
<Folder Name="Charts" Core="false" Basic="false" Description="Reports with sample charts, and their combination with other features.">
9898
<Report File="About Microsoft Chart.frx" WebDemo="false"/>
9999
<Report File="Microsoft Chart Sample.frx"/>
100100
<Report File="Interactive Chart.frx" WebDemo="false"/>
101101
<Report File="Sparkline.frx" />
102102
</Folder>
103-
<Folder Name="Maps" Core="false" Basic="false">
103+
<Folder Name="Maps" Core="false" Basic="false" Description="Reports with sample maps, and their combination with other features.">
104104
<Report File="World Map.frx"/>
105105
<Report File="USA Map.frx"/>
106106
<Report File="World Sales.frx"/>
@@ -109,7 +109,7 @@
109109
<Report File="World Sales, Interactive.frx"/>
110110
<Report File="World Sales by City.frx"/>
111111
</Folder>
112-
<Folder Name="Features">
112+
<Folder Name="Features" Description="Reports that demonstrate interesting and unusual features.">
113113
<Report File="Double Pass, Total Pages.frx" WebDemo="false"/>
114114
<Report File="Odd-Even Rows.frx"/>
115115
<Report File="Odd-Even Pages, Mirror Margins.frx" WebDemo="false"/>
@@ -126,7 +126,7 @@
126126
<Report File="Print Copy Names.frx" WebDemo="false"/>
127127
<Report File="Box.frx" Basic="false" WebDemo="false"/>
128128
<Report File="Unicode.frx" />
129-
<Report File="TextureFill.frx" />
129+
<Report File="TextureFill.frx" />
130130
<Report File="Purchase Order.frx" Basic="false" WebDemo="false"/>
131131
</Folder>
132132
</Reports>

Extras/Core/FastReport.Data/FastReport.Data.MySql/FastReport.Data.MySql.csproj

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@
2525
<PrivateAssets>all</PrivateAssets>
2626
</ProjectReference>
2727
</ItemGroup>
28-
<ItemGroup >
28+
<ItemGroup>
2929
<PackageReference Include="MySql.Data" Version="[6.7.9,)" />
3030
</ItemGroup>
31-
<ItemGroup >
31+
<ItemGroup>
3232
<Reference Include="System" />
3333
<Reference Include="System.Data" />
3434
<Reference Include="System.Design" />
@@ -38,14 +38,12 @@
3838
<Reference Include="System.Xml" />
3939
</ItemGroup>
4040
<ItemGroup>
41-
<Compile Update="MySqlConnectionEditor.cs">
42-
<SubType>UserControl</SubType>
43-
</Compile>
41+
<Compile Update="MySqlConnectionEditor.cs" />
4442
<Compile Update="MySqlConnectionEditor.Designer.cs">
4543
<DependentUpon>MySqlConnectionEditor.cs</DependentUpon>
4644
</Compile>
4745
</ItemGroup>
48-
<ItemGroup >
46+
<ItemGroup>
4947
<EmbeddedResource Update="MySqlConnectionEditor.resx">
5048
<DependentUpon>MySqlConnectionEditor.cs</DependentUpon>
5149
<SubType>Designer</SubType>

Extras/Core/FastReport.Data/FastReport.Data.OracleODPCore/FastReport.Data.OracleODPCore.csproj

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,6 @@
4848
</EmbeddedResource>
4949
</ItemGroup>
5050
<ItemGroup>
51-
<Compile Update="OracleConnectionEditor.cs">
52-
<SubType>UserControl</SubType>
53-
</Compile>
51+
<Compile Update="OracleConnectionEditor.cs" />
5452
</ItemGroup>
5553
</Project>

0 commit comments

Comments
 (0)