diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Designer/TextItemDesigner.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Designer/TextItemDesigner.cs index dfae32ba1f..369b77afad 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Designer/TextItemDesigner.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Designer/TextItemDesigner.cs @@ -61,7 +61,6 @@ namespace ICSharpCode.Reports.Addin.Designer private void OnComponentRename(object sender,ComponentRenameEventArgs e) { if (e.Component == this.Component) { Control.Name = e.NewName; - Control.Text = e.NewName; Control.Invalidate(); } } diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportItems/BaseGroupItem.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportItems/BaseGroupItem.cs index 23bdebaa48..4127f2f694 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportItems/BaseGroupItem.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportItems/BaseGroupItem.cs @@ -33,9 +33,9 @@ namespace ICSharpCode.Reports.Addin [System.ComponentModel.EditorBrowsableAttribute()] protected override void OnPaint(System.Windows.Forms.PaintEventArgs e) { - if (Text.CompareTo(ColumnName) != 0 ) { - Text = ColumnName; - } +// if (Text.CompareTo(ColumnName) != 0 ) { +// Text = ColumnName; +// } base.OnPaint(e); this.Draw(e.Graphics); } diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/ICSharpCode.Reports.Core.csproj b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/ICSharpCode.Reports.Core.csproj index 3483f78ee0..ae720859f3 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/ICSharpCode.Reports.Core.csproj +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/ICSharpCode.Reports.Core.csproj @@ -112,11 +112,13 @@ - + + + @@ -302,7 +304,6 @@ - diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/Printing/Layouter.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/Printing/Layouter.cs index 1f12bfb30c..523fa7b66b 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/Printing/Layouter.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/Printing/Layouter.cs @@ -38,8 +38,7 @@ namespace ICSharpCode.Reports.Core.BaseClasses.Printing return Rectangle.Empty; } -// BaseReportItem containerItem = container as BaseReportItem; - + Rectangle desiredContainerRectangle = new Rectangle (container.Location,container.Size); System.Collections.Generic.IEnumerable canGrowShrinkCollection = from bt in container.Items where bt.CanGrow == true select bt; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/Printing/PrintHelper.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/Printing/PrintHelper.cs index 5745cfe601..6fc66e5a82 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/Printing/PrintHelper.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/Printing/PrintHelper.cs @@ -87,6 +87,7 @@ namespace ICSharpCode.Reports.Core.BaseClasses.Printing throw new ArgumentNullException ("item"); } BaseReportItem bri = (BaseReportItem) item; + return new Rectangle(parent.Location.X + bri.Location.X , bri.Location.Y + bri.SectionOffset, bri.Size.Width,bri.Size.Height); @@ -156,7 +157,7 @@ namespace ICSharpCode.Reports.Core.BaseClasses.Printing } - public static IExpressionEvaluatorFacade SetupEvaluator (ISinglePage singlePage,IDataNavigator dataNavigator) + public static IExpressionEvaluatorFacade CreateEvaluator (ISinglePage singlePage,IDataNavigator dataNavigator) { if (singlePage == null) { diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/Printing/StandardPrinter.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/Printing/StandardPrinter.cs index 635f41a891..3409e482f5 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/Printing/StandardPrinter.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/Printing/StandardPrinter.cs @@ -28,7 +28,7 @@ namespace ICSharpCode.Reports.Core.BaseClasses.Printing public static void AdjustBackColor (ISimpleContainer container) { - foreach (BaseReportItem item in container.Items) + foreach (var item in container.Items) { item.BackColor = container.BackColor; } @@ -38,7 +38,7 @@ namespace ICSharpCode.Reports.Core.BaseClasses.Printing public static void AdjustBackColor (ISimpleContainer container, Color defaultColor) { if (container.BackColor != defaultColor) { - foreach (BaseReportItem item in container.Items) + foreach (var item in container.Items) { item.BackColor = defaultColor; } @@ -234,6 +234,7 @@ namespace ICSharpCode.Reports.Core.BaseClasses.Printing public static void EvaluateRow(IExpressionEvaluatorFacade evaluator,ExporterCollection row) { + Console.WriteLine("evaluate row with row:{0} ",evaluator.SinglePage.IDataNavigator.CurrentRow); foreach (BaseExportColumn element in row) { ExportText textItem = element as ExportText; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/BaseTableItem.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/BaseTableItem.cs index 52f34bcf63..3e894786c2 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/BaseTableItem.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/BaseTableItem.cs @@ -59,16 +59,16 @@ namespace ICSharpCode.Reports.Core { private void EvaluateRecursive (IExpressionEvaluatorFacade evaluatorFassade,ReportItemCollection items) { - foreach (BaseReportItem be in items) { + foreach (var item in items) { - ISimpleContainer ec = be as ISimpleContainer; + ISimpleContainer ec = item as ISimpleContainer; if (ec != null) { if (ec.Items.Count > 0) { EvaluateRecursive(evaluatorFassade,ec.Items); } } - BaseTextItem bt = be as BaseTextItem; + BaseTextItem bt = item as BaseTextItem; if (bt != null) { bt.Text = evaluatorFassade.Evaluate(bt.Text); } diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/DataNavigator.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/DataNavigator.cs index f98ec83801..96b26c7206 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/DataNavigator.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/DataNavigator.cs @@ -33,19 +33,22 @@ namespace ICSharpCode.Reports.Core #endregion - + /* private static Collection ExtraxtDataItems (ReportItemCollection items) { Collection inheritedReportItems = new Collection(items.OfType().ToList()); return inheritedReportItems; } - + */ #region IDataNavigator implementation public void Fill (ReportItemCollection collection) { - foreach (IDataItem item in collection) { - this.store.Fill(item); + foreach (var item in collection) { + IDataItem dataItem = item as IDataItem; + if (dataItem != null) { + this.store.Fill(dataItem); + } } } @@ -140,15 +143,19 @@ namespace ICSharpCode.Reports.Core } + // at the moment only tables are working + public void FillChild (ReportItemCollection collection) { TableStrategy tableStrategy = store as TableStrategy; - var filteredCollection = ExtraxtDataItems(collection); - - foreach (BaseDataItem item in filteredCollection) { - CurrentItemsCollection currentItemsCollection = tableStrategy.FillDataRow(ce.Current.ListIndex); - CurrentItem s = currentItemsCollection.FirstOrDefault(x => x.ColumnName == ((BaseDataItem)item).ColumnName); - item.DBValue = s.Value.ToString(); + foreach (var item in collection) { + IDataItem dataItem = item as IDataItem; + if (dataItem != null) { + CurrentItemsCollection currentItemsCollection = tableStrategy.FillDataRow(ce.Current.ListIndex); + CurrentItem s = currentItemsCollection.FirstOrDefault(x => x.ColumnName == dataItem.ColumnName); + dataItem.DBValue = s.Value.ToString(); + } + } } diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/ListStrategy/TableStrategy.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/ListStrategy/TableStrategy.cs index 408314b686..8bcff305dd 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/ListStrategy/TableStrategy.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/ListStrategy/TableStrategy.cs @@ -293,10 +293,9 @@ namespace ICSharpCode.Reports.Core get { try { int cr = base.CurrentPosition; - int li = (base.IndexList[cr] ).ListIndex; - return this.table.Rows[li]; + int li = (base.IndexList[cr] ).ListIndex; + return this.table.Rows[li]; } catch (Exception) { - throw; } // int cr = base.CurrentPosition; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Dialogs/GroupingCollectionEditor.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Dialogs/GroupingCollectionEditor.cs new file mode 100644 index 0000000000..cfb59a567b --- /dev/null +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Dialogs/GroupingCollectionEditor.cs @@ -0,0 +1,55 @@ +/* + * Created by SharpDevelop. + * User: Peter Forstmeier + * Date: 22.08.2010 + * Time: 13:37 + * + * To change this template use Tools | Options | Coding | Edit Standard Headers. + */ +using System; +using System.ComponentModel; +using System.ComponentModel.Design; +using System.Drawing.Design; + +namespace ICSharpCode.Reports.Core.Dialogs +{ + /// + /// Description of SortingCollectionEditor. + /// + public class GroupingCollectionEditor:CollectionEditor + { + private 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 object EditValue(System.ComponentModel.ITypeDescriptorContext context, IServiceProvider provider, object value) + { + return base.EditValue(context, provider, value); + } + + + public override System.Drawing.Design.UITypeEditorEditStyle GetEditStyle(ITypeDescriptorContext context) + { + return UITypeEditorEditStyle.Modal; + } + } +} diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Dialogs/ExtendedCollectionEditor.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Dialogs/ParametersCollectionEditor.cs similarity index 87% rename from src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Dialogs/ExtendedCollectionEditor.cs rename to src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Dialogs/ParametersCollectionEditor.cs index afc80741e2..2a93e8ab99 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Dialogs/ExtendedCollectionEditor.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Dialogs/ParametersCollectionEditor.cs @@ -11,16 +11,16 @@ using System.ComponentModel; using System.ComponentModel.Design; using System.Drawing.Design; -namespace ICSharpCode.Reports.Core +namespace ICSharpCode.Reports.Core.Dialogs { /// /// Description of ExtendedCollectionEditor. /// - public class ExtendedCollectionEditor:CollectionEditor + public class ParameterCollectionEditor:CollectionEditor { private Type[] types; - public ExtendedCollectionEditor(Type type):base(type) + public ParameterCollectionEditor(Type type):base(type) { types = new Type[] {typeof(BasicParameter),typeof(SqlParameter)}; } diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Dialogs/SortingCollectionEditor.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Dialogs/SortingCollectionEditor.cs new file mode 100644 index 0000000000..12ab2f7e85 --- /dev/null +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Dialogs/SortingCollectionEditor.cs @@ -0,0 +1,53 @@ +/* + * Created by SharpDevelop. + * User: Peter Forstmeier + * Date: 22.08.2010 + * Time: 13:25 + * + * To change this template use Tools | Options | Coding | Edit Standard Headers. + */ +using System; +using System.ComponentModel; +using System.ComponentModel.Design; +using System.Drawing.Design; + +namespace ICSharpCode.Reports.Core.Dialogs +{ + /// + /// Description of SortingCollectionEditor. + /// + public class SortingCollectionEditor:CollectionEditor + { + private Type[] types; + + public SortingCollectionEditor(Type type):base(type) + { + types = new Type[] {typeof(SortColumn)}; + } + + protected override Type[] CreateNewItemTypes() + { + return types; + } + protected override object CreateInstance(Type itemType) + { +// if (itemType == typeof(SqlParameter)) { +// return new SqlParameter(); +// } + return base.CreateInstance(typeof(SortColumn)); + } + + + + public override object EditValue(System.ComponentModel.ITypeDescriptorContext context, IServiceProvider provider, object value) + { + return base.EditValue(context, provider, value); + } + + + public override System.Drawing.Design.UITypeEditorEditStyle GetEditStyle(ITypeDescriptorContext context) + { + return UITypeEditorEditStyle.Modal; + } + } +} diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/BasePager.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/BasePager.cs index 3a8298f557..f3fd805209 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/BasePager.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/BasePager.cs @@ -199,7 +199,7 @@ namespace ICSharpCode.Reports.Core.Exporter { p.TotalPages = this.Pages.Count; } - + IExpressionEvaluatorFacade evaluatorFacade = new ExpressionEvaluatorFacade(); foreach (ExporterPage p in this.pages) @@ -224,8 +224,9 @@ namespace ICSharpCode.Reports.Core.Exporter } } ExportText et = be as ExportText; - if (et != null) { - et.Text = evaluatorFassade.Evaluate(et.Text); + if (et != null) {Console.WriteLine("nav {0}",evaluatorFassade.SinglePage.IDataNavigator.CurrentRow); + +// et.Text = evaluatorFassade.Evaluate(et.Text); } } diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Converters/BaseConverter.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Converters/BaseConverter.cs index 1e609bcead..2cb1d120c1 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Converters/BaseConverter.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Converters/BaseConverter.cs @@ -54,7 +54,7 @@ namespace ICSharpCode.Reports.Core.Exporter this.dataNavigator = dataNavigator; this.sectionBounds = this.singlePage.SectionBounds; this.layouter = layouter; - this.evaluator = PrintHelper.SetupEvaluator(this.singlePage,this.dataNavigator); + this.evaluator = PrintHelper.CreateEvaluator(this.singlePage,this.dataNavigator); } diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Converters/GroupedRowConverter.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Converters/GroupedRowConverter.cs index 9ba68bced0..791c91bb4b 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Converters/GroupedRowConverter.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Converters/GroupedRowConverter.cs @@ -58,6 +58,7 @@ namespace ICSharpCode.Reports.Core.Exporter } } + private ExporterCollection ConvertDataRow (ISimpleContainer simpleContainer) { ExporterCollection mylist = new ExporterCollection(); @@ -133,8 +134,8 @@ namespace ICSharpCode.Reports.Core.Exporter var groupCollection = section.Items.ExtractGroupedColumns(); base.DataNavigator.Fill(groupCollection); base.FireSectionRendering(section); - StandardPrinter.EvaluateRow(base.Evaluator,mylist); ExporterCollection list = StandardPrinter.ConvertPlainCollection(groupCollection,offset); + StandardPrinter.EvaluateRow(base.Evaluator,list); mylist.AddRange(list); AfterConverting (section); return new Point (leftPos,offset.Y + groupCollection[0].Size.Height + 20 + (3 *GlobalValues.GapBetweenContainer)); @@ -146,8 +147,8 @@ namespace ICSharpCode.Reports.Core.Exporter base.DataNavigator.FillChild(simpleContainer.Items); PrepareContainerForConverting(simpleContainer); base.FireSectionRendering(section); - StandardPrinter.EvaluateRow(base.Evaluator,mylist); Point curPos = BaseConverter.BaseConvert(mylist,simpleContainer,defaultLeftPos,currentPosition); + StandardPrinter.EvaluateRow(base.Evaluator,mylist); AfterConverting (section); return curPos; } @@ -158,8 +159,8 @@ namespace ICSharpCode.Reports.Core.Exporter base.FillRow(simpleContainer); PrepareContainerForConverting(simpleContainer); base.FireSectionRendering(section); - StandardPrinter.EvaluateRow(base.Evaluator,mylist); Point curPos = BaseConverter.BaseConvert(mylist,simpleContainer,defaultLeftPos,currentPosition); + StandardPrinter.EvaluateRow(base.Evaluator,mylist); AfterConverting (section); return curPos; } diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/ExportItemsConverter.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/ExportItemsConverter.cs deleted file mode 100644 index a28023a823..0000000000 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/ExportItemsConverter.cs +++ /dev/null @@ -1,48 +0,0 @@ -// -// -// -// -// $Revision$ -// - -using System; -using System.Drawing; -using ICSharpCode.Reports.Core.BaseClasses.Printing; -using ICSharpCode.Reports.Core.Interfaces; - -namespace ICSharpCode.Reports.Core.Exporter -{ - /* - public class ExportItemsConverter:IExportItemsConverter - { - - public ExportItemsConverter () - { - } - - - public static ExportContainer ConvertToContainer (BaseReportItem parent,ISimpleContainer item,Point offset) - { - if (item == null) { - throw new ArgumentNullException("item"); - } - IExportColumnBuilder lineBuilder = item as IExportColumnBuilder; - - if (lineBuilder != null) { - ExportContainer lineItem = (ExportContainer)lineBuilder.CreateExportColumn(); - - lineItem.StyleDecorator.Location = new Point (offset.X + lineItem.StyleDecorator.Location.X, - offset.Y); - - lineItem.StyleDecorator.DisplayRectangle = new Rectangle(lineItem.StyleDecorator.Location, - lineItem.StyleDecorator.Size); - - return lineItem; - } - return null; - } - - //public Rectangle ParentRectangle {get;set;} - } - */ -} diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Expressions/ExpressionEvaluatorFacade.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Expressions/ExpressionEvaluatorFacade.cs index e20716b4ba..67b3f0d467 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Expressions/ExpressionEvaluatorFacade.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Expressions/ExpressionEvaluatorFacade.cs @@ -6,11 +6,8 @@ * * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. */ -using ICSharpCode.Reports.Core.Interfaces; using System; -using ICSharpCode.Reports.Core; -using ICSharpCode.Reports.Core.Exporter; -using ICSharpCode.Reports.Expressions.ReportingLanguage; +using ICSharpCode.Reports.Core.Interfaces; using SimpleExpressionEvaluator; using SimpleExpressionEvaluator.Evaluation; using SimpleExpressionEvaluator.Utilities; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Expressions/SimpleExpressionEvaluator/Compilation/Functions/ReportingService/FieldReference.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Expressions/SimpleExpressionEvaluator/Compilation/Functions/ReportingService/FieldReference.cs index af1563a977..f01c0fd991 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Expressions/SimpleExpressionEvaluator/Compilation/Functions/ReportingService/FieldReference.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Expressions/SimpleExpressionEvaluator/Compilation/Functions/ReportingService/FieldReference.cs @@ -39,6 +39,7 @@ namespace SimpleExpressionEvaluator.Compilation.Functions.ReportingService string retval; if (item != null) { retval = item.Value.ToString(); + Console.WriteLine ("retval {0}",retval); } else { retval= String.Format("!! Can't find <{0}> !! ",variable.VariableName); } diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/ReportSettings.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/ReportSettings.cs index 498a526a2a..22714c7d36 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/ReportSettings.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/ReportSettings.cs @@ -14,6 +14,8 @@ using System.IO; using System.Windows.Forms; using System.Xml.Serialization; +using ICSharpCode.Reports.Core.Dialogs; + namespace ICSharpCode.Reports.Core{ /// /// This class stores all the basic settings of an Report @@ -224,12 +226,16 @@ namespace ICSharpCode.Reports.Core{ /// [Category("Sorting/Grouping")] + [EditorAttribute ( typeof(SortingCollectionEditor), + typeof(System.Drawing.Design.UITypeEditor) )] public SortColumnCollection SortColumnsCollection { get {return sortingCollection;} } [Category("Sorting/Grouping")] + [EditorAttribute ( typeof(GroupingCollectionEditor), + typeof(System.Drawing.Design.UITypeEditor) )] public GroupColumnCollection GroupColumnsCollection { get { return groupingsCollection; @@ -241,7 +247,7 @@ namespace ICSharpCode.Reports.Core{ #region ReportParameters [Category("Parameters")] - [EditorAttribute ( typeof(ExtendedCollectionEditor), + [EditorAttribute ( typeof(ParameterCollectionEditor), typeof(System.Drawing.Design.UITypeEditor) )] public ParameterCollection ParameterCollection {