Skip to content

Commit 13318ff

Browse files
Merge pull request #711 from FastReports/sync_branch_2024.2.14
FastReport.OpenSource 2024.2.14
2 parents c6b1c93 + 2ec8b27 commit 13318ff

File tree

63 files changed

+1468
-322
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+1468
-322
lines changed

Demos/Reports/About Microsoft Chart.frx

Lines changed: 9 additions & 12 deletions
Large diffs are not rendered by default.

Demos/Reports/Simple List.frx

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Report ScriptLanguage="CSharp" TextQuality="Regular" ReportInfo.Name="Simple List" ReportInfo.Author="Fast Reports Inc" ReportInfo.Description="Demonstrates a simple list report. To create it:&#13;&#10;- go to &quot;Data&quot; menu and select &quot;Choose Report Data...&quot; item to select a datasource;&#13;&#10;- go to &quot;Report|Configure Bands...&quot; menu to create the band structure;&#13;&#10;- return to the report page, doubleclick the data band to show its editor;&#13;&#10;- choose the datasource;&#13;&#10;- drag data from the Data Dictionary window to the band." ReportInfo.Created="01/17/2008 03:05:57" ReportInfo.Modified="05/14/2019 12:21:33" ReportInfo.CreatorVersion="1.0.0.0">
2+
<Report ScriptLanguage="CSharp" TextQuality="Regular" ReportInfo.Name="Simple List" ReportInfo.Author="Fast Reports Inc" ReportInfo.Description="Demonstrates a simple list report. To create it:&#13;&#10;- go to &quot;Data&quot; menu and select &quot;Choose Report Data...&quot; item to select a datasource;&#13;&#10;- go to &quot;Report|Configure Bands...&quot; menu to create the band structure;&#13;&#10;- return to the report page, doubleclick the data band to show its editor;&#13;&#10;- choose the datasource;&#13;&#10;- drag data from the Data Dictionary window to the band." ReportInfo.Created="01/17/2008 03:05:57" ReportInfo.Modified="04/24/2024 16:32:19" ReportInfo.CreatorVersion="1.0.0.0">
33
<Dictionary>
44
<TableDataSource Name="Employees" ReferenceName="NorthWind.Employees" DataType="System.Int32" Enabled="true">
55
<Column Name="EmployeeID" DataType="System.Int32"/>
@@ -26,31 +26,31 @@
2626
<TextObject Name="Text1" Top="75.6" Width="718.2" Height="28.35" Text="EMPLOYEES" HorzAlign="Center" VertAlign="Center" Font="Tahoma, 14pt, style=Bold"/>
2727
<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"/>
2828
<TextObject Name="Text18" Width="718.2" Height="28.35" Anchor="Top, Left, Right" Fill.Color="WhiteSmoke" Cursor="Hand" Hyperlink.Value="http://fast.report/aa29e" 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"/>
29-
<ChildBand Name="Child2" Top="107.67" Width="718.2" Height="18.9"/>
29+
<ChildBand Name="Child2" Top="107.95" Width="718.2" Height="18.9"/>
3030
</ReportTitleBand>
31-
<DataBand Name="Data1" Top="130.29" Width="718.2" Height="219.24" Border.Lines="All" Border.Color="Maroon" CanGrow="true" DataSource="Employees">
31+
<DataBand Name="Data1" Top="130.85" Width="718.2" Height="219.24" Border.Lines="All" Border.Color="Maroon" CanGrow="true" DataSource="Employees">
3232
<TextObject Name="Text3" Left="9.45" Top="66.15" Width="103.95" Height="18.9" Text="Birth date:" VertAlign="Center" Font="Tahoma, 9pt, style=Bold"/>
3333
<TextObject Name="Text4" Left="113.4" Top="66.15" Width="453.6" Height="18.9" Text="[Employees.BirthDate]" Format="Date" Format.Format="D" VertAlign="Center" Font="Tahoma, 9pt"/>
3434
<TextObject Name="Text5" Left="9.45" Top="103.95" Width="103.95" Height="18.9" Text="Address:" VertAlign="Center" Font="Tahoma, 9pt, style=Bold"/>
3535
<TextObject Name="Text6" Left="113.4" Top="103.95" Width="453.6" Height="18.9" CanGrow="true" Text="[Employees.Address]" VertAlign="Center" Font="Tahoma, 9pt"/>
3636
<TextObject Name="Text7" Left="9.45" Top="122.85" Width="103.95" Height="18.9" Text="Phone:" VertAlign="Center" Font="Tahoma, 9pt, style=Bold"/>
3737
<TextObject Name="Text8" Left="113.4" Top="122.85" Width="453.6" Height="18.9" Text="[Employees.HomePhone]" VertAlign="Center" Font="Tahoma, 9pt"/>
38-
<TextObject Name="Text9" Left="113.4" Top="151.2" Width="453.6" Height="56.7" CanGrow="true" CanShrink="true" Text="[Employees.Notes]" Padding="2, 0, 2, 10" HorzAlign="Justify" Font="Tahoma, 9pt"/>
38+
<TextObject Name="Text9" Left="113.4" Top="141.75" Width="453.6" Height="56.7" CanGrow="true" CanShrink="true" GrowToBottom="true" Text="[Employees.Notes]" Padding="2, 0, 2, 10" HorzAlign="Justify" Font="Tahoma, 9pt"/>
3939
<PictureObject Name="Picture1" Left="576.45" Top="47.25" Width="132.3" Height="162.54" Border.Lines="All" Border.Color="Maroon" CanGrow="true" CanShrink="true" DataColumn="Employees.Photo"/>
4040
<TextObject Name="Text13" Left="113.4" Top="47.25" Width="453.6" Height="18.9" Text="[Employees.HireDate]" Format="Date" Format.Format="d" VertAlign="Center" Font="Tahoma, 9pt"/>
4141
<TextObject Name="Text14" Left="113.4" Top="85.05" Width="453.6" Height="18.9" Text="[Employees.City]" VertAlign="Center" Font="Tahoma, 9pt"/>
4242
<TextObject Name="Text15" Left="9.45" Top="47.25" Width="103.95" Height="18.9" Text="Hire date:" VertAlign="Center" Font="Tahoma, 9pt, style=Bold"/>
4343
<TextObject Name="Text16" Left="9.45" Top="85.05" Width="103.95" Height="18.9" Text="City:" VertAlign="Center" Font="Tahoma, 9pt, style=Bold"/>
44-
<TextObject Name="Text17" Left="9.45" Top="151.2" Width="103.95" Height="18.9" Text="Notes:" Font="Tahoma, 9pt, style=Bold"/>
44+
<TextObject Name="Text17" Left="9.45" Top="141.75" Width="103.95" Height="18.9" Text="Notes:" Font="Tahoma, 9pt, style=Bold"/>
4545
<TextObject Name="Text2" Width="718.2" Height="37.8" Border.Lines="All" Border.Color="Maroon" Fill="LinearGradient" Fill.StartColor="IndianRed" Fill.EndColor="Maroon" Fill.Angle="90" Fill.Focus="0.52" Fill.Contrast="1" Text="[Employees.FirstName] [Employees.LastName]" Padding="10, 0, 2, 0" VertAlign="Center" Font="Tahoma, 12pt, style=Bold" TextFill.Color="White"/>
46-
<ChildBand Name="Child1" Top="353.25" Width="718.2" Height="18.9"/>
46+
<ChildBand Name="Child1" Top="354.09" Width="718.2" Height="18.9"/>
4747
<Sort>
4848
<Sort Expression="[Employees.FirstName]"/>
4949
<Sort Expression="[Employees.LastName]"/>
5050
</Sort>
5151
</DataBand>
52-
<PageFooterBand Name="PageFooter1" Top="375.87" Width="718.2" Height="28.35" Fill.Color="WhiteSmoke" CanGrow="true">
53-
<TextObject Name="Text10" Left="614.25" Width="94.5" Height="28.35" Text="[PageN]" HorzAlign="Right" VertAlign="Center" Font="Tahoma, 8pt"/>
52+
<PageFooterBand Name="PageFooter1" Top="376.99" Width="718.2" Height="28.35" Fill.Color="WhiteSmoke" CanGrow="true">
53+
<TextObject Name="Text10" Left="576.45" Width="132.3" Height="28.35" Text="[PageN]" HorzAlign="Right" VertAlign="Center" Font="Tahoma, 8pt"/>
5454
<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"/>
5555
</PageFooterBand>
5656
</ReportPage>

Extras/Core/FastReport.Data/FastReport.Data.Firebird/Shared.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<Import Project="..\Connections.props" />
99

1010
<ItemGroup>
11-
<PackageReference Include="FirebirdSql.Data.FirebirdClient" Version="7.1.1" />
11+
<PackageReference Include="FirebirdSql.Data.FirebirdClient" Version="10.0.0" />
1212
</ItemGroup>
1313

1414
<ItemGroup>

Extras/Core/FastReport.Data/FastReport.Data.Linter/LinterDataConnectionEditor.cs

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -56,17 +56,21 @@ protected override void SetConnectionString(string value)
5656
private void btnAdvanced_Click(object sender, EventArgs e)
5757
{
5858
if (factory == null)
59-
return;
60-
61-
using (AdvancedConnectionPropertiesForm form = new AdvancedConnectionPropertiesForm())
6259
{
63-
var stringBuilder = factory.CreateConnectionStringBuilder();
64-
stringBuilder.BrowsableConnectionString = false;
65-
form.AdvancedProperties = stringBuilder;
66-
67-
if (form.ShowDialog() == DialogResult.OK)
60+
FRMessageBox.Error(Res.Get("ConnectionEditors,Linter,DBProviderNotFound"));
61+
}
62+
else
63+
{
64+
using (AdvancedConnectionPropertiesForm form = new AdvancedConnectionPropertiesForm())
6865
{
69-
ConnectionString = form.AdvancedProperties.ToString();
66+
var stringBuilder = factory.CreateConnectionStringBuilder();
67+
stringBuilder.BrowsableConnectionString = false;
68+
form.AdvancedProperties = stringBuilder;
69+
70+
if (form.ShowDialog() == DialogResult.OK)
71+
{
72+
ConnectionString = form.AdvancedProperties.ToString();
73+
}
7074
}
7175
}
7276
}

0 commit comments

Comments
 (0)