From 8d7b17fdacb9dde5d5775115303b9e095a0631d1 Mon Sep 17 00:00:00 2001
From: jpbruyere <jp.bruyere@hotmail.com>
Date: Sun, 20 Mar 2016 22:04:14 +0100
Subject: [PATCH] try update monodevelop addin, workin progress

---
 .gitignore                                    |   1 +
 Crow.csproj                                   |  20 +-
 Crow.sln                                      |   7 +-
 ...b.addin.xml => MonoDevelop.Crow.addin.xml} |   9 +-
 ...p.GOLib.csproj => MonoDevelop.Crow.csproj} |  83 ++++---
 MonoDevelop.GOLib/Properties/AddinInfo.cs     |   4 +-
 MonoDevelop.GOLib/Properties/AssemblyInfo.cs  |   4 +-
 ...isplayBinding.cs => CrowDisplayBinding.cs} |  11 +-
 ...bNodeExtension.cs => CrowNodeExtension.cs} |  10 +-
 .../src/{GOLibView.cs => CrowView.cs}         |  44 ++--
 MonoDevelop.GOLib/src/GOLibGtkHost.cs         |  12 +-
 MonoDevelop.GOLib/src/XwtContainer.cs         | 209 ++++++++++++++++++
 OTKCrow/OTKCrow.csproj                        |   1 +
 packages.config                               |   4 -
 src/Interface.cs                              |  10 +-
 15 files changed, 328 insertions(+), 101 deletions(-)
 rename MonoDevelop.GOLib/{MonoDevelop.GOLib.addin.xml => MonoDevelop.Crow.addin.xml} (66%)
 rename MonoDevelop.GOLib/{MonoDevelop.GOLib.csproj => MonoDevelop.Crow.csproj} (58%)
 rename MonoDevelop.GOLib/src/{DisplayBinding.cs => CrowDisplayBinding.cs} (87%)
 rename MonoDevelop.GOLib/src/{GOLibNodeExtension.cs => CrowNodeExtension.cs} (94%)
 rename MonoDevelop.GOLib/src/{GOLibView.cs => CrowView.cs} (81%)
 create mode 100644 MonoDevelop.GOLib/src/XwtContainer.cs
 delete mode 100644 packages.config

diff --git a/.gitignore b/.gitignore
index 7aa58178..90925af9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,4 @@ Tests/Tests.userprefs
 src/GraphicObjects/Panel.cs
 src/GraphicObjects/VerticalWrappingWidget.cs
 src/GraphicObjects/HorizontalWrappingWidget.cs
+MonoDevelop.Crow/build
diff --git a/Crow.csproj b/Crow.csproj
index 5ebe65f5..d57d8ddf 100644
--- a/Crow.csproj
+++ b/Crow.csproj
@@ -21,8 +21,10 @@
     <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ReleaseVersion>0.1.*</ReleaseVersion>
+    <ReleaseVersion>0.4</ReleaseVersion>
     <Description>Crow project description</Description>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
     <DebugSymbols>true</DebugSymbols>
@@ -156,17 +158,12 @@
     <Reference Include="System.Xml" />
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Drawing" />
-    <Reference Include="cairo-sharp">
-      <HintPath>..\..\packages\gtk-sharp.Linux.3.14.3.14.7\lib\net40\cairo-sharp.dll</HintPath>
+    <Reference Include="Mono.Cairo" />
+    <Reference Include="glib-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
+      <Package>glib-sharp-2.0</Package>
     </Reference>
-    <Reference Include="gdk-sharp">
-      <HintPath>..\..\packages\gtk-sharp.Linux.3.14.3.14.7\lib\net40\gdk-sharp.dll</HintPath>
-    </Reference>
-    <Reference Include="gio-sharp">
-      <HintPath>..\..\packages\gtk-sharp.Linux.3.14.3.14.7\lib\net40\gio-sharp.dll</HintPath>
-    </Reference>
-    <Reference Include="glib-sharp">
-      <HintPath>..\..\packages\gtk-sharp.Linux.3.14.3.14.7\lib\net40\glib-sharp.dll</HintPath>
+    <Reference Include="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
+      <Package>gtk-sharp-2.0</Package>
     </Reference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
@@ -264,6 +261,5 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="README.md" />
-    <None Include="packages.config" />
   </ItemGroup>
 </Project>
diff --git a/Crow.sln b/Crow.sln
index ed803ba7..b414a9eb 100644
--- a/Crow.sln
+++ b/Crow.sln
@@ -5,7 +5,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Crow", "Crow.csproj", "{C29
 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}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.Crow", "MonoDevelop.GOLib\MonoDevelop.Crow.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
@@ -24,25 +24,22 @@ Global
 		{232716B4-D19D-4FD7-B310-94A98FD926F0}.Debug|Linux_x86.ActiveCfg = Debug|Any CPU
 		{232716B4-D19D-4FD7-B310-94A98FD926F0}.Release|Linux_x86.ActiveCfg = Debug|Any CPU
 		{350D4F49-9901-4998-9903-BCA7D48DA58C}.Debug|Linux_x86.ActiveCfg = Debug|Linux_x86
-		{350D4F49-9901-4998-9903-BCA7D48DA58C}.Debug|Linux_x86.Build.0 = Debug|Linux_x86
 		{350D4F49-9901-4998-9903-BCA7D48DA58C}.Release|Linux_x86.ActiveCfg = Release|Linux_x86
 		{350D4F49-9901-4998-9903-BCA7D48DA58C}.Release|Linux_x86.Build.0 = Release|Linux_x86
 		{74289092-9F70-4941-AFCB-DFD7BE2140B6}.Debug|Linux_x86.ActiveCfg = Debug|Any CPU
-		{74289092-9F70-4941-AFCB-DFD7BE2140B6}.Debug|Linux_x86.Build.0 = Debug|Any CPU
 		{74289092-9F70-4941-AFCB-DFD7BE2140B6}.Release|Linux_x86.ActiveCfg = Release|Any CPU
 		{74289092-9F70-4941-AFCB-DFD7BE2140B6}.Release|Linux_x86.Build.0 = Release|Any CPU
 		{7BAE4448-E8F4-48B3-BB11-FA78E7F4506B}.Debug|Linux_x86.ActiveCfg = Debug|Any CPU
-		{7BAE4448-E8F4-48B3-BB11-FA78E7F4506B}.Debug|Linux_x86.Build.0 = Debug|Any CPU
 		{7BAE4448-E8F4-48B3-BB11-FA78E7F4506B}.Release|Linux_x86.ActiveCfg = Release|Any CPU
 		{C2980F9B-4798-4C05-99E2-E174810F7C7B}.Debug|Linux_x86.ActiveCfg = Debug|Any CPU
 		{C2980F9B-4798-4C05-99E2-E174810F7C7B}.Debug|Linux_x86.Build.0 = Debug|Any CPU
 		{C2980F9B-4798-4C05-99E2-E174810F7C7B}.Release|Linux_x86.ActiveCfg = Release|Any CPU
 		{C2980F9B-4798-4C05-99E2-E174810F7C7B}.Release|Linux_x86.Build.0 = Release|Any CPU
 		{D6F98B08-56B8-405C-9212-F9D26097E35F}.Debug|Linux_x86.ActiveCfg = Debug|Linux_x86
-		{D6F98B08-56B8-405C-9212-F9D26097E35F}.Debug|Linux_x86.Build.0 = Debug|Linux_x86
 		{D6F98B08-56B8-405C-9212-F9D26097E35F}.Release|Linux_x86.ActiveCfg = Release|Linux_x86
 		{D6F98B08-56B8-405C-9212-F9D26097E35F}.Release|Linux_x86.Build.0 = Release|Linux_x86
 		{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
 	EndGlobalSection
 	GlobalSection(MonoDevelopProperties) = preSolution
diff --git a/MonoDevelop.GOLib/MonoDevelop.GOLib.addin.xml b/MonoDevelop.GOLib/MonoDevelop.Crow.addin.xml
similarity index 66%
rename from MonoDevelop.GOLib/MonoDevelop.GOLib.addin.xml
rename to MonoDevelop.GOLib/MonoDevelop.Crow.addin.xml
index fe15b3e9..6155263e 100644
--- a/MonoDevelop.GOLib/MonoDevelop.GOLib.addin.xml
+++ b/MonoDevelop.GOLib/MonoDevelop.Crow.addin.xml
@@ -1,17 +1,20 @@
 <ExtensionModel>	
 	<Extension path = "/MonoDevelop/Ide/DisplayBindings">			
 		<DisplayBinding
-			id = "GOLib designer"
+			id = "Crow designer"
 			insertafter ="AssemblyBrowser" 
-			class = "MonoDevelop.GOLib.GOLibDisplayBinding" />
+			class = "MonoDevelop.Crow.CrowDisplayBinding" />
 	</Extension>
 	<Extension path = "/MonoDevelop/Ide/Pads/ProjectPad">
-		<NodeBuilder id = "GOLibNodeExtension" class = "MonoDevelop.GOLib.GOLibNodeExtension"/>
+		<NodeBuilder id = "CrowNodeExtension" class = "MonoDevelop.Crow.CrowNodeExtension"/>
 	</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>
+		<MimeType id="text/x-crow" _description="Crow interface definition" icon="md-csharp-file" isText="false">
+			<File pattern="*.crow" />
+		</MimeType>
 	</Extension>
 <!--	<Extension path = "/MonoDevelop/DesignerSupport/PropertyProviders" extension-nodes="Class">
 		<Class class = "MonoDevelop.GOLib.GOLibItemPropertyProvider"/>
diff --git a/MonoDevelop.GOLib/MonoDevelop.GOLib.csproj b/MonoDevelop.GOLib/MonoDevelop.Crow.csproj
similarity index 58%
rename from MonoDevelop.GOLib/MonoDevelop.GOLib.csproj
rename to MonoDevelop.GOLib/MonoDevelop.Crow.csproj
index b09de992..31683755 100644
--- a/MonoDevelop.GOLib/MonoDevelop.GOLib.csproj
+++ b/MonoDevelop.GOLib/MonoDevelop.Crow.csproj
@@ -7,13 +7,13 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{E9E14DB5-3C67-4E01-B5C3-4D90D7E31A2E}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <RootNamespace>MonoDevelop.GOLib</RootNamespace>
-    <AssemblyName>MonoDevelop.GOLib</AssemblyName>
+    <RootNamespace>MonoDevelop.Crow</RootNamespace>
+    <AssemblyName>MonoDevelop.Crow</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <OutputPath>build</OutputPath>
     <CustomCommands>
       <CustomCommands>
-        <Command type="Execute" command="/usr/local/lib/monodevelop/bin/MonoDevelop.exe --no-redirect" workingdir="/usr/local/lib/monodevelop/bin">
+        <Command type="Execute" command="/opt/lib/monodevelop/bin/MonoDevelop.exe --no-redirect" workingdir="/opt/lib/monodevelop/bin">
           <EnvironmentVariables>
             <Variable name="MONODEVELOP_DEV_ADDINS" value="${TargetDir}" />
             <Variable name="MONODEVELOP_CONSOLE_LOG_LEVEL" value="UpToDebug" />
@@ -35,9 +35,16 @@
     <ConsolePause>false</ConsolePause>
     <CustomCommands>
       <CustomCommands>
-        <Command type="Execute" command="/usr/local/lib/monodevelop/bin/MonoDevelop.exe --no-redirect" workingdir="/usr/local/lib/monodevelop/bin" />
+        <Command type="Execute" command="/opt/lib/monodevelop/bin/MonoDevelop.exe --no-redirect" workingdir="/opt/lib/monodevelop/bin">
+          <EnvironmentVariables>
+            <Variable name="MONODEVELOP_DEV_ADDINS" value="${TargetDir}" />
+            <Variable name="MONODEVELOP_CONSOLE_LOG_LEVEL" value="UpToDebug" />
+            <Variable name="MONODEVELOP_LOGGING_PAD_LEVEL" value="UpToDebug" />
+            <Variable name="MONODEVELOP_CONSOLE_LOG_USE_COLOUR" value="True" />
+          </EnvironmentVariables>
+        </Command>
       </CustomCommands>
-    </CustomCommands>
+    </CustomCommands>    <OutputPath>..\MonoDevelop.Crow\build</OutputPath>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>none</DebugType>
@@ -47,67 +54,78 @@
     <ConsolePause>false</ConsolePause>
     <CustomCommands>
       <CustomCommands>
-        <Command type="Execute" command="/usr/local/lib/monodevelop/bin/MonoDevelop.exe --no-redirect" workingdir="/usr/local/lib/monodevelop/bin" />
+        <Command type="Execute" command="/opt/lib/monodevelop/bin/MonoDevelop.exe --no-redirect" workingdir="/opt/lib/monodevelop/bin">
+          <EnvironmentVariables>
+            <Variable name="MONODEVELOP_DEV_ADDINS" value="${TargetDir}" />
+            <Variable name="MONODEVELOP_CONSOLE_LOG_LEVEL" value="UpToDebug" />
+            <Variable name="MONODEVELOP_LOGGING_PAD_LEVEL" value="UpToDebug" />
+            <Variable name="MONODEVELOP_CONSOLE_LOG_USE_COLOUR" value="True" />
+          </EnvironmentVariables>
+        </Command>
       </CustomCommands>
     </CustomCommands>
+    <OutputPath>..\MonoDevelop.Crow\build</OutputPath>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="ICSharpCode.NRefactory">
-      <HintPath>\usr\local\lib\monodevelop\bin\ICSharpCode.NRefactory.dll</HintPath>
-    </Reference>
-    <Reference Include="Mono.Addins">
-      <Package>mono-addins</Package>
+      <HintPath>\opt\lib\monodevelop\bin\ICSharpCode.NRefactory.dll</HintPath>
     </Reference>
     <Reference Include="MonoDevelop.Ide">
-      <HintPath>\usr\local\lib\monodevelop\bin\MonoDevelop.Ide.dll</HintPath>
+      <HintPath>\opt\lib\monodevelop\bin\MonoDevelop.Ide.dll</HintPath>
     </Reference>
     <Reference Include="MonoDevelop.Core">
-      <HintPath>\usr\local\lib\monodevelop\bin\MonoDevelop.Core.dll</HintPath>
+      <HintPath>\opt\lib\monodevelop\bin\MonoDevelop.Core.dll</HintPath>
     </Reference>
     <Reference Include="MonoDevelop.DesignerSupport">
-      <HintPath>\usr\local\lib\monodevelop\AddIns\MonoDevelop.DesignerSupport\MonoDevelop.DesignerSupport.dll</HintPath>
+      <HintPath>\opt\lib\monodevelop\AddIns\MonoDevelop.DesignerSupport\MonoDevelop.DesignerSupport.dll</HintPath>
     </Reference>
-    <Reference Include="Mono.Cairo" />
-    <Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="MonoDevelop.SourceEditor2">
+      <HintPath>\opt\lib\monodevelop\AddIns\DisplayBindings\SourceEditor\MonoDevelop.SourceEditor2.dll</HintPath>
+    </Reference>
+    <Reference Include="Mono.TextEditor">
+      <HintPath>\opt\lib\monodevelop\bin\Mono.TextEditor.dll</HintPath>
+    </Reference>
+    <Reference Include="atk-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 Include="gio-sharp, Version=2.14.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
+      <Package>gio-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="System.Drawing" />
-    <Reference Include="OpenTK">
-      <HintPath>..\..\opentk\Binaries\OpenTK\Release\OpenTK.dll</HintPath>
+    <Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
+      <Package>gtk-sharp-2.0</Package>
     </Reference>
-    <Reference Include="MonoDevelop.SourceEditor2">
-      <HintPath>..\..\..\..\..\usr\local\lib\monodevelop\AddIns\DisplayBindings\SourceEditor\MonoDevelop.SourceEditor2.dll</HintPath>
+    <Reference Include="Mono.Cairo" />
+    <Reference Include="Mono.Addins, Version=1.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756">
+      <Package>mono-addins</Package>
     </Reference>
-    <Reference Include="Mono.TextEditor">
-      <HintPath>..\..\..\..\..\usr\local\lib\monodevelop\bin\Mono.TextEditor.dll</HintPath>
+    <Reference Include="Xwt">
+      <HintPath>..\..\..\..\..\opt\lib\monodevelop\bin\Xwt.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" />
+    <Compile Include="src\CrowDisplayBinding.cs" />
+    <Compile Include="src\CrowView.cs" />
+    <Compile Include="src\CrowNodeExtension.cs" />
+    <Compile Include="src\XwtContainer.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
     <Folder Include="src\" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="MonoDevelop.GOLib.addin.xml" />
+    <EmbeddedResource Include="MonoDevelop.Crow.addin.xml" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Crow.csproj">
@@ -115,4 +133,7 @@
       <Name>Crow</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="src\GOLibGtkHost.cs" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/MonoDevelop.GOLib/Properties/AddinInfo.cs b/MonoDevelop.GOLib/Properties/AddinInfo.cs
index f5af5b8d..551c66db 100644
--- a/MonoDevelop.GOLib/Properties/AddinInfo.cs
+++ b/MonoDevelop.GOLib/Properties/AddinInfo.cs
@@ -3,12 +3,12 @@ using System;
 using Mono.Addins;
 using Mono.Addins.Description;
 
-[assembly:Addin ("GOLib", 
+[assembly:Addin ("Crow", 
         Namespace = "MonoDevelop",
         Version = MonoDevelop.BuildInfo.Version,
         Category = "IDE extensions")]
 
-[assembly:AddinName ("MonoDevelop GOLib interface designer")]
+[assembly:AddinName ("MonoDevelop Crow interface designer")]
 [assembly:AddinDescription ("")]
 
 [assembly:AddinDependency ("Core", MonoDevelop.BuildInfo.Version)]
diff --git a/MonoDevelop.GOLib/Properties/AssemblyInfo.cs b/MonoDevelop.GOLib/Properties/AssemblyInfo.cs
index 117b1534..a5fb350d 100644
--- a/MonoDevelop.GOLib/Properties/AssemblyInfo.cs
+++ b/MonoDevelop.GOLib/Properties/AssemblyInfo.cs
@@ -4,8 +4,8 @@ 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: AssemblyTitle ("MonoDevelop.Crow")]
+[assembly: AssemblyDescription ("Crow interface designer for MonoDevelop")]
 [assembly: AssemblyConfiguration ("")]
 [assembly: AssemblyCompany ("")]
 [assembly: AssemblyProduct ("")]
diff --git a/MonoDevelop.GOLib/src/DisplayBinding.cs b/MonoDevelop.GOLib/src/CrowDisplayBinding.cs
similarity index 87%
rename from MonoDevelop.GOLib/src/DisplayBinding.cs
rename to MonoDevelop.GOLib/src/CrowDisplayBinding.cs
index 1898f16b..0776de73 100644
--- a/MonoDevelop.GOLib/src/DisplayBinding.cs
+++ b/MonoDevelop.GOLib/src/CrowDisplayBinding.cs
@@ -52,15 +52,15 @@ using MonoDevelop.Projects;
 using System.Globalization;
 using System.Diagnostics;
 
-namespace MonoDevelop.GOLib
+namespace MonoDevelop.Crow
 {
-	class GOLibDisplayBinding : IViewDisplayBinding
+	class CrowDisplayBinding : IViewDisplayBinding
 	{
 		bool canHandle = false;
 
 		public string Name {
 			get {
-				return GettextCatalog.GetString ("GOLib designer");
+				return GettextCatalog.GetString ("Crow designer");
 			}
 		}
 		public bool CanUseAsDefault 
@@ -68,13 +68,14 @@ namespace MonoDevelop.GOLib
 
 		public IViewContent CreateContent (FilePath fileName, string mimeType, Project ownerProject)
 		{			
-			return new GOLibView ();
+			return new CrowView ();
 
 
 		}
 		public bool CanHandle (FilePath fileName, string mimeType, Project ownerProject)
 		{			
-			canHandle = mimeType.StartsWith("text/x-goml");
+			canHandle = mimeType.StartsWith("text/x-goml", System.StringComparison.OrdinalIgnoreCase) |
+			                    mimeType.StartsWith ("text/x-crow", System.StringComparison.OrdinalIgnoreCase);
 			return canHandle;
 		}		
 	}
diff --git a/MonoDevelop.GOLib/src/GOLibNodeExtension.cs b/MonoDevelop.GOLib/src/CrowNodeExtension.cs
similarity index 94%
rename from MonoDevelop.GOLib/src/GOLibNodeExtension.cs
rename to MonoDevelop.GOLib/src/CrowNodeExtension.cs
index 8c68d4cf..035f2353 100644
--- a/MonoDevelop.GOLib/src/GOLibNodeExtension.cs
+++ b/MonoDevelop.GOLib/src/CrowNodeExtension.cs
@@ -33,16 +33,16 @@ using MonoDevelop.Ide;
 using System.Linq;
 using MonoDevelop.DesignerSupport;
 
-namespace MonoDevelop.GOLib
+namespace MonoDevelop.Crow
 {
 	enum Commands {
 		ShowGOLibViewer
 	}
 	
-	class GOLibNodeExtension : NodeBuilderExtension
+	class CrowNodeExtension : NodeBuilderExtension
 	{		
 		public override Type CommandHandlerType {
-			get { return typeof(GOLibCommandHandler); }
+			get { return typeof(CrowCommandHandler); }
 		}
 		public override bool CanBuildNode (Type dataType)
 		{			
@@ -65,13 +65,13 @@ namespace MonoDevelop.GOLib
 		} 
 	}
 	
-	class GOLibCommandHandler: NodeCommandHandler //, IPropertyPadProvider
+	class CrowCommandHandler: NodeCommandHandler //, IPropertyPadProvider
 	{
 		[CommandHandler (Commands.ShowGOLibViewer)]
 		protected void OnShowGOLibViewer () 
 		{
 
-			GOLibView view = new GOLibView ();
+			CrowView view = new CrowView ();
 
 			ProjectFile file   = CurrentNode.DataItem as ProjectFile;
 
diff --git a/MonoDevelop.GOLib/src/GOLibView.cs b/MonoDevelop.GOLib/src/CrowView.cs
similarity index 81%
rename from MonoDevelop.GOLib/src/GOLibView.cs
rename to MonoDevelop.GOLib/src/CrowView.cs
index 52dbf2cb..abdac98a 100644
--- a/MonoDevelop.GOLib/src/GOLibView.cs
+++ b/MonoDevelop.GOLib/src/CrowView.cs
@@ -47,24 +47,18 @@
 
 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 Crow;
 using MonoDevelop.DesignerSupport;
 using MonoDevelop.SourceEditor;
 
-namespace MonoDevelop.GOLib
+namespace MonoDevelop.Crow
 {
 	class CustomVPaned : Gtk.VPaned, IPropertyPadProvider
 	{
 		#region IPropertyPadProvider implementation
 		public object GetActiveComponent ()
 		{
-			return this.Child1 == null ? this as object: (this.Child1 as GOLibGtkHost).activeWidget as object;
+			return this.Child1 == null ? this as object: (this.Child1 as XwtContainer).CrowInterface.activeWidget as object;
 		}
 		public object GetProvider ()
 		{
@@ -82,29 +76,29 @@ namespace MonoDevelop.GOLib
 		#endregion
 		
 	}
-	class GOLibView : SourceEditorView
+	class CrowView : SourceEditorView
 	{
-		GOLibGtkHost gtkGoWidgetHost;
-		CustomVPaned gtkGOMLWidget;
+		XwtContainer gtkCrowHost;
+		CustomVPaned gtkCrowWidget;
 
 
 		double zoom = 1.0;
 		
 		public override Gtk.Widget Control {
 			get {
-				return gtkGOMLWidget;
+				return gtkCrowWidget;
 			}
 		}
 
-		public GOLibView () : base()
+		public CrowView () : base()
 		{			
-			gtkGoWidgetHost = new GOLibGtkHost ();
-			gtkGOMLWidget = new CustomVPaned ();
-			gtkGOMLWidget.CanFocus = true;
-			gtkGOMLWidget.Name = "vpaned1";
-			gtkGOMLWidget.Add (gtkGoWidgetHost);
-			gtkGOMLWidget.Add (base.Control);
-			gtkGOMLWidget.SizeAllocated += GtkGOMLWidget_SizeAllocated;
+			gtkCrowHost = new XwtContainer ();
+			gtkCrowWidget = new CustomVPaned ();
+			gtkCrowWidget.CanFocus = true;
+			gtkCrowWidget.Name = "vpaned1";
+			gtkCrowWidget.Add (gtkCrowHost);
+			gtkCrowWidget.Add (base.Control);
+			gtkCrowWidget.SizeAllocated += GtkGOMLWidget_SizeAllocated;
 
 			this.Document.DocumentUpdated += Document_DocumentUpdated;
 			//this.DirtyChanged += GOLibView_DirtyChanged;
@@ -128,23 +122,23 @@ namespace MonoDevelop.GOLib
 					writer.Flush ();
 
 					stream.Position = 0;
-					gtkGoWidgetHost.Load (stream);
+					gtkCrowHost.CrowInterface.LoadInterface (stream);
 				}
 			}			
 		}
 			
 		void GtkGOMLWidget_SizeAllocated (object o, Gtk.SizeAllocatedArgs args)
 		{
-			gtkGoWidgetHost.SetSizeRequest (-1, args.Allocation.Height / 2);
+			gtkCrowHost.SetSizeRequest (-1, args.Allocation.Height / 2);
 		}
 
 		public override void Load (string fileName)
 		{							
-			gtkGoWidgetHost.Load (fileName);
+			gtkCrowHost.CrowInterface.LoadInterface (fileName);
 			//ContentName = fileName;
 			//this.IsDirty = false;
-			gtkGOMLWidget.ShowAll ();
-			gtkGOMLWidget.Show ();
+			gtkCrowWidget.ShowAll ();
+			gtkCrowWidget.Show ();
 
 			base.Load (fileName);
 		}
diff --git a/MonoDevelop.GOLib/src/GOLibGtkHost.cs b/MonoDevelop.GOLib/src/GOLibGtkHost.cs
index 0069e3e7..1a86d457 100644
--- a/MonoDevelop.GOLib/src/GOLibGtkHost.cs
+++ b/MonoDevelop.GOLib/src/GOLibGtkHost.cs
@@ -1,20 +1,20 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.Diagnostics;
+using System.IO;
 using System.Linq;
 using Crow;
+using MonoDevelop.Components.Commands;
 using MonoDevelop.Core;
+using MonoDevelop.DesignerSupport;
 using MonoDevelop.Ide;
 using MonoDevelop.Projects;
-using System.Diagnostics;
 using OpenTK.Input;
-using MonoDevelop.DesignerSupport;
-using System.IO;
-using MonoDevelop.Components.Commands;
 
-namespace MonoDevelop.GOLib
+namespace MonoDevelop.Crow
 {
-	public class GOLibGtkHost : Gtk.DrawingArea, ILayoutable, IGOLibHost, IPropertyPadProvider,ICommandDelegator
+	public class GOLibGtkHost : Gtk.DrawingArea, IPropertyPadProvider,ICommandDelegator
 	{
 		#region ICommandDelegator implementation
 
diff --git a/MonoDevelop.GOLib/src/XwtContainer.cs b/MonoDevelop.GOLib/src/XwtContainer.cs
new file mode 100644
index 00000000..6a648f5c
--- /dev/null
+++ b/MonoDevelop.GOLib/src/XwtContainer.cs
@@ -0,0 +1,209 @@
+//
+//  OpenTKGameWindow.cs
+//
+//  Author:
+//       Jean-Philippe Bruyère <jp_bruyere@hotmail.com>
+//
+//  Copyright (c) 2016 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;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+using System.Threading;
+using System.Xml;
+using Cairo;
+using Crow;
+using MonoDevelop.Components.Commands;
+using MonoDevelop.Core;
+using MonoDevelop.DesignerSupport;
+using MonoDevelop.Ide;
+using MonoDevelop.Projects;
+
+namespace MonoDevelop.Crow
+{
+	public class XwtContainer : Xwt.Canvas, IPropertyPadProvider,ICommandDelegator
+    {
+		public Interface CrowInterface;
+
+		#region ICommandDelegator implementation
+
+		public object GetDelegatedCommandTarget ()
+		{
+			return CrowInterface.hoverWidget;
+		}
+
+		#endregion
+
+		#region IPropertyPadProvider implementation
+
+		public object GetActiveComponent ()
+		{
+			return CrowInterface.activeWidget;
+		}
+		public object GetProvider ()
+		{
+			return CrowInterface.activeWidget;
+		}
+		public void OnEndEditing (object obj)
+		{
+
+		}
+		public void OnChanged (object obj)
+		{
+			(obj as GraphicObject).RegisterForGraphicUpdate ();
+			QueueDraw ();
+		}
+		#endregion
+
+		#region ctor
+		public XwtContainer() : this(0,0,"test"){}
+		public XwtContainer(int _width, int _height, string _title="Crow")
+			: base()
+		{
+			CrowInterface = new Interface ();
+			CrowInterface.Quit += Quit;
+
+
+			//this.OverrideBackgroundColor (Gtk.StateFlags.Normal, Gdk.RGBA.Zero);
+			//this.Visual = Gdk.Global.DefaultRootWindow.Screen.RgbaVisual;
+
+			this.ButtonPressEvent += OpenTKGameWindow_ButtonPressEvent;
+			this.ButtonReleaseEvent += OpenTKGameWindow_ButtonReleaseEvent;
+			this.MotionNotifyEvent += OpenTKGameWindow_MotionNotifyEvent;
+			this.KeyPressEvent += OpenTKGameWindow_KeyPressEvent;
+			this.SizeAllocated += OpenTKGameWindow_SizeAllocated;
+
+			this.Show ();
+
+			//GLib.Idle.Add (new GLib.IdleHandler (idleHandler));
+			GLib.Timeout.Add (10, new GLib.TimeoutHandler (updateHandler));
+		}
+		#endregion
+
+
+
+		#region Timers
+		bool updateHandler(){
+			CrowInterface.Update();
+			return true;
+		}
+		bool idleHandler(){
+			if (CrowInterface.IsDirty) {
+				QueueDrawArea (CrowInterface.DirtyRect.X, CrowInterface.DirtyRect.Y, CrowInterface.DirtyRect.Width, CrowInterface.DirtyRect.Height);
+				return false;
+			}
+			return true;
+		}
+		#endregion
+
+		protected void Quit (object sender, EventArgs e)
+		{
+			Gtk.Application.Quit ();
+		}
+			
+		static double[] dashed = {2.0};
+		protected override void OnDraw (Xwt.Drawing.Context ctx, Xwt.Rectangle dirtyRect)
+		{
+			base.OnDraw (ctx, dirtyRect);
+			if (CrowInterface.IsDirty) {
+				using (MemoryStream ms = new MemoryStream (CrowInterface.dirtyBmp)) {
+					//Xwt.Drawing.ImageBuilder im = new Xwt.Drawing.ImageBuilder(CrowInterface.DirtyRect.Width, CrowInterface.DirtyRect.Height);
+					//bmp.
+					using (Xwt.Drawing.Image img = Xwt.Drawing.BitmapImage.FromStream (ms)) {
+						img.WithSize (CrowInterface.DirtyRect.Width, CrowInterface.DirtyRect.Height);
+						ctx.DrawImage (img, CrowInterface.DirtyRect.X, CrowInterface.DirtyRect.Y);
+						ctx.Fill ();
+					}
+				}
+				CrowInterface.IsDirty = false;
+				GLib.Idle.Add (new GLib.IdleHandler (idleHandler));
+				return;
+			}
+			if (CrowInterface.bmp != null) {
+				using (ImageSurface img = new ImageSurface (CrowInterface.bmp, Format.Argb32, CrowInterface.ClientRectangle.Width, CrowInterface.ClientRectangle.Height, 4 * CrowInterface.ClientRectangle.Width)) {
+					cr.SetSourceSurface (img, CrowInterface.ClientRectangle.X, CrowInterface.ClientRectangle.Y);
+					cr.Paint ();
+				}
+			}
+			if (CrowInterface.hoverWidget != null) {
+				cr.Rectangle (CrowInterface.hoverWidget.ScreenCoordinates (
+					CrowInterface.hoverWidget.getSlot ()));
+				cr.LineWidth = 1;
+				cr.SetDash (dashed, 0);
+				//cr.Color = Crow.Color.Yellow;
+				cr.Stroke ();
+			}
+
+		}
+		void Win_DeleteEvent (object o, Gtk.DeleteEventArgs args)
+		{
+			Gtk.Application.Quit ();
+		}
+		void OpenTKGameWindow_SizeAllocated (object o, Gtk.SizeAllocatedArgs args)
+		{
+			CrowInterface.ProcessResize (new Rectangle (args.Allocation.X, args.Allocation.Y, args.Allocation.Width, args.Allocation.Height));
+		}        
+		void OpenTKGameWindow_MotionNotifyEvent (object o, Gtk.MotionNotifyEventArgs args)
+		{
+			CrowInterface.ProcessMouseMove ((int)args.Event.X, (int)args.Event.Y);
+        }
+
+		void OpenTKGameWindow_ButtonReleaseEvent (object o, Gtk.ButtonReleaseEventArgs args)
+		{
+			CrowInterface.ProcessMouseButtonUp ((int)args.Event.Button - 1);
+		}
+		void OpenTKGameWindow_ButtonPressEvent (object o, Gtk.ButtonPressEventArgs args)
+		{
+			CrowInterface.ProcessMouseButtonDown ((int)args.Event.Button - 1);
+		}
+
+//		void Mouse_WheelChanged(object sender, OpenTK.Input.MouseWheelEventArgs otk_e)
+//        {
+//			MouseWheelEventArgs e = new MouseWheelEventArgs (otk_e.X, otk_e.Y, otk_e.Value, otk_e.Delta);
+//			MouseState ms = e.Mouse;
+//			update_mouseButtonStates (ref ms, otk_e.Mouse);
+//			e.Mouse = ms;
+//
+//			if (hoverWidget == null) {
+//				MouseWheelChanged.Raise (this, otk_e);
+//				return;
+//			}
+//			hoverWidget.onMouseWheel (this, e);
+//        }
+
+
+
+	#region keyboard Handling
+//		KeyboardState Keyboad = new KeyboardState ();
+//		void Keyboard_KeyDown(object sender, OpenTK.Input.KeyboardKeyEventArgs otk_e)
+//	{
+////			if (_focusedWidget == null) {
+//				KeyboardKeyDown.Raise (this, otk_e);
+////				return;
+////			}
+//			Keyboad.SetKeyState ((Crow.Key)otk_e.Key, true);
+//			KeyboardKeyEventArgs e = new KeyboardKeyEventArgs((Crow.Key)otk_e.Key, otk_e.IsRepeat,Keyboad);
+//			_focusedWidget.onKeyDown (sender, e);
+//        }
+		void OpenTKGameWindow_KeyPressEvent (object o, Gtk.KeyPressEventArgs args)
+		{
+
+		}
+
+	#endregion
+    }
+}
diff --git a/OTKCrow/OTKCrow.csproj b/OTKCrow/OTKCrow.csproj
index 7b2974d0..a2f455b0 100644
--- a/OTKCrow/OTKCrow.csproj
+++ b/OTKCrow/OTKCrow.csproj
@@ -10,6 +10,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <ProductVersion>8.0.30703</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
+    <ReleaseVersion>0.4</ReleaseVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|Linux_x86' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/packages.config b/packages.config
deleted file mode 100644
index d77cff2a..00000000
--- a/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="gtk-sharp.Linux.3.14" version="3.14.7" targetFramework="net45" />
-</packages>
\ No newline at end of file
diff --git a/src/Interface.cs b/src/Interface.cs
index 4cb94e76..e1062a55 100644
--- a/src/Interface.cs
+++ b/src/Interface.cs
@@ -227,7 +227,15 @@ namespace Crow
 				return tmp;
 			}
 		}
-
+		public GraphicObject LoadInterface (Stream stream)
+		{
+			lock (UpdateMutex) {
+				GraphicObject tmp = Interface.Load (stream,
+					Interface.GetTopContainerOfGOMLStream(stream), this);
+				AddWidget (tmp);
+				return tmp;
+			}
+		}
 		#endregion
 
 		#if MEASURE_TIME
-- 
2.47.3