Skip to content
This repository was archived by the owner on Oct 16, 2020. It is now read-only.

Commit 79b3217

Browse files
dgrunwalddgrunwald
committed
Merge remote-tracking branch 'origin/reports'
2 parents 129bf84 + 61f3091 commit 79b3217

61 files changed

Lines changed: 5281 additions & 53 deletions

File tree

Some content is hidden

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

‎SharpDevelop.sln‎

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11

2-
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 2012
2+
Microsoft Visual Studio Solution File, Format Version 11.00
3+
# Visual Studio 2010
44
# SharpDevelop 5.0
5-
VisualStudioVersion = 12.0.20827.3
6-
MinimumVisualStudioVersion = 10.0.40219.1
75
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Main", "Main", "{256F5C28-532C-44C0-8AB8-D8EC5E492E01}"
86
EndProject
97
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.BuildWorker35", "src\Main\ICSharpCode.SharpDevelop.BuildWorker35\ICSharpCode.SharpDevelop.BuildWorker35.csproj", "{B5F54272-49F0-40DB-845A-8D837875D3BA}"
@@ -115,8 +113,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Reports", "Reports", "{4ABB
115113
EndProject
116114
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Reporting", "src\AddIns\Misc\Reporting\ICSharpCode.Reporting\ICSharpCode.Reporting.csproj", "{40CA84D4-ACFC-4646-9CDD-B87262D34093}"
117115
EndProject
118-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Reporting.Addin", "src\AddIns\Misc\Reporting\ICSharpCode.Reporting.Addin\ICSharpCode.Reporting.Addin.csproj", "{0502FCF7-72F4-4587-936B-D0238CD0E072}"
119-
EndProject
120116
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Display Bindings", "Display Bindings", "{11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}"
121117
EndProject
122118
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AvalonEdit.AddIn", "src\AddIns\DisplayBindings\AvalonEdit.AddIn\AvalonEdit.AddIn.csproj", "{0162E499-42D0-409B-AA25-EED21F75336B}"
@@ -369,10 +365,6 @@ Global
369365
{60480C2F-F228-4D86-B98F-AF75A7DCEC34}.Debug|Any CPU.Build.0 = Debug|Any CPU
370366
{60480C2F-F228-4D86-B98F-AF75A7DCEC34}.Release|Any CPU.ActiveCfg = Release|Any CPU
371367
{60480C2F-F228-4D86-B98F-AF75A7DCEC34}.Release|Any CPU.Build.0 = Release|Any CPU
372-
{40CA84D4-ACFC-4646-9CDD-B87262D34093}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
373-
{40CA84D4-ACFC-4646-9CDD-B87262D34093}.Debug|Any CPU.Build.0 = Debug|Any CPU
374-
{40CA84D4-ACFC-4646-9CDD-B87262D34093}.Release|Any CPU.ActiveCfg = Release|Any CPU
375-
{40CA84D4-ACFC-4646-9CDD-B87262D34093}.Release|Any CPU.Build.0 = Release|Any CPU
376368
{0502FCF7-72F4-4587-936B-D0238CD0E072}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
377369
{0502FCF7-72F4-4587-936B-D0238CD0E072}.Debug|Any CPU.Build.0 = Debug|Any CPU
378370
{0502FCF7-72F4-4587-936B-D0238CD0E072}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -501,6 +493,10 @@ Global
501493
{3DF4060F-5EE0-41CF-8096-F27355FD5511}.Debug|Any CPU.Build.0 = Debug|Any CPU
502494
{3DF4060F-5EE0-41CF-8096-F27355FD5511}.Release|Any CPU.ActiveCfg = Release|Any CPU
503495
{3DF4060F-5EE0-41CF-8096-F27355FD5511}.Release|Any CPU.Build.0 = Release|Any CPU
496+
{40CA84D4-ACFC-4646-9CDD-B87262D34093}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
497+
{40CA84D4-ACFC-4646-9CDD-B87262D34093}.Debug|Any CPU.Build.0 = Debug|Any CPU
498+
{40CA84D4-ACFC-4646-9CDD-B87262D34093}.Release|Any CPU.ActiveCfg = Release|Any CPU
499+
{40CA84D4-ACFC-4646-9CDD-B87262D34093}.Release|Any CPU.Build.0 = Release|Any CPU
504500
EndGlobalSection
505501
GlobalSection(SolutionProperties) = preSolution
506502
HideSolutionNode = FALSE
@@ -557,7 +553,6 @@ Global
557553
{60480C2F-F228-4D86-B98F-AF75A7DCEC34} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
558554
{4ABB8D1E-3439-44C8-ACCE-1FA678ABBFB3} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
559555
{40CA84D4-ACFC-4646-9CDD-B87262D34093} = {4ABB8D1E-3439-44C8-ACCE-1FA678ABBFB3}
560-
{0502FCF7-72F4-4587-936B-D0238CD0E072} = {4ABB8D1E-3439-44C8-ACCE-1FA678ABBFB3}
561556
{11BF9245-88A3-4A0A-9A8A-EC9D98036B0F} = {39327899-ED91-4F7F-988C-4FE4E17C014D}
562557
{0162E499-42D0-409B-AA25-EED21F75336B} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
563558
{E618A9CD-A39F-4925-A538-E8A3FEF24E54} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}

‎src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/ICSharpCode.Reporting.Addin.csproj‎

Lines changed: 79 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,12 @@
4545
<Reference Include="Microsoft.CSharp">
4646
<RequiredTargetFramework>4.0</RequiredTargetFramework>
4747
</Reference>
48+
<Reference Include="PresentationCore">
49+
<RequiredTargetFramework>3.0</RequiredTargetFramework>
50+
</Reference>
51+
<Reference Include="PresentationFramework">
52+
<RequiredTargetFramework>3.0</RequiredTargetFramework>
53+
</Reference>
4854
<Reference Include="System" />
4955
<Reference Include="System.Core">
5056
<RequiredTargetFramework>3.5</RequiredTargetFramework>
@@ -53,23 +59,81 @@
5359
<Reference Include="System.Data.DataSetExtensions">
5460
<RequiredTargetFramework>3.5</RequiredTargetFramework>
5561
</Reference>
62+
<Reference Include="System.Design" />
63+
<Reference Include="System.Drawing" />
64+
<Reference Include="System.Windows.Forms" />
65+
<Reference Include="System.Xaml">
66+
<RequiredTargetFramework>4.0</RequiredTargetFramework>
67+
</Reference>
5668
<Reference Include="System.Xml" />
5769
<Reference Include="System.Xml.Linq">
5870
<RequiredTargetFramework>3.5</RequiredTargetFramework>
5971
</Reference>
72+
<Reference Include="WindowsBase">
73+
<RequiredTargetFramework>3.0</RequiredTargetFramework>
74+
</Reference>
6075
</ItemGroup>
6176
<ItemGroup>
6277
<Folder Include="Configuration" />
63-
<Folder Include="DesignerBinding" />
64-
<Folder Include="Commands" />
78+
<Folder Include="src" />
79+
<Folder Include="src\DesignerBinding" />
80+
<Folder Include="src\Commands" />
81+
<Folder Include="src\Designer" />
82+
<Folder Include="src\Globals" />
83+
<Folder Include="src\DesignableItems" />
84+
<Folder Include="src\Toolbox" />
85+
<Folder Include="src\TypeProvider" />
86+
<Folder Include="src\XML" />
87+
<Folder Include="src\Services" />
88+
<Folder Include="src\Views" />
6589
</ItemGroup>
6690
<ItemGroup>
67-
<Compile Include="..\..\..\..\Main\GlobalAssemblyInfo.cs">
68-
<Link>Configuration\GlobalAssemblyInfo.cs</Link>
69-
</Compile>
7091
<Compile Include="Configuration\AssemblyInfo.cs" />
71-
<Compile Include="Commands\ViewCommands.cs" />
72-
<Compile Include="DesignerBinding\DesignerBinding.cs" />
92+
<Compile Include="src\Commands\ViewCommands.cs" />
93+
<Compile Include="src\DesignableItems\AbstractItem.cs" />
94+
<Compile Include="src\DesignableItems\BaseLineItem.cs" />
95+
<Compile Include="src\DesignableItems\BaseSection.cs" />
96+
<Compile Include="src\DesignableItems\BaseTextItem.cs" />
97+
<Compile Include="src\DesignableItems\ReportSettings.cs" />
98+
<Compile Include="src\DesignerBinding\DesignerBinding.cs" />
99+
<Compile Include="src\DesignerBinding\DesignerGenerator.cs" />
100+
<Compile Include="src\DesignerBinding\IDesignerGenerator.cs" />
101+
<Compile Include="src\DesignerBinding\InternalReportLoader.cs" />
102+
<Compile Include="src\DesignerBinding\ReportDefinitionDeserializer.cs" />
103+
<Compile Include="src\DesignerBinding\ReportDesignerLoader.cs" />
104+
<Compile Include="src\Designer\AbstractDesigner.cs" />
105+
<Compile Include="src\Designer\LineDesigner.cs" />
106+
<Compile Include="src\Designer\ReportRootDesigner.cs" />
107+
<Compile Include="src\Designer\ReportSettingsDesigner.cs" />
108+
<Compile Include="src\Designer\RootReportModel.cs" />
109+
<Compile Include="src\Designer\SectionDesigner.cs" />
110+
<Compile Include="src\Designer\TextItemDesigner.cs" />
111+
<Compile Include="src\Globals\DesignerGlobals.cs" />
112+
<Compile Include="src\Globals\StringWriterWithEncoding.cs" />
113+
<Compile Include="src\Services\DefaultMemberRelationshipService.cs" />
114+
<Compile Include="src\Services\DesignerSerializationService.cs" />
115+
<Compile Include="src\Services\MenuCommandService.cs" />
116+
<Compile Include="src\Services\NameCreationService.cs" />
117+
<Compile Include="src\Services\TypeDiscoveryService.cs" />
118+
<Compile Include="src\Services\TypeResolutionService.cs" />
119+
<Compile Include="src\Services\DefaultServiceContainer.cs" />
120+
<Compile Include="src\Services\HelpService.cs" />
121+
<Compile Include="src\Services\ToolboxService.cs" />
122+
<Compile Include="src\Services\UIService.cs" />
123+
<Compile Include="src\Toolbox\SideTabItemDesigner.cs" />
124+
<Compile Include="src\Toolbox\ToolboxProvider.cs" />
125+
<Compile Include="src\TypeProvider\AbstractItemTypeProvider.cs" />
126+
<Compile Include="src\TypeProvider\LineItemTypeProvider.cs" />
127+
<Compile Include="src\TypeProvider\SectionItemTypeProvider.cs" />
128+
<Compile Include="src\TypeProvider\TextItemTypeProvider.cs" />
129+
<Compile Include="src\TypeProvider\TypeProviderHelper.cs" />
130+
<Compile Include="src\Views\DesignerView.cs" />
131+
<Compile Include="src\Views\WpfPreview.cs" />
132+
<Compile Include="src\Views\XmlView.cs" />
133+
<Compile Include="src\XML\MycroWriter.cs" />
134+
<Compile Include="src\XML\ReportDefinitionParser.cs" />
135+
<Compile Include="src\XML\ReportDesignerWriter.cs" />
136+
<Compile Include="src\XML\XmlHelper.cs" />
73137
</ItemGroup>
74138
<ItemGroup>
75139
<None Include="EmptyReport.xft">
@@ -90,6 +154,14 @@
90154
<Name>ICSharpCode.Core</Name>
91155
<Private>False</Private>
92156
</ProjectReference>
157+
<ProjectReference Include="..\..\..\..\Main\ICSharpCode.Core.WinForms\ICSharpCode.Core.WinForms.csproj">
158+
<Project>{857CA1A3-FC88-4BE0-AB6A-D1EE772AB288}</Project>
159+
<Name>ICSharpCode.Core.WinForms</Name>
160+
</ProjectReference>
161+
<ProjectReference Include="..\..\..\..\Main\ICSharpCode.SharpDevelop.Widgets\Project\ICSharpCode.SharpDevelop.Widgets.csproj">
162+
<Project>{8035765F-D51F-4A0C-A746-2FD100E19419}</Project>
163+
<Name>ICSharpCode.SharpDevelop.Widgets</Name>
164+
</ProjectReference>
93165
<ProjectReference Include="..\ICSharpCode.Reporting\ICSharpCode.Reporting.csproj">
94166
<Project>{40CA84D4-ACFC-4646-9CDD-B87262D34093}</Project>
95167
<Name>ICSharpCode.Reporting</Name>

‎src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/ICSharpCode.Reporting.addin‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,21 +19,20 @@
1919

2020
<!-- DisplayBinding -->
2121
<Path name="/SharpDevelop/Workbench/DisplayBindings">
22-
<DisplayBinding id="SharpDevelopReportsBinding"
22+
<DisplayBinding id="SharpDevelopReportsBinding"
2323
insertbefore="Text"
2424
fileNamePattern="\.(srd)$"
25-
languagePattern="^SharpDevelopReports$"
25+
languagePattern="^SharpDevelopReports$"
2626
class="ICSharpCode.Reporting.Addin.DesignerBinding.ReportDesignerBinding" />
2727
</Path>
2828

29-
<!-- label = "${res:SharpReport.ReportGenerator}"-->
30-
<!--<Path name="/SharpDevelop/Workbench/Tools">
29+
<!-- Tools Menu
30+
<Path name="/SharpDevelop/Workbench/Tools">
3131
<MenuItem id="ReportGeneratorPad"
32-
label="New Reporting"
33-
class="ICSharpCode.Reporting.Addin.DesignerBinding.ReportDesignerBinding" />
32+
label="${res:SharpReport.ReportGenerator}"
33+
class="ICSharpCode.Reporting.Addin.Commands.CreateDesignerCommand" />
3434
</Path>-->
3535

36-
3736
<!-- File Filter -->
3837
<Path name="/SharpDevelop/Workbench/FileFilter">
3938
<FileFilter id="SharpDevelopReports"

‎src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/Commands/ViewCommands.cs‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
/*
2+
* Created by SharpDevelop.
3+
* User: Peter Forstmeier
4+
* Date: 17.02.2014
5+
* Time: 20:07
6+
*
7+
* To change this template use Tools | Options | Coding | Edit Standard Headers.
8+
*/
9+
using System;
10+
using ICSharpCode.Core;
11+
using ICSharpCode.SharpDevelop.Workbench;
12+
using ICSharpCode.Reporting.Addin.DesignerBinding;
13+
using ICSharpCode.Reporting.Addin.Views;
14+
15+
namespace ICSharpCode.Reporting.Addin.Commands
16+
{
17+
/// <summary>
18+
/// Description of ViewCommands.
19+
/// </summary>
20+
public class CreateDesignerCommand : AbstractMenuCommand
21+
{
22+
readonly OpenedFile openedFile;
23+
24+
public CreateDesignerCommand() {
25+
MessageService.ShowMessage("Not implemented at the moment","Reporting");
26+
}
27+
28+
public CreateDesignerCommand (OpenedFile openedFile) {
29+
if (openedFile == null)
30+
throw new ArgumentNullException("openedFile");
31+
this.openedFile = openedFile;
32+
}
33+
34+
public override void Run(){
35+
var generator = new DesignerGenerator();
36+
37+
DesignerView = new DesignerView(openedFile, generator);
38+
}
39+
40+
public DesignerView DesignerView {get; private set;}
41+
}
42+
}

‎src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/DesignableItems/AbstractItem.cs‎

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
/*
2+
* Created by SharpDevelop.
3+
* User: Peter Forstmeier
4+
* Date: 15.03.2014
5+
* Time: 19:30
6+
*
7+
* To change this template use Tools | Options | Coding | Edit Standard Headers.
8+
*/
9+
using System;
10+
using System.ComponentModel;
11+
using System.Drawing;
12+
using ICSharpCode.Reporting.Addin.TypeProvider;
13+
14+
namespace ICSharpCode.Reporting.Addin.DesignableItems
15+
{
16+
/// <summary>
17+
/// Description of AbstractItem.
18+
/// </summary>
19+
// [TypeDescriptionProvider(typeof(AbstractItemTypeProvider))]
20+
public abstract class AbstractItem:System.Windows.Forms.Control
21+
{
22+
Color frameColor = Color.Black;
23+
24+
25+
protected AbstractItem()
26+
{
27+
InitializeComponent();
28+
TypeDescriptor.AddProvider(new AbstractItemTypeProvider(), typeof(AbstractItem));
29+
}
30+
31+
32+
protected void DrawControl (Graphics graphics,Rectangle borderRectangle)
33+
{
34+
if (DrawBorder == true) {
35+
graphics.DrawRectangle(new Pen(frameColor),borderRectangle);
36+
}
37+
System.Windows.Forms.ControlPaint.DrawBorder3D(graphics, this.ClientRectangle,
38+
System.Windows.Forms.Border3DStyle.Etched);
39+
}
40+
41+
42+
#region Property's
43+
44+
protected Rectangle DrawingRectangle {
45+
get {
46+
47+
return new Rectangle(this.ClientRectangle.Left ,
48+
ClientRectangle.Top ,
49+
ClientRectangle.Width -1,
50+
ClientRectangle.Height -1);
51+
}
52+
}
53+
54+
55+
[Category("Border")]
56+
public Color FrameColor {
57+
get { return frameColor; }
58+
set {
59+
frameColor = value;
60+
this.Invalidate();
61+
}
62+
}
63+
64+
65+
[Category("Border"),
66+
Description("Draw a Border around the Item")]
67+
public bool DrawBorder {get;set;}
68+
69+
70+
protected new Size DefaultSize {get;set;}
71+
72+
73+
#endregion
74+
75+
76+
public abstract void Draw(Graphics graphics);
77+
78+
private void InitializeComponent()
79+
{
80+
SuspendLayout();
81+
ResumeLayout(false);
82+
}
83+
}
84+
}

0 commit comments

Comments
 (0)