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

Commit 31e3d1c

Browse files
PeterForstmeierPeterForstmeier
committed
Start working on Designer
1 parent 95d1803 commit 31e3d1c

31 files changed

Lines changed: 3020 additions & 19 deletions

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

Lines changed: 46 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,21 +54,54 @@
5454
<Reference Include="System.Data.DataSetExtensions">
5555
<RequiredTargetFramework>3.5</RequiredTargetFramework>
5656
</Reference>
57+
<Reference Include="System.Design" />
58+
<Reference Include="System.Drawing" />
59+
<Reference Include="System.Windows.Forms" />
5760
<Reference Include="System.Xml" />
5861
<Reference Include="System.Xml.Linq">
5962
<RequiredTargetFramework>3.5</RequiredTargetFramework>
6063
</Reference>
6164
</ItemGroup>
6265
<ItemGroup>
6366
<Folder Include="Configuration" />
64-
<Folder Include="scr" />
65-
<Folder Include="scr\DesignerBinding" />
66-
<Folder Include="scr\Commands" />
67+
<Folder Include="src" />
68+
<Folder Include="src\DesignerBinding" />
69+
<Folder Include="src\Commands" />
70+
<Folder Include="src\Designer" />
71+
<Folder Include="src\Globals" />
72+
<Folder Include="src\DesignableItems" />
73+
<Folder Include="src\XML" />
74+
<Folder Include="src\Services" />
75+
<Folder Include="src\Views" />
6776
</ItemGroup>
6877
<ItemGroup>
6978
<Compile Include="Configuration\AssemblyInfo.cs" />
70-
<Compile Include="scr\Commands\ViewCommands.cs" />
71-
<Compile Include="scr\DesignerBinding\DesignerBinding.cs" />
79+
<Compile Include="src\Commands\ViewCommands.cs" />
80+
<Compile Include="src\DesignableItems\AbstractItem.cs" />
81+
<Compile Include="src\DesignableItems\BaseSection.cs" />
82+
<Compile Include="src\DesignableItems\ReportSettings.cs" />
83+
<Compile Include="src\DesignerBinding\DesignerBinding.cs" />
84+
<Compile Include="src\DesignerBinding\DesignerGenerator.cs" />
85+
<Compile Include="src\DesignerBinding\IDesignerGenerator.cs" />
86+
<Compile Include="src\DesignerBinding\InternalReportLoader.cs" />
87+
<Compile Include="src\DesignerBinding\ReportDefinitionDeserializer.cs" />
88+
<Compile Include="src\DesignerBinding\ReportDesignerLoader.cs" />
89+
<Compile Include="src\Designer\ReportRootDesigner.cs" />
90+
<Compile Include="src\Designer\ReportSettingsDesigner.cs" />
91+
<Compile Include="src\Designer\RootReportModel.cs" />
92+
<Compile Include="src\Designer\SectionDesigner.cs" />
93+
<Compile Include="src\Globals\DesignerGlobals.cs" />
94+
<Compile Include="src\Services\DefaultMemberRelationshipService.cs" />
95+
<Compile Include="src\Services\DesignerSerializationService.cs" />
96+
<Compile Include="src\Services\MenuCommandService.cs" />
97+
<Compile Include="src\Services\TypeDiscoveryService.cs" />
98+
<Compile Include="src\Services\TypeResolutionService.cs" />
99+
<Compile Include="src\Services\DefaultServiceContainer.cs" />
100+
<Compile Include="src\Services\HelpService.cs" />
101+
<Compile Include="src\Services\ToolboxService.cs" />
102+
<Compile Include="src\Services\UIService.cs" />
103+
<Compile Include="src\Views\DesignerView.cs" />
104+
<Compile Include="src\XML\ReportDefinitionParser.cs" />
72105
</ItemGroup>
73106
<ItemGroup>
74107
<None Include="EmptyReport.xft">
@@ -89,6 +122,14 @@
89122
<Name>ICSharpCode.Core</Name>
90123
<Private>False</Private>
91124
</ProjectReference>
125+
<ProjectReference Include="..\..\..\..\Main\ICSharpCode.Core.WinForms\ICSharpCode.Core.WinForms.csproj">
126+
<Project>{857CA1A3-FC88-4BE0-AB6A-D1EE772AB288}</Project>
127+
<Name>ICSharpCode.Core.WinForms</Name>
128+
</ProjectReference>
129+
<ProjectReference Include="..\ICSharpCode.Reporting\ICSharpCode.Reporting.csproj">
130+
<Project>{40CA84D4-ACFC-4646-9CDD-B87262D34093}</Project>
131+
<Name>ICSharpCode.Reporting</Name>
132+
</ProjectReference>
92133
<ProjectReference Include="..\ICSharpCode.Reporting\ICSharpCode.Reporting.csproj">
93134
<Project>{40CA84D4-ACFC-4646-9CDD-B87262D34093}</Project>
94135
<Name>ICSharpCode.Reporting</Name>

src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/scr/Commands/ViewCommands.cs renamed to src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/Commands/ViewCommands.cs

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
using System;
1010
using ICSharpCode.Core;
1111
using ICSharpCode.SharpDevelop.Workbench;
12+
using ICSharpCode.Reporting.Addin.DesignerBinding;
13+
using ICSharpCode.Reporting.Addin.Views;
1214

1315
namespace ICSharpCode.Reporting.Addin.Commands
1416
{
@@ -26,11 +28,11 @@ public CreateDesignerCommand (OpenedFile openedFile) {
2628
}
2729

2830
public override void Run(){
29-
// var generator = new ReportDesignerGenerator();
30-
// DesignerView = new ReportDesignerView(openedFile, generator);
31-
MessageService.ShowMessage("ReportDesigner not available at the Moment","New ReportDesigner");
31+
var generator = new DesignerGenerator();
32+
33+
DesignerView = new DesignerView(openedFile, generator);
3234
}
3335

34-
// public ReportDesignerView DesignerView {get; private set;}
36+
public DesignerView DesignerView {get; private set;}
3537
}
3638
}

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

Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
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+
13+
namespace ICSharpCode.Reporting.Addin.DesignableItems
14+
{
15+
/// <summary>
16+
/// Description of AbstractItem.
17+
/// </summary>
18+
// [TypeDescriptionProvider(typeof(AbstractItemTypeProvider))]
19+
public abstract class AbstractItem:System.Windows.Forms.Control
20+
{
21+
private Color frameColor = Color.Black;
22+
23+
24+
protected AbstractItem()
25+
{
26+
InitializeComponent();
27+
// TypeDescriptor.AddProvider(new AbstractItemTypeProvider(), typeof(AbstractItem));
28+
// VisibleInReport = true;
29+
}
30+
31+
32+
protected void DrawControl (Graphics graphics,Rectangle borderRectangle)
33+
{
34+
if (this.DrawBorder == true) {
35+
graphics.DrawRectangle(new Pen(this.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+
this.ClientRectangle.Top ,
49+
this.ClientRectangle.Width -1,
50+
this.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+
protected new Size DefaultSize {get;set;}
70+
71+
// public bool VisibleInReport {get;set;}
72+
73+
#endregion
74+
75+
[System.ComponentModel.EditorBrowsableAttribute()]
76+
protected override void OnPaint(System.Windows.Forms.PaintEventArgs e)
77+
{
78+
base.OnPaint(e);
79+
}
80+
81+
public abstract void Draw(Graphics graphics);
82+
83+
private void InitializeComponent()
84+
{
85+
this.SuspendLayout();
86+
this.ResumeLayout(false);
87+
}
88+
}
89+
}

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

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
/*
2+
* Created by SharpDevelop.
3+
* User: Peter Forstmeier
4+
* Date: 15.03.2014
5+
* Time: 19:24
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+
13+
namespace ICSharpCode.Reporting.Addin.DesignableItems
14+
{
15+
/// <summary>
16+
/// Description of BaseSection.
17+
/// </summary>
18+
// [TypeDescriptionProvider(typeof(SectionItemTypeProvider))]
19+
[Designer(typeof(ICSharpCode.Reporting.Addin.Designer.SectionDesigner))]
20+
public class BaseSection:AbstractItem
21+
{
22+
23+
public BaseSection():base()
24+
{
25+
base.FrameColor = Color.Black;
26+
// TypeDescriptor.AddProvider(new SectionItemTypeProvider(), typeof(BaseSection));
27+
}
28+
29+
30+
[System.ComponentModel.EditorBrowsableAttribute()]
31+
protected override void OnPaint(System.Windows.Forms.PaintEventArgs e)
32+
{
33+
base.OnPaint(e);
34+
Draw(e.Graphics);
35+
}
36+
37+
38+
public override void Draw(Graphics graphics)
39+
{
40+
base.DrawControl(graphics,Rectangle.Inflate(this.ClientRectangle,-2,-2));
41+
}
42+
43+
44+
#region Propertys
45+
46+
[Browsable(false)]
47+
public int SectionOffset {get;set;}
48+
49+
[Browsable(false)]
50+
public int SectionMargin {get;set;}
51+
52+
public bool PageBreakAfter {get;set;}
53+
54+
public bool CanGrow {get;set;}
55+
56+
public bool CanShrink {get;set;}
57+
58+
#endregion
59+
}
60+
}

0 commit comments

Comments
 (0)