Add GroupColumnEditor

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

@@ -140,6 +140,7 @@
     </Compile>
     <Compile Include="src\Dialogs\ExpressionEditor.cs" />
     <Compile Include="src\Dialogs\FormatStringConverter.cs" />
+    <Compile Include="src\Dialogs\GroupingCollectionEditor.cs" />
     <Compile Include="src\Dialogs\IStringBasedEditorDialog.cs" />
     <Compile Include="src\Factory\CreateFormSheetFromModel.cs" />
     <Compile Include="src\Globals\DesignerGlobals.cs" />

src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/DesignableItems/ReportSettings.cs

@@ -10,9 +10,11 @@ using System;
 using System.ComponentModel;
 using System.ComponentModel.Design;
 using System.Drawing;
+using System.Drawing.Design;
 using System.IO;
 using ICSharpCode.Reporting.Globals;
 using ICSharpCode.Reporting.Interfaces;
+using ICSharpCode.Reporting.Addin.Dialogs;
 
 namespace ICSharpCode.Reporting.Addin.DesignableItems
 {
@@ -147,7 +149,6 @@ namespace ICSharpCode.Reporting.Addin.DesignableItems
 		public PushPullModel DataModel {get;set;}
 		
 		
-		
 //		[Category("Parameters")]
 //		[EditorAttribute ( typeof(ParameterCollectionEditor),
 //		                  typeof(System.Drawing.Design.UITypeEditor) )]
@@ -156,8 +157,9 @@ namespace ICSharpCode.Reporting.Addin.DesignableItems
 	
 		public SortColumnCollection SortColumnsCollection {get;private set;}
 		
+		[Category("Sorting/Grouping")]
+		[EditorAttribute ( typeof(GroupingCollectionEditor), typeof(UITypeEditor) )]             
 		public GroupColumnCollection GroupColumnsCollection {get;private set;}
 		
-		
 	}
 }

src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/Dialogs/GroupingCollectionEditor.cs

@@ -0,0 +1,47 @@
+/*
+ * Created by SharpDevelop.
+ * User: Peter Forstmeier
+ * Date: 29.05.2015
+ * Time: 19:24
+ * 
+ * To change this template use Tools | Options | Coding | Edit Standard Headers.
+ */
+using System;
+using System.ComponentModel;
+using System.ComponentModel.Design;
+using System.Drawing.Design;
+using ICSharpCode.Reporting.Items;
+
+namespace ICSharpCode.Reporting.Addin.Dialogs
+{
+	/// <summary>
+	/// Description of GroupingCollectionEditor.
+	/// </summary>
+	public class GroupingCollectionEditor:CollectionEditor
+	{
+		Type[] types;
+		
+		public GroupingCollectionEditor(Type type):base(type){
+			types = new Type[] {typeof(GroupColumn)};
+		}
+		
+		
+		protected override Type[] CreateNewItemTypes(){
+			return types;
+		}
+			
+			
+		protected override object CreateInstance(Type itemType)
+		{
+//			if (itemType == typeof(SqlParameter)) {
+//				return new SqlParameter();
+//			}
+			return base.CreateInstance(typeof(GroupColumn));
+		}
+
+		
+		public override UITypeEditorEditStyle GetEditStyle(ITypeDescriptorContext context){
+			return  UITypeEditorEditStyle.Modal;
+		}
+	}
+}

src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Items/ReportSettings.cs

@@ -18,50 +18,32 @@
 
 using System;
 using System.ComponentModel;
-using System.ComponentModel.Design;
 using System.Drawing;
 using System.IO;
-
 using System.Xml.Serialization;
 using ICSharpCode.Reporting.Globals;
 using ICSharpCode.Reporting.Interfaces;
 
-
-
 namespace ICSharpCode.Reporting.Items
 {
 	/// <summary>
 	/// Description of ReportSettings.
 	/// </summary>
-	/*
-	public class ReportSettingsDesigner:ComponentDesigner
-	{
-		const string settingsName = "ReportSettings";
-		public ReportSettingsDesigner()
-		{
-		}
-		
-		public override void Initialize(IComponent component)
-		{
-			base.Initialize(component);
-			component.Site.Name = ReportSettingsDesigner.settingsName;
-		}
-	}
-	*/
 	
-//	[Designer(typeof(ReportSettingsDesigner))]
 	public class ReportSettings:Component,IReportSettings
 	{
 		
-		public ReportSettings()
+		public ReportSettings(){
-		{
+		
 			this.pageSize = GlobalValues.DefaultPageSize;
 			BaseValues();
 			var x = PdfSharp.PageSizeConverter.ToSize(PdfSharp.PageSize.A4);
-	//http://www.sizepaper.com/a-series/a4
+			//http://www.sizepaper.com/a-series/a4
-//	http://www.sizepaper.com/american-loose
+			//http://www.sizepaper.com/american-loose
-	System.Drawing.Printing.PageSettings paperProp = new System.Drawing.Printing.PageSettings();
+			
-	var p = paperProp.PaperSize.PaperName.ToString();
+			var paperProp = new System.Drawing.Printing.PageSettings();
+			var p = paperProp.PaperSize.PaperName.ToString();
+			Console.WriteLine("Set paperSize to {0}",p);
 		}