PushModel in unbound mode is now working as well

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

src/AddIns/Misc/SharpReport/SharpReport/Designer/NameService.cs

@@ -34,6 +34,10 @@ namespace SharpReport {
 		
 		public string CreateName (ReportItemCollection collection,
 		                          string typeName) {
+
+			if (String.IsNullOrEmpty(typeName)) {
+				throw new ArgumentNullException("typeName");
+			}
 			
 			string name = Char.ToLower(typeName[0],
 			                           CultureInfo.InvariantCulture) + typeName.Substring(1);
@@ -42,7 +46,6 @@ namespace SharpReport {
 			while (collection.Find(name + number.ToString(CultureInfo.InvariantCulture)) != null) {
 				++number;
 			}
-			
 			return name + number.ToString();
 		}
 		

src/AddIns/Misc/SharpReport/SharpReport/Designer/Report.cs

@@ -188,7 +188,8 @@ namespace SharpReport.Designer{
 			baseReportItem.Name = nameService.CreateName(itemCollection,
 			                                             baseReportItem.Name);
 			
-
+System.Console.WriteLine("Report:CustomizeItem Name {0}",baseReportItem.Name);
+			
 			if (baseReportItem.Parent == this.selectedSection) {
 				baseReportItem.Location = new Point(iddea.ItemAtPoint.X,iddea.ItemAtPoint.Y);
 			} else {

src/AddIns/Misc/SharpReport/SharpReport/Designer/SectionControls/ReportSectionControlbase.cs

@@ -339,8 +339,9 @@ namespace SharpReport.Designer{
 		
 		private bool CheckDraggedControl (DragEventArgs dea) {
 			string str = this.DragObjectToString (dea);
+			System.Console.WriteLine("ReportSectionControlBase");
+			System.Console.WriteLine("valid {0}",this.designableFactory.Contains(str));
 			return this.designableFactory.Contains(str);
-			
 		}
 		
 		private bool CheckDragElement (System.Windows.Forms.DragEventArgs dea) {

src/AddIns/Misc/SharpReport/SharpReport/Designer/SideTab/BuildSideTab.cs

@@ -96,6 +96,8 @@ namespace SharpReport
 //			                                                 GlobalValues.RectangleBitmap());
 			tab.Items.Add (t);
 			
+			
+			//
 			bitmap = ResourceService.GetIcon("Icons.16.16.SharpReport.Line").ToBitmap();
 			t = sideTab.SideTabItemFactory.CreateSideTabItem( ResourceService.GetString("SharpReport.Toolbar.Line"),
 			                                                 GlobalEnums.ReportItemType.ReportLineItem.ToString(),
@@ -105,6 +107,15 @@ namespace SharpReport
 			                                                 GlobalEnums.ReportItemType.ReportCircleItem.ToString(),
 			                                                 GlobalValues.CircleBitmap());
 			tab.Items.Add (t);
+			
+			//Test
+			/*
+			t = sideTab.SideTabItemFactory.CreateSideTabItem( "Table",
+			                                                 GlobalEnums.ReportItemType.ReportTableItem.ToString(),
+			                                                  ResourceService.GetBitmap("Icons.16x16.SharpQuery.Table"));
+			tab.Items.Add (t);
+			*/
+			//
 		}
 		
 		private void AddFunctionElements (AxSideTab tab) {

src/AddIns/Misc/SharpReport/SharpReport/Designer/VisualControls/ControlHelper.cs

@@ -77,6 +77,19 @@ namespace SharpReport.Designer
 		
 		}
 		
+		
+		
+		public static void DrawHeadLine (Control ctrl, PaintEventArgs pea) {
+			
+			StringFormat fmt = SharpReportCore.GlobalValues.StandartStringFormat();
+			fmt.LineAlignment = StringAlignment.Near;
+			pea.Graphics.DrawString(ctrl.Name,
+			                        ctrl.Font,
+			                        new SolidBrush(ctrl.ForeColor),
+			                        new Rectangle(7,0,pea.ClipRectangle.Width,(int)ctrl.Font.GetHeight(pea.Graphics) + 2),
+			                        fmt);
+		}
+		
 		/// <summary>
 		/// Set the Controls to selected = false, so the Focusrectangle is
 		/// not draw

src/AddIns/Misc/SharpReport/SharpReport/Designer/VisualControls/RectTracker.cs

@@ -281,6 +281,7 @@ namespace SharpReport.Designer
 			// convert cursor position to client co-ordinates
 			// do hittest and normalize hit
 			int nHandle = (int)HitTestHandles(MousePoint);
+			System.Console.WriteLine("RectTracker SetCursor {0}",nHandle);
 			if (nHandle < 0)
 				return false;
 

src/AddIns/Misc/SharpReport/SharpReport/Designer/VisualControls/ReportRowControl.cs

@@ -50,14 +50,8 @@ namespace SharpReport.Designer{
 				                 new BaseLine (this.ForeColor,System.Drawing.Drawing2D.DashStyle.Solid,1),
 				                 base.FocusRectangle);
 			}
+			ControlHelper.DrawHeadLine(this,pea);
 
-			StringFormat fmt = GlobalValues.StandartStringFormat();
-			fmt.LineAlignment = StringAlignment.Near;
-			pea.Graphics.DrawString(this.Name,
-			                        this.Font,
-			                        new SolidBrush(this.ForeColor),
-			                        new Rectangle(7,0,pea.ClipRectangle.Width,(int)this.Font.GetHeight(pea.Graphics) + 2),
-			                        fmt);
 		}
 		
 		public override string ToString() {
@@ -84,7 +78,7 @@ namespace SharpReport.Designer{
 			// ReportRectangleControl
 			// 
 			this.BackColor = System.Drawing.Color.White;
-			this.Name = "RowItem";
+			this.Name = "Row";
 			this.Size = new System.Drawing.Size(72, 40);
 		}
 		#endregion

src/AddIns/Misc/SharpReport/SharpReport/Designer/VisualControls/ReportTableControl.cs

@@ -0,0 +1,118 @@
+/*
+ * Created by SharpDevelop.
+ * User: Forstmeier Helmut
+ * Date: 09.07.2006
+ * Time: 15:39
+ * 
+ * To change this template use Tools | Options | Coding | Edit Standard Headers.
+ */
+
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Windows.Forms;
+
+using SharpReportCore;
+
+namespace SharpReport.Designer
+{
+	/// <summary>
+	/// Description of ReportTableControl.
+	/// </summary>
+	public  class ReportTableControl:ContainerControl
+	{
+		private RectangleShape shape = new RectangleShape();
+		private bool drawBorder;
+		public ReportTableControl()
+		{
+			//
+			// The InitializeComponent() call is required for Windows Forms designer support.
+			//
+			InitializeComponent();
+			this.SetStyle(ControlStyles.DoubleBuffer |
+			              ControlStyles.UserPaint |
+			              ControlStyles.AllPaintingInWmPaint |
+			              ControlStyles.ResizeRedraw,
+			              true);
+			this.UpdateStyles();
+			int h,w;
+			h = GlobalValues.PreferedSize.Height * 3 + 30;
+			w = (GlobalValues.PreferedSize.Width * 2) + 10;
+
+//			this.Size = new Size(w,h);
+		}
+		
+		#region overrides
+		protected override void OnPaint(PaintEventArgs pea){
+			
+			
+			base.OnPaint(pea);
+			base.DrawEdges (pea,
+			                new Rectangle(0,5,
+			                              this.ClientSize.Width - 1,this.ClientSize.Height - 6) );
+			
+			ControlHelper.DrawHeadLine(this,pea);
+		}
+		
+		
+		
+		public override string ToString() {
+			
+			return this.GetType().Name;
+		}
+		
+		
+		
+		#endregion
+		
+		public bool DrawBorder {
+			set {
+				drawBorder = value;
+				this.Invalidate();
+			}
+		}
+		#region FormsDesigner
+		
+		/// <summary>
+		/// Designer variable used to keep track of non-visual components.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+		
+		/// <summary>
+		/// Disposes resources used by the control.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if (disposing) {
+				if (components != null) {
+					components.Dispose();
+				}
+			}
+			base.Dispose(disposing);
+		}
+		
+		/// <summary>
+		/// This method is required for Windows Forms designer support.
+		/// Do not change the method contents inside the source code editor. The Forms designer might
+		/// not be able to load this method if it was changed manually.
+		/// </summary>
+		private void InitializeComponent()
+		{
+			
+			this.SuspendLayout();
+			
+			// 
+			// ReportTableControl
+			// 
+			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+		
+			this.Name = "Table";
+			this.Size = new System.Drawing.Size(200,40);
+			this.ResumeLayout(false);
+		}
+		
+		#endregion
+	}
+}

src/AddIns/Misc/SharpReport/SharpReport/ReportItems/GraphicBased/ReportCircleItem.cs

@@ -34,7 +34,7 @@ namespace SharpReport.ReportItems{
 	public ReportCircleItem() : base(){
 			visualControl = new ReportCircleControl();
 			
-			ItemsHelper.UpdateBaseFromGraphicControl (this.visualControl,this);
+//			ItemsHelper.UpdateBaseFromGraphicControl (this.visualControl,this);
 			
 			this.visualControl.Click += new EventHandler(OnControlSelect);
 			this.visualControl.VisualControlChanged += new EventHandler (OnControlChanged);

src/AddIns/Misc/SharpReport/SharpReport/ReportItems/GraphicBased/ReportLineItem.cs

@@ -33,7 +33,7 @@ namespace SharpReport.ReportItems{
 		/// </summary>
 		public ReportLineItem():base() {
 			visualControl = new ReportLineControl();
-			ItemsHelper.UpdateBaseFromGraphicControl (this.visualControl,this);
+//			ItemsHelper.UpdateBaseFromGraphicControl (this.visualControl,this);
 			
 			this.visualControl.Click += new EventHandler(OnControlSelect);
 			this.visualControl.VisualControlChanged += new EventHandler (OnControlChanged);

src/AddIns/Misc/SharpReport/SharpReport/ReportItems/GraphicBased/ReportRectangleItem.cs

@@ -35,7 +35,7 @@ namespace SharpReport.ReportItems{
 		public ReportRectangleItem():base() {
 			visualControl = new ReportRectangleControl();
 			
-			ItemsHelper.UpdateBaseFromGraphicControl (this.visualControl,this);
+//			ItemsHelper.UpdateBaseFromGraphicControl (this.visualControl,this);
 			
 			this.visualControl.Click += new EventHandler(OnControlSelect);
 			this.visualControl.VisualControlChanged += new EventHandler (OnControlChanged);

src/AddIns/Misc/SharpReport/SharpReport/ReportItems/TextBased/ReportDataItem.cs

@@ -44,7 +44,7 @@ namespace SharpReport.ReportItems{
 			visualControl.ContentAlignment = base.ContentAlignment;
 			visualControl.StringTrimming = base.StringTrimming;
 			
-			ItemsHelper.UpdateBaseFromTextControl (this.visualControl,this);
+//			ItemsHelper.UpdateBaseFromTextControl (this.visualControl,this);
 
 			this.visualControl.Click += new EventHandler(OnControlSelect);
 			this.visualControl.VisualControlChanged += new EventHandler (OnControlChanged);

src/AddIns/Misc/SharpReport/SharpReport/ReportItems/TextBased/ReportRowItem.cs

@@ -38,7 +38,7 @@ namespace SharpReport.ReportItems
 		private void Setup(){
 			
 			visualControl = new ReportRowControl();
-			ItemsHelper.UpdateBaseFromTextControl (this.visualControl,this);
+//			ItemsHelper.UpdateBaseFromTextControl (this.visualControl,this);
 			
 			this.visualControl.Click += new EventHandler(OnControlSelect);
 			this.visualControl.VisualControlChanged += new EventHandler (OnControlChanged);
@@ -62,19 +62,20 @@ namespace SharpReport.ReportItems
 			if (Selected != null)
 				Selected(sender,e);
 		}	
-		
+		/*
 		private void OnChildControlChanged (object sender, EventArgs e) {
 			ItemsHelper.UpdateBaseFromTextControl (this.visualControl,this);
 			this.HandlePropertyChanged("OnChildControlChanged");
 		}
-		
+			*/
+			
 		private void ChildPropertyChange (object sender, PropertyChangedEventArgs e){
 			if (! base.Suspend) {
 				ItemsHelper.UpdateControlFromTextBase (this.visualControl,this);
 				this.HandlePropertyChanged(e.PropertyName);
 			}
 		}
-		
+	
 		#endregion
 		
 		private void UpdateChilds () {
@@ -89,6 +90,7 @@ namespace SharpReport.ReportItems
 		
 		#region EventHandling for this Class
 		
+		
 		private void OnAdd (object sender, CollectionItemEventArgs<IItemRenderer> e){
 			IDesignable des = e.Item as IDesignable;
 			if (des != null) {
@@ -156,8 +158,9 @@ namespace SharpReport.ReportItems
 					PropertyChanged (this,new PropertyChangedEventArgs(info));
 				}
 			}
-			
 		}
+		
+		
 		#endregion
 		
 		#region IDesignable
@@ -220,6 +223,8 @@ namespace SharpReport.ReportItems
 			return this.GetType().Name;
 		}
 		
+	
+		
 		#endregion
 		
 	/*

src/AddIns/Misc/SharpReport/SharpReport/ReportItems/TextBased/ReportTableItem.cs

@@ -0,0 +1,158 @@
+/*
+ * Created by SharpDevelop.
+ * User: Forstmeier Helmut
+ * Date: 09.07.2006
+ * Time: 15:51
+ * 
+ * To change this template use Tools | Options | Coding | Edit Standard Headers.
+ */
+
+using System;
+using System.ComponentModel;
+
+using SharpReport.Designer;
+using SharpReportCore;
+
+namespace SharpReport.ReportItems{
+	/// <summary>
+	/// Description of ReportTableItem.
+	/// </summary>
+	public class ReportTableItem:TableItem ,IDesignable{
+		private ReportTableControl visualControl;
+		
+			
+		#region Constructor
+		public ReportTableItem():this (GlobalValues.UnboundName){
+			
+		}
+		
+		public ReportTableItem (string tableName):base(tableName) {
+			Setup();
+		}
+		
+		private void Setup (){
+		    visualControl = new ReportTableControl();
+//			ItemsHelper.UpdateBaseFromTextControl (this.visualControl,this);
+//			
+			this.visualControl.Click += new EventHandler(OnControlSelect);
+			this.visualControl.VisualControlChanged += new EventHandler (OnControlChanged);
+			this.visualControl.LocationChanged += new EventHandler (OnControlChanged);
+
+
+//			//Event from Tracker
+			this.visualControl.PropertyChanged += new PropertyChangedEventHandler (ControlPropertyChange);
+//			
+			base.PropertyChanged += new PropertyChangedEventHandler (BasePropertyChange);
+//			
+			base.Items.Added += OnAdd;
+			base.Items.Removed += OnRemove; 
+			System.Console.WriteLine("ReporttableItem ctrlName {0}",this.visualControl.Name);
+		}
+		#endregion
+		
+		#region List Handling
+		private void ChildSelected(object sender, EventArgs e){
+			if (Selected != null)
+				Selected(sender,e);
+		}	
+		
+		private void ChildPropertyChange (object sender, PropertyChangedEventArgs e){
+			if (! base.Suspend) {
+				ItemsHelper.UpdateControlFromTextBase (this.visualControl,this);
+				this.HandlePropertyChanged(e.PropertyName);
+			}
+		}
+		
+		private void OnAdd (object sender, CollectionItemEventArgs<IItemRenderer> e){
+			IDesignable des = e.Item as IDesignable;
+			if (des != null) {
+				this.visualControl.Controls.Add (des.VisualControl);
+				des.Selected += ChildSelected;
+				des.PropertyChanged += ChildPropertyChange;
+			}
+		}
+		
+		private void OnRemove (object sender, CollectionItemEventArgs<IItemRenderer> e){
+			
+			IDesignable des = e.Item as IDesignable;
+			if (des != null) {
+				this.visualControl.Controls.Remove(des.VisualControl);
+				des.Selected -= ChildSelected;
+				this.HandlePropertyChanged("OnChildControlRemoved");
+			}
+		}
+		
+		#endregion
+		public override string ToString() {
+			return this.GetType().Name;
+		}
+		#region Events from Control
+		//Tracker
+		
+		private void ControlPropertyChange (object sender, PropertyChangedEventArgs e){
+			ItemsHelper.UpdateBaseFromTextControl (this.visualControl,this);
+			this.HandlePropertyChanged(e.PropertyName);
+		}
+		
+		private void BasePropertyChange (object sender, PropertyChangedEventArgs e){
+			ItemsHelper.UpdateControlFromTextBase (this.visualControl,this);
+			this.visualControl.DrawBorder = base.DrawBorder;
+			this.HandlePropertyChanged(e.PropertyName);
+		}
+		
+		
+		private void OnControlChanged (object sender, EventArgs e) {
+			this.SuspendLayout();
+			ItemsHelper.UpdateBaseFromTextControl (this.visualControl,this);
+			
+			this.ResumeLayout();
+			this.HandlePropertyChanged("OnControlChanged");
+		
+		}
+		
+		private void OnAppereanceChanged (object sender, EventArgs e) {
+			this.SuspendLayout();
+			ItemsHelper.UpdateBaseFromTextControl (this.visualControl,this);
+			this.ResumeLayout();
+//			UpdateChilds();
+			
+			this.HandlePropertyChanged("OnControlChanged");
+		}
+		
+		private void OnControlSelect(object sender, EventArgs e){
+			if (Selected != null)
+				System.Console.WriteLine("fire selected");
+				Selected(this,e);
+		}	
+		
+		/// <summary>
+		/// A Property in ReportItem has changed, inform the Designer
+		/// to set the View's 'IsDirtyFlag' to true
+		/// </summary>
+		
+		protected void HandlePropertyChanged(string info) {
+			if ( !base.Suspend) {
+				if (PropertyChanged != null) {
+					PropertyChanged (this,new PropertyChangedEventArgs(info));
+				}
+			}
+		}
+		
+		
+		#endregion
+		
+		#region IDesignable
+	
+		[System.Xml.Serialization.XmlIgnoreAttribute]
+		[Browsable(false)]
+		public ReportObjectControlBase VisualControl {
+			get {
+				return visualControl;
+			}
+		}
+	
+		public new event PropertyChangedEventHandler PropertyChanged;
+		public event EventHandler <EventArgs> Selected;
+		#endregion
+	}
+}

src/AddIns/Misc/SharpReport/SharpReport/ReportItems/TextBased/ReportTextItem.cs

@@ -36,7 +36,7 @@ namespace SharpReport.ReportItems {
 			visualControl.ContentAlignment = base.ContentAlignment;
 			visualControl.StringTrimming = base.StringTrimming;
 			
-			ItemsHelper.UpdateBaseFromTextControl (this.visualControl,this);
+//			ItemsHelper.UpdateBaseFromTextControl (this.visualControl,this);
 
 			this.visualControl.LocationChanged += new EventHandler (OnControlChanged);
 			

src/AddIns/Misc/SharpReport/SharpReport/SharpReport.csproj

@@ -87,6 +87,8 @@
     <Compile Include="Designer\VisualControls\RectTracker.cs" />
     <Compile Include="Designer\VisualControls\ContainerControl.cs" />
     <Compile Include="Designer\VisualControls\ITracker.cs" />
+    <Compile Include="Designer\VisualControls\ReportTableControl.cs" />
+    <Compile Include="ReportItems\TextBased\ReportTableItem.cs" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Designer" />

src/AddIns/Misc/SharpReport/SharpReportCore/BaseItems/Functions/BasePageNumber.cs

@@ -27,6 +27,7 @@ namespace SharpReportCore {
 			static string fnName = "SharpReport.Toolbar.Functions.PageNumber";
 			
 			public BasePageNumber():base(fnName) {
+//				System.Console.WriteLine("!! PageNr created with name {0}",this.Name);
 				
 			}
 			

src/AddIns/Misc/SharpReport/SharpReportCore/BaseItems/TableItem.cs

@@ -11,17 +11,28 @@ using System;
 using System.ComponentModel;
 using System.Windows.Forms;
 
-namespace SharpReportCore.BaseItems {
+namespace SharpReportCore {
 	/// <summary>
 	/// Description of TableItem.
 	/// </summary>
 	public class TableItem :BaseReportItem,IContainerItem{
 		private Padding padding;
-//		private string tableName;
+		private string tableName;
+		private ReportItemCollection items;
 		
-		public TableItem(){
+		public TableItem():this (GlobalValues.UnboundName){
+		}
+		
+		public TableItem(string tableName){
+			this.tableName = tableName;
+		}
+		
+		#region overrides
 		
+		public override string ToString(){
+			return this.GetType().Name;
 		}
+		#endregion
 		
 		
 		/*
@@ -35,7 +46,10 @@ namespace SharpReportCore.BaseItems {
 //			}
 		}
 		*/
+		
+		
 		#region Interface implementation of 'IContainerItem'
+		
 		public System.Windows.Forms.Padding Padding {
 			get {
 				return this.padding;
@@ -48,7 +62,10 @@ namespace SharpReportCore.BaseItems {
 		
 		public ReportItemCollection Items {
 			get {
-				throw new NotImplementedException();
+				if (this.items == null) {
+					this.items = new ReportItemCollection();
+				}
+				return this.items;
 			}
 		}
 		

src/AddIns/Misc/SharpReport/SharpReportCore/Globals/GlobalEnums.cs

@@ -48,7 +48,8 @@ namespace SharpReportCore {
 			ReportLineItem,
 			ReportCircleItem,
 			PageNumber,
-			TodaysDate
+			TodaysDate,
+			ReportTableItem
 		}
 		/// <summary>
 		/// FormSheet means a blank form with Labels, Lines and Checkboxes

src/AddIns/Misc/SharpReport/SharpReportCore/Globals/GlobalValues.cs

@@ -33,6 +33,7 @@ namespace SharpReportCore {
 		private static string xsdExtension = "xsd";
 		private static string sharpReportStandartFileName = "SharpReport1";
 		private const string unbound = "unbound";
+		private const string tableName = "Table";
 		private const int enlargeControl = 5;
 		
 		#region some usefull functions and methodes
@@ -169,6 +170,13 @@ namespace SharpReportCore {
 		public static string UnboundName {
 			get {return unbound;}
 		}
+		
+		public static string TableName {
+			get {
+				return tableName;
+			}
+		}
+		
 		#endregion
 		
 		#region Message's

src/AddIns/Misc/SharpReport/SharpReportCore/SharpReportEngine.cs

@@ -260,6 +260,8 @@ namespace SharpReportCore {
 				if (this.dataManager.DataSource != null) {
 					abstr = new RendererFactory().Create (model,dataManager);
 				}
+				abstr.Rendering += new EventHandler<SectionRenderEventArgs>(OnSectionPrinting);
+				abstr.SectionRendered +=new EventHandler<SectionRenderEventArgs>(OnSectionPrinted);
 				
 				return abstr;
 			}

src/AddIns/Misc/SharpReport/SharpReportWizard/Generators/AbstractReportGenerator.cs

@@ -101,6 +101,7 @@ namespace ReportGenerator {
 			} else {
 				section.Items.Add (this.parentItem);
 				IContainerItem containerItem = this.parentItem as IContainerItem;
+
 				this.parentItem.Parent = section;
 				if ( containerItem != null) {
 					this.AddItemsToParent (containerItem,this.ReportItemCollection);
@@ -171,16 +172,15 @@ namespace ReportGenerator {
 		
 		protected void AdjustAllNames () {
 			foreach (BaseSection sec in this.reportModel.SectionCollection) {
-				AdjustNames(sec.Items);
+				BuildProperNames(sec.Items);
 			}
 		}
 		
-		private void AdjustNames (ReportItemCollection items) {
-			
+		private void BuildProperNames (ReportItemCollection items) {
 			foreach (IItemRenderer item in items) {
 				IContainerItem it = item as IContainerItem;
 				if (it != null) {
-					AdjustNames (it.Items);
+					BuildProperNames (it.Items);
 				}
 				item.Name = nameService.CreateName(items,item.Name);
 			}