Simple bindings

demonstration in testFps

8 files changed, 121 insertions, 61 deletions

diff --git a/src/GraphicObjects/Checkbox.cs b/src/GraphicObjects/Checkbox.cs
index 3c25c741..586855d9 100644
--- a/src/GraphicObjects/Checkbox.cs
+++ b/src/GraphicObjects/Checkbox.cs
@@ -242,11 +242,11 @@ namespace go
         public override void ReadXml(System.Xml.XmlReader reader)

         {

             string handler = reader.GetAttribute("OnClick");

-			Interface.EventsToResolve.Add(new EventSource 

+			Interface.EventsToResolve.Add(new DynAttribute 

             { 

                 Source = this, 

-                Handler = handler,

-                EventName = "OnClick"

+                Value = handler,

+                MemberName = "OnClick"

             });

 

             //Container c = this as Container;

diff --git a/src/GraphicObjects/GraphicObject.cs b/src/GraphicObjects/GraphicObject.cs
index a7b9e93e..683e88f3 100644
--- a/src/GraphicObjects/GraphicObject.cs
+++ b/src/GraphicObjects/GraphicObject.cs
@@ -108,6 +108,7 @@ namespace go
 		public event EventHandler<KeyboardKeyEventArgs> KeyUp;

 		public event EventHandler Focused;

 		public event EventHandler Unfocused;

+

 		#endregion

 

 		#region public properties

@@ -641,11 +642,11 @@ namespace go
 				if (string.IsNullOrEmpty (handler))

 					continue;

 					

-				Interface.EventsToResolve.Add(new EventSource 

+				Interface.EventsToResolve.Add(new DynAttribute 

 					{ 

 						Source = this, 

-						Handler = handler,

-						EventName = ei.Name

+						Value = handler,

+						MemberName = ei.Name

 					});

 			}

 			foreach (PropertyInfo pi in this.GetType().GetProperties(BindingFlags.Public | BindingFlags.Instance)) {

@@ -713,6 +714,19 @@ namespace go
 						else

 							pi.SetValue (this, defaultValue, null);

 					} else {

+						if (v.StartsWith("{")) {

+							//binding

+							if (!v.EndsWith("}"))

+								throw new Exception (string.Format("GOML:Malformed binding: {0}", v));

+							

+							string strBinding = v.Substring (1, v.Length - 2);

+							Interface.Bindings.Add (new DynAttribute () {

+								Source = this,

+								MemberName = name,

+								Value = strBinding

+							});

+						}

+

 						if (pi.PropertyType == typeof(string)) {

 							pi.SetValue (this, v, null);

 							continue;

diff --git a/src/GraphicObjects/Group.cs b/src/GraphicObjects/Group.cs
index 7b63156f..a2a04e0b 100644
--- a/src/GraphicObjects/Group.cs
+++ b/src/GraphicObjects/Group.cs
@@ -120,7 +120,10 @@ namespace go
 			return tmp;

 		}

 

-

+		public override void RegisterForLayouting (int layoutType)

+		{

+			base.RegisterForLayouting (layoutType);

+		}

 

 		public override Rectangle ContextCoordinates(Rectangle r){

 			return r + ClientRectangle.Position;

diff --git a/src/GraphicObjects/IValueChange.cs b/src/GraphicObjects/IValueChange.cs
new file mode 100644
index 00000000..4dc886b0
--- /dev/null
+++ b/src/GraphicObjects/IValueChange.cs
@@ -0,0 +1,30 @@
+//
+//  IValueChange.cs
+//
+//  Author:
+//       Jean-Philippe Bruyère <jp.bruyere@hotmail.com>
+//
+//  Copyright (c) 2015 jp
+//
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+using System;
+
+namespace go
+{
+	public interface IValueChange
+	{
+		event EventHandler<ValueChangeEventArgs> ValueChanged;
+	}
+}
+
diff --git a/src/GraphicObjects/Image.cs b/src/GraphicObjects/Image.cs
index aa3ea56d..3858aebc 100755
--- a/src/GraphicObjects/Image.cs
+++ b/src/GraphicObjects/Image.cs
@@ -71,7 +71,6 @@ namespace go
 				hSVG = new Rsvg.Handle (ms.ToArray ());

 				imgSize = new Size (hSVG.Dimensions.Width, hSVG.Dimensions.Height);

 				_imgPath = resId;

-				//loadImage (@"Images/Icons/question_mark.svg");

 			}

 		}

 		//load image via System.Drawing.Bitmap, cairo load png only

diff --git a/src/GraphicObjects/NumericControl.cs b/src/GraphicObjects/NumericControl.cs
index 93aadc84..2eb54bca 100644
--- a/src/GraphicObjects/NumericControl.cs
+++ b/src/GraphicObjects/NumericControl.cs
@@ -13,10 +13,10 @@ namespace go
 		public NumericControl(double minimum, double maximum, double step)
 			: base()
 		{
-			_minValue = minimum;
-			_maxValue = maximum;
-			_smallStep = step;
-			_bigStep = step * 5;
+			minValue = minimum;
+			maxValue = maximum;
+			smallStep = step;
+			bigStep = step * 5;
 		}
 		#endregion
 
@@ -30,54 +30,54 @@ namespace go
 		#endregion
 
 		#region private fields
-		double _actualValue, _minValue, _maxValue, _smallStep, _bigStep;
+		double _actualValue, minValue, maxValue, smallStep, bigStep;
 		#endregion
 
 		#region public properties
 		[XmlAttributeAttribute()][DefaultValue(0)]
 		public virtual double Minimum {
-			get { return _minValue; }
+			get { return minValue; }
 			set {
-				if (_minValue == value)
+				if (minValue == value)
 					return;
 
-				_minValue = value;
+				minValue = value;
 
 			}
 		}
 		[XmlAttributeAttribute()][DefaultValue(10.0)]
 		public virtual double Maximum
 		{
-			get { return _maxValue; }
+			get { return maxValue; }
 			set {
-				if (_maxValue == value)
+				if (maxValue == value)
 					return;
 
-				_maxValue = value;
+				maxValue = value;
 
 			}
 		}
 		[XmlAttributeAttribute()][DefaultValue(0.5)]
 		public virtual double SmallIncrement
 		{
-			get { return _smallStep; }
+			get { return smallStep; }
 			set {
-				if (_smallStep == value)
+				if (smallStep == value)
 					return;
 
-				_smallStep = value;
+				smallStep = value;
 
 			}
 		}
 		[XmlAttributeAttribute()][DefaultValue(2.0)]
 		public virtual double LargeIncrement
 		{
-			get { return _bigStep; }
+			get { return bigStep; }
 			set {
-				if (_bigStep == value)
+				if (bigStep == value)
 					return;
 
-				_bigStep = value;
+				bigStep = value;
 
 			}
 		}
@@ -90,16 +90,16 @@ namespace go
 				if (value == _actualValue)
 					return;
 
-				Decimal oldV = (Decimal)_actualValue;
+				int oldV = Convert.ToInt32(_actualValue);
 
-				if (value < _minValue)
-					_actualValue = _minValue;
-				else if (value > _maxValue)
-					_actualValue = _maxValue;
+				if (value < minValue)
+					_actualValue = minValue;
+				else if (value > maxValue)
+					_actualValue = maxValue;
 				else                    
 					_actualValue = value;
 
-				onValueChanged(this,new ValueChangeEventArgs(oldV,(Decimal)_actualValue));
+				onValueChanged(this,new ValueChangeEventArgs("Value", oldV, Convert.ToInt32( _actualValue)));
 				registerForGraphicUpdate();
 			}
 		}
diff --git a/src/GraphicObjects/Spinner.cs b/src/GraphicObjects/Spinner.cs
new file mode 100644
index 00000000..dcf0d3d4
--- /dev/null
+++ b/src/GraphicObjects/Spinner.cs
@@ -0,0 +1,43 @@
+//
+//  Spinner.cs
+//
+//  Author:
+//       Jean-Philippe Bruyère <jp.bruyere@hotmail.com>
+//
+//  Copyright (c) 2015 jp
+//
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+using System;
+
+namespace go
+{
+	public class Spinner : NumericControl
+	{
+		public Spinner (double minimum, double maximum, double step) : 
+		base (minimum, maximum, step)
+		{
+			butUp = new Button ();
+			butUp.setChild (new Image ("go.Image.Icons.updown.svg"));
+		}
+		public Spinner () : base()
+		{
+		}
+	
+		Button butUp;
+		Button butDown;
+		Label labCpt;
+
+	}
+}
+
diff --git a/src/GraphicObjects/TextBox.cs b/src/GraphicObjects/TextBox.cs
index 20403789..28e7c74c 100644
--- a/src/GraphicObjects/TextBox.cs
+++ b/src/GraphicObjects/TextBox.cs
@@ -15,7 +15,7 @@ namespace go
     public class TextBoxWidget : Label

     {

 		#region CTOR

-		public TextBoxWidget(string _initialValue, GOEvent _onTextChanged = null)

+		public TextBoxWidget(string _initialValue)

 			: base(_initialValue)

 		{

 

@@ -25,19 +25,6 @@ namespace go
 		{ }

 		#endregion

 

-		static bool _capitalOn = false;	//????????????????

-		[XmlIgnore]public static bool capitalOn

-		{

-			get

-			{

-				return _capitalOn;

-					//Keyboard[Key.ShiftLeft] || Keyboard[Key.ShiftRight] ?

-					//!_capitalOn : _capitalOn;

-			}

-			set { _capitalOn = value; }

-		}

-

-

 		#region GraphicObject overrides

 		[XmlIgnore]public override bool HasFocus   //trigger update when lost focus to errase text beam

         {

@@ -71,23 +58,7 @@ namespace go
 		protected override void onDraw (Context gr)

 		{

 			base.onDraw (gr);

-			//			gr.FontOptions.Antialias = Antialias.Subpixel;

-			//			gr.FontOptions.HintMetrics = HintMetrics.On;

-//			gr.SelectFontFace (Font.Name, Font.Slant, Font.Wheight);

-//			gr.SetFontSize (Font.Size);

-

 			FontExtents fe = gr.FontExtents;

-

-

-

-//			gr.MoveTo(rText.X, rText.Y + fe.Ascent);

-//			#if _WIN32 || _WIN64

-//			gr.ShowText(txt);

-//			#elif __linux__

-//			gr.ShowText(Text);

-//			#endif

-//			gr.Fill();

-

 		}

 		#endregion