Fix bug reported by Norbert Redeker

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

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

@@ -88,8 +88,7 @@
     <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\GroupedRowDesigner.cs" />
     <Compile Include="Project\Designer\DataItemDesigner.cs" />
     <Compile Include="Project\Designer\DesignerHelper.cs" />
     <Compile Include="Project\Designer\ImageDesigner.cs" />
@@ -141,7 +140,7 @@
     <Compile Include="Project\ReportItems\BaseDataItem.cs">
       <SubType>Component</SubType>
     </Compile>
-    <Compile Include="Project\ReportItems\BaseGroupHeader.cs" />
+    <Compile Include="Project\ReportItems\BaseGroupedRow.cs" />
     <Compile Include="Project\ReportItems\BaseImageItem.cs">
       <SubType>Component</SubType>
     </Compile>

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

@@ -1,22 +0,0 @@
-/*
- * 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/GroupedRowDesigner.cs

@@ -18,13 +18,13 @@ namespace ICSharpCode.Reports.Addin.Designer
 	/// <summary>
 	/// Description of BaseGroupHeaderDesigner.
 	/// </summary>
-	[Designer(typeof(ICSharpCode.Reports.Addin.Designer.GroupHeaderDesigner))]
-	public class GroupHeaderDesigner:ParentControlDesigner
+	
+	public class GroupedRowDesigner:ParentControlDesigner
 	{
 		
 		private ISelectionService selectionService;
 		
-		public GroupHeaderDesigner()
+		public GroupedRowDesigner()
 		{
 			
 		}

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

@@ -10,7 +10,6 @@
 using System;
 using System.ComponentModel;
 using System.ComponentModel.Design;
-using System.Drawing;
 using System.Windows.Forms;
 using System.Windows.Forms.Design;
 

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

@@ -100,7 +100,7 @@ namespace ICSharpCode.Reports.Addin.Designer
 //				this.componentChangeService.ComponentRemoving += new ComponentEventHandler(OnComponentRemoving);
 //				this.componentChangeService.ComponentRemoved += new ComponentEventHandler(OnComponentRemoved);
 				this.componentChangeService.ComponentChanged += new ComponentChangedEventHandler(OnComponentChanged);
-//				this.componentChangeService.ComponentChanging += new ComponentChangingEventHandler(OnComponentChanging);
+				this.componentChangeService.ComponentChanging += new ComponentChangingEventHandler(OnComponentChanging);
 			}
 	
 	
@@ -258,6 +258,7 @@ namespace ICSharpCode.Reports.Addin.Designer
 		}
 		*/
 		
+		
 		private void OnComponentChanged(object sender, ComponentChangedEventArgs ce)
 		{
 			LoggingService.InfoFormatted("RootDesigner:OnComponentChanged");
@@ -265,8 +266,9 @@ namespace ICSharpCode.Reports.Addin.Designer
 			LoggingService.InfoFormatted(str);
 			
 			AbstractItem item = ce.Component as AbstractItem;
-			if ((item != null) && (ce.NewValue != null)) {
-					item.Name = ce.NewValue.ToString();		
+			var member = ce.Member;
+			if (member.Name == "Name") {
+				item.Name = ce.NewValue.ToString();
 			}
 
 			BaseSection section = ce.Component as BaseSection;
@@ -279,12 +281,15 @@ namespace ICSharpCode.Reports.Addin.Designer
 				}
 				RecalculateSections();
 			}
+			
 		}
 		
 		
+		
 		private void OnComponentChanging(object sender, ComponentChangingEventArgs ce)
 		{
-//			System.Console.WriteLine("RootDesigner:OnComponentChanging");
+			System.Console.WriteLine("RootDesigner:OnComponentChanging");
+//			Host.CreateTransaction();
 		}
 		
 		

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

@@ -1,124 +0,0 @@
-/*
- * 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/BaseGroupedRow.cs

@@ -0,0 +1,29 @@
+/*
+ * Created by SharpDevelop.
+ * User: Peter Forstmeier
+ * Date: 06.08.2010
+ * Time: 19:25
+ * 
+ * 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;
+using ICSharpCode.Reports.Core;
+
+namespace ICSharpCode.Reports.Addin
+{
+	/// <summary>
+	/// Description of BaseGroupedRow.
+	/// </summary>
+	[Designer(typeof(ICSharpCode.Reports.Addin.Designer.GroupedRowDesigner))]
+	public class BaseGroupedRow:BaseRowItem
+	{
+		public BaseGroupedRow()
+		{
+		}
+	}
+}

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

@@ -20,7 +20,7 @@ namespace ICSharpCode.Reports.Addin.ReportWizard
 	/// </summary>
 	public class AbstractLayout
 	{
-//		ReportModel reportModel;
+
 		ISimpleContainer parentItem;
 		
 		public AbstractLayout(ReportModel reportModel)

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

@@ -75,7 +75,7 @@ namespace ICSharpCode.Reports.Addin
 			
 			
 			//Group
-			tb = new ToolboxItem(typeof(ICSharpCode.Reports.Addin.BaseGroupHeader));
+			tb = new ToolboxItem(typeof(ICSharpCode.Reports.Addin.BaseGroupedRow));
 			tb.Bitmap = WinFormsResourceService.GetBitmap("Icons.16x16.SharpQuery.Table");
 //			tb.DisplayName = ResourceService.GetString("SharpReport.Toolbar.DataRow");
 			tb.DisplayName = "GroupHeader";