* TableLayoutSettings.cs:

- Added a GetControls method and a support structure to help the 
TypeConverter to enumerate the controls for serialization. 
- Added a new serialization constructor. 
- Added a isSerialized flag initialized to true on the 
serialization constructor so that the TableLayoutPanel.LayoutSettings 
setter does not throw the designed NotSupportedOperation exception
when the object is built through deserialization.
- Implemented GetObjectData

* TableLayoutPanel.cs: Added check on LayoutSettings.

System.Windows.Forms.Layout/:
* TableLayoutSettingsTypeConverter.cs: Implemented the converters
for TableLayoutSettings.

2007-04-24  Andreia Gaita  <[email protected]>

svn path=/trunk/mcs/; revision=76233

mcs/class/Managed.Windows.Forms/System.Windows.Forms.Layout/ChangeLog

@@ -1,3 +1,8 @@
+2007-04-24  Andreia Gaita  <[email protected]>
+
+	* TableLayoutSettingsTypeConverter.cs: Implemented the converters
+	for TableLayoutSettings.
+
 2007-04-22  Jonathan Pobst  <[email protected]>
 
 	* DefaultLayout.cs: Use the parent's DisplayRectangle for laying

mcs/class/Managed.Windows.Forms/System.Windows.Forms.Layout/TableLayoutSettingsTypeConverter.cs

@@ -1,69 +1,201 @@
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-// Copyright (c) 2006 Novell, Inc.
-//
-
-#if NET_2_0
-
-using System;
-using System.ComponentModel;
-using System.Drawing;
-using System.Globalization;
-using System.Xml;
-
-namespace System.Windows.Forms.Layout
-{
-	public class TableLayoutSettingsTypeConverter : TypeConverter
-	{
-		public override bool CanConvertFrom (ITypeDescriptorContext context, Type sourceType)
-		{
-			if (sourceType == typeof(string))
-				return true;
-
-			return base.CanConvertFrom (context, sourceType);
-		}
-
-		public override bool CanConvertTo (ITypeDescriptorContext context, Type destinationType)
-		{
-			if (destinationType == typeof(string))
-				return true;
-
-			return base.CanConvertTo (context, destinationType);
-		}
-
-		public override object ConvertFrom (ITypeDescriptorContext context,
-						    CultureInfo culture,
-						    object value)
-		{
-			throw new NotImplementedException ();
-		}
-
-		public override object ConvertTo (ITypeDescriptorContext context,
-						  CultureInfo culture,
-						  object value,
-						  Type destinationType)
-		{
-			throw new NotImplementedException ();
-		}
-
-	}
-}
-
-#endif
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+// Copyright (c) 2006 Novell, Inc.
+//
+
+#if NET_2_0
+
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Globalization;
+using System.Xml;
+using System.IO;
+using System.Collections.Generic;
+
+namespace System.Windows.Forms.Layout
+{
+	public class TableLayoutSettingsTypeConverter : TypeConverter
+	{
+		public override bool CanConvertTo (ITypeDescriptorContext context, Type destinationType)
+		{
+			if (destinationType == typeof (string))
+				return true;
+
+			return base.CanConvertTo (context, destinationType);
+		}
+
+		public override bool CanConvertFrom (ITypeDescriptorContext context, Type sourceType)
+		{
+			if (sourceType == typeof(string))
+				return true;
+
+			return base.CanConvertFrom (context, sourceType);
+		}
+
+		
+
+		public override object ConvertTo (ITypeDescriptorContext context,
+						  CultureInfo culture,
+						  object value,
+						  Type destinationType)
+		{
+			if (!(value is TableLayoutSettings) || destinationType != typeof (string))
+				return base.ConvertTo (context, culture, value, destinationType);
+
+			TableLayoutSettings settings = value as TableLayoutSettings;
+			StringWriter sw = new StringWriter ();
+			XmlTextWriter xw = new XmlTextWriter (sw);
+			xw.WriteStartDocument ();
+			List<ControlInfo> list = settings.GetControls ();
+			xw.WriteStartElement ("TableLayoutSettings");
+			xw.WriteStartElement ("Controls");
+			
+			foreach (ControlInfo info in list) {
+				xw.WriteStartElement ("Control");
+				xw.WriteAttributeString ("Name", info.Control.ToString ());
+				xw.WriteAttributeString ("Row", info.Row.ToString ());
+				xw.WriteAttributeString ("RowSpan", info.RowSpan.ToString ());
+				xw.WriteAttributeString ("Column", info.Col.ToString ());
+				xw.WriteAttributeString ("ColumnSpan", info.ColSpan.ToString ());
+				xw.WriteEndElement ();
+			}
+			xw.WriteEndElement ();
+
+
+			List<string> styles = new List<string> ();
+			
+			foreach (ColumnStyle style in settings.ColumnStyles) {
+				styles.Add (style.SizeType.ToString ());
+				styles.Add (style.Width.ToString ());
+			}
+
+			
+			xw.WriteStartElement ("Columms");
+			xw.WriteAttributeString ("Styles", String.Join (",", styles.ToArray ()));
+			xw.WriteEndElement ();
+			
+			styles.Clear();
+			foreach (RowStyle style in settings.RowStyles) {
+				styles.Add (style.SizeType.ToString ());
+				styles.Add (style.Height.ToString ());
+			}
+
+			xw.WriteStartElement ("Rows");
+			xw.WriteAttributeString ("Styles", String.Join (",", styles.ToArray ()));
+			xw.WriteEndElement ();
+
+			xw.WriteEndElement ();
+			xw.WriteEndDocument ();
+			xw.Close ();
+
+			return sw.ToString ();
+
+		}
+
+		public override object ConvertFrom (ITypeDescriptorContext context,
+						    CultureInfo culture,
+						    object value)
+		{
+			if (!(value is string))
+				return base.ConvertFrom(context, culture, value);
+
+			XmlDocument xmldoc = new XmlDocument();
+			xmldoc.LoadXml (value as string);
+			TableLayoutSettings settings = new TableLayoutSettings(new TableLayoutPanel ());
+			int count = ParseControl (xmldoc, settings);
+			ParseColumnStyle (xmldoc, settings);
+			ParseRowStyle (xmldoc, settings);
+			settings.RowCount = count;
+			
+
+			return settings;
+		}
+
+
+		private int ParseControl (XmlDocument xmldoc, TableLayoutSettings settings)
+		{
+			int count = 0;
+			foreach (XmlNode node in xmldoc.GetElementsByTagName ("Control")) {
+				if (node.Attributes["Name"] == null || string.IsNullOrEmpty(node.Attributes["Name"].Value))
+					continue;
+				if (node.Attributes["Row"] != null) {
+					settings.SetRow (node.Attributes["Name"].Value, GetValue (node.Attributes["Row"].Value));
+					count++;
+				}
+				if (node.Attributes["RowSpan"] != null) {
+					settings.SetRowSpan (node.Attributes["Name"].Value, GetValue (node.Attributes["RowSpan"].Value));
+				}
+				if (node.Attributes["Column"] != null)
+					settings.SetColumn (node.Attributes["Name"].Value, GetValue (node.Attributes["Column"].Value));
+				if (node.Attributes["ColumnSpan"] != null)
+					settings.SetColumnSpan (node.Attributes["Name"].Value, GetValue (node.Attributes["ColumnSpan"].Value));
+			}
+			return count;
+		}
+
+		private void ParseColumnStyle (XmlDocument xmldoc, TableLayoutSettings settings)
+		{
+			foreach (XmlNode node in xmldoc.GetElementsByTagName ("Columns")) {
+				if (node.Attributes["Styles"] == null)
+					continue;
+				string styles = node.Attributes["Styles"].Value;
+				if (styles == null)
+					continue;
+				string[] list = styles.Split (',');
+				for (int i = 0; i < list.Length; i+=2) {
+					float width = 0f;
+					SizeType type = (SizeType) Enum.Parse (typeof (SizeType), list[i]);
+					float.TryParse (list[i+1], out width);
+					settings.ColumnStyles.Add (new ColumnStyle (type, width));
+				}				
+			}
+		}
+
+		private void ParseRowStyle (XmlDocument xmldoc, TableLayoutSettings settings)
+		{
+			foreach (XmlNode node in xmldoc.GetElementsByTagName ("Rows")) {
+				if (node.Attributes["Styles"] == null)
+					continue;
+				string styles = node.Attributes["Styles"].Value;
+				if (styles == null)
+					continue;
+				string[] list = styles.Split (',');
+				for (int i = 0; i < list.Length; i += 2) {
+					float height = 0f;
+					SizeType type = (SizeType) Enum.Parse (typeof (SizeType), list[i]);
+					float.TryParse (list[i + 1], out height);
+					settings.RowStyles.Add (new RowStyle (type, height));
+				}
+			}
+		}
+
+		private int GetValue (string attValue)
+		{
+			int val = -1;
+			if (!string.IsNullOrEmpty (attValue)) {
+				int.TryParse (attValue, out val);
+			}
+			return val;
+		}
+	}
+}
+
+#endif

mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog

@@ -1,3 +1,17 @@
+2007-04-24  Andreia Gaita  <[email protected]>
+
+	* TableLayoutSettings.cs: 
+	- Added a GetControls method and a support structure to help the 
+	TypeConverter to enumerate the controls for	serialization. 
+	- Added a new serialization constructor. 
+	- Added a isSerialized flag initialized to true on the 
+	serialization constructor so that the TableLayoutPanel.LayoutSettings 
+	setter does not throw the designed NotSupportedOperation exception
+	when the object is built through deserialization.
+	- Implemented GetObjectData
+	
+	* TableLayoutPanel.cs: Added check on LayoutSettings.
+
 2007-04-24  Carlos Alberto Cortez <[email protected]>
 
 	* ListView.cs: Report Click and DoubleClick events to the parent

mcs/class/Managed.Windows.Forms/System.Windows.Forms/TableLayoutPanel.cs

@@ -116,7 +116,13 @@ namespace System.Windows.Forms
 		[DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
 		public TableLayoutSettings LayoutSettings {
 			get { return this.settings; }
-			set { throw new NotSupportedException (); }
+			set {
+				if (value.isSerialized) {
+					this.settings = value;
+					value.isSerialized = false;
+				} else
+					throw new NotSupportedException ("LayoutSettings value cannot be set directly.");
+			}
 		}
 
 		[Localizable (true)]

mcs/class/Managed.Windows.Forms/System.Windows.Forms/TableLayoutSettings.cs

@@ -49,6 +49,7 @@ namespace System.Windows.Forms
 		private Dictionary<Object, int> rows;
 		private Dictionary<Object, int> row_spans;
 		private TableLayoutPanel panel;
+		internal bool isSerialized;
 
 		#region Internal Constructor
 		internal TableLayoutSettings (TableLayoutPanel panel)
@@ -64,6 +65,26 @@ namespace System.Windows.Forms
 			this.row_spans = new Dictionary<object, int> ();
 			this.panel = panel;
 		}
+
+		private TableLayoutSettings (SerializationInfo serializationInfo, StreamingContext context)
+		{
+			TypeConverter converter = TypeDescriptor.GetConverter (this);
+			string text = serializationInfo.GetString ("SerializedString");
+			if (!string.IsNullOrEmpty (text) && (converter != null)) {
+				TableLayoutSettings settings = converter.ConvertFromInvariantString (text) as TableLayoutSettings;
+				this.column_styles = settings.column_styles;
+				this.row_styles = settings.row_styles;
+				this.grow_style = settings.grow_style;
+				this.column_count = settings.column_count;
+				this.row_count = settings.row_count;
+				this.columns = settings.columns;
+				this.column_spans = settings.column_spans;
+				this.rows = settings.rows;
+				this.row_spans = settings.row_spans;
+				this.panel = settings.panel;
+				this.isSerialized = true;
+			}
+		}
 		#endregion		
 
 		#region Public Properties
@@ -237,12 +258,41 @@ namespace System.Windows.Forms
 		}
 		#endregion
 
+		#region Internal Methods
+		internal List<ControlInfo> GetControls ()
+		{
+			List<ControlInfo> list = new List<ControlInfo>();
+			foreach (KeyValuePair <object, int> control in columns) {
+				ControlInfo info = new ControlInfo();
+				info.Control = control.Key;
+				info.Col = GetColumn(control);
+				info.ColSpan = GetColumnSpan (control);
+				info.Row = GetRow (control);
+				info.RowSpan = GetRowSpan (control);
+				list.Add (info);
+			}
+			return list;
+		}
+
+		#endregion
+
 		#region ISerializable Members
 		void ISerializable.GetObjectData (SerializationInfo info, StreamingContext context)
 		{
-			throw new NotImplementedException ();
+			TableLayoutSettingsTypeConverter conv = new TableLayoutSettingsTypeConverter ();
+			string text = conv.ConvertToInvariantString (this);
+			info.AddValue ("SerializedString", text);
 		}
 		#endregion
 	}
+
+	internal struct ControlInfo
+	{
+		public object Control;
+		public int	Row;
+		public int RowSpan;
+		public int Col;
+		public int ColSpan;
+	}
 }
 #endif