diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/ICSharpCode.Reports.Addin.csproj b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/ICSharpCode.Reports.Addin.csproj index 77323b4ba4..81fe751818 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/ICSharpCode.Reports.Addin.csproj +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/ICSharpCode.Reports.Addin.csproj @@ -88,8 +88,7 @@ - - + @@ -141,7 +140,7 @@ Component - + Component diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Designer/Class1.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Designer/Class1.cs deleted file mode 100644 index e7c2c79017..0000000000 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Designer/Class1.cs +++ /dev/null @@ -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 -{ - /// - /// Description of Class1. - /// - public class Class1 - { - public Class1() - { - } - } -} diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Designer/BaseGroupHeaderDesigner.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Designer/GroupedRowDesigner.cs similarity index 86% rename from src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Designer/BaseGroupHeaderDesigner.cs rename to src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Designer/GroupedRowDesigner.cs index d58c31a16d..b951a0524b 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Designer/BaseGroupHeaderDesigner.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Designer/GroupedRowDesigner.cs @@ -18,13 +18,13 @@ namespace ICSharpCode.Reports.Addin.Designer /// /// Description of BaseGroupHeaderDesigner. /// - [Designer(typeof(ICSharpCode.Reports.Addin.Designer.GroupHeaderDesigner))] - public class GroupHeaderDesigner:ParentControlDesigner + + public class GroupedRowDesigner:ParentControlDesigner { private ISelectionService selectionService; - public GroupHeaderDesigner() + public GroupedRowDesigner() { } diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Designer/ImageDesigner.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Designer/ImageDesigner.cs index 296069fe24..4d476d14f7 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Designer/ImageDesigner.cs +++ b/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; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Designer/RootDesigner/ReportRootDesigner.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Designer/RootDesigner/ReportRootDesigner.cs index d140b31d99..6c6ea6b810 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Designer/RootDesigner/ReportRootDesigner.cs +++ b/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(); } diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportItems/BaseGroupHeader.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportItems/BaseGroupHeader.cs deleted file mode 100644 index f097e6de5e..0000000000 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportItems/BaseGroupHeader.cs +++ /dev/null @@ -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 -{ - /// - /// Description of BaseGroupHeader. - /// - /// - - [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 allProperties = new List(); - - 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()); - } - } -} diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportItems/BaseGroupedRow.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportItems/BaseGroupedRow.cs new file mode 100644 index 0000000000..4d6dfcf392 --- /dev/null +++ b/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 +{ + /// + /// Description of BaseGroupedRow. + /// + [Designer(typeof(ICSharpCode.Reports.Addin.Designer.GroupedRowDesigner))] + public class BaseGroupedRow:BaseRowItem + { + public BaseGroupedRow() + { + } + } +} diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/ReportLayout/AbstractLayout.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/ReportLayout/AbstractLayout.cs index cfd890c2cb..2a8fae84a6 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/ReportLayout/AbstractLayout.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/ReportLayout/AbstractLayout.cs @@ -20,7 +20,7 @@ namespace ICSharpCode.Reports.Addin.ReportWizard /// public class AbstractLayout { -// ReportModel reportModel; + ISimpleContainer parentItem; public AbstractLayout(ReportModel reportModel) diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Toolbox/ToolboxProvider.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Toolbox/ToolboxProvider.cs index 07b59b1992..9e7be5d0a8 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Toolbox/ToolboxProvider.cs +++ b/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";