From 7249a058b2e41a33b7b72c57fb63d716326cc01f Mon Sep 17 00:00:00 2001
From: jpbruyere <jp.bruyere@hotmail.com>
Date: Sat, 4 Apr 2015 15:48:33 +0200
Subject: [PATCH] * MyClass.cs: * Key.cs: * GOLibView.cs: * GOLibGtkHost.cs: *
 Buttons.cs: * DisplayBinding.cs: * MouseState.cs: * AddinInfo.cs: *
 MonoDevelop.GOLib.csproj: * GOLibNodeExtension.cs: * AssemblyInfo.cs: *
 MouseEventArgs.cs: * MonoDevelop.GOLib.addin.xml: * KeyboardKeyEventArgs.cs:
 Monodevelop GOLib Addin

* Tests.csproj:
* test4.xml:
* test3.xml:
* test1.xml:
* test0.xml:
* test5.xml:
* test5.goml:
* test4.goml:
* test3.goml:
* test1.goml:
* test0.goml: change xml to goml extension

* GOLibHost.cs: Generalization for GOLib host application

* OpenTKGameWindow.cs:
* Button.cs:
* Scroller.cs:
* IGOLibHost.cs:
* ILayoutable.cs:
* GraphicObject.cs: Top container + IGOLibHost interface for multiple
  application container implementation

* GOLib.sln:
* GOLib.csproj: MD GOLib addin
---
 GOLib.csproj                                  |   3 +-
 GOLib.sln                                     |  15 +-
 MonoDevelop.GOLib/MonoDevelop.GOLib.addin.xml |  16 +
 MonoDevelop.GOLib/MonoDevelop.GOLib.csproj    |  99 ++++
 MonoDevelop.GOLib/MyClass.cs                  |  12 +
 MonoDevelop.GOLib/Properties/AddinInfo.cs     |  16 +
 MonoDevelop.GOLib/Properties/AssemblyInfo.cs  |  27 +
 MonoDevelop.GOLib/src/DisplayBinding.cs       |  79 +++
 MonoDevelop.GOLib/src/GOLibGtkHost.cs         | 492 ++++++++++++++++++
 MonoDevelop.GOLib/src/GOLibNodeExtension.cs   |  83 +++
 MonoDevelop.GOLib/src/GOLibView.cs            |  95 ++++
 Tests/Interfaces/test0.goml                   |   5 +
 Tests/Interfaces/test0.xml                    |   4 -
 Tests/Interfaces/{test1.xml => test1.goml}    |   0
 Tests/Interfaces/{test3.xml => test3.goml}    |   0
 Tests/Interfaces/{test4.xml => test4.goml}    |   0
 Tests/Interfaces/{test5.xml => test5.goml}    |   0
 Tests/Tests.csproj                            |  14 +-
 src/GraphicObjects/Button.cs                  |   2 +-
 src/GraphicObjects/GraphicObject.cs           |  86 ++-
 src/GraphicObjects/IGOLibHost.cs              |  17 +
 src/GraphicObjects/ILayoutable.cs             |   2 +-
 src/GraphicObjects/Scroller.cs                |   2 +-
 src/OpenTKGameWindow.cs                       | 136 ++---
 24 files changed, 1112 insertions(+), 93 deletions(-)
 create mode 100644 MonoDevelop.GOLib/MonoDevelop.GOLib.addin.xml
 create mode 100644 MonoDevelop.GOLib/MonoDevelop.GOLib.csproj
 create mode 100644 MonoDevelop.GOLib/MyClass.cs
 create mode 100644 MonoDevelop.GOLib/Properties/AddinInfo.cs
 create mode 100644 MonoDevelop.GOLib/Properties/AssemblyInfo.cs
 create mode 100644 MonoDevelop.GOLib/src/DisplayBinding.cs
 create mode 100644 MonoDevelop.GOLib/src/GOLibGtkHost.cs
 create mode 100644 MonoDevelop.GOLib/src/GOLibNodeExtension.cs
 create mode 100644 MonoDevelop.GOLib/src/GOLibView.cs
 create mode 100755 Tests/Interfaces/test0.goml
 delete mode 100755 Tests/Interfaces/test0.xml
 rename Tests/Interfaces/{test1.xml => test1.goml} (100%)
 rename Tests/Interfaces/{test3.xml => test3.goml} (100%)
 rename Tests/Interfaces/{test4.xml => test4.goml} (100%)
 rename Tests/Interfaces/{test5.xml => test5.goml} (100%)
 create mode 100644 src/GraphicObjects/IGOLibHost.cs

diff --git a/GOLib.csproj b/GOLib.csproj
index 98f87430..3b8ed8b9 100644
--- a/GOLib.csproj
+++ b/GOLib.csproj
@@ -91,13 +91,13 @@
     <Compile Include="src\OpenGL\TexturedShader.cs" />
     <Compile Include="src\OpenGL\VertexArrayObject.cs" />
     <Compile Include="src\GraphicObjects\Window.cs" />
+    <Compile Include="src\GraphicObjects\IGOLibHost.cs" />
   </ItemGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Data" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Forms" />
-    <Reference Include="Mono.Cairo" />
     <Reference Include="System.Xml" />
     <Reference Include="OpenTK.Compatibility, Version=1.1.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4">
       <HintPath>dependencies\OpenTK.Compatibility.dll</HintPath>
@@ -112,6 +112,7 @@
       <Package>glib-sharp-3.0</Package>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
+    <Reference Include="Mono.Cairo" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/GOLib.sln b/GOLib.sln
index 6b02199c..6a99e7da 100644
--- a/GOLib.sln
+++ b/GOLib.sln
@@ -5,12 +5,20 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GOLib", "GOLib.csproj", "{C
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests", "Tests\Tests.csproj", "{74289092-9F70-4941-AFCB-DFD7BE2140B6}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.GOLib", "MonoDevelop.GOLib\MonoDevelop.GOLib.csproj", "{E9E14DB5-3C67-4E01-B5C3-4D90D7E31A2E}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.Diagram", "..\MonoDevelop.Diagram\MonoDevelop.Diagram.csproj", "{232716B4-D19D-4FD7-B310-94A98FD926F0}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Linux_x86 = Debug|Linux_x86
 		Release|Linux_x86 = Release|Linux_x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{232716B4-D19D-4FD7-B310-94A98FD926F0}.Debug|Linux_x86.ActiveCfg = Debug|Any CPU
+		{232716B4-D19D-4FD7-B310-94A98FD926F0}.Debug|Linux_x86.Build.0 = Debug|Any CPU
+		{232716B4-D19D-4FD7-B310-94A98FD926F0}.Release|Linux_x86.ActiveCfg = Release|Linux_x86
+		{232716B4-D19D-4FD7-B310-94A98FD926F0}.Release|Linux_x86.Build.0 = Release|Linux_x86
 		{74289092-9F70-4941-AFCB-DFD7BE2140B6}.Debug|Linux_x86.ActiveCfg = Debug|Linux_x86
 		{74289092-9F70-4941-AFCB-DFD7BE2140B6}.Debug|Linux_x86.Build.0 = Debug|Linux_x86
 		{74289092-9F70-4941-AFCB-DFD7BE2140B6}.Release|Linux_x86.ActiveCfg = Release|Linux_x86
@@ -19,8 +27,9 @@ Global
 		{C2980F9B-4798-4C05-99E2-E174810F7C7B}.Debug|Linux_x86.Build.0 = Debug|Linux_x86
 		{C2980F9B-4798-4C05-99E2-E174810F7C7B}.Release|Linux_x86.ActiveCfg = Release|Linux_x86
 		{C2980F9B-4798-4C05-99E2-E174810F7C7B}.Release|Linux_x86.Build.0 = Release|Linux_x86
-	EndGlobalSection
-	GlobalSection(MonoDevelopProperties) = preSolution
-		StartupItem = Tests\Tests.csproj
+		{E9E14DB5-3C67-4E01-B5C3-4D90D7E31A2E}.Debug|Linux_x86.ActiveCfg = Debug|Any CPU
+		{E9E14DB5-3C67-4E01-B5C3-4D90D7E31A2E}.Debug|Linux_x86.Build.0 = Debug|Any CPU
+		{E9E14DB5-3C67-4E01-B5C3-4D90D7E31A2E}.Release|Linux_x86.ActiveCfg = Release|Any CPU
+		{E9E14DB5-3C67-4E01-B5C3-4D90D7E31A2E}.Release|Linux_x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 EndGlobal
diff --git a/MonoDevelop.GOLib/MonoDevelop.GOLib.addin.xml b/MonoDevelop.GOLib/MonoDevelop.GOLib.addin.xml
new file mode 100644
index 00000000..5dcac153
--- /dev/null
+++ b/MonoDevelop.GOLib/MonoDevelop.GOLib.addin.xml
@@ -0,0 +1,16 @@
+<ExtensionModel>	
+	<Extension path = "/MonoDevelop/Ide/DisplayBindings">			
+		<DisplayBinding
+			id = "GOLib designer"
+			insertafter ="AssemblyBrowser" 
+			class = "MonoDevelop.GOLib.GOLibDisplayBinding" />
+	</Extension>
+	<Extension path = "/MonoDevelop/Ide/Pads/ProjectPad">
+		<NodeBuilder id = "GOLibNodeExtension" class = "MonoDevelop.GOLib.GOLibNodeExtension"/>
+	</Extension>
+	<Extension path = "/MonoDevelop/Core/MimeTypes">
+		<MimeType id="text/x-goml" _description="GOlib interface definition" icon="md-csharp-file" isText="false">
+			<File pattern="*.goml" />
+		</MimeType>
+	</Extension>
+</ExtensionModel>
\ No newline at end of file
diff --git a/MonoDevelop.GOLib/MonoDevelop.GOLib.csproj b/MonoDevelop.GOLib/MonoDevelop.GOLib.csproj
new file mode 100644
index 00000000..009c9a02
--- /dev/null
+++ b/MonoDevelop.GOLib/MonoDevelop.GOLib.csproj
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{E9E14DB5-3C67-4E01-B5C3-4D90D7E31A2E}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <RootNamespace>MonoDevelop.GOLib</RootNamespace>
+    <AssemblyName>MonoDevelop.GOLib</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <CustomCommands>
+      <CustomCommands>
+        <Command type="Execute" command="/usr/local/lib/monodevelop/bin/MonoDevelop.exe" workingdir="/usr/local/lib/monodevelop/bin/">
+          <EnvironmentVariables>
+            <Variable name="MONODEVELOP_DEV_ADDINS" value="${TargetDir}" />
+          </EnvironmentVariables>
+        </Command>
+      </CustomCommands>
+    </CustomCommands>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>build</OutputPath>
+    <DefineConstants>DEBUG;</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <ConsolePause>false</ConsolePause>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>full</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>build</OutputPath>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <ConsolePause>false</ConsolePause>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="ICSharpCode.NRefactory">
+      <HintPath>..\..\..\..\..\opt\lib\monodevelop\bin\ICSharpCode.NRefactory.dll</HintPath>
+    </Reference>
+    <Reference Include="Mono.Addins">
+      <Package>mono-addins</Package>
+    </Reference>
+    <Reference Include="MonoDevelop.Core">
+      <HintPath>..\..\..\..\..\opt\lib\monodevelop\bin\MonoDevelop.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="MonoDevelop.Ide">
+      <HintPath>..\..\..\..\..\opt\lib\monodevelop\bin\MonoDevelop.Ide.dll</HintPath>
+    </Reference>
+    <Reference Include="Mono.Cairo" />
+    <Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
+      <Package>gtk-sharp-2.0</Package>
+    </Reference>
+    <Reference Include="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
+      <Package>gtk-sharp-2.0</Package>
+    </Reference>
+    <Reference Include="atk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
+      <Package>gtk-sharp-2.0</Package>
+    </Reference>
+    <Reference Include="glib-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
+      <Package>glib-sharp-2.0</Package>
+    </Reference>
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="OpenTK, Version=1.1.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4">
+      <HintPath>..\dependencies\OpenTK.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Drawing" />
+    <Reference Include="MonoDevelop.DesignerSupport">
+      <HintPath>..\..\..\..\..\usr\local\lib\monodevelop\AddIns\MonoDevelop.DesignerSupport\MonoDevelop.DesignerSupport.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Properties\AddinInfo.cs" />
+    <Compile Include="src\DisplayBinding.cs" />
+    <Compile Include="src\GOLibView.cs" />
+    <Compile Include="src\GOLibNodeExtension.cs" />
+    <Compile Include="src\GOLibGtkHost.cs" />
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <ItemGroup>
+    <Folder Include="src\" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="MonoDevelop.GOLib.addin.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\GOLib.csproj">
+      <Project>{C2980F9B-4798-4C05-99E2-E174810F7C7B}</Project>
+      <Name>GOLib</Name>
+    </ProjectReference>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/MonoDevelop.GOLib/MyClass.cs b/MonoDevelop.GOLib/MyClass.cs
new file mode 100644
index 00000000..4ffb796b
--- /dev/null
+++ b/MonoDevelop.GOLib/MyClass.cs
@@ -0,0 +1,12 @@
+using System;
+
+namespace MonoDevelop.GOLib
+{
+	public class MyClass
+	{
+		public MyClass ()
+		{
+		}
+	}
+}
+
diff --git a/MonoDevelop.GOLib/Properties/AddinInfo.cs b/MonoDevelop.GOLib/Properties/AddinInfo.cs
new file mode 100644
index 00000000..f5af5b8d
--- /dev/null
+++ b/MonoDevelop.GOLib/Properties/AddinInfo.cs
@@ -0,0 +1,16 @@
+
+using System;
+using Mono.Addins;
+using Mono.Addins.Description;
+
+[assembly:Addin ("GOLib", 
+        Namespace = "MonoDevelop",
+        Version = MonoDevelop.BuildInfo.Version,
+        Category = "IDE extensions")]
+
+[assembly:AddinName ("MonoDevelop GOLib interface designer")]
+[assembly:AddinDescription ("")]
+
+[assembly:AddinDependency ("Core", MonoDevelop.BuildInfo.Version)]
+[assembly:AddinDependency ("Ide", MonoDevelop.BuildInfo.Version)]
+[assembly:AddinDependency ("Debugger", MonoDevelop.BuildInfo.Version)]
diff --git a/MonoDevelop.GOLib/Properties/AssemblyInfo.cs b/MonoDevelop.GOLib/Properties/AssemblyInfo.cs
new file mode 100644
index 00000000..117b1534
--- /dev/null
+++ b/MonoDevelop.GOLib/Properties/AssemblyInfo.cs
@@ -0,0 +1,27 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+
+// Information about this assembly is defined by the following attributes.
+// Change them to the values specific to your project.
+
+[assembly: AssemblyTitle ("MonoDevelop.GOLib")]
+[assembly: AssemblyDescription ("GOLib interface designer for MonoDevelop")]
+[assembly: AssemblyConfiguration ("")]
+[assembly: AssemblyCompany ("")]
+[assembly: AssemblyProduct ("")]
+[assembly: AssemblyCopyright ("jp")]
+[assembly: AssemblyTrademark ("")]
+[assembly: AssemblyCulture ("")]
+
+// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}".
+// The form "{Major}.{Minor}.*" will automatically update the build and revision,
+// and "{Major}.{Minor}.{Build}.*" will update just the revision.
+
+[assembly: AssemblyVersion ("1.0.*")]
+
+// The following attributes are used to specify the signing key for the assembly,
+// if desired. See the Mono documentation for more information about signing.
+
+//[assembly: AssemblyDelaySign(false)]
+//[assembly: AssemblyKeyFile("")]
+
diff --git a/MonoDevelop.GOLib/src/DisplayBinding.cs b/MonoDevelop.GOLib/src/DisplayBinding.cs
new file mode 100644
index 00000000..7749fb60
--- /dev/null
+++ b/MonoDevelop.GOLib/src/DisplayBinding.cs
@@ -0,0 +1,79 @@
+//
+//  DisplayBinding.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 Lesser 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 Lesser General Public License for more details.
+//
+//  You should have received a copy of the GNU Lesser General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+// 
+// DisplayBinding.cs
+//  
+// Author:
+//       Mike Krüger <mkrueger@novell.com>
+// 
+// Copyright (c) 2009 Novell, Inc (http://www.novell.com)
+// 
+// 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.
+
+using System.IO;
+using MonoDevelop.Core;
+using MonoDevelop.Ide.Gui;
+using MonoDevelop.Projects;
+using System.Globalization;
+using System.Diagnostics;
+
+namespace MonoDevelop.GOLib
+{
+	class GOLibDisplayBinding : IViewDisplayBinding
+	{
+		bool canHandle = false;
+
+		public string Name {
+			get {
+				return GettextCatalog.GetString ("GOLib designer");
+			}
+		}
+		public bool CanUseAsDefault 
+		{ get { return canHandle; } }
+
+		public IViewContent CreateContent (FilePath fileName, string mimeType, Project ownerProject)
+		{			
+			return new GOLibView ();
+		}
+		public bool CanHandle (FilePath fileName, string mimeType, Project ownerProject)
+		{			
+			canHandle = mimeType.StartsWith("text/x-goml");
+			return true;
+		}		
+	}
+}
diff --git a/MonoDevelop.GOLib/src/GOLibGtkHost.cs b/MonoDevelop.GOLib/src/GOLibGtkHost.cs
new file mode 100644
index 00000000..03c96220
--- /dev/null
+++ b/MonoDevelop.GOLib/src/GOLibGtkHost.cs
@@ -0,0 +1,492 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using go;
+using MonoDevelop.Core;
+using MonoDevelop.Ide;
+using MonoDevelop.Projects;
+using System.Diagnostics;
+using OpenTK.Input;
+using MonoDevelop.DesignerSupport;
+
+namespace MonoDevelop.GOLib
+{
+	public class GOLibGtkHost : Gtk.DrawingArea, ILayoutable, IGOLibHost, IPropertyPadProvider
+	{
+		#region IPropertyPadProvider implementation
+
+		public object GetActiveComponent ()
+		{
+			return activeWidget;
+		}
+		public object GetProvider ()
+		{
+			return activeWidget;
+		}
+		public void OnEndEditing (object obj)
+		{
+
+		}
+		public void OnChanged (object obj)
+		{
+
+		}
+		#endregion
+	
+		string _path;
+		GraphicObject goWidget;
+
+		public GOLibGtkHost ()
+		{
+			this.ExposeEvent += onExpose;
+			this.ButtonPressEvent += GOLibGtkHost_ButtonPressEvent;
+			this.ButtonReleaseEvent += GOLibGtkHost_ButtonReleaseEvent;
+			this.MotionNotifyEvent += GOLibGtkHost_MotionNotifyEvent;
+
+			this.Events |= Gdk.EventMask.ButtonPressMask | Gdk.EventMask.ButtonReleaseMask |
+				Gdk.EventMask.PointerMotionMask | Gdk.EventMask.PointerMotionHintMask;
+		}
+		static double[] dashed = {2.0};
+
+		void onExpose(object o, Gtk.ExposeEventArgs args)
+		{
+			Gtk.DrawingArea area = (Gtk.DrawingArea) o;
+			Cairo.Context cr =  Gdk.CairoHelper.Create(area.GdkWindow);
+			_redrawClip.AddRectangle (this.ClientRectangle);
+			update (cr);
+
+			if (_hoverWidget != null) {
+				cr.Rectangle (_hoverWidget.ScreenCoordinates(_hoverWidget.getSlot ()));
+				cr.LineWidth = 1;
+				cr.SetDash (dashed, 0);
+				cr.Color = go.Color.Yellow;
+				cr.Stroke ();
+			}
+			((IDisposable) cr.Target).Dispose();                                      
+			((IDisposable) cr).Dispose();
+		}
+		// TODO: should find a more safer way to link gtk button to otk.
+		void GOLibGtkHost_ButtonPressEvent (object o, Gtk.ButtonPressEventArgs args)
+		{
+			MouseButtonEventArgs e = new MouseButtonEventArgs 
+				((int)args.Event.X, (int)args.Event.Y, 
+					gtkButtonIdToOpenTkButton(args.Event.Button), true);
+			activeWidget = hoverWidget;
+			DesignerSupport.DesignerSupport.Service.SetPadContent (this);
+		}
+		void GOLibGtkHost_ButtonReleaseEvent (object o, Gtk.ButtonReleaseEventArgs args)
+		{
+			MouseButtonEventArgs e = new MouseButtonEventArgs 
+				((int)args.Event.X, (int)args.Event.Y, 
+					gtkButtonIdToOpenTkButton(args.Event.Button), false);			
+		}
+		int lastX,LastY;
+		void GOLibGtkHost_MotionNotifyEvent (object o, Gtk.MotionNotifyEventArgs args)
+		{
+			
+			Mouse_Move(this, new MouseMoveEventArgs (
+				(int)args.Event.X,(int)args.Event.Y,
+				(int)args.Event.X-lastX, (int)args.Event.Y-LastY
+			));
+			lastX = (int)args.Event.X;
+			LastY = (int)args.Event.Y;
+
+			QueueDraw ();
+		}
+
+		MouseButton gtkButtonIdToOpenTkButton(uint gtkMouseButton)
+		{
+			switch (gtkMouseButton) {
+			case 1:
+				return MouseButton.Left;
+			case 2:
+				return MouseButton.Middle;
+			case 3:
+				return MouseButton.Right;
+			case 4:
+				return MouseButton.Button4;
+			case 5:
+				return MouseButton.Button5;
+			}
+			return MouseButton.LastButton;
+		}
+
+
+
+		public void Load(string path)
+		{
+			goWidget = GraphicObject.Load (path);
+			this.AddWidget (goWidget);
+		}
+
+
+
+		public List<GraphicObject> GraphicObjects = new List<GraphicObject>();
+		public Color Background = Color.Transparent;
+
+		Rectangles _redrawClip = new Rectangles();//should find another way to access it from child
+		List<GraphicObject> _gobjsToRedraw = new List<GraphicObject>();
+
+		public Rectangles redrawClip {
+			get {
+				return _redrawClip;
+			}
+			set {
+				_redrawClip = value;
+			}
+		}
+		public List<GraphicObject> gobjsToRedraw {
+			get {
+				return _gobjsToRedraw;
+			}
+			set {
+				_gobjsToRedraw = value;
+			}
+		}			
+
+		#region focus
+
+		GraphicObject _activeWidget;	//button is pressed on widget 
+		GraphicObject _hoverWidget;		//mouse is over
+		GraphicObject _focusedWidget;	//has keyboard (or other perif) focus 
+
+		public GraphicObject activeWidget
+		{
+			get { return _activeWidget; }
+			set 
+			{
+				if (_activeWidget == value)
+					return;
+
+				_activeWidget = value;
+			}
+		}
+		public GraphicObject hoverWidget
+		{
+			get { return _hoverWidget; }
+			set { _hoverWidget = value; }
+		}
+		public GraphicObject FocusedWidget {
+			get { return _focusedWidget; }
+			set {
+				if (_focusedWidget == value)
+					return;
+				if (_focusedWidget != null)
+					_focusedWidget.onUnfocused (this, null);
+				_focusedWidget = value;
+				_focusedWidget.onFocused (this, null);
+			}
+		}
+
+		#endregion
+
+		Rectangle dirtyZone = Rectangle.Empty;
+
+		#region Chrono's
+		public Stopwatch updateTime = new Stopwatch ();
+		public Stopwatch layoutTime = new Stopwatch ();
+		public Stopwatch guTime = new Stopwatch ();
+		public Stopwatch drawingTime = new Stopwatch ();
+		#endregion
+
+		void update (Cairo.Context ctx)
+		{
+			updateTime.Restart ();
+			layoutTime.Reset ();
+			guTime.Reset ();
+			drawingTime.Reset ();
+
+			GraphicObject[] invGOList = new GraphicObject[GraphicObjects.Count];
+			GraphicObjects.CopyTo (invGOList,0);
+			invGOList = invGOList.Reverse ().ToArray ();
+
+			foreach (GraphicObject p in invGOList) {
+				if (p.Visible) {
+					layoutTime.Start ();
+					while(!p.LayoutIsValid)
+						p.UpdateLayout ();
+					layoutTime.Stop ();
+				}
+			}
+
+			GraphicObject[] gotr = new GraphicObject[_gobjsToRedraw.Count];
+			_gobjsToRedraw.CopyTo (gotr);
+			_gobjsToRedraw.Clear ();
+			foreach (GraphicObject p in gotr) {
+				p.registerClipRect ();
+			}
+
+
+			lock (_redrawClip) {
+				if (_redrawClip.count > 0) {
+					//					#if DEBUG_CLIP_RECTANGLE
+					//					redrawClip.stroke (ctx, new Color(1.0,0,0,0.3));
+					//					#endif
+					_redrawClip.clearAndClip (ctx);//rajouté après, tester si utile
+					//Link.draw (ctx);
+					foreach (GraphicObject p in invGOList) {
+						if (p.Visible) {
+							drawingTime.Start ();
+
+							ctx.Save ();
+							if (_redrawClip.count > 0) {
+								Rectangles clip = _redrawClip.intersectingRects (p.ContextCoordinates(p.Slot.Size));
+
+								if (clip.count > 0)
+									p.Paint (ref ctx, clip);
+							}
+							ctx.Restore ();
+
+							drawingTime.Stop ();
+						}
+					}
+					ctx.ResetClip ();
+					dirtyZone = _redrawClip.Bounds;
+					//					#if DEBUG_CLIP_RECTANGLE
+					//					redrawClip.stroke (ctx, Color.Red.AdjustAlpha(0.1));
+					//					#endif
+					_redrawClip.Reset ();
+				}
+			}
+			//			if (ToolTip.isVisible) {
+			//				ToolTip.panel.processkLayouting();
+			//				if (ToolTip.panel.layoutIsValid)
+			//					ToolTip.panel.Paint(ref ctx);
+			//			}
+			//			Debug.WriteLine("INTERFACE: layouting: {0} ticks \t graphical update {1} ticks \t drawing {2} ticks",
+			//			    layoutTime.ElapsedTicks,
+			//			    guTime.ElapsedTicks,
+			//			    drawingTime.ElapsedTicks);
+			//			Debug.WriteLine("INTERFACE: layouting: {0} ms \t graphical update {1} ms \t drawing {2} ms",
+			//			    layoutTime.ElapsedMilliseconds,
+			//			    guTime.ElapsedMilliseconds,
+			//			    drawingTime.ElapsedMilliseconds);
+			updateTime.Stop ();
+			//			Debug.WriteLine("UPDATE: {0} ticks \t, {1} ms",
+			//				updateTime.ElapsedTicks,
+			//				updateTime.ElapsedMilliseconds);
+
+		}						
+
+		public void AddWidget(GraphicObject g)
+		{
+			g.Parent = this;
+			GraphicObjects.Add (g);
+		}
+		public void DeleteWidget(GraphicObject g)
+		{
+			g.Visible = false;//trick to ensure clip is added to refresh zone
+			GraphicObjects.Remove (g);
+		}
+
+		public void LoadInterface<T>(string path, out T result)
+		{
+			GraphicObject.Load<T> (path, out result, this);
+			AddWidget (result as GraphicObject);
+		}
+		public T LoadInterface<T> (string Path)
+		{
+			T result;
+			GraphicObject.Load<T> (Path, out result, this);
+			AddWidget (result as GraphicObject);
+			return result;
+		}
+
+
+
+		public void PutOnTop(GraphicObject g)
+		{
+			if (GraphicObjects.IndexOf(g) > 0)
+			{
+				GraphicObjects.Remove(g);
+				GraphicObjects.Insert(0, g);
+			}
+		}
+
+		#region Mouse Handling
+		void Mouse_Move(object sender, MouseMoveEventArgs e)
+		{
+			if (_activeWidget != null) {
+				//send move evt even if mouse move outside bounds
+				_activeWidget.onMouseMove (this, e);
+				return;
+			}
+
+			if (_hoverWidget != null) {
+				if (_hoverWidget.MouseIsIn (e.Position)) {
+					_hoverWidget.onMouseMove (this, e);
+					return;
+				} else {
+					_hoverWidget.onMouseLeave (this, e);
+					//seek upward from last focused graph obj's
+					while (_hoverWidget.Parent as GraphicObject!=null) {
+						_hoverWidget = _hoverWidget.Parent as GraphicObject;
+						if (_hoverWidget.MouseIsIn (e.Position)) {
+							_hoverWidget.onMouseMove (this, e);
+							return;
+						} else
+							_hoverWidget.onMouseLeave (this, e);
+					}
+				}
+			}
+
+			//top level graphic obj's parsing
+			for (int i = 0; i < GraphicObjects.Count; i++) {
+				GraphicObject g = GraphicObjects[i];
+				if (g.MouseIsIn (e.Position)) {
+					g.onMouseMove (this, e);
+					PutOnTop (g);
+					return;
+				}
+			}
+			_hoverWidget = null;
+		}
+		void Mouse_ButtonUp(object sender, MouseButtonEventArgs e)
+		{
+			if (_activeWidget == null)
+				return;
+
+			_activeWidget.onMouseButtonUp (this, e);
+			_activeWidget = null;
+		}
+		void Mouse_ButtonDown(object sender, MouseButtonEventArgs e)
+		{
+			if (_hoverWidget == null) {
+				return;
+			}
+
+			GraphicObject g = _hoverWidget;
+			while (!g.Focusable) {
+				g = g.Parent as GraphicObject;
+				if (g == null) {					
+					return;
+				}
+			}
+
+			_activeWidget = g;
+			_activeWidget.onMouseButtonDown (this, e);
+		}
+		void Mouse_WheelChanged(object sender, MouseWheelEventArgs e)
+		{
+			if (_hoverWidget == null) {
+				return;
+			}
+			_hoverWidget.onMouseWheel (this, e);
+		}        
+		#endregion
+
+		#region keyboard Handling
+		void Keyboard_KeyDown(object sender, KeyboardKeyEventArgs e)
+		{
+			if (_focusedWidget == null)
+				return;
+			_focusedWidget.onKeyDown (sender, e);
+		}
+		#endregion
+		
+
+		#region ILayoutable implementation
+
+		public Rectangle ContextCoordinates (Rectangle r)
+		{
+			return r;
+		}
+		public Rectangle ScreenCoordinates (Rectangle r)
+		{
+			return r;
+		}
+
+		public ILayoutable Parent {
+			get {
+				return null;
+			}
+			set {
+				throw new NotImplementedException ();
+			}
+		}
+
+		public bool SizeIsValid {
+			get { return true; }
+			set { throw new NotImplementedException ();	}
+		}
+		public bool PositionIsValid {
+			get {
+				return true;
+			}
+			set {
+				throw new NotImplementedException ();
+			}
+		}
+		public bool LayoutIsValid {
+			get {
+				return true;//tester tout les enfants a mon avis
+			}
+			set {
+				throw new NotImplementedException ();
+			}
+		}
+
+		public Rectangle ClientRectangle {
+			get {			
+				return new go.Size(Allocation.Width,Allocation.Height);
+			}
+		}
+
+		public IGOLibHost TopContainer {
+			get { return this as IGOLibHost; }
+		}
+
+		public Rectangle getSlot ()
+		{
+			return ClientRectangle;
+		}
+		public Rectangle getBounds ()//redundant but fill ILayoutable implementation
+		{
+			return ClientRectangle;
+		}
+
+		public bool WIsValid {
+			get {
+				return true;
+			}
+			set {
+				throw new NotImplementedException ();
+			}
+		}
+		public bool HIsValid {
+			get {
+				return true;
+			}
+			set {
+				throw new NotImplementedException ();
+			}
+		}
+		public bool XIsValid {
+			get {
+				return true;
+			}
+			set {
+				throw new NotImplementedException ();
+			}
+		}
+		public bool YIsValid {
+			get {
+				return true;
+			}
+			set {
+				throw new NotImplementedException ();
+			}
+		}
+
+		public virtual void InvalidateLayout ()
+		{
+			//			foreach (GraphicObject g in GraphicObjects) {
+			//				g.InvalidateLayout ();
+			//			}
+		}
+
+		#endregion
+	}
+}
+
diff --git a/MonoDevelop.GOLib/src/GOLibNodeExtension.cs b/MonoDevelop.GOLib/src/GOLibNodeExtension.cs
new file mode 100644
index 00000000..0d0a42b5
--- /dev/null
+++ b/MonoDevelop.GOLib/src/GOLibNodeExtension.cs
@@ -0,0 +1,83 @@
+// 
+// ImageViewerNodeExtension.cs
+//  
+// Author:
+//       Mike Krüger <mkrueger@novell.com>
+// 
+// Copyright (c) 2010 Novell, Inc (http://www.novell.com)
+// 
+// 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.
+
+using System;
+using MonoDevelop.Projects;
+using MonoDevelop.Ide.Gui.Components;
+using MonoDevelop.Components;
+using MonoDevelop.Components.Commands;
+using MonoDevelop.Ide;
+
+namespace MonoDevelop.GOLib
+{
+	enum Commands {
+		ShowGOLibViewer
+	}
+	
+	class GOLibNodeExtension : NodeBuilderExtension
+	{		
+		public override Type CommandHandlerType {
+			get { return typeof(GOLibCommandHandler); }
+		}
+		public override bool CanBuildNode (Type dataType)
+		{			
+			return typeof(ProjectFile).IsAssignableFrom (dataType);
+		}
+		public override void BuildNode (ITreeBuilder treeBuilder, object dataObject, NodeInfo nodeInfo)
+		{
+			ProjectFile pf  = dataObject as ProjectFile;
+
+//			string mimeType = DesktopService.GetMimeTypeForUri (pf.FilePath);
+//			if (mimeType.StartsWith ("image/", StringComparison.CurrentCultureIgnoreCase)) {
+//				Image i;
+//				if (pf != null) {				
+//					i = Image.FromFile (pf.FilePath);
+//					nodeInfo.Icon = i.Scale (16.0 / i.Width, 16.0 / i.Height);
+//				}
+//			}
+
+			base.BuildNode (treeBuilder, dataObject, nodeInfo);
+		} 
+	}
+	
+	class GOLibCommandHandler: NodeCommandHandler 
+	{
+		[CommandHandler (Commands.ShowGOLibViewer)]
+		protected void OnShowGOLibViewer () 
+		{
+
+			GOLibView view = new GOLibView ();
+
+			ProjectFile file   = CurrentNode.DataItem as ProjectFile;
+			if (file != null)
+				view.Load (file.FilePath);
+			
+			IdeApp.Workbench.OpenDocument (view, true);
+		}
+	}
+
+}
+
diff --git a/MonoDevelop.GOLib/src/GOLibView.cs b/MonoDevelop.GOLib/src/GOLibView.cs
new file mode 100644
index 00000000..5c3d8f23
--- /dev/null
+++ b/MonoDevelop.GOLib/src/GOLibView.cs
@@ -0,0 +1,95 @@
+//
+//  ImageViewer.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 Lesser 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 Lesser General Public License for more details.
+//
+//  You should have received a copy of the GNU Lesser General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+// 
+// HexEditorView.cs
+//  
+// Author:
+//       Mike Krüger <mkrueger@novell.com>
+// 
+// Copyright (c) 2009 Novell, Inc (http://www.novell.com)
+// 
+// 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.
+
+using System;
+using System.IO;
+using MonoDevelop.Ide.Gui;
+using MonoDevelop.Ide.Gui.Content;
+using MonoDevelop.Ide.Fonts;
+using Mono.Addins;
+using MonoDevelop.Core;
+using MonoDevelop.Ide;
+using go;
+using MonoDevelop.DesignerSupport;
+
+namespace MonoDevelop.GOLib
+{
+	class GOLibView : AbstractViewContent
+	{
+		GOLibGtkHost gtkGoWidgetHost;
+
+
+		double zoom = 1.0;
+		
+		public override Gtk.Widget Control {
+			get {
+				return gtkGoWidgetHost;
+			}
+		}
+
+		public GOLibView ()
+		{			
+			gtkGoWidgetHost = new GOLibGtkHost ();
+		}
+
+		public override void Load (string fileName)
+		{							
+			gtkGoWidgetHost.Load (fileName);
+			ContentName = fileName;
+			this.IsDirty = false;
+			gtkGoWidgetHost.Show ();
+		}
+		public override bool CanReuseView (string fileName)
+		{
+			return base.CanReuseView (fileName);
+		}
+		public override void RedrawContent ()
+		{
+			base.RedrawContent ();
+		}
+	}
+}
diff --git a/Tests/Interfaces/test0.goml b/Tests/Interfaces/test0.goml
new file mode 100755
index 00000000..3163cc9a
--- /dev/null
+++ b/Tests/Interfaces/test0.goml
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<GraphicObject 
+			Top="10" Left="10"
+			Width="10" Height="50" 
+			Margin="10" Background="Green"/>
diff --git a/Tests/Interfaces/test0.xml b/Tests/Interfaces/test0.xml
deleted file mode 100755
index a87411c7..00000000
--- a/Tests/Interfaces/test0.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0"?>
-<GraphicObject 
-			Width="100" Height="50" 
-			BorderWidth="10" Margin="10" Background="Green"/>
diff --git a/Tests/Interfaces/test1.xml b/Tests/Interfaces/test1.goml
similarity index 100%
rename from Tests/Interfaces/test1.xml
rename to Tests/Interfaces/test1.goml
diff --git a/Tests/Interfaces/test3.xml b/Tests/Interfaces/test3.goml
similarity index 100%
rename from Tests/Interfaces/test3.xml
rename to Tests/Interfaces/test3.goml
diff --git a/Tests/Interfaces/test4.xml b/Tests/Interfaces/test4.goml
similarity index 100%
rename from Tests/Interfaces/test4.xml
rename to Tests/Interfaces/test4.goml
diff --git a/Tests/Interfaces/test5.xml b/Tests/Interfaces/test5.goml
similarity index 100%
rename from Tests/Interfaces/test5.xml
rename to Tests/Interfaces/test5.goml
diff --git a/Tests/Tests.csproj b/Tests/Tests.csproj
index c02c0094..4570715f 100644
--- a/Tests/Tests.csproj
+++ b/Tests/Tests.csproj
@@ -9,7 +9,7 @@
     <OutputType>Exe</OutputType>
     <RootNamespace>Tests</RootNamespace>
     <AssemblyName>Tests</AssemblyName>
-    <StartupObject>test.GOLIBTest_4</StartupObject>
+    <StartupObject>test.GOLIBTest_0</StartupObject>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <OutputPath>..\bin\$(configuration)</OutputPath>
     <IntermediateOutputPath>obj\$(configuration)</IntermediateOutputPath>
@@ -60,22 +60,22 @@
     <Compile Include="GOLIBTest_1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Interfaces\test0.xml">
+    <None Include="image\u.svg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="Interfaces\test5.xml">
+    <None Include="Interfaces\test1.goml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="Interfaces\test4.xml">
+    <None Include="Interfaces\test3.goml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="Interfaces\test3.xml">
+    <None Include="Interfaces\test4.goml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="image\u.svg">
+    <None Include="Interfaces\test5.goml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="Interfaces\test1.xml">
+    <None Include="Interfaces\test0.goml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
diff --git a/src/GraphicObjects/Button.cs b/src/GraphicObjects/Button.cs
index c0c12565..e4987fda 100755
--- a/src/GraphicObjects/Button.cs
+++ b/src/GraphicObjects/Button.cs
@@ -13,7 +13,7 @@ using System.ComponentModel;
 
 namespace go
 {
-    public class Button : Container
+    public class Button : Container, IXmlSerializable
     {
 		#region CTOR
         public Button() : base()
diff --git a/src/GraphicObjects/GraphicObject.cs b/src/GraphicObjects/GraphicObject.cs
index 935729f2..86cb3009 100755
--- a/src/GraphicObjects/GraphicObject.cs
+++ b/src/GraphicObjects/GraphicObject.cs
@@ -14,6 +14,8 @@ using System.Xml.Serialization;
 using System.Reflection;
 using System.ComponentModel;
 using System.IO;
+//using System.Xml;
+using System.Xml;
 
 namespace go
 {
@@ -52,6 +54,8 @@ namespace go
 		bool yIsValid = false;
 		#endregion
 
+		public static bool DesignerMode = false;
+
 		#region public fields
 		public Rectangle Bounds;
 		public Rectangle Slot = new Rectangle ();
@@ -114,7 +118,7 @@ namespace go
 				return cb;
 			}
 		}
-		[XmlIgnore]public virtual OpenTKGameWindow TopContainer {
+		[XmlIgnore]public virtual IGOLibHost TopContainer {
 			get { return Parent.TopContainer; }
 		}
 		public virtual void InvalidateLayout ()
@@ -242,7 +246,7 @@ namespace go
 		}
 		[XmlAttributeAttribute()][DefaultValue(false)]
 		public virtual bool Focusable {
-			get { return _focusable; }
+			get { return _focusable | DesignerMode; }
 			set { _focusable = value; }
 		}        
 		[XmlAttributeAttribute()][DefaultValue("Transparent")]
@@ -287,11 +291,11 @@ namespace go
 				_isVisible = value;
 
 				//add slot to clipping to redraw
-				OpenTKGameWindow.gobjsToRedraw.Add (this);
+				TopContainer.gobjsToRedraw.Add (this);
 
 				//ensure main win doesn't keep hidden childrens ref
-				if (this.Contains (OpenTKGameWindow.currentWindow.hoverWidget))
-					OpenTKGameWindow.currentWindow.hoverWidget = null;
+				if (this.Contains (TopContainer.hoverWidget))
+					TopContainer.hoverWidget = null;
 //				if (Parent != null)
 //					Parent.InvalidateLayout ();
 				//else
@@ -380,11 +384,11 @@ namespace go
 		public virtual void registerForRedraw ()
 		{
 			if (LayoutIsValid && Visible)
-				OpenTKGameWindow.gobjsToRedraw.Add (this);
+				TopContainer.gobjsToRedraw.Add (this);
 		}
 		public virtual void registerClipRect()
 		{
-			OpenTKGameWindow.redrawClip.AddRectangle (ScreenCoordinates(Slot));
+			TopContainer.redrawClip.AddRectangle (ScreenCoordinates(Slot));
 		}
 		protected virtual Size measureRawSize ()
 		{
@@ -536,10 +540,10 @@ namespace go
 		}
 		public virtual void onMouseMove(object sender, MouseMoveEventArgs e)
 		{
-			OpenTKGameWindow w = sender as OpenTKGameWindow;
+			//ILayoutable w = sender as ILayoutable;
 
-			if (w.hoverWidget != this) {
-				w.hoverWidget = this;
+			if (TopContainer.hoverWidget != this) {
+				TopContainer.hoverWidget = this;
 				onMouseEnter (sender, e);
 			}
 				
@@ -552,7 +556,7 @@ namespace go
 			MouseButtonUp (this, e);
 		}
 		public virtual void onMouseButtonDown(object sender, MouseButtonEventArgs e){
-			(sender as OpenTKGameWindow).FocusedWidget = this;
+			TopContainer.FocusedWidget = this;
 
 			MouseButtonDown (this, e);
 		}
@@ -601,7 +605,25 @@ namespace go
 			{
 				xs.Serialize(s, graphicObject, xn);
 			}
-		}			
+		}
+		public static GraphicObject Load(string path)
+		{
+			string root = "Object";
+			using (Stream s = new FileStream (path, FileMode.Open)) {
+				using (XmlReader reader = XmlReader.Create (s)) {
+					while (reader.Read()) {
+						// first element is the root element
+						if (reader.NodeType == XmlNodeType.Element) {
+							root = reader.Name;
+							break;
+						}
+					}
+				}
+			}
+			Type t = Type.GetType("go." + root);
+			var go = Activator.CreateInstance(t);
+			return Load(path, t);
+		}
 		public static void Load<T>(string file, out T result, object ClassContainingHandlers = null)
 		{
 			EventsToResolve = new List<EventSource>();
@@ -639,7 +661,47 @@ namespace go
 					fi.SetValue(es.Source, del);
 				}
 			}
+		}
+
+		public static GraphicObject Load(string file, Type type, object ClassContainingHandlers = null)
+		{
+			GraphicObject result;
+			EventsToResolve = new List<EventSource>();
+
+			XmlSerializerNamespaces xn = new XmlSerializerNamespaces();
+			xn.Add("", "");
+			XmlSerializer xs = new XmlSerializer(type);            
+
+			using (Stream s = new FileStream(file, FileMode.Open))
+			{
+				result = (GraphicObject)xs.Deserialize(s);
+			}
+
+			if (ClassContainingHandlers == null)
+				return result;
+
+			foreach (EventSource es in EventsToResolve)
+			{
+				if (string.IsNullOrEmpty(es.Handler))
+					continue;
+
+				if (es.Handler.StartsWith ("{")) {
+					CompilerServices.CompileEventSource (es);
+				} else {					
+					MethodInfo mi = ClassContainingHandlers.GetType ().GetMethod (es.Handler, BindingFlags.NonPublic | BindingFlags.Public
+						| BindingFlags.Instance);
 
+					if (mi == null) {
+						Debug.WriteLine ("Handler Method not found: " + es.Handler);
+						continue;
+					}
+
+					FieldInfo fi = CompilerServices.getEventHandlerField (es.Source.GetType (), es.EventName);
+					Delegate del = Delegate.CreateDelegate(fi.FieldType, ClassContainingHandlers, mi);
+					fi.SetValue(es.Source, del);
+				}
+			}
+			return result;
 		}
 
 		#endregion
diff --git a/src/GraphicObjects/IGOLibHost.cs b/src/GraphicObjects/IGOLibHost.cs
new file mode 100644
index 00000000..7a422877
--- /dev/null
+++ b/src/GraphicObjects/IGOLibHost.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+
+namespace go
+{
+	public interface IGOLibHost
+	{
+		Rectangles redrawClip { get; set; }
+		List<GraphicObject> gobjsToRedraw { get; }
+		GraphicObject activeWidget { get; set; }
+		GraphicObject hoverWidget { get; set; }
+		GraphicObject FocusedWidget { get; set; }
+		void AddWidget (GraphicObject g);
+		void DeleteWidget(GraphicObject g);
+	}
+}
+
diff --git a/src/GraphicObjects/ILayoutable.cs b/src/GraphicObjects/ILayoutable.cs
index 579fe2b0..1107f825 100644
--- a/src/GraphicObjects/ILayoutable.cs
+++ b/src/GraphicObjects/ILayoutable.cs
@@ -18,7 +18,7 @@ namespace go
 		Rectangle getSlot();
 		Rectangle getBounds();
 
-		OpenTKGameWindow TopContainer { get; }
+		IGOLibHost TopContainer { get; }
 
 		void InvalidateLayout ();
 
diff --git a/src/GraphicObjects/Scroller.cs b/src/GraphicObjects/Scroller.cs
index b24eb784..3d952fd0 100644
--- a/src/GraphicObjects/Scroller.cs
+++ b/src/GraphicObjects/Scroller.cs
@@ -115,7 +115,7 @@ namespace go
 
 		public override void registerClipRect ()
 		{
-			OpenTKGameWindow.redrawClip.AddRectangle (base.ScreenCoordinates(Slot));
+			TopContainer.redrawClip.AddRectangle (base.ScreenCoordinates(Slot));
 		}
 		public override void UpdateLayout ()
 		{
diff --git a/src/OpenTKGameWindow.cs b/src/OpenTKGameWindow.cs
index 1e937545..1e5b5d86 100755
--- a/src/OpenTKGameWindow.cs
+++ b/src/OpenTKGameWindow.cs
@@ -17,12 +17,14 @@ using System.Threading;
 using System.Drawing.Imaging;
 //using System.Xml.Serialization;
 //using System.Reflection;
+using System.Xml;
+using System.IO;
 
 
 
 namespace go
 {
-	public class OpenTKGameWindow : GameWindow, ILayoutable
+	public class OpenTKGameWindow : GameWindow, ILayoutable, IGOLibHost
     {
 		#region ctor
 //		public OpenTKGameWindow(int _width, int _height, string _title="golib")
@@ -50,10 +52,39 @@ namespace go
 		public List<GraphicObject> GraphicObjects = new List<GraphicObject>();
 		public Color Background = Color.Transparent;
 
-		public static Rectangles redrawClip = new Rectangles();//should find another way to access it from child
-		public static List<GraphicObject> gobjsToRedraw = new List<GraphicObject>();
 		internal static OpenTKGameWindow currentWindow;
 
+		Rectangles _redrawClip = new Rectangles();//should find another way to access it from child
+		List<GraphicObject> _gobjsToRedraw = new List<GraphicObject>();
+
+		public Rectangles redrawClip {
+			get {
+				return _redrawClip;
+			}
+			set {
+				_redrawClip = value;
+			}
+		}
+
+		public List<GraphicObject> gobjsToRedraw {
+			get {
+				return _gobjsToRedraw;
+			}
+			set {
+				_gobjsToRedraw = value;
+			}
+		}
+		public void AddWidget(GraphicObject g)
+		{
+			g.Parent = this;
+			GraphicObjects.Add (g);
+		}
+		public void DeleteWidget(GraphicObject g)
+		{
+			g.Visible = false;//trick to ensure clip is added to refresh zone
+			GraphicObjects.Remove (g);
+		}
+
 		#region Events
 		//those events are raised only if mouse isn't in a graphic object
 		public event EventHandler<MouseWheelEventArgs> MouseWheelChanged = delegate { };
@@ -266,17 +297,7 @@ namespace go
 //				updateTime.ElapsedMilliseconds);
 
 		}						
-
-		public void AddWidget(GraphicObject g)
-		{
-			g.Parent = this;
-			GraphicObjects.Add (g);
-		}
-		public void DeleteWidget(GraphicObject g)
-		{
-			g.Visible = false;//ensure clip is added to refresh zone
-			GraphicObjects.Remove (g);
-		}
+			
 		public void LoadInterface<T>(string path, out T result)
 		{
 			GraphicObject.Load<T> (path, out result, this);
@@ -289,7 +310,7 @@ namespace go
 			AddWidget (result as GraphicObject);
 			return result;
 		}
-
+			
 		#region Game win overrides
 		protected override void OnUpdateFrame(FrameEventArgs e)
 		{	
@@ -434,14 +455,12 @@ namespace go
         }
         #endregion
 
-
 		#region ILayoutable implementation
 
 		public Rectangle ContextCoordinates (Rectangle r)
 		{
 			return r;
 		}
-
 		public Rectangle ScreenCoordinates (Rectangle r)
 		{
 			return r;
@@ -460,7 +479,6 @@ namespace go
 			get { return true; }
 			set { throw new NotImplementedException ();	}
 		}
-
 		public bool PositionIsValid {
 			get {
 				return true;
@@ -469,7 +487,6 @@ namespace go
 				throw new NotImplementedException ();
 			}
 		}
-
 		public bool LayoutIsValid {
 			get {
 				return true;//tester tout les enfants a mon avis
@@ -483,7 +500,7 @@ namespace go
 			get { return new Size(this.ClientRectangle.Size.Width,this.ClientRectangle.Size.Height); }
 		}
 
-		public OpenTKGameWindow TopContainer {
+		public IGOLibHost TopContainer {
 			get { return this; }
 		}
 
@@ -495,6 +512,7 @@ namespace go
 		{
 			return ClientRectangle;
 		}
+
 		public bool WIsValid {
 			get {
 				return true;
@@ -503,7 +521,6 @@ namespace go
 				throw new NotImplementedException ();
 			}
 		}
-
 		public bool HIsValid {
 			get {
 				return true;
@@ -512,7 +529,6 @@ namespace go
 				throw new NotImplementedException ();
 			}
 		}
-
 		public bool XIsValid {
 			get {
 				return true;
@@ -521,7 +537,6 @@ namespace go
 				throw new NotImplementedException ();
 			}
 		}
-
 		public bool YIsValid {
 			get {
 				return true;
@@ -530,52 +545,47 @@ namespace go
 				throw new NotImplementedException ();
 			}
 		}
+
 		public virtual void InvalidateLayout ()
 		{
 //			foreach (GraphicObject g in GraphicObjects) {
 //				g.InvalidateLayout ();
 //			}
 		}
-		public Rectangle rectInScreenCoord (Rectangle r)
-		{
-			throw new NotImplementedException ();
-		}
-
-		public Rectangle renderBoundsInContextCoordonate {
-			get { return ClientRectangle; }
-		}
-
-		public Rectangle ClientBoundsInContextCoordonate {
-			get {
-				throw new NotImplementedException ();
-			}
-		}
-
-		public Rectangle renderBoundsInBackendSurfaceCoordonate {
-			get { return ClientRectangle; }
-		}
-
-		public Rectangle ClientBoundsInBackendSurfaceCoordonate {
-			get {
-				throw new NotImplementedException ();
-			}
-			set {
-				throw new NotImplementedException ();
-			}
-		}
-
-		public Rectangle ScreenCoordBounds {
-			get { return ClientRectangle; }
-		}
-
-		public Rectangle ScreenCoordClientBounds {
-			get {
-				throw new NotImplementedException ();
-			}
-			set {
-				throw new NotImplementedException ();
-			}
-		}
+//		public Rectangle rectInScreenCoord (Rectangle r)
+//		{
+//			throw new NotImplementedException ();
+//		}
+//		public Rectangle renderBoundsInContextCoordonate {
+//			get { return ClientRectangle; }
+//		}
+//		public Rectangle ClientBoundsInContextCoordonate {
+//			get {
+//				throw new NotImplementedException ();
+//			}
+//		}
+//		public Rectangle renderBoundsInBackendSurfaceCoordonate {
+//			get { return ClientRectangle; }
+//		}
+//		public Rectangle ClientBoundsInBackendSurfaceCoordonate {
+//			get {
+//				throw new NotImplementedException ();
+//			}
+//			set {
+//				throw new NotImplementedException ();
+//			}
+//		}
+//		public Rectangle ScreenCoordBounds {
+//			get { return ClientRectangle; }
+//		}
+//		public Rectangle ScreenCoordClientBounds {
+//			get {
+//				throw new NotImplementedException ();
+//			}
+//			set {
+//				throw new NotImplementedException ();
+//			}
+//		}
 		#endregion
     }
 }
\ No newline at end of file
-- 
2.47.3