From: jpbruyere <jp.bruyere@hotmail.com>
Date: Wed, 3 Jun 2015 13:11:24 +0000 (+0200)
Subject: - Item template
X-Git-Tag: 0.2~91
X-Git-Url: https://git.osiis.dedyn.io/?a=commitdiff_plain;h=ef87679b886e5ce8b4defc21e3b9eac6c5030663;p=jp%2Fcrow.git

- Item template
- Null binding for template items with "{}"
---

diff --git a/Templates/ItemTemplate.goml b/Templates/ItemTemplate.goml
index e4370966..c35332e9 100755
--- a/Templates/ItemTemplate.goml
+++ b/Templates/ItemTemplate.goml
@@ -1,2 +1,5 @@
 <?xml version="1.0"?>
-<Label Text="{Field}"/>
+<Label Margin="2" Focusable="true" Text="{}" 
+	MouseEnter="{Background=SteelBlue}"
+	MouseLeave="{Background=Transparent}"
+/>
diff --git a/Tests/GOLIBTest_Listbox.cs b/Tests/GOLIBTest_Listbox.cs
index cd7cd83a..624bc2c7 100644
--- a/Tests/GOLIBTest_Listbox.cs
+++ b/Tests/GOLIBTest_Listbox.cs
@@ -17,13 +17,13 @@ using System.Collections.Generic;
 
 namespace test
 {
-	public class ClsItem : IValueChange
+	public class ClsItem
 	{
-		#region IValueChange implementation
-
-		public event EventHandler<ValueChangeEventArgs> ValueChanged;
-
-		#endregion
+//		#region IValueChange implementation
+//
+//		public event EventHandler<ValueChangeEventArgs> ValueChanged;
+//
+//		#endregion
 
 		public string field;
 
@@ -33,7 +33,7 @@ namespace test
 			}
 			set {
 				field = value;
-				ValueChanged.Raise(this, new ValueChangeEventArgs ("Field", null, field));
+				//ValueChanged.Raise(this, new ValueChangeEventArgs ("Field", null, field));
 			}
 		}
 
@@ -56,12 +56,24 @@ namespace test
 			: base(1024, 600,"test")
 		{}
 
-		public List<ClsItem> TestList = new List<ClsItem>(new ClsItem[] 
+//		public List<ClsItem> TestList = new List<ClsItem>(new ClsItem[] 
+//			{
+//				new ClsItem("string 1"),
+//				new ClsItem("string 2"),
+//				new ClsItem("string 3")
+//			});
+		public List<string> TestList = new List<string>(new string[] 
 			{
-				new ClsItem("string 1"),
-				new ClsItem("string 2"),
-				new ClsItem("string 3")
-			});
+				"string 1",
+				"string 2",
+				"string 3"
+			});		
+//		string[] TestList = new string[] 
+//			{
+//				"string 1",
+//				"string 2",
+//				"string 3"
+//			};	
 		ListBox g;
 
 		protected override void OnLoad (EventArgs e)
@@ -69,8 +81,10 @@ namespace test
 			base.OnLoad (e);
 			LoadInterface("Interfaces/test_Listbox.goml", out g);
 
-			ValueChanged.Raise(this, new ValueChangeEventArgs ("TestList", null, TestList));
-			TestList [1].Field = "test string";
+//			TestList [1].Field = "test string";
+//			ValueChanged.Raise(this, new ValueChangeEventArgs ("TestList", null, TestList));
+
+
 		}
 		protected override void OnRenderFrame (FrameEventArgs e)
 		{
diff --git a/src/CompilerServices/CompilerServices.cs b/src/CompilerServices/CompilerServices.cs
index f8bbcdf0..6f00d36d 100644
--- a/src/CompilerServices/CompilerServices.cs
+++ b/src/CompilerServices/CompilerServices.cs
@@ -154,27 +154,41 @@ namespace go
 			evtFi.SetValue(es.Source, del);
 		}
 
-		public static void CreateBinding(DynAttribute binding, object _source)
-		{
-			
+		public static void ResolveBinding(DynAttribute binding, object _source)
+		{			
 			Type srcType = _source.GetType ();
 			Type dstType = binding.Source.GetType ();
 
+			MemberInfo miDst = dstType.GetMember (binding.MemberName).FirstOrDefault ();
 			MemberInfo miSrc = srcType.GetMember (binding.Value).FirstOrDefault();
-			Type srcValueType = null;
-			if (miSrc.MemberType == MemberTypes.Property)
-				srcValueType = (miSrc as PropertyInfo).PropertyType;
-			else if (miSrc.MemberType == MemberTypes.Field) 
-				srcValueType = (miSrc as FieldInfo).FieldType;
-			else
-				throw new Exception("unandled source type for binding");
 
+			//initialize target with actual value
+			if (miDst.MemberType == MemberTypes.Property) {
+				if (miSrc == null)//if no member is provided for binding, source raw value is taken
+					(miDst as PropertyInfo).GetSetMethod ().Invoke (binding.Source, new object[] { _source });
+				else if (miSrc.MemberType == MemberTypes.Property)
+					(miDst as PropertyInfo).GetSetMethod ().Invoke (binding.Source, new object[] { (miSrc as PropertyInfo).GetGetMethod ().Invoke (_source, null) });
+				else if (miSrc.MemberType == MemberTypes.Field)				
+					(miDst as PropertyInfo).GetSetMethod ().Invoke (binding.Source, new object[] { (miSrc as FieldInfo).GetValue (_source) });			
+			} else if (miDst.MemberType == MemberTypes.Field) {
+				if (miSrc == null)//if no member is provided for binding, source raw value is taken
+					(miDst as FieldInfo).SetValue (binding.Source, _source );
+				else if (miSrc.MemberType == MemberTypes.Property)
+					(miDst as FieldInfo).SetValue (binding.Source, (miSrc as PropertyInfo).GetGetMethod ().Invoke (_source, null));
+				else if (miSrc.MemberType == MemberTypes.Field)				
+					(miDst as FieldInfo).SetValue (binding.Source, (miSrc as FieldInfo).GetValue (_source));							
+			}else
+				throw new Exception("unandled destination member type for binding");
+			
 			#region Retrieve EventHandler parameter type
 			EventInfo ei = srcType.GetEvent ("ValueChanged");
+			if (ei == null)
+				return; //no dynamic update if ValueChanged interface is not implemented
+
 			MethodInfo evtInvoke = ei.EventHandlerType.GetMethod ("Invoke");
 			ParameterInfo[] evtParams = evtInvoke.GetParameters ();
-
 			Type handlerArgsType = evtParams [1].ParameterType;
+
 			#endregion
 
 			Type[] args = {typeof(object), handlerArgsType};
@@ -214,7 +228,7 @@ namespace go
 
 			string[] srcLines = binding.Value.Trim().Split (new char[] { ';' });
 			foreach (string srcLine in srcLines) {
-				MethodInfo infoWriteLine = typeof(System.Diagnostics.Debug).GetMethod("WriteLine", new Type[] { typeof(string) });
+				//MethodInfo infoWriteLine = typeof(System.Diagnostics.Debug).GetMethod("WriteLine", new Type[] { typeof(string) });
 
 				string statement = srcLine.Trim ();
 
@@ -232,23 +246,23 @@ namespace go
 				FieldInfo fiNewValue = typeof(ValueChangeEventArgs).GetField("NewValue");
 				il.Emit(OpCodes.Ldfld, fiNewValue);
 
-				PropertyInfo piTarget = dstType.GetProperty(binding.MemberName);
+
 				MethodInfo miToStr = typeof(object).GetMethod("ToString",Type.EmptyTypes);
+				PropertyInfo piTarget = dstType.GetProperty(binding.MemberName);
 
+				Type srcValueType = null;
+				if (miSrc.MemberType == MemberTypes.Property)
+					srcValueType = (miSrc as PropertyInfo).PropertyType;
+				else if (miSrc.MemberType == MemberTypes.Field) 
+					srcValueType = (miSrc as FieldInfo).FieldType;
+				else
+					throw new Exception("unandled source member type for binding");
+				
 				if (!srcValueType.IsValueType)
 					il.Emit(OpCodes.Castclass, srcValueType);
 				if (piTarget.PropertyType == typeof(string))
 					il.Emit(OpCodes.Callvirt, miToStr);
 				il.Emit(OpCodes.Callvirt, piTarget.GetSetMethod());
-
-				//initialize target with actual value
-				if (miSrc.MemberType == MemberTypes.Property)
-					piTarget.GetSetMethod().Invoke(binding.Source, new object[] { (miSrc as PropertyInfo).GetGetMethod().Invoke(_source,null)});
-				else if (miSrc.MemberType == MemberTypes.Field){ 
-					MethodInfo miSetTarget = piTarget.GetSetMethod();
-					FieldInfo fiSource = miSrc as FieldInfo;
-					miSetTarget.Invoke(binding.Source, new object[] { fiSource.GetValue(_source)});
-				}
 			}
 			il.MarkLabel(labFailed);
 			il.Emit(OpCodes.Ret);
diff --git a/src/GraphicObjects/ListBox.cs b/src/GraphicObjects/ListBox.cs
index 869eae2a..1f0ccf5e 100644
--- a/src/GraphicObjects/ListBox.cs
+++ b/src/GraphicObjects/ListBox.cs
@@ -41,22 +41,32 @@ namespace go
 		}
 		#endregion
 
-		IList data;
+		ICollection data;
+		int _selectedIndex;
+
+		public int SelectedIndex{
+			get { return _selectedIndex; }
+			set { _selectedIndex = value; }
+		}
 
 		[XmlAttributeAttribute()][DefaultValue(null)]
-		public IList Data {
+		public ICollection Data {
 			get {
 				return data;
 			}
-			set {
-				if (data == value)
-					return;
-				
+			set {				
 				data = value;
 
-
+				_list.Children.Clear ();
+				if (data == null)
+					return;
 				foreach (var item in data) {
-					_list.addChild(Interface.Load ("#go.Templates.ItemTemplate.goml", item));
+					GraphicObject g = Interface.Load ("#go.Templates.ItemTemplate.goml", item);
+//					g.Tag = item;
+//					g.MouseClick += (object sender, OpenTK.Input.MouseButtonEventArgs e) => {
+//						
+//					};
+					_list.addChild(g);
 
 				}
 			}
diff --git a/src/GraphicObjects/TemplatedControl.cs b/src/GraphicObjects/TemplatedControl.cs
index 7b9db047..df843076 100644
--- a/src/GraphicObjects/TemplatedControl.cs
+++ b/src/GraphicObjects/TemplatedControl.cs
@@ -24,7 +24,7 @@ using System.ComponentModel;
 
 namespace go
 {
-	public abstract class TemplatedControl : Container
+	public abstract class TemplatedControl : Container, IXmlSerializable
 	{
 		public TemplatedControl () : base()
 		{
@@ -52,6 +52,52 @@ namespace go
 			//prevent name searching in template
 			return nameToFind == this.Name ? this : null;
 		}
+
+		#region IXmlSerializable
+
+		public override System.Xml.Schema.XmlSchema GetSchema()
+		{
+			return null;
+		}
+		public override void ReadXml(System.Xml.XmlReader reader)
+		{
+			base.ReadXml(reader);
+
+//			using (System.Xml.XmlReader subTree = reader.ReadSubtree())
+//			{
+//				subTree.Read(); //skip current node
+//				subTree.Read(); //read first child
+//
+//				if (!subTree.IsStartElement())
+//					return;
+//
+//				Type t = Type.GetType("go." + subTree.Name);
+//				GraphicObject go = (GraphicObject)Activator.CreateInstance(t);                                
+//
+//				(go as IXmlSerializable).ReadXml(subTree);
+//
+//				setChild(go);
+//
+//				subTree.Read();
+//
+//				if (!subTree.IsStartElement())
+//					return;
+//
+//			}
+		}
+		public override void WriteXml(System.Xml.XmlWriter writer)
+		{
+			base.WriteXml(writer);
+//
+//			if (child == null)
+//				return;
+//
+//			writer.WriteStartElement(child.GetType().Name);
+//			(child as IXmlSerializable).WriteXml(writer);
+//			writer.WriteEndElement();
+		}
+
+		#endregion
 	}
 }
 
diff --git a/src/Interface.cs b/src/Interface.cs
index 0d0425ed..2b80564f 100644
--- a/src/Interface.cs
+++ b/src/Interface.cs
@@ -103,6 +103,8 @@ namespace go
 		}
 		public static void Load<T>(string file, out T result, object hostClass = null)
 		{
+			//result = (T)(Load (file, hostClass) as object);
+
 			EventsToResolve = new List<DynAttribute>();
 			Bindings = new List<DynAttribute> ();
 
@@ -142,7 +144,7 @@ namespace go
 			while (Bindings.Count > 0) {
 				DynAttribute binding = Bindings [0];
 				Bindings.RemoveAt (0);
-				CompilerServices.CreateBinding (binding, hostClass);
+				CompilerServices.ResolveBinding (binding, hostClass);
 			}
 //			foreach (DynAttribute binding in Bindings) {
 ////				Type tSource = binding.Source.GetType ();
@@ -193,7 +195,7 @@ namespace go
 			while (Bindings.Count > 0) {
 				DynAttribute binding = Bindings [0];
 				Bindings.RemoveAt (0);
-				CompilerServices.CreateBinding (binding, hostClass);
+				CompilerServices.ResolveBinding (binding, hostClass);
 			}
 
 //			foreach (DynAttribute binding in Bindings) {