Browse Source

Breaking Change, change 'BaseGroupedRow' to 'GroupHeader'. Reports can be modified very easy with an TextEditor. Just replace <BaseGroupedRow>' with <GroupHeader>, don't forgott about the closing tag's.

pull/14/head
peterforstmeier 15 years ago
parent
commit
957509f6a1
  1. 2
      src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportItems/BaseGroupFooter.cs
  2. 6
      src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportItems/BaseGroupeHeader.cs
  3. 4
      src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/ReportLayout/AbstractLayout.cs
  4. 2
      src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Toolbox/ToolboxProvider.cs
  5. 2
      src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Wizard/Generators/GenerateListWithGroupFixture.cs
  6. 2
      src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Wizard/Generators/GenerateTableWithGrouping.cs
  7. 2
      src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/BaseGroupeFooter.cs
  8. 4
      src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/BaseGroupedRow.cs
  9. 2
      src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Collections/Collections.cs
  10. 4
      src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Events/SectionRenderEventArgs.cs
  11. 6
      src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Converters/BaseConverter.cs
  12. 4
      src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Converters/GroupedTableConverter.cs

2
src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportItems/BaseGroupFooter.cs

@ -13,7 +13,7 @@ namespace ICSharpCode.Reports.Addin
/// <summary> /// <summary>
/// Description of BaseGroupFooter. /// Description of BaseGroupFooter.
/// </summary> /// </summary>
public class GroupFooter:BaseGroupedRow public class GroupFooter:GroupHeader
{ {
public GroupFooter() public GroupFooter()
{ {

6
src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportItems/BaseGroupeHeader.cs

@ -15,11 +15,11 @@ namespace ICSharpCode.Reports.Addin
/// Description of GroupedRow. /// Description of GroupedRow.
/// </summary> /// </summary>
[Designer(typeof(ICSharpCode.Reports.Addin.Designer.GroupedRowDesigner))] [Designer(typeof(ICSharpCode.Reports.Addin.Designer.GroupedRowDesigner))]
public class BaseGroupedRow:BaseRowItem public class GroupHeader:BaseRowItem
{ {
public BaseGroupedRow() public GroupHeader()
{ {
TypeDescriptor.AddProvider(new GroupedRowTypeProvider(), typeof(BaseGroupedRow)); TypeDescriptor.AddProvider(new GroupedRowTypeProvider(), typeof(GroupHeader));
} }

4
src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/ReportLayout/AbstractLayout.cs

@ -161,7 +161,7 @@ namespace ICSharpCode.Reports.Addin.ReportWizard
#region Grouping #region Grouping
protected ICSharpCode.Reports.Core.BaseGroupedRow CreateGroupHeader(Point headerLocation) protected ICSharpCode.Reports.Core.GroupHeader CreateGroupHeader(Point headerLocation)
{ {
ICSharpCode.Reports.Core.BaseDataItem dataItem = new ICSharpCode.Reports.Core.BaseDataItem(); ICSharpCode.Reports.Core.BaseDataItem dataItem = new ICSharpCode.Reports.Core.BaseDataItem();
@ -172,7 +172,7 @@ namespace ICSharpCode.Reports.Addin.ReportWizard
dataItem.Size = new Size (150,20); dataItem.Size = new Size (150,20);
dataItem.Text = ReportModel.ReportSettings.GroupColumnsCollection[0].ColumnName; dataItem.Text = ReportModel.ReportSettings.GroupColumnsCollection[0].ColumnName;
ICSharpCode.Reports.Core.BaseGroupedRow groupHeader = new ICSharpCode.Reports.Core.BaseGroupedRow(); ICSharpCode.Reports.Core.GroupHeader groupHeader = new ICSharpCode.Reports.Core.GroupHeader();
groupHeader.Location = headerLocation; groupHeader.Location = headerLocation;
groupHeader.Size = new Size (300,dataItem.Size.Height + GlobalValues.ControlMargins.Top + GlobalValues.ControlMargins.Bottom); groupHeader.Size = new Size (300,dataItem.Size.Height + GlobalValues.ControlMargins.Top + GlobalValues.ControlMargins.Bottom);
groupHeader.Items.Add(dataItem); groupHeader.Items.Add(dataItem);

2
src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Toolbox/ToolboxProvider.cs

@ -69,7 +69,7 @@ namespace ICSharpCode.Reports.Addin
//GroupHeader //GroupHeader
tb = new ToolboxItem(typeof(ICSharpCode.Reports.Addin.BaseGroupedRow)); tb = new ToolboxItem(typeof(ICSharpCode.Reports.Addin.GroupHeader));
tb.Bitmap = WinFormsResourceService.GetBitmap("Icons.16x16.SharpQuery.Table"); tb.Bitmap = WinFormsResourceService.GetBitmap("Icons.16x16.SharpQuery.Table");
tb.DisplayName = "GroupHeader"; tb.DisplayName = "GroupHeader";
sideTab.Items.Add(new SideTabItemDesigner(tb)); sideTab.Items.Add(new SideTabItemDesigner(tb));

2
src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Wizard/Generators/GenerateListWithGroupFixture.cs

@ -29,7 +29,7 @@ namespace ICSharpCode.Reports.Addin.Test.Wizard.Generators
ICSharpCode.Reports.Core.BaseSection section = this.reportModel.DetailSection; ICSharpCode.Reports.Core.BaseSection section = this.reportModel.DetailSection;
//GroupHeader //GroupHeader
var c = new Collection<ICSharpCode.Reports.Core.BaseGroupedRow>(section.Items.OfType<ICSharpCode.Reports.Core.BaseGroupedRow>().ToList()); var c = new Collection<ICSharpCode.Reports.Core.GroupHeader>(section.Items.OfType<ICSharpCode.Reports.Core.GroupHeader>().ToList());
Assert.That(c.Count,Is.GreaterThanOrEqualTo(1)); Assert.That(c.Count,Is.GreaterThanOrEqualTo(1));
} }

2
src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Wizard/Generators/GenerateTableWithGrouping.cs

@ -29,7 +29,7 @@ namespace ICSharpCode.Reports.Addin.Test.Wizard.Generators
{ {
ICSharpCode.Reports.Core.BaseTableItem table = CreateContainer(); ICSharpCode.Reports.Core.BaseTableItem table = CreateContainer();
//GroupHeader //GroupHeader
var c = new Collection<ICSharpCode.Reports.Core.BaseGroupedRow>(table.Items.OfType<ICSharpCode.Reports.Core.BaseGroupedRow>().ToList()); var c = new Collection<ICSharpCode.Reports.Core.GroupHeader>(table.Items.OfType<ICSharpCode.Reports.Core.GroupHeader>().ToList());
Assert.That(c.Count,Is.GreaterThanOrEqualTo(1)); Assert.That(c.Count,Is.GreaterThanOrEqualTo(1));
} }

2
src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/BaseGroupeFooter.cs

@ -13,7 +13,7 @@ namespace ICSharpCode.Reports.Core
/// <summary> /// <summary>
/// Description of BaseGroupeFooter. /// Description of BaseGroupeFooter.
/// </summary> /// </summary>
public class GroupFooter:BaseGroupedRow public class GroupFooter:GroupHeader
{ {
public GroupFooter() public GroupFooter()

4
src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/BaseGroupedRow.cs

@ -8,9 +8,9 @@ namespace ICSharpCode.Reports.Core
/// <summary> /// <summary>
/// Description of BaseGroupeRow. /// Description of BaseGroupeRow.
/// </summary> /// </summary>
public class BaseGroupedRow:BaseRowItem public class GroupHeader:BaseRowItem
{ {
public BaseGroupedRow():base() public GroupHeader():base()
{ {
} }

2
src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Collections/Collections.cs

@ -152,7 +152,7 @@ namespace ICSharpCode.Reports.Core{
public bool IsGrouped public bool IsGrouped
{ {
get { get {
return (this[0] is BaseGroupedRow)|| (this[0] is BaseGroupItem) ; return (this[0] is GroupHeader)|| (this[0] is BaseGroupItem) ;
//return CreateGroupedList().Count > 0; //return CreateGroupedList().Count > 0;
} }
} }

4
src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Events/SectionRenderEventArgs.cs

@ -24,12 +24,12 @@ namespace ICSharpCode.Reports.Core {
public class GroupHeaderEventArgs: EventArgs public class GroupHeaderEventArgs: EventArgs
{ {
public GroupHeaderEventArgs (BaseGroupedRow groupHeader) public GroupHeaderEventArgs (GroupHeader groupHeader)
{ {
GroupHeader = groupHeader; GroupHeader = groupHeader;
} }
public BaseGroupedRow GroupHeader {get; private set;} public GroupHeader GroupHeader {get; private set;}
} }

6
src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Converters/BaseConverter.cs

@ -83,7 +83,7 @@ namespace ICSharpCode.Reports.Core.Exporter
} }
protected void FireGroupHeaderRendering (BaseGroupedRow groupHeader) protected void FireGroupHeaderRendering (GroupHeader groupHeader)
{ {
GroupHeaderEventArgs ghea = new GroupHeaderEventArgs(groupHeader); GroupHeaderEventArgs ghea = new GroupHeaderEventArgs(groupHeader);
EventHelper.Raise<GroupHeaderEventArgs>(GroupHeaderRendering,this,ghea); EventHelper.Raise<GroupHeaderEventArgs>(GroupHeaderRendering,this,ghea);
@ -179,9 +179,9 @@ namespace ICSharpCode.Reports.Core.Exporter
} }
protected static Collection<BaseGroupedRow> FindGroupHeader (ISimpleContainer container) protected static Collection<GroupHeader> FindGroupHeader (ISimpleContainer container)
{ {
return new Collection<BaseGroupedRow>(container.Items.OfType<BaseGroupedRow>().ToList()); return new Collection<GroupHeader>(container.Items.OfType<GroupHeader>().ToList());
} }

4
src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Converters/GroupedTableConverter.cs

@ -78,7 +78,7 @@ namespace ICSharpCode.Reports.Core.Exporter
base.CurrentPosition = ConvertContainer(exporterCollection,headerRow,base.DefaultLeftPosition,base.CurrentPosition); base.CurrentPosition = ConvertContainer(exporterCollection,headerRow,base.DefaultLeftPosition,base.CurrentPosition);
} }
BaseGroupedRow row = table.Items[1] as BaseGroupedRow; GroupHeader row = table.Items[1] as GroupHeader;
if (row != null) { if (row != null) {
@ -187,7 +187,7 @@ namespace ICSharpCode.Reports.Core.Exporter
var rowSize = Size.Empty; var rowSize = Size.Empty;
ReportItemCollection groupCollection = null; ReportItemCollection groupCollection = null;
var groupedRow = new Collection<BaseGroupedRow>(table.Items.OfType<BaseGroupedRow>().ToList()); var groupedRow = new Collection<GroupHeader>(table.Items.OfType<GroupHeader>().ToList());
if (groupedRow.Count == 0) { if (groupedRow.Count == 0) {

Loading…
Cancel
Save