Start with GroupHeader Control

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/branches/reports@6363 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61

src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/ICSharpCode.Reports.Addin.csproj

@@ -88,6 +88,8 @@
     <Compile Include="Project\DesignerBinding\ReportDesignerGenerator.cs" />
     <Compile Include="Project\DesignerBinding\ReportDesignerLoader.cs" />
     <Compile Include="Project\DesignerBinding\InternalReportLoader.cs" />
+    <Compile Include="Project\Designer\BaseGroupHeaderDesigner.cs" />
+    <Compile Include="Project\Designer\Class1.cs" />
     <Compile Include="Project\Designer\DataItemDesigner.cs" />
     <Compile Include="Project\Designer\DesignerHelper.cs" />
     <Compile Include="Project\Designer\ImageDesigner.cs" />
@@ -139,6 +141,7 @@
     <Compile Include="Project\ReportItems\BaseDataItem.cs">
       <SubType>Component</SubType>
     </Compile>
+    <Compile Include="Project\ReportItems\BaseGroupHeader.cs" />
     <Compile Include="Project\ReportItems\BaseImageItem.cs">
       <SubType>Component</SubType>
     </Compile>

src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Designer/BaseGroupHeaderDesigner.cs

@@ -0,0 +1,57 @@
+/*
+ * Created by SharpDevelop.
+ * User: Peter Forstmeier
+ * Date: 30.07.2010
+ * Time: 20:03
+ * 
+ * To change this template use Tools | Options | Coding | Edit Standard Headers.
+ */
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.ComponentModel.Design;
+using System.Drawing;
+using System.Windows.Forms.Design;
+
+namespace ICSharpCode.Reports.Addin.Designer
+{
+	/// <summary>
+	/// Description of BaseGroupHeaderDesigner.
+	/// </summary>
+	[Designer(typeof(ICSharpCode.Reports.Addin.Designer.GroupHeaderDesigner))]
+	public class GroupHeaderDesigner:ParentControlDesigner
+	{
+		
+		private ISelectionService selectionService;
+		
+		public GroupHeaderDesigner()
+		{
+			
+		}
+		
+		public override void Initialize(IComponent component)
+		{
+			if (component == null) {
+				throw new ArgumentNullException("component");
+			}
+			base.Initialize(component);
+			GetService ();	
+		}
+		
+		
+		private void OnSelectionChanged(object sender, EventArgs e)
+		{
+			Control.Invalidate( );
+		}
+		
+		
+		private void GetService ()
+		{
+			selectionService = GetService(typeof(ISelectionService)) as ISelectionService;
+			if (selectionService != null)
+			{
+				selectionService.SelectionChanged += OnSelectionChanged;
+			}
+		}
+	}
+}

src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Designer/Class1.cs

@@ -0,0 +1,22 @@
+/*
+ * Created by SharpDevelop.
+ * User: Peter Forstmeier
+ * Date: 30.07.2010
+ * Time: 20:02
+ * 
+ * To change this template use Tools | Options | Coding | Edit Standard Headers.
+ */
+using System;
+
+namespace ICSharpCode.Reports.Addin.Project.Designer
+{
+	/// <summary>
+	/// Description of Class1.
+	/// </summary>
+	public class Class1
+	{
+		public Class1()
+		{
+		}
+	}
+}

src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Designer/DataItemDesigner.cs

@@ -14,7 +14,7 @@ using System.Windows.Forms;
 using System.Windows.Forms.Design;
 
 
-namespace ICSharpCode.Reports.Addin
+namespace ICSharpCode.Reports.Addin.Designer
 {
 	/// <summary>
 	/// Description of DataItemDesigner.

src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Designer/DesignerHelper.cs

@@ -12,7 +12,7 @@ using System.Collections.Generic;
 using System.Collections;
 using System.ComponentModel;
 
-namespace ICSharpCode.Reports.Addin
+namespace ICSharpCode.Reports.Addin.Designer
 {
 	/// <summary>
 	/// Description of DesignerHelper.

src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Designer/ImageDesigner.cs

@@ -14,7 +14,7 @@ using System.Drawing;
 using System.Windows.Forms;
 using System.Windows.Forms.Design;
 
-namespace ICSharpCode.Reports.Addin
+namespace ICSharpCode.Reports.Addin.Designer
 	
 {
 	/// <summary>

src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Designer/LineDesigner.cs

@@ -14,7 +14,7 @@ using System.Drawing;
 using System.Windows.Forms;
 using System.Windows.Forms.Design;
 
-namespace ICSharpCode.Reports.Addin
+namespace ICSharpCode.Reports.Addin.Designer
 {
 	/// <summary>
 	/// Description of LineDesigner.

src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Designer/RootDesigner/ReportItemsContainer.cs

@@ -13,7 +13,7 @@ using System.ComponentModel.Design;
 using System.Drawing;
 using System.Drawing.Printing;
 
-namespace ICSharpCode.Reports.Addin
+namespace ICSharpCode.Reports.Addin.Designer
 {
 	/// <summary>
 	/// Description of ReportItemsContainer.
@@ -78,7 +78,7 @@ namespace ICSharpCode.Reports.Addin
 	}
 	
 		
-	[Designer(typeof(ICSharpCode.Reports.Addin.ReportRootDesigner), typeof(IRootDesigner))]
+	[Designer(typeof(ICSharpCode.Reports.Addin.Designer.ReportRootDesigner), typeof(IRootDesigner))]
 	public class RootDesignedComponent : System.Windows.Forms.UserControl
 	{
 		public RootDesignedComponent()

src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Designer/RootDesigner/ReportRootDesigner.cs

@@ -21,7 +21,7 @@ using System.Windows.Forms.Design;
 using ICSharpCode.Reports.Core;
 using ICSharpCode.SharpDevelop.Dom;
 using ICSharpCode.Core;
-namespace ICSharpCode.Reports.Addin
+namespace ICSharpCode.Reports.Addin.Designer
 {
 	/// <summary>
 	/// Description of ReportRootDesigner.

src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Designer/RowItemDesigner.cs

@@ -15,7 +15,7 @@ using System.Drawing.Design;
 using System.Windows.Forms;
 using System.Windows.Forms.Design;
 
-namespace ICSharpCode.Reports.Addin
+namespace ICSharpCode.Reports.Addin.Designer
 {
 	/// <summary>
 	/// Description of RowItemDesigner.

src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Designer/Ruler.cs

@@ -10,7 +10,7 @@ using System.ComponentModel;
 using System.Drawing;
 using System.Windows.Forms;
 
-namespace ICSharpCode.Reports.Addin
+namespace ICSharpCode.Reports.Addin.Designer
 {
 	/// <summary>
 	/// Description of ctrlRuler.

src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Designer/SectionDesigner.cs

@@ -18,7 +18,7 @@ using System.Windows.Forms.Design;
 
 using ICSharpCode.Reports.Core;
 
-namespace ICSharpCode.Reports.Addin
+namespace ICSharpCode.Reports.Addin.Designer
 {
 	/// <summary>
 	/// Description of SectionDesigner.

src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Designer/ShapeDesigner.cs

@@ -14,7 +14,7 @@ using System.Drawing;
 using System.Windows.Forms;
 using System.Windows.Forms.Design;
 
-namespace ICSharpCode.Reports.Addin
+namespace ICSharpCode.Reports.Addin.Designer
 {
 	/// <summary>
 	/// Description of ShapeDesigner.

src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Designer/SmartTagTransactions.cs

@@ -11,7 +11,7 @@ using System.ComponentModel;
 using System.ComponentModel.Design;
 using System.Windows.Forms;
 
-namespace ICSharpCode.Reports.Addin
+namespace ICSharpCode.Reports.Addin.Designer
 {
 	/// <summary>
 	/// Description of SmartTagTransactions.

src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Designer/TableDesigner.cs

@@ -14,7 +14,7 @@ using System.Drawing.Design;
 using System.Windows.Forms;
 using System.Windows.Forms.Design;
 
-namespace ICSharpCode.Reports.Addin
+namespace ICSharpCode.Reports.Addin.Designer
 {
 	/// <summary>
 	/// Description of TableDesigner.

src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Designer/TextBasedDesignerActionList.cs

@@ -10,7 +10,7 @@ using System;
 using System.ComponentModel;
 using System.ComponentModel.Design;
 
-namespace ICSharpCode.Reports.Addin
+namespace ICSharpCode.Reports.Addin.Designer
 {
 	/// <summary>
 	/// Description of TextBasedDesignerActionList.

src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Designer/TextItemDesigner.cs

@@ -15,7 +15,7 @@ using System.Windows.Forms.Design;
 
 using ICSharpCode.Reports.Core;
 
-namespace ICSharpCode.Reports.Addin
+namespace ICSharpCode.Reports.Addin.Designer
 {
 	/// <summary>
 	/// Description of ReportItemDesigner.

src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/DesignerBinding/InternalReportLoader.cs

@@ -47,8 +47,8 @@ namespace ICSharpCode.Reports.Addin
 			Application.UseWaitCursor = true;
 			Application.DoEvents();
 			try {
-				IComponent cc = this.host.CreateComponent(typeof(ICSharpCode.Reports.Addin.RootReportModel),"RootReportModel");
+				IComponent cc = this.host.CreateComponent(typeof(ICSharpCode.Reports.Addin.Designer.RootReportModel),"RootReportModel");
-				ICSharpCode.Reports.Addin.RootReportModel rootControl = cc as ICSharpCode.Reports.Addin.RootReportModel;
+				ICSharpCode.Reports.Addin.Designer.RootReportModel rootControl = cc as ICSharpCode.Reports.Addin.Designer.RootReportModel;
 				UpdateStatusbar();
 				this.CreateNamedSurface();
 				rootControl.Size = this.ReportModel.ReportSettings.PageSize;

src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportDesignerView.cs

@@ -13,14 +13,15 @@ using System.ComponentModel.Design;
 using System.ComponentModel.Design.Serialization;
 using System.Drawing.Design;
 using System.IO;
+using System.Linq;
 using System.Text;
 using System.Windows.Forms;
 
 using ICSharpCode.Core;
+using ICSharpCode.Reports.Addin.Designer;
 using ICSharpCode.Reports.Core;
 using ICSharpCode.SharpDevelop;
 using ICSharpCode.SharpDevelop.Gui;
-using System.Linq;
 
 namespace ICSharpCode.Reports.Addin
 {

src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportItems/AbstractItem.cs

@@ -24,8 +24,7 @@ namespace ICSharpCode.Reports.Addin
 	public abstract class AbstractItem:System.Windows.Forms.Control
 	{
 		private Color frameColor = Color.Black;
-		//private bool drawBorder;
+		
-		//private Size defaultSize;
 
 		protected AbstractItem()
 		{

src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportItems/BaseCircleItem.cs

@@ -22,7 +22,7 @@ namespace ICSharpCode.Reports.Addin
 	/// Description of BaseCircleItem.
 	/// </summary>
 	
-	[Designer(typeof(ICSharpCode.Reports.Addin.ShapeDesigner))]
+	[Designer(typeof(ICSharpCode.Reports.Addin.Designer.ShapeDesigner))]
 	public class BaseCircleItem:AbstractItem
 	{
 		

src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportItems/BaseDataItem.cs

@@ -12,6 +12,7 @@ using System.Collections.Generic;
 using System.ComponentModel;
 using System.Drawing;
 
+using ICSharpCode.Reports.Addin.Designer;
 using ICSharpCode.Reports.Core;
 
 namespace ICSharpCode.Reports.Addin
@@ -20,7 +21,7 @@ namespace ICSharpCode.Reports.Addin
 	/// <summary>
 	/// Description of BaseDataItem.
 	/// </summary>
-	[Designer(typeof(ICSharpCode.Reports.Addin.DataItemDesigner))]
+	[Designer(typeof(ICSharpCode.Reports.Addin.Designer.DataItemDesigner))]
 	public class BaseDataItem:BaseTextItem
 	{
 		private string columnName;

src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportItems/BaseGroupHeader.cs

@@ -0,0 +1,124 @@
+/*
+ * Created by SharpDevelop.
+ * User: Peter Forstmeier
+ * Date: 30.07.2010
+ * Time: 19:19
+ * 
+ * To change this template use Tools | Options | Coding | Edit Standard Headers.
+ */
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+
+using ICSharpCode.Reports.Addin.Designer;
+
+namespace ICSharpCode.Reports.Addin
+{
+	/// <summary>
+	/// Description of BaseGroupHeader.
+	/// </summary>
+	/// 
+	
+	[Designer(typeof(ICSharpCode.Reports.Addin.Designer.GroupHeaderDesigner))]
+	
+	public class BaseGroupHeader:AbstractItem
+	{
+		public BaseGroupHeader():base()
+		{
+			TypeDescriptor.AddProvider(new GroupItemTypeProvider(), typeof(BaseGroupHeader));
+		}
+		
+		
+		[System.ComponentModel.EditorBrowsableAttribute()]
+		protected override void OnPaint(System.Windows.Forms.PaintEventArgs e)
+		{
+			base.OnPaint(e);
+			this.Draw (e.Graphics);
+		}
+		
+		
+		
+		
+		public override void Draw(System.Drawing.Graphics graphics)
+		{
+			if (graphics == null) {
+				throw new ArgumentNullException("graphics");
+			}
+			using (Brush b = new SolidBrush(this.BackColor)){
+				graphics.FillRectangle(b, base.DrawingRectangle);
+			}
+			
+			base.DrawControl(graphics,base.DrawingRectangle);
+		}
+	}
+	
+		internal class GroupItemTypeProvider : TypeDescriptionProvider
+	{
+		public GroupItemTypeProvider() :  base(TypeDescriptor.GetProvider(typeof(AbstractItem)))
+		{
+		}
+		
+//		public RowItemTypeProvider(TypeDescriptionProvider parent): base(parent)
+//		{
+//		
+//		}
+
+	
+		public override ICustomTypeDescriptor GetTypeDescriptor(Type objectType, object instance)
+		{
+			ICustomTypeDescriptor td = base.GetTypeDescriptor(objectType,instance);
+			return new GroupItemTypeDescriptor(td, instance);
+		}
+	}
+	
+	
+	internal class GroupItemTypeDescriptor : CustomTypeDescriptor
+	{
+		public GroupItemTypeDescriptor(ICustomTypeDescriptor parent, object instance)
+			: base(parent)
+		{
+		}
+
+		
+		public override PropertyDescriptorCollection GetProperties()
+		{
+			return GetProperties(null);
+		}
+
+		
+		public override PropertyDescriptorCollection GetProperties(Attribute[] attributes)
+		{
+			
+			PropertyDescriptorCollection props = base.GetProperties(attributes);
+			List<PropertyDescriptor> allProperties = new List<PropertyDescriptor>();
+
+			DesignerHelper.AddDefaultProperties(allProperties,props);
+			/*
+			PropertyDescriptor prop = null;
+			
+			prop = props.Find("DrawBorder",true);
+			allProperties.Add(prop);
+			
+			prop = props.Find("ForeColor",true);
+			allProperties.Add(prop);
+			
+			prop = props.Find("Visible",true);
+			allProperties.Add(prop);
+			
+			prop = props.Find("FrameColor",true);
+			allProperties.Add(prop);
+			
+			prop = props.Find("Controls",true);
+			allProperties.Add(prop);
+			
+			prop = props.Find("AlternateBackColor",true);
+			allProperties.Add(prop);
+			
+			prop = props.Find("ChangeBackColorEveryNRow",true);
+			allProperties.Add(prop);
+			*/
+			return new PropertyDescriptorCollection(allProperties.ToArray());
+		}
+	}
+}

src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportItems/BaseImageItem.cs

@@ -17,6 +17,7 @@ using System.IO;
 using System.Windows.Forms.Design;
 using System.Xml.Serialization;
 
+using ICSharpCode.Reports.Addin.Designer;
 using ICSharpCode.Reports.Core;
 
 namespace ICSharpCode.Reports.Addin
@@ -24,7 +25,7 @@ namespace ICSharpCode.Reports.Addin
 	/// <summary>
 	/// Description of BaseImageItem.
 	/// </summary>
-	[Designer(typeof(ICSharpCode.Reports.Addin.ImageDesigner))]
+	[Designer(typeof(ICSharpCode.Reports.Addin.Designer.ImageDesigner))]
 	public class BaseImageItem:AbstractItem
 	{
 		private string imageFileName;

src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportItems/BaseLine.cs

@@ -13,12 +13,14 @@ using System.ComponentModel;
 using System.Drawing;
 using System.Drawing.Drawing2D;
 
+using ICSharpCode.Reports.Addin.Designer;
+
 namespace ICSharpCode.Reports.Addin
 {
 	/// <summary>
 	/// Description of BaseLine.
 	/// </summary>
-	[Designer(typeof(ICSharpCode.Reports.Addin.LineDesigner))]
+	[Designer(typeof(ICSharpCode.Reports.Addin.Designer.LineDesigner))]
 	public class BaseLineItem:AbstractItem
 	{
 		private Point fromPoint;

src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportItems/BaseRectangleItem.cs

@@ -20,7 +20,7 @@ namespace ICSharpCode.Reports.Addin
 	/// Description of BaseRectangleItem.
 	/// </summary>
 	
-	[Designer(typeof(ICSharpCode.Reports.Addin.ShapeDesigner))]
+	[Designer(typeof(ICSharpCode.Reports.Addin.Designer.ShapeDesigner))]
 	public class BaseRectangleItem:AbstractItem
 	{
 		private RectangleShape shape = new RectangleShape();

src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportItems/BaseRowItem.cs

@@ -12,6 +12,7 @@ using System.Collections.Generic;
 using System.ComponentModel;
 using System.Drawing;
 
+using ICSharpCode.Reports.Addin.Designer;
 using ICSharpCode.Reports.Core;
 
 namespace ICSharpCode.Reports.Addin
@@ -19,7 +20,7 @@ namespace ICSharpCode.Reports.Addin
 	/// <summary>
 	/// Description of BaseRowItem.
 	/// </summary>
-	[Designer(typeof(ICSharpCode.Reports.Addin.RowItemDesigner))]
+	[Designer(typeof(ICSharpCode.Reports.Addin.Designer.RowItemDesigner))]
 	public class BaseRowItem:AbstractItem
 	{
 

src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportItems/BaseSection.cs

@@ -9,9 +9,10 @@
 
 using System;
 using System.Collections.Generic;
-using System.Drawing;
 using System.ComponentModel;
+using System.Drawing;
 
+using ICSharpCode.Reports.Addin.Designer;
 using ICSharpCode.Reports.Core;
 
 namespace ICSharpCode.Reports.Addin
@@ -21,7 +22,7 @@ namespace ICSharpCode.Reports.Addin
 	/// </summary>
 	/// 
 	[TypeDescriptionProvider(typeof(SectionItemTypeProvider))]
-	[Designer(typeof(ICSharpCode.Reports.Addin.SectionDesigner))]
+	[Designer(typeof(ICSharpCode.Reports.Addin.Designer.SectionDesigner))]
 	public class BaseSection:AbstractItem
 	{
 		private int  sectionOffset;

src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportItems/BaseTableItem.cs

@@ -7,11 +7,12 @@
  * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern.
  */
 using System;
-using System.Windows.Forms;
 using System.Collections.Generic;
-using System.Drawing;
 using System.ComponentModel;
+using System.Drawing;
+using System.Windows.Forms;
 
+using ICSharpCode.Reports.Addin.Designer;
 using ICSharpCode.Reports.Core;
 
 namespace ICSharpCode.Reports.Addin
@@ -19,7 +20,7 @@ namespace ICSharpCode.Reports.Addin
 	/// <summary>
 	/// Description of BaseTableItem.
 	/// </summary>
-	[Designer(typeof(ICSharpCode.Reports.Addin.TableDesigner))]
+	[Designer(typeof(ICSharpCode.Reports.Addin.Designer.TableDesigner))]
 	public class BaseTableItem:AbstractItem
 	{
 		

src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportItems/BaseTextItem.cs

@@ -12,6 +12,7 @@ using System.Collections.Generic;
 using System.ComponentModel;
 using System.Drawing;
 
+using ICSharpCode.Reports.Addin.Designer;
 using ICSharpCode.Reports.Core;
 using ICSharpCode.Reports.Core.BaseClasses.Printing;
 
@@ -21,7 +22,7 @@ namespace ICSharpCode.Reports.Addin
 	/// Description of ReportTextItem.
 	/// </summary>
 
-	[Designer(typeof(ICSharpCode.Reports.Addin.TextItemDesigner))]
+	[Designer(typeof(ICSharpCode.Reports.Addin.Designer.TextItemDesigner))]
 	public class BaseTextItem:AbstractItem
 	{
 		

src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportItems/ErrorItem.cs

@@ -10,7 +10,7 @@
 using System;
 using System.Drawing;
 
-namespace ICSharpCode.Reports.Addin
+namespace ICSharpCode.Reports.Addin.Designer
 {
 	/// <summary>
 	/// Description of ErrorItem.

src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportItems/RectangleItemTypeProvider.cs

@@ -8,6 +8,7 @@
  */
 using System;
 using System.ComponentModel;
+using ICSharpCode.Reports.Addin.Designer;
 
 namespace ICSharpCode.Reports.Addin
 {

src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/Generators/GeneratePushDataReport.cs

@@ -23,7 +23,7 @@ namespace ICSharpCode.Reports.Addin.ReportWizard
 {
 	public class GeneratePushDataReport : AbstractReportGenerator
 	{
-//		private ReportStructure reportStructure;
+
 		/// <summary>
 		/// Default constructor - initializes all fields to default values
 		/// </summary>
@@ -40,7 +40,6 @@ namespace ICSharpCode.Reports.Addin.ReportWizard
 		{
 			base.ReportModel.ReportSettings.ReportType = GlobalEnums.ReportType.DataReport;
 			base.ReportModel.ReportSettings.DataModel = GlobalEnums.PushPullModel.PushData;
-		//	base.ReportModel.ReportSettings.AvailableFieldsCollection.AddRange(base.ReportStructure.AvailableFieldsCollection);
 			base.GenerateReport();
 			GlobalEnums.ReportLayout reportLayout = (GlobalEnums.ReportLayout)base.Properties.Get("ReportLayout");
 			

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

@@ -47,12 +47,15 @@ namespace ICSharpCode.Reports.Addin.ReportWizard
 			if (section == null) {
 				throw new ArgumentNullException("section");
 			}
-			
+			if (base.ReportModel.ReportSettings.GroupColumnsCollection.Count > 0) {
-			if (base.ParentItem != null) {
+				Console.WriteLine  ("build with group");
-				base.AddItemsToContainer(base.ReportModel.DetailSection,this.reportItems);
+			} else {
-			}
+				if (base.ParentItem != null) {
-			else{
+					base.AddItemsToContainer(base.ReportModel.DetailSection,this.reportItems);
-				AddItemsToSection (base.ReportModel.DetailSection,this.reportItems);
+				}
+				else{
+					AddItemsToSection (base.ReportModel.DetailSection,this.reportItems);
+				}
 			}
 		}
 		

src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/ReportStructure.cs

@@ -56,20 +56,21 @@ namespace ICSharpCode.Reports.Addin.ReportWizard
 			} else {
 				model.ReportSettings.PageSize = GlobalValues.DefaultPageSize;
 			}
-			CheckGrouping(model.ReportSettings);
+			
+			CreateGrouping(model.ReportSettings);
 			
 			return model;
 		}
 		
-		private void CheckGrouping(ReportSettings settings)
+		private void CreateGrouping(ReportSettings settings)
 		{
 			if (!String.IsNullOrEmpty(this.Grouping)){
 				GroupColumn g = new GroupColumn(Grouping,1,System.ComponentModel.ListSortDirection.Ascending);
-				
 				settings.GroupColumnsCollection.Add(g);
 			}
 		}
 		
+		
 		#region BaseSettingsPanel property's
 		
 		public GraphicsUnit GraphicsUnit {get;set;}

src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/LayoutPanel.cs

@@ -51,12 +51,8 @@ namespace ICSharpCode.Reports.Addin.ReportWizard
 				this.layoutControl.ReportLayout = (GlobalEnums.ReportLayout)customizer.Get("ReportLayout");
 				reportStructure = (ReportStructure)customizer.Get("Generator");
 				layoutControl.AvailableFieldsCollection = reportStructure.AvailableFieldsCollection;
-				
-			}
-			else if (message == DialogMessage.Next)
-			{
-				Console.WriteLine("aa");
 			}
+			
 			else if (message == DialogMessage.Finish)
 			{
 				customizer.Set ("ReportLayout",this.layoutControl.ReportLayout);

src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/LayoutPanelControl.cs

@@ -91,12 +91,12 @@ namespace ICSharpCode.Reports.Addin.ReportWizard
 		{
 			get {
 				string ret = String.Empty;
-				if (!String.IsNullOrEmpty(comboBox1.SelectedItem.ToString()))
+				if (checkBox1.Checked) {
-				    {
+					ret =  comboBox1.SelectedItem.ToString();
-				    	ret =  comboBox1.SelectedItem.ToString();
-				    }
-				    return ret;
 				}
+				return ret;
+			}
+			
 		}
 	}
 }

src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Services/MenuCommandService.cs

@@ -6,13 +6,15 @@
  * 
  * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern.
  */
-using ICSharpCode.Core.WinForms;
 using System;
 using System.ComponentModel.Design;
 using System.Drawing;
 using System.Windows.Forms;
 using System.Windows.Forms.Design;
+
 using ICSharpCode.Core;
+using ICSharpCode.Core.WinForms;
+using ICSharpCode.Reports.Addin.Designer;
 using CommandID = System.ComponentModel.Design.CommandID;
 
 namespace ICSharpCode.Reports.Addin

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

@@ -74,6 +74,14 @@ namespace ICSharpCode.Reports.Addin
 			sideTab.Items.Add(new SideTabItemDesigner(tb));
 			
 			
+			//Group
+			tb = new ToolboxItem(typeof(ICSharpCode.Reports.Addin.BaseGroupHeader));
+			tb.Bitmap = WinFormsResourceService.GetBitmap("Icons.16x16.SharpQuery.Table");
+//			tb.DisplayName = ResourceService.GetString("SharpReport.Toolbar.DataRow");
+			tb.DisplayName = "GroupHeader";
+			sideTab.Items.Add(new SideTabItemDesigner(tb));
+			
+			
 			//BaseTable
 			tb.Bitmap = WinFormsResourceService.GetBitmap("Icons.16x16.SharpQuery.Table");
 			tb = new ToolboxItem(typeof(ICSharpCode.Reports.Addin.BaseTableItem));

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

@@ -192,9 +192,14 @@ namespace ICSharpCode.Reports.Core{
 			 return this.FirstOrDefault(x => 0 == String.Compare(x.ColumnName,columnName,true));
 		}
 	}
+	
+	
+	
+	
 	[Serializable()]
-	public class SortColumnCollection: Collection<SortColumn>{
+//	public class SortColumnCollection: Collection<SortColumn>{
-		
+	public class SortColumnCollection: ColumnCollection
+		{
 		public SortColumnCollection()
 		{
 		}
@@ -228,6 +233,17 @@ namespace ICSharpCode.Reports.Core{
 	}
 	
 	
+	[Serializable()]
+
+	public class GroupColumnCollection: SortColumnCollection
+	{
+		public GroupColumnCollection()
+		{
+		}
+		
+	}
+	
+	
 	
 	[Serializable()]
 	public class ColumnCollection: Collection<AbstractColumn>{

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/Comparer/BaseComparer.cs

@@ -20,15 +20,15 @@ namespace ICSharpCode.Reports.Core {
 		
 		private int listIndex;
 		private object[] objectArray;
-//		private SortColumnCollection columnCollection;
+
-		Collection<AbstractColumn> columnCollection;
+//		Collection<AbstractColumn> columnCollection;
+		ColumnCollection columnCollection;
 		/// <summary>
 		/// Default constructor - initializes all fields to default values
 		/// </summary>
-//		public BaseComparer(ColumnCollection owner, int listIndex, object[] values) {
+
-//		public BaseComparer(SortColumnCollection owner, int listIndex, object[] values) {
+		public BaseComparer(ColumnCollection columnCollection , int listIndex, object[] values) {
-		public BaseComparer(Collection<AbstractColumn> owner, int listIndex, object[] values) {
+			this.columnCollection = columnCollection;
-			this.columnCollection = owner;
 			this.listIndex = listIndex;
 			this.objectArray = values;
 		}
@@ -88,8 +88,8 @@ namespace ICSharpCode.Reports.Core {
 			}
 		}
 		
-		public Collection<AbstractColumn> ColumnCollection {
+//		public Collection<AbstractColumn> ColumnCollection {
-//		public SortColumnCollection ColumnCollection {
+		public ColumnCollection ColumnCollection {
 			get {
 				return columnCollection;
 			}

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/Comparer/GroupSeparator.cs

@@ -21,7 +21,7 @@ namespace ICSharpCode.Reports.Core
 	public  class GroupComparer :SortComparer
 	{
 		
-		public GroupComparer (Collection<AbstractColumn> owner, int listIndex, object[] values):base(owner,listIndex,values)
+		public GroupComparer (ColumnCollection owner, int listIndex, object[] values):base(owner,listIndex,values)
 		{
 			IndexList = new IndexList();
 		}

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/Comparer/SortComparer.cs

@@ -15,7 +15,7 @@ namespace ICSharpCode.Reports.Core {
 	
 	public class SortComparer : BaseComparer {
 		
-		public SortComparer(Collection<AbstractColumn> owner, int listIndex, object[] values):base(owner,listIndex,values)
+		public SortComparer(ColumnCollection owner, int listIndex, object[] values):base(owner,listIndex,values)
 		{
 		}
 		

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/ListStrategy/BaseListStrategy.cs

@@ -63,7 +63,7 @@ namespace ICSharpCode.Reports.Core {
 		
 		
 		
-		protected static Collection<AbstractColumn> CreateSortCollection (ColumnCollection items)
+		protected static Collection<AbstractColumn> CreateSortCollection (SortColumnCollection items)
 		{
 			
 				Collection<AbstractColumn> abstrCol = new Collection<AbstractColumn>();
@@ -75,6 +75,8 @@ namespace ICSharpCode.Reports.Core {
 		
 		}
 
+		
+		
 		public IndexList IndexList
 		{
 			get {

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/ListStrategy/CollectionStrategy.cs

@@ -53,7 +53,7 @@ namespace ICSharpCode.Reports.Core {
 		
 		#region build sorting
 		
-		private PropertyDescriptor[] BuildSortProperties (Collection<AbstractColumn> col)
+		private PropertyDescriptor[] BuildSortProperties (SortColumnCollection col)
 		{
 			PropertyDescriptor[] sortProperties = new PropertyDescriptor[col.Count];
 			PropertyDescriptorCollection c = this.baseList.GetItemProperties(null);
@@ -72,7 +72,7 @@ namespace ICSharpCode.Reports.Core {
 		}
 		
 		
-		private  IndexList BuildSortIndex(Collection<AbstractColumn> col) 
+		private  IndexList BuildSortIndex(SortColumnCollection col) 
 		{
 			IndexList arrayList = new IndexList();
 			PropertyDescriptor[] sortProperties = BuildSortProperties (col);
@@ -112,7 +112,7 @@ namespace ICSharpCode.Reports.Core {
 		
 		
 		// if we have no sorting, we build the indexlist as well, so we don't need to
-		private IndexList IndexBuilder(Collection <AbstractColumn>col)
+		private IndexList IndexBuilder(SortColumnCollection col)
 		{
 			IndexList arrayList = new IndexList();
 			for (int rowIndex = 0; rowIndex < this.baseList.Count; rowIndex++){
@@ -174,11 +174,11 @@ namespace ICSharpCode.Reports.Core {
 			base.Sort();		
 			if ((base.ReportSettings.SortColumnsCollection != null)) {
 				if (base.ReportSettings.SortColumnsCollection.Count > 0) {
-					
+
-					base.IndexList = this.BuildSortIndex (BaseListStrategy.CreateSortCollection(ReportSettings.SortColumnsCollection));
+					base.IndexList = this.BuildSortIndex (ReportSettings.SortColumnsCollection);
 					base.IsSorted = true;
 				} else {
-					base.IndexList = this.IndexBuilder(BaseListStrategy.CreateSortCollection(ReportSettings.SortColumnsCollection));
+					base.IndexList = this.IndexBuilder(ReportSettings.SortColumnsCollection);
 					base.IsSorted = false;
 				}
 			}

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/ListStrategy/TableStrategy.cs

@@ -94,7 +94,7 @@ namespace ICSharpCode.Reports.Core
 			base.Sort();
 			if ((base.ReportSettings.SortColumnsCollection != null)) {
 				if (base.ReportSettings.SortColumnsCollection.Count > 0) {
-					base.IndexList = this.BuildSortIndex (BaseListStrategy.CreateSortCollection(ReportSettings.SortColumnsCollection));
+					base.IndexList = this.BuildSortIndex (ReportSettings.SortColumnsCollection);
 					base.IsSorted = true;
 				} else {
 					// if we have no sorting, we build the indexlist as well
@@ -109,7 +109,7 @@ namespace ICSharpCode.Reports.Core
 		{
 			base.Group();
 			IndexList gl = new IndexList("group");
-			gl = this.BuildSortIndex (BaseListStrategy.CreateSortCollection(ReportSettings.GroupColumnsCollection));
+			gl = this.BuildSortIndex (ReportSettings.GroupColumnsCollection);
 			ShowIndexList(gl);
 			BuildGroup(gl);
 			
@@ -118,7 +118,7 @@ namespace ICSharpCode.Reports.Core
 		#endregion
 		
 		
-		private IndexList  BuildSortIndex(Collection<AbstractColumn> col)
+		private IndexList  BuildSortIndex(ColumnCollection col)
 		{
 			IndexList arrayList = new IndexList();
 			
@@ -192,7 +192,7 @@ namespace ICSharpCode.Reports.Core
 		}
 		
 		
-		private IndexList IndexBuilder(Collection<AbstractColumn> col)
+		private IndexList IndexBuilder(SortColumnCollection col)
 		{
 			IndexList arrayList = new IndexList();
 			for (int rowIndex = 0; rowIndex < this.table.Rows.Count; rowIndex++){

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/ReportSettings.cs

@@ -50,7 +50,7 @@ namespace ICSharpCode.Reports.Core{
 		private ParameterCollection parameterCollection;
 		private AvailableFieldsCollection availableFields;
 		private ColumnCollection groupingsCollection;
-		private ColumnCollection sortingCollection;
+		private SortColumnCollection sortingCollection;
 
 		
 		#region Constructor
@@ -105,7 +105,7 @@ namespace ICSharpCode.Reports.Core{
 			
 			this.availableFields = new AvailableFieldsCollection();
 			this.groupingsCollection = new ColumnCollection();
-			this.sortingCollection = new ColumnCollection();
+			this.sortingCollection = new SortColumnCollection();
 			this.parameterCollection = new ParameterCollection();
 			this.NoDataMessage = "No Data for this Report";
 		}
@@ -224,7 +224,7 @@ namespace ICSharpCode.Reports.Core{
 		/// </summary>
 		
 		[Category("Sorting/Grouping")]
-		public ColumnCollection SortColumnsCollection {
+		public SortColumnCollection SortColumnsCollection {
 			get {return sortingCollection;}
 		}