Skip to content

Commit 127c70f

Browse files
auto sync for version 2023.1
1 parent 0d2c8dd commit 127c70f

39 files changed

+1241
-1087
lines changed

.gitattributes

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
VB/* linguist-vendored
2-
scripts linguist-vendored
3-
*.css linguist-detectable=false
1+
VB/* linguist-vendored
2+
scripts linguist-vendored
3+
*.css linguist-detectable=false
44
*.aff linguist-detectable=false
File renamed without changes.
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
using System;
2-
using System.Collections.Generic;
3-
using System.Configuration;
4-
using System.Data;
5-
using System.Linq;
6-
using System.Windows;
7-
8-
namespace ReportDesigner_AddingCustomControl
9-
{
10-
/// <summary>
11-
/// Interaction logic for App.xaml
12-
/// </summary>
13-
public partial class App : Application
14-
{
15-
}
16-
}
1+
using System;
2+
using System.Collections.Generic;
3+
using System.Configuration;
4+
using System.Data;
5+
using System.Linq;
6+
using System.Windows;
7+
8+
namespace ReportDesigner_AddingCustomControl
9+
{
10+
/// <summary>
11+
/// Interaction logic for App.xaml
12+
/// </summary>
13+
public partial class App : Application
14+
{
15+
}
16+
}
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
1-
using System.Windows;
2-
using System.Windows.Media.Imaging;
3-
using DevExpress.Utils;
4-
using DevExpress.Xpf.Reports.UserDesigner;
5-
using DevExpress.Xpf.Reports.UserDesigner.XRDiagram;
6-
using DevExpress.XtraReports.UI;
7-
// ...
8-
9-
namespace ReportDesigner_AddingCustomControl {
10-
/// <summary>
11-
/// Interaction logic for MainWindow.xaml
12-
/// </summary>
13-
public partial class MainWindow : Window {
14-
public MainWindow() {
15-
InitializeComponent();
16-
17-
var icon = BitmapFrame.Create(AssemblyHelper.GetResourceUri(GetType().Assembly, "progress.png"));
18-
ReportDesigner.RegisterControl<XRProgressBar>(() => new DefaultXRControlDiagramItem(), icon);
19-
}
20-
21-
private void Window_Loaded(object sender, RoutedEventArgs e) {
22-
reportDesigner.OpenDocument(new XtraReport());
23-
}
24-
}
25-
}
1+
using System.Windows;
2+
using System.Windows.Media.Imaging;
3+
using DevExpress.Utils;
4+
using DevExpress.Xpf.Reports.UserDesigner;
5+
using DevExpress.Xpf.Reports.UserDesigner.XRDiagram;
6+
using DevExpress.XtraReports.UI;
7+
// ...
8+
9+
namespace ReportDesigner_AddingCustomControl {
10+
/// <summary>
11+
/// Interaction logic for MainWindow.xaml
12+
/// </summary>
13+
public partial class MainWindow : Window {
14+
public MainWindow() {
15+
InitializeComponent();
16+
17+
var icon = BitmapFrame.Create(AssemblyHelper.GetResourceUri(GetType().Assembly, "progress.png"));
18+
ReportDesigner.RegisterControl<XRProgressBar>(() => new DefaultXRControlDiagramItem(), icon);
19+
}
20+
21+
private void Window_Loaded(object sender, RoutedEventArgs e) {
22+
reportDesigner.OpenDocument(new XtraReport());
23+
}
24+
}
25+
}
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,55 @@
1-
using System.Reflection;
2-
using System.Resources;
3-
using System.Runtime.CompilerServices;
4-
using System.Runtime.InteropServices;
5-
using System.Windows;
6-
7-
// General Information about an assembly is controlled through the following
8-
// set of attributes. Change these attribute values to modify the information
9-
// associated with an assembly.
10-
[assembly: AssemblyTitle("ReportDesigner_AddingCustomControl")]
11-
[assembly: AssemblyDescription("")]
12-
[assembly: AssemblyConfiguration("")]
13-
[assembly: AssemblyCompany("")]
14-
[assembly: AssemblyProduct("ReportDesigner_AddingCustomControl")]
15-
[assembly: AssemblyCopyright("Copyright © 2016")]
16-
[assembly: AssemblyTrademark("")]
17-
[assembly: AssemblyCulture("")]
18-
19-
// Setting ComVisible to false makes the types in this assembly not visible
20-
// to COM components. If you need to access a type in this assembly from
21-
// COM, set the ComVisible attribute to true on that type.
22-
[assembly: ComVisible(false)]
23-
24-
//In order to begin building localizable applications, set
25-
//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
26-
//inside a <PropertyGroup>. For example, if you are using US english
27-
//in your source files, set the <UICulture> to en-US. Then uncomment
28-
//the NeutralResourceLanguage attribute below. Update the "en-US" in
29-
//the line below to match the UICulture setting in the project file.
30-
31-
//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
32-
33-
34-
[assembly: ThemeInfo(
35-
ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
36-
//(used if a resource is not found in the page,
37-
// or application resource dictionaries)
38-
ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
39-
//(used if a resource is not found in the page,
40-
// app, or any theme specific resource dictionaries)
41-
)]
42-
43-
44-
// Version information for an assembly consists of the following four values:
45-
//
46-
// Major Version
47-
// Minor Version
48-
// Build Number
49-
// Revision
50-
//
51-
// You can specify all the values or you can default the Build and Revision Numbers
52-
// by using the '*' as shown below:
53-
// [assembly: AssemblyVersion("1.0.*")]
54-
[assembly: AssemblyVersion("1.0.0.0")]
55-
[assembly: AssemblyFileVersion("1.0.0.0")]
1+
using System.Reflection;
2+
using System.Resources;
3+
using System.Runtime.CompilerServices;
4+
using System.Runtime.InteropServices;
5+
using System.Windows;
6+
7+
// General Information about an assembly is controlled through the following
8+
// set of attributes. Change these attribute values to modify the information
9+
// associated with an assembly.
10+
[assembly: AssemblyTitle("ReportDesigner_AddingCustomControl")]
11+
[assembly: AssemblyDescription("")]
12+
[assembly: AssemblyConfiguration("")]
13+
[assembly: AssemblyCompany("")]
14+
[assembly: AssemblyProduct("ReportDesigner_AddingCustomControl")]
15+
[assembly: AssemblyCopyright("Copyright © 2016")]
16+
[assembly: AssemblyTrademark("")]
17+
[assembly: AssemblyCulture("")]
18+
19+
// Setting ComVisible to false makes the types in this assembly not visible
20+
// to COM components. If you need to access a type in this assembly from
21+
// COM, set the ComVisible attribute to true on that type.
22+
[assembly: ComVisible(false)]
23+
24+
//In order to begin building localizable applications, set
25+
//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
26+
//inside a <PropertyGroup>. For example, if you are using US english
27+
//in your source files, set the <UICulture> to en-US. Then uncomment
28+
//the NeutralResourceLanguage attribute below. Update the "en-US" in
29+
//the line below to match the UICulture setting in the project file.
30+
31+
//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
32+
33+
34+
[assembly: ThemeInfo(
35+
ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
36+
//(used if a resource is not found in the page,
37+
// or application resource dictionaries)
38+
ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
39+
//(used if a resource is not found in the page,
40+
// app, or any theme specific resource dictionaries)
41+
)]
42+
43+
44+
// Version information for an assembly consists of the following four values:
45+
//
46+
// Major Version
47+
// Minor Version
48+
// Build Number
49+
// Revision
50+
//
51+
// You can specify all the values or you can default the Build and Revision Numbers
52+
// by using the '*' as shown below:
53+
// [assembly: AssemblyVersion("1.0.*")]
54+
[assembly: AssemblyVersion("1.0.0.0")]
55+
[assembly: AssemblyFileVersion("1.0.0.0")]
+63-63
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)